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 3c99723..ea8e323 100644 --- a/src/ninebadge-1.0/src/Repository/TallydayRepository.php +++ b/src/ninebadge-1.0/src/Repository/TallydayRepository.php @@ -65,17 +65,20 @@ class TallydayRepository extends ServiceEntityRepository } public function getCapitaltimeinterval($user,$getnovalidate=false) { - $datenow=new \DateTime('00:00'); $datas = $this->_em->getRepository('App:Tallyday')->findBy(["user"=>$user],["datestart"=>"DESC"]); $tbdays=[]; - $ework = new \DateTime('00:00'); + // 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()); } + $ework->add($data->getTimeday()); } @@ -84,10 +87,11 @@ class TallydayRepository extends ServiceEntityRepository if($iddayweek>=1&&$iddayweek<=5) { if(!in_array($data->getDateof(),$tbdays)) array_push($tbdays,$data->getDateof()); } + $ework->add($data->getTimeday()); } } - + // Enlever du temps travailler les heures sup payƩ $timeextra=$this->_em->getRepository("App:Timeextra")->getTimeextrauser($user, new \DateTime()); if($timeextra[1]) { @@ -96,7 +100,8 @@ class TallydayRepository extends ServiceEntityRepository // Nbday worked $nbdaywork=count($tbdays); - $etowork = new \DateTime('00:00'); + + $etowork = new \DateTime('00:00', new \DateTimeZone('UTC')); $etowork->add(new \DateInterval("PT".($nbdaywork*7)."H")); $interval = $etowork->diff($ework); diff --git a/src/ninebadge-1.0/templates/Tallyday/month.html.twig b/src/ninebadge-1.0/templates/Tallyday/month.html.twig index 86f9d41..2331660 100644 --- a/src/ninebadge-1.0/templates/Tallyday/month.html.twig +++ b/src/ninebadge-1.0/templates/Tallyday/month.html.twig @@ -115,13 +115,14 @@ td { {{validate.dateof|date("W")}} - {% if loop.first %} - {% for i in 2..(validate.dateof|date("N")) %} - - {% endfor %} - {%endif %} {% endif %} + {% if loop.first and validate.dateof|date("l")!="Monday"%} + {% for i in 2..(validate.dateof|date("N")) %} + + {% endfor %} + {%endif %} +
{{validate.dateof|date("d/m")}}