Changeset 531 for Dev/trunk/src/client/qed-client/pages/surveys.js

Timestamp:

03/27/14 14:44:36 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Return to using truly ISO formatted dates, including milliseconds.
• Also set constraint on surveyrun dates when value is initially set.
• Separate runs & results from surveys and questions.
• Moved date & email format to schema itself.

File:

• Dev/trunk/src/client/qed-client/pages/surveys.js (modified) (5 diffs)

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

@@ -18 +18 @@
             this.draftsTab.set('title','Drafts (<span class="qedLoading"></span>)');
             this.publishedTab.set('title','Published (<span class="qedLoading"></span>)');
-            this.runsTab.set('title','Runs (<span class="qedLoading"></span>)');
             this.refresh();
         },
@@ -56 +55 @@
         _onRunSurvey:function(survey){
             var surveyRun = surveyRuns.create();
-            surveyRun.title = 'Run of "' + survey.title + '" of '+(new Date().toString());
+            surveyRun.title = 'Run of "'+survey.title+'" of '+
+                              (new Date().toString());
             surveyRun.survey = survey;
             surveyRuns.save(surveyRun)
             .then(lang.hitch(this,function(surveyRun){
-                this._onRunDetails(surveyRun);
-            }),lang.hitch(this,function(err){
-                this.notify(err.error,'error');
-            }));
-        },
-        _onRunDetails: function(surveyRun) {
-            Router.go(surveyRuns.getObjectPath(surveyRun));
-        },
-        _onRunDelete: function(surveyRun) {
-            if ( !confirm("Are you sure you want to delete this survey run?") ) {
-                return;
-            }
-            surveyRuns.remove(surveyRun)
-            .then(lang.hitch(this,function(){
-                this.notify("SurveyRun successfully deleted.");
-                this.refreshRuns();
+                Router.go(surveyRuns.getObjectPath(
+                    surveyRuns.getId(surveyRun)));
             }),lang.hitch(this,function(err){
                 this.notify(err.error,'error');
@@ -83 +69 @@
             this.refreshDrafts();
             this.refreshPublished();
-            this.refreshRuns();
         },
         refreshDrafts: function() {
-            this.draftsContainer.set('content','');
+            this.draftsContainer.set('content','Loading draft surveys <span class="qedLoading"></span>');
             when(surveys.query({drafts:true}), lang.hitch(this,function(surveys) {
                 this.draftsTab.set('title','Drafts ('+surveys.length+')');
+                this.draftsContainer.set('content','');
                 array.forEach(surveys,function(survey){
                     var w = new LineWithActionsWidget({
@@ -127 +113 @@
         },
         refreshPublished: function() {
-            this.publishedContainer.set('content','');
+            this.publishedContainer.set('content','Loading published surveys <span class="qedLoading"></span>');
             when(surveys.query({published:true}), lang.hitch(this, function(surveys) {
+                this.publishedContainer.set('content','');
                 this.publishedTab.set('title','Published ('+surveys.length+')');
                 array.forEach(surveys,function(survey){
@@ -152 +139 @@
                 },this);
             }));
-        },
-        refreshRuns: function() {
-            this.runsContainer.set('content','');
-            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.title || "",
-                        actions:[{
-                            callback: lang.hitch(this,'_onRunDetails',surveyRun),
-                            properties: {
-                                label: 'Details',
-                                tooltip: 'Show details for this run',
-                                icon: 'Edit'
-                            }
-                        },{
-                            callback: lang.hitch(this,'_onRunDelete',surveyRun),
-                            properties: {
-                                label: 'Delete',
-                                tooltip: 'Delete this run',
-                                icon: 'Delete'
-                            }
-                        }]
-                    });
-                    this.runsContainer.addChild(w);
-                },this);
-            }));
         }
     });