Changeset 490 for Dev/trunk/src/client/qed-client/pages/surveyRun.js

Timestamp:

03/08/14 22:51:23 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Mark content as dirty to prevent moving away from unsaved data.
• Better change propagation from lists and our own widgets.
• Generate notifications for errors and show correct message.
• Moved all path/url generation to the class stores, not everywhere we use it.
• Give user always a choice between Save and Save & Close.
• Better refresh behaviour on form changes and saves.
• Don't generate duplicate code error when existing object is the one you're storing.

File:

• Dev/trunk/src/client/qed-client/pages/surveyRun.js (modified) (3 diffs)

Dev/trunk/src/client/qed-client/pages/surveyRun.js

@@ -1 +1 @@
 define([
     "../app/Content",
-    "../app/Page",
+    "../app/Path",
     "../app/Router",
     "../lib/func",
     "../model/classes/responses",
     "../model/classes/surveyRuns",
+    "../model/classes/surveys",
     "../widgets/LineWithActionsWidget",
+    "./_ObjectPage",
+    "dojo/Deferred",
     "dojo/_base/array",
     "dojo/_base/declare",
@@ -14 +17 @@
     "require",
     "dojo/text!./templates/surveyRun.html"
-], function(Content, Page, Router, func, responses, surveyRuns, LineWithActionsWidget, array, declare, event, lang, when, require, template) {
-    return declare([Page],{
+], function(Content, Path, Router, func, responses, surveyRuns, surveys, LineWithActionsWidget, _ObjectPage, Deferred, array, declare, event, lang, when, require, template) {
+    return declare([_ObjectPage],{
         contextRequire: require,
         templateString: template,
-        surveyRun: null,
+        classStore: surveyRuns,
         startup: function() {
             if ( this._started ) { return; }
             this.inherited(arguments);
-            this.surveyRunWidget.on("blur",lang.hitch(this,'_onPropChange'));
-            if ( this.surveyRunId ) {
-                this._loadSurveyRun();
+            this.surveyRunWidget.on("change",lang.hitch(this,'_onPropChange'));
+            this._load();
+        },
+        _refresh: function() {
+            this.titleNode.innerHTML = this.object.title || "";
+            this.surveySummaryWidget.set('value',this.object.survey);
+            this.surveyRunWidget.set('value',this.object);
+            this._refreshURL();
+            this._loadResponses();
+        },
+        _refreshURL: function() {
+            if ( this.object.mode === "open" ) {
+                this.runURLNode.innerHTML =
+                    this._link(this._buildGeneralURL(this.object));
             } else {
-                throw "No valid uid or survey passed!";
+                this.runURLNode.innerHTML =
+                    "No general URL. Add individual respondents below.";
             }
         },
-        _loadSurveyRun: function() {
-            when(surveyRuns.load(this.surveyRunId))
-            .then(lang.hitch(this,function(surveyRun){
-                this.surveyRun = surveyRun;
-                this.refreshSurveyRun();
-                this._loadResponses();
-            }));
-        },
-        refreshSurveyRun: function() {
-            this.titleNode.innerHTML = this.surveyRun.title || "";
-            this.surveySummaryWidget.set('value',this.surveyRun.survey);
-            this.surveyRunWidget.set('value',this.surveyRun);
-            this._onPropChange();
-        },
         _loadResponses: function() {
-            responses.query({surveyRunId:surveyRuns.getId(this.surveyRun)})
+            responses.query({surveyRunId:surveyRuns.getId(this.object)})
             .then(lang.hitch(this,function(allResponses){
                 array.forEach(allResponses, function(response){
@@ -73 +74 @@
         },
         _onPropChange: function(e) {
-            var surveyRun = this.surveyRunWidget.get('value');
-            if ( surveyRun.mode === "open" ) {
-                this.runURLNode.innerHTML =
-                    this._link(this._buildGeneralURL(this.surveyRun));
-            } else {
-                this.runURLNode.innerHTML =
-                    "No general URL. Add individual respondents below.";
+            if ( this.surveyRunWidget.validate() ) {
+                lang.mixin(this.object,this.surveyRunWidget.get('value'));
+                this._refreshURL();
             }
+            this.markDirty();
         },
         _buildGeneralURL: function(surveyRun) {
-            return 'response.html#!/surveyRuns/'+surveyRuns.getId(surveyRun)+'!secret='+surveyRun.secret;
+            return 'response.html#'+Path.format(surveyRuns.getObjectPath(surveyRun),{secret:surveyRun.secret});
         },
         _buildResponseURL: function(response) {
-            return 'response.html#!/responses/'+responses.getId(response)+'!secret='+response.secret;
+            return 'response.html#'+Path.format(responses.getObjectPath(response),{secret:response.secret});
         },
         _link: function(url,label) {
             return '<a target="_blank" href="'+url+'">'+(label || url)+'</a>';
         },
+        _save: function() {
+            if ( this.surveyRunWidget.validate() ) {
+                lang.mixin(this.object,this.surveyRunWidget.get('value'));
+                return this.inherited(arguments);
+            } else {
+                return new Deferred.reject();
+            }
+        },
         _onSave: function(evt) {
-            if ( this.surveyRunWidget.validate() ) {
-                lang.mixin(this.surveyRun,this.surveyRunWidget.get('value'));
-
-                surveyRuns.save(this.surveyRun)
-                .then(function() { 
-                    Router.go('/surveys');
-                },function(err){
-                    Content.notify(err);
-                });
-            }
+            this._save();
+            if ( evt ) { event.stop(evt); }
+            return false;
+        },
+        _onSaveAndClose: function(evt) {
+            this._save()
+            .then(function() { 
+                Router.go(surveys.getCollectionPath());
+            });
             if ( evt ) { event.stop(evt); }
             return false;
         },
         _onDiscard: function(evt) {
-            Router.go('/surveys');
+            this.markClean();
+            Router.go(surveys.getCollectionPath());
             if ( evt ) { event.stop(evt); }
             return false;