Questionnaire: "'Save is actully 'Save and exit', and should be better labelled. Also it should be easier to resume if pressed in error". #560831 (#396)

Co-authored-by: lamtranb <[email protected]>

Author: 2 people

lang/en/questionnaire.php

@@ -549,6 +549,7 @@
 $string['resumesurvey'] = 'Resume questionnaire';
 $string['return'] = 'Return';
 $string['save'] = 'Save';
+$string['save_and_exit'] = 'Save and exit';
 $string['saveasnew'] = 'Save as New Question';
 $string['savedbutnotsubmitted'] = 'This questionnaire has been saved but not yet submitted.';
 $string['savedprogress'] = 'Your progress has been saved.  You may return at any time to complete this questionnaire.';

questionnaire.class.php

@@ -1254,7 +1254,7 @@ public function print_survey($quser, $userid=false) {
             }
             if ($this->resume) {
                 $controlbuttons['resume'] = ['type' => 'submit', 'class' => 'btn btn-secondary',
-                    'value' => get_string('save', 'questionnaire')];
+                    'value' => get_string('save_and_exit', 'questionnaire')];
             }
 
             // Add a 'hidden' variable for the mod's 'view.php', and use a language variable for the submit button.
@@ -2528,7 +2528,7 @@ private function response_goto_thankyou() {
      * @param string $url
      */
     private function response_goto_saved($url) {
-        global $CFG;
+        global $CFG, $USER;
         $resumesurvey = get_string('resumesurvey', 'questionnaire');
         $savedprogress = get_string('savedprogress', 'questionnaire', '<strong>'.$resumesurvey.'</strong>');
 
@@ -2537,6 +2537,21 @@ private function response_goto_saved($url) {
         $this->page->add_to_page('respondentinfo',
             $this->renderer->homelink($CFG->wwwroot.'/course/view.php?id='.$this->course->id,
                 get_string("backto", "moodle", $this->course->fullname)));
+
+        if ($this->resume) {
+            $message = $this->user_access_messages($USER->id, true);
+            if ($message === false) {
+                if ($this->user_can_take($USER->id)) {
+                    if ($this->questions) { // Sanity check.
+                        if ($this->user_has_saved_response($USER->id)) {
+                            $this->page->add_to_page('respondentinfo',
+                                $this->renderer->homelink($CFG->wwwroot . '/mod/questionnaire/complete.php?' .
+                                    'id=' . $this->cm->id . '&resume=1', $resumesurvey));
+                        }
+                    }
+                }
+            }
+        }
         return;
     }
 

styles.css

@@ -175,6 +175,10 @@ td.selected {
     display: inline;
 }
 
+#page-mod-questionnaire-complete .notice .buttons input {
+    margin-bottom: 10px;
+}
+
 .floatprinticon {
     margin-top: -30px;
     float: right;
@@ -217,6 +221,10 @@ td.selected {
     overflow: hidden;
 }
 
+#page-mod-questionnaire-complete .mod_questionnaire_completepage.generalbox .homelink ~ .homelink {
+    padding-top: 10px;
+}
+
 .qn-legend {
     float: left;
     font-size: inherit;

tests/behat/save_and_resume.feature

@@ -50,8 +50,9 @@ Feature: Questionnaire responses can be saved and resumed without submitting.
     And I set the field "One" to "checked"
     And I set the field "Two" to "checked"
     And I set the field "Select one choice" to "Four"
-    And I press "Save"
+    And I press "Save and exit"
     Then I should see "Your progress has been saved."
+    And I should see "Resume questionnaire"
 
     And I am on "Course 1" course homepage
     And I follow "Questionnaire 1"
@@ -66,8 +67,9 @@ Feature: Questionnaire responses can be saved and resumed without submitting.
     And the field "Select one choice" matches value "Four"
     And I set the field "Two" to "0"
     And I set the field "Three" to "checked"
-    And I press "Save"
+    And I press "Save and exit"
     Then I should see "Your progress has been saved."
+    And I should see "Resume questionnaire"
 
     And I am on "Course 1" course homepage
     And I follow "Questionnaire 1"
@@ -81,6 +83,7 @@ Feature: Questionnaire responses can be saved and resumed without submitting.
     And the field "Select one choice" matches value "Four"
     And I press "Submit questionnaire"
     Then I should see "Thank you for completing this Questionnaire."
+    And I should not see "Resume questionnaire"
 
     And I am on "Course 1" course homepage
     And I follow "Questionnaire 1"