Skip to content

Commit 8d8e3ab

Browse files
author
vietlx426
committed
Questionnaire: Make summary page even more intuitive
1 parent 08a415f commit 8d8e3ab

File tree

4 files changed

+21
-3
lines changed

4 files changed

+21
-3
lines changed

lang/en/questionnaire.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,7 @@
569569
$string['responseformat'] = 'Response format';
570570
$string['responseoptions'] = 'Response options';
571571
$string['responses'] = 'Responses';
572+
$string['responses_breakdown'] = '(Submissions: {$a->responses} | In progress: {$a->incomplete})';
572573
$string['responseview'] = 'Students can view ALL responses';
573574
$string['responseview_help'] = 'You can specify who can see the responses of all respondents to submitted questionnaires (general statistics tables).';
574575
$string['responseview_link'] = 'mod/questionnaire/mod#Response_viewing';

questionnaire.class.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2887,6 +2887,23 @@ public function survey_results($rid = '', $uid=false, $pdf = false, $currentgrou
28872887
if ($userview === 'y') {
28882888
$respondentstring = get_string('submissions', 'questionnaire');
28892889
}
2890+
if (!$userview) {
2891+
$completedcount = 0;
2892+
$inprogresscount = 0;
2893+
2894+
foreach ($rows as $row) {
2895+
if ($row->complete === 'y') {
2896+
$completedcount++;
2897+
} else if ($row->complete === 'n') {
2898+
$inprogresscount++;
2899+
}
2900+
}
2901+
$numresps .= ' ' . get_string('responses_breakdown', 'questionnaire',
2902+
[
2903+
'responses' => $completedcount,
2904+
'incomplete' => $inprogresscount,
2905+
]);
2906+
}
28902907
$this->page->add_to_page('respondentinfo',
28912908
' ' . $respondentstring . ': <strong>' . $numresps . '</strong>');
28922909
if (empty($rows)) {

tests/behat/check_responses.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Feature: Review responses
3535
Then I should see "View all responses"
3636
And I navigate to "View all responses" in current page administration
3737
And I should see "View Default order"
38-
And I should see "Responses: 7"
38+
And I should see "Responses: 7 (Submissions: 6 | In progress: 1)"
3939
And I set the field "View" to "Full submissions"
4040
And I should see "Submissions: 6"
4141
And I set the field "View" to "Responses not submitted"
@@ -70,7 +70,7 @@ Feature: Review responses
7070
Then I should see "1 / 6"
7171
And I follow "Summary"
7272
And I should see "View Default order"
73-
And I should see "Responses: 6"
73+
And I should see "Responses: 6 (Submissions: 6 | In progress: 0)"
7474
And I follow "Delete ALL Responses"
7575
Then I should see "Are you sure you want to delete ALL the responses in this questionnaire?"
7676
And I press "Delete"

tests/behat/check_responses_capabilities.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Feature: Review responses with different capabilities
3333
And I navigate to "View all responses" in current page administration
3434
Then I should see "All responses"
3535
And I should see "View Default order"
36-
And I should see "Responses: 7"
36+
And I should see "Responses: 7 (Submissions: 6 | In progress: 1)"
3737
And I log out
3838

3939
@javascript

0 commit comments

Comments
 (0)