MDL-82126 gradereport_grader: apply penalty to overridden grade

catalyst · Nov 7, 2024 · a21d195 · a21d195
1 parent 92c1751
commit a21d195
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 12 deletions.
diff --git a/admin/settings/grades.php b/admin/settings/grades.php
@@ -246,6 +246,11 @@
                 new lang_string('gradepenalty_supportedplugins', 'grades'),
                 new lang_string('gradepenalty_supportedplugins_help', 'grades'), [], $options));
 
+            // Option to apply penalty to overridden grades.
+            $temp->add(new admin_setting_configcheckbox('gradepenalty_overriddengrade',
+                new lang_string('gradepenalty_overriddengrade', 'grades'),
+                new lang_string('gradepenalty_overriddengrade_help', 'grades'), 0));
+
             $ADMIN->add('gradepenalty', $temp);
         }
 

diff --git a/grade/report/grader/lang/en/gradereport_grader.php b/grade/report/grader/lang/en/gradereport_grader.php
@@ -23,6 +23,8 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+$string['applypenaltytext'] = 'Deduct {$a}';
+$string['applypenaltytooltip'] = 'Apply a deduction to the grade. This value is retrieved from the current overridden grade.';
 $string['aria:dropdowncolumns'] = 'Collapsed columns found';
 $string['clearsearch'] = 'Clear searched users';
 $string['collapsedcolumns'] = 'Collapsed columns <span class="badge rounded-pill bg-primary text-white ms-1" data-collapse="count">{$a}</span>';

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
@@ -241,18 +241,21 @@ public function process_data($data) {
                             continue;
                         }
 
-                        // If the grade item uses a custom scale
-                        if (!empty($oldvalue->grade_item->scaleid)) {
+                        // Detect if there is any mark deduction.
+                        if (!isset($data->deduction[$userid][$itemid])) {
+                            // If the grade item uses a custom scale.
+                            if (!empty($oldvalue->grade_item->scaleid)) {
 
-                            if ((int)$oldvalue->finalgrade === (int)$postedvalue) {
-                                continue;
-                            }
-                        } else {
-                            // The grade item uses a numeric scale
+                                if ((int)$oldvalue->finalgrade === (int)$postedvalue) {
+                                    continue;
+                                }
+                            } else {
+                                // The grade item uses a numeric scale.
 
-                            // Format the finalgrade from the DB so that it matches the grade from the client
-                            if ($postedvalue === format_float($oldvalue->finalgrade, $oldvalue->grade_item->get_decimals())) {
-                                continue;
+                                // Format the finalgrade from the DB so that it matches the grade from the client.
+                                if ($postedvalue === format_float($oldvalue->finalgrade, $oldvalue->grade_item->get_decimals())) {
+                                    continue;
+                                }
                             }
                         }
 
@@ -328,6 +331,13 @@ public function process_data($data) {
 
                     $gradeitem->update_final_grade($userid, $finalgrade, 'gradebook', false,
                         FORMAT_MOODLE, null, null, true);
+
+                    // Apply penalty.
+                    if (isset($data->deduction[$userid][$itemid])) {
+                        $deductedmark = $data->deduction[$userid][$itemid];
+                        $gradeitem->update_final_grade($userid, $finalgrade - $deductedmark, 'gradepenalty', false,
+                            FORMAT_MOODLE, null, null, true);
+                    }
                 }
             }
         }
@@ -1146,6 +1156,14 @@ public function get_right_rows(bool $displayaverages): array {
                             if ($context->statusicons) {
                                 $context->extraclasses .= ' statusicons';
                             }
+
+                            // If option to reapply deduction is enabled, add the option to the context.
+                            if (get_config('core', 'gradepenalty_overriddengrade')) {
+                                $context->deductedmark = format_float($grade->deductedmark, $decimalpoints);
+                                $context->reapplydeduction = $grade->deductedmark > 0;
+                                $context->deductionid = 'deduction_' . $userid . '_' . $item->id;
+                                $context->deductionname = 'deduction[' . $userid . '][' . $item->id .']';
+                            }
                         } else {
                             $context->extraclasses = 'gradevalue' . $hidden . $gradepass;
                             $context->text = format_float($gradeval, $decimalpoints);

diff --git a/grade/report/grader/templates/cell.mustache b/grade/report/grader/templates/cell.mustache
@@ -41,7 +41,19 @@
                     {{>core_grades/grades/grader/scale}}
                 {{/scale}}
                 {{^scale}}
-                    {{>core_grades/grades/grader/input}}
+                    <div class="container">
+                        <div class="row">
+                            {{>core_grades/grades/grader/input}}
+                        </div>
+                        {{#reapplydeduction}}
+                            <div class="row deductedmark">
+                                <input type="checkbox" name="{{deductionname}}" value="{{deductedmark}}" id="{{deductionid}}" class="ms-0">
+                                <label for="{{deductionname}}" class="form-check-label ml-1" title="{{#str}}applypenaltytooltip, gradereport_grader{{/str}}">
+                                    {{#str}}applypenaltytext, gradereport_grader, {{deductedmark}}{{/str}}
+                                </label>
+                            </div>
+                        {{/reapplydeduction}}
+                    </div>
                 {{/scale}}
             {{/iseditable}}
             {{^iseditable}}

diff --git a/grade/report/grader/tests/behat/switch_views.feature b/grade/report/grader/tests/behat/switch_views.feature
@@ -1,4 +1,4 @@
-@gradereport @gradereport_grader
+@gradereport @gradereport_grader @gradereport_grader_tmp
 Feature: We can change what we are viewing on the grader report
   In order to check the expected results are displayed
   As a teacher

diff --git a/lang/en/grades.php b/lang/en/grades.php
@@ -334,6 +334,8 @@
 $string['gradepenalty_enabled'] = 'Grade penalty';
 $string['gradepenalty_enabled_help'] = 'If enabled, the penalty will be applied to the grades of supported modules.';
 $string['gradepenalty_indicator_info'] = 'Late penalty applied -{$a} marks';
+$string['gradepenalty_overriddengrade'] = 'Apply penalty to overridden grades';
+$string['gradepenalty_overriddengrade_help'] = 'If enabled, the penalty will be applied to overridden grades.';
 $string['gradepenalty_supportedplugins'] = 'Supported modules';
 $string['gradepenalty_supportedplugins_help'] = 'Enable the grade penalty for the selected modules.';
 $string['gradepointdefault'] = 'Grade point default';