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

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.

Location:

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

Files:

• MultipleChoiceInputWidget.js (modified) (4 diffs)
• NumberInputWidget.js (modified) (1 diff)
• ScaleInputWidget.js (modified) (5 diffs)
• StringInputWidget.js (modified) (1 diff)
• TextInputWidget.js (modified) (1 diff)
• templates/MultipleChoiceInputWidget.html (modified) (1 diff)
• templates/NumberInputWidget.html (modified) (1 diff)
• templates/ScaleInputWidget.html (modified) (2 diffs)
• templates/StringInputWidget.html (modified) (1 diff)
• templates/TextInputWidget.html (modified) (1 diff)

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"] : []});
-            }
         }
     });

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

@@ -1 +1 @@
 define([
-    "../../../widgets/_ComplexValueWidget",
+    "dijit/_Container",
+    "dijit/_TemplatedMixin",
+    "dijit/_WidgetBase",
+    "dijit/_WidgetsInTemplateMixin",
     "dojo/_base/declare",
     "dojo/text!./templates/NumberInputWidget.html"
-], function(_ComplexValueWidget, declare, template) {
-    return declare([_ComplexValueWidget],{
+], function(_Container, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, declare, template) {
+    return declare([_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,_Container],{
+        templateString: template,
         text: '',
-        maxLength: null,
-        templateString: template,
         startup: function() {
+            if ( this._started ) { return; }
+            this.inherited(arguments);
+
             var constraints = {};
-            if ( this.min !== null && !isNaN(this.min) ) {
+            if ( this.min && !isNaN(this.min) ) {
                 constraints.min = this.min;
             }
-            if ( this.max !== null && !isNaN(this.max) ) {
+            if ( this.max && !isNaN(this.max) ) {
                 constraints.max = this.max;
             }
-            if ( this.places !== null && !isNaN(this.places) ) {
+            if ( this.places && !isNaN(this.places) ) {
                 constraints.places = this.places;
             }
             this.numberBox.set('constraints', constraints);
-        },
-        _getValueAttr: function() {
-            return this.numberBox.get('value');
-        },
-        _setValueAttr: function(value) {
-            return this.numberBox.set('value', value);
         }
     });

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

@@ -1 +1 @@
 define([
-    "../../../widgets/_ComplexValueWidget",
+    "dijit/_Container",
+    "dijit/_TemplatedMixin",
+    "dijit/_WidgetBase",
+    "dijit/_WidgetsInTemplateMixin",
     "dijit/form/RadioButton",
     "dojo/_base/array",
@@ -8 +11 @@
     "dojo/dom-construct",
     "dojo/text!./templates/ScaleInputWidget.html"
-], function(_ComplexValueWidget, RadioButton, array, declare, lang, domAttr, domConstruct, template) {
-    return declare([_ComplexValueWidget],{
+], function(_Container, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, RadioButton, array, declare, lang, domAttr, domConstruct, template) {
+    return declare([_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,_Container],{
         templateString: template,
         baseClass: "qedScaleWidget",
-        min: 0,
-        max: 0,
-        minLabel: "",
-        maxLabel: "",
-        naLabel: null,
-        items: null,
-        value: null,
-        constuctor: function() {
-            this.items = [];
-            this.value = {};
-        },
         startup: function() {
             if ( this._started ) { return; }
@@ -42 +34 @@
         },
         _renderItems: function() {
-            array.forEach(this.items, function(item,index) {
+            array.forEach(this.items, function(item) {
                 var tr = domConstruct.create("tr", {}, this.itemsNode);
                 var td;
@@ -57 +49 @@
                     td = domConstruct.create("td", {}, tr);
                     radio = new RadioButton({
-                        name: index.toString(),
+                        name: this.code+item.subcode,
                         value: i.toString()
                     });
@@ -69 +61 @@
                     td = domConstruct.create("td", {}, tr);
                     radio = new RadioButton({
-                        name: index.toString(),
+                        name: this.code+item.subcode,
                         value: "n/a"
                     });

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

@@ -1 +1 @@
 define([
-    "../../../widgets/_ComplexValueWidget",
+    "dijit/_Container",
+    "dijit/_TemplatedMixin",
+    "dijit/_WidgetBase",
+    "dijit/_WidgetsInTemplateMixin",
     "dojo/_base/declare",
     "dojo/text!./templates/StringInputWidget.html"
-], function(_ComplexValueWidget, declare, template) {
-    return declare([_ComplexValueWidget],{
-        text: '',
+], function(_Container, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, declare, template) {
+    return declare([_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,_Container],{
         templateString: template,
-        _getValueAttr: function() {
-            return this.textBox.get('value');
-        },
-        _setValueAttr: function(value) {
-            return this.textBox.set('value', value);
-        }
+        text: ''
     });
 });

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

@@ -1 +1 @@
 define([
-    "../../../widgets/_ComplexValueWidget",
+    "dijit/_Container",
+    "dijit/_TemplatedMixin",
+    "dijit/_WidgetBase",
+    "dijit/_WidgetsInTemplateMixin",
     "dojo/_base/declare",
     "dojo/text!./templates/TextInputWidget.html"
-], function(_ComplexValueWidget, declare, template) {
-    return declare([_ComplexValueWidget],{
+], function(_Container, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, declare, template) {
+    return declare([_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,_Container],{
+        templateString: template,
         text: '',
-        maxLength: null,
-        templateString: template,
         startup: function() {
+            if ( this._started ) { return; }
+            this.inherited(arguments);
+
             if ( this.maxLength ) {
                 this.textArea.set('maxLength', this.maxLength);
             }
-        },
-        _getValueAttr: function() {
-            return this.textArea.get('value');
-        },
-        _setValueAttr: function(value) {
-            return this.textArea.set('value', value);
         }
     });

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

@@ -1 @@
-<form>
-</form>
+<div>
+</div>

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

@@ -1 @@
-<form>
+<div>
   <p>${text}</p>
-  <div class="qedField" data-dojo-attach-point="numberBox" data-dojo-type="dijit/form/NumberTextBox" name="text"></div>
-</form>
+  <div class="qedField"
+       data-dojo-attach-point="numberBox"
+       data-dojo-type="dijit/form/NumberTextBox"
+       name="${code}${subcode}"></div>
+</div>

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

@@ -1 @@
-<form class="${baseClass}">
+<div class="${baseClass}">
   <table>
     <thead>
@@ -12 +12 @@
     </tbody>
   </table>
-</form>
+</div>

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

@@ -1 @@
-<form>
+<div>
   <p>${text}</p>
-  <div data-dojo-attach-point="textBox" data-dojo-type="dijit/form/TextBox" name="text"></div>
-</form>
+  <div data-dojo-type="dijit/form/TextBox"
+       name="${code}${subcode}"></div>
+</div>

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

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