Changeset 490 for Dev/trunk/src/client/qed-client/pages/survey.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/survey.js (modified) (3 diffs)

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

@@ -1 +1 @@
 define([
-    "../app/Page",
     "../app/Router",
     "../model/classes/surveys",
     "../model/widgets/QuestionListView",
     "../model/widgets/TabbedQuestionBrowser",
+    "./_ObjectPage",
     "dojo/_base/array",
     "dojo/_base/declare",
@@ -12 +12 @@
     "require",
     "dojo/text!./templates/survey.html"
-], function(Page, Router, surveys, QuestionListView, TabbedQuestionBrowser, array, declare, event, lang, when, require, template) {
-    return declare([Page],{
+], function(Router, surveys, QuestionListView, TabbedQuestionBrowser, _ObjectPage, array, declare, event, lang, when, require, template) {
+    return declare([_ObjectPage],{
         contextRequire: require,
         templateString: template,
-        survey: null,
+        classStore: surveys,
         questionList: null,
         startup: function() {
             if ( this._started ) { return; }
             this.inherited(arguments);
-            if ( this.surveyId ) {
-                this._setupQuestionBrowser();
-                this._setupListView();
-                this._loadSurvey();
-            } else {
-                throw "No valid uid or survey passed!";
-            }
+            this._setupQuestionBrowser();
+            this._setupListView();
+            this._load();
         },
         _setupQuestionBrowser: function() {
@@ -60 +56 @@
             this.questionList.startup();
         },
-        _loadSurvey: function() {
-            if ( this.surveyId === "new" ) {
-                this.survey = surveys.create();
-                this.refresh();
-            } else {
-                when(surveys.load(this.surveyId))
-                .then(lang.hitch(this,function(survey){
-                    this.survey = survey;
-                    this.questionList.set('value',
-                                          this.survey.questions);
-                    this.refresh();
-                }));
-            }
+        _refresh: function() {
+            this.titleNode.innerHTML = this.object.title || "(set title in properties)";
+            this.propertiesDialog.set('value',this.object);
+            this.questionList.set('value',
+                                  this.object.questions);
+        },
+        _save: function() {
+            this.object.questions = this.questionList.get('value');
+            return this.inherited(arguments);
         },
         _includeQuestion: function(question) {
             this.questionList.appendItem(question);
         },
-        refresh: function() {
-            this.titleNode.innerHTML = this.survey.title || "(set title in properties)";
-            this.propertiesDialog.set('value',this.survey);
-        },
         _onShowProperties: function(evt) {
             this.propertiesDialog.show();
+            if ( evt ) { event.stop(evt); }
+            return false;
         },
         _onPropertiesOk: function(evt) {
             this.propertiesDialog.hide();
-            lang.mixin(this.survey, this.propertiesDialog.get('value'));
-            this.refresh();
-            event.stop(evt);
+            lang.mixin(this.object, this.propertiesDialog.get('value'));
+            this.markDirty();
+            this._refresh();
+            if ( evt ) { event.stop(evt); }
             return false;
         },
         _onPropertiesCancel: function(evt) {
             this.propertiesDialog.hide();
-            this.propertiesDialog.reset('value',this.survey);
-            event.stop(evt);
+            this.propertiesDialog.set('value',this.object);
+            if ( evt ) { event.stop(evt); }
             return false;
         },
         _onSave: function(evt) {
-            this.survey.questions = this.questionList.get('value');
-            surveys.save(this.survey)
+            this._save();
+            if ( evt ) { event.stop(evt); }
+            return false;
+        },
+        _onSaveAndClose: function(evt) {
+            this._save()
             .then(function() { 
-                Router.go('/surveys');
+                Router.go(surveys.getCollectionPath());
             });
             event.stop(evt);
             return false;
         },
-        _onDiscard: function(evt) {
-            Router.go('/surveys');
+        _onDiscardAndClose: function(evt) {
+            this.markClean();
+            Router.go(surveys.getCollectionPath());
         },
         _onShowPreview: function() {
-            Router.go('/previewSurvey/'+this.survey._id,{
+            Router.go(surveys.getPreviewPath(this.object),{
                 preview: true
             });