Changeset 529 for Dev/trunk/src/client/qed-client/pages

Timestamp:

03/23/14 22:58:54 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Added grey icons for better highlighting, synced block and large buttons.
• Introduced extra color for text, now disabled/inactive/hovered -> it's not very clear though.
• Added confirmation on irrevertable actions.
• Added support for query string in our new request implementation.

Location:

Dev/trunk/src/client/qed-client/pages

Files:

• questions.js (modified) (2 diffs)
• surveyRun.js (modified) (3 diffs)
• surveys.js (modified) (4 diffs)
• templates/surveys.html (modified) (2 diffs)

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

@@ -50 +50 @@
         },
         onDeleteQuestion: function(question) {
+            if ( !confirm("Are you sure you want to delete this question?") ) {
+                return;
+            }
             questions.remove(question)
             .then(lang.hitch(this,function(){
@@ -62 +65 @@
         },
         onPublishQuestion: function(question) {
+            if ( !confirm("After publication the question cannot be modified anymore, are you sure?") ) {
+                return;
+            }
             question.publicationDate = new Date();
             questions.save(question)

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

@@ -47 +47 @@
             .then(lang.hitch(this,function(allResponses){
                 array.forEach(allResponses, function(response){
-                    var actions = {};
+                    var actions = {}, w;
                     if ( !response.publicationDate ) {
                         actions.Delete = {
-                            callback: function(){
-                                responses.remove(response)
-                                .then(function(){
-                                    w.destroy();
-                                });
-                            },
+                            callback: lang.hitch(this,function(){
+                                // We cannot bind _onDeleteResponse
+                                // directly, because of the
+                                // initialization problem with w. We
+                                // need it in the handler, but we need
+                                // to pass the handler as an argument
+                                // on the creation of w.
+                                this._onDeleteResponse(response,w);
+                            }),
                             properties: {
                                 icon: 'Delete',
@@ -62 +65 @@
                         };
                     }
-                    var w = new LineWithActionsWidget({
+                    w = new LineWithActionsWidget({
                         actions: actions
                     });
@@ -70 +73 @@
                 }, this);
             }));
+        },
+        _onDeleteResponse: function(response,w) {
+            if ( !confirm("Are you sure you want to delete this survey response?") ) {
+                return;
+            }
+            responses.remove(response)
+            .then(function(){
+                w.destroy();
+            });
         },
         _handlePropChange: function(e) {

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

@@ -16 +16 @@
             if ( this._started ) { return; }
             this.inherited(arguments);
+            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();
         },
@@ -22 +25 @@
         },
         _onPublishSurvey:function(survey){
-            var self = this;
+            if ( !confirm("After publication the survey cannot be modified anymore, are you sure?") ) {
+                return;
+            }
             survey.publicationDate = new Date();
             surveys.save(survey)
-            .then(function(){
-                self.refreshDrafts();
-                self.refreshPublished();
-            },lang.hitch(this,function(err){
+            .then(lang.hitch(this,function(){
+                this.refreshDrafts();
+                this.refreshPublished();
+            }),lang.hitch(this,function(err){
                 this.notify(err.error,'error');
             }));
         },
         _onDeleteSurvey:function(survey){
-            var self = this;
+            if ( !confirm("Are you sure you want to delete this draft survey?") ) {
+                return;
+            }
             surveys.remove(survey)
-            .then(function(){
-                self.refreshDrafts();
-            },lang.hitch(this,function(err){
+            .then(lang.hitch(this,function(){
+                this.refreshDrafts();
+            }),lang.hitch(this,function(err){
                 this.notify(err.error,'error');
             }));
@@ -62 +69 @@
         },
         _onRunDelete: function(surveyRun) {
+            if ( !confirm("Are you sure you want to delete this survey run?") ) {
+                return;
+            }
             surveyRuns.remove(surveyRun)
             .then(lang.hitch(this,function(){
@@ -135 +145 @@
                                 label: 'Run',
                                 tooltip: 'Run survey',
-                                icon: 'Run'
+                                icon: 'Forward'
                             }
                         }]

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

@@ -8 +8 @@
     </div>
 
-    <div data-dojo-attach-point="tabContainer" data-dojo-type="dijit/layout/TabContainer" class="blue" data-dojo-props="tabPosition:'left-h',region:'center'">
+    <div data-dojo-attach-point="tabContainer"
+         data-dojo-type="dijit/layout/TabContainer"
+         class="blue" data-dojo-props="tabPosition:'left-h',region:'center'">
 
-        <div data-dojo-type="dijit/layout/BorderContainer" title="Drafts" data-dojo-attach-point="draftsTab">
+        <div data-dojo-type="dijit/layout/BorderContainer"
+             title="Drafts"
+             data-dojo-attach-point="draftsTab">
             <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region: 'center'" data-dojo-attach-point="draftsContainer">
             </div>
@@ -17 +21 @@
         </div>
 
-        <div data-dojo-type="dijit/layout/BorderContainer" title="Published" data-dojo-attach-point="publishedTab">
-            <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region: 'center'" data-dojo-attach-point="publishedContainer">
+        <div data-dojo-type="dijit/layout/BorderContainer"
+             title="Published"
+             data-dojo-attach-point="publishedTab">
+            <div data-dojo-type="dijit/layout/ContentPane"
+                 data-dojo-props="region: 'center'"
+                 data-dojo-attach-point="publishedContainer">
             </div>
-            <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region: 'bottom'" style="height: 40px;">
+            <div data-dojo-type="dijit/layout/ContentPane"
+                 data-dojo-props="region: 'bottom'"
+                 style="height: 40px;">
             </div>
         </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 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 data-dojo-type="dijit/layout/ContentPane"
+                 data-dojo-props="region: 'bottom'"
+                 style="height: 40px;">
             </div>
         </div>
     </div>
 
-    <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region: 'bottom'" style="height: 40px;">
-        <button data-dojo-type="dijit/form/Button" class="blue" data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconNew'" data-dojo-attach-event="onClick:_onNewSurvey">New survey</button>
+    <div data-dojo-type="dijit/layout/ContentPane"
+         data-dojo-props="region: 'bottom'"
+         style="height: 40px;">
+        <button data-dojo-type="dijit/form/Button"
+                class="blue"
+                data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconNew'"
+                data-dojo-attach-event="onClick:_onNewSurvey">New survey</button>
     </div>