Changeset 457 for Dev/trunk/src/client/qed-client/pages

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,

Location:

Dev/trunk/src/client/qed-client/pages

Files:

• surveyRun.js (modified) (4 diffs)
• templates/previewSurvey.html (modified) (1 diff)
• templates/response.html (modified) (1 diff)
• templates/survey.html (modified) (1 diff)
• templates/surveyRun.html (modified) (1 diff)

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;

Dev/trunk/src/client/qed-client/pages/templates/previewSurvey.html

@@ -10 +10 @@
     <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'center'" data-dojo-attach-point="questionsPane">
         <form data-dojo-type="dijit/form/Form" data-dojo-attach-point="questionsForm" style="overflow: auto">
-            <div data-dojo-type="../model/widgets/SurveyWidget" data-dojo-attach-point="surveyWidget"></div>
+            <div data-dojo-type="../model/widgets/SurveyRenderWidget" data-dojo-attach-point="surveyWidget"></div>
         </form>
     </div>

Dev/trunk/src/client/qed-client/pages/templates/response.html

@@ -11 +11 @@
         <form data-dojo-type="dijit/form/Form" data-dojo-attach-point="responseForm"
               data-dojo-attach-event="onSubmit:_ignoreEvent" style="overflow: auto">
-            <div data-dojo-type="../model/widgets/SurveyWidget" data-dojo-attach-point="surveyWidget"></div>
+            <div data-dojo-type="../model/widgets/SurveyRenderWidget" data-dojo-attach-point="surveyWidget"></div>
         </form>
     </div>

Dev/trunk/src/client/qed-client/pages/templates/survey.html

@@ -40 +40 @@
          data-dojo-attach-point="propertiesDialog"
          data-dojo-attach-event="onSubmit:_onPropertiesOk">
-        <fieldset data-dojo-type="../model/widgets/SurveyFieldset"></fieldset>
+        <fieldset class="qedFieldset">
+            <div data-dojo-type="../model/widgets/SurveyWidget"></div>
+        </fieldset>
         <button data-dojo-type="dijit/form/Button"
                 type="submit"

Dev/trunk/src/client/qed-client/pages/templates/surveyRun.html

@@ -9 +9 @@
     
     <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'center'">
-        <div data-dojo-type="../model/widgets/SurveySummary" data-dojo-attach-point="surveyNode"></div>
-        <div data-dojo-type="dijit/form/Form"
-             data-dojo-attach-point="propertiesForm">
-            <fieldset data-dojo-type="../model/widgets/SurveyRunFieldset"></fieldset>
-        </div>
         <fieldset class="qedFieldset">
+            <legend>Survey</legend>
+            <div data-dojo-type="../model/widgets/SurveySummary" data-dojo-attach-point="surveySummaryWidget"></div>
+        </fieldset>
+        <fieldset class="qedFieldset">
+            <legend>Run Details</legend>
+            <div data-dojo-type="../model/widgets/SurveyRunWidget" data-dojo-attach-point="surveyRunWidget"></div>
+        </fieldset>
+        <fieldset class="qedFieldset">
+            <legend>Response Details</legend>
             <div><div class="qedLabel">General URL</div><div class="qedField" data-dojo-attach-point="runURLNode" style="overflow: ellipsis"></div></div>
             <div><div class="qedLabel">Responses <span data-dojo-attach-point="responsesCountNode"></span></div><div class="qedField qedFill" data-dojo-attach-point="responsesNode"></div></div>