From 37a1f2454aa21b5421a63f048ba77f9e1fe9bf6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luca=20B=C3=B6sch?= Date: Tue, 6 Oct 2020 18:12:10 +0200 Subject: [PATCH] MDL-69874 workshop: Title mentions received assessments in close phase. --- mod/workshop/lang/en/workshop.php | 1 + mod/workshop/tests/behat/workshop_assessment.feature | 8 ++++++++ mod/workshop/view.php | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mod/workshop/lang/en/workshop.php b/mod/workshop/lang/en/workshop.php index 653dd748786..b8a24182907 100644 --- a/mod/workshop/lang/en/workshop.php +++ b/mod/workshop/lang/en/workshop.php @@ -445,3 +445,4 @@ $string['workshop:viewreviewernames'] = 'View reviewer names'; $string['yourassessmentfor'] = 'Your assessment for {$a}'; $string['yourgrades'] = 'Your grades'; $string['yoursubmission'] = 'Your submission'; +$string['yoursubmissionwithassessments'] = 'Your submission with assessments'; diff --git a/mod/workshop/tests/behat/workshop_assessment.feature b/mod/workshop/tests/behat/workshop_assessment.feature index d835dc19733..69e4fcb6b9f 100644 --- a/mod/workshop/tests/behat/workshop_assessment.feature +++ b/mod/workshop/tests/behat/workshop_assessment.feature @@ -148,6 +148,14 @@ Feature: Workshop submission and assessment And I press "Re-calculate grades" And I should see "32" in the "//table/tbody/tr[td[contains(concat(' ', normalize-space(@class), ' '), ' participant ') and contains(.,'Sam1')]]/td[contains(concat(' ', normalize-space(@class), ' '), ' submissiongrade ')]" "xpath_element" And I should see "16" in the "//table/tbody/tr[td[contains(concat(' ', normalize-space(@class), ' '), ' participant ') and contains(.,'Sam1')]]/td[contains(concat(' ', normalize-space(@class), ' '), ' gradinggrade ')]" "xpath_element" + And I change phase in workshop "TestWorkshop" to "Closed" + And I log out + + # student1 looks at the activity + And I log in as "student1" + And I am on "Course1" course homepage + And I follow "TestWorkshop" + Then I should see "Your submission with assessments" And I log out @javascript diff --git a/mod/workshop/view.php b/mod/workshop/view.php index 8cfb1150206..7465481641f 100644 --- a/mod/workshop/view.php +++ b/mod/workshop/view.php @@ -615,8 +615,8 @@ case workshop::PHASE_CLOSED: } } if (has_capability('mod/workshop:submit', $PAGE->context)) { - print_collapsible_region_start('', 'workshop-viewlet-ownsubmission', get_string('yoursubmission', 'workshop'), - 'workshop-viewlet-ownsubmission-collapsed'); + print_collapsible_region_start('', 'workshop-viewlet-ownsubmission', + get_string('yoursubmissionwithassessments', 'workshop'), 'workshop-viewlet-ownsubmission-collapsed'); echo $output->box_start('generalbox ownsubmission'); if ($submission = $workshop->get_submission_by_author($USER->id)) { echo $output->render($workshop->prepare_submission_summary($submission, true));