From ed91a16b2b597dbcc28bb983160c6eca975ce973 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadole.com>
Date: Thu, 22 Sep 2022 14:12:55 +0200
Subject: [PATCH] correction fuseau & affichage rapport mensuel

---
 .../src/Controller/TallydayController.php     |  2 ++
 .../src/Repository/TallydayRepository.php     | 31 +++++++------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/ninebadge-1.0/src/Controller/TallydayController.php b/src/ninebadge-1.0/src/Controller/TallydayController.php
index 77290c8..43b1701 100755
--- a/src/ninebadge-1.0/src/Controller/TallydayController.php
+++ b/src/ninebadge-1.0/src/Controller/TallydayController.php
@@ -137,6 +137,8 @@ class TallydayController extends AbstractController
         $users = $em->getRepository("App:User")->findBy([],["firstname"=>"ASC","lastname"=>"ASC"]);
         foreach($users as $user) {
             if($user->hasRole("ROLE_USER")) {
+                
+
                 $dates[$user->getId()] = [
                     "id"=>$user->getId(),
                     "avatar"=>$user->getAvatar(),
diff --git a/src/ninebadge-1.0/src/Repository/TallydayRepository.php b/src/ninebadge-1.0/src/Repository/TallydayRepository.php
index 6d46a04..ea8e323 100644
--- a/src/ninebadge-1.0/src/Repository/TallydayRepository.php
+++ b/src/ninebadge-1.0/src/Repository/TallydayRepository.php
@@ -65,38 +65,29 @@ class TallydayRepository extends ServiceEntityRepository
     }
 
     public function getCapitaltimeinterval($user,$getnovalidate=false) {
-
-        // Calculer les jours travaillés sur la base du fuseau Paris
-        date_default_timezone_set("Europe/Paris");
         $datas = $this->_em->getRepository('App:Tallyday')->findBy(["user"=>$user],["datestart"=>"DESC"]);
         $tbdays=[];
+
+        // Cumuler les temps de travail sans fuseau
         $datenow=new \DateTime('00:00');
+        $ework = new \DateTime('00:00', new \DateTimeZone('UTC'));
+        $i=0;
         foreach($datas as $data) {
             if($data->getDateof()<$datenow) {
                 $iddayweek=$data->getDateof()->format("w");
                 if($iddayweek>=1&&$iddayweek<=5) {
                     if(!in_array($data->getDateof(),$tbdays)) array_push($tbdays,$data->getDateof());
                 }
-                if($data->getDateof()==$datenow&&($getnovalidate||$data->getValidateuser()||$data->getValidatemaster())) {
-                    $iddayweek=$data->getDateof()->format("w");
-                    if($iddayweek>=1&&$iddayweek<=5) {
-                        if(!in_array($data->getDateof(),$tbdays)) array_push($tbdays,$data->getDateof());
-                    }
-                }
-            }
-        }
-    
 
-        // Cumuler les temps de travail sans fuseau
-        date_default_timezone_set("UTC");
-        $datenow=new \DateTime('00:00');
-        $ework = clone $datenow;
-        foreach($datas as $data) {
-            if($data->getDateof()<$datenow) {
                 $ework->add($data->getTimeday());
             }
 
             if($data->getDateof()==$datenow&&($getnovalidate||$data->getValidateuser()||$data->getValidatemaster())) {
+                $iddayweek=$data->getDateof()->format("w");
+                if($iddayweek>=1&&$iddayweek<=5) {
+                    if(!in_array($data->getDateof(),$tbdays)) array_push($tbdays,$data->getDateof());
+                }
+
                 $ework->add($data->getTimeday());
             }
         }
@@ -109,12 +100,12 @@ class TallydayRepository extends ServiceEntityRepository
 
         // Nbday worked
         $nbdaywork=count($tbdays);
-        $etowork = clone $datenow;
+
+        $etowork = new \DateTime('00:00', new \DateTimeZone('UTC'));
         $etowork->add(new \DateInterval("PT".($nbdaywork*7)."H"));
 
         $interval = $etowork->diff($ework);
 
-        date_default_timezone_set("Europe/Paris");
         return $interval;
     }