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

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/model

Files:

• classes/_Class.js (modified) (2 diffs)
• classes/_View.js (modified) (2 diffs)
• classes/questions.js (modified) (2 diffs)
• classes/responses.js (modified) (3 diffs)
• classes/surveyRuns.js (modified) (3 diffs)
• classes/surveys.js (modified) (2 diffs)
• widgets/SurveyRunWidget.js (modified) (1 diff)
• widgets/questions/templates/TextInputWidget.html (modified) (1 diff)
• widgets/templates/QuestionWidget.html (modified) (1 diff)
• widgets/templates/SurveyRunWidget.html (modified) (1 diff)
• widgets/templates/SurveyWidget.html (modified) (1 diff)

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

@@ -2 +2 @@
     "./_View",
     "dojo/_base/declare",
-    "dojo/_base/lang"
-], function(_View, declare, lang) {
+    "dojo/_base/lang",
+    "dojo/date/stamp"
+], function(_View, declare, lang, stamp) {
 
     var _Class = declare([_View],{
@@ -56 +57 @@
                                              idOrObj :
                                              this.getId(idOrObj));
+        },
+        _formatDate: function(date) {
+            return stamp.toISOString(date,{zulu:true,milliseconds:false});
         }
     });

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

@@ -5 +5 @@
     "dojo/_base/json",
     "dojo/_base/lang",
+    "dojo/date/stamp",
     "dojo/store/util/QueryResults"
