bug correction
This commit is contained in:
@@ -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));
|
||||
}
|
||||
|
Reference in New Issue
Block a user