Changeset 508 for Dev/trunk/src/client/qed-client/model/widgets/questions/MultipleChoiceInputWidget.js

Timestamp:

03/12/14 02:23:11 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Server handles the new flat response format correctly.
• Client widgets and survey rendering creates a flat structure.
• Fixed logic error in checking if questions in survey are published.
• Restrict accepted properties in answers and reject empty strings as properties.

File:

• Dev/trunk/src/client/qed-client/model/widgets/questions/MultipleChoiceInputWidget.js (modified) (4 diffs)

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

@@ -1 +1 @@
 define([
-    "../../../widgets/_ComplexValueWidget",
+    "dijit/_Container",
+    "dijit/_TemplatedMixin",
+    "dijit/_WidgetBase",
+    "dijit/_WidgetsInTemplateMixin",
     "dijit/form/CheckBox",
     "dijit/form/RadioButton",
@@ -7 +10 @@
     "dojo/dom-construct",
     "dojo/text!./templates/MultipleChoiceInputWidget.html"
-], function(_ComplexValueWidget, CheckBox, RadioButton, array, declare, domConstruct, template) {
-    return declare([_ComplexValueWidget],{
+], function(_Container, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, CheckBox, RadioButton, array, declare, domConstruct, template) {
+    return declare([_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,_Container],{
         templateString: template,
-        allowMultiple: false,
         startup: function() {
             if ( this._started ) { return; }
@@ -17 +19 @@
             domConstruct.empty(this.domNode);
             var Ctor = this.allowMultiple === true ? CheckBox : RadioButton;
-            array.forEach(this.items, function(item, index){
+            array.forEach(this.items, function(item){
                 var div = domConstruct.create("div", {
                 }, this.domNode, "last");
                 var input = new Ctor({
-                    name: this.allowMultiple === true ? index.toString() : 'choice',
-                    value: item.text
+                    name: this.code + (this.allowMultiple === true ? item.subcode : ''),
+                    value: this.allowMultiple === true ? null : item.subcode
                 }).placeAt(div);
                 var label = domConstruct.create("label",{
@@ -29 +31 @@
                 }, div);
             }, this);
-        },
-        _getValueAttr: function() {
-            var value = this.inherited(arguments);
-            /*if ( this.allowMultiple === true ) {
-                return value;
-            } else {
-                return value.choice; //.length > 0;
-            }*/
-        },
-        _setValueAttr: function(value) {
-            var inherited = this.getInherited(arguments);
-            if ( this.allowMultiple === true ) {
-                inherited.call(this,value);
-            } else {
-                inherited.call(this,{choice:value ? ["on"] : []});
-            }
         }
     });