Commit 49f845f4 authored by Jean-Baptiste Oellers's avatar Jean-Baptiste Oellers
Browse files

Ajout Etape

parent 1511c43a

module/Oscar/config/module.config.php

+3 −1
Original line number Diff line number Diff line
@@ -620,7 +620,8 @@ return array( 
                    'action' => [

                        'conventionModeles',

                        'conventionModeleConfigurer',

                        'conventionModeleConfigurerInformationsAjouter'

                        'conventionModeleConfigurerInformationsAjouter',

                        'conventionModeleConfigurerEtapesAjouter'

                    ],

                    'roles' => ['user']

                ],
@@ -667,6 +668,7 @@ return array( 
            \Oscar\Service\ConnectorService::class => \Oscar\Service\ConnectorServiceFactory::class,

            \Oscar\Service\ContractDocumentService::class => \Oscar\Service\ContractDocumentServiceFactory::class,

            \Oscar\Service\ConventionModeleService::class => \Oscar\Service\ConventionModeleServiceFactory::class,

            \Oscar\Service\ConventionModeleEtapeService::class => \Oscar\Service\ConventionModeleEtapeServiceFactory::class,

            \Oscar\Service\DocumentFormatterService::class => \Oscar\Service\DocumentFormatterServiceFactory::class,

            \Oscar\Service\Fixture\FixtureService::class => \Oscar\Service\Fixture\FixtureServiceFactory::class,

            \Oscar\Service\GearmanJobLauncherService::class => \Oscar\Service\GearmanJobLauncherServiceFactory::class,

module/Oscar/config/routes.yml

+13 −0
Original line number Diff line number Diff line
@@ -2109,6 +2109,19 @@ administration: 
                    route: /ajouter

                    defaults:

                      action: conventionModeleConfigurerInformationsAjouter

            etapes:

              type: segment

              may_terminate: false

              options:

                route: /etapes

              child_routes:

                ajouter:

                  type: segment

                  may_terminate: true

                  options:

                    route: /ajouter

                    defaults:

                      action: conventionModeleConfigurerEtapesAjouter



    # Gestion et chargement du référenciel des pays

    logs:

module/Oscar/src/Oscar/Controller/ConventionModeleAdministrationController.php

+23 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ class ConventionModeleAdministrationController extends AbstractOscarController 
    /** @var \Oscar\Service\ConventionModeleService */

    public $conventionModeleService;



    /** @var \Oscar\Service\ConventionModeleEtapeService */

    public $conventionModeleEtapeService;



    public function conventionModelesAction()

    {

        if (!$this->getRequest()->isPost()) {
@@ -54,4 +57,24 @@ class ConventionModeleAdministrationController extends AbstractOscarController 
        

        return ['conventionModele' => $conventionModele];

    }



    public function conventionModeleConfigurerEtapesAjouterAction()

    {

        /** @var \Oscar\Entity\ConventionModele $conventionModele */

        $conventionModele = $this->getEntityManager()->find(\Oscar\Entity\ConventionModele::class, $this->params('id'));

        if (!$conventionModele) {

            return $this->getResponseNotFound("Le modèle de convention n'a pas été trouvé.");

        }



        if (!$this->getRequest()->isPost()) {

            return ['conventionModele' => $conventionModele];

        }



        if ($this->params()->fromPost('action') == "creer") {

            $this->conventionModeleEtapeService->creer($conventionModele, $this->params()->fromPost('titre'), $this->getCurrentPerson());

            return $this->redirect()->toRoute('administration/conventionModeles');

        }



        return $this->redirect()->toRoute('administration/conventionModeles/configurer/etapes/ajouter', ['id' => $conventionModele->id]);

    }

}

module/Oscar/src/Oscar/Controller/ConventionModeleAdministrationControllerFactory.php

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ class ConventionModeleAdministrationControllerFactory implements FactoryInterfac 
        $c->setEntityManager($container->get(EntityManager::class));

        $c->setOscarUserContextService($container->get(OscarUserContext::class));

        $c->conventionModeleService = $container->get(\Oscar\Service\ConventionModeleService::class);

        $c->conventionModeleEtapeService = $container->get(\Oscar\Service\ConventionModeleEtapeService::class);

        return $c;

    }

}

module/Oscar/src/Oscar/Controller/PublicController.php

+8 −1
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ class PublicController extends AbstractOscarController implements UseTimesheetSe 
        $periodsRejected = [];

        $documentsWait = [];

        $cheminsDecisionnels = [];

        $conventionModeles = [];

        $todos = [];



        $action = $this->params()->fromQuery('a');
@@ -365,8 +366,13 @@ class PublicController extends AbstractOscarController implements UseTimesheetSe 
            /** @var \Oscar\Entity\CheminDecisionnelRepository $cheminDecisionnelRepository */

            $cheminDecisionnelRepository = $this->getEntityManager()->getRepository(\Oscar\Entity\CheminDecisionnel::class);

            $cheminsDecisionnels = $cheminDecisionnelRepository->getAll();

        }



            /** @var \Oscar\Entity\ConventionModeleRepository $conventionModeleRepository */

            $conventionModeleRepository = $this->getEntityManager()->getRepository(\Oscar\Entity\ConventionModele::class);

            $conventionModeles = $conventionModeleRepository->createQueryBuilder('c')

                ->select('c')

                ->orderBy('c.nom', 'ASC')->getQuery()->getResult();

        }



        return [

            'isRequestValidator' => $isRequestValidator,
@@ -377,6 +383,7 @@ class PublicController extends AbstractOscarController implements UseTimesheetSe 
            'documentsWait' => $documentsWait,

            'user' => $person,

            'cheminsDecisionnels' => $cheminsDecisionnels,

            'conventionModeles' => $conventionModeles,

            'hasTodos' => count($todos)>0,

            'paramsTodo' => $paramsTodo,

            'user' => $person