Commit ff02ca57 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

SearchFilter : ménage, typages, refactorisations, améliorations.

parent 8e77bcf0

module/Admission/src/Admission/Controller/AdmissionRechercheController.php

+3 −3
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ class AdmissionRechercheController extends AbstractController implements SearchC 
                $ed = $roleEcoleDoctorale->getStructure()->getEcoleDoctorale();

                $edFilter->setData([$ed]);

                $edFilter->setDefaultValueAsObject($ed);

                $edFilter->setAllowsEmptyOption(false);

                $edFilter->setAllowsEmptyValueOption(false);

            }

        }

    }
@@ -169,7 +169,7 @@ class AdmissionRechercheController extends AbstractController implements SearchC 
                $ed = $roleUniteRecherche->getStructure()->getUniteRecherche();

                $urFilter->setData([$ed]);

                $urFilter->setDefaultValueAsObject($ed);

                $urFilter->setAllowsEmptyOption(false);

                $urFilter->setAllowsEmptyValueOption(false);

            }

        }

    }
@@ -199,6 +199,6 @@ class AdmissionRechercheController extends AbstractController implements SearchC 
        $filter

            ->setData([$entity])

            ->setDefaultValueAsObject($entity)

            ->setAllowsEmptyOption(false);

            ->setAllowsEmptyValueOption(false);

    }

}
 
 No newline at end of file

module/Admission/src/Admission/Search/Admission/AdmissionTextSearchFilter.php

+3 −28
Original line number Diff line number Diff line
@@ -4,14 +4,10 @@ namespace Admission\Search\Admission; 


use Application\Search\Filter\TextCriteriaSearchFilter;



/**

 *

 *

 * @author Unicaen

 */

class AdmissionTextSearchFilter extends TextCriteriaSearchFilter

{

    const NAME = 'text';

    protected string $name = 'text';

    protected string $label = "Recherche de texte";



    const CRITERIA_titre = 'titre';

    const CRITERIA_numero_doctorant = 'doctorant-numero';
@@ -38,26 +34,5 @@ class AdmissionTextSearchFilter extends TextCriteriaSearchFilter 
    /**

     * Critères possibles sur lesquels faire porter la recherche sur texte libre.

     */

    protected $availableCriteria = self::CRITERIA;



    /**

     * TheseTextSearchFilter constructor.

     * @param string $label

     * @param string $name

     */

    protected function __construct(string $label, string $name)

    {

        parent::__construct($label, $name);

    }



    /**

     * @return self

     */

    static public function newInstance(): self

    {

        return new self(

            "Recherche de texte",

            self::NAME

        );

    }

    protected array $availableCriteria = self::CRITERIA;

}

module/Admission/src/Admission/Search/Admission/AdmissionTextSearchFilterAwareTrait.php

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ trait AdmissionTextSearchFilterAwareTrait 
    public function getAdmissionTextSearchFilter(): AdmissionTextSearchFilter

    {

        if ($this->admissionTextSearchFilter === null) {

            $this->admissionTextSearchFilter = AdmissionTextSearchFilter::newInstance();

            $this->admissionTextSearchFilter = new AdmissionTextSearchFilter();

        }

        return $this->admissionTextSearchFilter;

    }

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

+3 −22
Original line number Diff line number Diff line
@@ -10,29 +10,10 @@ class EtatAdmissionSearchFilter extends SelectSearchFilter 
{

    const NAME = 'etat';



    /**

     * @inheritDoc

     */

    protected function __construct(string $label, string $name, array $attributes = [], $defaultValue = null)

    {

        parent::__construct($label, $name, $attributes, $defaultValue);

    }

    protected string $name = self::NAME;

    protected string $label = "État";



    /**

     * @return self

     */

    static public function newInstance(): self

    {

        return new self(

            "État",

            self::NAME

        );

    }



    /**

     * @param QueryBuilder $qb

     */

    public function applyToQueryBuilder(QueryBuilder $qb)

    public function applyToQueryBuilder(QueryBuilder $qb): void

    {

        $alias = 'admission'; // todo: rendre paramétrable

module/Admission/src/Admission/Search/Admission/EtatAdmissionSearchFilterAwareTrait.php

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ trait EtatAdmissionSearchFilterAwareTrait 
    public function getEtatAdmissionSearchFilter(): EtatAdmissionSearchFilter

    {

        if ($this->etatAdmissionSearchFilter === null) {

            $this->etatAdmissionSearchFilter = EtatAdmissionSearchFilter::newInstance();

            $this->etatAdmissionSearchFilter = new EtatAdmissionSearchFilter();

        }

        return $this->etatAdmissionSearchFilter;

    }