Changeset 501

Timestamp:

03/10/14 17:10:16 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Allow to specify all or only published questions.
• TabbedQuestionBrowser? respects include parameter again.
• Enable events in create() of ListWidget?.

Location:

Dev/trunk/src

Files:

• client/qed-client/model/widgets/TabbedQuestionBrowser.js (modified) (1 diff)
• client/qed-client/widgets/ListWidget.js (modified) (6 diffs)
• server/app.js (modified) (15 diffs)
• server/config/couchdb-design-docs.js (modified) (1 diff)

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

@@ -13 +13 @@
         dndType: "question",
         getCategories: function(){
-            return categories.query();
+            var opts = {};
+            if ( this.include ) { opts[this.include] = true; }
+            return categories.query(opts);
         },
         getCategoryName: function(category){ return category.name; },
         getCategoryCount: function(category){ return category.count; },
         getTopics: function(category) {
-            return topics.query({category:category.name});
+            var opts = {category:category.name};
+            if ( this.include ) { opts[this.include] = true; }
+            return topics.query(opts);
         },
         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);
-            }));
+            var opts = {category:category.name,topic:topic.name};
+            if ( this.include ) { opts[this.include] = true; }
+            return questions.query(opts);
         },
         getItemName: function(item) {

Dev/trunk/src/client/qed-client/widgets/ListWidget.js

@@ -9 +9 @@
     "dojo/dnd/common",
     "dojo/dom-construct",
+    "dojo/_base/event",
     "dojo/on"
-], function(_Container, _WidgetBase, registry, array, declare, lang, Source, dnd, domConstruct, on) {
+], function(_Container, _WidgetBase, registry, array, declare, lang, Source, dnd, domConstruct, event, on) {
     return declare([_WidgetBase,_Container],{
         name: "",
@@ -58 +59 @@
                         lang.hitch(this,'_handleChange')));
         },
+        create: function() {
+            this.inherited(arguments);
+            this._onChangeActive = true;
+        },
         creator: function(item, hint) {
             var id = dnd.getUniqueId();
@@ -74 +79 @@
                 }
             }
-            this.own(on(nodeOrWidget,'change',lang.hitch(this,'_handleChange')));
+            //this.own(on(nodeOrWidget,'change',lang.hitch(this,'_handleChange')));
             var node = nodeOrWidget.domNode ? nodeOrWidget.domNode : nodeOrWidget;
             if ( hint !== "avatar" && node.id !== id ) {
@@ -122 +127 @@
         appendItems: function(items,forceEvent) {
             this.source.insertNodes(false,items);
-            if ( forceEvent ) { this._handleChange(); }
+            if ( forceEvent ) { this._handleDrop(); }
         },
         appendItem: function(item,forceEvent) {
             this.source.insertNodes(false,[item]);
-            if ( forceEvent ) { this._handleChange(); }
+            if ( forceEvent ) { this._handleDrop(); }
         },
         removeItem: function(key,forceEvent) {
@@ -133 +138 @@
             }), lang.hitch(this, "_destroyNodeOrWidget"));
             this.source.delItem(key);
-            if ( forceEvent ) { this._handleChange(); }
+            if ( forceEvent ) { this._handleDrop(); }
         },
         getChildren: function() {
@@ -144 +149 @@
                           lang.hitch(this, "_destroyNodeOrWidget"));
             this.source.clearItems();
-            if ( forceEvent ) { this._handleChange(); }
+            if ( forceEvent ) { this._handleDrop(); }
         },
         _destroyNodeOrWidget: function(node) {

Dev/trunk/src/server/app.js

@@ -136 +136 @@
     }
     
+    function identity(obj) { return obj; }
     function stripAndReturnPrivates(obj) {
         var priv = {};
@@ -146 +147 @@
         return priv;
     }
