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

Timestamp:

03/09/14 14:23:42 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Enable/disable buttons on content change.
• One place to do date formatting, because it was going wrong again.
• Serialize questions in survey properly.
• _ComplexValueMixin consumes submit events, but does trigger outer forms if present.
• Trigger dialog show/hide for login only after previous effect is finished.
• Check that documents are actually valid, not just that validator returned a result.
• Validate email and timestamp formats.
• Prepared for live runs.

Location:

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

Files:

• _ObjectPage.js (modified) (1 diff)
• question.js (modified) (2 diffs)
• response.js (modified) (1 diff)
• survey.js (modified) (5 diffs)
• surveyRun.js (modified) (3 diffs)
• templates/question.html (modified) (1 diff)
• templates/survey.html (modified) (2 diffs)
• templates/surveyRun.html (modified) (1 diff)

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

@@ -11 +11 @@
         classStore: null,
         constructor: function() {
-            if ( !this.classStore ) { throw new Error("Subclasses must specify a classStore."); }
+            if ( !this.classStore ) {
+                throw new Error("Subclasses must specify a classStore.");
+            }
+        },
+        startup: function() {
+            if ( this._started ) { return; }
+            this.inherited(arguments);
+            this.markClean();
         },
         _load: function() {

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

@@ -29 +29 @@
         },
         _handlePropertiesChange: function() {
-            if ( this.propertiesForm.validate() ) {
-                lang.mixin(this.object,this.propertiesForm.get('value'));
-            }
+            lang.mixin(this.object,this.propertiesForm.get('value'));
             this.markDirty();
+            this._refresh();
         },
         _handleContentChange: function() {
-            if ( this.contentList.validate() ) {
-                this.object.content = this.contentList.get('value');
-            }
+            this.object.content = this.contentList.get('value');
             this.markDirty();
+            this._refresh();
         },
         _save: function() {
-            if ( this.propertiesForm.validate() && this.contentList.validate() ) {
-                lang.mixin(this.object,this.propertiesForm.get('value'));
-                this.object.content = this.contentList.get('value');
+            if ( this._isValid ) {
                 return this.inherited(arguments);
             } else {
@@ -68 +64 @@
             return false;
         },
+        markDirty: function() {
+            this._isValid = this.propertiesForm.validate() &&
+                            this.contentList.validate();
+            this.saveBtn.set('disabled',!this._isValid);
+            this.saveAndCloseBtn.set('disabled',!this._isValid);
+            this.discardBtn.set('label','Discard & Close');
+            this.inherited(arguments);
+        },
+        markClean: function() {
+            this._isValid = true;
+            this.saveBtn.set('disabled',true);
+            this.saveAndCloseBtn.set('disabled',true);
+            this.discardBtn.set('label','Close');
+            this.inherited(arguments);
+        },
         _ignore: function(evt) {
             if ( evt ) { event.stop( evt ); }

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

@@ -40 +40 @@
             this.submitButton.set('disabled',false);
             this.continueButton.set('disabled',false);
-            this.cancelButton.set('disabled',false);
+            var canDelete = (this.response &&
+                             this.response._surveyRun.respondentCanDeleteOwnResponse);
+            this.cancelButton.set('disabled',canDelete||false);
             this.surveyWidget.set('disabled', false);
         },

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

@@ -23 +23 @@
             this._setupQuestionBrowser();
             this._setupListView();
+            this.questionList.on('change',lang.hitch(this,'_handleQuestionsChange'));
             this._load();
         },
@@ -58 +59 @@
         _refresh: function() {
             this.titleNode.innerHTML = this.object.title || "(set title in properties)";
-            this.propertiesDialog.set('value',{survey:this.object});
+            this.propertiesForm.set('value',{survey: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);
+        },
+        _handleQuestionsChange: function() {
+            this.object.questions = this.questionList.get('value');
+            this.markDirty();
+            this._refresh();
         },
         _onShowProperties: function(evt) {
@@ -76 +78 @@
         _onPropertiesOk: function(evt) {
             this.propertiesDialog.hide();
-            lang.mixin(this.object, this.propertiesDialog.get('value').survey);
+            lang.mixin(this.object, this.propertiesForm.get('value').survey);
             this.markDirty();
             this._refresh();
@@ -84 +86 @@
         _onPropertiesCancel: function(evt) {
             this.propertiesDialog.hide();
-            this.propertiesDialog.set('value',{survey:this.object});
+            this.propertiesForm.set('value',{survey:this.object});
             if ( evt ) { event.stop(evt); }
             return false;
@@ -109 +111 @@
                 preview: true
             });
+        },
+        markDirty: function() {
+            this.saveBtn.set('disabled',false);
+            this.saveAndCloseBtn.set('disabled',false);
+            this.discardBtn.set('label','Discard & Close');
+            this.inherited(arguments);
+        },
+        markClean: function() {
+            this.saveBtn.set('disabled',true);
+            this.saveAndCloseBtn.set('disabled',true);
+            this.discardBtn.set('label','Close');
+            this.inherited(arguments);
         }
     });

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

