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

Merge branch 'MDL-56646-32-fix' of https://github.com/xow/moodle into MOODLE_32_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2017-08-31 15:01:03 +08:00
parent a7df7cbe77 0a6282a861
commit 8c0221add0
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/lang/en/assign.php
+2 -2
View File
@@ -195,8 +195,8 @@ $string['expandreviewpanel'] = 'Expand review panel';
$string['extensionduedate'] = 'Extension due date';
$string['extensionnotafterduedate'] = 'Extension date must be after the due date';
$string['extensionnotafterfromdate'] = 'Extension date must be after the allow submissions from date';
$string['fixrescalednullgrades'] = 'This assignment contains some erroneous grades. You can <a href="{$a->link}">automatically repair</a> these grades. This may affect course totals.';
$string['fixrescalednullgradesconfirm'] = 'Are you sure you want to fix erroneous grades? All broken grades will be removed. This may affect course totals.';
$string['fixrescalednullgrades'] = 'This assignment contains some erroneous grades. You can <a href="{$a->link}">automatically fix these grades</a>. This may affect course totals.';
$string['fixrescalednullgradesconfirm'] = 'Are you sure you want to fix erroneous grades? All affected grades will be removed. This may affect course totals.';
$string['fixrescalednullgradesdone'] = 'Grades fixed.';
$string['gradecanbechanged'] = 'Grade can be changed';
$string['gradersubmissionupdatedtext'] = '{$a->username} has updated their assignment submission
mod/assign/tests/behat/rescale_grades.feature
+2 -3
View File
@@ -84,6 +84,5 @@ Feature: Check that the assignment grade can be rescaled when the max grade is c
And I set the field "Maximum grade" to "50"
When I press "Save and display"
And I navigate to "View all submissions" in current page administration
# Since the decimal places are always displayed (e.g. 0.00), this will catch any grade. The student should not have one.
# We can't just check for - (empty grade) because a negative grade would also have that character.
Then "Student 2" row "Grade" column of "generaltable" table should not contain "."
# Make sure the student did not receive a negative grade.
Then "Student 2" row "Grade" column of "generaltable" table should not contain "-0.50"