Changeset 372

Timestamp:

07/23/12 17:03:47 (13 years ago)

Author:

jkraaijeveld

Message:

Started work on loading questions into the question editor if the already exist.

Location:

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

Files:

• pages/question.html (modified) (1 diff)
• pages/question.js (modified) (3 diffs)
• ui/AccordionList.js (modified) (1 diff)
• ui/QuestionEditorToolkit.js (modified) (1 diff)
• ui/templates/QuestionEditorToolkit.html (modified) (1 diff)

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

@@ -8 +8 @@
                 </div>
                 <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'left', design:'headline'" style="width: 300px;">
-                        
                         <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
                                 <div id="QuestionEditorToolkit"></div>

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

@@ -16 +16 @@
     function(declare, lang, Deferred, LineWithActionsWidget, store, _Page, api, content, registry, on, behavior, query){
         return declare('rft.pages.question', [_Page], {
-            object: null,
-            preview: null,
+            question: null,
+            _toolkit: null,
+            _preview: null,
             
             onVisit: function() {
@@ -23 +24 @@
                     Deferred.when(store.get(this.pageArgs.uid))
                     .then(lang.hitch(this, function(obj) {
-                        this.object = obj;
+                        this.question = obj;
+                        this._refresh();
                     }));
                 } else {
                     throw new Error("Error: no reference to object set!");
                 }
-
+                this._setupEditor();
                 this._setupButtons();
-                this._setupEditor();
             },
             onLeave: function() {
                 this.inherited(arguments);
+            },
+            _refresh: function () {
+                this._toolkit.propertiesForm.set('value', this.question);
             },
             _setupButtons: function() {
@@ -52 +56 @@
             },
             _setupEditor: function() {
-                this.toolkit = new rft.ui.QuestionEditorToolkit();
-                this.toolkit.placeAt("QuestionEditorToolkit");
+//                this.toolkit = new rft.ui.QuestionEditorToolkit( { question: this.question } );
+                this._toolkit = new rft.ui.QuestionEditorToolkit();
+                this._toolkit.placeAt("QuestionEditorToolkit");
 
-                this.preview = new rft.ui.QuestionEditorPreview();
-                this.preview.placeAt("QuestionEditorPreview");
+                this._preview = new rft.ui.QuestionEditorPreview();
+                this._preview.placeAt("QuestionEditorPreview");
             }
         });

Dev/branches/rest-dojo-ui/client/rft/ui/AccordionList.js

@@ -11 +11 @@
             idProperty: null,
             categoryProperty: null,
-            titleProperty: null,
+            titleProperty: "test",
             actions: null,
             _widgets: null,

Dev/branches/rest-dojo-ui/client/rft/ui/QuestionEditorToolkit.js

@@ -14 +14 @@
 
                         templateString: template,
+                        question: null,
+
                         postCreate: function(){
                                 this.contentSource = new dojo.dnd.Source(this.ToolkitContentSourceNode, {

Dev/branches/rest-dojo-ui/client/rft/ui/templates/QuestionEditorToolkit.html

@@ -2 +2 @@
         <div data-dojo-type="dijit.layout.AccordionContainer" class="orange">
                 <div data-dojo-type="dijit.layout.ContentPane" title="Properties" data-dojo-props="iconClass:'rftIcon rftIconProperties'">
-                        <form id="propertiesForm">
+            <div id="propertiesForm" data-dojo-type="dijit.form.Form" data-dojo-attach-point="propertiesForm" data-rft-attach-event="onSubmit:onSave">
                                 <fieldset class="align">
-                                        <label for="propertiesTitle">Title:</label><input data-dojo-type="dijit.form.TextBox" id="propertiesTitle"/>
-                                        <label for="propertiesCode">Code:</label><input data-dojo-type="dijit.form.TextBox" id="propertiesCode"/>
-                                        <label for="propertiesCategories">Categories:</label><input data-dojo-type="dijit.form.FilteringSelect" id="propertiesCategories"/>
-                                        <label for="propertiesTopic">Topic:</label><input data-dojo-type="dijit.form.FilteringSelect" id="propertiesTopic"/>
-                                        <label for="propertiesDescription">Description:</label><textarea data-dojo-type="dijit.form.Textarea" id="propertiesDescription"></textarea>
+                                        <label for="propertiesTitle">Title:</label><input data-dojo-type="dijit.form.TextBox" id="propertiesTitle" name="title"/>
+                                        <label for="propertiesCode">Code:</label><input data-dojo-type="dijit.form.TextBox" id="propertiesCode" name= "code"/>
+                                        <label for="propertiesCategories">Categories:</label><input data-dojo-type="dijit.form.FilteringSelect" id="propertiesCategories" name="categories"/>
+                                        <label for="propertiesTopic">Topic:</label><input data-dojo-type="dijit.form.FilteringSelect" id="propertiesTopic" name="topic"/>
+                                        <label for="propertiesDescription">Description:</label><textarea data-dojo-type="dijit.form.Textarea" id="propertiesDescription" name="description"></textarea>
                                 </fieldset>
-                        </form>
+                        </div>
                 </div>