From df4d62df7d43b2c52fff759fd16707e9d6b54120 Mon Sep 17 00:00:00 2001 From: Matthieu Lamalle Date: Tue, 28 Jul 2020 15:05:46 +0200 Subject: [PATCH] bug correction --- src/schedule-2.0/src/Controller/EventController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/schedule-2.0/src/Controller/EventController.php b/src/schedule-2.0/src/Controller/EventController.php index 79d153f..ccb8f7a 100755 --- a/src/schedule-2.0/src/Controller/EventController.php +++ b/src/schedule-2.0/src/Controller/EventController.php @@ -122,7 +122,7 @@ class EventController extends AbstractController if($am&&$ap) { $datestart->SetTime(0,0,0); $dateend->add(new \DateInterval('P1D')); - $dateend->SetTime(0,0,-1); + $dateend->SetTime(0,0,0); $duration=$dateend->diff($datestart)->d; $allday=true; } @@ -334,11 +334,15 @@ class EventController extends AbstractController if($am&&$ap) { $datestart->SetTime(0,0,0); $dateend->add(new \DateInterval('P1D')); - $dateend->SetTime(0,0,-1); + $dateend->SetTime(0,0,0); $duration=$dateend->diff($datestart)->d; $allday=true; } else { + $duration=$dateend->diff($datestart)->d; + if ($duration == 1) { + $dateend->SetTime(0,0,-1); + } $duration=0.5; $allday=false; if($am) { @@ -361,12 +365,9 @@ class EventController extends AbstractController ->setParameter('start',$datestart) ->setParameter('end',$dateend) ->getQuery()->getResult(); - dump($event->getId()); if($events) { $tbevent=[]; foreach($events as $ev) { - - if ($event->getId() != $ev->getId()) { $tmp=[ "id" => $ev->getId(), @@ -398,7 +399,6 @@ class EventController extends AbstractController $em->flush(); $output=$this->formatEvent($event); - dump($event); } return new Response(json_encode($output)); }