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

Timestamp:

06/09/13 17:27:20 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Improve SurveyRun? form and drop Fieldsets as widgets.

• Improved console message on Page change fail.
• Renamed some widgets, dropped having Fieldset widgets.
• Put constraint that survey run start date cannot be before end date.
• Link to survey from survey summary,

Location:

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

Files:

• SurveyRenderWidget.js (copied) (copied from Dev/trunk/src/client/qed-client/model/widgets/SurveyWidget.js) (1 diff)
• SurveyRunWidget.js (moved) (moved from Dev/trunk/src/client/qed-client/model/widgets/SurveyRunFieldset.js) (1 diff)
• SurveySummary.js (modified) (2 diffs)
• SurveyWidget.js (moved) (moved from Dev/trunk/src/client/qed-client/model/widgets/SurveyFieldset.js) (1 diff)
• templates/SurveyRenderWidget.html (copied) (copied from Dev/trunk/src/client/qed-client/model/widgets/templates/SurveyWidget.html)
• templates/SurveyRunWidget.html (moved) (moved from Dev/trunk/src/client/qed-client/model/widgets/templates/SurveyRunFieldset.html) (1 diff)
• templates/SurveySummary.html (modified) (1 diff)
• templates/SurveyWidget.html (moved) (moved from Dev/trunk/src/client/qed-client/model/widgets/templates/SurveyFieldset.html)

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

