Commit 637c4887 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Ajout de filtres sur la page des résultats d'enquête

parent 33759362
Loading
Loading
Loading
Loading
+34 −10
Changes for doc/dev/recherche.md: 34 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -46,19 +46,20 @@ class FormationSearchService extends SearchService
    const NAME_modalite = 'modalite';
    const NAME_responsable = 'responsable';
    
    public function init()
    {
        $libelleFilter = $this->createLibelleFilter()->setWhereField('f.libelle');
        $responsableFilter = $this->createResponsableFilter();
        $modaliteFilter = $this->createModaliteFilter()->setWhereField('f.modalite');
    protected SearchFilter $libelleFilter;
    protected SearchFilter $responsableFilter;
    protected SearchFilter $modaliteFilter;
    
        $responsableFilter->setDataProvider(fn() => $this->formationRepository->fetchListeResponsable());
        $modaliteFilter->setData(HasModaliteInterface::MODALITES);
    public function __construct() 
    {
        $this->libelleFilter = $this->createLibelleFilter()->setWhereField('f.libelle');
        $this->responsableFilter = $this->createResponsableFilter();
        $this->modaliteFilter = $this->createModaliteFilter()->setWhereField('f.modalite');
        
        $this->addFilters([
            $libelleFilter,
            $responsableFilter,
            $modaliteFilter,
            $this->libelleFilter,
            $this->responsableFilter,
            $this->modaliteFilter,
        ]);

        $this->addSorters([
@@ -68,6 +69,12 @@ class FormationSearchService extends SearchService
        ]);
    }
    
    public function init()
    {
        $this->responsableFilter->setDataProvider(fn() => $this->formationRepository->fetchListeResponsable());
        $this->modaliteFilter->setData(HasModaliteInterface::MODALITES);
    }

    public function createQueryBuilder(): QueryBuilder
    {
        // ATTENTION à bien sélectionner les relations amenées à être parcourues dans la vue.
@@ -376,6 +383,7 @@ Cf. [paginator.phtml](../../module/Formation/view/formation/paginator.phtml)
                        'may_terminate' => true,
                        'options' => [
                            'route'    => '/formation',
                            //'route'    => '/formation[/:type]', <<< Désolé mais c'est impossible !
                            'defaults' => [
                                'controller' => FormationRechercheController::class,
                                'action'     => 'index',
@@ -408,3 +416,19 @@ Cf. [paginator.phtml](../../module/Formation/view/formation/paginator.phtml)
                ],
    // ...
```

**Remarques importantes** : 
- La route menant à l'action de recherche ne peut pas faire mention d'un paramètre facultatif.
  Une solution possible :
```php
                        'options' => [
                            'route'    => '/formation/:type',
                            'constraints' => [
                                'type' => '(\d+)|(tous)',
                            ],
                            'defaults' => [
                                'controller' => FormationRechercheController::class,
                                'action'     => 'index',
                                'type'       => 'tous',
                            ],
```
+16 −4
Changes for module/Application/src/Application/Search/Controller/SearchControllerPlugin.php: 16 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -26,9 +26,13 @@ class SearchControllerPlugin extends AbstractPlugin
     * NB : Contrairement à {@see self::searchIfRequested()}, ici le paginator retourné contient systématiquement
     * un résultat de recherche (cf. {@see SearchResultPaginator::containsRealSearchResult()}).
     *
     * @param callable|null $queryBuilderModifierCallback Fonction de rappel éventuelle permettant d'agir sur
     * le query builder généré par le {@see \Application\Search\SearchService}. Cette fonction doit accepter en argument
     * un {@see \Doctrine\ORM\QueryBuilder}.
     *
     * @return Response|SearchResultPaginator
     */
    public function search()
    public function search(?callable $queryBuilderModifierCallback = null)
    {
        $queryParams = array_filter($this->getController()->params()->fromQuery());

@@ -45,8 +49,12 @@ class SearchControllerPlugin extends AbstractPlugin
        $searchService->initFiltersWithUnpopulatedOptions();
        $searchService->processQueryParams($queryParams);

        /** Configuration du paginator **/
        $qb = $searchService->getQueryBuilder();
        if ($queryBuilderModifierCallback !== null) {
            $queryBuilderModifierCallback($qb);
        }

        /** Configuration du paginator **/
        $maxi = $this->getController()->params()->fromQuery('maxi', 50);
        $page = $this->getController()->params()->fromQuery('page', 1);
        $paginator = new SearchResultPaginator(new DoctrinePaginator(new Paginator($qb, true)));
@@ -67,9 +75,13 @@ class SearchControllerPlugin extends AbstractPlugin
     * Cela est utile pour ne lancer une recherche que lorsque l'utilisateur a cliqué sur le bouton "Rechercher"
     * du formulaire de recherche.
     *
     * @param callable|null $queryBuilderModifierCallback Fonction de rappel éventuelle permettant d'agir sur
     * le query builder généré par le {@see \Application\Search\SearchService}. Cette fonction doit accepter en argument
     * un {@see \Doctrine\ORM\QueryBuilder}.
     *
     * @return Response|SearchResultPaginator
     */
    public function searchIfRequested()
    public function searchIfRequested(?callable $queryBuilderModifierCallback = null)
    {
        $queryParams = array_filter($this->getController()->params()->fromQuery());

@@ -80,7 +92,7 @@ class SearchControllerPlugin extends AbstractPlugin
            return $paginator;
        }

        return $this->search();
        return $this->search($queryBuilderModifierCallback);
    }

    /**
+10 −3
Changes for module/Application/src/Application/Search/Controller/SearchControllerTrait.php: 10 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -27,12 +27,16 @@ trait SearchControllerTrait
    }

    /**
     * @param callable|null $queryBuilderModifierCallback Fonction de rappel éventuelle permettant d'agir sur
     * le query builder généré par le {@see \Application\Search\SearchService}. Cette fonction doit accepter en argument
     * un {@see \Doctrine\ORM\QueryBuilder}.
     *
     * @return Response|LaminasPaginator
     * @see SearchControllerPlugin::searchIfRequested()
     */
    public function searchIfRequested()
    public function searchIfRequested(?callable $queryBuilderModifierCallback = null)
    {
        return $this->getSearchPluginController()->searchIfRequested();
        return $this->getSearchPluginController()->searchIfRequested($queryBuilderModifierCallback);
    }

    /**
@@ -61,6 +65,9 @@ trait SearchControllerTrait
            throw new DomainException("Ce trait n'est utilisable que sur un contrôleur de type " . AbstractActionController::class);
        }

        return $this->getPluginManager()->get('searchControllerPlugin');
        /** @var SearchControllerPlugin $plugin */
        $plugin = $this->getPluginManager()->get('searchControllerPlugin');

        return $plugin;
    }
}
 No newline at end of file
+11 −0
Changes for module/Application/src/Application/Search/SearchService.php: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -171,6 +171,17 @@ abstract class SearchService implements SearchServiceInterface
        $this->unpopulatedOptions = true;
    }

    /**
     * Retourne le filtre dont le nom est spécifié.
     *
     * @param string $name
     * @return SearchFilter
     */
    public function getFilterByName(string $name): SearchFilter
    {
        return $this->filters[$name];
    }

    /**
     * Retourne la liste des filtres.
     *
+52 −32
Changes for module/Formation/config/others/enquete.config.php: 52 added lines, 32 removed lines.
Original line number Diff line number Diff line
@@ -2,9 +2,12 @@

namespace Formation;


use Formation\Controller\EnqueteController;
use Formation\Controller\EnqueteControllerFactory;
use Formation\Controller\EnqueteQuestionController;
use Formation\Controller\EnqueteQuestionControllerFactory;
use Formation\Controller\EnqueteReponseController;
use Formation\Controller\EnqueteReponseControllerFactory;
use Formation\Controller\Recherche\EnqueteReponseRechercheController;
use Formation\Controller\Recherche\EnqueteReponseRechercheControllerFactory;
use Formation\Form\EnqueteCategorie\EnqueteCategorieForm;
use Formation\Form\EnqueteCategorie\EnqueteCategorieFormFactory;
use Formation\Form\EnqueteCategorie\EnqueteCategorieHydrator;
@@ -24,16 +27,18 @@ use Formation\Service\EnqueteQuestion\EnqueteQuestionService;
use Formation\Service\EnqueteQuestion\EnqueteQuestionServiceFactory;
use Formation\Service\EnqueteReponse\EnqueteReponseService;
use Formation\Service\EnqueteReponse\EnqueteReponseServiceFactory;
use UnicaenAuth\Guard\PrivilegeController;
use Formation\Service\EnqueteReponse\Search\EnqueteReponseSearchService;
use Formation\Service\EnqueteReponse\Search\EnqueteReponseSearchServiceFactory;
use Laminas\Router\Http\Literal;
use Laminas\Router\Http\Segment;
use UnicaenAuth\Guard\PrivilegeController;

return [
    'bjyauthorize' => [
        'guards' => [
            PrivilegeController::class => [
                [
                    'controller' => EnqueteController::class,
                    'controller' => EnqueteQuestionController::class,
                    'action' => [
                        'afficher-questions',
                    ],
@@ -42,7 +47,7 @@ return [
                    ],
                ],
                [
                    'controller' => EnqueteController::class,
                    'controller' => EnqueteQuestionController::class,
                    'action' => [
                        'ajouter-categorie',
                        'ajouter-question',
@@ -52,7 +57,7 @@ return [
                    ],
                ],
                [
                    'controller' => EnqueteController::class,
                    'controller' => EnqueteQuestionController::class,
                    'action' => [
                        'modifier-categorie',
                        'modifier-question',
@@ -62,7 +67,7 @@ return [
                    ],
                ],
                [
                    'controller' => EnqueteController::class,
                    'controller' => EnqueteQuestionController::class,
                    'action' => [
                        'historiser-categorie',
                        'restaurer-categorie',
@@ -74,7 +79,7 @@ return [
                    ],
                ],
                [
                    'controller' => EnqueteController::class,
                    'controller' => EnqueteQuestionController::class,
                    'action' => [
                        'supprimer-categorie',
                        'supprimer-question',
@@ -84,21 +89,22 @@ return [
                    ],
                ],
                [
                    'controller' => EnqueteController::class,
                    'controller' => EnqueteQuestionController::class,
                    'action' => [
                        'afficher-resultats',
                        'repondre-questions',
                    ],
                    'privileges' => [
                        EnquetePrivileges::ENQUETE_REPONSE_RESULTAT,
                        EnquetePrivileges::ENQUETE_REPONSE_REPONDRE,
                    ],
                ],
                [
                    'controller' => EnqueteController::class,
                    'controller' => EnqueteReponseRechercheController::class,
                    'action' => [
                        'repondre-questions',
                        'afficher-resultats',
                        'filters',
                    ],
                    'privileges' => [
                        EnquetePrivileges::ENQUETE_REPONSE_REPONDRE,
                        EnquetePrivileges::ENQUETE_REPONSE_RESULTAT,
                    ],
                ],
            ],
@@ -114,13 +120,16 @@ return [
                            'enquete-question' => [
                                'label'    => 'Enquête - Question',
                                'route'    => 'formation/enquete/question',
                                'resource' => PrivilegeController::getResourceId(EnqueteController::class, 'afficher-questions') ,
                                'resource' => PrivilegeController::getResourceId(EnqueteQuestionController::class, 'afficher-questions') ,
                                'order'    => 700,
                            ],
                            'enquete-resultat' => [
                                'label'    => 'Enquête - Resultat',
                                'route'    => 'formation/enquete/resultat',
                                'resource' => PrivilegeController::getResourceId(EnqueteController::class, 'afficher-questions') ,
                                'params'   => [
                                    'session' => EnqueteReponseRechercheController::SESSION_ROUTE_PARAM_TOUTES,
                                ],
                                'resource' => PrivilegeController::getResourceId(EnqueteQuestionController::class, 'afficher-questions') ,
                                'order'    => 800,
                            ],
                        ],
@@ -145,10 +154,25 @@ return [
                                'type'  => Segment::class,
                                'may_terminate' => true,
                                'options' => [
                                    'route'    => '/resultat[/:session]',
                                    'route'    => '/resultat/session/:session',
                                    'constraints' => [
                                        'session' => '(\d+)|(' . EnqueteReponseRechercheController::SESSION_ROUTE_PARAM_TOUTES . ')',
                                    ],
                                    'defaults' => [
                                        'controller' => EnqueteController::class,
                                        'controller' => EnqueteReponseRechercheController::class,
                                        'action'     => 'afficher-resultats',
                                        'session'    => EnqueteReponseRechercheController::SESSION_ROUTE_PARAM_TOUTES,
                                    ],
                                ],
                                'child_routes' => [
                                    'filters' => [
                                        'type' => 'Literal',
                                        'options' => [
                                            'route' => '/filters',
                                            'defaults' => [
                                                'action' => 'filters',
                                            ],
                                        ],
                                    ],
                                ],
                            ],
@@ -158,7 +182,7 @@ return [
                                'options' => [
                                    'route'    => '/question',
                                    'defaults' => [
                                        'controller' => EnqueteController::class,
                                        'controller' => EnqueteQuestionController::class,
                                        'action'     => 'afficher-questions',
                                    ],
                                ],
@@ -169,7 +193,6 @@ return [
                                        'options' => [
                                            'route'    => '/ajouter',
                                            'defaults' => [
                                                'controller' => EnqueteController::class,
                                                'action'     => 'ajouter-question',
                                            ],
                                        ],
@@ -180,7 +203,6 @@ return [
                                        'options' => [
                                            'route'    => '/modifier/:question',
                                            'defaults' => [
                                                'controller' => EnqueteController::class,
                                                'action'     => 'modifier-question',
                                            ],
                                        ],
@@ -191,7 +213,6 @@ return [
                                        'options' => [
                                            'route'    => '/historiser/:question',
                                            'defaults' => [
                                                'controller' => EnqueteController::class,
                                                'action'     => 'historiser-question',
                                            ],
                                        ],
@@ -202,7 +223,6 @@ return [
                                        'options' => [
                                            'route'    => '/restaurer/:question',
                                            'defaults' => [
                                                'controller' => EnqueteController::class,
                                                'action'     => 'restaurer-question',
                                            ],
                                        ],
@@ -213,7 +233,6 @@ return [
                                        'options' => [
                                            'route'    => '/supprimer/:question',
                                            'defaults' => [
                                                'controller' => EnqueteController::class,
                                                'action'     => 'supprimer-question',
                                            ],
                                        ],
@@ -226,6 +245,7 @@ return [
                                'options' => [
                                    'route'    => '/categorie',
                                    'defaults' => [
                                        'controller' => EnqueteQuestionController::class,
                                    ],
                                ],
                                'child_routes' => [
@@ -235,7 +255,6 @@ return [
                                        'options' => [
                                            'route'    => '/ajouter',
                                            'defaults' => [
                                                'controller' => EnqueteController::class,
                                                'action'     => 'ajouter-categorie',
                                            ],
                                        ],
@@ -246,7 +265,6 @@ return [
                                        'options' => [
                                            'route'    => '/modifier/:categorie',
                                            'defaults' => [
                                                'controller' => EnqueteController::class,
                                                'action'     => 'modifier-categorie',
                                            ],
                                        ],
@@ -257,7 +275,6 @@ return [
                                        'options' => [
                                            'route'    => '/historiser/:categorie',
                                            'defaults' => [
                                                'controller' => EnqueteController::class,
                                                'action'     => 'historiser-categorie',
                                            ],
                                        ],
@@ -268,7 +285,6 @@ return [
                                        'options' => [
                                            'route'    => '/restaurer/:categorie',
                                            'defaults' => [
                                                'controller' => EnqueteController::class,
                                                'action'     => 'restaurer-categorie',
                                            ],
                                        ],
@@ -279,7 +295,6 @@ return [
                                        'options' => [
                                            'route'    => '/supprimer/:categorie',
                                            'defaults' => [
                                                'controller' => EnqueteController::class,
                                                'action'     => 'supprimer-categorie',
                                            ],
                                        ],
@@ -292,7 +307,7 @@ return [
                                'options' => [
                                    'route'    => '/repondre-questions/:inscription',
                                    'defaults' => [
                                        'controller' => EnqueteController::class,
                                        'controller' => EnqueteQuestionController::class,
                                        'action'     => 'repondre-questions',
                                    ],
                                ],
@@ -309,11 +324,16 @@ return [
            EnqueteCategorieService::class => EnqueteCategorieServiceFactory::class,
            EnqueteQuestionService::class => EnqueteQuestionServiceFactory::class,
            EnqueteReponseService::class => EnqueteReponseServiceFactory::class,

            EnqueteReponseSearchService::class => EnqueteReponseSearchServiceFactory::class,
        ],
    ],
    'controllers'     => [
        'factories' => [
            EnqueteController::class => EnqueteControllerFactory::class,
            EnqueteQuestionController::class => EnqueteQuestionControllerFactory::class,
            EnqueteReponseController::class => EnqueteReponseControllerFactory::class,

            EnqueteReponseRechercheController::class => EnqueteReponseRechercheControllerFactory::class,
        ],
    ],
    'form_elements' => [
Loading