Questionnaire: Make summary page even more intuitive

Author: vietlx426

lang/en/questionnaire.php

@@ -569,6 +569,7 @@
 $string['responseformat'] = 'Response format';
 $string['responseoptions'] = 'Response options';
 $string['responses'] = 'Responses';
+$string['responses_breakdown'] = '(Submissions: {$a->responses} | In progress: {$a->incomplete})';
 $string['responseview'] = 'Students can view ALL responses';
 $string['responseview_help'] = 'You can specify who can see the responses of all respondents to submitted questionnaires (general statistics tables).';
 $string['responseview_link'] = 'mod/questionnaire/mod#Response_viewing';

questionnaire.class.php

@@ -2887,6 +2887,22 @@ public function survey_results($rid = '', $uid=false, $pdf = false, $currentgrou
             if ($userview === 'y') {
                 $respondentstring = get_string('submissions', 'questionnaire');
             }
+            if (!$userview) {
+                $completedcount = 0;
+                $inprogresscount = 0;
+
+                foreach ($rows as $row) {
+                    if ($row->complete === 'y') {
+                        $completedcount++;
+                    } else if ($row->complete === 'n') {
+                        $inprogresscount++;
+                    }
+                }
+                $breakdown = new \stdClass();
+                $breakdown->responses = $completedcount;
+                $breakdown->incomplete = $inprogresscount;
+                $numresps .= ' ' . get_string('responses_breakdown', 'questionnaire', $breakdown);
+            }
             $this->page->add_to_page('respondentinfo',
                     ' ' . $respondentstring . ': <strong>' . $numresps . '</strong>');
             if (empty($rows)) {

tests/behat/check_responses.feature

@@ -35,7 +35,7 @@ Feature: Review responses
     Then I should see "View all responses"
     And I navigate to "View all responses" in current page administration
     And I should see "View Default order"
-    And I should see "Responses: 7"
+    And I should see "Responses: 7 (Submissions: 6 | In progress: 1)"
     And I set the field "View" to "Full submissions"
     And I should see "Submissions: 6"
     And I set the field "View" to "Responses not submitted"
@@ -70,7 +70,7 @@ Feature: Review responses
     Then I should see "1 / 6"
     And I follow "Summary"
     And I should see "View Default order"
-    And I should see "Responses: 6"
+    And I should see "Responses: 6 (Submissions: 6 | In progress: 0)"
     And I follow "Delete ALL Responses"
     Then I should see "Are you sure you want to delete ALL the responses in this questionnaire?"
     And I press "Delete"

tests/behat/check_responses_capabilities.feature

@@ -33,7 +33,7 @@ Feature: Review responses with different capabilities
     And I navigate to "View all responses" in current page administration
     Then I should see "All responses"
     And I should see "View Default order"
-    And I should see "Responses: 7"
+    And I should see "Responses: 7 (Submissions: 6 | In progress: 1)"
     And I log out
 
   @javascript