Changeset 477 for Dev

Timestamp:

08/06/13 01:48:17 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Quick hack to allow responding despite not being authenticated. Something like tokes need to be added.

Location:

Dev/trunk/src

Files:

• client/qed-client/css/fonts.less (modified) (1 diff)
• client/qed-client/css/layout.less (modified) (1 diff)
• client/qed-client/css/qed.css (deleted)
• client/qed-client/model/widgets/TabbedQuestionBrowser.js (modified) (3 diffs)
• client/qed-client/pages/response.js (modified) (5 diffs)
• client/qed-client/response.js (modified) (3 diffs)
• client/qed-client/widgets/Selector.js (modified) (5 diffs)
• client/response.html (modified) (1 diff)
• server/app.js (modified) (4 diffs)
• server/config/couchdb-design-docs.js (modified) (1 diff)
• server/util/couch.coffee (modified) (1 diff)

Dev/trunk/src/client/qed-client/css/fonts.less

@@ -3 +3 @@
     font-size: @font_size;
     color: @text;
+    &.light {
+        color: black; // FIXME : hack for readability
+    }
 
     a {

Dev/trunk/src/client/qed-client/css/layout.less

@@ -7 +7 @@
     height: 100%;
     background-color: @base;
+    .light {
+        background-color: white; // FIXME : hack for readability
+    }
 }

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

@@ -78 +78 @@
                     title: (topic || '[No topic]')+" ("+count+")",
                     selectedActions: this.selectedActions,
-                    itemActions: this.itemActions
+                    itemActions: this.itemActions,
+                    itemTitle: this._itemTitle
                 }).placeAt(categoryMap._widget.containerNode);
                 w.startup();
@@ -87 +88 @@
             }
         },
