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

Correction Problème au niveau des astreintes #65

Browse Source
This commit is contained in:
Matthieu Lamalle
2021-03-08 10:23:23 +01:00
parent 01f56289b4
commit 7ebdf9ba53
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -492,7 +492,8 @@ class EventController extends AbstractController
} }
public function formatEvent($event) { public function formatEvent($event) {
$editable=(!($event->getValidate())&&!($event->getValidateholiday())); $event instanceof Penalty ? $editable=(!($event->getValidate())) : ($editable=(!($event->getValidate())&&!($event->getValidateholiday())));
// Si l'utilisateur en cours est différent de celui de l'event = seul MASTER - ADMIN peuvent modifier // Si l'utilisateur en cours est différent de celui de l'event = seul MASTER - ADMIN peuvent modifier
if($event->getUser()!=$this->getUser()) { if($event->getUser()!=$this->getUser()) {
@@ -522,7 +523,7 @@ class EventController extends AbstractController
"taskid" => $event->getTask()->getId(), "taskid" => $event->getTask()->getId(),
"avatar" => "/".$this->getParameter("appAlias")."/uploads/avatar/".$event->getUser()->getAvatar(), "avatar" => "/".$this->getParameter("appAlias")."/uploads/avatar/".$event->getUser()->getAvatar(),
"estimate" => !$event->getTask()->getNature()->getIsvacation() ? $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(), "locked" => ($event instanceof Penalty?$event->getValidate():$event->getValidate()||$event->getValidateholiday()),
"editable" => $editable, "editable" => $editable,
"astreinte" => ($event instanceof Penalty) "astreinte" => ($event instanceof Penalty)
] ]