Commit 881736c5 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Recherche de rapports d'activité : nouveau filtre 'Annuel ou fin de thèse'.

parent c02dccc6
Loading
Loading
Loading
Loading
+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Journal des modifications
- Envoi automatique par mail des jetons d'authentification créés + possibilité de les renvoyer.
- Utilisation des dates et lieux des dossiers de soutenances plutôt que celles saisies dans les SIs pour la génération des documents du module soutenance.
- Précision de la date de rendu des rapports dès le premier mail des rapporteurs
- Recherche de rapports d'activité : nouveau filtre "Annuel ou fin de thèse".  
- [FIX] Dédoublonnage des origines de financement dans le filtres de la page des rapports.

2.2.2
+36 −3
Changes for module/Application/src/Application/Service/Rapport/RapportSearchService.php: 36 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ use Application\Entity\Db\TypeStructure;
use Application\Filter\AnneeUnivFormatter;
use Application\Search\EcoleDoctorale\EcoleDoctoraleSearchFilter;
use Application\Search\Etablissement\EtablissementSearchFilter;
use Application\Search\Filter\CheckboxSearchFilter;
use Application\Search\Filter\SearchFilter;
use Application\Search\Filter\SelectSearchFilter;
use Application\Search\Filter\TextSearchFilter;
@@ -69,6 +68,10 @@ class RapportSearchService extends SearchService
     * @var SelectSearchFilter
     */
    private $validationSearchFilter;
    /**
     * @var SelectSearchFilter
     */
    private $finalSearchFilter;

    /**
     * @inheritDoc
@@ -96,8 +99,9 @@ class RapportSearchService extends SearchService
                return $this->fetchAnneesRapportActivite();
            });
        $validationSearchFilter = $this->getValidationSearchFilter();
        $finalSearchFilter = $this->getFinalSearchFilter();

        $this->addFilters([
        $this->addFilters(array_filter([
            $etablissementInscrFilter,
            $origineFinancementFilter,
            $ecoleDoctoraleFilter,
@@ -105,8 +109,9 @@ class RapportSearchService extends SearchService
            $anneeRapportActiviteInscrFilter,
            $this->createFilterNomDoctorant(),
            $this->createFilterNomDirecteur(),
            $finalSearchFilter,
            $validationSearchFilter,
        ]);
        ]));
        $this->addSorters([
            $etablissementInscrFilter->createSorter(),
            $this->createSorterTypeRapport(),
@@ -255,6 +260,14 @@ class RapportSearchService extends SearchService
        }
    }

    public function applyFinalFilterToQueryBuilder(SearchFilter $filter, QueryBuilder $qb, $alias = 'ra')
    {
        $filterValue = $filter->getValue();
        $qb
            ->andWhere("$alias.estFinal = :final")
            ->setParameter('final', $filterValue === 'finthese');
    }

    public function applyNomDoctorantSorterToQueryBuilder(SearchSorter $sorter, QueryBuilder $qb, $alias = 'these')
    {
        $direction = $sorter->getDirection();
@@ -384,6 +397,26 @@ class RapportSearchService extends SearchService
        return $this->validationSearchFilter;
    }

    public function getFinalSearchFilter(): ?SelectSearchFilter
    {
        if (! $this->typeRapport->estRapportActivite()) {
            return null;
        }

        if ($this->finalSearchFilter === null) {
            $this->finalSearchFilter = new SelectSearchFilter("Type", self::NAME_type);
            $this->finalSearchFilter
                ->setDataProvider(function () {
                    return ['annuel' => "Annuel", 'finthese' => "Fin de thèse"];
                })
                ->setEmptyOptionLabel("(Peu importe)")
                ->setAllowsEmptyOption()
                ->setQueryBuilderApplier([$this, 'applyFinalFilterToQueryBuilder']);
        }

        return $this->finalSearchFilter;
    }

    /**
     * @return EtablissementSearchFilter
     */