Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Author: ywarnier

main/gradebook/lib/gradebook_data_generator.class.php

@@ -356,14 +356,18 @@ public function get_data(
                     $row[] = $result['display'];
                     $row['result_score'] = $result['score'];
                     $row['result_score_weight'] = $result['score'];
+                    $showPercentage = true;
+                    if ($this->hidePercentage) {
+                        $showPercentage = false;
+                    }
 
                     if (empty($model)) {
                         // Best
                         if (isset($defaultData[$item->get_id()]) && isset($defaultData[$item->get_id()]['best'])) {
                             $best = $defaultData[$item->get_id()]['best'];
                             if ($useExerciseScoreInTotal) {
                                 $bestScore = $best['score'];
-                                $best['display'] = ExerciseLib::show_score($bestScore[0], $bestScore[1], true);
+                                $best['display'] = ExerciseLib::show_score($bestScore[0], $bestScore[1], $showPercentage);
                             } else {
                                 $best = $defaultData[$item->get_id()]['best'];
                             }
@@ -380,7 +384,7 @@ public function get_data(
                             $average = $defaultData[$item->get_id()]['average'];
                             if ($useExerciseScoreInTotal) {
                                 $averageScore = $average['score'];
-                                $average['display'] = ExerciseLib::show_score($averageScore[0], $averageScore[1], true);
+                                $average['display'] = ExerciseLib::show_score($averageScore[0], $averageScore[1], $showPercentage);
                             }
                         } else {
                             $average = $this->buildAverageResultColumn($item, $useExerciseScoreInTotal);