L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-69874-master' of git://github.com/lucaboesch/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2021-04-13 23:08:45 +02:00
parent 392fc8ead0 37a1f2454a
commit 7d3012f9bc
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/workshop/lang/en/workshop.php
+1
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';
mod/workshop/tests/behat/workshop_assessment.feature
+8
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
mod/workshop/view.php
+2 -2
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));