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

Timestamp:

03/19/14 21:33:13 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Allow empty subcodes.
• Use HTTPResult exclusively on server (no more q).
• Set readonly & disabled on ourselves as well in _ComplexValueMixin
• Split server into several modules.
• Check codes on the variable level, not question level.
• We can add modules in design documents now.

Location:

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

Files:

• classes/_Class.js (modified) (1 diff)
• widgets/QuestionEditorPreviewItem.js (modified) (1 diff)
• widgets/questions/ScaleInputWidget.js (modified) (2 diffs)
• widgets/questions/templates/MultipleChoiceInputConfigWidget.html (modified) (1 diff)
• widgets/questions/templates/NumberInputConfigWidget.html (modified) (1 diff)
• widgets/questions/templates/ScaleInputConfigRowWidget.html (modified) (1 diff)
• widgets/questions/templates/StringInputConfigWidget.html (modified) (1 diff)
• widgets/questions/templates/TextInputConfigWidget.html (modified) (1 diff)

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

@@ -71 +71 @@
             } else if ( lang.isObject(obj) ) {
                 objectFuns.forEach(obj,function(v,prop){
-                    if ( v === null ||
-                         v === "" ||
-                         (typeof v === "number" && isNaN(v)) ) {
+                    if ( ( v === null ||
+                           v === "" ||
+                           (typeof v === "number" && isNaN(v)) ) && 
+                         prop !== 'subcode' ) // HACK : this hardcoded exclusion for subcode is quite nasty
+                    {
                         delete obj[prop];
                     } else {

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

@@ -149 +149 @@
             if ( this.innerWidget !== null ) {
                 if ( this._editing === true ) {
-                    this._onChange();
-                    // how to force event on widget here?
+                    // because the widget doesn't generate an event
+                    // unless it loses focus, we set the value here
+                    // just to be sure not to lose any user input
+                    this._setValueInternal(this.innerWidget.get('value'));
                 }
                 this.removeChild(this.innerWidget);

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

@@ -22 +22 @@
             this.minNode.innerHTML = this.minLabel || "";
             this.maxNode.innerHTML = this.maxLabel || "";
-            if ( this.naLabel !== null ) {
+            if ( this.naLabel ) {
                 this.naNode.innerHTML = this.naLabel;
             }
@@ -56 +56 @@
                     className: 'max'
                 }, tr);
-                if ( this.naLabel !== null && this.naLabel !== "" ) {
+                if ( this.naLabel ) {
                     td = domConstruct.create("td", {}, tr);
                     radio = new RadioButton({

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

@@ -3 +3 @@
     <label class="qedLabel" for="subcode">Subcode</label>
     <input data-dojo-type="dijit/form/ValidationTextBox"
-           data-dojo-props="required:true,placeHolder:'Subcode'"
+           data-dojo-props="placeHolder:'Subcode'"
            class="subcode"
            name="subcode"/>

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

@@ -5 +5 @@
          data-dojo-attach-point="subcodeBox"
          data-dojo-type="dijit/form/ValidationTextBox"
-         data-dojo-props="required: true, placeholder: 'Subcode'"
+         data-dojo-props="placeholder: 'Subcode'"
          name="subcode"></div>
   </div>

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

@@ -2 +2 @@
   <th class="subcode">
     <div data-dojo-type="dijit/form/ValidationTextBox"
-         data-dojo-props="required: true, placeholder: 'Subcode'"
+         data-dojo-props="placeholder: 'Subcode'"
          name="subcode"></div>
   </th>

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

@@ -5 +5 @@
          data-dojo-attach-point="subcodeBox"
          data-dojo-type="dijit/form/ValidationTextBox"
-         data-dojo-props="required: true, placeholder: 'Subcode'"
+         data-dojo-props="placeholder: 'Subcode'"
          name="subcode"></div>
   </div>

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

@@ -5 +5 @@
          data-dojo-attach-point="subcodeBox"
          data-dojo-type="dijit/form/ValidationTextBox"
-         data-dojo-props="required: true, placeholder: 'Subcode'"
+         data-dojo-props="placeholder: 'Subcode'"
          name="subcode"></div>
   </div>