From aeeb6384c42867af67b7d61b2db8b7efe0077868 Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Tue, 28 Jul 2020 17:21:43 +0200
Subject: [PATCH] =?UTF-8?q?ajout=20icone=20cong=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/schedule-2.0/src/Controller/EventController.php | 5 ++---
 src/schedule-2.0/templates/Event/list.html.twig     | 9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/schedule-2.0/src/Controller/EventController.php b/src/schedule-2.0/src/Controller/EventController.php
index 7ea1d06..e944d91 100755
--- a/src/schedule-2.0/src/Controller/EventController.php
+++ b/src/schedule-2.0/src/Controller/EventController.php
@@ -335,9 +335,6 @@ class EventController extends AbstractController
             $datestart=$event->getStart();
             $dateend  =$event->getEnd();
             $duration=$dateend->diff($datestart)->d;
-            dump($datestart);
-            dump($dateend);
-            dump($duration);
             if($am&&$ap) {
                 if ($duration >= 1) {
                     $dateend->SetTime(0,0,-1);
@@ -484,6 +481,7 @@ class EventController extends AbstractController
             "borderColor" => $event->getTask()->getColor(),
             "textColor" => "#ffffff",
             "allDay" => $event->getAllday(),
+            "holiday" => $event->getTask()->getNature()->getIsvacation(),
             "externaltrip" => $event->getExternalTrip(),
             "editable" => $editable,
             "durationEditable" => false,
@@ -516,6 +514,7 @@ class EventController extends AbstractController
             "textColor" => "#ffffff",
             "allDay" => true,
             "externaltrip" => false,
+            "holiday" => false,
             "editable" => false,
             "durationEditable" => false,
             "extendedProps" => [
diff --git a/src/schedule-2.0/templates/Event/list.html.twig b/src/schedule-2.0/templates/Event/list.html.twig
index 13cc7f8..cfe6268 100644
--- a/src/schedule-2.0/templates/Event/list.html.twig
+++ b/src/schedule-2.0/templates/Event/list.html.twig
@@ -253,14 +253,19 @@ function eventRender(info) {
     var eventInfo=$(content).children('.eventUser');
 
     // Ajout container 
-    content.append("<span class='eventInfo float-right'></span>");
+    content.append("<span style='margin-top:-12px' class='eventInfo float-right'></span>");
     var eventInfo=$(content).children('.eventInfo');
 
     // Ajouter le verrou si event non editable
     if(info.event.extendedProps.locked) {
         eventInfo.append("<i class='fa fa-lock float-right'></i>");
     }
-
+    if(info.event.extendedProps.externaltrip) {
+        eventInfo.append("<i class='fas fa-bed float-right'></i>");
+    }
+    if(info.event.extendedProps.holiday) {
+        eventInfo.append("<i class='fas fa-umbrella-beach float-right'></i>");
+    }
     // Ajout estimation
     eventInfo.append("<span class='eventEstimate float-right small'>"+info.event.extendedProps.estimate+"</span>");