-
-    function identity(obj) { return obj; }
+    function areDocsUnique(docs) {
+        return _.chain(docs)
+                .map(function(doc){ return doc._id; })
+                .uniq()
+                .value().length === docs.length;
+    }
+    function areDocsPublished(docs) {
+        return _.every(docs,isDocPublished);
+    }
+    function isDocPublished(doc) {
+        return doc.publicationDate;
+    }
+
     function handleUnknownResponse(status,error) {
         return new HTTPResult(500,{error: error.reason});
@@ -342 +354 @@
 
     // Questions
-    function getQuestionsWithCode(code) {
-        var url = '_design/questions/_view/by_code';
+    function getQuestionsWithCode(code,sub) {
+        var url = '_design/questions/_view/'+(sub||'all')+'_by_code';
         var query = {include_docs:true,key:code};
+        return HTTPResult.fromResponsePromise(couch.get(url,{query:query}).response,
+                                              handleUnknownError)
+        .handle({
+            200: handleRowDocs,
+            default: handleUnknownResponse
+        });
+    }
+    function getQuestions(sub) {
+        var url = '_design/questions/_view/'+(sub||'all');
+        var query = {include_docs:true};
         return HTTPResult.fromResponsePromise(couch.get(url,{query:query}).response,
                                               handleUnknownError)
@@ -362 +384 @@
         });
     }
-    function getQuestionsWithTopic(topic) {
-        var url = '_design/questions/_view/all_topics';
+    function getQuestionsWithTopic(topic,sub) {
+        var url = '_design/questions/_view/'+(sub||'all')+'_topics';
         var query = {reduce:false,include_docs:true,key:topic};
         return HTTPResult.fromResponsePromise(couch.get(url,{query:query}).response,
@@ -372 +394 @@
         });
     }
