Changeset 442 for Dev/trunk/client/qed/model

Timestamp:

05/02/13 13:13:13 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Enable validation on all fields of question.

Location:

Dev/trunk/client/qed/model/widgets

Files:

• QuestionEditorPreviewItem.js (modified) (3 diffs)
• QuestionEditorToolkit.js (modified) (4 diffs)
• templates/QuestionEditorToolkit.html (modified) (1 diff)

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

@@ -55 +55 @@
             return !this._editing || this.innerWidget.validate();
         },
+        focus: function() {
+            if ( this._editing ) {
+                this.innerWidget.focus();
+            }
+        },
         showView: function() {
             if ( this._editing ) {
@@ -74 +79 @@
                 this.showEdit();
             }
-            evt && event.stop(evt);
+            if ( evt ) { event.stop(evt); }
             return false;
         },
@@ -141 +146 @@
                 }
             }
-            evt && event.stop(evt);
+            if ( evt ) { event.stop(evt); }
             return false;
         }

Dev/trunk/client/qed/model/widgets/QuestionEditorToolkit.js

@@ -20 +20 @@
 
         templateString: template,
-        _list: null,
+        _categoryList: null,
         _categorySelect: null,
         _categoryStore: null,
@@ -65 +65 @@
         },
 
-        postCreate: function(){
+        buildRendering: function() {
             this.inherited(arguments);
+
+            this._categoryList = new CategoryListView({
+                name: "categories"
+            }).placeAt(this.categoryListNode);
+
+            this._categoryStore = new Memory({data: [] });
+            this._categorySelect = new ComboBox( {
+                store: this._categoryStore,
+                searchAttr: "id"
+            }, this.categoryBoxNode);
+
+            this._topicStore = new Memory( {data: [] });
+            this._topicSelect = new ComboBox({
+                name: "topic",
+                store: this._topicStore,
+                searchAttr: "id"
+            }, this.topicBoxNode);
+
             var creator = lang.hitch(this,"_creator");
             this.contentSource = new Source(this.ToolkitContentSourceNode, {
@@ -85 +103 @@
             this.inputsSource.insertNodes(false, this._inputsItems);
         },
-        _setValueAttr: function(question) {
-            this._setupListView();
-            this._setupCategories();
-            this._setupTopic(question.topic);
-            this.propertiesForm.set('value', question);
-            this._list.set('value', question.categories);
+        startup: function() {
+            if ( this._started ) { return; }
+            this.inherited(arguments);
+
+            store.query("_design/questions/_view/all", {reduce:true, group:false, group_level:1})
+            .forPairs(lang.hitch(this, function(value, key) {
+                this._categoryStore.put({ id: key[0] });
+            }));
+
+            store.query("_design/questions/_view/all_topics", {reduce:true, group:true})
+            .forPairs(lang.hitch(this, function(value, key) {
+                this._topicStore.put({ id: key });
+            }));
         },
-        _getValueAttr: function() {
-            var value = this.propertiesForm.get('value');
-            value.categories = this._list.get('value');
-            return value;
-        },
-        onCategoryAdd: function() {
-            this._addCategory(this._categorySelect.get('displayedValue')); 
+        _onCategoryAdd: function() {
+            this._categoryList.appendItem(this._categorySelect.get('displayedValue')); 
             this._categorySelect.reset();
         },
@@ -122 +142 @@
                 type: ["questionContent"]
             };
-        },
-        _setupListView: function() {
-            this._list = new CategoryListView({
-            }).placeAt(this.listNode);
-            this._list.startup();                
-        },
-        _setupCategories: function() {
-            this._categoryStore = new Memory({data: [] });
-            store.query("_design/questions/_view/all", {reduce:true, group:false, group_level:1})
-            .forPairs(lang.hitch(this, function(value, key) {
-                this._categoryStore.put({ id: key[0] });
-            }));
-            this._categorySelect = new ComboBox( {
-                name: "categories",
-                store: this._categoryStore,
-                searchAttr: "id"
-            }, this.categoriesBoxNode);
-        },
-        _setupTopic: function(topic) {
-            this._topicStore = new Memory( {data: [] });
-            store.query("_design/questions/_view/all_topics", {reduce:true, group:true})
-            .forPairs(lang.hitch(this, function(value, key) {
-                this._topicStore.put({ id: key });
-            }));
-            this._topicSelect = new ComboBox( {
-                name: "topic",
-                store: this._topicStore,
-                searchAttr: "id",
-                value: topic
-            }, this.topicBoxNode);
-        },
-        _addCategory: function(item) {
-            this._list.appendItem(item);
         }
 

Dev/trunk/client/qed/model/widgets/templates/QuestionEditorToolkit.html

@@ -1 +1 @@
 <div>
-        <div data-dojo-type="dojox/widget/TitleGroup">
+        <div data-dojo-type="qed/widgets/TitleGroup">
                 <div data-dojo-type="dijit/TitlePane" class="orange" data-dojo-props="open:true" title="Properties" data-dojo-props="iconClass:'rftIcon rftIconProperties'">
-            <div data-dojo-type="dijit/form/Form" data-dojo-attach-point="propertiesForm">
-                                <fieldset class="align">
-                                        <label>Title:</label><input data-dojo-type="dijit/form/TextBox" name="title"/>
-                                        <label>Code:</label><input data-dojo-type="dijit/form/TextBox" name= "code"/>
-                                        <label>Categories:</label>
-                                        <div data-dojo-attach-point="listNode" class="rftLineListView"></div> 
-                                        <div data-dojo-attach-point="categoriesBoxNode"></div>
-                                        <button class="inheritBgColor" data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:onCategoryAdd" data-dojo-props="baseClass:'rftBlockButton', iconClass: 'rftIcon rftIconPlus'">Add</button><br/>
-                                        <label>Topic:</label>
-                                        <div data-dojo-attach-point="topicBoxNode"></div>
-                                        <label>Description:</label><textarea data-dojo-type="dijit/form/Textarea" name="description"></textarea>
-                                </fieldset>
-                        </div>
+            <fieldset class="align">
+                <label>Title:</label><input data-dojo-type="dijit/form/ValidationTextBox" required="required" name="title"/>
+                <label>Code:</label><input data-dojo-type="dijit/form/ValidationTextBox" required="required" name="code"/>
+                <label>Categories:</label>
+                <div data-dojo-attach-point="categoryListNode" class="rftLineListView"></div> 
+                <div data-dojo-attach-point="categoryBoxNode"></div>
+                <button class="inheritBgColor" data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:_onCategoryAdd" data-dojo-props="baseClass:'rftBlockButton', iconClass: 'rftIcon rftIconPlus'">Add</button><br/>
+                <label>Topic:</label>
+                <div data-dojo-attach-point="topicBoxNode"></div>
+                <label>Description:</label><textarea data-dojo-type="dijit/form/Textarea" name="description"></textarea>
+            </fieldset>
                 </div>
 
                 <div data-dojo-type="dijit/TitlePane" title="Content" data-dojo-props="iconClass:'rftIcon rftIconPlus', open:false">
-                        <div data-dojo-attach-point="ToolkitContentSourceNode">
-                                
-                        </div>
+                        <div data-dojo-attach-point="ToolkitContentSourceNode"></div>
                 </div>
 
                 <div data-dojo-type="dijit/TitlePane" title="Inputs" data-dojo-props="iconClass:'rftIcon rftIconInput', open:false">
-                        <div data-dojo-attach-point="ToolkitInputsSourceNode">
-                                
-                        </div>
+                        <div data-dojo-attach-point="ToolkitInputsSourceNode"></div>
                 </div>
         </div>