Changeset 487 for Dev/trunk/src/client

Timestamp:

03/05/14 22:44:48 (11 years ago)

Author:

hendrikvanantwerpen

Message:

Completed migration to API, without CouchDB proxy.

Move to API is now completed. The full API is password protected, a very
limited API is exposed for respondents, which works with secrets that
are passed in URLs.

Serverside the HTTPResult class was introduced, which is similar to
Promises, but specifically for HTTP. It carries a status code and
response and makes it easier to extract parts of async handling in
separate functions.

Fixed a bug in our schema (it seems optional attributes don't exist but
a required list does). Verification of our schema by grunt-tv4 didn't
work yet. Our schema is organized the wrong way (this is fixable),
but the json-schema schema has problems with simple types and $refs.

Location:

Dev/trunk/src/client/qed-client

Files:

• app/Router.js (modified) (1 diff)
• model/classes (modified) (1 prop)
• model/classes/SessionTemplate.js (deleted)
• model/classes/_Class.js (added)
• model/classes/_View.js (added)
• model/classes/categories.js (added)
• model/classes/questions.js (moved) (moved from Dev/trunk/src/client/qed-client/model/classes/Question.js) (1 diff)
• model/classes/responses.js (moved) (moved from Dev/trunk/src/client/qed-client/model/classes/Response.js) (1 diff)
• model/classes/surveyRuns.js (moved) (moved from Dev/trunk/src/client/qed-client/model/classes/SurveyRun.js) (1 diff)
• model/classes/surveys.js (moved) (moved from Dev/trunk/src/client/qed-client/model/classes/Survey.js) (1 diff)
• model/classes/topics.js (added)
• model/schema.js (deleted)
• model/widgets/QuestionEditorToolkit.js (modified) (3 diffs)
• model/widgets/SurveyRenderWidget.js (modified) (3 diffs)
• model/widgets/SurveySummary.js (modified) (3 diffs)
• model/widgets/TabbedQuestionBrowser.js (modified) (4 diffs)
• pages/previewSurvey.js (modified) (3 diffs)
• pages/question.js (modified) (5 diffs)
• pages/questions.js (modified) (3 diffs)
• pages/response.js (modified) (6 diffs)
• pages/session.js (modified) (3 diffs)
• pages/sessions.js (modified) (7 diffs)
• pages/survey.js (modified) (6 diffs)
• pages/surveyRun.js (modified) (7 diffs)
• pages/surveys.js (modified) (8 diffs)
• response.js (modified) (3 diffs)
• routes.js (modified) (1 diff)
• session.coffee (modified) (4 diffs)
• stddeps.js (modified) (2 diffs)
• store.js (deleted)
• store/JsonRest.js (added)
• ui/LoginDialogWrapper.coffee (modified) (2 diffs)
• xhr.js (moved) (moved from Dev/trunk/src/client/qed-client/request.js) (3 diffs)

Dev/trunk/src/client/qed-client/app/Router.js

@@ -78 +78 @@
                         route.callback(params);
                     } catch(err) {
-                        console.error("Page change failed with",err.toString());
+                        console.error("Page change failed with",err,err.toString());
                     }
                     return;

Dev/trunk/src/client/qed-client/model/classes/questions.js

