Commit adc68723 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

BS 5 + filtre

parent 94083a8b
Loading
Loading
Loading
Loading
Loading
+18 −1
Changes for config/merged/etat-instance.config.php: 18 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -16,6 +16,13 @@ return [
    'bjyauthorize' => [
        'guards' => [
            PrivilegeController::class => [
                [
                    'controller' => EtatInstanceController::class,
                    'action' => [
                        'rechercher-utilisateur',
                    ],
                    'roles' => [],
                ],
                [
                    'controller' => EtatInstanceController::class,
                    'action' => [
@@ -53,8 +60,18 @@ return [
                        ],
                        'may_terminate' => true,
                        'child_routes' => [
                            'supprimer' => [
                            'rechercher-utilisateur' => [
                                'type' => Literal::class,
                                'options' => [
                                    'route' => '/rechercher-utilisateur',
                                    'defaults' => [
                                        'controller' => EtatInstanceController::class,
                                        'action' => 'rechercher-utilisateur',
                                    ],
                                ],
                            ],
                            'supprimer' => [
                                'type' => Segment::class,
                                'options' => [
                                    'route' => '/supprimer/:instance',
                                    'defaults' => [
+27 −1
Changes for src/UnicaenEtat/Controller/EtatInstanceController.php: 27 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -4,18 +4,26 @@ namespace UnicaenEtat\Controller;

use Laminas\Http\Request;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\View\Model\JsonModel;
use Laminas\View\Model\ViewModel;
use UnicaenEtat\Service\EtatInstance\EtatInstanceServiceAwareTrait;
use UnicaenEtat\Service\EtatType\EtatTypeServiceAwareTrait;
use UnicaenUtilisateur\Entity\Db\User;

class EtatInstanceController extends AbstractActionController {
    use EtatInstanceServiceAwareTrait;
    use EtatTypeServiceAwareTrait;

    public function indexAction() : ViewModel
    {
        $instances = $this->getEtatInstanceService()->getEtatsInstances();
        $params = $this->params()->fromQuery();
        $instances = $this->getEtatInstanceService()->getEtatsInstancesWithFiltre($params);
        $types = $this->getEtatTypeService()->getEtatsTypes();

        return new ViewModel([
            'params' => $params,
            'instances' => $instances,
            'types' => $types,
        ]);
    }

@@ -42,4 +50,22 @@ class EtatInstanceController extends AbstractActionController {
        }
        return $vm;
    }
    public function rechercherUtilisateurAction()
    {
        if (($term = $this->params()->fromQuery('term'))) {
            /** @var User $utilisateurs */
            $utilisateurs = $this->getEtatInstanceService()->findUtilisateurByTerm($term);
            foreach ($utilisateurs as $utilisateur) {
                $result[] = array(
                    'id' => $utilisateur->getHistoCreateur()->getId(),
                    'label' => $utilisateur->getHistoCreateur()->getDisplayName(),
                );
            }
            usort($result, function ($a, $b) {
                return strcmp($a['label'], $b['label']);
            });
            return new JsonModel($result);
        }
        exit;
    }
}
 No newline at end of file
+4 −0
Changes for src/UnicaenEtat/Controller/EtatInstanceControllerFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace UnicaenEtat\Controller;

use Interop\Container\ContainerInterface;
use UnicaenEtat\Service\EtatInstance\EtatInstanceService;
use UnicaenEtat\Service\EtatType\EtatTypeService;

class EtatInstanceControllerFactory {

@@ -17,11 +18,14 @@ class EtatInstanceControllerFactory {
    {
        /**
         * @var EtatInstanceService $instanceService
         * @var EtatTypeService $typeService
         */
        $instanceService = $container->get(EtatInstanceService::class);
        $typeService = $container->get(EtatTypeService::class);

        $controller = new EtatInstanceController();
        $controller->setEtatInstanceService($instanceService);
        $controller->setEtatTypeService($typeService);
        return $controller;
    }
}
 No newline at end of file
+40 −0
Changes for src/UnicaenEtat/Service/EtatInstance/EtatInstanceService.php: 40 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ use UnicaenApp\Exception\RuntimeException;
use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenEtat\Entity\Db\EtatInstance;
use UnicaenEtat\Service\EtatType\EtatTypeServiceAwareTrait;
use UnicaenUtilisateur\Entity\Db\User;

class EtatInstanceService {
    use EntityManagerAwareTrait;
@@ -79,6 +80,8 @@ class EtatInstanceService {
    public function createQueryBuilder() : QueryBuilder
    {
        $qb = $this->getEntityManager()->getRepository(EtatInstance::class)->createQueryBuilder('einstance')
            ->addSelect('createur')->join('einstance.histoCreateur', 'createur')
            ->addSelect('modificateur')->join('einstance.histoModificateur', 'modificateur')
            ->join('einstance.type', 'etype')->addSelect('etype')
            ->leftJoin('etype.categorie', 'ecategorie')->addSelect('ecategorie')
        ;
@@ -128,6 +131,43 @@ class EtatInstanceService {
        return $result;
    }

    /**
     * @param ?string $term
     * @return User[]
     */
    public function findUtilisateurByTerm(?string $term) : array
    {
        $qb = $this->createQueryBuilder()
            ->andWhere("LOWER(createur.displayName) like :search")
            ->setParameter('search', '%'.strtolower($term).'%');
        $result = $qb->getQuery()->getResult();

        $validateurs = [];
        /** @var  $item */
        foreach ($result as $item) {
            $validateurs[$item->getHistoCreateur()->getId()] = $item;
        }
        return $validateurs;
    }

    /**
     * @param array $params
     * @return EtatInstance[]
     */
    public function getEtatsInstancesWithFiltre(array $params) : array
    {
        $qb = $this->createQueryBuilder();
        if (isset($params['type'])  AND $params['type'] !== '') {
            $qb = $qb->andWhere('etype.code = :code')->setParameter('code', $params['type']);
        }
        if (isset($params['utilisateur']) AND isset($params['utilisateur']['id']) AND $params['utilisateur']['id'] !== '') {
            $id = ((int) $params['utilisateur']['id']);
            $qb = $qb->andWhere('createur.id = :id')->setParameter('id', $id);
        }

        $result = $qb->getQuery()->getResult();
        return $result;
    }
    /** FACADE ********************************************************************************************************/

    public function createWithCode(string $code) : EtatInstance
+4 −5
Changes for view/unicaen-etat/etat-categorie/index.phtml: 4 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ $this->headTitle("Catégories d'état");
            Ajouter une catégorie d'état
        </a>
    </div>
    <div class="pull-right">

    <div class="col-md-4">
        <?php /** @see \UnicaenEtat\Controller\EtatTypeController::indexAction() */ ?>
        <a href="<?php echo $this->url('unicaen-etat/etat-type', [], [], true); ?>"
           class="btn btn-primary action">
@@ -32,10 +31,10 @@ $this->headTitle("Catégories d'état");
            Accéder aux types
        </a>
        <br/>
        <a href="<?php echo $this->url('unicaen-etat/etat-type/ajouter', [], [], true); ?>"
           class="btn btn-primary action disabled">
        <a href="<?php echo $this->url('unicaen-etat/etat-instance', [], [], true); ?>"
           class="btn btn-primary action">
            <span class="icon acceder"></span>
            Accéder aux instances TODO
            Accéder aux instances
        </a>
    </div>
</div>
Loading