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

Timestamp:

06/10/13 01:07:16 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Save answers, improved response page and question widgets.

• Warn if _ComplexValueMixin is not pout on a form element, to prevent 'name' collisions. Changed all depending widgets to <form>'s.
• Fixed names for question widgets to actually save answers.
• Fixed and improved response page.
• Fixed names in MultipleChoice? widget, which behaves different for radio and check.

Location:

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

Files:

• response.js (modified) (4 diffs)
• templates/response.html (modified) (1 diff)

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

@@ -1 +1 @@
 define([
+    "../app/Content",
     "../app/Page",
     "../lib/async",
@@ -13 +14 @@
     "require",
     "dojo/text!./templates/response.html"
-], function(Page, async, Response, Survey, SurveyRun, store, declare, event, lang, all, when, require, template) {
+], function(Content, Page, async, Response, Survey, SurveyRun, store, declare, event, lang, all, when, require, template) {
     return declare([Page],{
         contextRequire: require,
@@ -24 +25 @@
             if ( this._started ) { return; }
             this.inherited(arguments);
-            this._disableButtons();
+            this._disableSubmit();
             var surveyRunId = this.surveyRunId;
             var responseId = this.options && this.options.id;
             if ( surveyRunId && responseId ) {
                 this._loadSurveyAndResponse(surveyRunId,responseId)
-                .then(lang.hitch(this,"_enableButtons"));
+                .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();
+                    }
+                }), function() {
+                    this._showInfo("<div>The url seems to be incorrect, no survey found.</div>");
+                });
             } else {
                 throw new Error("No valid uid or survey passed!");
@@ -43 +53 @@
                 }
                 this.titleNode.innerHTML = Survey.DisplayTitle.get(surveyRun.survey);
-                this.surveyWidget.set('survey',surveyRun.survey);
-                this.responseForm.set('value',this.response.answers || {});
+                this.surveyWidget.set('survey', surveyRun.survey);
+                this.surveyWidget.set('value', this.response.answers || {});
             }));
         },
-        _enableButtons: function() {
+        _enableSubmit: function() {
             this.submitButton.set('disabled',false);
             this.continueButton.set('disabled',false);
+            this.surveyWidget.set('disabled', false);
         },
-        _disableButtons: function() {
+        _disableSubmit: function() {
             this.submitButton.set('disabled',true);
             this.continueButton.set('disabled',true);
+            this.surveyWidget.set('disabled', true);
+        },
+        _showInfo: function(html) {
+            this.infoNode.innerHTML = html;
         },
         _getAnswersAndSaveResponse: function() {
-            this.response.answers = this.responseForm.get('value');
-            console.log(this.response);
-            return store.put(this.response);
+            var answers = this.surveyWidget.get('value');
+            this.response.answers = answers;
+            return store.put(this.response).then(function(){
+                Content.notify("Your response is saved.");
+            }, function(err){
+                Content.notify(err,'error');
+            });
         },
         _onSubmit: function(e) {
             this.response.publicationDate = store.timestamp();
-            this._getAnswersAndSaveResponse();
-            this.content.domNode.innerHTML = "<div>Thanks for filling in the survey.</div>";
+            this._getAnswersAndSaveResponse()
+            .then(function(){
+                this._showInfo("<div>Thanks for filling in the survey. You cannot edit your answers anymore.</div>");
+                this._disableSubmit();
+            });
             if ( e ) { event.stop(e); }
             return false;
         },
         _onContinueLater: function(e) {
-            this._getAnswersAndSaveResponse();
-            this.content.domNode.innerHTML = "<div>To continue with this survey later, just save the URL in the location bar and revisit it later. Your answers will still be there.</div>";
+            this._getAnswersAndSaveResponse()
+            .then(lang.hitch(this,function(){
+                this._showInfo("<div>To continue with this survey later, just save the URL in the location bar and revisit it later. Your answers will still be there.</div>");
+            }));
             if ( e ) { event.stop(e); }
             return false;

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

@@ -6 +6 @@
             <span class="headerText" data-dojo-attach-point="titleNode">Survey</span>
         </h2>
+        <div data-dojo-attach-point="infoNode"></div>
     </div>
     
     <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'center'" data-dojo-attach-point="content">
-        <form data-dojo-type="dijit/form/Form" data-dojo-attach-point="responseForm"
-              data-dojo-attach-event="onSubmit:_ignoreEvent" style="overflow: auto">
-            <div data-dojo-type="../model/widgets/SurveyRenderWidget" data-dojo-attach-point="surveyWidget"></div>
-        </form>
+        <div name="answers" data-dojo-type="../model/widgets/SurveyRenderWidget" data-dojo-attach-point="surveyWidget"></div>
     </div>