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

ajout icone congés

Browse Source
This commit is contained in:
Matthieu Lamalle
2020-07-28 17:21:43 +02:00
parent 8b46636159
commit aeeb6384c4
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -335,9 +335,6 @@ class EventController extends AbstractController
$datestart=$event->getStart(); $datestart=$event->getStart();
$dateend =$event->getEnd(); $dateend =$event->getEnd();
$duration=$dateend->diff($datestart)->d; $duration=$dateend->diff($datestart)->d;
dump($datestart);
dump($dateend);
dump($duration);
if($am&&$ap) { if($am&&$ap) {
if ($duration >= 1) { if ($duration >= 1) {
$dateend->SetTime(0,0,-1); $dateend->SetTime(0,0,-1);
@@ -484,6 +481,7 @@ class EventController extends AbstractController
"borderColor" => $event->getTask()->getColor(), "borderColor" => $event->getTask()->getColor(),
"textColor" => "#ffffff", "textColor" => "#ffffff",
"allDay" => $event->getAllday(), "allDay" => $event->getAllday(),
"holiday" => $event->getTask()->getNature()->getIsvacation(),
"externaltrip" => $event->getExternalTrip(), "externaltrip" => $event->getExternalTrip(),
"editable" => $editable, "editable" => $editable,
"durationEditable" => false, "durationEditable" => false,
@@ -516,6 +514,7 @@ class EventController extends AbstractController
"textColor" => "#ffffff", "textColor" => "#ffffff",
"allDay" => true, "allDay" => true,
"externaltrip" => false, "externaltrip" => false,
"holiday" => false,
"editable" => false, "editable" => false,
"durationEditable" => false, "durationEditable" => false,
"extendedProps" => [ "extendedProps" => [

9
src/schedule-2.0/templates/Event/list.html.twig
View File

@@ -253,14 +253,19 @@ function eventRender(info) {
var eventInfo=$(content).children('.eventUser'); var eventInfo=$(content).children('.eventUser');
// Ajout container // 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'); var eventInfo=$(content).children('.eventInfo');
// Ajouter le verrou si event non editable // Ajouter le verrou si event non editable
if(info.event.extendedProps.locked) { if(info.event.extendedProps.locked) {
eventInfo.append("<i class='fa fa-lock float-right'></i>"); 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 // Ajout estimation
eventInfo.append("<span class='eventEstimate float-right small'>"+info.event.extendedProps.estimate+"</span>"); eventInfo.append("<span class='eventEstimate float-right small'>"+info.event.extendedProps.estimate+"</span>");