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

ajout propriété déplacement externe

Browse Source
This commit is contained in:
Matthieu Lamalle
2020-07-28 16:56:11 +02:00
parent df4d62df7d
commit 9471ada755
3 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,6 +99,7 @@ class EventController extends AbstractController
$am = ($request->request->get('am')=="true");
$ap = ($request->request->get('ap')=="true");
$astreinte = ($request->request->get('astreinte')=="true");
$externaltrip = ($request->request->get('externaltrip')=="true");
$description = $request->request->get('description');
$user = $em->getRepository("App:User")->find($iduser);
@@ -242,6 +243,7 @@ class EventController extends AbstractController
$event->setEnd($dateend);
$event->setDuration($duration);
$event->setAllday($allday);
$event->setExternalTrip($externaltrip);
$event->setDescription($description);
$event->setUser($user);
$event->setTask($task);
@@ -274,6 +276,7 @@ class EventController extends AbstractController
$am = ($request->request->get('am')=="true");
$ap = ($request->request->get('ap')=="true");
$fgastreinte = ($request->request->get('fgastreinte')=="true");
$externaltrip = ($request->request->get('externaltrip')=="true");
$description = $request->request->get('description');
$user = $em->getRepository("App:User")->find($iduser);
@@ -392,6 +395,7 @@ class EventController extends AbstractController
$event->setDescription($description);
$event->setDuration($duration);
$event->setAllday($allday);
$event->setExternalTrip($externaltrip);
$event->setUser($user);
$event->setTask($task);
@@ -473,6 +477,7 @@ class EventController extends AbstractController
"borderColor" => $event->getTask()->getColor(),
"textColor" => "#ffffff",
"allDay" => $event->getAllday(),
"externaltrip" => $event->getExternalTrip(),
"editable" => $editable,
"durationEditable" => false,
"extendedProps" => [
@@ -503,6 +508,7 @@ class EventController extends AbstractController
"borderColor" => "#cdcdcd",
"textColor" => "#ffffff",
"allDay" => true,
"externaltrip" => false,
"editable" => false,
"durationEditable" => false,
"extendedProps" => [

17
src/schedule-2.0/src/Entity/Event.php
View File

@@ -50,6 +50,12 @@ class Event
*/
private $allday;
/**
* @ORM\Column(name="externaltrip", type="boolean")
*
*/
private $externaltrip;
/**
* @ORM\Column(name="validate", type="boolean")
*
@@ -129,6 +135,17 @@ class Event
return $this;
}
public function getExternalTrip(): ?bool
{
return $this->externaltrip;
}
public function setExternalTrip(bool $externaltrip): self
{
$this->externaltrip = $externaltrip;
return $this;
}
public function getValidate(): ?bool
{