From d92e1d8d5ca716ee3b95c004d27e681dc1d06dcc Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Tue, 28 Jul 2020 10:36:44 +0200
Subject: [PATCH] =?UTF-8?q?rapport=20hebdomadaire,=20par=20projet,=20t?=
 =?UTF-8?q?=C3=A2che=20et=20utilisateur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Controller/ReportController.php       | 161 +++++++++++++-----
 .../templates/Report/export.csv.twig          |  10 +-
 2 files changed, 122 insertions(+), 49 deletions(-)

diff --git a/src/schedule-2.0/src/Controller/ReportController.php b/src/schedule-2.0/src/Controller/ReportController.php
index 76bf981..735d4f4 100755
--- a/src/schedule-2.0/src/Controller/ReportController.php
+++ b/src/schedule-2.0/src/Controller/ReportController.php
@@ -610,25 +610,48 @@ class ReportController extends AbstractController
                 $tbproject["weeks"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["cumul"] = $tbproject["weeks"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["cumul"]+$event->getDuration();
             }
            
-            foreach($eventsbyweek as $event) {
-                if(!isset($tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"])){
-                    $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")] = [
-                        "weeknumber" => $event->getStart()->format("W"),
-                        "users" => [],
-                    ];
-                }
-                if(!isset($tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()])){
-                    $tbuser= [
-                        "id"=>$event->getUser()->getId(),
-                        "displayname"=>$event->getUser()->getDisplayname(),
-                        "cumul"=>0
-                    ];
-                    $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()] = $tbuser;
-                }
+            // foreach($eventsbyweek as $event) {
+            //     if(!isset($tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"])){
+            //         $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")] = [
+            //             "weeknumber" => $event->getStart()->format("W"),
+            //             "users" => [],
+            //         ];
+            //     }
+            //     if(!isset($tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()])){
+            //         $tbuser= [
+            //             "id"=>$event->getUser()->getId(),
+            //             "displayname"=>$event->getUser()->getDisplayname(),
+            //             "cumul"=>0
+            //         ];
+            //         $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()] = $tbuser;
+            //     }
             
-                $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()]["cumul"] = $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()]["cumul"]+$event->getDuration();
-            }
-
+            //     $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()]["cumul"] = $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()]["cumul"]+$event->getDuration();
+            // }
+            // foreach($eventsbyweek as $event) {
+            //     if(!isset($tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"])){
+            //         $tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")] = [
+            //             "weeknumber" => $event->getStart()->format("W"),
+            //             "tasks" => [],
+            //         ];
+            //     }
+            //     if(!isset($tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"][$event->getTask()->getId()])){
+            //         $tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"][$event->getTask()->getId()] = [
+            //             "taskname" => $event->getTask()->getName(),
+            //             "users" => [],
+            //         ];
+            //     }
+            //     if(!isset($tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"][$event->getTask()->getId()]["users"][$event->getUser()->getId()])){
+            //         $tbuser= [
+            //             "id"=>$event->getUser()->getId(),
+            //             "displayname"=>$event->getUser()->getDisplayname(),
+            //             "cumul"=>0
+            //         ];
+            //         $tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"][$event->getTask()->getId()]["users"][$event->getUser()->getId()] = $tbuser;
+            //     }
+                
+            //     $tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"][$event->getTask()->getId()]["users"][$event->getUser()->getId()]["cumul"] = $tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"][$event->getTask()->getId()]["users"][$event->getUser()->getId()]["cumul"]+$event->getDuration();
+            // }
             // Somme astreintes validé par semaine
             $start=new \Datetime('first day of this month');
             $start->sub(new \DateInterval('P'.$nbmonth.'M'));
@@ -1130,33 +1153,57 @@ class ReportController extends AbstractController
                 ->orderBy('event.start')
                 ->getQuery()->getResult();
 
