#1690 [Survey] add: ODT change average calcul

Evarisk · Jan 27, 2024 · ce0b718 · ce0b718
1 parent 3094b95
commit ce0b718
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/core/modules/digiquali/digiqualidocuments/surveydocument/doc_surveydocument_odt.modules.php b/core/modules/digiquali/digiqualidocuments/surveydocument/doc_surveydocument_odt.modules.php
@@ -304,24 +304,28 @@ public function write_file(SaturneDocuments $objectDocument, Translate $outputLa
 
         $sheet->fetchQuestionsLinked($object->fk_sheet, 'digiquali_' . $sheet->element);
 
-        $questionCounter = count($sheet->linkedObjectsIds['digiquali_question']);
-
-        $average = 0;
+        $averagePercentageQuestions = 0;
+        $percentQuestionCounter     = 0;
         foreach ($sheet->linkedObjects['digiquali_question'] as $questionLinked) {
             if ($questionLinked->type !== 'Percentage') {
                 continue; // Skip non-percentage questions
             }
 
+            $percentQuestionCounter++;
             foreach ($object->lines as $line) {
                 if ($line->fk_question === $questionLinked->id) {
-                    $average += $line->answer;
+                    $averagePercentageQuestions += $line->answer;
                 }
             }
         }
 
-        $average = ($questionCounter > 0) ? ($average / $questionCounter) : 0;
+        $averagePercentageQuestions = ($percentQuestionCounter > 0) ? ($averagePercentageQuestions / $percentQuestionCounter) : 0;
 
-        $tmpArray['average']            = price2num($average) . ' %';
+        if ($percentQuestionCounter > 0) {
+            $tmpArray['average'] = price2num($averagePercentageQuestions) . ' %';
+        } else {
+            $tmpArray['average'] = '';
+        }
         $tmpArray['project_label']      = $project->ref . ' - ' . $project->title;
         $tmpArray['sheet_ref']          = $sheet->ref;
         $tmpArray['sheet_label']        = $sheet->label;