Changeset 493 for Dev/trunk/src/client

Timestamp:

03/09/14 19:25:40 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• _ComplexValueMixin propagates priorityChange to children.
• Deserialize updated docs after save too.
• Validate to false if definitions are missing.

Location:

Dev/trunk/src/client/qed-client

Files:

• model/classes/_Class.js (modified) (1 diff)
• model/widgets/QuestionEditorToolkit.js (modified) (3 diffs)
• model/widgets/SurveyRunWidget.js (modified) (1 diff)
• model/widgets/SurveySummary.js (modified) (1 diff)
• model/widgets/questions/MultipleChoiceInputConfigWidget.js (modified) (1 diff)
• model/widgets/questions/NumberInputConfigWidget.js (modified) (1 diff)
• model/widgets/questions/TextInputConfigWidget.js (modified) (1 diff)
• model/widgets/questions/templates/MultipleChoiceInputConfigRowWidget.html (modified) (1 diff)
• model/widgets/questions/templates/MultipleChoiceInputConfigWidget.html (modified) (1 diff)
• model/widgets/templates/SurveyRunWidget.html (modified) (1 diff)
• pages/question.js (modified) (3 diffs)
• pages/survey.js (modified) (1 diff)
• pages/surveyRun.js (modified) (4 diffs)
• widgets (modified) (1 prop)
• widgets/_ComplexValueMixin.coffee (deleted)
• widgets/_ComplexValueMixin.js (added)

Dev/trunk/src/client/qed-client/model/classes/_Class.js

@@ -34 +34 @@
         save: function(obj) {
             return this._store.put(this._doSerialize(obj))
-            .otherwise(lang.hitch(this,'_deserializeError'));
+            .then(lang.hitch(this,'_doDeserialize'),
+                  lang.hitch(this,'_deserializeError'));
         },
         remove: function(objOrId,rev) {

Dev/trunk/src/client/qed-client/model/widgets/QuestionEditorToolkit.js

@@ -30 +30 @@
             { type: "Header" },
             { type: "Text" },
-            { type: "Image" },
-            { type: "ExternalMedia" },
             { type: "Divider" }
         ],
@@ -44 +42 @@
             "Header": "Header",
             "Text": "Text",
-            "Image": "Image",
-            "ExternalMedia": "External media",
             "Divider": "Divider",
             "StringInput": "Text line",
@@ -56 +52 @@
             "Header": "Header",
             "Text": "TextBox",
-            "Image": "Image",
-            "ExternalMedia": "External",
             "Divider": "Divider",
             "StringInput": "Text",

Dev/trunk/src/client/qed-client/model/widgets/SurveyRunWidget.js

@@ -17 +17 @@
             if ( !value.startDate ) { delete value.startDate; }
             if ( !value.endDate ) { delete value.endDate; }
-            value.respondentCanDeleteOwnResponse = value.respondentCanDeleteOwnResponse[0] === true;
+            value.respondentCanDeleteOwnResponse =
+                value.respondentCanDeleteOwnResponse.length > 0;
             return value;
+        },
+        _setValueAttr: function(value) {
+            value.respondentCanDeleteOwnResponse =
+                value.respondentCanDeleteOwnResponse ? ["on"] : [];
+            this.inherited(arguments);
         }
     });

Dev/trunk/src/client/qed-client/model/widgets/SurveySummary.js

@@ -19 +19 @@
             this.titleNode.innerHTML = survey.title || "";
             domAttr.set(this.titleNode, "href", survey && surveys.getObjectPath(survey));
-            this.descriptionNode.innerHTML = survey.description;
+            this.descriptionNode.innerHTML = survey.description || "";
             this.questionsNode.innerHTML = survey.questions.length;
         }

Dev/trunk/src/client/qed-client/model/widgets/questions/MultipleChoiceInputConfigWidget.js

@@ -52 +52 @@
         _getValueAttr: function() {
             var value = this.inherited(arguments);
-            value.allowMultiple = value.allowMultiple && value.allowMultiple.length > 0;
+            value.allowMultiple = value.allowMultiple.length > 0;
             value.type = this.type;
             return value;
-        },
-        _setValueAttr: function(value) {
-            value.allowMultiple = value.allowMultiple === true ? ["on"] : [];
-            this.inherited(arguments);
         },
         onAddItem: function(evt) {

Dev/trunk/src/client/qed-client/model/widgets/questions/NumberInputConfigWidget.js

@@ -10 +10 @@
             var value = this.inherited(arguments);
             value.type = this.type;
+            if ( !value.min ) { delete value.min; }
+            if ( !value.max ) { delete value.max; }
+            if ( !value.places ) { delete value.places; }
             return value;
         }

Dev/trunk/src/client/qed-client/model/widgets/questions/TextInputConfigWidget.js

@@ -10 +10 @@
             var value = this.inherited(arguments);
             value.type = this.type;
+            if ( !value.maxLength ) { delete value.maxLength; }
             return value;
         }

Dev/trunk/src/client/qed-client/model/widgets/questions/templates/MultipleChoiceInputConfigRowWidget.html

@@ -1 +1 @@
 <form>
