Commit 89034e48 authored by Thomas Hamel's avatar Thomas Hamel Committed by Bertrand Gauthier
Browse files

Module Admission : Initialisation du tableau de bord avec les dossiers... 

Module Admission : Initialisation du tableau de bord avec les dossiers d'admissions en cours de saisie/en cours de validation 10.1.0
parent 9b50ba2f

CHANGELOG.md

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

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

10.2.0

------

- Module Admission : Initialisation du tableau de bord avec les dossiers d'admissions en cours de saisie/en cours de validation



10.1.1

------

module/Admission/config/module.config.php

+3 −0
Changes for module/Admission/config/module.config.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ return array( 
                        'order' => -200,

                        'label' => 'Admission',

                        'route' => 'admission',

                        'query' => [AdmissionRechercheService::NAME_etatAdmission => ['C','E']],

                        'resource' => PrivilegeController::getResourceId(AdmissionRechercheController::class, 'index'),

                        'pages' => []

                    ],
@@ -376,6 +377,7 @@ return array( 
                        'order' => -200,

                        'label' => 'Mes admissions',

                        'route' => 'admission',

                        'query' => [AdmissionRechercheService::NAME_etatAdmission => ['C','E']],

                        'resource' => PrivilegeController::getResourceId(AdmissionRechercheController::class, 'index'),

                        'pages' => [

                        ],
@@ -387,6 +389,7 @@ return array( 
                        'order' => -200,

                        'label' => 'Nos admissions',

                        'route' => 'admission',

                        'query' => [AdmissionRechercheService::NAME_etatAdmission => ['C','E']],

                        'resource' => PrivilegeController::getResourceId(AdmissionRechercheController::class, 'index'),

                        'pages' => [

                        ],

module/Admission/src/Admission/Search/Admission/EtatAdmissionSearchFilter.php

+1 −1
Changes for module/Admission/src/Admission/Search/Admission/EtatAdmissionSearchFilter.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class EtatAdmissionSearchFilter extends SelectSearchFilter 
        $alias = 'admission'; // todo: rendre paramétrable



        $qb

            ->andWhere("$alias.etat = :etat")

            ->andWhere("$alias.etat in (:etat)")

            ->setParameter('etat', $this->getValue());

    }

module/Admission/src/Admission/Service/Admission/AdmissionRechercheService.php

+1 −1
Changes for module/Admission/src/Admission/Service/Admission/AdmissionRechercheService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ class AdmissionRechercheService extends SearchService 
                    ->setParameter('sourceCodeUR', $filter->getValue());

            });

        $etatAdmissionSearchFilter = $this->getEtatAdmissionSearchFilter()

            ->setMultiple()

            ->setDataProvider(function() {

                return $this->fetchEtatsAdmission();

            });
@@ -216,7 +217,6 @@ class AdmissionRechercheService extends SearchService 
            $v = Etat::CODE_VALIDE => Admission::$etatsLibelles[$v],

            $v = Etat::CODE_REJETE => Admission::$etatsLibelles[$v],

            $v = Etat::CODE_ABANDONNE => Admission::$etatsLibelles[$v],



        ];

    }