Commit 3d8d5b4f authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Changement de l'action d'ajout de compétence sur les fiches métiers pour réutiliser l'hydrator

parent e6eeaac6

documentation/release/3.2.6.md

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Version 3.2.5 (XX/XX/2023) 
- Restauration de l'ajout/gestion/retrait des missions additionnelles dans les fiches de postes

- Ajout de nouvelle macro pour le CREP et les listings 

- Remplacement du champ type des maîtrises par un select

- Changement de l'action d'ajout de compétence sur les fiches métiers pour réutiliser l'hydrator



Modification en BD

---

module/Element/src/Element/Form/SelectionCompetence/SelectionCompetenceFormAwareTrait.php

+3 −12
Original line number Diff line number Diff line
@@ -4,25 +4,16 @@ namespace Element\Form\SelectionCompetence; 


trait SelectionCompetenceFormAwareTrait {



    /** @var SelectionCompetenceForm */

    private $selectionCompetenceForm;

    private SelectionCompetenceForm $selectionCompetenceForm;



    /**

     * @return SelectionCompetenceForm

     */

    public function getSelectionCompetenceForm()

    public function getSelectionCompetenceForm() : SelectionCompetenceForm

    {

        return $this->selectionCompetenceForm;

    }



    /**

     * @param SelectionCompetenceForm $selectionCompetenceForm

     * @return SelectionCompetenceForm

     */

    public function setSelectionCompetenceForm($selectionCompetenceForm)

    public function setSelectionCompetenceForm(SelectionCompetenceForm $selectionCompetenceForm): void

    {

        $this->selectionCompetenceForm = $selectionCompetenceForm;

        return $this->selectionCompetenceForm;

    }



}

module/FicheMetier/view/fiche-metier/fiche-metier/partial/applications.phtml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ if ($mode === 'edition-fiche-metier') { 
                        <?php /** @see \FicheMetier\Controller\FicheMetierController::gererApplicationsAction() */ ?>

                        <a href="<?php echo $this->url('fiche-metier/gerer-applications', ['fiche-metier' => $fichemetier->getId()], [], true); ?>"

                           class="btn btn-primary ajax-modal" data-event="modification">

                            <span class="icon icon-gerer"></span>

                            <span class="icon icon-lister"></span>

                            Gérer les applications

                        </a>

                    <?php endif; ?>

module/FicheMetier/view/fiche-metier/fiche-metier/partial/competences.phtml

+4 −5
Original line number Diff line number Diff line
@@ -37,14 +37,13 @@ if ($mode === 'edition-fiche-metier') { 
                    </a>



                    <?php if ($actions['modifier'] === true) : ?>

                        <?php /** @see \Application\Controller\ElementController::ajouterCompetenceElementAction() */ ?>

                        <a href="<?php echo $this->url('element_/ajouter-competence-element', ['type' => FicheMetier::class, 'id' => $fichemetier->getId()],

                            ['query' => ['multiple' => true]], true); ?>"

                        <?php /** @see \FicheMetier\Controller\FicheMetierController::gererCompetencesAction() */ ?>

                        <a href="<?php echo $this->url('fiche-metier/gerer-competences', ['fiche-metier' => $fichemetier->getId()], [], true); ?>"

                           class="btn btn-primary action ajax-modal" style="margin: 0 0.5rem;"

                           data-event="modification"

                        >

                            <span class="icon icon-ajouter"></span>

                            Ajouter des compétences

                            <span class="icon icon-lister"></span>

                            Gérer les compétences

                        </a>

                    <?php endif; ?>