mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-71352 gradereport_grader: Add icons for pass/fail.

Browse Source
This commit is contained in:
Luca Bösch 2021-04-16 11:44:23 +02:00
parent 5ea3545115
commit 1f7fbed812
6 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
grade/report/grader/lib.php
View File

@ -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 .= "<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>";
}
}
@ -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 .= "<span class='gradevalue{$hidden}{$gradepass}'>" .
$itemcell->text .= $gradepassicon . "<span class='gradevalue{$hidden}{$gradepass}'>" .
format_float($gradeval, $decimalpoints) . "</span>";
}
}
@ -1196,7 +1201,7 @@ class grade_report_grader extends grade_report {
}
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)) {
@ -1204,7 +1209,7 @@ class grade_report_grader extends grade_report {
$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);

8
grade/report/grader/styles.css
View File

@ -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;

2
lang/en/grades.php
View File

@ -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)';

9
theme/boost/scss/moodle/grade.scss
View File

@ -52,6 +52,15 @@
}
}
.path-grade-report-grader {
span.gradepass {
color: $success;
}
span.gradefail {
color: $danger;
}
}
// Rubrics
#page-grade-grading-manage {
#activemethodselector {

6
theme/boost/style/moodle.css
View File

@ -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; }

6
theme/classic/style/moodle.css
View File

@ -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; }