Commit 34207bbd authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Métier afficher + ReferenceVH

parent b8bbbf23

module/Application/src/Application/Controller/IndexController.php

+3 −3
Changes for module/Application/src/Application/Controller/IndexController.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -111,10 +111,10 @@ class IndexController extends AbstractActionController 
            }

        }

        $fiches = [];

        $fichesRAW = $this->getFichePosteService()->getFichesPostesbyAgents($agents);

        foreach ($fichesRAW as $fiche) {

//        $fichesRAW = $this->getFichePosteService()->getFichesPostesbyAgents($agents);

//        foreach ($fichesRAW as $fiche) {

//            $fiches[$fiche->getAgent()->getId()][] = $fiche;

        }

//        }

module/Carriere/src/Carriere/View/Helper/partial/niveau-enveloppe.phtml

+19 −1
Changes for module/Carriere/src/Carriere/View/Helper/partial/niveau-enveloppe.phtml: 19 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -8,9 +8,26 @@ 


use Carriere\Entity\Db\NiveauEnveloppe;





$verbose = (isset($options['verbose']) AND $options['verbose'] === true);

?>



<?php if ($verbose) : ?>

    <?php

        $minimun = $niveauEnveloppe->getBorneInferieure();

        $maximum = $niveauEnveloppe->getBorneSuperieure();

        $recommande = $niveauEnveloppe->getValeurRecommandee();

    ?>

    <?php if ($minimun === $maximum) : ?>

        Niveau : <?php echo $minimun->getLibelle(); ?> (<?php echo $minimun->getEtiquette(); ?>)

    <?php else : ?>

        Niveau au plus bas : <?php echo $minimun->getLibelle(); ?> (<?php echo $minimun->getEtiquette(); ?>) <br/>

        Niveau au plus haut : <?php echo $maximum->getLibelle(); ?> (<?php echo $maximum->getEtiquette(); ?>)

        <?php if ($recommande !== null) : ?>

            <br/>

            Niveau recommandé : <?php echo $recommande->getLibelle(); ?> (<?php echo $recommande->getEtiquette(); ?>)

        <?php endif; ?>

    <?php endif; ?>

<?php else : ?>

    <?php if ($niveauEnveloppe === null) : ?>

        Non&nbsp;précisé

    <?php else: ?>
@@ -19,5 +36,6 @@ use Carriere\Entity\Db\NiveauEnveloppe; 
            Recommandé&nbsp;<?php echo $niveauEnveloppe->getValeurRecommandee()->getEtiquette(); ?>

        <?php endif; ?>

    <?php endif; ?>

<?php endif; ?>

module/Metier/config/merged/metier.config.php

+20 −0
Changes for module/Metier/config/merged/metier.config.php: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -36,6 +36,15 @@ return [ 
                        MetierPrivileges::METIER_INDEX,

                    ],

                ],

                [

                    'controller' => MetierController::class,

                    'action' => [

                        'afficher',

                    ],

                    'privileges' => [

                        MetierPrivileges::METIER_AFFICHER,

                    ],

                ],

                [

                    'controller' => MetierController::class,

                    'action' => [
@@ -169,6 +178,17 @@ return [ 


                    /** METIER ****************************************************************************************/



                    'afficher' => [

                        'type' => Segment::class,

                        'options' => [

                            'route' => '/afficher/:metier',

                            'defaults' => [

                                /** @see MetierController::afficherAction() */

                                'controller' => MetierController::class,

                                'action' => 'afficher',

                            ],

                        ],

                    ],

                    'ajouter' => [

                        'type' => Literal::class,

                        'options' => [

module/Metier/config/merged/reference.config.php

+7 −1
Changes for module/Metier/config/merged/reference.config.php: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ use Metier\Form\Reference\ReferenceHydraytorFactory; 
use Metier\Provider\Privilege\ReferencemetierPrivileges;

use Metier\Service\Reference\ReferenceService;

use Metier\Service\Reference\ReferenceServiceFactory;

use Metier\View\Helper\ReferenceViewHelper;

use UnicaenPrivilege\Guard\PrivilegeController;

use Laminas\Router\Http\Literal;

use Laminas\Router\Http\Segment;
@@ -161,6 +162,11 @@ return [ 
        'factories' => [

            ReferenceHydrator::class => ReferenceHydraytorFactory::class,

        ],

    ]

    ],

    'view_helpers' => [

        'invokables' => [

            'reference' => ReferenceViewHelper::class,

        ],

    ],



];
 
 No newline at end of file

module/Metier/src/Metier/Controller/MetierController.php

+12 −0
Changes for module/Metier/src/Metier/Controller/MetierController.php: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -52,6 +52,18 @@ class MetierController extends AbstractActionController { 
        ]);

    }



    public function afficherAction() : ViewModel

    {

        $metier = $this->getMetierService()->getRequestedMetier($this);

        $fiches = $metier->getFichesMetiers();



        return new ViewModel([

            'title' => "Affichage du métier",

            'metier' => $metier,

            'fiches' => $fiches,

        ]);

    }



    public function ajouterAction() : ViewModel

    {

        $metier = new Metier();