From 9471ada7558deef69a7e1411706544508123d0c3 Mon Sep 17 00:00:00 2001 From: Matthieu Lamalle Date: Tue, 28 Jul 2020 16:56:11 +0200 Subject: [PATCH] =?UTF-8?q?ajout=20propri=C3=A9t=C3=A9=20d=C3=A9placement?= =?UTF-8?q?=20externe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Controller/EventController.php | 6 +++++ src/schedule-2.0/src/Entity/Event.php | 17 ++++++++++++ .../templates/Event/list.html.twig | 27 ++++++++++++++----- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/src/schedule-2.0/src/Controller/EventController.php b/src/schedule-2.0/src/Controller/EventController.php index ccb8f7a..e05e7bf 100755 --- a/src/schedule-2.0/src/Controller/EventController.php +++ b/src/schedule-2.0/src/Controller/EventController.php @@ -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" => [ diff --git a/src/schedule-2.0/src/Entity/Event.php b/src/schedule-2.0/src/Entity/Event.php index 97d7942..491a1ae 100644 --- a/src/schedule-2.0/src/Entity/Event.php +++ b/src/schedule-2.0/src/Entity/Event.php @@ -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 { diff --git a/src/schedule-2.0/templates/Event/list.html.twig b/src/schedule-2.0/templates/Event/list.html.twig index 271b7ac..13cc7f8 100644 --- a/src/schedule-2.0/templates/Event/list.html.twig +++ b/src/schedule-2.0/templates/Event/list.html.twig @@ -109,6 +109,12 @@ +
+
+ + +
+
+
+
+ + +
+