Changeset 420 for Dev/branches/rest-dojo-ui/client/qed/pages/surveys.js

Timestamp:

12/16/12 20:07:35 (12 years ago)

Author:

hendrikvanantwerpen

Message:

We can store answers for surveys now!

Introduces SurveyRun?, which can be edited. Workflow not quite clear yet. A
running survey can be accessed to leave a response. When the response
has an ID, it is loaded (used for closed surveys and continuations). A
researcher cannot create responses yet. He should also be able to add
comments to responses (that he creates).

Introduced caching of store requests.

Factored out path matching and formatting.

Put object creation in separate classes, to localize model/storage
dependency. Not consistent at the moment.

File:

• Dev/branches/rest-dojo-ui/client/qed/pages/surveys.js (modified) (5 diffs)

Dev/branches/rest-dojo-ui/client/qed/pages/surveys.js

@@ -9 +9 @@
     '../app/Page',
     '../app/Router',
+    '../model/classes/Survey',
+    '../model/classes/SurveyRun',
     '../widgets/LineWithActionsWidget',
     'dojo/text!./templates/surveys.html'
-],function(array,declare,lang,when,Rx,store,Content,Page,Router,LineWithActionsWidget,template){
+],function(array,declare,lang,when,Rx,store,Content,Page,Router,Survey,SurveyRun,LineWithActionsWidget,template){
     return declare([Page],{
         templateString: template,
@@ -45 +47 @@
         },
         _onPreviewSurvey:function(survey){
-            Router.go('/viewSurvey/'+store.getIdentity(survey),{preview:true});
+            Router.go('/previewSurvey/'+store.getIdentity(survey));
         },
         _onRunSurvey:function(survey){
-            this.surveyRun = {
-                type: 'SurveyRun',
-                surveyId: store.getIdentity(survey),
-                publicationDate: store.timestamp()
-            };
-            this.surveyRunDialog.set('value',this.surveyRun);
-            this.surveyRunDialog.show();
-        },
-        _onSurveyRunOk: function() {
-            var surveyRun = lang.mixin(lang.clone(this.surveyRun),this.surveyRunDialog.get('value'));
+            var surveyRun = SurveyRun.create();
+            SurveyRun.Survey.set(surveyRun,survey);
             store.put(surveyRun)
-            .then(lang.hitch(this,function(){
-                this.surveyRunDialog.hide();
-                this.refreshRuns();
+            .then(lang.hitch(this,function(surveyRun){
+                this._onRunDetails(surveyRun);
             }),function(err){
                 Content.notify(err);
             });
         },
-        _onSurveyRunCancel: function() {
-            this.surveyRunDialog.hide();
+        _onRunDetails: function(surveyRun) {
+            Router.go('/surveyRun/'+store.getIdentity(surveyRun));
         },
         refresh: function() {
@@ -81 +74 @@
                 array.forEach(surveys,function(survey){
                     var w = new LineWithActionsWidget({
-                        title: survey.title || '(unnamed)',
+                        title: Survey.DisplayTitle.get(survey) || '(unnamed)',
                         actions: [{
                             callback: lang.hitch(this,'_onPublishSurvey',survey),
@@ -123 +116 @@
                 array.forEach(surveys,function(survey){
                     var w = new LineWithActionsWidget({
-                        title: survey.title,
+                        title: Survey.DisplayTitle.get(survey),
                         actions:[{
                             callback: lang.hitch(this,'_onPreviewSurvey',survey),
@@ -151 +144 @@
                 array.forEach(surveyRuns,function(surveyRun){
                     var w = new LineWithActionsWidget({
-                        title: surveyRun.title+" (from "+surveyRun.startDate+" to "+surveyRun.endDate+")",
+                        title: SurveyRun.DisplayTitle.get(surveyRun),
                         actions:[{
-                            callback: lang.hitch(this,'_onCloseRun',surveyRun),
+                            callback: lang.hitch(this,'_onRunDetails',surveyRun),
                             properties: {
-                                label: 'Close',
-                                tooltip: 'Close survey',
-                                icon: 'Close'
+                                label: 'Details',
+                                tooltip: 'Show details for this run',
+                                icon: 'Details'
                             }
                         }]