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

Merge branch 'MDL-55520-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2016-08-15 10:58:39 +08:00
parent 6f302b17b9 a95014f5b4
commit 098aad4f72
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/form/modgrade.php
+9 -2
View File
@@ -266,7 +266,8 @@ class MoodleQuickForm_modgrade extends MoodleQuickForm_group {
$point = (isset($vals['modgrade_point'])) ? $vals['modgrade_point'] : null;
$scale = (isset($vals['modgrade_scale'])) ? $vals['modgrade_scale'] : null;
$rescalegrades = (isset($vals['modgrade_rescalegrades'])) ? $vals['modgrade_rescalegrades'] : null;
$return = $this->process_value($type, $scale, $point);
$return = $this->process_value($type, $scale, $point, $rescalegrades);
return array($this->getName() => $return, $this->getName() . '_rescalegrades' => $rescalegrades);
}
@@ -276,11 +277,17 @@ class MoodleQuickForm_modgrade extends MoodleQuickForm_group {
* @param string $type The value of the grade type select box. Can be 'none', 'scale', or 'point'
* @param string|int $scale The value of the scale select box.
* @param string|int $point The value of the point grade textbox.
* @param string $rescalegrades The value of the rescalegrades select.
* @return int The resulting value
*/
protected function process_value($type='none', $scale=null, $point=null) {
protected function process_value($type='none', $scale=null, $point=null, $rescalegrades=null) {
global $COURSE;
$val = 0;
if ($this->isupdate && $this->hasgrades && $this->canrescale && $this->currentgradetype == 'point' && empty($rescalegrades)) {
// If the maxgrade field is disabled with javascript, no value is sent with the form and mform assumes the default.
// If the user was forced to choose a rescale option - and they haven't - prevent any changes to the max grade.
return $this->currentgrade;
}
switch ($type) {
case 'point':
if ($this->validate_point($point) === true) {
mod/assign/tests/behat/rescale_grades.feature
+16
View File
@@ -45,6 +45,22 @@ Feature: Check that the assignment grade can be rescaled when the max grade is c
And I follow "View all submissions"
Then "Student 1" row "Grade" column of "generaltable" table should contain "40.00"
Scenario: Update an assignment without touching the max grades
Given I follow "Edit settings"
And I expand all fieldsets
And I set the field "Rescale existing grades" to "No"
And I set the field "Maximum grade" to "80"
And I press "Save and display"
And I follow "Edit settings"
And I press "Save and display"
And I follow "Edit settings"
And I expand all fieldsets
And I set the field "Rescale existing grades" to "Yes"
And I set the field "Maximum grade" to "80"
When I press "Save and display"
And I follow "View all submissions"
Then "Student 1" row "Grade" column of "generaltable" table should contain "40.00"
Scenario: Update the max grade for an assignment rescaling existing grades
Given I follow "Edit settings"
And I expand all fieldsets