ajout des filtres ville et site dans les Ateliers et sessions (67825edc) · Commits · open-source / inscription_suac

module/Atelier/src/Controller/AtelierController.php

+12 −1

Original line number	Diff line number	Diff line
		@@ -13,6 +13,8 @@ use Laminas\Http\Request;
		use Laminas\Http\Response;
		use Laminas\Mvc\Controller\AbstractActionController;
		use Laminas\View\Model\ViewModel;
		use Site\Service\Site\SiteServiceAwareTrait;
		use Site\Service\Ville\VilleServiceAwareTrait;

		class AtelierController extends AbstractActionController
		{
		@@ -21,13 +23,22 @@ class AtelierController extends AbstractActionController
		use NatureServiceAwareTrait;
		use AtelierFormAwareTrait;
		use UploadFormAwareTrait;
		use VilleServiceAwareTrait;
		use SiteServiceAwareTrait;

		public function indexAction() : ViewModel
		{
		$ateliers = $this->getAtelierService()->getAteliers('libelle','asc', true);
		$params = $this->params()->fromQuery();
		$villeAsOptions = $this->getVilleService()->getVillesAsOptions();
		$siteAsOptions = $this->getSiteService()->getSitesAsOptions();

		$ateliers = $this->getAtelierService()->getAteliersWithFiltre($params, 'libelle','asc', true);

		return new ViewModel([
		'ateliers' => $ateliers,
		'params' => $params,
		'villeAsOptions' => $villeAsOptions,
		'siteAsOptions' => $siteAsOptions,
		]);
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,8 @@ use Fichier\Service\Nature\NatureService;
		use Psr\Container\ContainerExceptionInterface;
		use Psr\Container\ContainerInterface;
		use Psr\Container\NotFoundExceptionInterface;
		use Site\Service\Site\SiteService;
		use Site\Service\Ville\VilleService;

		class AtelierControllerFactory
		{
		@@ -23,12 +25,16 @@ class AtelierControllerFactory
		* @var AtelierService $atelierService
		* @var FichierService $fichierService
		* @var NatureService $natureService
		* @var SiteService $siteService
		* @var VilleService $villeService
		* @var AtelierForm $atelierForm
		* @var UploadForm $uploadForm
		*/
		$atelierService = $container->get(AtelierService::class);
		$fichierService = $container->get(FichierService::class);
		$natureService = $container->get(NatureService::class);
		$villeService = $container->get(VilleService::class);
		$siteService = $container->get(SiteService::class);
		$atelierForm = $container->get('FormElementManager')->get(AtelierForm::class);
		$uploadForm = $container->get('FormElementManager')->get(UploadForm::class);

		@@ -38,6 +44,9 @@ class AtelierControllerFactory
		$controller->setNatureService($natureService);
		$controller->setAtelierForm($atelierForm);
		$controller->setUploadForm($uploadForm);
		$controller->setVilleService($villeService);
		$controller->setSiteService($siteService);

		return $controller;
		}
		}
		No newline at end of file

+8 −1

Original line number	Diff line number	Diff line
		@@ -202,7 +202,11 @@ class ProgrammeController extends AbstractActionController

		public function courantAction(): ViewModel
		{
		$programmes = $this->getProgrammeService()->getProgrammesActifs();
		$params = $this->params()->fromQuery();
		$villeAsOptions = $this->getVilleService()->getVillesAsOptions();
		$siteAsOptions = $this->getSiteService()->getSitesAsOptions();

		$programmes = $this->getProgrammeService()->getProgrammesActifsWithFiltre($params);

		$ateliers = [];
		foreach ($programmes as $programme) {
		@@ -214,6 +218,9 @@ class ProgrammeController extends AbstractActionController
		return new ViewModel([
		'programmes' => $programmes,
		'ateliers' => $ateliers,
		'params' => $params,
		'villeAsOptions' => $villeAsOptions,
		'siteAsOptions' => $siteAsOptions,
		]);
		}
		}
		No newline at end of file

+2 −2

Original line number	Diff line number	Diff line
		@@ -30,10 +30,10 @@ class ProgrammeControllerFactory {
		*/
		$atelierService = $container->get(AtelierService::class);
		$programmeService = $container->get(ProgrammeService::class);
		$programmeForm = $container->get('FormElementManager')->get(ProgrammeForm::class);
		$selectionnerAtelierForm = $container->get('FormElementManager')->get(SelectionnerAtelierForm::class);
		$villeService = $container->get(VilleService::class);
		$siteService = $container->get(SiteService::class);
		$programmeForm = $container->get('FormElementManager')->get(ProgrammeForm::class);
		$selectionnerAtelierForm = $container->get('FormElementManager')->get(SelectionnerAtelierForm::class);

		$controller = new ProgrammeController();
		$controller->setAtelierService($atelierService);

+8 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,8 @@ use Laminas\View\Model\JsonModel;
		use Laminas\View\Model\ViewModel;
		use Laminas\View\Renderer\PhpRenderer;
		use Mpdf\MpdfException;
		use Site\Service\Site\SiteServiceAwareTrait;
		use Site\Service\Ville\VilleServiceAwareTrait;
		use UnicaenEtat\Service\EtatInstance\EtatInstanceServiceAwareTrait;
		use UnicaenEtat\Service\EtatType\EtatTypeServiceAwareTrait;
		use UnicaenMail\Service\Mail\MailServiceAwareTrait;
		@@ -62,6 +64,8 @@ class SessionController extends AbstractActionController
		use JustificationFormAwareTrait;
		use SelectionnerIntervenantFormAwareTrait;
		use SessionFormAwareTrait;
		use VilleServiceAwareTrait;
		use SiteServiceAwareTrait;

		private ?PhpRenderer $renderer = null;
		public function setRenderer(PhpRenderer $renderer): void
		@@ -81,6 +85,8 @@ class SessionController extends AbstractActionController
		{
		$groupes = $this->getGroupeService()->getGroupes();
		$types = $this->getEtatTypeService()->getEtatsTypesByCategorieCode(SessionEtats::TYPE);
		$villeAsOptions = $this->getVilleService()->getVillesAsOptions();
		$siteAsOptions = $this->getSiteService()->getSitesAsOptions();
		$params = $this->params()->fromQuery();

		$sessions = $this->getSessionService()->getSessionsWithFiltre($params);
		@@ -90,6 +96,8 @@ class SessionController extends AbstractActionController
		'params' => $params,
		'groupes' => $groupes,
		'types' => $types,
		'villeAsOptions' => $villeAsOptions,
		'siteAsOptions' => $siteAsOptions,
		]);
		}