Changeset 510 for Dev/trunk/src/client/qed-client/model/classes

Timestamp:

03/12/14 15:16:54 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Factored out general object mapping and iteration.
• Split widgets for multiplechoice and singlechoice.
• Restored readOnly/disabled setting for QuestionEditorPreviewItem? on innerWidget (since view innerWidget is not a form anymore, we cannot just set it on that, we iterate over all form children now).

Location:

Dev/trunk/src/client/qed-client/model/classes

Files:

• _Class.js (modified) (4 diffs)
• responses.js (modified) (4 diffs)

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

@@ -1 +1 @@
 define([
+    "../../lib/object",
     "./_View",
     "dojo/_base/array",
@@ -5 +6 @@
     "dojo/_base/lang",
     "dojo/date/stamp"
-], function(_View, array, declare, lang, stamp) {
+], function(objectFuns, _View, array, declare, lang, stamp) {
 
     var _Class = declare([_View],{
@@ -24 +25 @@
             obj = lang.clone(obj);
             obj = this._serialize(obj) || obj;
-            this._strip(obj);
+            this._sanitize(obj);
             return obj;
         },
@@ -65 +66 @@
             return stamp.toISOString(date,{zulu:true,milliseconds:false});
         },
-        _strip: function(obj) {
+        _sanitize: function(obj) {
             if ( lang.isArray(obj) ) {
-                array.forEach(obj,this._strip,this);
+                array.forEach(obj,this._sanitize,this);
             } else if ( lang.isObject(obj) ) {
-                for ( var prop in obj ) {
-                    if ( obj.hasOwnProperty(prop) ) {
-                        var v = obj[prop];
-                        if ( v === null || v === "" || (typeof v === "number" && isNaN(v)) ) {
-                            delete obj[prop];
-                        } else {
-                            this._strip(v);
-                        }
+                objectFuns.forEach(obj,function(v,prop){
+                    if ( v === null ||
+                         v === "" ||
+                         (typeof v === "number" && isNaN(v)) ) {
+                        delete obj[prop];
+                    } else {
+                        this._sanitize(v);
                     }
-                }
+
+                },this);
             }
-
         }
     });

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

@@ -1 +1 @@
 define([
+    "../../lib/object",
     "./_Class",
     "./surveyRuns",
@@ -7 +8 @@
     "dojo/_base/lang",
     "dojo/_base/xhr"
-], function(_Class, surveyRuns, Deferred, declare, json, lang, xhr) {
+], function(objectFuns, _Class, surveyRuns, Deferred, declare, json, lang, xhr) {
 
     var Responses = declare([_Class],{
@@ -29 +30 @@
         },
         _serialize: function(obj) {
+            this._convertCheckAndRadio(obj.answers);
             if (obj._surveyRun) {
                 obj._surveyRun = surveyRuns._doSerialize(obj._surveyRun);
@@ -84 +86 @@
                 return result;
             },lang.hitch(this,'_deserializeError'));
+        },
+        _convertCheckAndRadio: function(answers) {
+            // When we encounter an array, we assume it's really a
+            // checkbox value.
+            objectFuns.forEach(answers,function(v,prop){
+                if ( lang.isArray(v) ) {
+                    switch (v.length) {
+                    case 0:
+                    case 1:
+                        answers[prop] = v[0];
+                        break;
+                    default:
+                        throw new Error("Responses cannot exist of array values.");
+                    }
+                }
+            },this);
         }
     });