Cadoles
/
ninebadge
10
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into dist/eole/2.8.1/master

This commit is contained in:
Arnaud Fornerot 2022-03-30 13:54:11 +02:00
parent 5416f122d5 d893036fcf
commit 99ea7ad9a5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ninebadge-1.0/src/Controller/TallydayController.php
View File

@ -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);