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

Correction affichage calendrier sélectionné ref #60

Browse Source
This commit is contained in:
Matthieu Lamalle
2021-03-03 16:10:48 +01:00
parent 164da2ee48
commit ce10df9293
5 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ class EventController extends AbstractController
private $entity = "App:Event";
private $notificator;
public function __construct(\App\Service\notificationService $notificator) {
public function __construct(\App\Service\notificationService $notificator) {
$this->notificator = $notificator;
}
@@ -29,7 +29,7 @@ class EventController extends AbstractController
$users = $em->getRepository("App:User")->findAll();
$tasks = $em->getRepository("App:Task")->findAll();
$projects= $em->getRepository("App:Project")->findBy(["active"=>true]);
return $this->render($this->render.'list.html.twig',[
"useheader" => true,
"usesidebar" => true,
@@ -38,13 +38,13 @@ class EventController extends AbstractController
]);
}
public function load(Request $request)
public function load($iduser, Request $request)
{
$em = $this->getDoctrine()->getManager();
$tbevents=[];
$start = $request->query->get('start');
$end = $request->query->get('end');
$iduser=$this->get("session")->get("iduser");
//$iduser=$this->get("session")->get("iduser");
// Evenements
if($iduser=="all") {
$events=$em->getRepository("App:Event")->findAll();
@@ -72,16 +72,16 @@ class EventController extends AbstractController
}
foreach($events as $event) {
//Filtre par service
if($this->get('session')->get('idservice')!="all") {
$idservice=$event->getUser()->getService()->getId();
if ($idservice!=$this->get('session')->get('idservice')){
continue;
}
}
// Filtre par project
if($this->get('session')->get('idproject')!="all") {
$idproject=$event->getTask()->getProject()->getId();
if($idproject!=$this->get('session')->get('idproject'))
@@ -144,7 +144,7 @@ class EventController extends AbstractController
$output=["return"=>"KO","error"=>"Tâche inconnu"];
return new Response(json_encode($output));
}
// Convertir les dates string en date
$datestart=new \DateTime($start);
$dateend =new \DateTime($end);
@@ -291,9 +291,9 @@ class EventController extends AbstractController
$output=$this->formatEvent($event);
}
return new Response(json_encode($output));
}
return new Response(json_encode($output));
}
public function update(Request $request)
{
$em = $this->getDoctrine()->getManager();
@@ -321,8 +321,8 @@ class EventController extends AbstractController
$output=["return"=>"KO","error"=>"Tâche inconnue"];
return new Response(json_encode($output));
}
// Astreinte
// Astreinte
if($fgastreinte) {
// Recherche de l'event
$penalty = $em->getRepository("App:Penalty")->find($idevent);
@@ -418,10 +418,10 @@ class EventController extends AbstractController
$output=["return"=>"KO","error"=>"Cet intervant a déjà une tache à cette date","start"=>$datestart,"end"=>$dateend,"events"=>$tbevent];
return new Response(json_encode($output));
}
}
// Modification de l'évenement
$event->setStart($datestart);
$event->setEnd($dateend);
@@ -431,14 +431,14 @@ class EventController extends AbstractController
$event->setExternalTrip($externaltrip);
$event->setUser($user);
$event->setTask($task);
$em->persist($event);
$em->flush();
$output=$this->formatEvent($event);
}
return new Response(json_encode($output));
}
return new Response(json_encode($output));
}
public function delete(Request $request)
@@ -449,7 +449,7 @@ class EventController extends AbstractController
$idevent = str_replace("A","",$request->request->get('idevent'));
$fgastreinte = ($request->request->get('fgastreinte')=="true");
// Astreinte
// Astreinte
if($fgastreinte) {
// Recherche de l'event
$penalty = $em->getRepository("App:Penalty")->find($idevent);
@@ -488,19 +488,19 @@ class EventController extends AbstractController
}
$output=[];
return new Response(json_encode($output));
}
return new Response(json_encode($output));
}
public function formatEvent($event) {
$editable=(!($event->getValidate())&&!($event->getValidateholiday()));
// Si l'utilisateur en cours est différent de celui de l'event = seul MASTER - ADMIN peuvent modifier
if($event->getUser()!=$this->getUser()) {
if(!$this->isGranted('ROLE_ADMIN')&&!$this->isGranted('ROLE_MASTER'))
$editable=false;
}
$tmp= [
"id"=> ($event instanceof Penalty?"A":"").$event->getId(),
"title" => ($event instanceof Penalty?"ASTREINTE = ":"").$event->getTask()->getDisplayname(),
@@ -532,7 +532,7 @@ class EventController extends AbstractController
public function formatBreakday($event) {
$editable=false;
$tmp= [
"id"=> "B".$event->getId(),
"title" => "Jour Férié",
@@ -577,5 +577,5 @@ class EventController extends AbstractController
$request->getSession()->getFlashBag()->add("error", $error->getMessage());
}
}
}
}
}

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

@@ -39,7 +39,7 @@ class HomeController extends AbstractController
$this->get('session')->set('nbmonth',$nbmonth);
$output=["return"=>"OK"];
return new Response(json_encode($output));
}
}
public function selectuser(Request $request)
{
@@ -47,7 +47,7 @@ class HomeController extends AbstractController
$this->get('session')->set('iduser',$iduser);
$output=["return"=>"OK"];
return new Response(json_encode($output));
}
}
public function selectproject(Request $request)
{
@@ -55,7 +55,7 @@ class HomeController extends AbstractController
$this->get('session')->set('idproject',$idproject);
$output=["return"=>"OK"];
return new Response(json_encode($output));
}
}
public function selectservice(Request $request)
{