Ignore:
Timestamp:
03/11/14 22:45:58 (11 years ago)
Author:
hendrikvanantwerpen
Message:
  • Added subcodes to schema and config widgets.
  • Disallow empty strings in schema and strip objects before sending them to the server.
  • Finally managed proper change events in lists and complexvalues.
Location:
Dev/trunk/src/client/qed-client/model/widgets
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • Dev/trunk/src/client/qed-client/model/widgets/SurveyRunWidget.js

    r494 r506  
    1515        _getValueAttr: function() {
    1616            var value = this.inherited(arguments);
    17             if ( !value.startDate ) { delete value.startDate; }
    18             if ( !value.endDate ) { delete value.endDate; }
    1917            value.respondentCanDeleteOwnResponse =
    2018                value.respondentCanDeleteOwnResponse.length > 0;
  • Dev/trunk/src/client/qed-client/model/widgets/questions/MultipleChoiceInputConfigWidget.js

    r494 r506  
    2020    return declare([_ComplexValueWidget],{
    2121        type: 'MultipleChoiceInput',
     22        baseClass: 'qedMultipleChoiceWidget',
    2223        templateString: template,
    2324        buildRendering: function() {
  • Dev/trunk/src/client/qed-client/model/widgets/questions/NumberInputConfigWidget.js

    r493 r506  
    1010            var value = this.inherited(arguments);
    1111            value.type = this.type;
    12             if ( !value.min ) { delete value.min; }
    13             if ( !value.max ) { delete value.max; }
    14             if ( !value.places ) { delete value.places; }
    1512            return value;
    1613        }
  • Dev/trunk/src/client/qed-client/model/widgets/questions/TextInputConfigWidget.js

    r493 r506  
    1010            var value = this.inherited(arguments);
    1111            value.type = this.type;
    12             if ( !value.maxLength ) { delete value.maxLength; }
    1312            return value;
    1413        }
  • Dev/trunk/src/client/qed-client/model/widgets/questions/templates/HeaderConfigWidget.html

    r461 r506  
    11<form>
    22  <label for="text" class="qedLabel">Text</label>
    3   <div class="qedField" data-dojo-type="dijit/form/TextBox" name="text"></div>
     3  <div class="qedField" data-dojo-type="dijit/form/ValidationTextBox"
     4       data-dojo-props="'required': true, placeHolder:'Text'"
     5       name="text"></div>
    46</form>
  • Dev/trunk/src/client/qed-client/model/widgets/questions/templates/MultipleChoiceInputConfigRowWidget.html

    r493 r506  
    11<form>
     2    <div data-dojo-type="dijit/form/ValidationTextBox"
     3         data-dojo-props="required: true, placeholder: 'Subcode'"
     4       class="subcode"
     5         name="subcode"></div>
    26  <div data-dojo-type="dijit/form/ValidationTextBox"
    3        name="text" required="required"
    4        data-dojo-attach-point="textBox"></div>
     7       data-dojo-props="required: true, placeholder: 'Item text'"
     8       name="text"></div>
    59  <div data-dojo-type="dijit/form/Button"
    610       data-dojo-attach-event="onClick:onDestroy">X</div>
  • Dev/trunk/src/client/qed-client/model/widgets/questions/templates/MultipleChoiceInputConfigWidget.html

    r493 r506  
    1 <form>
     1<form class="${baseClass}">
    22  <div>
    33    <label class="qedLabel" for="allowMultiple">Allow multiple</label>
  • Dev/trunk/src/client/qed-client/model/widgets/questions/templates/NumberInputConfigWidget.html

    r461 r506  
    11<form>
     2  <div>
     3    <label class="qedLabel" for="text">Subcode</label>
     4    <div class="qedField"
     5         data-dojo-attach-point="subcodeBox"
     6         data-dojo-type="dijit/form/ValidationTextBox"
     7         data-dojo-props="required: true, placeholder: 'Subcode'"
     8         name="subcode"></div>
     9  </div>
    210  <div>
    311    <label class="qedLabel" for="text">Item/Question Text</label>
  • Dev/trunk/src/client/qed-client/model/widgets/questions/templates/ScaleInputConfigRowWidget.html

    r443 r506  
    11<tr>
     2  <th class="subcode">
     3    <div data-dojo-type="dijit/form/ValidationTextBox"
     4         data-dojo-props="required: true, placeholder: 'Subcode'"
     5         name="subcode"></div>
     6  </th>
    27  <th class="item">
    38    <div name="text"
     
    611         data-dojo-props="placeholder: 'Item/Question text'"></div>
    712  </th>
    8   <th class="min">
     13  <th class="minLabel">
    914    <div name="minLabel"
    1015         required="required"
     
    1318  </th>
    1419  <td>
    15     <div disabled="disabled"
     20    <div disabled="disabled" class="min"
    1621         data-dojo-type="dijit/form/RadioButton"></div>
    1722  </td>
    1823  <td>...</td>
    1924  <td>
    20     <div disabled="disabled"
     25    <div disabled="disabled" class="max"
    2126         data-dojo-type="dijit/form/RadioButton"></div>
    2227  </td>
    23   <th class="max">
     28  <th class="maxLabel">
    2429    <div name="maxLabel"
    2530         required="required"
  • Dev/trunk/src/client/qed-client/model/widgets/questions/templates/ScaleInputConfigWidget.html

    r461 r506  
    33    <thead>
    44      <tr>
     5        <th class="subcode"></th>
    56        <th class="item"></th>
    67        <th data-dojo-attach-point="minLabelNode"
    7             class="min">
     8            class="minLabel">
    89          <div name="minLabel"
    910               data-dojo-type="dijit/form/TextBox"
    1011               data-dojo-props="placeholder: 'Minimum label'"></div>
    1112        </th>
    12         <th data-dojo-attach-point="minNode">
     13        <th class="min" data-dojo-attach-point="minNode">
    1314          <div name="min"
    1415               data-dojo-type="dijit/form/NumberTextBox"
     
    1617        </th>
    1718        <th>...</th>
    18         <th data-dojo-attach-point="maxNode">
     19        <th class="max" data-dojo-attach-point="maxNode">
    1920          <div name="max"
    2021               data-dojo-type="dijit/form/NumberTextBox"
    2122               data-dojo-props="required: true, placeholder: 'Maximum value'"></div>
    2223        </th>
    23         <th data-dojo-attach-point="maxLabelNode" class="max">
     24        <th data-dojo-attach-point="maxLabelNode" class="maxLabel">
    2425          <div name="maxLabel"
    2526               data-dojo-type="dijit/form/TextBox"
     
    3738    <tbody data-dojo-attach-point="itemsNode">
    3839    </tbody>
    39     <tbody>
    40       <tr>
    41         <td class="item">
    42           <button data-dojo-type="dijit/form/Button"
    43                   data-dojo-attach-event="onClick:onAddNewItem">Click to add item</button>
    44         </td>
    45       </tr>
    46     </tbody>
    4740  </table>
     41<div>
     42  <button data-dojo-type="dijit/form/Button"
     43          data-dojo-attach-event="onClick:onAddNewItem">
     44    Click to add item</button>
     45</div>
    4846</form>
  • Dev/trunk/src/client/qed-client/model/widgets/questions/templates/StringInputConfigWidget.html

    r461 r506  
    11<form>
    2   <label class="qedLabel" for="text">Item/Question Text</label>
    3   <div class="qedField" data-dojo-attach-point="textBox" data-dojo-type="dijit/form/TextBox" data-dojo-props="placeholder: 'Item/Question Text'" name="text"></div>
     2  <div>
     3    <label class="qedLabel" for="text">Subcode</label>
     4    <div class="qedField"
     5         data-dojo-attach-point="subcodeBox"
     6         data-dojo-type="dijit/form/ValidationTextBox"
     7         data-dojo-props="required: true, placeholder: 'Subcode'"
     8         name="subcode"></div>
     9  </div>
     10  <div>
     11    <label class="qedLabel" for="text">Item/Question Text</label>
     12    <div class="qedField"
     13         data-dojo-attach-point="textBox"
     14         data-dojo-type="dijit/form/TextBox"
     15         data-dojo-props="placeholder: 'Item/Question Text'"
     16         name="text"></div>
     17  </div>
    418</form>
  • Dev/trunk/src/client/qed-client/model/widgets/questions/templates/TextInputConfigWidget.html

    r461 r506  
    11<form>
     2  <div>
     3    <label class="qedLabel" for="text">Subcode</label>
     4    <div class="qedField"
     5         data-dojo-attach-point="subcodeBox"
     6         data-dojo-type="dijit/form/ValidationTextBox"
     7         data-dojo-props="required: true, placeholder: 'Subcode'"
     8         name="subcode"></div>
     9  </div>
    210  <div>
    311    <label class="qedLabel" for="text">Item/Question Text</label>
Note: See TracChangeset for help on using the changeset viewer.