@@ -1 +1 @@
 define([
+    "../../widgets/_ComplexValueWidget",
     "../classes/Survey",
     "./questions/Factory",
-    "dijit/_Container",
-    "dijit/_TemplatedMixin",
-    "dijit/_WidgetBase",
-    "dijit/_WidgetsInTemplateMixin",
     "dojo/_base/array",
     "dojo/_base/declare",
     "dojo/dom-construct",
-    "dojo/text!./templates/SurveyWidget.html"
-], function(Survey, QuestionWidgetFactory, _Container, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, array, declare, domConstruct, template) {
-    return declare([_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,_Container],{
+    "dojo/text!./templates/SurveyRenderWidget.html"
+], function(_ComplexValueWidget, Survey, QuestionWidgetFactory, array, declare, domConstruct, template) {
+    return declare([_ComplexValueWidget],{
         templateString: template,
         survey: null,

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

@@ -1 +1 @@
 define([
-    'dojo/_base/declare',
-    'dijit/_Container',
-    'dijit/_WidgetBase',
-    'dijit/_TemplatedMixin',
-    'dijit/_WidgetsInTemplateMixin',
-    'dojo/text!./templates/SurveyRunFieldset.html'
-],function(declare,_Container,_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,template){
-    return declare([_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,_Container],{
+    "../../widgets/_ComplexValueWidget",
+    "dojo/_base/declare",
+    "dojo/date",
+    "dojo/text!./templates/SurveyRunWidget.html"
+], function(_ComplexValueWidget, declare, date, template) {
+    return declare([_ComplexValueWidget],{
         templateString: template,
-        baseClass: "rftSurveyRunFieldset"
+        postCreate: function() {
+            var endDateBox = this.endDateBox;
+            this.startDateBox.on('change', function(value){
+                endDateBox.constraints.min  = value;
+            });
+        }
     });
 });

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

@@ -1 +1 @@
 define([
-    'dojo/_base/declare',
-    'dijit/_WidgetBase',
-    'dijit/_TemplatedMixin',
-    'dojo/text!./templates/SurveySummary.html'
-],function(declare,_WidgetBase,_TemplatedMixin,template){
+    "../../store",
+    "../classes/Survey",
+    "dijit/_TemplatedMixin",
+    "dijit/_WidgetBase",
+    "dojo/_base/declare",
+    "dojo/dom-attr",
+    "dojo/text!./templates/SurveySummary.html"
+], function(store, Survey, _TemplatedMixin, _WidgetBase, declare, domAttr, template) {
     return declare([_WidgetBase,_TemplatedMixin],{
         templateString: template,
@@ -15 +18 @@
         },
         _setValueAttr: function(survey) {
-            this.titleNode.innerHTML = survey.title;
+            this.titleNode.innerHTML = Survey.DisplayTitle.get(survey);
+            var id = store.getIdentity(survey);
+            domAttr.set(this.titleNode, "href", id && ("#!/survey/"+id));
             this.descriptionNode.innerHTML = survey.description;
             this.questionsNode.innerHTML = (survey.questions || []).length;

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

@@ -1 +1 @@
 define([
-    'dojo/_base/declare',
-    'dijit/_Container',
-    'dijit/_WidgetBase',
-    'dijit/_TemplatedMixin',
-    'dijit/_WidgetsInTemplateMixin',
-    'dojo/text!./templates/SurveyFieldset.html'
-],function(declare,_Container,_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,template){
-    return declare([_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,_Container],{
-        templateString: template,
-        baseClass: "rftSurveyFieldset"
+    "../../widgets/_ComplexValueWidget",
+    "dojo/_base/declare",
+    "dojo/text!./templates/SurveyWidget.html"
+], function(_ComplexValueWidget, declare, template) {
+    return declare([_ComplexValueWidget],{
+        templateString: template
     });
 });

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

@@ -1 @@
-<fieldset class="${baseClass} qedFieldset">
+<div class="${baseClass}">
 
     <div>
-    <label for="mode" class="qedLabel">Description</label>
-    <textarea name="description" class="qedField" data-dojo-type="dijit/form/Textarea"></textarea>
+        <label for="mode" class="qedLabel">Description</label>
+        <textarea name="description" class="qedField" data-dojo-type="dijit/form/Textarea"></textarea>
     </div>
 
     <div>
-    <label for="startDate" class="qedLabel">Start date</label>
-    <input type="text" name="startDate" class="qedField" data-dojo-type="dijit/form/DateTextBox" data-dojo-attach-point="startDateBox" />
+        <label for="startDate" class="qedLabel">Start date</label>
+        <input type="text" name="startDate" class="qedField" data-dojo-type="dijit/form/DateTextBox" data-dojo-attach-point="startDateBox" />
     </div>
 
     <div>
-    <label for="endDate" class="qedLabel">End date</label>
-    <input type="text" name="endDate" class="qedField" data-dojo-type="dijit/form/DateTextBox" data-dojo-attach-point="endDateBox" />
+        <label for="endDate" class="qedLabel">End date</label>
+        <input type="text" name="endDate" class="qedField" data-dojo-type="dijit/form/DateTextBox" data-dojo-attach-point="endDateBox" />
     </div>
 
     <div>
-    <label for="mode" class="qedLabel">Mode</label>
-    <select name="mode" class="qedField" data-dojo-type="dijit/form/Select">
-        <option value="open" selected="selected">Open</option>
-        <option value="closed">Closed</option>
-    </select>
+        <label for="mode" class="qedLabel">Mode</label>
+        <select name="mode" class="qedField" data-dojo-type="dijit/form/Select">
+            <option value="open" selected="selected">Open</option>
+            <option value="closed">Closed</option>
+        </select>
     </div>
 
-</fieldset>
+</div>

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

@@ -1 @@
-<fieldset class="qedFieldset">
-    <legend>Survey</legend>
-    <div><div class="qedLabel">Title</div><div class="qedField" data-dojo-attach-point="titleNode"></div></div>
+<div>
+    <div><div class="qedLabel">Title</div><div class="qedField"><a data-dojo-attach-point="titleNode"></a></div></div>
     <div><div class="qedLabel">Description</div><div class="qedField" data-dojo-attach-point="descriptionNode"></div></div>
     <div><div class="qedLabel">Questions</div><div class="qedField" data-dojo-attach-point="questionsNode"></div></div>
-</fieldset>
+</div>