+            // foreach($eventsbyweek as $event) {
+            //     if(!isset($tbproject["weeks"][$event->getStart()->format("Y")][$event->getStart()->format("W")])){
+            //         $tbproject["weeks"][$event->getStart()->format("Y")][$event->getStart()->format("W")] = [
+            //             "weeknumber" => $event->getStart()->format("W"),
+            //             "cumul" => 0,
+            //         ];
+            //     }
+            //     $tbproject["weeks"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["cumul"] = $tbproject["weeks"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["cumul"]+$event->getDuration();
+
+            // }
+            // foreach($eventsbyweek as $event) {
+            //     if(!isset($tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"])){
+            //         $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")] = [
+            //             "weeknumber" => $event->getStart()->format("W"),
+            //             "users" => [],
+            //         ];
+            //     }
+            //     if(!isset($tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()])){
+            //         $tbuser= [
+            //             "id"=>$event->getUser()->getId(),
+            //             "displayname"=>$event->getUser()->getDisplayname(),
+            //             "cumul"=>0
+            //         ];
+            //             $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()] = $tbuser;
+            //     }
+            
+            //     $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()]["cumul"] = $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()]["cumul"]+$event->getDuration();
+            // }
             foreach($eventsbyweek as $event) {
-                if(!isset($tbproject["weeks"][$event->getStart()->format("Y")][$event->getStart()->format("W")])){
-                    $tbproject["weeks"][$event->getStart()->format("Y")][$event->getStart()->format("W")] = [
+                if(!isset($tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"])){
+                    $tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")] = [
                         "weeknumber" => $event->getStart()->format("W"),
-                        "cumul" => 0,
+                        "tasks" => [],
                     ];
                 }
-                $tbproject["weeks"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["cumul"] = $tbproject["weeks"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["cumul"]+$event->getDuration();
-
-            }
-            foreach($eventsbyweek as $event) {
-                if(!isset($tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"])){
-                    $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")] = [
-                        "weeknumber" => $event->getStart()->format("W"),
+                if(!isset($tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"][$event->getTask()->getId()])){
+                    $tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"][$event->getTask()->getId()] = [
+                        "taskname" => $event->getTask()->getName(),
                         "users" => [],
                     ];
                 }
-                if(!isset($tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()])){
+                if(!isset($tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"][$event->getTask()->getId()]["users"][$event->getUser()->getId()])){
                     $tbuser= [
                         "id"=>$event->getUser()->getId(),
                         "displayname"=>$event->getUser()->getDisplayname(),
                         "cumul"=>0
                     ];
-                        $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()] = $tbuser;
+                    $tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"][$event->getTask()->getId()]["users"][$event->getUser()->getId()] = $tbuser;
                 }
-            
-                $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()]["cumul"] = $tbproject["weeks_by_name"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["users"][$event->getUser()->getId()]["cumul"]+$event->getDuration();
+                
+                $tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"][$event->getTask()->getId()]["users"][$event->getUser()->getId()]["cumul"] = $tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"][$event->getTask()->getId()]["users"][$event->getUser()->getId()]["cumul"]+$event->getDuration();
             }
             // Somme astreintes validé par semaine
             $start=new \Datetime('first day of this month');
@@ -1185,32 +1232,56 @@ class ReportController extends AbstractController
                 ->setParameter('end',$endmonth)
                 ->orderBy('penalty.start')
                 ->getQuery()->getResult();
+            // foreach($penaltybyweek as $penalty) {
+            //     if(!isset($tbproject["weeks"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")])){
+            //         $tbproject["weeks"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")] = [
+            //             "weeknumber" => $penalty->getStart()->format("W"),
+            //             "cumul" => 0,
+            //         ];
+            //     }
+            //     $tbproject["weeks"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["cumul"] = $tbproject["weeks"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["cumul"]+$penalty->getDuration();
+            // }
+            // foreach($penaltybyweek as $penalty) {
+            //     if(!isset($tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["users"])){
+            //         $tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")] = [
+            //             "weeknumber" => $penalty->getStart()->format("W"),
+            //             "users" => [],
+            //         ];
+            //     }
+            //     if(!isset($tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["users"][$penalty->getUser()->getId()])){
+            //         $tbuser= [
+            //             "id"=>$penalty->getUser()->getId(),
+            //             "displayname"=>$penalty->getUser()->getDisplayname(),
+            //             "cumul"=>0
+            //         ];
+            //             $tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["users"][$penalty->getUser()->getId()] = $tbuser;
+            //     }
+            
+            //     $tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["users"][$penalty->getUser()->getId()]["cumul"] = $tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["users"][$penalty->getUser()->getId()]["cumul"]+$penalty->getDuration();
+            // }
             foreach($penaltybyweek as $penalty) {
-                if(!isset($tbproject["weeks"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")])){
-                    $tbproject["weeks"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")] = [
+                if(!isset($tbproject["weeks_by_task_by_user"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["tasks"])){
+                    $tbproject["weeks_by_task_by_user"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")] = [
                         "weeknumber" => $penalty->getStart()->format("W"),
-                        "cumul" => 0,
+                        "tasks" => [],
                     ];
                 }
-                $tbproject["weeks"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["cumul"] = $tbproject["weeks"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["cumul"]+$penalty->getDuration();
-            }
-            foreach($penaltybyweek as $penalty) {
-                if(!isset($tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["users"])){
-                    $tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")] = [
-                        "weeknumber" => $penalty->getStart()->format("W"),
+                if(!isset($tbproject["weeks_by_task_by_user"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["tasks"][$penalty->getTask()->getId()])){
+                    $tbproject["weeks_by_task_by_user"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["tasks"][$penalty->getTask()->getId()] = [
+                        "taskname" => $penalty->getTask()->getName(),
                         "users" => [],
                     ];
                 }
-                if(!isset($tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["users"][$penalty->getUser()->getId()])){
+                if(!isset($tbproject["weeks_by_task_by_user"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["tasks"][$penalty->getTask()->getId()]["users"][$penalty->getUser()->getId()])){
                     $tbuser= [
                         "id"=>$penalty->getUser()->getId(),
                         "displayname"=>$penalty->getUser()->getDisplayname(),
                         "cumul"=>0
                     ];
-                        $tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["users"][$penalty->getUser()->getId()] = $tbuser;
+                    $tbproject["weeks_by_task_by_user"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["tasks"][$penalty->getTask()->getId()]["users"][$penalty->getUser()->getId()] = $tbuser;
                 }
-            
-                $tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["users"][$penalty->getUser()->getId()]["cumul"] = $tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["users"][$penalty->getUser()->getId()]["cumul"]+$penalty->getDuration();
+                
+                $tbproject["weeks_by_task_by_user"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["tasks"][$penalty->getTask()->getId()]["users"][$penalty->getUser()->getId()]["cumul"] = $tbproject["weeks_by_task_by_user"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["tasks"][$penalty->getTask()->getId()]["users"][$penalty->getUser()->getId()]["cumul"]+$penalty->getDuration();
             }
 
             $tbprojects[$project->getId()]=$tbproject;
diff --git a/src/schedule-2.0/templates/Report/export.csv.twig b/src/schedule-2.0/templates/Report/export.csv.twig
index c1a5a81..6e75a0d 100644
--- a/src/schedule-2.0/templates/Report/export.csv.twig
+++ b/src/schedule-2.0/templates/Report/export.csv.twig
@@ -1,10 +1,12 @@
 {% block body %}
-Projet;Utilisateur;Année;Semaine;Cumul;
+Projet;Tâche;Utilisateur;Année;Semaine;Cumul;
 {% for project in projects %}
-{% for year,weeks in project.weeks_by_name %}
+{% for year,weeks in project.weeks_by_task_by_user %}
 {% for week in weeks %}
-{% for user in week.users%}
-{{project.projectname}};{{user.displayname}};{{year}};S{{week.weeknumber}};{{user.cumul}};
+{% for task in week.tasks%}
+{% for user in task.users%}
+{{project.projectname}};{{task.taskname}};{{user.displayname}};{{year}};S{{week.weeknumber}};{{user.cumul|replace({".": ","})}};
+{% endfor %}
 {% endfor %}
 {% endfor %}
 {% endfor %}