Cadoles/schedule
21
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

bug correction

Browse Source
This commit is contained in:
Matthieu Lamalle
2020-07-28 15:05:46 +02:00
parent 8b4d1e31ec
commit df4d62df7d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/schedule-2.0/src/Controller/EventController.php
View File

@@ -122,7 +122,7 @@ class EventController extends AbstractController
if($am&&$ap) { if($am&&$ap) {
$datestart->SetTime(0,0,0); $datestart->SetTime(0,0,0);
$dateend->add(new \DateInterval('P1D')); $dateend->add(new \DateInterval('P1D'));
$dateend->SetTime(0,0,-1); $dateend->SetTime(0,0,0);
$duration=$dateend->diff($datestart)->d; $duration=$dateend->diff($datestart)->d;
$allday=true; $allday=true;
} }
@@ -334,11 +334,15 @@ class EventController extends AbstractController
if($am&&$ap) { if($am&&$ap) {
$datestart->SetTime(0,0,0); $datestart->SetTime(0,0,0);
$dateend->add(new \DateInterval('P1D')); $dateend->add(new \DateInterval('P1D'));
$dateend->SetTime(0,0,-1); $dateend->SetTime(0,0,0);
$duration=$dateend->diff($datestart)->d; $duration=$dateend->diff($datestart)->d;
$allday=true; $allday=true;
} }
else { else {
$duration=$dateend->diff($datestart)->d;
if ($duration == 1) {
$dateend->SetTime(0,0,-1);
}
$duration=0.5; $duration=0.5;
$allday=false; $allday=false;
if($am) { if($am) {
@@ -361,12 +365,9 @@ class EventController extends AbstractController
->setParameter('start',$datestart) ->setParameter('start',$datestart)
->setParameter('end',$dateend) ->setParameter('end',$dateend)
->getQuery()->getResult(); ->getQuery()->getResult();
dump($event->getId());
if($events) { if($events) {
$tbevent=[]; $tbevent=[];
foreach($events as $ev) { foreach($events as $ev) {
if ($event->getId() != $ev->getId()) { if ($event->getId() != $ev->getId()) {
$tmp=[ $tmp=[
"id" => $ev->getId(), "id" => $ev->getId(),
@@ -398,7 +399,6 @@ class EventController extends AbstractController
$em->flush(); $em->flush();
$output=$this->formatEvent($event); $output=$this->formatEvent($event);
dump($event);
} }
return new Response(json_encode($output)); return new Response(json_encode($output));
} }