From 4c9b0a1db2e0e6720f955ce8e8a0ff02ea80bc71 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Sat, 15 Jun 2024 13:12:26 +0200
Subject: [PATCH] fix stat clos

---
 src/Controller/ScrumController.php | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/Controller/ScrumController.php b/src/Controller/ScrumController.php
index 472162c..04f847b 100755
--- a/src/Controller/ScrumController.php
+++ b/src/Controller/ScrumController.php
@@ -633,7 +633,7 @@ class ScrumController extends AbstractController
         $showfilters        = $em->getRepository("App:User")->getUserpreference($this->getUser(),"showfilters",$id);
         
         $tbestim=$this->getEstim($scrum);
-       
+        
         return $this->render($this->render.'stat.html.twig', [
             'useheader'         => true,
             'usesidebar'        => false,
@@ -759,6 +759,18 @@ class ScrumController extends AbstractController
                 ];
             }            
 
+            if(!array_key_exists("clos",$tbestim[$idjal]["columns"])) {
+                $tbestim[$idjal]["columns"]["clos"] = [
+                    "rowcol" => 1000,
+                    "idcol" => "clos",
+                    "gicol" => "clos",
+                    "nmcol" => "Clos",
+                    "color" => "000000",
+                    "nbjrs" => 0,
+                    "nbiss" => 0,
+                ];
+            }  
+            
             if(!array_key_exists($idcol,$tbestim[$idjal]["columns"])) {
                 $tbestim[$idjal]["columns"][$idcol] = [
                     "rowcol" => $rowcol,
@@ -771,6 +783,18 @@ class ScrumController extends AbstractController
                 ];
             }         
             
+            if(!array_key_exists("clos",$tbestim[$idjal]["sprints"][$idspr]["columns"])) {
+                $tbestim[$idjal]["sprints"][$idspr]["columns"]["clos"] = [
+                    "rowcol" => 10000,
+                    "idcol" => "clos",
+                    "gicol" => "clos",
+                    "nmcol" => "Clos",
+                    "color" => "000000",
+                    "nbjrs" => 0,
+                    "nbiss" => 0,
+                ];
+            }
+            
             if(!array_key_exists($idcol,$tbestim[$idjal]["sprints"][$idspr]["columns"])) {
                 $tbestim[$idjal]["sprints"][$idspr]["columns"][$idcol] = [
                     "rowcol" => $rowcol,
@@ -782,8 +806,10 @@ class ScrumController extends AbstractController
                     "nbiss" => 0,
                 ];
             }         
-            
+
             // On cumule les estimations
+            if($issue->getGiteastate()=="closed") $idcol="clos";
+
             $tbestim[$idjal]["nbjrs"]+=$issue->getWeight();
             $tbestim[$idjal]["columns"][$idcol]["nbjrs"]+=$issue->getWeight();
             $tbestim[$idjal]["sprints"][$idspr]["nbjrs"]+=$issue->getWeight();