From 1f7fbed81281078753958bb09361a9503606ab8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luca=20B=C3=B6sch?= Date: Fri, 16 Apr 2021 11:44:23 +0200 Subject: [PATCH] MDL-71352 gradereport_grader: Add icons for pass/fail. --- grade/report/grader/lib.php | 15 ++++++++++----- grade/report/grader/styles.css | 8 -------- lang/en/grades.php | 2 ++ theme/boost/scss/moodle/grade.scss | 9 +++++++++ theme/boost/style/moodle.css | 6 ++++++ theme/classic/style/moodle.css | 6 ++++++ 6 files changed, 33 insertions(+), 13 deletions(-) diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php index 874af23cf80..3373526814d 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -1090,10 +1090,13 @@ class grade_report_grader extends grade_report { } $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 @@ -1145,10 +1148,12 @@ class grade_report_grader extends grade_report { // invalid grade if gradeval < 1 if ($gradeval < 1) { - $itemcell->text .= "-"; + $itemcell->text .= $gradepassicon . + "-"; } else { $gradeval = $grade->grade_item->bounded_grade($gradeval); //just in case somebody changes scale - $itemcell->text .= "{$scales[$gradeval - 1]}"; + $itemcell->text .= $gradepassicon . + "{$scales[$gradeval - 1]}"; } } @@ -1162,7 +1167,7 @@ class grade_report_grader extends grade_report { . '" type="text" class="text" title="'. $strgrade .'" name="grade[' .$userid.'][' .$item->id.']" id="grade_'.$userid.'_'.$item->id.'" value="'.$value.'" />'; } else { - $itemcell->text .= "" . + $itemcell->text .= $gradepassicon . "" . format_float($gradeval, $decimalpoints) . ""; } } @@ -1196,7 +1201,7 @@ class grade_report_grader extends grade_report { } if ($item->needsupdate) { - $itemcell->text .= "" . $error . ""; + $itemcell->text .= $gradepassicon . "" . $error . ""; } else { // The max and min for an aggregation may be different to the grade_item. if (!is_null($gradeval)) { @@ -1204,7 +1209,7 @@ class grade_report_grader extends grade_report { $item->grademin = $grade->get_grade_min(); } - $itemcell->text .= "" . + $itemcell->text .= $gradepassicon . "" . grade_format_gradevalue($gradeval, $item, true, $gradedisplaytype, null) . ""; 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 index e3a6280109f..8e59f6b2a17 100644 --- 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 index 15de3617de7..8cd9000eb4b 100644 --- a/lang/en/grades.php +++ b/lang/en/grades.php @@ -226,6 +226,7 @@ $string['externalurl'] = 'External URL'; $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['overridesitedefaultgradedisplaytype_help'] = 'If ticked, grade letters $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 index 0855200da58..0ff63a484fc 100644 --- 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 index 79447ab3aba..b5392cd1018 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -18468,6 +18468,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 index 44c2d1db9f9..5f5c2faa165 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -18708,6 +18708,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; }