diff --git a/src/schedule-2.0/config/routes.yaml b/src/schedule-2.0/config/routes.yaml index 0300d19..f6b4681 100644 --- a/src/schedule-2.0/config/routes.yaml +++ b/src/schedule-2.0/config/routes.yaml @@ -262,6 +262,10 @@ app_task_activeproject: path: /master/task/activeproject defaults: { _controller: App\Controller\TaskController:activeproject } +app_task_activetask: + path: /master/task/activetask + defaults: { _controller: App\Controller\TaskController:activetask } + #== Event ==================================================================================================== app_event: path: /user/event diff --git a/src/schedule-2.0/src/Controller/TaskController.php b/src/schedule-2.0/src/Controller/TaskController.php index 6828d2f..77bd776 100755 --- a/src/schedule-2.0/src/Controller/TaskController.php +++ b/src/schedule-2.0/src/Controller/TaskController.php @@ -31,13 +31,13 @@ class TaskController extends AbstractController "services" => $services, "useheader" => true, "usesidebar" => true, - "fgprint" => true, + "fgprint" => true, ]); return new PdfResponse( $this->knpSnappy->getOutputFromHtml($render,["orientation"=>"Landscape"]), 'taches.pdf' - ); + ); } else { return $this->render($this->render.'list.html.twig',[ @@ -61,30 +61,30 @@ class TaskController extends AbstractController // Récupération des data du formulaire $form->handleRequest($request); - + // Sur erreur $this->getErrorForm(null,$form,$request,$data,"submit"); - + // Sur validation - if ($form->get('submit')->isClicked() && $form->isValid()) { - $data = $form->getData(); + if ($form->get('submit')->isClicked() && $form->isValid()) { + $data = $form->getData(); $em->persist($data); $em->flush(); // Retour à la liste return $this->redirectToRoute($this->route); } - + // Affichage du formulaire return $this->render($this->render.'edit.html.twig', [ 'useheader' => true, - 'usesidebar' => true, + 'usesidebar' => true, $this->data => $data, 'mode' => 'submit', 'form' => $form->createView() ]); - } - + } + public function update($id,Request $request) { // Initialisation de l'enregistrement @@ -99,43 +99,43 @@ class TaskController extends AbstractController // Sur erreur $this->getErrorForm(null,$form,$request,$data,"update"); - + // Sur validation - if ($form->get('submit')->isClicked() && $form->isValid()) { - $data = $form->getData(); + if ($form->get('submit')->isClicked() && $form->isValid()) { + $data = $form->getData(); $em->persist($data); $em->flush(); // Retour à la liste return $this->redirectToRoute($this->route); } - + // Affichage du formulaire if($request->query->get('fgprint')) { $render = $this->renderView($this->render.'edit.html.twig', [ 'useheader' => true, - 'usesidebar' => true, + 'usesidebar' => true, $this->data => $data, 'mode' => 'update', 'form' => $form->createView(), - "fgprint" => true, + "fgprint" => true, ]); return new PdfResponse( $this->knpSnappy->getOutputFromHtml($render), 'tache.pdf' - ); + ); } else { return $this->render($this->render.'edit.html.twig', [ 'useheader' => true, - 'usesidebar' => true, + 'usesidebar' => true, $this->data => $data, 'mode' => 'update', 'form' => $form->createView() ]); } - } + } public function delete($id,Request $request) { @@ -161,13 +161,18 @@ class TaskController extends AbstractController // Retour à la liste return $this->redirectToRoute($this->route); } - } + } public function activeproject() { $this->get('session')->set('activeproject',!$this->get('session')->get('activeproject')); return $this->redirectToRoute($this->route); } + public function activetask() { + $this->get('session')->set('activetask',!$this->get('session')->get('activetask')); + return $this->redirectToRoute($this->route); + } + public function activeoffer() { $this->get('session')->set('activeoffer',!$this->get('session')->get('activeoffer')); return $this->redirectToRoute($this->route); @@ -189,5 +194,5 @@ class TaskController extends AbstractController $request->getSession()->getFlashBag()->add("error", $error->getMessage()); } } - } + } } diff --git a/src/schedule-2.0/src/Service/sessionListener.php b/src/schedule-2.0/src/Service/sessionListener.php index e99f79d..00b4412 100644 --- a/src/schedule-2.0/src/Service/sessionListener.php +++ b/src/schedule-2.0/src/Service/sessionListener.php @@ -33,7 +33,7 @@ class sessionListener { $haverole=true; } } - + return $haverole; } @@ -67,11 +67,12 @@ class sessionListener { // Initialisation de la session if($regen) { $session->set('activeproject',true); + $session->set('activetask',true); $session->set('activeoffer',true); $session->set('activeholiday',true); $session->set('activetimer',true); $session->set('nbmonth',3); - + if($curentuser!="anon.") { if(in_array("ROLE_USER",$roles)) $session->set('iduser',$curentuser->getId()); @@ -86,7 +87,7 @@ class sessionListener { $session->set('idproject',"all"); $session->set('idservice',"all"); } - + $tbusers=[]; $users=$this->em->getRepository('App:User')->findAll(); foreach($users as $user) { @@ -99,7 +100,7 @@ class sessionListener { } } $session->set('users',$tbusers); - + $tbprojects=[]; $projects=$this->em->getRepository('App:Project')->findBy(["active"=>true]); foreach($projects as $project) { @@ -110,7 +111,7 @@ class sessionListener { array_push($tbprojects,$tmp); } $session->set('projects',$tbprojects); - + $tbservices=[]; $services=$this->em->getRepository('App:Service')->findAll(); foreach($services as $service) { @@ -120,8 +121,8 @@ class sessionListener { ]; array_push($tbservices,$tmp); } - $session->set('services',$tbservices); - + $session->set('services',$tbservices); + } } } diff --git a/src/schedule-2.0/templates/Task/list.html.twig b/src/schedule-2.0/templates/Task/list.html.twig index 188522e..13e40b0 100644 --- a/src/schedule-2.0/templates/Task/list.html.twig +++ b/src/schedule-2.0/templates/Task/list.html.twig @@ -13,7 +13,7 @@ thead { display: table-header-group; } - tr { page-break-inside: avoid; } + tr { page-break-inside: avoid; } {%endif%} {% endblock %} @@ -30,6 +30,11 @@ +