@@ -1 @@
-define(function(){
-    return {
-        create: function(){
-            return { type:'Question' };
+define([
+    "./_Class",
+    "dojo/_base/declare",
+    "dojo/date/stamp"
+], function(_Class, declare, stamp) {
+
+    var Questions = declare([_Class],{
+        _collection: 'questions',
+        _type: 'Question',
+        create: function() {
+            var obj = {
+                type: this._type,
+                categories: [],
+                code: "",
+                content: [],
+                title: ""
+            };
+            return obj;
         },
-        DisplayTitle: {
-            get: function(q) {
-                return q.title || '';
+        _deserialize: function(obj) {
+            if (obj.publicationDate) {
+                obj.publicationDate = stamp.fromISOString(obj.publicationDate);
             }
         },
-        Content: {
-            get: function(q) {
-                return q.content || [];
-            },
-            set: function(q,content) {
-                q.content = content;
+        _serialize: function(obj) {
+            if (obj.publicationDate) {
+                obj.publicationDate = stamp.toISOString(obj.publicationDate);
             }
         }
-    };
+    });
+
+    return new Questions();
+
 });

Dev/trunk/src/client/qed-client/model/classes/responses.js

@@ -1 @@
-define([],function(){
-    var SurveyRun = {
-        create: function(){
-            return { type:'Response' };
+define([
+    "./_Class",
+    "./surveyRuns",
+    "dojo/Deferred",
+    "dojo/_base/declare",
+    "dojo/_base/json",
+    "dojo/_base/lang",
+    "dojo/_base/xhr",
+    "dojo/date/stamp"
+], function(_Class, surveyRuns, Deferred, declare, json, lang, xhr, stamp) {
+
+    var Responses = declare([_Class],{
+        _collection: 'responses',
+        _type: 'Response',
+        create: function() {
+            var obj = {
+                type: this._type,
+                answers: {},
+                surveyRunId: null
+            };
+            return obj;
         },
-        SurveyRun: {
-            get: function(r) {
-                return r.surveyRunId || null;
-            },
-            set: function(r,sr) {
-                r.surveyRunId = sr;
-                return r;
+        _deserialize: function(obj) {
+            if (obj._surveyRun) {
+                obj._surveyRun = surveyRuns._doDeserialize(obj._surveyRun);
             }
+            if (obj.publicationDate) {
+                obj.publicationDate = stamp.fromISOString(obj.publicationDate);
+            }
+        },
+        _serialize: function(obj) {
+            if (obj._surveyRun) {
+                obj._surveyRun = surveyRuns._doSerialize(obj._surveyRun);
+            }
+            if (obj.publicationDate) {
+                obj.publicationDate = stamp.toISOString(obj.publicationDate);
+            }
+        },
+        getWithSecret: function(id,secret) {
+            var query = xhr.objectToQuery({secret:secret});
+            return xhr('GET',{
+                url: '/api/open/responses/' + id + '?' + query,
+                handleAs: 'json',
+                contentType: false
+            }).then(lang.hitch(this,'_doDeserialize'),function(err){
+                return new Deferred().reject(json.fromJson(err.responseText));
+            });
+        },
+        postWithSecret: function(response,secret) {
+            var query = xhr.objectToQuery({secret:secret});
+            var body = json.toJson(this._doSerialize(response));
+            return xhr('POST',{
+                url: '/api/open/responses?' + query,
+                handleAs: 'json',
+                contentType: 'application/json',
+                rawBody: body
+            }).then(lang.hitch(this,'_doDeserialize'),function(err){
+                return new Deferred().reject(json.fromJson(err.responseText));
+            });
+        },
+        putWithSecret: function(response,secret) {
+            var query = xhr.objectToQuery({secret:secret});
+            var body = json.toJson(this._doSerialize(response));
+            return xhr('PUT',{
+                url: '/api/open/responses/' + this.getId(response) + '?' + query,
+                handleAs: 'json',
+                contentType: 'application/json',
+                rawBody: body
+            }).then(lang.hitch(this,'_doDeserialize'),function(err){
+                return new Deferred().reject(json.fromJson(err.responseText));
+            });
+        },
+        removeWithSecret: function(response,secret) {
+            var query = xhr.objectToQuery({secret:secret});
+            var rev = this.getRev(response);
+            var body = json.toJson(this._doSerialize(response));
+            var headers = {};
+            if ( rev ) {
+                headers['If-Match'] = '"'+rev+'"';
+            }
+            return xhr('DELETE',{
+                url: '/api/open/responses/' + this.getId(response) + '?' + query,
+                headers: headers,
+                handleAs: 'json',
+                contentType: 'application/json',
+                rawBody: body
+            });
         }
-    };
-    return SurveyRun;
+    });
+
+    return new Responses();
+
 });

Dev/trunk/src/client/qed-client/model/classes/surveyRuns.js

@@ -1 @@
-define(['dojo/_base/lang','dojo/date/locale','dojo/date/stamp'],function(lang,locale,stamp){
-    var SurveyRun = {
-        create: function(){
-            return { type:'SurveyRun' };
+define([
+    "./_Class",
+    "./surveys",
+    "dojo/_base/declare",
+    "dojo/date/stamp"
+], function(_Class, surveys, declare, stamp) {
+
+    var SurveyRuns = declare([_Class],{
+        _collection: 'surveyRuns',
+        _type: 'SurveyRun',
+        create: function() {
+            var obj = {
+                type: this._type,
+                description: "",
+                mode: "open",
+                survey: null,
+                title: ""
+            };
+            return obj;
         },
-        StartDate: {
-            get: function(sr) {
-                var d;
-                if ( sr.startDate ) {
-                    d = lang.isString(sr.startDate) ? stamp.fromISOString(sr.startDate) : sr.startDate;
-                }
-                return d;
-            },
-            set: function(sr,d) {
-                if ( d ) {
-                    sr.startDate = lang.isString(d) ? stamp.toISOString(d) : d;
-                }
+        _deserialize: function(obj) {
+            if (obj.endDate) {
+                obj.endDate = stamp.fromISOString(obj.endDate);
+            }
+            if (obj.startDate) {
+                obj.startDate = stamp.fromISOString(obj.startDate);
+            }
+            if (obj.survey) {
+                obj.survey = surveys._doDeserialize(obj.survey);
             }
         },
-        EndDate: {
-            get: function(sr) {
-                var d;
-                if ( sr.endDate ) {
-                    d = lang.isString(sr.endDate) ? stamp.fromISOString(sr.endDate) : sr.endDate;
-                }
-                return d;
-            },
-            set: function(sr,d) {
-                if ( d ) {
-                    sr.endDate = lang.isString(d) ? stamp.toISOString(d) : d;
-                }
+        _serialize: function(obj) {
+            if (obj.endDate) {
+                obj.endDate = stamp.toISOString(obj.endDate);
             }
-        },
-        DisplayTitle: {
-            get: function(sr) {
-                var t = "Run of '"+sr.survey.title+"'";
-                if ( sr.startDate ) {
-                    t += " from "+locale.format(SurveyRun.StartDate.get(sr));
-                }
-                if ( sr.endDate ) {
-                    t += " until "+locale.format(SurveyRun.EndDate.get(sr));
-                }
-                return t;
+            if (obj.startDate) {
+                obj.startDate = stamp.toISOString(obj.startDate);
             }
-        },
-        Survey: {
-            get: function(sr) {
-                return sr.survey || null;
-            },
-            set: function(sr,s) {
-                sr.survey = s;
-                return sr;
+            if (obj.survey) {
+                obj.survey = surveys._doSerialize(obj.survey);
             }
         }
-    };
-    return SurveyRun;
+    });
+
+    return new SurveyRuns();
+
 });

Dev/trunk/src/client/qed-client/model/classes/surveys.js

@@ -1 @@
-define(function(){
-    return {
-        create: function(){
-            return { type:'Survey' };
+define([
+    "./_Class",
+    "dojo/_base/declare",
+    "dojo/date/stamp",
+    "dojo/store/JsonRest"
+], function(_Class, declare, stamp, JsonRest) {
+
+    var Surveys = declare([_Class],{
+        _collection: 'surveys',
+        _type: 'Survey',
+        create: function() {
+            var obj = {
+                type: this._type,
+                questions: [],
+                title: ""
+            };
+            return obj;
         },
-        DisplayTitle: {
-            get: function(s) {
-                return s.title || '';
+        _deserialize: function(obj) {
+            if (obj.publicationDate) {
+                obj.publicationDate = stamp.fromISOString(obj.publicationDate);
             }
         },
-        Questions: {
-            get: function(s) {
-                return s.questions || [];
-            },
-            set: function(s,questions) {
-                s.questions = questions;
+        _serialize: function(obj) {
+            if (obj.publicationDate) {
+                obj.publicationDate = stamp.toISOString(obj.publicationDate);
             }
         }
-    };
+    });
+
+    return new Surveys();
+
 });

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

@@ -1 +1 @@
 define([
-    "../../store",
+    "../classes/categories",
+    "../classes/topics",
     "./CategoryListView",
     "dijit/_Container",
@@ -15 +16 @@
     "require",
     "dojo/text!./templates/QuestionEditorToolkit.html"
-], function(store, CategoryListView, _Container, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, Button, ComboBox, declare, lang, Source, domConstruct, Memory, require, template) {
+], function(categories, topics, CategoryListView, _Container, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, Button, ComboBox, declare, lang, Source, domConstruct, Memory, require, template) {
     return declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, _Container], {
 
@@ -107 +108 @@
             this.inherited(arguments);
 
-            store.query("_design/questions/_view/all", {reduce:true, group:false, group_level:1})
-            .forPairs(lang.hitch(this, function(value, key) {
-                this._categoryStore.put({ id: key[0] });
+            categories.query().forEach(lang.hitch(this,function(cat){
+                this._categoryStore.put({ id: cat });
             }));
 
-            store.query("_design/questions/_view/all_topics", {reduce:true, group:true})
-            .forPairs(lang.hitch(this, function(value, key) {
-                this._topicStore.put({ id: key });
+            topics.query().forEach(lang.hitch(this,function(topic){
+                this._categoryStore.put({ id: topic });
             }));
         },

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

@@ -1 +1 @@
 define([
     "../../widgets/_ComplexValueWidget",
-    "../classes/Survey",
     "./questions/Factory",
     "dojo/_base/array",
@@ -7 +6 @@
     "dojo/dom-construct",
     "dojo/text!./templates/SurveyRenderWidget.html"
-], function(_ComplexValueWidget, Survey, QuestionWidgetFactory, array, declare, domConstruct, template) {
+], function(_ComplexValueWidget, QuestionWidgetFactory, array, declare, domConstruct, template) {
     return declare([_ComplexValueWidget],{
         templateString: template,
@@ -22 +21 @@
             this.survey = survey;
             var f = new QuestionWidgetFactory();
-            array.forEach(Survey.Questions.get(this.survey),function(question,question_index){
+            array.forEach(this.survey.questions,function(question,question_index){
                 array.forEach(question.content || [], function(item,item_index){
                     // The dot causes values to be grouped in an object!

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

@@ -1 +1 @@
 define([
-    "../../store",
-    "../classes/Survey",
     "dijit/_TemplatedMixin",
     "dijit/_WidgetBase",
@@ -7 +5 @@
     "dojo/dom-attr",
     "dojo/text!./templates/SurveySummary.html"
-], function(store, Survey, _TemplatedMixin, _WidgetBase, declare, domAttr, template) {
+], function(_TemplatedMixin, _WidgetBase, declare, domAttr, template) {
     return declare([_WidgetBase,_TemplatedMixin],{
         templateString: template,
@@ -18 +16 @@
         },
         _setValueAttr: function(survey) {
-            this.titleNode.innerHTML = Survey.DisplayTitle.get(survey);
-            var id = store.getIdentity(survey);
-            domAttr.set(this.titleNode, "href", id && ("#!/survey/"+id));
+            this.titleNode.innerHTML = survey.title || "";
+            domAttr.set(this.titleNode, "href", survey._id && ("#!/survey/"+survey._id));
             this.descriptionNode.innerHTML = survey.description;
-            this.questionsNode.innerHTML = (survey.questions || []).length;
+            this.questionsNode.innerHTML = survey.questions.length;
         }
     });

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

@@ -1 +1 @@
 define([
-    'dojo/_base/declare',
-    'dojo/_base/lang',
-    'dojo/_base/window',
-    'dijit/layout/ContentPane',
-    'dijit/layout/TabContainer',
-    'dojox/widget/Standby',
-    '../../store',
-    '../../widgets/Selector'
-],function(declare,lang,win,ContentPane,TabContainer,Standby,store,Selector){
+    "../../widgets/Selector",
+    "../classes/categories",
+    "../classes/questions",
+    "../classes/topics",
+    "dijit/layout/ContentPane",
+    "dijit/layout/TabContainer",
+    "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],{
         tabPosition: 'left-h',
@@ -38 +40 @@
                 this._fillCategoryTab(newTab.__category);
             }));
-            store.query(this._query, {reduce:true,group:true,group_level:1})
-            .forPairs(lang.hitch(this,function(value,key){
-                this._createCategoryTab(key[0],value);
+            categories.query()
+            .forEach(lang.hitch(this,function(cat){
+                this._createCategoryTab(cat.name,cat.count);
             }));
         },
@@ -61 +63 @@
                 this._busy();
                 categoryMap._filled = true;
-                store.query(this._query, {reduce:true,group:true,group_level:2,startkey:[category],endkey:[category,{}]})
-                .forPairs(lang.hitch(this,function(value,key){
-                    this._createTopicSelector(key[1],category,value);
+                topics.query({category:category})
+                .forEach(lang.hitch(this,function(topic){
+                    this._createTopicSelector(topic.name,category,topic.count);
                 })).then(lang.hitch(this,function(){
                     this._done();
@@ -101 +103 @@
                 topicMap._filled = true;
                 this._busy();
-                store.query(this._query, {
-                    reduce:false,
-                    include_docs:true,
-                    key:[category,topic]
-                }).forEach(lang.hitch(this,function(value){
+                questions.query({category:category,topic:topic})
+                .forEach(lang.hitch(this,function(value){
                     topicMap._widget.addItem(value);
                 })).then(lang.hitch(this,function(){

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

@@ -1 +1 @@
 define([
     "../app/Page",
-    "../store",
+    "../model/classes/surveys",
     "dojo/_base/array",
     "dojo/_base/declare",
@@ -8 +8 @@
     "require",
     "dojo/text!./templates/previewSurvey.html"
-], function(Page, store, array, declare, lang, when, require, template) {
+], function(Page, surveys, array, declare, lang, when, require, template) {
     return declare([Page],{
         contextRequire: require,
@@ -16 +16 @@
             this.inherited(arguments);
             if ( this.surveyId ) {
-                when(store.get(this.surveyId))
+                when(surveys.load(this.surveyId))
                 .then(lang.hitch(this,function(survey){
-                    this.titleNode.innerHTML = survey.title;
+                    this.titleNode.innerHTML = survey.title || "";
                     this.surveyWidget.set('survey',survey);
                 }));

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

@@ -3 +3 @@
     "../app/Page",
     "../app/Router",
-    "../model/classes/Question",
+    "../model/classes/questions",
     "../model/widgets/QuestionEditorPreview",
     "../model/widgets/QuestionEditorToolkit",
-    "../store",
     "../widgets/_ComplexValueMixin",
     "dojo/_base/declare",
@@ -13 +12 @@
     "dojo/when",
     "dojo/text!./templates/question.html"
-], function(Content, Page, Router, Question, QuestionEditorPreview, QuestionEditorToolkit, store, _ComplexValueMixin, declare, event, lang, when, template) {
+], function(Content, Page, Router, questions, QuestionEditorPreview, QuestionEditorToolkit, _ComplexValueMixin, declare, event, lang, when, template) {
     return declare([Page,_ComplexValueMixin], {
         templateString: template,
@@ -43 +42 @@
             }
             if (this.questionId === "new") {
-                this.set('value', Question.create());
+                this.set('value', questions.create());
             } else {
-                when(store.get(this.questionId))
+                when(questions.load(this.questionId))
                 .then(lang.hitch(this, function(value) {
                     this.set('value', value);
@@ -54 +53 @@
             this.value = value;
             this.inherited(arguments);
-            this.titleNode.innerHTML = Question.DisplayTitle.get(value);
+            this.titleNode.innerHTML = value.title || "";
         },
         _getValueAttr: function() {
@@ -63 +62 @@
         _onSave: function(evt) {
             if ( this.validate() ) {
-                var value = this.get('value');
-                store.put(value)
+                questions.save(this.get('value'))
                 .then(function() {
                     Router.go('/questions');

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

@@ -1 +1 @@
 define([
-    'dojo/_base/declare',
-    'dojo/_base/Deferred',
-    'dojo/_base/event',
-    'dojo/_base/lang',
-    '../store',
-    '../app/Content',
-    '../app/Router',
-    '../app/Page',
-    '../model/widgets/TabbedQuestionBrowser',
-    'dojo/text!./templates/questions.html'
-],function(declare,Deferred,event,lang,store,Content,Router,Page,TabbedQuestionBrowser,template) {
+    "../app/Content",
+    "../app/Page",
+    "../app/Router",
+    "../model/classes/questions",
+    "../model/widgets/TabbedQuestionBrowser",
+    "dojo/_base/Deferred",
+    "dojo/_base/declare",
+    "dojo/_base/event",
+    "dojo/_base/lang",
+    "dojo/text!./templates/questions.html"
+], function(Content, Page, Router, questions, TabbedQuestionBrowser, Deferred, declare, event, lang, template) {
     return declare([Page],{
         templateString: template,
@@ -44 +44 @@
         },
         onDeleteQuestion: function(question) {
-            store.remove(store.getIdentity(question),store.getRevision(question))
+            questions.remove(question)
             .then(function(){
                 Content.notify("Question deleted.");
@@ -55 +55 @@
         },
         onPublishQuestion: function(question) {
-            question.publicationDate = store.timestamp();
-            store.put(question)
+            question.publicationDate = new Date();
+            questions.save(question)
             .then(function(){
                 Content.notify("Question published.");

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

@@ -3 +3 @@
     "../app/Page",
     "../lib/async",
-    "../model/classes/Response",
-    "../model/classes/Survey",
-    "../model/classes/SurveyRun",
-    "../store",
+    "../model/classes/responses",
     "dojo/_base/declare",
     "dojo/_base/event",
@@ -16 +13 @@
     "require",
     "dojo/text!./templates/response.html"
-], function(Content, Page, async, Response, Survey, SurveyRun, store, declare, event, json, lang, all, request, when, require, template) {
+], function(Content, Page, async, responses, declare, event, json, lang, all, request, when, require, template) {
     return declare([Page],{
         contextRequire: require,
@@ -28 +25 @@
             this.inherited(arguments);
             this._disableSubmit();
-            var surveyRunId = this.surveyRunId;
-            var responseId = this.options && this.options.id;
-            if ( surveyRunId && responseId ) {
-                this._loadSurveyAndResponse(surveyRunId,responseId)
-                .then(lang.hitch(this, function() {
-                    if ( this.response.publicationDate ) {
-                        this._showInfo("<div>You already submitted your survey and cannot change it anymore. You can still view your answers here.</div>");
-                        this._disableSubmit();
-                    } else {
-                        this._enableSubmit();
-                    }
-                }), lang.hitch(this,function() {
-                    this._showInfo("<div>The url seems to be incorrect, no survey found.</div>");
-                }));
+            if ( !this.response ) {
+                this._showInfo("<div>The url seems to be incorrect, no response found.</div>");
             } else {
-                throw new Error("No valid uid or survey passed!");
+                this.titleNode.innerHTML = this.response._surveyRun.survey.title || "";
+                this.surveyWidget.set('survey', this.response._surveyRun.survey);
+                this.surveyWidget.set('value', this.response.answers || {});
+                if ( this.response.publicationDate ) {
+                    this._showInfo("<div>You already submitted your survey and cannot change it anymore. You can still view your answers here.</div>");
+                    this._disableSubmit();
+                } else {
+                    this._enableSubmit();
+                }
             }
-        },
-        _loadSurveyAndResponse: function(surveyRunId,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];
-                this.response = surveyAndResponse[1];
-                if ( this.response.surveyRunId !== surveyRunId ) {
-                    throw "Survey does not match the response...";
-                }
-                this.titleNode.innerHTML = Survey.DisplayTitle.get(surveyRun.survey);
-                this.surveyWidget.set('survey', surveyRun.survey);
-                this.surveyWidget.set('value', this.response.answers || {});
-            }));
         },
         _enableSubmit: function() {
@@ -78 +57 @@
             var answers = this.surveyWidget.get('value');
             this.response.answers = answers;
-            return request.put('/api/responses/'+store.getIdentity(this.response),{
-                handleAs:'json',
-                data:json.toJson(this.response),
-                headers:{"Content-Type": "application/json"}
-            }).then(lang.hitch(this,function(res){
-                this.response._rev = res.rev;
+            return responses.putWithSecret(this.response,this.response.secret)
+            .then(lang.hitch(this,function(response){
+                this.response = response;
                 Content.notify("Your response is saved.");
             }), function(err){
@@ -90 +66 @@
         },
         _onSubmit: function(e) {
-            this.response.publicationDate = store.timestamp();
+            this.response.publicationDate = new Date();
             this._getAnswersAndSaveResponse()
             .then(lang.hitch(this,function(){
@@ -110 +86 @@
             this._disableSubmit();
             this.surveyWidget.destroy();
-            request('/api/responses/'+store.getIdentity(this.response)+'?rev='+store.getRevision(this.response),{
-                method: 'DELETE',
-                handleAs:'json',
-                data:json.toJson(this.response),
-                headers:{"Content-Type": "application/json"}
-            }).then(lang.hitch(this,function(res){
+            responses.removeWithSecret(this.response,this.response.secret)
+            .then(lang.hitch(this,function(res){
                 this._showInfo("<div>Your response has been deleted, no answers have been saved.</div>");
                 Content.notify("Your response is deleted.");

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

@@ -1 +1 @@
 define([
-    'dojo/_base/array',
+    /*'dojo/_base/array',
     'dojo/_base/declare',
     'dojo/_base/event',
@@ -12 +12 @@
     '../model/classes/SessionTemplate',
     '../model/widgets/AccountListView',
-    'dojo/text!./templates/session.html'
+    'dojo/text!./templates/session.html'*/
 ],function(array,declare,event,lang,when,search,store,Page,Router,ThresholdFilteringSelect,SessionTemplate,AccountListView,template){
-    return declare([Page],{
+    /*return declare([Page],{
         templateString: template,
         session: null,
@@ -92 +92 @@
 
 
-    });
+    });*/
 });
 

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

@@ -1 +1 @@
 define([
-    'dojo/_base/declare',
+    /*'dojo/_base/declare',
     'dojo/_base/lang',
     'dojo/date/stamp',
@@ -7 +7 @@
     '../app/Page',
     '../widgets/ObjectBox',
-    'dojo/text!./templates/sessions.html'
+    'dojo/text!./templates/sessions.html'*/
 ],function(declare,lang,dateStamp,store,Router,Page,ObjectBox,template){
-    return declare([Page],{
+    /*return declare([Page],{
         templateString: template,
         templateActions: null,
@@ -18 +18 @@
             this.templateActions = {
                 "Edit": function(obj){
-                    Router.go('/session/'+store.getIdentity(obj));
+                    Router.go('/session/'+obj.get('id'));
                 },
                 "Delete": lang.hitch(this,function(obj){
-                    store.remove(store.getIdentity(obj),store.getRevision(obj))
+                    obj.remove()
                     .then(lang.hitch(this,function(){
                         this._refresh();
@@ -30 +30 @@
             this.sessionActions = {
                 "Facilitate": function(obj){
-                    Router.go('run',{uid:store.getIdentity(obj)});
+                    Router.go('run',{uid: obj.get('id')});
                 },
                 "Delete": lang.hitch(this,function(obj){
-                    store.remove(store.getIdentity(obj),store.getRevision(obj))
+                    obj.remove()
                     .then(lang.hitch(this,function(){
                         this._refresh();
@@ -48 +48 @@
         },
         _refreshByType: function(type,container,actions) {
+            // FIXME
             store.query("_design/default/_view/by_type",{key:type})
             .forEach(lang.hitch(this,function(obj){
@@ -61 +62 @@
         },
         _publishSession: function(sessionTemplate) {
+            // FIXME
             var session = lang.clone(sessionTemplate);
             delete session[store.idProperty];
@@ -73 +75 @@
             }));
         }
-    });
+    });*/
 });

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

@@ -2 +2 @@
     "../app/Page",
     "../app/Router",
-    "../model/classes/Survey",
+    "../model/classes/surveys",
     "../model/widgets/QuestionListView",
     "../model/widgets/TabbedQuestionBrowser",
-    "../store",
     "dojo/_base/array",
     "dojo/_base/declare",
@@ -13 +12 @@
     "require",
     "dojo/text!./templates/survey.html"
-], function(Page, Router, Survey, QuestionListView, TabbedQuestionBrowser, store, array, declare, event, lang, when, require, template) {
+], function(Page, Router, surveys, QuestionListView, TabbedQuestionBrowser, array, declare, event, lang, when, require, template) {
     return declare([Page],{
         contextRequire: require,
@@ -63 +62 @@
         _loadSurvey: function() {
             if ( this.surveyId === "new" ) {
-                this.survey = Survey.create();
+                this.survey = surveys.create();
                 this.refresh();
             } else {
-                when(store.get(this.surveyId))
+                when(surveys.load(this.surveyId))
                 .then(lang.hitch(this,function(survey){
                     this.survey = survey;
                     this.questionList.set('value',
-                                          Survey.Questions.get(this.survey));
+                                          this.survey.questions);
                     this.refresh();
                 }));
@@ -79 +78 @@
         },
         refresh: function() {
-            this.titleNode.innerHTML = Survey.DisplayTitle.get(this.survey) || "(set title in properties)";
+            this.titleNode.innerHTML = this.survey.title || "(set title in properties)";
             this.propertiesDialog.set('value',this.survey);
         },
@@ -100 +99 @@
         _onSave: function(evt) {
             this.survey.questions = this.questionList.get('value');
-            store.put(this.survey)
+            surveys.save(this.survey)
             .then(function() { 
                 Router.go('/surveys');
@@ -111 +110 @@
         },
         _onShowPreview: function() {
-            Router.go('/previewSurvey/'+store.getIdentity(this.survey),{
+            Router.go('/previewSurvey/'+this.survey._id,{
                 preview: true
             });

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

@@ -4 +4 @@
     "../app/Router",
     "../lib/func",
-    "../model/classes/SurveyRun",
-    "../store",
+    "../model/classes/responses",
+    "../model/classes/surveyRuns",
     "../widgets/LineWithActionsWidget",
+    "dojo/_base/array",
     "dojo/_base/declare",
     "dojo/_base/event",
@@ -13 +14 @@
     "require",
     "dojo/text!./templates/surveyRun.html"
-], function(Content, Page, Router, func, SurveyRun, store, LineWithActionsWidget, declare, event, lang, when, require, template) {
+], function(Content, Page, Router, func, responses, surveyRuns, LineWithActionsWidget, array, declare, event, lang, when, require, template) {
     return declare([Page],{
         contextRequire: require,
@@ -24 +25 @@
             if ( this.surveyRunId ) {
                 this._loadSurveyRun();
-                this._loadResponses();
             } else {
                 throw "No valid uid or survey passed!";
@@ -30 +30 @@
         },
         _loadSurveyRun: function() {
-            when(store.get(this.surveyRunId))
+            when(surveyRuns.load(this.surveyRunId))
             .then(lang.hitch(this,function(surveyRun){
                 this.surveyRun = surveyRun;
                 this.refreshSurveyRun();
+                this._loadResponses();
             }));
         },
         refreshSurveyRun: function() {
-            this.titleNode.innerHTML = SurveyRun.DisplayTitle.get(this.surveyRun);
-            this.surveySummaryWidget.set('value',SurveyRun.Survey.get(this.surveyRun));
+            this.titleNode.innerHTML = this.surveyRun.title || "";
+            this.surveySummaryWidget.set('value',this.surveyRun.survey);
             this.surveyRunWidget.set('value',this.surveyRun);
             this._onPropChange();
         },
         _loadResponses: function() {
-            when(store.query("_design/responses/_view/by_surveyrun",{key:this.surveyRunId}))
-            .forEach(lang.hitch(this,function(response){
-                var actions = {
-                    view: {
-                        callback: function(){},
-                        properties: {
-                            title: "View response"
-                        }
-                    }
-                };
-                if ( !response.publicationDate ) {
-                    actions.remove = {
-                        callback: function(){},
-                        properties: {
-                            title: "Remove response"
+            responses.query({surveyRunId:surveyRuns.getId(this.surveyRun)})
+            .then(lang.hitch(this,function(allResponses){
+                array.forEach(allResponses, function(response){
+                    var actions = {
+                        view: {
+                            callback: function(){},
+                            properties: {
+                                title: "View response"
+                            }
                         }
                     };
-                }
-                var w = new LineWithActionsWidget({
-                    actions: actions
-                });
-                var responseId = store.getIdentity(response);
-                w.set('title',this._link(this._getResponseURL(this.surveyRunId,responseId),responseId));
-                w.placeAt(this.responsesNode);
+                    if ( !response.publicationDate ) {
+                        actions.remove = {
+                            callback: function(){},
+                            properties: {
+                                title: "Remove response"
+                            }
+                        };
+                    }
+                    var w = new LineWithActionsWidget({
+                        actions: actions
+                    });
+                    var rid = responses.getId(response);
+                    w.set('title',this._link(this._buildResponseURL(response),rid),rid);
+                    w.placeAt(this.responsesNode);
+                }, this);
             }));
         },
@@ -73 +76 @@
             if ( surveyRun.mode === "open" ) {
                 this.runURLNode.innerHTML =
-                    this._link(this._getGeneralURL(store.getIdentity(this.surveyRun)));
+                    this._link(this._buildGeneralURL(this.surveyRun));
             } else {
                 this.runURLNode.innerHTML =
@@ -79 +82 @@
             }
         },
-        _getGeneralURL: function(surveyRunId) {
-            return 'response.html#!/'+surveyRunId;
+        _buildGeneralURL: function(surveyRun) {
+            return 'response.html#!/surveyRuns/'+surveyRuns.getId(surveyRun)+'!secret='+surveyRun.secret;
         },
-        _getResponseURL: function(surveyRunId,responseId) {
-            return 'response.html#!/'+surveyRunId+'!id='+responseId;
+        _buildResponseURL: function(response) {
+            return 'response.html#!/responses/'+responses.getId(response)+'!secret='+response.secret;
         },
         _link: function(url,label) {
@@ -92 +95 @@
                 lang.mixin(this.surveyRun,this.surveyRunWidget.get('value'));
 
-                var SD = SurveyRun.StartDate;
-                var ED = SurveyRun.EndDate;
-                SD.set(this.surveyRun, SD.get(this.surveyRun));
-                ED.set(this.surveyRun, ED.get(this.surveyRun));
-
-                store.put(this.surveyRun)
+                surveyRuns.save(this.surveyRun)
                 .then(function() { 
                     Router.go('/surveys');

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

@@ -1 +1 @@
 define([
-    'dojo/_base/array',
-    'dojo/_base/declare',
-    'dojo/_base/lang',
-    'dojo/when',
-    '../store',
-    '../app/Content',
-    '../app/Page',
-    '../app/Router',
-    '../model/classes/Survey',
-    '../model/classes/SurveyRun',
-    '../widgets/LineWithActionsWidget',
-    'dojo/text!./templates/surveys.html'
-],function(array,declare,lang,when,store,Content,Page,Router,Survey,SurveyRun,LineWithActionsWidget,template){
+    "../app/Content",
+    "../app/Page",
+    "../app/Router",
+    "../model/classes/surveys",
+    "../model/classes/surveyRuns",
+    "../widgets/LineWithActionsWidget",
+    "dojo/_base/array",
+    "dojo/_base/declare",
+    "dojo/_base/lang",
+    "dojo/when",
+    "dojo/text!./templates/surveys.html"
+], function(Content, Page, Router, surveys, surveyRuns, LineWithActionsWidget, array, declare, lang, when, template) {
     return declare([Page],{
         templateString: template,
@@ -25 +24 @@
         _onPublishSurvey:function(survey){
             var self = this;
-            survey.publicationDate = store.timestamp();
-            store.put(survey).then(function(){
+            survey.publicationDate = new Date();
+            surveys.save(survey)
+            .then(function(){
                 self.refreshDrafts();
                 self.refreshPublished();
@@ -35 +35 @@
         _onDeleteSurvey:function(survey){
             var self = this;
-            store.remove(store.getIdentity(survey),store.getRevision(survey))
+            surveys.remove(survey)
             .then(function(){
                 self.refreshDrafts();
@@ -43 +43 @@
         },
         _onEditSurvey:function(survey){
-            Router.go('/survey/'+store.getIdentity(survey));
+            Router.go('/survey/'+survey._id);
         },
         _onPreviewSurvey:function(survey){
-            Router.go('/previewSurvey/'+store.getIdentity(survey));
+            Router.go('/previewSurvey/'+survey._id);
         },
         _onRunSurvey:function(survey){
-            var surveyRun = SurveyRun.create();
-            SurveyRun.Survey.set(surveyRun,survey);
-            store.put(surveyRun)
+            var surveyRun = surveyRuns.create();
+            surveyRun.survey = survey;
+            surveyRuns.save(surveyRun)
             .then(lang.hitch(this,function(surveyRun){
                 this._onRunDetails(surveyRun);
@@ -59 +59 @@
         },
         _onRunDetails: function(surveyRun) {
-            Router.go('/surveyRun/'+store.getIdentity(surveyRun));
+            Router.go('/surveyRun/'+surveyRun._id);
         },
         refresh: function() {
@@ -68 +68 @@
         refreshDrafts: function() {
             this.draftsContainer.set('content','');
-            when(store.query("_design/surveys/_view/drafts"),
-                    lang.hitch(this,function(surveys) {
+            when(surveys.query({drafts:true}), lang.hitch(this,function(surveys) {
                 this.draftsTab.set('title','Drafts ('+surveys.length+')');
                 array.forEach(surveys,function(survey){
                     var w = new LineWithActionsWidget({
-                        title: Survey.DisplayTitle.get(survey) || '(unnamed)',
+                        title: survey.title || '(unnamed)',
                         actions: [{
                             callback: lang.hitch(this,'_onPublishSurvey',survey),
@@ -110 +109 @@
         refreshPublished: function() {
             this.publishedContainer.set('content','');
-            when(store.query("_design/surveys/_view/published"),
-                    lang.hitch(this, function(surveys) {
+            when(surveys.query({published:true}), lang.hitch(this, function(surveys) {
                 this.publishedTab.set('title','Published ('+surveys.length+')');
                 array.forEach(surveys,function(survey){
                     var w = new LineWithActionsWidget({
-                        title: Survey.DisplayTitle.get(survey),
+                        title: survey.title || "",
                         actions:[{
                             callback: lang.hitch(this,'_onPreviewSurvey',survey),
@@ -138 +136 @@
         refreshRuns: function() {
             this.runsContainer.set('content','');
-            when(store.query("_design/default/_view/by_type",{key:'SurveyRun'}),
-                    lang.hitch(this,function(surveyRuns){
+            when(surveyRuns.query(), lang.hitch(this,function(surveyRuns){
                 this.runsTab.set('title','Runs ('+surveyRuns.length+')');
                 array.forEach(surveyRuns,function(surveyRun){
                     var w = new LineWithActionsWidget({
-                        title: SurveyRun.DisplayTitle.get(surveyRun),
+                        title: surveyRun.title || "",
                         actions:[{
                             callback: lang.hitch(this,'_onRunDetails',surveyRun),

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

@@ -4 +4 @@
     "./app/Path",
     "./lib/async",
-    "./model/classes/Response",
-    "./model/classes/SurveyRun",
+    "./model/classes/responses",
+    "./model/classes/surveyRuns",
     "./pages/response",
-    "./store",
     "dojo/_base/json",
     "dojo/date",
@@ -16 +15 @@
     "./stddeps",
     "dojo/domReady!"
-], function(Content, Page, Path, async, Response, SurveyRun, ResponsePage, store, json, date, locale, hash, parser, request) {
+], function(Content, Page, Path, async, responses, surveyRuns, ResponsePage, json, date, locale, hash, parser, request) {
     parser.parse();
     Content.startup();
@@ -26 +25 @@
     }
 
-    var path = new Path('/:surveyRunId');
+    var path = new Path('/:type/:id');
     var params = path.match(hash());
     params.options = params.options || {};
-
-    if ( !params || !params.surveyRunId ) {
+    
+    if ( params && params.type === 'surveyRuns' ) {
+        var response = responses.create();
+        response.surveyRunId = params.id;
+        responses.postWithSecret(response,params.options.secret)
+        .then(setContent,function(err){ error(err.error); });
+    } else if ( params && params.type === 'responses' ) {
+        responses.getWithSecret(params.id,params.options.secret)
+        .then(setContent,function(err){ error(err.error); });
+    } else {
         error("Something is wrong with the URL, don't know what survey to show you. Sorry.");
-        return;
     }
 
-    var surveyRunId = params.surveyRunId;
-
-    function checkDates(surveyRun) {
-        var now = new Date();
-        var startDate = SurveyRun.StartDate.get(surveyRun);
-        var endDate = SurveyRun.EndDate.get(surveyRun);
-        if ( startDate && date.compare(startDate,now) > 0 ) {
-            error("This survey will start on "+locale.format(startDate,'date'));
-            throw false;
-        }
-        if ( endDate && date.compare(now,endDate) > 0 ) {
-            error("This survey ended on "+locale.format(endDate,'date'));
-            throw false;
-        }
+    function setContent(response) {
+        hash(Path.format("/responses/"+responses.getId(response),
+                         {secret:response.secret}));
+        Content.set(new ResponsePage({
+            response: response
+        }));
     }
 
-    request.get('/api/surveyRuns/'+surveyRunId,{handleAs:'json'})
-    .then(function(surveyRun){
-        checkDates(surveyRun);
-        if ( params.options.id ) {
-            return params.options.id;
-        } else {
-            if ( surveyRun.mode === "open") {
-                var response = Response.create();
-                response.surveyRunId = surveyRunId;
-                return request.post('/api/responses',{
-                    handleAs:'json',
-                    data:json.toJson(response),
-                    headers:{"Content-Type": "application/json"}
-                }).then(function(res){
-                    return res.id;
-                });
-            } else {
-                error("Cannot respond to closed survey without response id. Sorry.");
-                throw false;
-            }
-        }
-        return surveyRun;
-    },function(){
-        error("No running survey found for the given id. Sorry.");
-        throw false;
-    })
-    .then(function(responseId){
-        hash(Path.format("/"+surveyRunId,{ id: responseId }));
-        Content.set(new ResponsePage({
-            surveyRunId: surveyRunId,
-            options: {
-                id: responseId
-            }
-        }));
-    });
 });

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

@@ -1 +1 @@
 define([
-    './pages/index',
-    './pages/questions',
-    './pages/question',
-    './pages/surveys',
-    './pages/survey',
-    './pages/surveyRun',
-    './pages/sessions',
-    './pages/session',
-    './pages/previewSurvey'
-],function(index,questions,question,surveys,survey,surveyRun,sessions,session,previewSurvey){
+    "./pages/index",
+    "./pages/previewSurvey",
+    "./pages/question",
+    "./pages/questions",
+    "./pages/survey",
+    "./pages/surveyRun",
+    "./pages/surveys"
+], function(index, previewSurvey, question, questions, survey, surveyRun, surveys) {
 
     return [

Dev/trunk/src/client/qed-client/session.coffee

@@ -2 +2 @@
     "dojo/_base/declare",
     "dojo/_base/json",
+    "dojo/Deferred",
     "dojo/Evented",
     "dojo/request"
-], (declare, json, Evented, request) ->
+], (declare, json, Deferred, Evented, request) ->
     Session = declare [Evented],
         info: null
@@ -18 +19 @@
                 @_set res
             , () =>
-                throw (@_set null)
+                new Deferred().reject (@_set null)
 
         login: (username, password) ->
@@ -30 +31 @@
                 @_set res
             , () =>
-                throw (@_set null)
+                new Deferred().reject (@_set null)
 
         logout: () ->
@@ -45 +46 @@
                 @info = newInfo
                 @emit 'change', @info
-                @info
+            @info
 
     new Session()

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

@@ -1 +1 @@
 define([
+
     // dijit & rft widgets used declaratively in templates
     'dijit/Dialog',
@@ -43 +44 @@
     './widgets/Selector',
     './widgets/TitleGroup'
+
 ],function(){});

Dev/trunk/src/client/qed-client/ui/LoginDialogWrapper.coffee

@@ -17 +17 @@
             if @_started then return
             @inherited arguments
-            _on session, 'change', (lang.hitch @, @onUserChange)
+            _on session, 'change', (lang.hitch @, 'onUserChange')
             @onUserChange session.get()
         onLogin: (evt) ->
@@ -35 +35 @@
             else
                 @loginDialog.show()
+            null

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

@@ -2 +2 @@
     "./session",
     "dojo/Deferred",
+    "dojo/_base/lang",
     "dojo/on",
-    "dojo/request"
-], function(session, Deferred, on, request) {
+    "dojo/_base/xhr"
+], function(session, Deferred, lang, on, xhr) {
 
     var user = session.get();
     var queue = [];
     
-    on(session, 'change', function(newUser) {
+    on(session, 'change', function(newUser){
         user = newUser;
-        if ( user ) {
-            retry();
-        }
+        retry();
     });
-    
+
     function retry() {
-        if (queue.length > 0) {
+        if (user && queue.length > 0) {
             var item = queue.shift();
-            console.log("Retry",item.url);
+            console.log("Retry",item.options.url);
             real_request(item);
         }
@@ -25 +24 @@
     
     function real_request(item) {
-        var req = request(item.url,item.options);
+        var req = xhr(item.method,lang.mixin(item.options||{},{
+            failOk: true
+        }));
+        item.promise.ioArgs = req.ioArgs;
 
-        // forward successfull response
-        req.then(function(body){
-            item.dfd.resolve(body);
-        });
-
-        // handle unauthenticated and queued requests
-        req.response.then(function(response){
+        req.then(function(result){
+            item.dfd.resolve(result);
             retry();
-        }, function(error) {
+        }, function(error){
             if ( error.response.status === 401 ) {
                 queue.unshift(item);
                 session.restore();
             } else {
-                item.dfd.reject(error); // this should be error body
-                                        // not, the request?
+                item.dfd.reject(error);
                 retry();
             }
@@ -47 +43 @@
     }
     
-    var _request = function(url, options) {
+    var _request = function(method, options) {
         var item = {
-            url: url,
+            method: method,
             options: options,
             dfd: new Deferred()
         };
+        item.promise = lang.delegate(item.dfd.promise);
         // only do the request directly if we are authenticated and
         // there are no earlier requests queued.
         if ( user && queue.length === 0 ) {
-            console.log("Request",url);
+            console.log("Request",options.url);
             real_request(item);
         } else {
-            console.log("Push",url);
+            console.log("Push",options.url);
             queue.push(item);
         }
-        return item.dfd.promise;
+        return item.promise;
     };