Commit 5f6a1b7e authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

modal pour les applications, les activites et les affectations

parent 97e22e54

module/Application/src/Application/Controller/Activite/ActiviteController.php

+6 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ class ActiviteController extends AbstractActionController { 


        /** @var ActiviteForm $form */

        $form = $this->getServiceLocator()->get('FormElementManager')->get(ActiviteForm::class);

//        $form->setAttribute('action', $this->url()->fromRoute('activite/creer',[],[], true));

        $form->setAttribute('action', $this->url()->fromRoute('activite/creer',[],[], true));

        $form->bind($activite);

        /** @var Request $request */

        $request = $this->getRequest();
@@ -39,11 +39,12 @@ class ActiviteController extends AbstractActionController { 


            if ($form->isValid()) {

                $this->getActiviteService()->create($activite);

                $this->redirect()->toRoute('activite');

//                $this->redirect()->toRoute('activite');

            }

        }



        return new ViewModel([

            'title' => 'Ajouter une activité',

            'form' => $form,

        ]);

    }
@@ -56,7 +57,7 @@ class ActiviteController extends AbstractActionController { 


        /** @var ActiviteForm $form */

        $form = $this->getServiceLocator()->get('FormElementManager')->get(ActiviteForm::class);

//        $form->setAttribute('action', $this->url()->fromRoute('activite/editer',['id' => $activite->getId()],[], true));

        $form->setAttribute('action', $this->url()->fromRoute('activite/editer',['id' => $activite->getId()],[], true));

        $form->bind($activite);

        /** @var Request $request */

        $request = $this->getRequest();
@@ -66,11 +67,12 @@ class ActiviteController extends AbstractActionController { 


            if ($form->isValid()) {

                $this->getActiviteService()->update($activite);

                $this->redirect()->toRoute('activite');

//                $this->redirect()->toRoute('activite');

            }

        }



        return new ViewModel([

            'title' => 'Éditer une activité',

            'form' => $form,

        ]);

    }

module/Application/src/Application/Controller/Affectation/AffectationController.php

+6 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ class AffectationController extends AbstractActionController { 


        /** @var AffectationForm $form */

        $form = $this->getServiceLocator()->get('FormElementManager')->get(AffectationForm::class);

//        $form->setAttribute('action', $this->url()->fromRoute('activite/creer',[],[], true));

        $form->setAttribute('action', $this->url()->fromRoute('affectation/creer',[],[], true));

        $form->bind($affectation);

        /** @var Request $request */

        $request = $this->getRequest();
@@ -37,11 +37,12 @@ class AffectationController extends AbstractActionController { 


            if ($form->isValid()) {

                $this->getAffectationService()->create($affectation);

                $this->redirect()->toRoute('affectation');

//                $this->redirect()->toRoute('affectation');

            }

        }



        return new ViewModel([

            'title' => 'Ajouter une affectation',

            'form' => $form,

        ]);

    }
@@ -54,7 +55,7 @@ class AffectationController extends AbstractActionController { 


        /** @var AffectationForm $form */

        $form = $this->getServiceLocator()->get('FormElementManager')->get(AffectationForm::class);

//        $form->setAttribute('action', $this->url()->fromRoute('activite/editer',['id' => $activite->getId()],[], true));

        $form->setAttribute('action', $this->url()->fromRoute('affectation/editer',['id' => $affectation->getId()],[], true));

        $form->bind($affectation);

        /** @var Request $request */

        $request = $this->getRequest();
@@ -64,11 +65,12 @@ class AffectationController extends AbstractActionController { 


            if ($form->isValid()) {

                $this->getAffectationService()->update($affectation);

                $this->redirect()->toRoute('affectation');

//                $this->redirect()->toRoute('affectation');

            }

        }



        return new ViewModel([

            'title' => 'Éditer une affectation',

            'form' => $form,

        ]);

    }

module/Application/src/Application/Controller/Application/ApplicationController.php

+7 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ class ApplicationController extends AbstractActionController { 


        /** @var ApplicationForm $form */

        $form = $this->getServiceLocator()->get('FormElementManager')->get(ApplicationForm::class);

        $form->setAttribute('action', $this->url()->fromRoute('application/creer', [], [], true));

        $form->bind($application);

        /** @var Request $request */

        $request = $this->getRequest();
@@ -38,11 +39,12 @@ class ApplicationController extends AbstractActionController { 


            if ($form->isValid()) {

                $this->getApplicationService()->create($application);

                $this->redirect()->toRoute('application');

                //$this->redirect()->toRoute('application');

            }

        }



        return new ViewModel([

            'title' => 'Ajouter une application',

            'form' => $form,

        ]);

    }
