Merge branch 'master' of git.unicaen.fr:dsi/sygal (261e857d) · Commits · open-source / sygal

module/Application/src/Application/Controller/TheseController.php

+6 −0

Changes for module/Application/src/Application/Controller/TheseController.php: 6 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@ class TheseController extends AbstractController
		$needsRedirect = false;
		$queryParams = $this->params()->fromQuery();
		$etatThese = $this->params()->fromQuery($name = 'etatThese');
		$etablissement = $this->params()->fromQuery($name = 'etablissement');
		if ($etatThese === null) { // null <=> paramètre absent
		$queryParams = array_merge($queryParams, [$name => These::ETAT_EN_COURS]);
		$needsRedirect = true;
		@@ -135,6 +136,7 @@ class TheseController extends AbstractController

		private function createQueryBuilder() {
		$etatThese = $this->params()->fromQuery($name = 'etatThese');
		$etabCode = $this->params()->fromQuery($name = 'etablissement');
		$sort = $this->params()->fromQuery('sort');
		$text = $this->params()->fromQuery('text');
		$dir = $this->params()->fromQuery('direction', Sortable::ASC);
		@@ -149,6 +151,10 @@ class TheseController extends AbstractController
		if ($etatThese) {
		$qb->andWhere('t.etatThese = :etat')->setParameter('etat', $etatThese);
		}
		if ($etabCode) {
		$etablissement = $this->etablissementService->getRepository()->findOneBy(["code" =>$etabCode]);
		$qb->andWhere('t.etablissement = :etablissement')->setParameter('etablissement', $etablissement);
		}
		$sortProps = $sort ? explode('+', $sort) : [];
		foreach ($sortProps as $sortProp) {
		if ($sortProp === 't.titre') {

+12 −0

Changes for module/Application/view/application/these/partial/form-filtrage.phtml: 12 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -31,6 +31,18 @@ echo $this->filterPanel([
		],
		'filterUrl' => $urlFiltrer,
		],

		$this->translate("Établissement") => [
		'paramName' => 'etablissement',
		'paramConfig' => [
		['value' => '', 'label' => $this->translate("Tous") ],
		['value' => $v = 'INSA', 'label' => $this->translate("INSA Rouen") ],
		['value' => $v = 'UCN', 'label' => $this->translate("UniCaen") ],
		['value' => $v = 'ULHN', 'label' => $this->translate("Univ-LeHavre") ],
		['value' => $v = 'URN', 'label' => $this->translate("Univ-Rouen") ],
		],
		'filterUrl' => $urlFiltrer,
		],
		]) ?>