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

ajout propriété déplacement externe

Browse Source
This commit is contained in:
Matthieu Lamalle
2020-07-28 16:56:11 +02:00
parent df4d62df7d
commit 9471ada755
3 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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" => [

17
src/schedule-2.0/src/Entity/Event.php
View File

@@ -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
{

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

@@ -109,6 +109,12 @@
<label class="custom-control-label" for="astreinte">Astreinte</label>
</div>
</div>
<div class="form-group">
<div class="custom-control custom-switch">
<input type="checkbox" class="custom-control-input" id="externaltrip">
<label class="custom-control-label" for="externaltrip">Déplacement externe</label>
</div>
</div>
<div class="form-group">
<label for="description" class="control-label">
@@ -180,6 +186,12 @@
<input type="checkbox" class="custom-control-input" id="apupdate">
<label class="custom-control-label" for="apupdate">Evènement sur l'après-midi</label>
</div>
</div>
<div class="form-group">
<div class="custom-control custom-switch">
<input type="checkbox" class="custom-control-input" id="externaltripupdate">
<label class="custom-control-label" for="externaltripupdate">Déplacement externe</label>
</div>
</div>
<div class="form-group">
<label for="description" class="control-label">
@@ -256,7 +268,7 @@ function eventRender(info) {
content.attr("title",info.event.extendedProps.fulldescription);
}
// Formulaire Création d'un évelement
// Formulaire Création d'un événement
var allDay;
function eventSelect(selectionInfo) {
var start=moment(selectionInfo.start);
@@ -302,6 +314,7 @@ function eventSelect(selectionInfo) {
$('#modalsubmit #end').val(end.format("YYYY-MM-DD"));
$('#modalsubmit #description').val("");
$('#modalsubmit #externaltrip').prop("checked",false);
$("#modalsubmit .alert").remove();
@@ -309,7 +322,7 @@ function eventSelect(selectionInfo) {
$('#modalsubmit').modal();
}
// Formulaire Modification d'un évelement
// Formulaire Modification d'un événement
function eventClick(info) {
if(info.event.extendedProps.editable) {
console.log(info.event);
@@ -322,7 +335,7 @@ function eventClick(info) {
var eventallday = info.event.allDay;
var eventstart = info.event.start;
var eventend = info.event.end;
var externaltrip = info.event.extendedProps.externaltrip;
$('#userupdate').val(userid).trigger("change");
$('#taskupdate').val(taskid).trigger("change");
$('#modalupdate #idevent').val(id);
@@ -330,10 +343,11 @@ function eventClick(info) {
$('#modalupdate #fgastreinte').val(fgastreinte);
$('#modalupdate #description').val(description);
$('#modalupdate #externaltripupdate').prop("checked",externaltrip);
$("#modalupdate .alert").remove();
eDayStart=eventstart.toString().split(" ")[2]
eDayEnd=eventend.toString().split(" ")[2]
console.log( eDayStart + " " + eDayEnd + " " + (eDayEnd - eDayStart))
if ((eDayEnd - eDayStart) >1) {
$('#modalupdate #amupdate').prop("checked",true);
$('#modalupdate #apupdate').prop("checked",true);
@@ -395,6 +409,7 @@ function eventSubmit() {
am: $("#modalsubmit #amsubmit").prop("checked"),
ap: $("#modalsubmit #apsubmit").prop("checked"),
astreinte: $("#modalsubmit #astreinte").prop("checked"),
externaltrip: $("#modalsubmit #externaltrip").prop("checked"),
description: $("#modalsubmit #description").val()
},
url: "{{ path('app_event_submit') }}",
@@ -426,6 +441,7 @@ function eventUpdate() {
am: $("#modalupdate #amupdate").prop("checked"),
ap: $("#modalupdate #apupdate").prop("checked"),
fgastreinte: $("#modalupdate #fgastreinte").val(),
externaltrip: $("#modalupdate #externaltripupdate").prop("checked"),
description: $("#modalupdate #description").val()
},
url: "{{ path('app_event_update') }}",
@@ -473,7 +489,6 @@ function eventDelete() {
// On change astreinte
$("#astreinte").change(function() {
console.log(allDay)
if(this.checked) {
$("#amsubmit").prop("disabled",true);
$("#apsubmit").prop("disabled",true);