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

Timestamp:

06/09/13 17:27:20 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Improve SurveyRun? form and drop Fieldsets as widgets.

• Improved console message on Page change fail.
• Renamed some widgets, dropped having Fieldset widgets.
• Put constraint that survey run start date cannot be before end date.
• Link to survey from survey summary,

File:

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

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

@@ -21 +21 @@
             if ( this._started ) { return; }
             this.inherited(arguments);
-            this.propertiesForm.on("blur",lang.hitch(this,'_onPropChange'));
+            this.surveyRunWidget.on("blur",lang.hitch(this,'_onPropChange'));
             if ( this.surveyRunId ) {
                 this._loadSurveyRun();
@@ -38 +38 @@
         refreshSurveyRun: function() {
             this.titleNode.innerHTML = SurveyRun.DisplayTitle.get(this.surveyRun);
-            this.surveyNode.set('value',SurveyRun.Survey.get(this.surveyRun));
-            this.propertiesForm.set('value',this.surveyRun);
+            this.surveySummaryWidget.set('value',SurveyRun.Survey.get(this.surveyRun));
+            this.surveyRunWidget.set('value',this.surveyRun);
             this._onPropChange();
         },
@@ -70 +70 @@
         },
         _onPropChange: function(e) {
-            var surveyRun = this.propertiesForm.get('value');
+            var surveyRun = this.surveyRunWidget.get('value');
             if ( surveyRun.mode === "open" ) {
                 this.runURLNode.innerHTML = this._link(this._getGeneralURL(store.getIdentity(this.surveyRun)));
@@ -87 +87 @@
         },
         _onSave: function(evt) {
-            lang.mixin(this.surveyRun,this.propertiesForm.get('value'));
-            var not = function(p){ return !p; };
-            func.modPropIf(this.surveyRun,"startDate",not.compose(lang.isString),store.formatDate);
-            func.modPropIf(this.surveyRun,"endDate",not.compose(lang.isString),store.formatDate);
-            store.put(this.surveyRun)
-            .then(function() { 
-                Router.go('/surveys');
-            },function(err){
-                Content.notify(err);
-            });
+            if ( this.surveyRunWidget.validate() ) {
+                lang.mixin(this.surveyRun,this.surveyRunWidget.get('value'));
+
+                var SD = SurveyRun.StartDate;
+                var ED = SurveyRun.EndDate;
+                SD.set(this.surveyRun, SD.get(this.surveyRun));
+                ED.set(this.surveyRun, ED.get(this.surveyRun));
+
+                store.put(this.surveyRun)
+                .then(function() { 
+                    Router.go('/surveys');
+                },function(err){
+                    Content.notify(err);
+                });
+            }
             event.stop(evt);
             return false;