From a6acd26a5c5294928d93948de8c7fb129ac461d0 Mon Sep 17 00:00:00 2001 From: Matthieu Lamalle Date: Wed, 14 Oct 2020 10:16:00 +0200 Subject: [PATCH] =?UTF-8?q?Ne=20pas=20afficher=20le=20cumul=20des=20cong?= =?UTF-8?q?=C3=A9s=20sur=20le=20calendrier=20ref=20#52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/schedule-2.0/src/Controller/EventController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/schedule-2.0/src/Controller/EventController.php b/src/schedule-2.0/src/Controller/EventController.php index d3255e4..153b7e4 100755 --- a/src/schedule-2.0/src/Controller/EventController.php +++ b/src/schedule-2.0/src/Controller/EventController.php @@ -521,7 +521,7 @@ class EventController extends AbstractController "username" => $event->getUser()->getUsername(), "taskid" => $event->getTask()->getId(), "avatar" => "/".$this->getParameter("appAlias")."/uploads/avatar/".$event->getUser()->getAvatar(), - "estimate" => $event->getTask()->getDuration($event->getEnd())." / ".$event->getTask()->getQuantity(), + "estimate" => !$event->getTask()->getNature()->getIsvacation() ? $event->getTask()->getDuration($event->getEnd())." / ".$event->getTask()->getQuantity(): "", "locked" => $event->getValidate()||$event->getValidateholiday(), "editable" => $editable, "astreinte" => ($event instanceof Penalty)