Commit 87fc49fe authored by Thibaut Vallee's avatar Thibaut Vallee
Browse files

correctif pour le filtre sur les instant d'état

parent 51103523

src/UnicaenEtat/Controller/EtatCategorieControllerFactory.php

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ class EtatCategorieControllerFactory { 
        /**

         * @var EtatCategorieService $etatTypeService

         */

        $etatTypeService = $container->get(EtatCategorieService::class);

        $etatCategorieService = $container->get(EtatCategorieService::class);



        /**

         * @var EtatCategorieForm $etatTypeForm
@@ -27,7 +27,7 @@ class EtatCategorieControllerFactory { 
        $etatTypeForm = $container->get('FormElementManager')->get(EtatCategorieForm::class);



        $controller = new EtatCategorieController();

        $controller->setEtatCategorieService($etatTypeService);

        $controller->setEtatCategorieService($etatCategorieService);

        $controller->setEtatCategorieForm($etatTypeForm);

        return $controller;

    }

src/UnicaenEtat/Controller/EtatInstanceController.php

+4 −0
Original line number Diff line number Diff line
@@ -6,23 +6,27 @@ use Laminas\Http\Request; 
use Laminas\Mvc\Controller\AbstractActionController;

use Laminas\View\Model\JsonModel;

use Laminas\View\Model\ViewModel;

use UnicaenEtat\Service\EtatCategorie\EtatCategorieServiceAwareTrait;

use UnicaenEtat\Service\EtatInstance\EtatInstanceServiceAwareTrait;

use UnicaenEtat\Service\EtatType\EtatTypeServiceAwareTrait;

use UnicaenUtilisateur\Entity\Db\User;



class EtatInstanceController extends AbstractActionController {

    use EtatInstanceServiceAwareTrait;

    use EtatCategorieServiceAwareTrait;

    use EtatTypeServiceAwareTrait;



    public function indexAction() : ViewModel

    {

        $params = $this->params()->fromQuery();

        $instances = $this->getEtatInstanceService()->getEtatsInstancesWithFiltre($params);

        $categories = $this->getEtatCategorieService()->getEtatsCategories();

        $types = $this->getEtatTypeService()->getEtatsTypes();



        return new ViewModel([

            'params' => $params,

            'instances' => $instances,

            'categories' => $categories,

            'types' => $types,

        ]);

    }

src/UnicaenEtat/Controller/EtatInstanceControllerFactory.php

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
namespace UnicaenEtat\Controller;



use Interop\Container\ContainerInterface;

use UnicaenEtat\Service\EtatCategorie\EtatCategorieService;

use UnicaenEtat\Service\EtatInstance\EtatInstanceService;

use UnicaenEtat\Service\EtatType\EtatTypeService;
@@ -18,13 +19,16 @@ class EtatInstanceControllerFactory { 
    {

        /**

         * @var EtatInstanceService $instanceService

         * @var EtatCategorieService $etatTypeService

         * @var EtatTypeService $typeService

         */

        $instanceService = $container->get(EtatInstanceService::class);

        $etatCategorieService = $container->get(EtatCategorieService::class);

        $typeService = $container->get(EtatTypeService::class);



        $controller = new EtatInstanceController();

        $controller->setEtatInstanceService($instanceService);

        $controller->setEtatCategorieService($etatCategorieService);

        $controller->setEtatTypeService($typeService);

        return $controller;

    }

view/unicaen-etat/etat-instance/index.phtml

+3 −1
Original line number Diff line number Diff line 
<?php



/**

 * @see \UnicaenEtat\Controller\EtatCategorieController::indexAction()

 * @see \UnicaenEtat\Controller\EtatInstanceController::indexAction()

 * @var EtatInstance[] $instances

 * @var \UnicaenEtat\Entity\Db\EtatCategorie[] $categories

 * @var \UnicaenEtat\Entity\Db\EtatType[] $types

 * @var array $params

 */