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

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.

File:

• Dev/branches/rest-dojo-ui/client/rft/pages/session.js (modified) (5 diffs)

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();
             }
 
 
-                });
-});
+        });
+    });