@@ -55,6 +57,7 @@ class ApplicationController extends AbstractActionController { 


        /** @var ApplicationForm $form */

        $form = $this->getServiceLocator()->get('FormElementManager')->get(ApplicationForm::class);

        $form->setAttribute('action', $this->url()->fromRoute('application/editer', ['id' => $application->getId()], [], true));

        $form->bind($application);

        /** @var Request $request */

        $request = $this->getRequest();
@@ -64,11 +67,12 @@ class ApplicationController extends AbstractActionController { 


            if ($form->isValid()) {

                $this->getApplicationService()->update($application);

                $this->redirect()->toRoute('application');

                //$this->redirect()->toRoute('application');

            }

        }



        return new ViewModel([

            'title' => 'Éditer une application',

            'form' => $form,

        ]);

    }
@@ -102,7 +106,7 @@ class ApplicationController extends AbstractActionController { 
        $application = $this->getApplicationService()->getApplication($applicationId);



        return new ViewModel([

            'title' => "Affichage de la description de l'application",

            'title' => "Description de l'application",

            'application' => $application,

        ]);

    }

module/Application/src/Application/Controller/FicheMetier/FicheMetierTypeController.php

+6 −4
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class FicheMetierTypeController extends AbstractActionController{ 


        /** @var MissionsPrincipalesForm $form */

        $form = $this->getServiceLocator()->get('FormElementManager')->get(MissionsPrincipalesForm::class);

//        $form->setAttribute('action', $this->url()->fromRoute('activite/editer',['id' => $activite->getId()],[], true));

        $form->setAttribute('action', $this->url()->fromRoute('fiche-metier-type/editer-missions-principales',['id' => $fiche->getId()],[], true));

        $form->bind($fiche);

        /** @var Request $request */

        $request = $this->getRequest();
@@ -79,11 +79,12 @@ class FicheMetierTypeController extends AbstractActionController{ 


            if ($form->isValid()) {

                $this->getFicheMetierService()->updateFicheMetierType($fiche);

                $this->redirect()->toRoute('fiche-metier-type/afficher', ['id' => $fiche->getId()], [] , true);

                //$this->redirect()->toRoute('fiche-metier-type/afficher', ['id' => $fiche->getId()], [] , true);

            }

        }



        return new ViewModel([

            'title' => 'Modification des missions principales',

            'form' => $form,

        ]);

    }
@@ -96,6 +97,7 @@ class FicheMetierTypeController extends AbstractActionController{ 


        /** @var MissionsPrincipalesForm $form */

        $form = $this->getServiceLocator()->get('FormElementManager')->get(ActiviteForm::class);

        $form->setAttribute('action', $this->url()->fromRoute('fiche-metier-type/ajouter-nouvelle-activite',['id' => $fiche->getId()],[], true));

        $form->bind($activite);



        /** @var Request $request */
@@ -108,12 +110,12 @@ class FicheMetierTypeController extends AbstractActionController{ 
                $this->getActiviteService()->create($activite);



                $this->getActiviteService()->createFicheMetierTypeActivite($fiche, $activite);



                $this->redirect()->toRoute('fiche-metier-type/afficher', ['id' => $fiche->getId()], [], true);

                //$this->redirect()->toRoute('fiche-metier-type/afficher', ['id' => $fiche->getId()], [], true);

            }

        }



        return new ViewModel([

            'title' => 'Ajout d\'une nouvelle activité',

            'form' => $form,

        ]);

module/Application/src/Application/Service/Affectation/AffectationService.php

+1 −1
Original line number Diff line number Diff line
@@ -49,11 +49,11 @@ class AffectationService { 
     */

    public function create($affectation)

    {

        $this->getEntityManager()->persist($affectation);

        $affectation->setHistoCreation(new DateTime());

        $affectation->setHistoCreateur($this->getUserService()->getConnectedUser());

        $affectation->setHistoModification(new DateTime());

        $affectation->setHistoModificateur($this->getUserService()->getConnectedUser());

        $this->getEntityManager()->persist($affectation);

        try {

            $this->getEntityManager()->flush($affectation);

        } catch (OptimisticLockException $e) {