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

Timestamp:

07/29/12 00:03:52 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• Cleanup of the differen ListViews?, List & OrderedList?. Based QuestionListView? on these base classes as well. Removed duplicate code.
• Destroy busy indicator of TabbedQuestionBrowser? (because it's placed outside of the widgets DOM tree, this is not done automatically).
• Use dojo/date/stamp module for uniform and parsable date formatting.
• Added docs/ directory for database format documentation etc.

Location:

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

Files:

• session.html (modified) (3 diffs)
• session.js (modified) (5 diffs)
• sessions.js (modified) (2 diffs)
• survey.js (modified) (2 diffs)

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

@@ -14 +14 @@
                         <h3>Basic</h3>
                         <fieldset class="align">
-                            <label for="titleInput">Title</label>
+                            <label for="title">Title</label>
                             <input type="text" name="title" data-dojo-type="dijit.form.TextBox" data-dojo-props="placeHolder: 'Enter title here'" />
                             <br/>
-                            <label for="descriptionInput">Description</label>
+                            <label for="description">Description</label>
                             <textarea name="description" rows="3" cols="54" data-dojo-type="dijit.form.SimpleTextarea" data-dojo-props="selectOnClick: true, placeHolder: 'Description shown in tooltips'"></textarea>
                             <br/>
-                            <label for="dateInput">Planned date</label>
+                            <label for="plannedDate">Planned date</label>
                             <input type="text" name="plannedDate" data-dojo-type="dijit.form.DateTextBox" required="required" />
                         </fieldset>
@@ -26 +26 @@
                         <h3>Accounts</h3>
                         <fieldset class="align">
-                            <label for="accountsInput">Add new</label>
-                            <select id="accountBox"></select>
+                            <label for="accountSelector">Add new</label>
+                            <select data-rft-attach-point="accountSelector"></select>
                             <button data-rft-attach-point="btnInvite" data-dojo-type="dijit.form.Button" data-rft-attach-event="onClick:onInvite" data-dojo-props="baseClass: 'rftBlockButton', class: 'green', iconClass: 'rftIcon rftIconPlus'">Invite</button>
                             <br/><br/>
                             
-                            <div data-rft-attach-point="listViewNode" class="rftAccountListView">
+                            <div data-rft-attach-point="accountListNode" class="rftAccountListView">
                             </div>
                         </fieldset>
 
-                        <button data-rft-attach-point="btnPropertiesDiscard" data-dojo-type="dijit.form.Button" data-rft-attach-event="onClick:onDiscard" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">Discard changes</button>
-                        <button data-rft-attach-point="btnPropertiesSave" data-dojo-type="dijit.form.Button" data-rft-attach-event="onClick:onSave" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">Save changes</button>
+                        <button data-dojo-type="dijit.form.Button" data-rft-attach-event="onClick:onDiscard" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">Discard changes</button>
+                        <button data-dojo-type="dijit.form.Button" data-rft-attach-event="onClick:onSave" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">Save changes</button>
 
                     </div>
@@ -42 +42 @@
                 </div>
                 <div data-dojo-type="dijit.layout.ContentPane" title="Design">
-                    <!--DESIGN-->
-
                     <div class="rftSessionObject green">
                         <div class="rftIcon rftIconSurvey"></div>

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

@@ -1 @@
-define(['dojo/_base/declare',
-        'dojo/_base/lang',
-        'dojo/_base/event',
-        'dojo/_base/Deferred',
+define([
+    'dojo/_base/array',
+    'dojo/_base/declare',
+    'dojo/_base/lang',
+    'dojo/_base/event',
+    'dojo/_base/Deferred',
     'rft/elastic/ElasticSearchFilteringSelect',
     'rft/elastic/ElasticReadStore',
-        'rft/store',
-        'rft/ui/_Page',
-        'rft/content',
+    'rft/store',
+    'rft/ui/_Page',
+    'rft/content',
     'rft/ui/AccountListView'
     ],
-        function(declare,lang,event,Deferred,ElasticSearchFilteringSelect,ElasticReadStore,store,_Page,content,AccountListView){
-                return declare('rft.pages.session',[_Page],{
-                        session: null,
-                        _listView: null,
+    function(array,declare,lang,event,Deferred,ElasticSearchFilteringSelect,ElasticReadStore,store,_Page,content,AccountListView){
+        return declare('rft.pages.session',[_Page],{
+            session: null,
+            _accountList: null,
             _select: null,
-                        onVisit: function() {
-                                if ( this.pageArgs.uid ) {
-                                        Deferred.when(store.get(this.pageArgs.uid))
-                                        .then(lang.hitch(this,function(obj){
-                                                this.session = obj;
-                        this._setupListView();
+            onVisit: function() {
+                if ( this.pageArgs.uid ) {
+                    Deferred.when(store.get(this.pageArgs.uid))
+                    .then(lang.hitch(this,function(obj){
+                        this.session = obj;
+                        this._setupAccountList();
                         this._refresh();
-                                        }));
+                    }));
                     this._setupAutoComplete();
-                                } else {
-                                        throw "No valid uid or session passed!";
-                                }
-                        },
-                        onLeave: function() {
-                                this.inherited(arguments);
-                        },
+                } else {
+                    throw "No valid uid or session passed!";
+                }
+            },
             _refresh: function() {
                 this.titleNode.innerHTML = this.session.title || '';
@@ -41 +40 @@
             onSave: function(evt) {
                 lang.mixin(this.session,this.propertiesForm.get('value'));
+                this.session.accounts = array.map(this._accountList.getItems(),function(item){
+                    return store.getIdentity(item);
+                });
                 store.put(this.session)
                 .then(function(){
@@ -55 +57 @@
             },
             _addAccount: function(item) {
-                if (!this.session.accounts) 
-                    this.session.accounts = [];
-                this.session.accounts.push(item);
-                this._listView.insertItem(item);
+                this._accountList.insertItem(item);
             },
-            _removeAccount: function(item) {
-                this.session.accounts.splice(this.session.accounts.indexOf(item), 1);
-            },
-            _setupListView: function() {
-                this._listView = new AccountListView( {
-                    controller: this,
-                    removeCallback: lang.hitch(this, this._removeAccount)
-                }).placeAt(this.listViewNode);
-                for (account in this.session.accounts) {
-                    this._listView.insertItem(this.session.accounts[account]);
+            _setupAccountList: function() {
+                this._accountList = new AccountListView().placeAt(this.accountListNode);
+                this._accountList.startup();
+                for (var account in this.session.accounts) {
+                    this._accountList.insertItem(this.session.accounts[account]);
                 }
-
-                this._listView.startup();
             },
             _setupAutoComplete: function() {
-
                 var accountStore = new ElasticReadStore({
                     url: "http://localhost:9200/rft/_search",
@@ -81 +72 @@
                 });
                 this._select = new ElasticSearchFilteringSelect({
-                    name: "accountBox",
                     store: accountStore,
                     autoComplete: false,
@@ -90 +80 @@
                     hasDownArrow: false,
                     style: "width: 400",
-                    searchAttr: "title",
-                    id: "accountText"
-                }, "accountBox");
+                    searchAttr: "title"
+                }, this.accountSelector);
                 this._select.startup();
             }
 
 
-                });
-});
+        });
+    });
 

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

@@ -1 @@
-define(['dojo/_base/declare','dojo/_base/lang','rft/store','rft/content','rft/ui/_Page','rft/ui/ObjectBox'],
-    function(declare,lang,store,content,_Page,ObjectBox){
+define([
+    'dojo/_base/declare',
+    'dojo/_base/lang',
+    'dojo/date/stamp',
+    'rft/store',
+    'rft/content',
+    'rft/ui/_Page',
+    'rft/ui/ObjectBox'],
+    function(declare,lang,dateStamp,store,content,_Page,ObjectBox){
         return declare('rft.pages.sessions',[_Page],{
             templateActions: null,
@@ -55 +62 @@
             },
             _publishSession: function(sessionTemplate) {
-                var publishDate = new Date();
                 var session = lang.clone(sessionTemplate);
                 delete session[store.idProperty];
                 delete session[store.revProperty];
                 session.type = "SessionInstance";
-                session.date = publishDate.getDate()+"-"+publishDate.getMonth()+"-"+publishDate.getFullYear();
+                session.publishedDate = dateStamp.toISOString(new Date(),{zulu: true});
                 session.creator = "Igor Mayer";
                 store.add(session)

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

@@ -8 +8 @@
     'rft/store',
     'rft/ui/_Page',
-    'rft/ui/OrderedDndList',
+    'rft/ui/QuestionListView',
     'rft/ui/TabbedQuestionBrowser'
     ],
     function(array,declare,Deferred,event,lang,content,store,_Page,
-             OrderedDndList,TabbedQuestionBrowser){
+             QuestionListView,TabbedQuestionBrowser){
         return declare('rft.pages.survey',[_Page],{
             survey: null,
@@ -58 +58 @@
             },
             _setupListView: function() {
-                this.questionList = new OrderedDndList({
-                    type: 'question',
+                this.questionList = new QuestionListView({
                     region: 'center'
                 }).placeAt(this.surveyListViewNode);