MDL-12356 CSS classes implemented

moodle · Nov 27, 2007 · cd7bc96 · cd7bc96
1 parent 00a0032
commit cd7bc96
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
@@ -710,6 +710,11 @@ function get_studentshtml() {
                     $hidden = ' hidden ';
                 }
 
+                $gradepass = ' gradefail '; 
+                if ($grade->is_passed($item)) {
+                    $gradepass = ' gradepass ';
+                }
+
                 // if in editting mode, we need to print either a text box
                 // or a drop down (for scales)
                 // grades in item of type grade category or course are not directly editable
@@ -750,10 +755,10 @@ function get_studentshtml() {
 
                             // invalid grade if gradeval < 1
                             if ((int) $gradeval < 1) {
-                                $studentshtml .= '<span class="gradevalue'.$hidden.'">-</span>';
+                                $studentshtml .= '<span class="gradevalue'.$hidden.$gradepass.'">-</span>';
                             } else {
                                 $gradeval = (int)bounded_number($grade->grade_item->grademin, $gradeval, $grade->grade_item->grademax); //just in case somebody changes scale
-                                $studentshtml .= '<span class="gradevalue'.$hidden.'">'.$scales[$gradeval-1].'</span>';
+                                $studentshtml .= '<span class="gradevalue'.$hidden.$gradepass.'">'.$scales[$gradeval-1].'</span>';
                             }
                         } else {
                             // no such scale, throw error?
@@ -767,7 +772,7 @@ function get_studentshtml() {
                                           . '" type="text" title="'. $strgrade .'" name="grade_'
                                           .$userid.'_' .$item->id.'" value="'.$value.'" />';
                         } else {
-                            $studentshtml .= '<span class="gradevalue'.$hidden.'">'.format_float($gradeval, $decimalpoints).'</span>';
+                            $studentshtml .= '<span class="gradevalue'.$hidden.$gradepass.'">'.format_float($gradeval, $decimalpoints).'</span>';
                         }
                     }
 
@@ -797,10 +802,10 @@ function get_studentshtml() {
                     }
 
                     if ($item->needsupdate) {
-                        $studentshtml .= '<span class="gradingerror'.$hidden.'">'.get_string('error').'</span>';
+                        $studentshtml .= '<span class="gradingerror'.$hidden.$gradepass.'">'.get_string('error').'</span>';
 
                     } else {
-                        $studentshtml .= '<span class="gradevalue'.$hidden.'">'.grade_format_gradevalue($gradeval, $item, true, $gradedisplaytype, null).'</span>';
+                        $studentshtml .= '<span class="gradevalue'.$hidden.$gradepass.'">'.grade_format_gradevalue($gradeval, $item, true, $gradedisplaytype, null).'</span>';
                     }
 
                     // Close feedback span

diff --git a/lib/grade/grade_grade.php b/lib/grade/grade_grade.php
@@ -675,5 +675,22 @@ function get_hiding_affected(&$grade_grades, &$grade_items) {
 
         return array('unknown'=>$unknown, 'altered'=>$altered);
     }
+
+    /**
+     * Returns true if the grade's value is superior or equal to the grade item's gradepass value, false otherwise.
+     * @param object $grade_item An optional grade_item of which gradepass value we can use, saves having to load the grade_grade's grade_item
+     * @return boolean
+     */
+    function is_passed($grade_item = null) {
+        if (empty($grade_item)) {
+            if (!isset($this->grade_item)) {
+                $this->load_grade_item();
+            }
+        } else {
+            $this->grade_item = $grade_item;
+            $this->itemid = $grade_item->id;
+        }
+        return $this->finalgrade >= $this->grade_item->gradepass;
+    }
 }
 ?>