Commit 9b934c0f authored by Johnny Leveneur's avatar Johnny Leveneur
Browse files

gestion ateliers ajout du filtre sur les ateliers historisés

parent 17666096

module/Atelier/src/Controller/AtelierController.php

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ class AtelierController extends AbstractActionController 
        $params = $this->params()->fromQuery();

        $villeAsOptions = $this->getVilleService()->getVillesAsOptions();

        $siteAsOptions = $this->getSiteService()->getSitesAsOptions();

        $archivageAsOptions = ['0' => 'Non historisés', '1' => 'Historisés'];



        $ateliers = $this->getAtelierService()->getAteliersWithFiltre($params, 'libelle','asc', true);
@@ -57,6 +58,7 @@ class AtelierController extends AbstractActionController 
            'params' => $params,

            'villeAsOptions' => $villeAsOptions,

            'siteAsOptions' => $siteAsOptions,

            'archivageAsOptions' => $archivageAsOptions,

        ]);

    }

module/Atelier/src/Service/Atelier/AtelierService.php

+8 −0
Original line number Diff line number Diff line
@@ -80,6 +80,14 @@ class AtelierService 
            $qb = $qb->andWhere('ville.id = :ville')->setParameter('ville', $params['ville']);

        }



        if(array_key_exists('archivage',$params)){

            if($params['archivage'] == '0') {

                $qb = $qb->andWhere('atelier.histoDestruction IS NULL');

            }else{

                $qb = $qb->andWhere('atelier.histoDestruction IS NOT NULL');

            }

        }



        return $qb;

    }

module/Atelier/view/atelier/atelier/index.phtml

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * @var Atelier[] $ateliers

 * @var array $villeAsOptions

 * @var array $siteAsOptions

 * @var array $archivageAsOptions

 * @var array $params

 */
@@ -47,6 +48,7 @@ $this->headTitle("Ateliers"); 
    [

        'villeAsOptions' => $villeAsOptions,

        'siteAsOptions' => $siteAsOptions,

        'archivageAsOptions' => $archivageAsOptions,

        'params' => $params,

    ], [], true); ?>

<br/>

module/Atelier/view/atelier/atelier/partial/filtre.phtml

+16 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ use UnicaenApp\Form\Element\SearchAndSelect; 
/**

 * @var array $villeAsOptions

 * @var array $siteAsOptions

 * @var array $archivageAsOptions

 * @var array $params

 */
@@ -45,6 +46,19 @@ use UnicaenApp\Form\Element\SearchAndSelect; 
                        <?php endforeach; ?>

                    </select>

                </div>

                <div class="col-md-3">

                    <label for="archivage"> Archivage : </label>

                    <select id="archivage" name="archivage" class="selectpicker" data-live-search="true">

                        <option value="">Non historisés et historisés</option>

                        <?php foreach ($archivageAsOptions as $key => $site): ?>

                            <option value="<?php echo $key; ?>"

                                <?php if (isset($params['archivage']) && $params['archivage'] == $key) echo " selected "; ?>

                            >

                                <?php echo $site; ?>

                            </option>

                        <?php endforeach; ?>

                    </select>

                </div>

                <!-- BOUTON -->

                <div class="col-md-3">

                    <div class="pull-right">
@@ -77,11 +91,13 @@ use UnicaenApp\Form\Element\SearchAndSelect; 
    $('button#filter').click(function () {

        let villeValue = $('select#ville :selected').val();

        let siteValue = $('select#site :selected').val();

        let archivageValue = $('select#archivage :selected').val();



        let query = "";



        query += "ville=" + villeValue;

        query += "&site=" + siteValue;

        query += "&archivage=" + archivageValue;

        window.location.href = "?" + query;



    });