Merge branch 'MDL-71352-310' of git://github.com/lucaboesch/moodle in…

…to MOODLE_310_STABLE
moodle · Sep 21, 2021 · fdfbf41 · fdfbf41
2 parents 70d5ba9 + e3958e5
commit fdfbf41
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 13 deletions.
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
@@ -1087,10 +1087,13 @@ public function get_right_rows($displayaverages) {
                 }
 
                 $gradepass = ' gradefail ';
+                $gradepassicon = $OUTPUT->pix_icon('i/invalid', get_string('fail', 'grades'));
                 if ($grade->is_passed($item)) {
                     $gradepass = ' gradepass ';
+                    $gradepassicon = $OUTPUT->pix_icon('i/valid', get_string('pass', 'grades'));
                 } else if (is_null($grade->is_passed($item))) {
                     $gradepass = '';
+                    $gradepassicon = '';
                 }
 
                 // if in editing mode, we need to print either a text box
@@ -1142,10 +1145,12 @@ public function get_right_rows($displayaverages) {
 
                             // invalid grade if gradeval < 1
                             if ($gradeval < 1) {
-                                $itemcell->text .= "<span class='gradevalue{$hidden}{$gradepass}'>-</span>";
+                                $itemcell->text .= $gradepassicon .
+                                    "<span class='gradevalue{$hidden}{$gradepass}'>-</span>";
                             } else {
                                 $gradeval = $grade->grade_item->bounded_grade($gradeval); //just in case somebody changes scale
-                                $itemcell->text .= "<span class='gradevalue{$hidden}{$gradepass}'>{$scales[$gradeval - 1]}</span>";
+                                $itemcell->text .= $gradepassicon .
+                                    "<span class='gradevalue{$hidden}{$gradepass}'>{$scales[$gradeval - 1]}</span>";
                             }
                         }
 
@@ -1159,7 +1164,7 @@ public function get_right_rows($displayaverages) {
                                           . '" type="text" class="text" title="'. $strgrade .'" name="grade['
                                           .$userid.'][' .$item->id.']" id="grade_'.$userid.'_'.$item->id.'" value="'.$value.'" />';
                         } else {
-                            $itemcell->text .= "<span class='gradevalue{$hidden}{$gradepass}'>" .
+                            $itemcell->text .= $gradepassicon . "<span class='gradevalue{$hidden}{$gradepass}'>" .
                                     format_float($gradeval, $decimalpoints) . "</span>";
                         }
                     }
@@ -1193,15 +1198,15 @@ public function get_right_rows($displayaverages) {
                     }
 
                     if ($item->needsupdate) {
-                        $itemcell->text .= "<span class='gradingerror{$hidden}{$gradepass}'>" . $error . "</span>";
+                        $itemcell->text .= $gradepassicon . "<span class='gradingerror{$hidden}{$gradepass}'>" . $error . "</span>";
                     } else {
                         // The max and min for an aggregation may be different to the grade_item.
                         if (!is_null($gradeval)) {
                             $item->grademax = $grade->get_grade_max();
                             $item->grademin = $grade->get_grade_min();
                         }
 
-                        $itemcell->text .= "<span class='gradevalue{$hidden}{$gradepass}'>" .
+                        $itemcell->text .= $gradepassicon . "<span class='gradevalue{$hidden}{$gradepass}'>" .
                                 grade_format_gradevalue($gradeval, $item, true, $gradedisplaytype, null) . "</span>";
                         if ($showanalysisicon) {
                             $itemcell->text .= $this->gtree->get_grade_analysis_icon($grade);

diff --git a/grade/report/grader/styles.css b/grade/report/grader/styles.css
@@ -137,14 +137,6 @@
     display: inline-block;
 }
 
-.path-grade-report-grader span.gradepass {
-    color: #298721;
-}
-
-.path-grade-report-grader span.gradefail {
-    color: #890d0d;
-}
-
 .path-grade-report-grader .gradeparent tr:nth-child(n) td.overridden:nth-child(n) {
     /* Made very specific to override the default stripped style of the table. */
     background-color: #efd9a4;

diff --git a/lang/en/grades.php b/lang/en/grades.php
@@ -226,6 +226,7 @@
 $string['externalurl_desc'] = 'If an external gradebook is used, the URL should be specified here.';
 $string['extracreditvalue'] = 'Extra credit value for {$a}';
 $string['extracreditwarning'] = 'Note: Setting all items for a category to extra credit will effectively remove them from the grade calculation. Since there will be no point total';
+$string['fail'] = 'Fail';
 $string['feedback'] = 'Feedback';
 $string['feedback_help'] = 'This box enables any comments about the grade to be added.';
 $string['feedbackadd'] = 'Add feedback';
@@ -616,6 +617,7 @@
 $string['overrideweightofa'] = 'Override weight of {$a}';
 $string['parentcategory'] = 'Parent category';
 $string['pctoftotalgrade'] = '% of total grade';
+$string['pass'] = 'Pass';
 $string['percent'] = 'Percent';
 $string['percentage'] = 'Percentage';
 $string['percentageletter'] = 'Percentage (letter)';

diff --git a/theme/boost/scss/moodle/grade.scss b/theme/boost/scss/moodle/grade.scss
@@ -52,6 +52,15 @@
     }
 }
 
+.path-grade-report-grader {
+    span.gradepass {
+        color: $success;
+    }
+    span.gradefail {
+        color: $danger;
+    }
+}
+
 // Rubrics
 #page-grade-grading-manage {
     #activemethodselector {

diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
@@ -18296,6 +18296,12 @@ p.arrow_button {
   width: 100%;
   clear: both; }
 
+.path-grade-report-grader span.gradepass {
+  color: #357a32; }
+
+.path-grade-report-grader span.gradefail {
+  color: #ca3120; }
+
 #page-grade-grading-manage #activemethodselector label {
   display: inline-block; }
 

diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
@@ -18528,6 +18528,12 @@ p.arrow_button {
   width: 100%;
   clear: both; }
 
+.path-grade-report-grader span.gradepass {
+  color: #357a32; }
+
+.path-grade-report-grader span.gradefail {
+  color: #ca3120; }
+
 #page-grade-grading-manage #activemethodselector label {
   display: inline-block; }