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

Categorie pour les Parcours

parent c714a139
Loading
Loading
Loading
Loading
+1 −1
Changes for module/Application/config/merged/competence.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ return [
                                'label'    => 'Compétences',
                                'route'    => 'competence',
                                'resource' => CompetencePrivileges::getResourceId(CompetencePrivileges::COMPETENCE_AFFICHER),
                                'order'    => 500,
                                'order'    => 600,
                            ],
                        ],
                    ],
+96 −4
Changes for module/Application/config/merged/corps.config.php: 96 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -2,9 +2,17 @@

namespace Application;

use Application\Controller\CategorieController;
use Application\Controller\CategorieControllerFactory;
use Application\Controller\CorpsController;
use Application\Controller\CorpsControllerFactory;
use Application\Form\Categorie\CategorieForm;
use Application\Form\Categorie\CategorieFormFactory;
use Application\Form\Categorie\CategorieHydrator;
use Application\Form\Categorie\CategorieHydratorFactory;
use Application\Provider\Privilege\CorpsPrivileges;
use Application\Service\Categorie\CategorieService;
use Application\Service\Categorie\CategorieServiceFactory;
use Application\Service\Corps\CorpsService;
use Application\Service\Corps\CorpsServiceFactory;
use Application\Service\Correspondance\CorrespondanceService;
@@ -13,6 +21,7 @@ use Application\Service\Grade\GradeService;
use Application\Service\Grade\GradeServiceFactory;
use UnicaenPrivilege\Guard\PrivilegeController;
use Zend\Router\Http\Literal;
use Zend\Router\Http\Segment;

return [
    'bjyauthorize' => [
@@ -27,6 +36,19 @@ return [
                        CorpsPrivileges::CORPS_INDEX,
                    ],
                ],
                [
                    'controller' => CategorieController::class,
                    'action' => [
                        'ajouter',
                        'modifier',
                        'historiser',
                        'restaurer',
                        'supprimer',
                    ],
                    'privileges' => [
                        CorpsPrivileges::CORPS_INDEX,
                    ],
                ],
            ],
        ],
    ],
