Commit 4f507763 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

correction bug lié à des soucis de dictionnaires et à la fusion de compétences

parent 6666f872

module/Application/src/Application/Service/FichePoste/FichePosteService.php

+3 −1
Original line number Diff line number Diff line
@@ -557,6 +557,7 @@ class FichePosteService { 
        $retirees = $fiche->getApplicationsRetirees();

        foreach ($retirees as $retiree) {

            $dictionnaire[$retiree->getApplication()->getId()]["conserve"] = false;

            $dictionnaire[$retiree->getApplication()->getId()]["entite"] = $retiree->getApplication();

        }



        return $dictionnaire;
@@ -652,7 +653,7 @@ class FichePosteService { 
        foreach ($activites as $activite) {

            foreach ($activite->getCompetenceListe() as $competenceElement) {

                $competence = $competenceElement->getCompetence();

                $dictionnaire[$competence->getId()]["object"] = $competence;

                $dictionnaire[$competence->getId()]["entite"] = $competence;

                $dictionnaire[$competence->getId()]["raison"][] = $activite;

                $dictionnaire[$competence->getId()]["conserve"] = true;

            }
@@ -660,6 +661,7 @@ class FichePosteService { 


        $retirees = $fiche->getCompetencesRetirees();

        foreach ($retirees as $retiree) {

            $dictionnaire[$retiree->getCompetence()->getId()]["entite"] = $retiree->getCompetence();

            $dictionnaire[$retiree->getCompetence()->getId()]["conserve"] = false;

        }

module/Application/view/application/fiche-poste/selectionner-competences-retirees.phtml

+2 −0
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@ $listings["Opérationnelles"] = []; 
$listings["Comportementales"] = [];



foreach ($competences as $item) {

    if (isset($item['entite'])) {

        $listings[$item['entite']->getType()->getLibelle()][] = $item;

    }

}

?>