Changeset 288 for Dev/branches/rest-dojo-ui/client/rft/pages

Timestamp:

02/24/12 16:09:22 (13 years ago)

Author:

hendrikvanantwerpen

Message:

[Client] MultipleChoiceWidget? for editing multiple choice questions
[Client] Move templates to separate directories.
[Client] Created QuestionWidget? to edit complete questions.
[Client] Fixed startup race condition where parsing was started before all classes were loaded.

Location:

Dev/branches/rest-dojo-ui/client/rft/pages

Files:

• questions.html (modified) (1 diff)
• questions.js (modified) (6 diffs)

Dev/branches/rest-dojo-ui/client/rft/pages/questions.html

@@ -6 +6 @@
     <div data-dojo-type="dijit.Dialog" title="Question" data-rft-attach-point="questionDialog">
         <form data-dojo-type="dijit.form.Form" data-rft-attach-point="questionForm" data-rft-attach-event="onSubmit:onSaveQuestion">
-            <fieldset>
-                <input data-dojo-type="dijit.form.TextBox" name="uid" type="text" class="dijitHidden" />
-                <label for="code" class="loginLabel">Code</label>
-                <input data-dojo-type="dijit.form.TextBox" name="code" type="text" class="loginInput" />
-                <label for="question" class="loginLabel">Title</label>
-                <input data-dojo-type="dijit.form.TextBox" name="title" type="text" class="loginInput" />
-                <label for="question" class="loginLabel">Description</label>
-                <input data-dojo-type="dijit.form.Textarea" name="description" type="text" class="loginInput"/>
-                <label for="category" class="loginLabel">Category</label>
-                <input data-dojo-type="dijit.form.TextBox" name="category" type="text" class="loginInput" />
-            </fieldset>
-            <fieldset>
-                <div data-dojo-type="rft.ui.QuestionWidget" data-rft-attach-point="questionWidget" ></div>
-            </fieldset>
+            <div data-dojo-type="rft.ui.QuestionWidget" data-rft-attach-point="questionWidget"></div>
             <div style="float: right;">
                 <button type="button" data-dojo-type="dijit.form.Button" data-rft-attach-event="onClick:onCancelQuestion">Cancel</button>

Dev/branches/rest-dojo-ui/client/rft/pages/questions.js

@@ -1 +1 @@
 define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/array','dojo/_base/event',
-    'dojo/_base/Deferred','dojo/store/JsonRest','dijit/layout/ContentPane','dijit/TitlePane',
+    'dojo/_base/Deferred','dojo/dom-construct','dojo/store/JsonRest','dijit/layout/ContentPane','dijit/TitlePane',
     'rft/ui/_Page','rft/ui/LineWithActionsWidget'],
-    function(declare,lang,array,event,Deferred,JsonRest,ContentPane,TitlePane,_Page,LineWithActionsWidget) {
+    function(declare,lang,array,event,Deferred,domConstruct,JsonRest,ContentPane,TitlePane,_Page,LineWithActionsWidget) {
         return declare('rft.pages.questions',[_Page],{
             constructor: function() {
@@ -13 +13 @@
                     idProperty: 'uid'
                 });
-                this._refresh();
+                this._refresh(true);
             },
-            _refresh: function() {
+            _refresh: function(initial) {
                 Deferred.when( this._store.query() ).then(lang.hitch(this,function(results){
                     array.forEach(results,lang.hitch(this,'_addQuestion'));
+                    initial && this.accordion.selectChild(true);
                 }));
             },
@@ -50 +51 @@
                 var category = q.category || 'Unsorted';
                 var widgets = this.accordion.getChildren();
-                var containerWidget;
-                var lastIndex = 'last';
+                var containerWidget = null;
+                var placeNode = this.accordion.domNode;
+                var placePos = 'last';
                 array.some(widgets,lang.hitch(this,function(widget,idx) {
                     if ( widget.title == category ) {
@@ -57 +59 @@
                         return true;
                     } else if ( widget.title > category  ) {
-                        lastIndex = idx;
+                        placeNode = widget.domNode;
+                        placePos = "before";
                         return true;
                     }
@@ -67 +70 @@
                     });
                     containerWidget.startup();
-                    this.accordion.addChild(containerWidget,lastIndex);
+                    domConstruct.place(containerWidget.domNode,placeNode,placePos);
                 }
                 return containerWidget;
@@ -87 +90 @@
             _editQuestion: function(question) {
                 this.questionForm.reset();
-                this.questionForm.set('value',question);
                 this.questionWidget.set('value',question);
                 this.questionDialog.show();
             },
             onSaveQuestion: function(evt) {
-                var value = this.questionForm.get('value');
-                var subvalue = this.questionWidget.get('value');
-                lang.mixin(value,subvalue);
+                var value = this.questionWidget.get('value');
                 Deferred.when( this._store.put(value) )
                 .then(lang.hitch(this,function(){