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

Fixing sélection des activités des missions dans les fiches de postes

parent 68256763

config/autoload/unicaen-app.global.php

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ return [ 
        'app_infos' => [

            'nom'     => "EMC2",

            'desc'    => "Emploi Mobilité Carrière Compétences",

            'version' => "3.1.5",

            'date'    => "22/02/2023",

            'version' => "3.1.6",

            'date'    => "20/03/2023",



//            'liens' => [

//                'COMUE' => [

documentation/release/3.1.6.md

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ alter table agent_carriere_statut alter column source_id type varchar(128); 
composer update unicaen/renderer

composer update unicaen/utilisateur

composer update unicaen/authentification

composer update unicaen/mail

composer remove unicaen/octopus

composer remove unicaen/db-import

```
 
 No newline at end of file

module/Application/src/Application/Controller/FichePosteController.php

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ class FichePosteController extends AbstractActionController { 
         * @var FicheposteActiviteDescriptionRetiree[] $retirees

         */

        $activites = $mission->getActivites();

        $retirees = $this->getActivitesDescriptionsRetireesService()->getActivitesDescriptionsRetirees($ficheposte, $fichemetier, $mission);

        $retirees = $ficheposte->getDescriptionsRetireesByFicheMetierAndActivite($fichemetier, $mission);



        /** @var Request $request */

        $request = $this->getRequest();

module/Application/src/Application/View/Helper/partial/activite.phtml

+17 −2
Original line number Diff line number Diff line
@@ -114,11 +114,26 @@ $nbObject = $nbCompetence + $nbApplication; 
        $activites = $mission->getActivites();

        usort($activites, function (MissionActivite $a, MissionActivite $b) { return $a->getOrdre() > $b->getOrdre();});



//        var_dump("INIT");

//        foreach ($activites as $activite) {

//            var_dump($activite->getId() . " - ".$activite->getLibelle());

//        }



        if ($ficheposte !== null) {

            $removed = array_map(function (FicheposteActiviteDescriptionRetiree $a) { return $a->getActivite()->getLibelle(); } , $ficheposte->getDescriptionsRetireesByFicheMetierAndActivite($fichemetier, $mission));

            $removed = array_map(function (FicheposteActiviteDescriptionRetiree $a) { return $a->getActivite()->getId(); } , $ficheposte->getDescriptionsRetireesByFicheMetierAndActivite($fichemetier, $mission));



//            var_dump("TO REMOVE :");

//            foreach ($removed as $retrait) {

//                var_dump($retrait);

//            };



            $activites = array_filter($activites, function (MissionActivite $d) use ($removed){

                return (array_search($d, $removed) === false);

                return (!in_array($d->getId(), $removed));

            });



//            foreach ($activites as $activite) {

//                var_dump($activite->getId() . " - ".$activite->getLibelle());

//            }

        }

    ?>

    <ul>

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

+1 −1
Original line number Diff line number Diff line 
<?php



/**

 * @see \Application\Controller\FichePosteController::selectionnerApplicationsRetireesAction()

 * @see \Application\Controller\FichePosteController::selectionnerDescriptionsRetireesAction()

 *

 * @var FichePoste $ficheposte

 * @var FicheMetier $fichemetier