Changeset 461 for Dev/trunk/src/client/qed-client/model/widgets

Timestamp:

06/10/13 01:07:16 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Save answers, improved response page and question widgets.

• Warn if _ComplexValueMixin is not pout on a form element, to prevent 'name' collisions. Changed all depending widgets to <form>'s.
• Fixed names for question widgets to actually save answers.
• Fixed and improved response page.
• Fixed names in MultipleChoice? widget, which behaves different for radio and check.

Location:

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

Files:

• SurveyRenderWidget.js (modified) (1 diff)
• questions/MultipleChoiceInputWidget.js (modified) (2 diffs)
• questions/TextInputWidget.js (modified) (1 diff)
• questions/templates/HeaderConfigWidget.html (modified) (1 diff)
• questions/templates/MultipleChoiceInputConfigRowWidget.html (modified) (1 diff)
• questions/templates/MultipleChoiceInputConfigWidget.html (modified) (2 diffs)
• questions/templates/MultipleChoiceInputWidget.html (modified) (1 diff)
• questions/templates/NumberInputConfigWidget.html (modified) (2 diffs)
• questions/templates/NumberInputWidget.html (modified) (1 diff)
• questions/templates/ScaleInputConfigWidget.html (modified) (2 diffs)
• questions/templates/ScaleInputWidget.html (modified) (2 diffs)
• questions/templates/StringInputConfigWidget.html (modified) (1 diff)
• questions/templates/StringInputWidget.html (modified) (1 diff)
• questions/templates/TextConfigWidget.html (modified) (1 diff)
• questions/templates/TextInputConfigWidget.html (modified) (2 diffs)
• questions/templates/TextInputWidget.html (modified) (1 diff)
• templates/SurveyRenderWidget.html (modified) (1 diff)
• templates/SurveyRunWidget.html (modified) (2 diffs)
• templates/SurveyWidget.html (modified) (1 diff)

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

@@ -22 +22 @@
             this.survey = survey;
             var f = new QuestionWidgetFactory();
-            array.forEach(Survey.Questions.get(this.survey),function(question){
-                array.forEach(question.content || [],function(item,index){
+            array.forEach(Survey.Questions.get(this.survey),function(question,question_index){
+                array.forEach(question.content || [], function(item,item_index){
                     // The dot causes values to be grouped in an object!
-                    item.code = question.code.toString()+'.'+index.toString();
                     var w = f.createViewWidget(item);
                     if ( w !== null ) {
+                        w.name = question_index.toString()+'/'+question.code.toString()+'.'+item_index.toString();
                         w.placeAt(this.domNode);
                     }

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

@@ -10 +10 @@
     return declare([_ComplexValueWidget],{
         templateString: template,
+        allowMultiple: false,
         startup: function() {
             if ( this._started ) { return; }
@@ -20 +21 @@
                 }, this.domNode, "last");
                 var input = new Ctor({
-                    name: index.toString()
+                    name: this.allowMultiple === true ? index.toString() : 'choice',
+                    value: item.text
                 }).placeAt(div);
                 var label = domConstruct.create("label",{
+                    for: input.id,
                     innerHTML: item.text
                 }, div);
             }, this);
+        },
+        _getValueAttr: function() {
+            var value = this.inherited(arguments);
+            if ( this.allowMultiple === true ) {
+                return value;
+            } else {
+                return value.choice;
+            }
+        },
+        _setValueAttr: function(value) {
+            var inherited = this.getInherited(arguments);
+            if ( this.allowMultiple === true ) {
+                inherited.call(this,value);
+            } else {
+                inherited.call(this,{choice:value});
+            }
         }
     });

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

@@ -14 +14 @@
         },
         _getValueAttr: function() {
-            return this.textBox.get('value');
+            return this.textArea.get('value');
         },
         _setValueAttr: function(value) {
-            return this.textBox.set('value', value);
+            return this.textArea.set('value', value);
         }
     });

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

@@ -1 @@
-<div>
+<form>
   <label for="text" class="qedLabel">Text</label>
   <div class="qedField" data-dojo-type="dijit/form/TextBox" name="text"></div>
-</div>
+</form>

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

@@ -1 @@
-<div>
+<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>
+</form>

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

@@ -1 @@
-<div>
+<form>
   <div>
     <label class="qedLabel" for="allowMultiple">Allow multiple</label>
@@ -7 +7 @@
   </div>
   <div data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:onAddItem">Add item</div>
-</div>
+</form>

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

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

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

@@ -1 @@
-<div>
+<form>
   <div>
     <label class="qedLabel" for="text">Item/Question Text</label>
@@ -16 +16 @@
     <div class="qedField" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props="constraints:{ min: 0 }" name="places"></div>
   </div>
-</div>
+</form>

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

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

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

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

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

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

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

@@ -1 @@
-<div>
+<form>
   <label class="qedLabel" for="text">Item/Question Text</label>
   <div class="qedField" data-dojo-attach-point="textBox" data-dojo-type="dijit/form/TextBox" data-dojo-props="placeholder: 'Item/Question Text'" name="text"></div>
-</div>
+</form>

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

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

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

@@ -1 @@
-<div>
+<form>
   <label for="text" class="qedLabel">Text</label>
   <textarea class="qedField" data-dojo-type="dijit/form/Textarea" name="text"></textarea>
-</div>
+</form>

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

@@ -1 @@
-<div>
+<form>
   <div>
     <label class="qedLabel" for="text">Item/Question Text</label>
@@ -8 +8 @@
     <div class="qedField" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props="placeholder: 'Maximum length', constraints: { min: 0 }" name="maxLength"></div>
   </div>
-</div>
+</form>

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

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

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

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

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

@@ -1 @@
-<div class="${baseClass}">
+<form class="${baseClass}">
 
     <div>
@@ -24 +24 @@
     </div>
 
-</div>
+</form>

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

@@ -1 @@
-<fieldset class="${baseClass}">
+<form class="${baseClass}">
     <label for="title">Title</label>
     <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/>
-</fieldset>
+</form>