-], function(JsonRest, Deferred, declare, json, lang, queryResults) {
+], function(JsonRest, Deferred, declare, json, lang, stamp, queryResults) {
 
     var _View = declare([],{
@@ -38 +39 @@
         getCollectionPath: function() {
             return '/'+this._collection;
+        },
+        _parseDate: function(str) {
+            return stamp.fromISOString(str);
         }
     });

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

@@ -1 +1 @@
 define([
     "./_Class",
-    "dojo/_base/declare",
-    "dojo/date/stamp"
-], function(_Class, declare, stamp) {
+    "dojo/_base/declare"
+], function(_Class, declare) {
 
     var Questions = declare([_Class],{
@@ -20 +19 @@
         _deserialize: function(obj) {
             if (obj.publicationDate) {
-                obj.publicationDate = stamp.fromISOString(obj.publicationDate);
+                obj.publicationDate = this._parseDate(obj.publicationDate);
             }
         },
         _serialize: function(obj) {
             if (obj.publicationDate) {
-                obj.publicationDate = stamp.toISOString(obj.publicationDate);
+                obj.publicationDate = this._formatDate(obj.publicationDate);
             }
         }

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

@@ -6 +6 @@
     "dojo/_base/json",
     "dojo/_base/lang",
-    "dojo/_base/xhr",
-    "dojo/date/stamp"
-], function(_Class, surveyRuns, Deferred, declare, json, lang, xhr, stamp) {
+    "dojo/_base/xhr"
+], function(_Class, surveyRuns, Deferred, declare, json, lang, xhr) {
 
     var Responses = declare([_Class],{
@@ -26 +25 @@
             }
             if (obj.publicationDate) {
-                obj.publicationDate = stamp.fromISOString(obj.publicationDate);
+                obj.publicationDate = this._parseDate(obj.publicationDate);
             }
         },
@@ -34 +33 @@
             }
             if (obj.publicationDate) {
-                obj.publicationDate = stamp.toISOString(obj.publicationDate);
+                obj.publicationDate = this._formatDate(obj.publicationDate);
             }
         },

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

@@ -2 +2 @@
     "./_Class",
     "./surveys",
-    "dojo/_base/declare",
-    "dojo/date/stamp"
-], function(_Class, surveys, declare, stamp) {
+    "dojo/_base/declare"
+], function(_Class, surveys, declare) {
 
     var SurveyRuns = declare([_Class],{
@@ -21 +20 @@
         _deserialize: function(obj) {
             if (obj.endDate) {
-                obj.endDate = stamp.fromISOString(obj.endDate);
+                obj.endDate = this._parseDate(obj.endDate);
             }
             if (obj.startDate) {
-                obj.startDate = stamp.fromISOString(obj.startDate);
+                obj.startDate = this._parseDate(obj.startDate);
             }
             if (obj.survey) {
@@ -32 +31 @@
         _serialize: function(obj) {
             if (obj.endDate) {
-                obj.endDate = stamp.toISOString(obj.endDate);
+                obj.endDate = this._formatDate(obj.endDate);
             }
             if (obj.startDate) {
-                obj.startDate = stamp.toISOString(obj.startDate);
+                obj.startDate = this._formatDate(obj.startDate);
             }
             if (obj.survey) {

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

@@ -1 +1 @@
 define([
     "./_Class",
+    "./questions",
+    "dojo/_base/array",
     "dojo/_base/declare",
-    "dojo/date/stamp",
-    "dojo/store/JsonRest"
-], function(_Class, declare, stamp, JsonRest) {
+    "dojo/_base/lang"
+], function(_Class, questions, array, declare, lang) {
 
     var Surveys = declare([_Class],{
@@ -18 +19 @@
         },
         _deserialize: function(obj) {
+            obj.questions = array.map(obj.questions,
+                                      lang.hitch(questions,'_doDeserialize'));
             if (obj.publicationDate) {
-                obj.publicationDate = stamp.fromISOString(obj.publicationDate);
+                obj.publicationDate = this._parseDate(obj.publicationDate);
             }
         },
         _serialize: function(obj) {
+            obj.questions = array.map(obj.questions,
+                                      lang.hitch(questions,'_doSerialize'));
             if (obj.publicationDate) {
-                obj.publicationDate = stamp.toISOString(obj.publicationDate);
+                obj.publicationDate = this._formatDate(obj.publicationDate);
             }
         },

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

@@ -12 +12 @@
                 endDateBox.constraints.min  = value;
             });
+        },
+        _getValueAttr: function() {
+            var value = this.inherited(arguments);
+            if ( !value.startDate ) { delete value.startDate; }
+            if ( !value.endDate ) { delete value.endDate; }
+            value.respondentCanDeleteOwnResponse = value.respondentCanDeleteOwnResponse[0] === true;
+            return value;
         }
     });

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

@@ -1 +1 @@
 <form>
   <p>${text}</p>
-  <div class="qedField" data-dojo-attach-point="textArea" data-dojo-type="dijit/form/Textarea" name="text"></div>
+  <textarea class="qedField" data-dojo-attach-point="textArea" data-dojo-type="dijit/form/Textarea" name="text"></textarea>
 </form>

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

@@ -7 +7 @@
             <input data-dojo-type="dijit/form/TextBox" name="title" type="text" class="loginInput" />
             <label for="question" class="loginLabel">Description</label>
-            <input data-dojo-type="dijit/form/Textarea" name="description" type="text" class="loginInput"/>
+            <textarea data-dojo-type="dijit/form/Textarea" name="description" type="text" class="loginInput"></textarea>
             <label for="category" class="loginLabel">Category</label>
             <input data-dojo-type="dijit/form/TextBox" name="category" type="text" class="loginInput" />

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

@@ -3 +3 @@
     <div>
         <label for="mode" class="qedLabel">Description</label>
-        <textarea name="description" class="qedField" data-dojo-type="dijit/form/Textarea"></textarea>
+        <textarea name="description" class="qedField"
+                  data-dojo-type="dijit/form/Textarea"></textarea>
     </div>
 
     <div>
         <label for="startDate" class="qedLabel">Start date</label>
-        <input type="text" name="startDate" class="qedField" data-dojo-type="dijit/form/DateTextBox" data-dojo-attach-point="startDateBox" />
+        <input type="text" name="startDate" class="qedField"
+               data-dojo-type="dijit/form/DateTextBox"
+               data-dojo-attach-point="startDateBox" />
     </div>
 
     <div>
         <label for="endDate" class="qedLabel">End date</label>
-        <input type="text" name="endDate" class="qedField" data-dojo-type="dijit/form/DateTextBox" data-dojo-attach-point="endDateBox" />
+        <input type="text" name="endDate" class="qedField"
+               data-dojo-type="dijit/form/DateTextBox"
+               data-dojo-attach-point="endDateBox" />
+    </div>
+
+    <div>
+        <label for="endDate" class="qedLabel">Allow respondents to delete their unsubmitted response</label>
+        <input type="text" name="respondentCanDeleteOwnResponse"
+               class="qedField"
+               data-dojo-type="dijit/form/CheckBox"
+               data-dojo-props="'value':true" />
     </div>
 

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

@@ -3 +3 @@
     <input data-dojo-type="dijit/form/TextBox" name="title"/><br/>
     <label for="description">Description</label>
-    <input data-dojo-type="dijit/form/Textarea" name="description"/><br/>
+    <textarea data-dojo-type="dijit/form/Textarea" name="description"></textarea><br/>
 </form>