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

Merge branch 'menuRattatchement'

parents 1aa04a0f 73236801
Loading
Loading
Loading
Loading
Loading
+2 −0
Changes for module/Application/src/Application/Controller/UniteRechercheController.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ class UniteRechercheController extends AbstractController
        // si POST alors on revient du formulaire
        if ($data = $this->params()->fromPost()) {

            var_dump($data);

            // récupération des données et des fichiers
            $request = $this->getRequest();
            $data = $request->getPost()->toArray();
+17 −0
Changes for module/Application/src/Application/View/Helper/SelectHelper.php: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -94,4 +94,21 @@ class SelectHelper extends AbstractHelper {
        $texte .= '</select>';
        return $texte;
    }

    public function asDataArray() {
        $data = [];

        $data[] = [
            'value' => '-1',
            'label' => $this->getText(),
        ];

        foreach ($this->listing as $element) {
            $data[] = [
                'value' => $element->getId(),
                'label' => $element->getLibelle(),
            ];
        }
        return $data;
    }
}
 No newline at end of file
+66 −5
Changes for module/Application/view/application/unite-recherche/modifier.phtml: 66 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ use Application\Entity\Db\EtablissementRattachement;
use Application\Entity\Db\UniteRecherche;
use Application\Form\UniteRechercheForm;
use Application\View\Helper\SelectHelper;
use Application\View\Helper\SelectsFilterPanel\SelectsFilterPanelHelper;
use Application\View\Renderer\PhpRenderer;

/**
@@ -45,8 +46,6 @@ $form->get('sourceCode')->setAttribute('readonly', !$editable);

<?php echo $this->messenger()->addMessagesFromFlashMessengerWithNoNamespace(); ?>



<!-- BLOC DES INFORMATIONS GENERALES ---------------------------------------------------------------------------------->

<h2> Informations générales </h2>
@@ -147,9 +146,33 @@ $form->get('sourceCode')->setAttribute('readonly', !$editable);
    <div class="col-md-6">
        <?php
        $selectDomaine = new SelectHelper("etablissements", $etablissements, "Choisissez un établissement de rattachement ...");
        echo $selectDomaine;
        ?>
        <br/> <br/>

        <select title=""
                class="filter selectpicker show-menu-arrow"
                name="etablissements"
                id="etablissements"
                data-live-search="true"
                data-width="450px">

            <?php foreach ($selectDomaine->asDataArray() as $data): ?>

                <?php
                $value = $data['value'];
                $label = $data['label'];
                $subtext = isset($data['subtext']) ? $data['subtext'] : '';
                $isActive = SelectsFilterPanelHelper::isSelectOptionActive($paramName, $value, $queryParams);
                ?>
                <option value="<?php echo $value ?>" <?php echo $isActive ? 'selected' : '' ?> data-subtext="<?php echo $subtext ?>">
                    <?php echo $label ?>
                </option>

            <?php endforeach ?>
        </select>

        <br/>
        <br/>

        <a
                class="btn btn-success"
                id="ajout-rattachement"
@@ -201,8 +224,31 @@ $form->get('sourceCode')->setAttribute('readonly', !$editable);
    <div class="col-md-6">
        <?php
        $selectDomaine = new SelectHelper("domaines", $domainesScientifiques, 'Choisissez un domaine scientifique ...');
        echo $selectDomaine;
        ?>

        <select title=""
                class="filter selectpicker show-menu-arrow"
                name="domaines"
                id="domaines"
                data-live-search="true"
                data-width="450px">

            <?php foreach ($selectDomaine->asDataArray() as $data): ?>

                <?php
                $value = $data['value'];
                $label = $data['label'];
                $subtext = isset($data['subtext']) ? $data['subtext'] : '';
                $isActive = SelectsFilterPanelHelper::isSelectOptionActive($paramName, $value, $queryParams);
                ?>
                <option value="<?php echo $value ?>" <?php echo $isActive ? 'selected' : '' ?> data-subtext="<?php echo $subtext ?>">
                    <?php echo $label ?>
                </option>

            <?php endforeach ?>
        </select>


        <br/>
        <br/>
        <a class="btn btn-success"
@@ -244,3 +290,18 @@ $form->get('sourceCode')->setAttribute('readonly', !$editable);
        });
    });
</script>

<?php
$this->headLink()->appendStylesheet("https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.1/css/bootstrap-select.min.css");
$this->inlineScript()->appendFile("https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.1/js/bootstrap-select.min.js");
$this->inlineScript()->appendFile("https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.1/js/i18n/defaults-fr_FR.min.js");
?>

<script>
    $(function() {
        $("#domaines").refresh();
    });
    $(function() {
        $("#etablissements").refresh();
    });
</script>
 No newline at end of file