diff --git a/src/ninebadge-1.0/src/Controller/TallydayController.php b/src/ninebadge-1.0/src/Controller/TallydayController.php index 03c78b1..2f2d2c1 100755 --- a/src/ninebadge-1.0/src/Controller/TallydayController.php +++ b/src/ninebadge-1.0/src/Controller/TallydayController.php @@ -186,15 +186,17 @@ class TallydayController extends AbstractController $dates[$user->getId()]["validates"][0]["timeweek"]=$timeweek; } - // On recherche le pointage à valider - if(isset($datenow)) - $datenow->add(new \DateInterval('P1D')); + // On recherche le premier pointage non validé + $tallyday=$em->getRepository(("App:Tallyday"))->findOneBy(["user"=>$user,"validatemaster"=>false],["dateof"=>"ASC"]); + if($tallyday) + $datenow= $tallyday->getDateof(); else - $datenow=new \DateTime(); + $datenow=new \DateTime("now"); + $datenow->modify("monday this week"); $dateend=new \DateTime("now"); - $dateend->modify("last day of this month"); + $dateend->add(new \DateInterval("P14D")); $dateend->modify("next sunday"); $i=0;