#282 [ODT] fix: fatal if nbtasks empty

Evarisk · Jun 7, 2023 · 1d23193 · 1d23193
1 parent dc82b02
commit 1d23193
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/core/modules/dolisirh/dolisirhdocuments/projectdocument/doc_projectdocument_odt.modules.php b/core/modules/dolisirh/dolisirhdocuments/projectdocument/doc_projectdocument_odt.modules.php
@@ -326,21 +326,24 @@ public function write_file(SaturneDocuments $objectDocument, Translate $outputLa
         $totalProgress        = 0;
         $totalPlannedWorkload = 0;
         $totalConsumedTime    = 0;
-        $nbTasks              = 0;
         if (is_array($tasksArray) && !empty($tasksArray)) {
             $nbTasks = count($tasksArray);
             foreach ($tasksArray as $task) {
                 $totalProgress        += $task->progress;
                 $totalPlannedWorkload += $task->planned_workload;
                 $totalConsumedTime    += $task->duration;
             }
+            $tmpArray['project_progress']         = (($totalProgress) ? price2num($totalProgress / $nbTasks, 2) . ' %' : '0 %');
+            $tmpArray['project_status']           = $object->getLibStatut();
+            $tmpArray['project_planned_workload'] = convertSecondToTime($totalPlannedWorkload, 'allhourmin');
+            $tmpArray['project_timespent']        = convertSecondToTime($totalConsumedTime, 'allhourmin');
+        } else {
+            $tmpArray['project_progress']         = '';
+            $tmpArray['project_status']           = '';
+            $tmpArray['project_planned_workload'] = '';
+            $tmpArray['project_timespent']        = '';
         }
 
-        $tmpArray['project_progress']         = (($totalProgress) ? price2num($totalProgress / $nbTasks, 2) . ' %' : '0 %');
-        $tmpArray['project_status']           = $object->getLibStatut();
-        $tmpArray['project_planned_workload'] = convertSecondToTime($totalPlannedWorkload, 'allhourmin');
-        $tmpArray['project_timespent']        = convertSecondToTime($totalConsumedTime, 'allhourmin');
-
         $moreParam['tmparray'] = $tmpArray;
 
         return parent::write_file($objectDocument, $outputLangs, $srcTemplatePath, $hideDetails, $hideDesc, $hideRef, $moreParam);

diff --git a/documents/doctemplates/projectdocument/template_projectdocument.odt b/documents/doctemplates/projectdocument/template_projectdocument.odt