+        _itemTitle: function(item) {
+            var title = '['+item.code+']'+item.title;
+            if ( this.include === 'all' ) {
+                title += (item.publicationDate?' (published on '+item.publicationDate+')':' (unpublished)');
+            }
+            return title;
+        },
         _fillTopicSelector: function(topic,category) {
             var categoryMap = this._dataMap[category];
@@ -93 +101 @@
                 topicMap._filled = true;
                 this._busy();
-                store.query(this._query, {reduce:false,include_docs:true,key:[category,topic]})
-                .forEach(lang.hitch(this,function(value){
-                    var title;
-                    if ( this.include === 'all' ) {
-                        title = value.title+(value.publicationDate?' (published on '+value.publicationDate+')':' (unpublished)');
-                    }
-                    topicMap._widget.addItem(value,title);
+                store.query(this._query, {
+                    reduce:false,
+                    include_docs:true,
+                    key:[category,topic]
+                }).forEach(lang.hitch(this,function(value){
+                    topicMap._widget.addItem(value);
                 })).then(lang.hitch(this,function(){
                     this._done();

Dev/trunk/src/client/qed-client/pages/response.js

@@ -9 +9 @@
     "dojo/_base/declare",
     "dojo/_base/event",
+    "dojo/_base/json",
     "dojo/_base/lang",
     "dojo/promise/all",
+    "dojo/request",
     "dojo/when",
     "require",
     "dojo/text!./templates/response.html"
-], function(Content, Page, async, Response, Survey, SurveyRun, store, declare, event, lang, all, when, require, template) {
+], function(Content, Page, async, Response, Survey, SurveyRun, store, declare, event, json, lang, all, request, when, require, template) {
     return declare([Page],{
         contextRequire: require,
@@ -37 +39 @@
                         this._enableSubmit();
                     }
-                }), function() {
+                }), lang.hitch(this,function() {
                     this._showInfo("<div>The url seems to be incorrect, no survey found.</div>");
-                });
+                }));
             } else {
                 throw new Error("No valid uid or survey passed!");
@@ -45 +47 @@
         },
         _loadSurveyAndResponse: function(surveyRunId,responseId){
-            return all([store.get(surveyRunId),store.get(responseId)])
+            return all([request.get('/api/surveyRuns/'+surveyRunId,{handleAs:'json'}),
+                        request.get('/api/responses/'+responseId,{handleAs:'json'})])
             .then(lang.hitch(this,function(surveyAndResponse){
                 var surveyRun = surveyAndResponse[0];
@@ -73 +76 @@
             var answers = this.surveyWidget.get('value');
             this.response.answers = answers;
-            return store.put(this.response).then(function(){
+            return request.put('/api/responses/'+store.getIdentity(this.response),{
+                handleAs:'json',
+                data:json.toJson(this.response),
+                headers:{"Content-Type": "application/json"}
+            }).then(function(){
                 Content.notify("Your response is saved.");
             }, function(err){
@@ -82 +89 @@
             this.response.publicationDate = store.timestamp();
             this._getAnswersAndSaveResponse()
-            .then(function(){
+            .then(lang.hitch(this,function(){
                 this._showInfo("<div>Thanks for filling in the survey. You cannot edit your answers anymore.</div>");
                 this._disableSubmit();
-            });
+            }));
             if ( e ) { event.stop(e); }
             return false;

Dev/trunk/src/client/qed-client/response.js

@@ -1 +1 @@
 define([
-    'dojo/date',
-    'dojo/date/locale',
-    'dojo/hash',
-    'dojo/parser',
-    './store',
-    './app/Content',
-    './app/Page',
-    './app/Path',
-    './lib/async',
-    './model/classes/Response',
-    './model/classes/SurveyRun',
-    './pages/response',
-    'dojo/domReady!',
-    './stddeps'
-],function(date,locale,hash,parser,store,Content,Page,Path,async,Response,SurveyRun,ResponsePage) {
+    "./app/Content",
+    "./app/Page",
+    "./app/Path",
+    "./lib/async",
+    "./model/classes/Response",
+    "./model/classes/SurveyRun",
+    "./pages/response",
+    "./store",
+    "dojo/_base/json",
+    "dojo/date",
+    "dojo/date/locale",
+    "dojo/hash",
+    "dojo/parser",
+    "dojo/request",
+    "./stddeps",
+    "dojo/domReady!"
+], function(Content, Page, Path, async, Response, SurveyRun, ResponsePage, store, json, date, locale, hash, parser, request) {
     parser.parse();
     Content.startup();
@@ -49 +51 @@
     }
 
-    store.get(surveyRunId)
+    request.get('/api/surveyRuns/'+surveyRunId,{handleAs:'json'})
     .then(function(surveyRun){
         checkDates(surveyRun);
@@ -58 +60 @@
                 var response = Response.create();
                 response.surveyRunId = surveyRunId;
-                return store.put(response).then(function(res){
-                    return store.getIdentity(res);
+                return request.post('/api/responses',{
+                    handleAs:'json',
+                    data:json.toJson(response),
+                    headers:{"Content-Type": "application/json"}
+                }).then(function(res){
+                    return res.id;
                 });
             } else {

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

@@ -18 +18 @@
 ], function(LineWithActionsWidget, _Container, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, registry, baseArray, declare, event, lang, Source, domClass, domConstruct, fx, query, templateString) {
 
+    function get(selector, item) {
+        if ( lang.isFunction(selector) ) {
+            return selector(item);
+        } else {
+            return item[selector || 'title'];
+        }
+    }
+    
     return declare([_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,_Container],{
         templateString: templateString,
@@ -25 +33 @@
         selectedActions: null,
         itemActions: null,
+        itemTitle: 'title',
         // main selector action: Object
         //    title:
@@ -111 +120 @@
             this._selectedItem = item;
             this.onToggle();
-            this._selectorLine.set("title", item.title);
+            this._selectorLine.set("title", get(this.itemTitle,item));
             baseArray.forEach(this.optionsNode.childNodes, function(node){
                 var line = registry.byNode(node);
@@ -174 +183 @@
             return domConstruct.create("div",{
                 'class': 'dragAvatar',
-                innerHTML: item.title
+                innerHTML: get(this.itemTitle,item)
             });
         },
@@ -197 +206 @@
             }
             var w = new LineWithActionsWidget({
-                title: item.title,
+                title: get(this.itemTitle,item),
                 actions: actions
             });

Dev/trunk/src/client/response.html

@@ -6 +6 @@
         <link rel="stylesheet" type="text/css" href="qed-client/css/qed.css" />
     </head>
-    <body id="rft" class="dijitReset claro">
+    <body id="rft" class="dijitReset claro light" >
         <script type="text/javascript">
             var dojoConfig = {

Dev/trunk/src/server/app.js

@@ -48 +48 @@
 
     // cookies and session
-    app.use('/api/login',express.bodyParser());
+    app.use('/api',express.bodyParser());
     app.use(express.cookieParser());
     app.use(express.session({ secret: "quasi experimental design" }));
@@ -99 +99 @@
         });
 
+    // expose everything needed to fill in responses
+    // FIXME : this needs more security, now you can guess ids
+    //         and get actual survey and response data!
+    app.get(
+        '/live',
+        function(req,res){
+            res.redirect('/response.html#!/55704d6a84194c2d7ba9bec93c000e75');
+        });
+    app.get(
+        '/api/surveyRuns/:id',
+        function(req,res){
+            var id = req.params.id;
+            couch.get(id).then(function(result){
+                if ( result.type === 'SurveyRun') {
+                    res.send(200, result);
+                } else {
+                    res.send(404, {error: "Cannot find survey run "+id});
+                }
+            }, function(error){
+                res.send(404, {error: "Cannot find survey run "+id});
+            });
+        });
+    app.get(
+        '/api/responses/:id',
+        function(req,res){
+            var id = req.params.id;
+            couch.get(id).then(function(result){
+                if ( result.type === 'Response') {
+                    res.send(200, result);
+                } else {
+                    res.send(404, {error: "Cannot find response "+id});
+                }
+            }, function(error){
+                res.send(404, {error: "Cannot find response "+id});
+            });
+        });
+    app.post(
+        '/api/responses',
+        function(req,res){
+            console.log(req.body);
+            couch.post(req.body).then(function(result){
+                res.send(200, result);
+            }, function(error){
+                res.send(500, error);
+            });
+        });
+    app.put(
+        '/api/responses/:id',
+        function(req,res){
+            var id = req.params.id;
+            couch.put(id,req.body).then(function(result){
+                res.send(200, result);
+            }, function(error){
+                res.send(500, error);
+            });
+        });
+    
     // data is proxied to couch
     app.use('/api/data', ensureAuthenticated);
@@ -135 +192 @@
 function responseToVariables(response) {
     var result = flattenObject(response.answers);
-    result.respondent = response.id;
     return result;
 }
@@ -143 +199 @@
     (function agg(val,key,res){
         if ( _.isObject(val) ) {
-            _.forEach(val, function(v,k){
-                agg(v,(key ? key+'.' : '')+k,res);
-            });
+            var keys = _.keys(val);
+            // FIXME : dirty hack for questions with only one input
+            if ( keys.length === 1 ) {
+                agg(val[keys[0]],key,res);
+            } else {
+                _.forEach(val, function(v,k){
+                    agg(v,(key ? key+'.' : '')+k,res);
+                });
+            }
         } else if ( _.isArray(val) ) {
-            _.forEach(val, function(v,i){
-                agg(v,(key ? key+'.' : '')+i,res);
-            });
+            // FIXME : dirty hack for questions with only one input
+            if ( val.length === 1 ) {
+                agg(val[0],key,res);
+            } else {
+                _.forEach(val, function(v,i){
+                    agg(v,(key ? key+'.' : '')+i,res);
+                });
+            }
         } else {
             res[key] = val;

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

@@ -33 +33 @@
                 map: function(doc){
                     emit(doc.type, doc);
+                }
+            },
+            typeless: {
+                map: function(doc){
+                    if ( !doc.type ) {
+                        emit(doc._id, doc);
+                    }
                 }
             }

Dev/trunk/src/server/util/couch.coffee

@@ -9 +9 @@
         url = "#{@url}/#{id}"
         couchRequest 'GET', url
+    post: (doc) ->
+        url = "#{@url}"
+        couchRequest 'POST', url, doc
     put: (id, doc) ->
         url = "#{@url}/#{id}"