Changeset 512 for Dev

Timestamp:

03/13/14 01:19:07 (11 years ago)

Author:

hendrikvanantwerpen

Message:

Small fixes fir urls and validation.

Location:

Dev/trunk/src/client/qed-client

Files:

• model/widgets/QuestionEditorPreviewItem.js (modified) (1 diff)
• model/widgets/SurveyRunWidget.js (modified) (1 diff)
• model/widgets/SurveySummary.js (modified) (1 diff)
• model/widgets/templates/SurveyWidget.html (modified) (1 diff)
• pages/survey.js (modified) (4 diffs)
• widgets/_ComplexValueMixin.js (modified) (3 diffs)

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

@@ -149 +149 @@
             if ( this.innerWidget !== null ) {
                 if ( this._editing === true ) {
-                    this._onChange();
+                    this.triggerOnChange();
                 }
                 this.removeChild(this.innerWidget);

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

@@ -8 +8 @@
         templateString: template,
         postCreate: function() {
+            this.inherited(arguments);
             var endDateBox = this.endDateBox;
             this.own(this.startDateBox.on('change', function(value){
                 endDateBox.constraints.min  = value;
             }));
+        },
+        startup: function() {
+            this.inherited(arguments);
         },
         _getValueAttr: function() {

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

@@ -18 +18 @@
         _setValueAttr: function(survey) {
             this.titleNode.innerHTML = survey.title || "";
-            domAttr.set(this.titleNode, "href", survey && surveys.getObjectPath(survey));
+            domAttr.set(this.titleNode, "href",
+                        survey && ('#!'+surveys.getObjectPath(survey)));
             this.descriptionNode.innerHTML = survey.description || "";
             this.questionsNode.innerHTML = survey.questions.length;

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

@@ -1 +1 @@
 <form class="${baseClass}">
     <label for="title">Title</label>
-    <input data-dojo-type="dijit/form/TextBox" name="title"/><br/>
+    <input data-dojo-type="dijit/form/ValidationTextBox"
+           data-dojo-props="required: true"
+           name="title"/><br/>
     <label for="description">Description</label>
     <textarea data-dojo-type="dijit/form/Textarea" name="description"></textarea><br/>

Dev/trunk/src/client/qed-client/pages/survey.js

@@ -5 +5 @@
     "../model/widgets/TabbedQuestionBrowser",
     "./_ObjectPage",
+    "dojo/Deferred",
     "dojo/_base/array",
     "dojo/_base/declare",
@@ -12 +13 @@
     "require",
     "dojo/text!./templates/survey.html"
-], function(Router, surveys, QuestionListView, TabbedQuestionBrowser, _ObjectPage, array, declare, event, lang, when, require, template) {
+], function(Router, surveys, QuestionListView, TabbedQuestionBrowser, _ObjectPage, Deferred, array, declare, event, lang, when, require, template) {
     return declare([_ObjectPage],{
         contextRequire: require,
@@ -77 +78 @@
         },
         _handleQuestionsChange: function() {
-            this.object.questions = this.questionList.get('value');
+            this._updateObject();
             this.markDirty();
             this._refresh();
         },
         _handlePropertiesChange: function() {
-            lang.mixin(this.object, this.propertiesForm.get('value').survey);
+            this._updateObject();
             this.markDirty();
             this._refresh();
             this.layout();
+        },
+        _updateObject: function() {
+            this._isValid = this.propertiesForm.validate();
+            lang.mixin(this.object, this.propertiesForm.get('value').survey);
+            this.object.questions = this.questionList.get('value');
+            return this._isValid;
         },
         _onSave: function(evt) {
@@ -109 +116 @@
             });
         },
+        _save: function() {
+            if ( this._updateObject ) {
+                return this.inherited(arguments);
+            } else {
+                return new Deferred().reject({error:"Please correct invalid values."});
+            }
+        },
         markDirty: function() {
-            this.saveBtn.set('disabled',false);
-            this.saveAndCloseBtn.set('disabled',false);
+            this.saveBtn.set('disabled',!this._isValid);
+            this.saveAndCloseBtn.set('disabled',!this._isValid);
             this.discardBtn.set('label','Discard & Close');
             this.inherited(arguments);

Dev/trunk/src/client/qed-client/widgets/_ComplexValueMixin.js

@@ -46 +46 @@
             });
         },
-        // Yuk, this function is taken directly from _FromMixin only
-        // to add the priorityChange parameter
         _getValueAttr: function() {
             this.value = this.inherited(arguments);
             return this.value;
         },
+        // Yuk, _setValueAttr is taken directly from _FromMixin only
+        // to add the priorityChange parameter
                 _setValueAttr: function(obj, priorityChange) {
             this.value = obj;
@@ -99 +99 @@
         _handleChange: function(evt) {
             if ( evt.target !== this.domNode ) {
-                this._onChange();
+                this.triggerOnChange();
                 if ( evt ) { event.stop(evt); }
                 return false;
@@ -120 +120 @@
             return false;
         },
-        _onChange: function() {
+        triggerOnChange: function() {
             if ( this._onChangeActive &&
                  !(this.readOnly || this.disabled) ) {