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

Timestamp:

03/23/12 17:26:55 (13 years ago)

Author:

hendrikvanantwerpen

Message:

Mockup included.

Location:

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

Files:

• questions.js (modified) (2 diffs)
• survey.html (modified) (2 diffs)
• survey.js (modified) (3 diffs)

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

@@ -10 +10 @@
                 this._store = store.getStore('Question');
                 this._list = new AccordionList({
-                    store: this._store,
                     actions: {
                         'Edit': lang.hitch(this,'_editQuestion')
                     },
+                    idProperty: this._store.idProperty,
                     categoryProperty: 'category',
                     titleProperty: 'title'
@@ -21 +21 @@
             },
             _refresh: function() {
-                this._list.refresh();
+                Deferred.when(this._store.query())
+                .then(lang.hitch(this,function(items){
+                    this._list.setItems(items);
+                }));
             },
             onNewQuestion: function() {

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

@@ -1 +1 @@
 <div data-dojo-type="rft.pages.survey">
     <h1 data-rft-attach-point="header">(default)</h1>
-    <div>Created by <span data-rft-attach-point="creator"></span><div>
+    <div>Created by <span data-rft-attach-point="creator"></span></div>
     <form data-dojo-type="dijit.form.Form" data-rft-attach-point="form" data-rft-attach-event="onSubmit:onSave">
         <div style="display: block; clear: both;">
@@ -11 +11 @@
         <label for="description" class="loginLabel">Description</label>
         <textarea name="description" data-dojo-type="dijit.form.SimpleTextarea" class="loginInput"></textarea>
+        <div>
+            <div style="width: 45%; float: left; clear: left;"><div data-rft-attach-point="allQuestions"></div></div>
+            <div style="width: 45%; float: left;"><div data-rft-attach-point="surveyQuestions"></div></div>
+        </div>
     </form>
 </div>

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

@@ -1 @@
-define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/event','dojo/_base/Deferred','rft/store','rft/ui/_Page','rft/api'],
-    function(declare,lang,event,Deferred,store,_Page,api){
+define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/event',
+    'dojo/_base/Deferred','rft/ui/AccordionList','rft/ui/LineWithActionsWidget',
+    'rft/store','rft/ui/_Page','rft/api'],
+    function(declare,lang,event,Deferred,AccordionList,LineWithActionsWidget,store,_Page,api){
         return declare('rft.pages.survey',[_Page],{
             object: null,
             postCreate: function() {
                 this.inherited(arguments);
-                this._store = store.getStore('Survey');
+                this._surveyStore = store.getStore('Survey');
+                this._questionStore = store.getStore('Question');
             },
             onVisit: function() {
                 if ( this.pageArgs.uid ) {
-                    Deferred.when(this._store.get(this.pageArgs.uid))
+                    Deferred.when(this._surveyStore.get(this.pageArgs.uid))
                     .then(lang.hitch(this,function(obj){
                         this.object = obj;
@@ -17 +20 @@
                     .then(lang.hitch(this,function(obj){
                         this.creator.innerHTML = (obj && obj.email) || 'unknown';
+                    }));
+                    Deferred.when(this._questionStore.query())
+                    .then(lang.hitch(this,function(items){
+                        this._questionList = new AccordionList({
+                            store: this._surveyStore,
+                            actions: {
+                                'Add': lang.hitch(this,'_addQuestion')
+                            },
+                            idProperty: this._questionStore.idProperty,
+                            categoryProperty: 'category',
+                            titleProperty: 'title'
+                        },this.allQuestions);
+                        this._questionList.startup();
+                        this._questionList.setItems(items);
                     }));
                 } else {
@@ -42 +59 @@
                 this.header.innerHTML = "Edit survey '"+(obj.title || '(undefined)')+"'";
                 obj && this.form.set('value',obj);
+            },
+            _addQuestion: function(obj) {
+                var d = {};
+                d.widget = new LineWithActionsWidget({
+                    title:obj.title,
+                    userObj: obj,
+                    actions:{
+                        "Remove": lang.hitch(this,'_removeQuestion',d)
+                    }
+                });
+                d.widget.placeAt(this.surveyQuestions);
+            },
+            _removeQuestion: function(data,obj) {
+                data.widget.destroy();
             }
         });