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

Timestamp:

07/23/12 13:07:24 (13 years ago)

Author:

hendrikvanantwerpen

Message:

Seperated question browser in TabbedQuestionBrowser? widget.
Made configuring Selector actions more flexible (both for top actions and item actions).
Fixed lowercase/uppercase problem in SurveyListView?.
Fixed whitespace and toolyip in LineWithActionsWidget?.
Added question browser to questions page. Removed the old dialog that was there and redirect to questionEditor page.

File:

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

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

@@ -1 @@
-define(['dojo/_base/declare',
+define([
+    'dojo/_base/declare',
+    'dojo/_base/Deferred',
+    'dojo/_base/event',
     'dojo/_base/lang',
-    'dojo/_base/event',
-    'dojo/_base/Deferred',
-    'dojo/on',
-    'rft/ui/Selector',
-    'rft/ui/SurveyListView',
-    'dijit/layout/ContentPane',
+    'rft/content',
     'rft/store',
     'rft/ui/_Page',
-    'rft/content',
-    'dojo/store/Cache',
-    'dojo/store/Memory' ],
-    function(declare,lang,event,Deferred,on,Selector,SurveyListView,ContentPane,store,_Page,content,Cache,Memory){
+    'rft/ui/SurveyListView',
+    'rft/ui/TabbedQuestionBrowser'
+    ],
+    function(declare,Deferred,event,lang,content,store,_Page,SurveyListView,TabbedQuestionBrowser){
         return declare('rft.pages.survey',[_Page],{
             object: null,
@@ -27 +25 @@
                         return Deferred.when( obj.creator && store.dereference(obj.creator) );
                     }));
-                    this._setupButtons();
                     this._setupQuestionBrowser();
                     this._setupListView();
@@ -49 +46 @@
                 content.goTo('surveyAdvanced', {uid: this.object._id});
             },
-            _setupButtons: function() {
-                this.btnSave.on("click", lang.hitch(this, this.onSave));
-                this.btnPreview.on("click", lang.hitch(this, this._goToPreview));
-            },
             _setupQuestionBrowser: function() {
-                this.tabList.watch("selectedChildWidget",lang.hitch(this,function(name,oldTab,newTab){
-                    this._fillCategoryTab(newTab.__category);
-                }));
-                store.query('_design/default/_view/questions', {reduce:true,group:true,group_level:1})
-                .forPairs(lang.hitch(this,function(value,key){
-                    this._createCategoryTab(key[0],value);
-                }));
-            },
-            _createCategoryTab: function(category,count) {
-                if (this._dataMap[category] === undefined) {
-                    var categoryTab = new ContentPane({
-                        __category: category,
-                        title: category+" ("+count+")"
-                    });
-                    categoryTab.startup();
-                    this._dataMap[category] = {
-                        _widget: categoryTab
-                    };
-                    this.tabList.addChild(categoryTab);
-                }
-            },
-            _fillCategoryTab: function(category) {
-                var categoryMap = this._dataMap[category];
-                if (!categoryMap._filled) {
-                    categoryMap._filled = true;
-                    store.query('_design/default/_view/questions', {reduce:true,group:true,group_level:2,startkey:[category],endkey:[category,{}]})
-                    .forPairs(lang.hitch(this,function(value,key){
-                        this._createTopicSelector(key[1],category,value);
-                    }));
-                }
-            },
-            _createTopicSelector: function(topic,category,count){
-                var categoryMap = this._dataMap[category];
-                if (categoryMap[topic] === undefined) {
-                    var w = new Selector({
-                        __category: category,
-                        __topic: topic,
-                        title: topic+" ("+count+")"
-                    }).placeAt(categoryMap._widget.containerNode);
-                    w.startup();
-                    categoryMap[topic] = {
-                        _widget: w
-                    };
-                    this._fillTopicSelector(topic,category);
-                    w.on('include',lang.hitch(this,this.includeQuestion));
-                }
-            },
-            _fillTopicSelector: function(topic,category) {
-                var categoryMap = this._dataMap[category];
-                var topicMap = categoryMap[topic];
-                if (!topicMap._filled) {
-                    store.query('_design/default/_view/questions', {reduce:false,include_docs:true,key:[category,topic]})
-                    .forEach(lang.hitch(this,function(value){
-                        topicMap._widget.addItem(value);
-                    }));
-                }
+                this.questionBrowser = new TabbedQuestionBrowser({
+                    region: 'center',
+                    'class': 'blue',
+                    selectedActions: {
+                        "Include": {
+                            callback: lang.hitch(this,this.includeQuestion),
+                            icon: "Accept",
+                            description: "Include in survey"
+                        }
+                    },
+                    itemActions: {
+                        "Info": {
+                            callback: function(item){ item.description && alert(item.description); },
+                            icon: "Inspect",
+                            description: "Show item description"
+                        }
+                    }
+                },this.questionBrowser);
+                this.questionBrowser.startup();
             },
             /* ListView code */