Fix gradebook result, make difference between null and 0 result

BT#17405

main/gradebook/lib/be/exerciselink.class.php

@@ -316,7 +316,7 @@ class ExerciseLink extends AbstractLink
 
         if (isset($stud_id) && empty($type)) {
             // for 1 student
-            if ($data = Database::fetch_array($scores)) {
+            if ($data = Database::fetch_array($scores, 'ASSOC')) {
                 $attempts = Database::query($sql);
                 $counter = 0;
                 while ($attempt = Database::fetch_array($attempts)) {

main/gradebook/lib/flatview_data_generator.class.php

@@ -439,12 +439,19 @@ class FlatViewDataGenerator
             );
 
             $evaluationsAdded = [];
+            $detailAdminView = api_get_setting('gradebook_detailed_admin_view');
+            $style = api_get_configuration_value('gradebook_report_score_style');
+            $defaultStyle = SCORE_DIV_SIMPLE_WITH_CUSTOM;
+            if (!empty($style)) {
+                $defaultStyle = (int) $style;
+            }
+
             if (0 == $parent_id && !empty($allcat)) {
                 /** @var Category $sub_cat */
                 foreach ($allcat as $sub_cat) {
                     $score = $sub_cat->calc_score($user_id);
 
-                    if ('true' === api_get_setting('gradebook_detailed_admin_view')) {
+                    if ('true' === $detailAdminView) {
                         $links = $sub_cat->get_links();
                         /** @var ExerciseLink $link */
                         $linkScoreList = [];
@@ -478,12 +485,6 @@ class FlatViewDataGenerator
                     $item_value = $percentage * $item_value;
                     $item_total += $sub_cat->get_weight();
 
-                    $style = api_get_configuration_value('gradebook_report_score_style');
-                    $defaultStyle = SCORE_DIV_SIMPLE_WITH_CUSTOM;
-                    if (!empty($style)) {
-                        $defaultStyle = (int) $style;
-                    }
-
                     if ('false' === api_get_setting('gradebook_show_percentage_in_reports')) {
                         $defaultShowPercentageValue = SCORE_SIMPLE;
                         if (!empty($style)) {
@@ -573,7 +574,6 @@ class FlatViewDataGenerator
 
             if (!$show_all) {
                 $defaultStyle = empty($style) ? SCORE_DIV_PERCENT : (int) $style;
-
                 $displayScore = $scoreDisplay->display_score($total_score, $defaultStyle);
                 if (!empty($model)) {
                     $displayScore = ExerciseLib::show_score($total_score[0], $total_score[1]);
@@ -585,7 +585,6 @@ class FlatViewDataGenerator
                 }
             } else {
                 $defaultStyle = empty($style) ? SCORE_DIV_SIMPLE_WITH_CUSTOM_LETTERS : (int) $style;
-
                 $displayScore = $scoreDisplay->display_score($total_score, $defaultStyle);
                 if (!empty($model)) {
                     $displayScore = ExerciseLib::show_score($total_score[0], $total_score[1]);
@@ -637,7 +636,7 @@ class FlatViewDataGenerator
         if (!empty($style)) {
             $defaultStyle = (int) $style;
         }
-
+        $showPercentage = api_get_setting('gradebook_show_percentage_in_reports');
         for ($count = 0; $count < $items_count && ($items_start + $count < count($this->evals_links)); $count++) {
             /** @var AbstractLink $item */
             $item = $this->evals_links[$count + $items_start];
@@ -661,7 +660,7 @@ class FlatViewDataGenerator
             $divide = isset($score[1]) && !empty($score[1]) && $score[1] > 0 ? $score[1] : 1;
 
             // Sub cat weight
-            $item_value = isset($score[0]) ? $score[0] / $divide : 0;
+            $item_value = isset($score[0]) ? $score[0] / $divide : null;
 
             // Fixing total when using one or multiple gradebooks.
             if (empty($parentCategoryIdFilter)) {
@@ -669,14 +668,17 @@ class FlatViewDataGenerator
                     if (isset($score[0])) {
                         $item_value = $score[0] / $divide * $item->get_weight();
                     } else {
-                        $item_value = 0;
+                        $item_value = null;
                     }
                 } else {
-                    $item_value = $item_value * $item->get_weight();
+                    if (null !== $item_value) {
+                        $item_value = $item_value * $item->get_weight();
+                    }
                 }
             } else {
                 $item_value = $score[0] / $divide * $item->get_weight();
             }
+
             $item_total += $item->get_weight();
 
             $complete_score = $scoreDisplay->display_score(
@@ -685,7 +687,7 @@ class FlatViewDataGenerator
                 SCORE_ONLY_SCORE
             );
 
-            if ('false' === api_get_setting('gradebook_show_percentage_in_reports')) {
+            if ('false' === $showPercentage) {
                 $defaultShowPercentageValue = SCORE_SIMPLE;
                 if (!empty($style)) {
                     $defaultShowPercentageValue = $style;
@@ -706,6 +708,7 @@ class FlatViewDataGenerator
                 );
                 $temp_score = Display::tip($temp_score, $complete_score);
             }
+
             if (!empty($model)) {
                 $scoreToShow = '';
                 if (isset($score[0]) && isset($score[1])) {
@@ -732,13 +735,17 @@ class FlatViewDataGenerator
                         ]
                     )
                     ) {
-                        if (!empty($score[0])) {
+                        if (null !== $score[0]) {
                             $row[] = $temp_score.' ';
                         } else {
                             $row[] = '';
                         }
                     } else {
-                        $row[] = $temp_score.' ';
+                        if (null !== $score[0]) {
+                            $row[] = $temp_score.' ';
+                        } else {
+                            $row[] = '';
+                        }
                     }
                 } else {
                     $row[] = $temp_score;