Improve gradebook results table - refs #8339

main/gradebook/index.php

@@ -925,15 +925,15 @@ if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
 
                 if (api_is_allowed_to_edit()) {
                     $gradebooktable->td_attributes = [
-                        4 => 'class=centered'
+                        4 => 'class="text-center"'
                     ];
                 } else {
                     $gradebooktable->td_attributes = [
-                        3 => 'class=centered',
-                        4 => 'class=centered',
-                        5 => 'class=centered',
-                        6 => 'class=centered',
-                        7 => 'class=centered'
+                        3 => 'class="text-right"',
+                        4 => 'class="text-center"',
+                        5 => 'class="text-center"',
+                        6 => 'class="text-center"',
+                        7 => 'class="text-center"'
                     ];
 
                     if ($action == 'export_table') {

main/gradebook/lib/gradebook_data_generator.class.php

@@ -244,7 +244,7 @@ class GradebookDataGenerator
         );
 
         $scoreDisplay = ScoreDisplay :: instance();
-        $display = $scoreDisplay->display_score($score, SCORE_DIV, SCORE_BOTH, true);
+        $display = $scoreDisplay->display_score($score, SCORE_DIV_PERCENT_WITH_CUSTOM, SCORE_BOTH, true);
         $type = $item->get_item_type();
         if ($type == 'L' && get_class($item) == 'ExerciseLink') {
             $display  = ExerciseLib::show_score($score[0], $score[1], false);
@@ -265,7 +265,7 @@ class GradebookDataGenerator
     {
         $score = $item->calc_score(null, 'average');
         $scoreDisplay = ScoreDisplay :: instance();
-        $display = $scoreDisplay->display_score($score, SCORE_DIV, SCORE_BOTH, true);
+        $display = $scoreDisplay->display_score($score, SCORE_DIV_PERCENT_WITH_CUSTOM, SCORE_BOTH, true);
         $type = $item->get_item_type();
 
         if ($type == 'L' && get_class($item) == 'ExerciseLink') {
@@ -293,7 +293,7 @@ class GradebookDataGenerator
         $scoreDisplay = null;
         if (isset($score[0])) {
             $scoreDisplay = ScoreDisplay::instance();
-            $scoreDisplay = $scoreDisplay->display_score($score, SCORE_DIV, SCORE_BOTH, true);
+            $scoreDisplay = $scoreDisplay->display_score($score, SCORE_DIV, SCORE_BOTH);
         }
 
         return array(
@@ -358,7 +358,7 @@ class GradebookDataGenerator
                         ];
                     //}
 
-                $display = $scoredisplay->display_score($score, SCORE_DIV);
+                $display = $scoredisplay->display_score($score, SCORE_DIV_PERCENT_WITH_CUSTOM);
 
                 $type = $item->get_item_type();
                 if ($type == 'L' && get_class($item) == 'ExerciseLink') {

main/gradebook/lib/scoredisplay.class.php

@@ -323,7 +323,7 @@ class ScoreDisplay
             $display = $this->display_default($my_score, $type);
         }
 
-        if ($this->coloring_enabled && $no_color == false) {
+        if ($this->coloring_enabled && $no_color != false) {
             $my_score_denom = isset($score[1]) && !empty($score[1]) ? $score[1] : 1;
             $scoreCleaned = isset($score[0]) ? $score[0] : 0;
             if (($scoreCleaned / $my_score_denom) < ($this->color_split_value / 100)) {