Commit 879804f4 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Structures: abandon de l'extraction de la source à partir du source_code.

parent 70b75bf6

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

+0 −5
Original line number Diff line number Diff line
@@ -34,13 +34,8 @@ class EcoleDoctoraleController extends StructureConcreteController 
    {

        $vm = parent::indexAction();



        $codeStructureExtractor = function($code) {

            return $this->sourceCodeStringHelper->extractPrefixFrom($code);

        };



        return new ViewModel([

            'ecoles' => $vm->getVariable('structures'),

            'codeStructureExtractor' => $codeStructureExtractor,

        ]);

    }

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

+0 −5
Original line number Diff line number Diff line
@@ -53,14 +53,9 @@ class EtablissementController extends StructureConcreteController 
            return !$e->estMembre();

        });



        $codeStructureExtractor = function($code) {

            return $this->sourceCodeStringHelper->extractPrefixFrom($code);

        };



        return new ViewModel([

            'etablissementsSygal'    => $etablissementsPrincipaux,

            'etablissementsExternes' => $etablissementsExternes,

            'codeStructureExtractor' => $codeStructureExtractor,

        ]);

    }

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

+0 −5
Original line number Diff line number Diff line
@@ -41,13 +41,8 @@ class UniteRechercheController extends StructureConcreteController 
    {

        $viewModel = parent::indexAction();



        $codeStructureExtractor = function($code) {

            return $this->sourceCodeStringHelper->extractPrefixFrom($code);

        };



        return new ViewModel([

            'unites' => $viewModel->getVariable('structures'),

            'codeStructureExtractor' => $codeStructureExtractor,

        ]);

    }

module/Application/view/application/ecole-doctorale/index.phtml

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ use Application\Provider\Privilege\SubstitutionPrivileges; 


/**

 * @var EcoleDoctorale[] $ecoles

 * @var callable $codeStructureExtractor

 *

 * @see \Application\Controller\EcoleDoctoraleController::indexAction()

 */
@@ -64,7 +63,7 @@ $canSubstituer = $this->isAllowed(SubstitutionPrivileges::getResourceId(Substitu 
                    </a>

                </td>

                <td>

                    <?php echo $codeStructureExtractor($ecole->getSource()->getCode()); ?>

                    <?php echo $ecole->getSource(); ?>

                </td>

                <td>

                    <?php echo $ecole->getStructure()->getCode(); ?>

module/Application/view/application/etablissement/index.phtml

+2 −3
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ use Application\Provider\Privilege\SubstitutionPrivileges; 
/**

 * @var Etablissement[] $etablissementsSygal

 * @var Etablissement[] $etablissementsExternes

 * @var callable $codeStructureExtractor

 *

 * @see \Application\Controller\EtablissementController::indexAction()

 */
@@ -82,7 +81,7 @@ $canSubstituer = $this->isAllowed(SubstitutionPrivileges::getResourceId(Substitu 
                    <?php endif ?>

                </td>

                <td>

                    <?php echo $codeStructureExtractor($etablissement->getSource()->getCode()); ?>

                    <?php echo $etablissement->getSource(); ?>

                </td>

                <td>

                    <?php echo $etablissement->getStructure()->getCode(); ?>
@@ -158,7 +157,7 @@ $canSubstituer = $this->isAllowed(SubstitutionPrivileges::getResourceId(Substitu 
                    <?php endif ?>

                </td>

                <td>

                    <?php echo $codeStructureExtractor($etablissement->getSource()->getCode()); ?>

                    <?php echo $etablissement->getSource(); ?>

                </td>

                <td>

                    <?php echo $etablissement->getStructure()->getCode(); ?>