-    function getQuestionsWithCategoryAndTopic(category,topic) {
+    function getQuestionsWithCategoryAndTopic(category,topic,sub) {
         var hasTopic = typeof topic !== 'undefined';
-        var url = '_design/questions/_view/all';
+        var url = '_design/questions/_view/'+(sub||'all');
         var query = {reduce:false,include_docs:true,
                      startkey:hasTopic?[category,topic]:[category],
@@ -389 +411 @@
         ensureMIME(JSON_MIME),
         function(req,res) {
+            var sub = 'published' in req.query && 'published';
             var hr;
             if ( 'category' in req.query ) {
-                hr = getQuestionsWithCategoryAndTopic(req.query.category,req.query.topic);
+                hr = getQuestionsWithCategoryAndTopic(req.query.category,
+                                                      req.query.topic,sub);
             } else if ( 'topic' in req.query ) {
-                hr = getQuestionsWithTopic(req.query.topic);
+                hr = getQuestionsWithTopic(req.query.topic,sub);
             } else if ( 'code' in req.query ) {
-                hr = getQuestionsWithCode(req.query.code);
+                hr = getQuestionsWithCode(req.query.code,sub);
+            } else {
+                hr = getQuestions(sub);
             }
             hr.handle(res.send.bind(res));
@@ -444 +470 @@
         makeDocDel_id('Question'));
 
-
     // Categories and topics
-    function getTopicsWithCategory(category) {
-        var url = '_design/questions/_view/all';
+    function getTopics(sub) {
+        var url = '_design/questions/_view/'+(sub||'all')+'_topics';
+        return HTTPResult.fromResponsePromise(couch.get(url,{query:{reduce:true,group:true}}).response,
+                                            handleUnknownError)
+        .handle({
+            200: function(result) {
+                return _.map(result.rows, function(item) { return {name:item.key, count:item.value}; });
+            },
+            default: handleUnknownResponse
+        });
+    }
+    function getCategories(sub) {
+        var url = '_design/questions/_view/'+(sub||'all');
+        return HTTPResult.fromResponsePromise(couch.get(url,{query:{reduce:true,group:true,group_level:1}}).response,
+                                       handleUnknownError)
+        .handle({
+            200: function(result) {
+                return _.map(result.rows, function(item) {
+                    return { name:item.key[0], count:item.value };
+                });
+            },
+            default: handleUnknownResponse
+        });
+    }
+    function getTopicsWithCategory(category,sub) {
+        var url = '_design/questions/_view/'+(sub||'all');
         return HTTPResult.fromResponsePromise(couch.get(url,{query:{reduce:true,group:true,group_level:2,startkey:[category],endkey:[category,{}]}}).response,
                                        handleUnknownError)
@@ -461 +510 @@
         ensureMIME(JSON_MIME),
         function(req,res) {
-            var url = '_design/questions/_view/all';
-            HTTPResult.fromResponsePromise(couch.get(url,{query:{reduce:true,group:true,group_level:1}}).response,
-                                           handleUnknownError)
-            .handle({
-                200: function(result) {
-                    return _.map(result.rows, function(item) {
-                        return { name:item.key[0], count:item.value };
-                    });
-                },
-                default: handleUnknownResponse
-            })
+            var sub = 'published' in req.query && 'published';
+            getCategories(sub)
             .handle(res.send.bind(res));
         });
@@ -479 +519 @@
         function(req,res) {
             var category = req.params.category;
-            getTopicsWithCategory(category)
+            var sub = 'published' in req.query && 'published';
+            getTopicsWithCategory(category,sub)
             .handle(res.send.bind(res));
         });
@@ -486 +527 @@
         ensureMIME(JSON_MIME),
         function(req,res) {
-            var url = '_design/questions/_view/all_topics';
+            var sub = 'published' in req.query && 'published';
             var hr;
             if ( 'category' in req.query ) {
-                hr = getTopicsWithCategory(req.query.category);
-            } else {
-                hr = HTTPResult.fromResponsePromise(couch.get(url,{query:{reduce:true,group:true}}).response,
-                                                    handleUnknownError)
-                .handle({
-                    200: function(result) {
-                        return _.map(result.rows, function(item) { return {name:item.key, count:item.value}; });
-                    },
-                    default: handleUnknownResponse
-                });
+                hr = getTopicsWithCategory(req.query.category,sub);
+            } else {
+                hr = getTopics(sub);
             }
             hr.handle(res.send.bind(res));
@@ -504 +538 @@
 
     // Surveys
-    function areSurveyQuestionsUnique(survey) {
-        return _.chain(survey.questions)
-                .map(function(q){ return q.code; })
-                .uniq()
-                .value().length === survey.questions.length;
-    }
     app.get('/api/surveys',
         ensureAuthenticated,
@@ -538 +566 @@
             var doc = req.body;
             var hr;
-            if ( !areSurveyQuestionsUnique(doc) ) {
+            if ( !areDocsUnique(doc.questions) ) {
                 hr = new HTTPResult(400,{error:"Survey contains duplicate questions."});
+            } else if ( !areDocsPublished(doc.questions) || isDocPublished(doc) ) {
+                hr = new HTTPResult(400,{error:"Cannot publish Survey with unpublished questions."});
             } else {
                 hr = postDocument('Survey',doc);
@@ -557 +587 @@
             var rev = etags.parse(req.header('If-Match'))[0] || (doc && doc._rev);
             var hr;
-            if ( !areSurveyQuestionsUnique(doc) ) {
+            if ( !areDocsUnique(doc.questions) ) {
                 new HTTPResult(400,{error:"Survey contains duplicate questions."})
                 .handle(res.send.bind(res));
+            } else if ( !areDocsPublished(doc.questions) || isDocPublished(doc) ) {
+                hr = new HTTPResult(400,{error:"Cannot publish Survey with unpublished questions."});
             } else {
                 putDocument(id,rev,'Survey',doc)
@@ -587 +619 @@
         function(req,res) {
             var doc = req.body;
-            randomToken()
-            .handle({
-                201: function(token) {
-                    doc.secret = token;
-                    return postDocument('SurveyRun',doc);
-                }
-            })
-            .handle(res.send.bind(res));
+            var hr;
+            if ( !isDocPublished(doc.survey) ) {
+                hr = new HTTPResult(400,{error:"Cannot run unpublished survey."});
+            } else {
+                hr = randomToken()
+                .handle({
+                    201: function(token) {
+                        doc.secret = token;
+                        return postDocument('SurveyRun',doc);
+                    }
+                });
+            }
+            hr.handle(res.send.bind(res));
         });
     app.get('/api/surveyRuns/:id',
@@ -608 +645 @@
             var rev = etags.parse(req.header('If-Match'))[0] || (doc && doc._rev);
             var hr;
-            if ( typeof doc.secret === 'undefined' ) {
+            if ( !isDocPublished(doc.survey) ) {
+                hr = new HTTPResult(400,{error:"Cannot run unpublished survey."});
+            } else if ( typeof doc.secret === 'undefined' ) {
                 hr = randomToken()
                 .handle({

Dev/trunk/src/server/config/couchdb-design-docs.js

@@ -96 +96 @@
                 reduce: function(key, values, rereduce) { return sum(values); }
             },
-            by_code: {
+            all_by_code: {
                 map: function(doc){
                     if ( doc.type !== 'Question' ) { return; }
+                    emit(doc.code,doc);
+                }
+            },
+            published_by_code: {
+                map: function(doc){
+                    if ( doc.type !== 'Question' || !doc.publicationDate ) { return; }
                     emit(doc.code,doc);
                 }