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

Simplification de l'affichage des rôles par structures + exploitation des... 

Simplification de l'affichage des rôles par structures + exploitation des compléments pour les établissements
parent c87496e8

CHANGELOG.md

+2 −1
Changes for CHANGELOG.md: 2 added lines, 1 removed line.
Original line number Diff line number Diff line 
Journal des modifications

=========================



4.0.4

-----

- Correction de typos dans mail de feu vert de la soutenance
@@ -12,7 +13,7 @@ Journal des modifications 
- [FIX] Correction de l'affichage de la date d'historisation dans Individu lié

- [FIX] Correction de la signature de Membre::setEtablissement(?string) qui faisait planter la création de proprosition (lorsqu'aucun établissement n'était fourni)

- Ajout de l'unité de recherche des acteurs (manuel pour le moment) pour améliorer les pages de couverture

- 



4.0.2

-----

- [FIX] Affichage de la bonne adresse électronique institutionnelle sur la fiche thèse

module/Application/src/Application/Controller/EcoleDoctoraleController.php

+1 −1
Changes for module/Application/src/Application/Controller/EcoleDoctoraleController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class EcoleDoctoraleController extends StructureConcreteController 
    /**

     * @return ViewModel

     */

    public function informationAction()

    public function informationAction() : ViewModel

    {

        $id = $this->params()->fromRoute('structure');

        $structureConcrete = $this->getStructureConcreteService()->getRepository()->findByStructureId($id);

module/Application/src/Application/Controller/EtablissementController.php

+1 −1
Changes for module/Application/src/Application/Controller/EtablissementController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ class EtablissementController extends StructureConcreteController 
    /**

     * @return ViewModel

     */

    public function informationAction()

    public function informationAction() : ViewModel

    {

        $id = $this->params()->fromRoute('structure');

        /** @var Etablissement $etablissement */

module/Application/src/Application/Controller/StructureConcreteController.php

+2 −14
Changes for module/Application/src/Application/Controller/StructureConcreteController.php: 2 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ abstract class StructureConcreteController extends AbstractController 
    /**

     * @return ViewModel

     */

    public function informationAction()

    public function informationAction() : ViewModel

    {

        $id = $this->params()->fromRoute('structure');

        $structureConcrete = $this->getStructureConcreteService()->getRepository()->findByStructureId($id);
@@ -92,35 +92,23 @@ abstract class StructureConcreteController extends AbstractController 
        }



        $roleListings = [];

        $individuListings = [];

        $roles = $this->roleService->getRolesByStructure($structureConcrete->getStructure());

        $individus = $this->roleService->getIndividuByStructure($structureConcrete->getStructure());

        $individuRoles = $this->roleService->getIndividuRoleByStructure($structureConcrete->getStructure());



        /** @var Role $role */

        foreach ($roles as $role) {

            $roleListings[$role->getLibelle()] = 0;

        }



        /** @var Individu $individu */

        foreach ($individus as $individu) {

            $denomination = $individu->getNomComplet(false, false, false, true, false);

            $individuListings[$denomination] = [];

        }



        /** @var IndividuRole $individuRole */

        foreach ($individuRoles as $individuRole) {

            $denomination = $individuRole->getIndividu()->getNomComplet(false, false, false, true, false);

            $role = $individuRole->getRole()->getLibelle();

            $etablissement = ($individuRole->getIndividu()->getEtablissement())?$individuRole->getIndividu()->getEtablissement()->getLibelle():"Aucun";

            $individuListings[$denomination][] = [ 'Role' => $role, 'Etablissement' => $etablissement ];

            $roleListings[$role]++;

        }



        return new ViewModel([

            'structure'       => $structureConcrete,

            'roleListing'     => $roleListings,

            'individuListing' => $individuListings,

            'individuRoles' => $individuRoles,

            'logoContent'     => $this->structureService->getLogoStructureContent($structureConcrete),

        ]);

    }

module/Application/src/Application/Controller/UniteRechercheController.php

+1 −1
Changes for module/Application/src/Application/Controller/UniteRechercheController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ class UniteRechercheController extends StructureConcreteController 
    /**

     * @return ViewModel

     */

    public function informationAction()

    public function informationAction() : ViewModel

    {

        $id = $this->params()->fromRoute('structure');

        $structureConcrete = $this->getStructureConcreteService()->getRepository()->findByStructureId($id);