From d893036fcf34b724822be0e6bbf80842fead4fb9 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadole.com>
Date: Wed, 30 Mar 2022 13:53:43 +0200
Subject: [PATCH] =?UTF-8?q?correctif=20sur=20le=20calcul=20du=20capital=20?=
 =?UTF-8?q?les=20weekend=20et=20dans=20la=20journ=C3=A9e=20meme=20(ref=20#?=
 =?UTF-8?q?6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Controller/TallydayController.php              | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ninebadge-1.0/src/Controller/TallydayController.php b/src/ninebadge-1.0/src/Controller/TallydayController.php
index 26ae183..ac78a93 100755
--- a/src/ninebadge-1.0/src/Controller/TallydayController.php
+++ b/src/ninebadge-1.0/src/Controller/TallydayController.php
@@ -916,30 +916,30 @@ class TallydayController extends AbstractController
         // On recherche le dernier pointage de la journée non terminé et on simule le créneau avec la date du moment
         $data = $em->getRepository($this->entity)->findOneBy(["user"=>$this->getUser(),"dateof"=>$datenow],["datestart"=>"DESC"]);
         if($data&&$data->getDatestart()&&!$data->getDateend()) {
-            $interval2 = $datenow->diff($data->getDatestart());
+            $interval2 = $data->getDatestart()->diff($datenow);
             $e->add($interval2);
         }
 
         // Calcul de temps global de la journée = réel + simulé
-        $interval = $e->diff($f);
+        $interval = $f->diff($e);
         $timeday = $interval->format("%R").(($interval->days*24) + $interval->h).":".sprintf("%02s",$interval->i);
 
         // On récupère le capital
         $capital=$em->getRepository("App:Tallyday")->getCapitaltimeinterval($this->getUser());
         $e = new  \DateTime('00:00');
-        
 
         // Si la journée n'est finalisé on ajoute le créneau simulé
         if($data&&$data->getDatestart()&&!$data->getDateend()) {
             $f = new  \DateTime('00:00');
             $f->add($interval);
-            $f->sub(new \DateInterval('PT7H'));
             $f->add($capital);
-
+            $f->sub(new \DateInterval('PT7H'));
+            
             $interval = $e->diff($f);
             $newcapital = $interval->format("%R").(($interval->days*24) + $interval->h).":".sprintf("%02s",$interval->i);        
     
         }
+
         // Si la journée n'est pas encore validé : on ajoute la journée à la simulation
         else if($data && (!$data->getValidateuser()||!$data->getValidateuser())) {
             $interval=$em->getRepository("App:Tallyday")->getCapitaltimeinterval($this->getUser(),true);