Fix total values using format_score see BT#13460

chamilo · Oct 2, 2017 · 60c8801 · 60c8801
1 parent 6317d46
commit 60c8801
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/main/gradebook/lib/fe/displaygradebook.php b/main/gradebook/lib/fe/displaygradebook.php
@@ -314,13 +314,14 @@ public static function header(
                 if (!empty($score)) {
                     $divide = $score[1] == 0 ? 1 : $score[1];
                     $item_value = $score[0] / $divide * $item->get_weight();
-                    $item_value_total += $item_value;
+                    $item_value_total += $scoredisplay->format_score($item_value);
                 }
             }
 
             $item_total = $main_weight;
             $total_score = array($item_value_total, $item_total);
             $scorecourse_display = $scoredisplay->display_score($total_score, SCORE_DIV_PERCENT);
+
             if ((!$catobj->get_id() == '0') && (!isset($_GET['studentoverview'])) && (!isset($_GET['search']))) {
                 $additionalButtons = null;
                 if (!empty($certificateLinkInfo)) {

diff --git a/main/gradebook/lib/fe/gradebooktable.class.php b/main/gradebook/lib/fe/gradebooktable.class.php
@@ -385,13 +385,13 @@ public function get_table_data($from = 1, $per_page = null, $column = null, $dir
                                 $data['result_score'][1]
                             );
                         }
-
                         $totalResultAverageValue = strip_tags(
                             $scoredisplay->display_score(
                                 $totalResult,
                                 SCORE_AVERAGE
                             )
                         );
+
                         $this->dataForGraph['my_result'][] = floatval($totalResultAverageValue);
                         $this->dataForGraph['my_result_no_float'][] = $data['result_score'][0];
                         $totalAverageValue = strip_tags($scoredisplay->display_score($totalAverage, SCORE_AVERAGE));
@@ -631,8 +631,9 @@ public function get_table_data($from = 1, $per_page = null, $column = null, $dir
                 $global = null;
                 $average = null;
                 $myTotal = 0;
+
                 foreach ($this->dataForGraph['my_result_no_float'] as $result) {
-                    $myTotal += $result;
+                    $myTotal += $scoredisplay->format_score($result);
                 }
 
                 $totalResult[0] = $myTotal;