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

remise des structures substituées si historisation de la substitution

parent 82d80885
Loading
Loading
Loading
Loading
+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
@@ -27,7 +27,7 @@ class EcoleDoctoraleController extends AbstractController

    public function indexAction()
    {
        $eds = $this->getStructureService()->getStructuresNonSubstitueesByType(TypeStructure::CODE_ECOLE_DOCTORALE, 'libelle');
        $eds = $this->getStructureService()->getAllStructuresAffichablesByType(TypeStructure::CODE_ECOLE_DOCTORALE, 'libelle');

        return new ViewModel([
            'ecoles'                         => $eds,
+6 −24
Changes for module/Application/src/Application/Controller/EtablissementController.php: 6 added lines, 24 removed lines.
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ use Application\Entity\Db\Role;
use Application\Entity\Db\SourceInterface;
use Application\Entity\Db\Structure;
use Application\Entity\Db\StructureConcreteInterface;
use Application\Entity\Db\TypeStructure;
use Application\Form\EtablissementForm;
use Application\Service\Etablissement\EtablissementServiceAwareTrait;
use Application\Service\Individu\IndividuServiceAwareTrait;
@@ -53,33 +54,14 @@ class EtablissementController extends AbstractController
     */
    public function indexAction()
    {
        $etablissements = $this->getEtablissementService()->getRepository()->findAll();

        $etablissementsSYGAL = $this->getEtablissementService()->getRepository()->findAllBySource(SourceInterface::CODE_SYGAL);
        $etablissementsPrincipaux = array_filter($etablissementsSYGAL, function (Etablissement $etablissement) { return count($etablissement->getStructure()->getStructuresSubstituees())==0; });
        $etablissementsSecondaires = array_diff($etablissements, $etablissementsPrincipaux);

        /** retrait des structures substituées */
        $structuresSub = array_filter($etablissementsSYGAL, function (StructureConcreteInterface $structure) { return count($structure->getStructure()->getStructuresSubstituees())!=0; });
        $toRemove = [];
        /** @var Etablissement $structure */
        foreach($structuresSub as $structure) {
            foreach ($structure->getStructure()->getStructuresSubstituees() as $sub) {
                $toRemove[] = $sub;
            }
        }
        $structures = [];
        foreach ($etablissementsSecondaires as $structure) {
            $found = false;
            foreach ($toRemove as $remove) {
                if($structure->getStructure()->getId() == $remove->getId()) $found = true;
            }
            if (!$found) $structures[] = $structure;
        }
        $etablissements = $this->getStructureService()->getAllStructuresAffichablesByType(TypeStructure::CODE_ETABLISSEMENT);

        $etablissementsPrincipaux = array_filter($etablissements, function(Etablissement $e) { return $e->estMembre(); });
        $etablissementsExternes = array_filter($etablissements, function(Etablissement $e) { return !$e->estMembre(); });

        return new ViewModel([
            'etablissementsSygal'          => $etablissementsPrincipaux,
            'etablissementsExternes'       => $structures,
            'etablissementsExternes'       => $etablissementsExternes,
        ]);
    }

+1 −1
Changes for module/Application/src/Application/Controller/SubstitutionController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ class SubstitutionController extends AbstractController
        $sources = $dictionnary["sources"];
        $cible = $dictionnary["cible"];

        $structures = $this->getStructureService()->getStructuresNonSubstitueesByType($type);
        $structures = $this->getStructureService()->getAllStructuresAffichablesByType($type);

        $request = $this->getRequest();
        if ($request->isPost()) {
+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
@@ -38,7 +38,7 @@ class UniteRechercheController extends AbstractController
     */
    public function indexAction()
    {
        $urs = $this->getStructureService()->getStructuresNonSubstitueesByType(TypeStructure::CODE_UNITE_RECHERCHE, 'libelle');
        $urs = $this->getStructureService()->getAllStructuresAffichablesByType(TypeStructure::CODE_UNITE_RECHERCHE, 'libelle');

        return new ViewModel([
            'unites'                         => $urs,
+2 −2
Changes for module/Application/src/Application/Service/Structure/StructureService.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -599,11 +599,11 @@ class StructureService extends BaseService
     * @param string order
     * @return StructureConcreteInterface[]
     */
    public function getStructuresNonSubstitueesByType($type, $order=null) {
    public function getAllStructuresAffichablesByType($type, $order=null) {
        $qb = $this->getEntityManager()->getRepository($this->getEntityByType($type))->createQueryBuilder('structureConcrete')
            ->join('structureConcrete.structure', 'structure')
            ->leftJoin('structure.structureSubstituante', 'substitutionTo')
            ->andWhere('substitutionTo.id IS NULL')
            ->andWhere('substitutionTo.id IS NULL OR pasHistorise(substitutionTo) != 1' )
            ;
        if ($order) $qb->orderBy('structure.'.$order);

Loading