From 5f149ade6fe7e2c0f068af36ff255109c61ab844 Mon Sep 17 00:00:00 2001
From: Etienne Pallier <epallier@irap.omp.eu>
Date: Thu, 25 Nov 2021 15:44:45 +0100
Subject: [PATCH] Bugfix page statistique sur les matériels (conditions limites, division par zéro quand année précédente nulle)

---
 CHANGELOG                    |  4 ++++
 README.md                    |  4 ++--
 src/Template/Pages/stats.ctp | 65 ++++++++++++++++++++++++++++++++++++++++++++---------------------
 3 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5c48bd5..651b2f4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -631,6 +631,10 @@ Ne pas autoriser la commande via url si le bouton order est désactivé dans la 
 ======= CHANGES =======
 
 -------
+25/11/2021	v5.3.9-3.7.9
+	- (b) Bugfix page statistique sur les matériels (conditions limites, division par zéro quand année précédente nulle)
+
+-------
 24/11/2021	v5.3.8-3.7.9
 	- (e) Nouvelle Amélioration (bugfix) de la présentation de la page de configuration des champs obligatoires
 	- (e) Amélioration de toutes les pages de config : pliées par défaut
diff --git a/README.md b/README.md
index 9ef8073..30a8bc2 100644
--- a/README.md
+++ b/README.md
@@ -52,8 +52,8 @@ Logiciel testé et validé sur les configurations suivantes :
 
 --------------------------------------------------------------------------------------------
 
-Date: 24/11/2021	
-Version: v5.3.8-3.7.9
+Date: 25/11/2021	
+Version: v5.3.9-3.7.9
 
 
 HISTORIQUE DES CHANGEMENTS DE VERSION : voir le fichier CHANGES.txt (ou la page web /pages/changes)
diff --git a/src/Template/Pages/stats.ctp b/src/Template/Pages/stats.ctp
index 5cdc492..a86d243 100644
--- a/src/Template/Pages/stats.ctp
+++ b/src/Template/Pages/stats.ctp
@@ -76,55 +76,78 @@ function displayEmptyLine() {
     </tr>";
 }
 
-
+// 100 * (current - prev) / prev
+function computeEvolutionFromPrevToCurrent($prev,$current) {
+    $evol_from_year_prev = round ( 100 * ($current-$prev) / $prev );
+    if ($evol_from_year_prev >= 0) $evol_from_year_prev = '+'.$evol_from_year_prev;
+    return $evol_from_year_prev.'%';
+}
 //function displayStatsLine($title, $line, $suivis, $prets, $bold=false, $year_prev=null, $avg=null) {
-function displayStatsLine($title, $line, $is_bold=false, $year_prev=null, $avg=null) {
+function displayStatsLine($title, $line, $is_bold=false, $year_prev_tot=-1, $avg=-1) {
     //debug($line);
     ?>
     <tr>
         
         <!-- Titre -->
         <td><b><?=$title?></b></td>
-        
-        <!-- Evolution \N-1 et \avg -->
+
+		<?php 
+        $year_curr_tot = $line['CREATED'];
+		?>        
+
+        <!-- Evolution \ N-1 -->
         <?php
-        $total = $line['CREATED'];
-        $evol_from_year_prev = '/';
-        $evol_from_avg = '/';
-        if ($year_prev) {
-            $evol_from_year_prev = round (($total-$year_prev['CREATED'])/$year_prev['CREATED'] * 100);
-            if ($evol_from_year_prev>=0) $evol_from_year_prev = '+'.$evol_from_year_prev;
-            $evol_from_year_prev .= '%';
+        //$evol_from_year_prev = '/';
+        $evol_from_year_prev = $year_prev_tot>0 ? computeEvolutionFromPrevToCurrent($year_prev_tot, $year_curr_tot) : '/';
+        /* inutile, on fait pas des maths ici
+        // - Si prev = 0 => éviter division par zéro, résultat = +/- INFINI
+        if ($year_prev_tot==0) {
+            if ($year_curr_tot==0) $evol_from_year_prev = '+0';
+            else $evol_from_year_prev = $year_curr_tot>0 ? '+INF' : '-INF';
         }
+        // - Si prev <> 0 => Cas nominal
+        else {
+        $evol_from_year_prev = round ( 100 * ($year_curr_tot-$year_prev_tot) / $year_prev_tot );
+        if ($evol_from_year_prev >= 0) $evol_from_year_prev = '+'.$evol_from_year_prev;
+        $evol_from_year_prev .= '%';
+        */
+        ?>
+        <td><?=$evol_from_year_prev?></td>
+        
+        <!-- Evolution \ moyenne -->
+        <?php
+        //$evol_from_avg = '/';
+        $evol_from_avg = $avg>0 ? computeEvolutionFromPrevToCurrent($avg, $year_curr_tot) : '/';
+        /*
         if ($avg) {
-            $evol_from_avg = round (($total-$avg['CREATED'])/$avg['CREATED'] * 100);
+            $evol_from_avg = round (($year_curr_tot-$avg['CREATED'])/$avg['CREATED'] * 100);
             if ($evol_from_avg>=0) $evol_from_avg = '+'.$evol_from_avg;
             $evol_from_avg .= '%';
         }
+        */
         ?>
-        <td><?=$evol_from_year_prev?></td>
         <td><?=$evol_from_avg?></td>
 
         <!-- TOTAL -->
-        <td><?=echoAsPctAndBold($total, null, $is_bold)?></td>
+        <td><?=echoAsPctAndBold($year_curr_tot, null, $is_bold)?></td>
         
         <!-- VALIDATED -->
-        <td><?=echoAsPctAndBold($line['VALIDATED'], $total, $is_bold)?></td>
+        <td><?=echoAsPctAndBold($line['VALIDATED'], $year_curr_tot, $is_bold)?></td>
     	
         <!-- TBA -->
         <!-- 
         <td><echoAsPctAndBold($line['TOBEARCHIVED'], null, $is_bold)></td>
          -->
-        <td><?=echoAsPctAndBold($line['TOBEARCHIVED'], $total, $is_bold)?></td>
+        <td><?=echoAsPctAndBold($line['TOBEARCHIVED'], $year_curr_tot, $is_bold)?></td>
 
         <!-- ARCHIVED -->
-        <td><?=echoAsPctAndBold($line['ARCHIVED'], $total, $is_bold)?></td>
+        <td><?=echoAsPctAndBold($line['ARCHIVED'], $year_curr_tot, $is_bold)?></td>
 
         <!-- SUIVIS -->
-        <td><?=echoAsPctAndBold($line['suivis'], $total, $is_bold)?></td>
+        <td><?=echoAsPctAndBold($line['suivis'], $year_curr_tot, $is_bold)?></td>
 
         <!-- EMPRUNTS -->
-        <td><?=echoAsPctAndBold($line['prets'], $total, $is_bold)?></td>
+        <td><?=echoAsPctAndBold($line['prets'], $year_curr_tot, $is_bold)?></td>
     	
     </tr>
     <?php
@@ -279,8 +302,8 @@ echo $this->Form->end();
     	    $val = $years[$y];
     	    $year_title = $y;
     	    if ($y==$current_year) $year_title = "Année en cours ($y)";
-    	    $year_prev = $y==$year_min ? null : $years[$y-1];
-    	    displayStatsLine($year_title, $val, false, $year_prev, $avg);
+    	    $year_prev_tot = $y==$year_min ? -1 : $years[$y-1]['CREATED'];
+    	    displayStatsLine($year_title, $val, false, $year_prev_tot, $avg['CREATED']);
     	}
     	
     	?>
--
libgit2 0.21.2