Changeset 495 for Dev/trunk/src/client/qed-client/model/widgets/TabbedQuestionBrowser.js

Timestamp:

03/10/14 00:47:38 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Factored TabbedBrowser? out of TabbedQuestionBrowser?.
• Remove questions from overview when deleted.
• Only return topics that are inhabited in a category when one is specified.

File:

• Dev/trunk/src/client/qed-client/model/widgets/TabbedQuestionBrowser.js (modified) (1 diff)

Dev/trunk/src/client/qed-client/model/widgets/TabbedQuestionBrowser.js

@@ -1 +1 @@
 define([
-    "../../widgets/Selector",
+    "../../widgets/TabbedBrowser",
     "../classes/categories",
     "../classes/questions",
     "../classes/topics",
-    "dijit/layout/ContentPane",
-    "dijit/layout/TabContainer",
+    "dojo/_base/array",
     "dojo/_base/declare",
-    "dojo/_base/lang",
-    "dojo/_base/window",
-    "dojox/widget/Standby"
-], function(Selector, categories, questions, topics, ContentPane, TabContainer, declare, lang, win, Standby) {
-    return declare([TabContainer],{
+    "dojo/_base/lang"
+], function(TabbedBrowser, categories, questions, topics, array, declare, lang) {
+    return declare([TabbedBrowser],{
         tabPosition: 'left-h',
-        include: 'all',
-
-        selectedActions: null,
-        itemActions: null,
+        include: null,
         dndType: "question",
-
-        _dataMap: null,
-        _busyCount: 0,
-        constructor: function(){
-            this.inherited(arguments);
-            this._dataMap = {};
+        getCategories: function(){
+            return categories.query();
         },
-        startup: function() {
-            if ( this._started ){ return; }
-            this.inherited(arguments);
-            this._busyWidget = new Standby({
-                target: this.domNode,
-                duration: 200
-            }).placeAt(win.body());
-            this._busyWidget.startup();
-            this.watch("selectedChildWidget",lang.hitch(this,function(name,oldTab,newTab){
-                this._fillCategoryTab(newTab.__category);
-            }));
-            categories.query()
-            .forEach(lang.hitch(this,function(cat){
-                this._createCategoryTab(cat.name,cat.count);
+        getCategoryName: function(category){ return category.name; },
+        getCategoryCount: function(category){ return category.count; },
+        getTopics: function(category) {
+            return topics.query({category:category.name});
+        },
+        getTopicName: function(topic){ return topic.name; },
+        getTopicCount: function(topic){ return topic.count; },
+        getItems: function(category,topic) {
+            return questions.query({category:category.name,topic:topic.name})
+            .then(lang.hitch(this,function(items){
+                return array.filter(items, function(item){
+                    return (this.include === 'published' && item.publicationDate) ||
+                           (this.include === 'drafts' && !item.publicationDate) ||
+                           true;
+                }, this);
             }));
         },
-        _createCategoryTab: function(category,count) {
-            if (this._dataMap[category] === undefined) {
-                var categoryTab = new ContentPane({
-                    __category: category,
-                    title: (category || '[No category]')+" ("+count+")"
-                });
-                categoryTab.startup();
-                this._dataMap[category] = {
-                    _widget: categoryTab
-                };
-                this.addChild(categoryTab);
-            }
-        },
-        _fillCategoryTab: function(category) {
-            var categoryMap = this._dataMap[category];
-            if (!categoryMap._filled) {
-                this._busy();
-                categoryMap._filled = true;
-                topics.query({category:category})
-                .forEach(lang.hitch(this,function(topic){
-                    this._createTopicSelector(topic.name,category,topic.count);
-                })).then(lang.hitch(this,function(){
-                    this._done();
-                }));
-            }
-        },
-        _createTopicSelector: function(topic,category,count){
-            var categoryMap = this._dataMap[category];
-            if (categoryMap[topic] === undefined) {
-                var w = new Selector({
-                    __category: category,
-                    __topic: topic,
-                    dndType: this.dndType,
-                    title: (topic || '[No topic]')+" ("+count+")",
-                    selectedActions: this.selectedActions,
-                    itemActions: this.itemActions,
-                    itemTitle: this._itemTitle
-                }).placeAt(categoryMap._widget.containerNode);
-                w.startup();
-                categoryMap[topic] = {
-                    _widget: w
-                };
-                this._fillTopicSelector(topic,category);
-            }
-        },
-        _itemTitle: function(item) {
+        getItemName: function(item) {
             var title = '['+item.code+']'+item.title;
-            if ( this.include === 'all' ) {
-                title += (item.publicationDate?' (published on '+item.publicationDate+')':' (unpublished)');
+            if ( !this.include ) {
+                title += (item.publicationDate ?' (published on '+item.publicationDate+')':' (unpublished)');
             }
             return title;
         },
-        _fillTopicSelector: function(topic,category) {
-            var categoryMap = this._dataMap[category];
-            var topicMap = categoryMap[topic];
-            if (!topicMap._filled) {
-                topicMap._filled = true;
-                this._busy();
-                questions.query({category:category,topic:topic})
-                .forEach(lang.hitch(this,function(value){
-                    topicMap._widget.addItem(value);
-                })).then(lang.hitch(this,function(){
-                    this._done();
-                }));
-            }
-        },
-        _busy: function() {
-            if ( this._busyCount === 0 ) {
-                this._busyWidget.show();
-            }
-            this._busyCount++;
-        },
-        _done: function() {
-            if ( this._busyCount > 0 ) {
-                this._busyCount--;
-                if ( this._busyCount === 0 ) {
-                    this._busyWidget.hide();
-                }
-            } else {
-                console.warn('_done() was called more times than _busy().');
-            }
-        },
-        destroy: function() {
-            this._busyWidget.destroyRecursive();
-            this.inherited(arguments);
+        areItemsEqual: function(i1,i2) {
+            return questions.getId(i1) === questions.getId(i2);
         }
     });