Changeset 531 for Dev/trunk/src/client

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.

Location:

Dev/trunk/src/client/qed-client

Files:

• model/classes/_Class.js (modified) (1 diff)
• model/classes/sessions.js (added)
• model/widgets/SurveyRunWidget.js (modified) (2 diffs)
• pages/surveyRuns.js (added)
• pages/surveys.js (modified) (5 diffs)
• pages/templates/surveyRuns.html (added)
• pages/templates/surveys.html (modified) (1 diff)
• routes.js (modified) (3 diffs)
• ui/templates/MainMenu.html (modified) (1 diff)

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

@@ -64 +64 @@
         },
         _formatDate: function(date) {
-            return stamp.toISOString(date,{zulu:true,milliseconds:false});
+            return stamp.toISOString(date,{zulu:true,milliseconds:true});
         },
         _sanitize: function(obj) {

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

@@ -11 +11 @@
             var endDateBox = this.endDateBox;
             this.own(this.startDateBox.on('change', function(value){
-                endDateBox.constraints.min  = value;
+                endDateBox.constraints.min = value;
             }));
         },
@@ -24 +24 @@
                 value.respondentCanDeleteOwnResponse ? ["on"] : [];
             this.inherited(arguments);
+            this.endDateBox.constraints.min =
+                this.startDateBox.get('value');
         }
     });

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);
-            }));
         }
     });

Dev/trunk/src/client/qed-client/pages/templates/surveys.html

@@ -34 +34 @@
         </div>
 
-        <div data-dojo-type="dijit/layout/BorderContainer"
-             title="Runs"
-             data-dojo-attach-point="runsTab">
-            <div data-dojo-type="dijit/layout/ContentPane"
-                 data-dojo-props="region: 'center'"
-                 data-dojo-attach-point="runsContainer">
-            </div>
-            <div data-dojo-type="dijit/layout/ContentPane"
-                 data-dojo-props="region: 'bottom'"
-                 style="height: 40px;">
-            </div>
-        </div>
     </div>
 

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

@@ -1 +1 @@
 define([
     "./model/classes/questions",
+    "./model/classes/sessions",
     "./model/classes/surveyRuns",
     "./model/classes/surveys",
@@ -9 +10 @@
     "./pages/survey",
     "./pages/surveyRun",
+    "./pages/surveyRuns",
     "./pages/surveys"
-], function(questionsClass, surveyRunsClass, surveysClass, index, previewSurvey, question, questions, survey, surveyRun, surveys) {
+], function(questionsClass, sessionsClass, surveyRunsClass, surveysClass, index, previewSurvey, question, questions, survey, surveyRun, surveyRuns, surveys) {
 
     return [
@@ -19 +21 @@
         { path: surveysClass.getCollectionPath(), constructor: surveys },
         { path: surveysClass.getObjectPath(':objectId'), constructor: survey },
+        { path: surveyRunsClass.getCollectionPath(), constructor: surveyRuns },
         { path: surveyRunsClass.getObjectPath(':objectId'), constructor: surveyRun },
-        //{ path: "/sessions", constructor: sessions },
-        //{ path: "/session/:sessionId", constructor: session },
+        //{ path: sessionsClass.getObjectPath(''), constructor: sessions },
+        //{ path: sessionsClass.getObjectPath(':objectId'), constructor: session },
         { path: surveysClass.getPreviewPath(':surveyId'), constructor: previewSurvey }
     ];

Dev/trunk/src/client/qed-client/ui/templates/MainMenu.html

@@ -1 +1 @@
 <div class="mainMenu">
     <div  data-dojo-type="dijit/MenuBar">
-        <div class="rftMainMenuButton" data-dojo-type="./MenuBarLink" data-dojo-props="path:'/sessions'">Sessions</div>
-        <div class="rftMainMenuButton" data-dojo-type="dijit/PopupMenuBarItem">
+        <div class="rftMainMenuButton"
+             data-dojo-type="./MenuBarLink" data-dojo-props="path:'/sessions'">Sessions</div>
+        <div class="rftMainMenuButton"
+             data-dojo-type="dijit/PopupMenuBarItem">
             <span>Content</span>
             <div data-dojo-type="dijit/DropDownMenu">
-                <div data-dojo-type="./MenuLink" class="blue bgColorHover" data-dojo-props="path:'/surveys', iconClass:'rftIcon rftIconSurvey'">Surveys</div>
-                <div data-dojo-type="./MenuLink" class="orange bgColorHover" data-dojo-props="path:'/questions', iconClass:'rftIcon rftIconQuestion'">Questions</div>
-                <div data-dojo-type="./MenuLink" class="purple bgColorHover" data-dojo-props="path:'/applications', iconClass: 'rftIcon rftIconApplication'">Applications</div>
-                <div data-dojo-type="./MenuLink" class="red bgColorHover" data-dojo-props="path:'/dashboards', iconClass: 'rftIcon rftIconDashboard'">Dashboards</div>
+                <div data-dojo-type="./MenuLink"
+                     class="blue bgColorHover"
+                     data-dojo-props="path:'/surveys', iconClass:'rftIcon rftIconSurvey'">
+                  Surveys</div>
+                <div data-dojo-type="./MenuLink"
+                     class="orange bgColorHover"
+                     data-dojo-props="path:'/questions', iconClass:'rftIcon rftIconQuestion'">
+                  Questions</div>
             </div>
         </div>
-        <div class="rftMainMenuButton" data-dojo-type="./MenuBarLink" data-dojo-props="path:'/results'">Results</div>
-        <div class="rftMainMenuButton" data-dojo-type="./SessionMenu"></div>
+        <div class="rftMainMenuButton"
+             data-dojo-type="./MenuBarLink" data-dojo-props="path:'/surveyRuns'">
+          Results</div>
+        <div class="rftMainMenuButton"
+             data-dojo-type="./SessionMenu"></div>
     </div>
 </div>