Commit 7077818c authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Correction des certains intitulés et de l'export de la cartographie

parent 888b2d07

module/Application/src/Application/Controller/RessourceRh/RessourceRhController.php

+2 −2
Original line number Diff line number Diff line
@@ -454,12 +454,12 @@ class RessourceRhController extends AbstractActionController { 
        $results = [];

        foreach($metiers as $metier) {

            $fonction = $metier->getFonction();

            $domaine = ($fonction)?$fonction->getDomaine():null;

            $domaine = ($metier)?$metier->getDomaine():null;

            $famille = ($domaine)?$domaine->getFamille():null;

            $entry = [

                'famille'  => ($famille)?$famille->__toString():"---",

                'domaine'  => ($domaine)?$domaine->__toString():"---",

                'fonction' => ($fonction)?$fonction->__toString():"---",

                'fonction' => ($fonction)?:"---",

                'metier'   => ($metier)?$metier->__toString():"---",

                'nbFiche'   => count($metier->getFichesMetiers()),

            ];

module/Application/src/Application/Form/Agent/AgentForm.php

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ class AgentForm extends Form { 
            'type' => Select::class,

            'name' => 'quotite',

            'options' => [

                'label' => 'Quotité travaillée* :',

                'empty_option' => "Sélectionner une quotité ...",

                'value_options' => [

                    20 => ' 20 %',
@@ -42,6 +43,7 @@ class AgentForm extends Form { 
            'type' => Select::class,

            'name' => 'missions',

            'options' => [

                'label' => 'Missions spécifiques :',

                'value_options' => $this->getRessourceRhService()->getMisssionsSpecifiquesAsOption(),

            ],

            'attributes' => [

module/Application/src/Application/View/Helper/partial/fiche-metier-externe.phtml

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ use Application\Entity\Db\FicheTypeExterne; 


             <div class="row">

                 <div class="col-md-6">

                     <h4> Applications </h4>

                     <h4> Applications métiers</h4>



                    <?php

                        $applications = [];

module/Application/src/Application/View/Helper/partial/fiche-metier.phtml

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ use Application\Entity\Db\FicheMetierTypeActivite; 


    <div class="row">

        <div class="col-md-6">

            <h3> Applications </h3>

            <h3> Applications métiers</h3>

                <ul>

                    <?php foreach ($applications as $application) : ?>

                        <li> <?php echo $application; ?> </li>

module/Application/view/application/activite/afficher.phtml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ use Application\Entity\Db\Activite; 
</div>



<h3>

    Applications associées

    Applications métiers associées

    <span class="badge">

        <?php echo count($activite->getApplications()); ?>

    </span>