@@ -38,8 +60,8 @@ return [
                    'ressource' => [
                        'pages' => [
                            [
                                'order' => 600,
                                'label' => 'Corps, grades et correspondances',
                                'order' => 500,
                                'label' => 'Catégories, corps, grades et correspondances',
                                'route' => 'corps',
                                'resource' => PrivilegeController::getResourceId(CorpsController::class, 'index') ,
                                'dropdown-header' => true,
@@ -65,11 +87,76 @@ return [
                'may_terminate' => true,
                'child_routes' => [],
            ],
            'categorie' => [
                /** CATEGORIE ***************************************************************************************/
                'type'  => Literal::class,
                'options' => [
                    'route'    => '/categorie',
                    'defaults' => [
                        'controller' => CategorieController::class,
                    ],
                ],
                'may_terminate' => false,
                'child_routes' => [
                    'ajouter' => [
                        'type'  => Literal::class,
                        'options' => [
                            'route'    => '/ajouter',
                            'defaults' => [
                                'controller' => CategorieController::class,
                                'action'     => 'ajouter',
                            ],
                        ],
                        'may_terminate' => true,
                    ],
                    'modifier' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/modifier/:categorie',
                            'defaults' => [
                                'controller' => CategorieController::class,
                                'action'     => 'modifier',
                            ],
                        ],
                    ],
                    'historiser' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/historiser/:categorie',
                            'defaults' => [
                                'controller' => CategorieController::class,
                                'action'     => 'historiser',
                            ],
                        ],
                    ],
                    'restaurer' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/restaurer/:categorie',
                            'defaults' => [
                                'controller' => CategorieController::class,
                                'action'     => 'restaurer',
                            ],
                        ],
                    ],
                    'supprimer' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/supprimer/:categorie',
                            'defaults' => [
                                'controller' => CategorieController::class,
                                'action'     => 'supprimer',
                            ],
                        ],
                    ],
                ],
            ],
        ],
    ],

    'service_manager' => [
        'factories' => [
            CategorieService::class => CategorieServiceFactory::class,
            CorpsService::class => CorpsServiceFactory::class,
            CorrespondanceService::class => CorrespondanceServiceFactory::class,
            GradeService::class => GradeServiceFactory::class,
@@ -77,14 +164,19 @@ return [
    ],
    'controllers'     => [
        'factories' => [
            CategorieController::class => CategorieControllerFactory::class,
            CorpsController::class => CorpsControllerFactory::class,
        ],
    ],
    'form_elements' => [
        'factories' => [],
        'factories' => [
            CategorieForm::class => CategorieFormFactory::class,
        ],
    ],
    'hydrators' => [
        'factories' => [],
        'factories' => [
            CategorieHydrator::class => CategorieHydratorFactory::class,
        ],
    ]

];
 No newline at end of file
+117
Changes for module/Application/src/Application/Controller/CategorieController.php: 117 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Controller;

use Application\Entity\Db\Categorie;
use Application\Form\Categorie\CategorieForm;
use Application\Form\Categorie\CategorieFormAwareTrait;
use Application\Service\Categorie\CategorieServiceAwareTrait;
use Zend\Http\Request;
use Zend\Mvc\Controller\AbstractActionController;
use Zend\View\Model\ViewModel;

class CategorieController extends AbstractActionController
{
    use CategorieServiceAwareTrait;
    use CategorieFormAwareTrait;

    public function ajouterAction()
    {
        /** @var Categorie $categorie */
        $categorie = new Categorie();

        /** @var CategorieForm $form */
        $form = $this->getCategorieForm();
        $form->setAttribute('action', $this->url()->fromRoute('categorie/ajouter', [], [], true));
        $form->bind($categorie);

        /** @var Request $request */
        $request = $this->getRequest();
        if ($request->isPost()) {
            $data = $request->getPost();
            $form->setData($data);
            if ($form->isValid()) {
                $this->getCategorieService()->create($categorie);
            }
        }

        $vm = new ViewModel();
        $vm->setTemplate('application/default/default-form');
        $vm->setVariables([
            'title' => 'Ajouter une catégorie',
            'form' => $form,
        ]);
        return $vm;
    }

    public function modifierAction()
    {
        $categorie = $this->getCategorieService()->getRequestedCategorie($this);

        /** @var CategorieForm $form */
        $form = $this->getCategorieForm();
        $form->setAttribute('action', $this->url()->fromRoute('categorie/modifier', ['categorie' => $categorie->getId()], [], true));
        $form->bind($categorie);

        /** @var Request $request */
        $request = $this->getRequest();
        if ($request->isPost()) {
            $data = $request->getPost();
            $form->setData($data);
            if ($form->isValid()) {
                $this->getCategorieService()->update($categorie);
            }
        }

        $vm = new ViewModel();
        $vm->setTemplate('application/default/default-form');
        $vm->setVariables([
            'title' => 'Modifier une catégorie',
            'form' => $form,
        ]);
        return $vm;
    }

    public function historiserAction()
    {
        $categorie = $this->getCategorieService()->getRequestedCategorie($this);
        if ($categorie !== null) {
            $this->getCategorieService()->historise($categorie);
        }
        return $this->redirect()->toRoute('corps', [], ['fragment'=>'categorie'], true);
    }

    public function restaurerAction()
    {
        $categorie = $this->getCategorieService()->getRequestedCategorie($this);
        if ($categorie !== null) {
            $this->getCategorieService()->restore($categorie);
        }
        return $this->redirect()->toRoute('corps', [], ['fragment'=>'categorie'], true);
    }

    public function supprimerAction()
    {
        $categorie = $this->getCategorieService()->getRequestedCategorie($this);

        /** @var Request $request */
        $request = $this->getRequest();
        if ($request->isPost()) {
            $data = $request->getPost();
            if ($data["reponse"] === "oui") $this->getCategorieService()->delete($categorie);
            //return $this->redirect()->toRoute('home');
            exit();
        }

        $vm = new ViewModel();
        if ($categorie !== null) {
            $vm->setTemplate('application/default/confirmation');
            $vm->setVariables([
                'title' => "Suppression d'une catégorie " . $categorie->getLibelle(),
                'text' => "La suppression est définitive êtes-vous sûr&middot;e de vouloir continuer ?",
                'action' => $this->url()->fromRoute('categorie/supprimer', ["categorie" => $categorie->getId()], [], true),
            ]);
        }
        return $vm;
    }
}
 No newline at end of file
+30
Changes for module/Application/src/Application/Controller/CategorieControllerFactory.php: 30 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Controller;

use Application\Form\Categorie\CategorieForm;
use Application\Service\Categorie\CategorieService;
use Interop\Container\ContainerInterface;

class CategorieControllerFactory {

    /**
     * @param ContainerInterface $container
     * @return CategorieController
     */
    public function __invoke(ContainerInterface $container)
    {
        /**
         * @var CategorieService $categorieService
         * @var CategorieForm $categorieForm
         */
        $categorieService = $container->get(CategorieService::class);
        $categorieForm = $container->get('FormElementManager')->get(CategorieForm::class);

        /** @var CategorieController $controller */
        $controller = new CategorieController();
        $controller->setCategorieService($categorieService);
        $controller->setCategorieForm($categorieForm);
        return $controller;
    }
}
 No newline at end of file
+4
Changes for module/Application/src/Application/Controller/CorpsController.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@

namespace Application\Controller;

use Application\Service\Categorie\CategorieServiceAwareTrait;
use Application\Service\Corps\CorpsServiceAwareTrait;
use Application\Service\Correspondance\CorrespondanceServiceAwareTrait;
use Application\Service\Grade\GradeServiceAwareTrait;
@@ -9,17 +10,20 @@ use Zend\Mvc\Controller\AbstractActionController;
use Zend\View\Model\ViewModel;

class CorpsController extends AbstractActionController {
    use CategorieServiceAwareTrait;
    use CorpsServiceAwareTrait;
    use CorrespondanceServiceAwareTrait;
    use GradeServiceAwareTrait;

    public function indexAction()
    {
        $categories = $this->getCategorieService()->getCategories();
        $corps = $this->getCorpsService()->getCorps();
        $correspondances = $this->getCorrespondanceService()->getCorrespondances();
        $grades = $this->getGradeService()->getGrades();

        return new ViewModel([
            "categories" => $categories,
            "corps" => $corps,
            "correspondances" => $correspondances,
            "grades" => $grades,
Loading