moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-69874 workshop: Title mentions received assessments in close phase.

Browse source
This commit is contained in:
Luca Bösch 2020-10-06 18:12:10 +02:00
parent 511a87f5fc
commit 37a1f2454a
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mod/workshop/lang/en/workshop.php
View file

@ -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';

8
mod/workshop/tests/behat/workshop_assessment.feature
View file

@ -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

4
mod/workshop/view.php
View file

@ -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));