-  <div data-dojo-type="dijit/form/ValidationTextBox" name="text" required="required" data-dojo-attach-point="textBox"></div><div data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:onDestroy">X</div>
+  <div data-dojo-type="dijit/form/ValidationTextBox"
+       name="text" required="required"
+       data-dojo-attach-point="textBox"></div>
+  <div data-dojo-type="dijit/form/Button"
+       data-dojo-attach-event="onClick:onDestroy">X</div>
 </form>

Dev/trunk/src/client/qed-client/model/widgets/questions/templates/MultipleChoiceInputConfigWidget.html

@@ -6 +6 @@
   <div data-dojo-attach-point="itemsNode">
   </div>
-  <div data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:onAddItem">Add item</div>
+  <div data-dojo-type="dijit/form/Button"
+       data-dojo-attach-event="onClick:onAddItem">Add item</div>
 </form>

Dev/trunk/src/client/qed-client/model/widgets/templates/SurveyRunWidget.html

@@ -25 +25 @@
         <input type="text" name="respondentCanDeleteOwnResponse"
                class="qedField"
-               data-dojo-type="dijit/form/CheckBox"
-               data-dojo-props="'value':true" />
+               data-dojo-type="dijit/form/CheckBox" />
     </div>
 

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

@@ -25 +25 @@
         _refresh: function() {
             this.titleNode.innerHTML = this.object.title || "";
-            this.propertiesForm.set('value',this.object);
-            this.contentList.set('value',this.object.content);
+            this.propertiesForm.set('value',this.object,null);
+            this.contentList.set('value',this.object.content,null);
         },
         _handlePropertiesChange: function() {
-            lang.mixin(this.object,this.propertiesForm.get('value'));
+            this._updateObject();
             this.markDirty();
             this._refresh();
         },
         _handleContentChange: function() {
-            this.object.content = this.contentList.get('value');
+            this._updateObject();
             this.markDirty();
             this._refresh();
         },
+        _updateObject: function() {
+            var pValid = this.propertiesForm.validate();
+            if ( pValid ) {
+                lang.mixin(this.object,this.propertiesForm.get('value'));
+            }
+            var cValid = this.contentList.validate();
+            if ( cValid ) {
+                this.object.content = this.contentList.get('value');
+            }
+            this._isValid = pValid && cValid;
+            return this._isValid;
+        },
         _save: function() {
-            if ( this._isValid ) {
+            if ( this._updateObject() ) {
                 return this.inherited(arguments);
             } else {
@@ -65 +77 @@
         },
         markDirty: function() {
-            this._isValid = this.propertiesForm.validate() &&
-                            this.contentList.validate();
             this.saveBtn.set('disabled',!this._isValid);
             this.saveAndCloseBtn.set('disabled',!this._isValid);
@@ -73 +83 @@
         },
         markClean: function() {
-            this._isValid = true;
             this.saveBtn.set('disabled',true);
             this.saveAndCloseBtn.set('disabled',true);

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

@@ -59 +59 @@
         _refresh: function() {
             this.titleNode.innerHTML = this.object.title || "(set title in properties)";
-            this.propertiesForm.set('value',{survey:this.object});
-            this.questionList.set('value',
-                                  this.object.questions);
+            this.propertiesForm.set('value',{survey:this.object},null);
+            this.questionList.set('value',this.object.questions,null);
         },
         _includeQuestion: function(question) {

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

@@ -22 +22 @@
         templateString: template,
         classStore: surveyRuns,
+        _isValid: false,
         startup: function() {
             if ( this._started ) { return; }
@@ -30 +31 @@
         _refresh: function() {
             this.titleNode.innerHTML = this.object.title || "";
-            this.surveySummaryWidget.set('value',this.object.survey);
-            this.surveyRunWidget.set('value',this.object);
+            this.surveySummaryWidget.set('value',this.object.survey,null);
+            this.surveyRunWidget.set('value',this.object,null);
             this._refreshURL();
             this._loadResponses();
@@ -96 +97 @@
         },
         _updateObject: function() {
-            var valid = this.surveyRunWidget.validate();
-            if ( valid ) {
+            this._isValid = this.surveyRunWidget.validate();
+            if ( this._isValid ) {
                 lang.mixin(this.object,this.surveyRunWidget.get('value'));
             }
-            return valid;
+            return this._isValid;
         },
         _onSave: function(evt) {
@@ -122 +123 @@
         },
         markDirty: function() {
-            this.saveBtn.set('disabled',false);
-            this.saveAndCloseBtn.set('disabled',false);
+            this.saveBtn.set('disabled',!this._isValid);
+            this.saveAndCloseBtn.set('disabled',!this._isValid);
             this.discardBtn.set('label','Discard & Close');
             this.inherited(arguments);

Dev/trunk/src/client/qed-client/widgets

@@ -1 +1 @@
 
-### begin grunt-svn-ignore managed ignores
-### edits will be overwritten when grunt svn-ignore is run
-_ComplexValueMixin.js
-### end grunt-svn-ignore managed ignores

@@ -1 +1 @@
 
-### begin grunt-svn-ignore managed ignores
-### edits will be overwritten when grunt svn-ignore is run
-_ComplexValueMixin.js
-### end grunt-svn-ignore managed ignores

@@ -1 +1 @@
 
-### begin grunt-svn-ignore managed ignores
-### edits will be overwritten when grunt svn-ignore is run
-_ComplexValueMixin.js
-### end grunt-svn-ignore managed ignores