@@ -74 +74 @@
         },
         _onPropChange: function(e) {
-            if ( this.surveyRunWidget.validate() ) {
-                lang.mixin(this.object,this.surveyRunWidget.get('value'));
+            if ( this._updateObject() ) {
                 this._refreshURL();
             }
@@ -90 +89 @@
         },
         _save: function() {
-            if ( this.surveyRunWidget.validate() ) {
-                lang.mixin(this.object,this.surveyRunWidget.get('value'));
+            if ( this._updateObject() ) {
                 return this.inherited(arguments);
             } else {
                 return new Deferred.reject();
             }
+        },
+        _updateObject: function() {
+            var valid = this.surveyRunWidget.validate();
+            if ( valid ) {
+                lang.mixin(this.object,this.surveyRunWidget.get('value'));
+            }
+            return valid;
         },
         _onSave: function(evt) {
@@ -115 +120 @@
             if ( evt ) { event.stop(evt); }
             return false;
+        },
+        markDirty: function() {
+            this.saveBtn.set('disabled',false);
+            this.saveAndCloseBtn.set('disabled',false);
+            this.discardBtn.set('label','Discard & Close');
+            this.inherited(arguments);
+        },
+        markClean: function() {
+            this.saveBtn.set('disabled',true);
+            this.saveAndCloseBtn.set('disabled',true);
+            this.discardBtn.set('label','Close');
+            this.inherited(arguments);
         }
     });

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

@@ -18 +18 @@
                 <button data-dojo-type="dijit/form/Button"
                         data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'"
+                        data-dojo-attach-point="saveBtn"
                         data-dojo-attach-event="onClick:_onSave">
                   Save</button>
                 <button data-dojo-type="dijit/form/Button"
                         data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'"
+                        data-dojo-attach-point="saveAndCloseBtn"
                         data-dojo-attach-event="onClick:_onSaveAndClose">
                   Save &amp; Close</button>
                 <button data-dojo-type="dijit/form/Button"
                         data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'"
+                        data-dojo-attach-point="discardBtn"
                         data-dojo-attach-event="onClick:_onDiscard">
                   Discard &amp; Close</button>

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

@@ -23 +23 @@
             <button data-dojo-type="dijit/form/Button"
                     data-dojo-attach-event="onClick:_onSave"
+                    data-dojo-attach-point="saveBtn"
                     data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">
                 Save</button>
             <button data-dojo-type="dijit/form/Button"
                     data-dojo-attach-event="onClick:_onSaveAndClose"
+                    data-dojo-attach-point="saveAndCloseBtn"
                     data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">
                 Save &amp; Close</button>
             <button data-dojo-type="dijit/form/Button"
                     data-dojo-attach-event="onClick:_onDiscardAndClose"
+                    data-dojo-attach-point="discardBtn"
                     data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">
                 Discard &amp; Close</button>
@@ -41 +44 @@
 
     <div data-dojo-type="dijit/Dialog"
-         title="Survey properties"
-         data-dojo-attach-point="propertiesDialog"
-         data-dojo-attach-event="onSubmit:_onPropertiesOk">
-        <fieldset class="qedFieldset">
-            <div data-dojo-type="../model/widgets/SurveyWidget" data-dojo-props="name:'survey'"></div>
-        </fieldset>
-        <button data-dojo-type="dijit/form/Button"
-                type="submit"
-                data-dojo-attach-event="onClick:_onPropertiesOk">
-            OK</button>
-        <button data-dojo-type="dijit/form/Button"
-                type="button"
-                data-dojo-attach-event="onClick:_onPropertiesCancel">
-            Cancel</button>
+         data-dojo-props="'title':'Survey properties'"
+         data-dojo-attach-point="propertiesDialog">
+        <form data-dojo-type="dijit/form/Form"
+              data-dojo-attach-point="propertiesForm"
+              data-dojo-attach-event="onSubmit:_onPropertiesOk">
+            <fieldset class="qedFieldset">
+                <div data-dojo-type="../model/widgets/SurveyWidget" data-dojo-props="name:'survey'"></div>
+            </fieldset>
+            <button data-dojo-type="dijit/form/Button"
+                    type="submit"
+                    data-dojo-attach-event="onClick:_onPropertiesOk">
+                OK</button>
+            <button data-dojo-type="dijit/form/Button"
+                    type="button"
+                    data-dojo-attach-event="onClick:_onPropertiesCancel">
+                Cancel</button>
+        </form>
     </div>
 

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

@@ -55 +55 @@
                 class="blue"
                 data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconSave'"
+                data-dojo-attach-point="saveBtn"
                 data-dojo-attach-event="onClick:_onSave">Save</button>
         <button data-dojo-type="dijit/form/Button"
                 class="blue"
                 data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconSave'"
+                data-dojo-attach-point="saveAndCloseBtn"
                 data-dojo-attach-event="onClick:_onSaveAndClose">Save &amp; Close</button>
         <button data-dojo-type="dijit/form/Button"
                 class="blue"
                 data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconClose'"
+                data-dojo-attach-point="discardBtn"
                 data-dojo-attach-event="onClick:_onDiscard">Discard &amp; Close</button>
     </div>