Commit 9837bd7c authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge remote-tracking branch 'origin/master'

parents cfd9e42f ddc4f1a3

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        "unicaen/open-document"            : "6.0.10",

        "unicaen/siham"                    : "6.2.0",

        "unicaen/mail"                     : "7.1.2",

        "unicaen/vue"                      : "6.3.1",

        "unicaen/vue"                      : "6.3.2",

        "unicaen/bddadmin"                 : "1.1.1",

        "unicaen/signature"                : "1.0.4",

        "connecteur-ose/actul"             : "dev-master",

module/Formule/src/Controller/TestController.php

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ class TestController extends AbstractController 
          lower(fti.libelle || ' ' || f.libelle || ' ' || a.libelle) like :search

        ";



        return Util::tableAjaxData($this->em(), $this->axios()->fromPOst(), $sql);

        return Util::tableAjaxData($this->em(), $this->axios()->fromPost(), $sql);

    }

module/Signature/view/signature/signature-flow/saisir-circuit.phtml

+2 −10
Original line number Diff line number Diff line
@@ -2,20 +2,12 @@ 
echo $this->messenger()->addCurrentMessagesFromFlashMessengerWithNamespace('error');



echo $this->form()->openTag($form);

echo '<div class="row">';

echo '<div class="col-md-12">';

echo '<h2 class="title">Ajouter/modifier un circuit de signature</h2>';

echo $this->formControlGroup($form->get('label'));

echo '</div>';

echo '<div class="col-md-12">';

echo $this->formControlGroup($form->get('description'));

echo '</div>';

echo '<div class="col-md-12">';

echo $this->formControlGroup($form->get('enabled'));

echo '</div>';

echo '<div class="col-md-12">';

echo $this->formSubmit($form->get('submit'));

echo '</div>';

echo $this->form()->closeTag($form);

echo '<div class="row">';





?>

module/Signature/view/signature/signature-flow/saisir-etape.phtml

+17 −41
Original line number Diff line number Diff line 
<?php

echo $this->messenger()->addCurrentMessagesFromFlashMessengerWithNamespace('error');





echo '<h2 class="title">Ajouter/modifier un étape de signature</h2>';

echo $this->form()->openTag($form);

echo '<div class="row">';

echo '<div class="col-md-12">';

echo $this->formControlGroup($form->get('label'));

echo '</div>';

echo '<div class="col-md-12">';

echo $this->formControlGroup($form->get('level'));

echo '</div>';

echo '<div class="col-md-12">';

echo $this->formControlGroup($form->get('recipientMethod'));

echo '</div>';

echo '<div class="col-md-12" id="roleEtablissement">';

echo $this->formControlGroup($form->get('roles'));

echo '</div>';

echo '<div class="col-md-12">';

echo $this->formControlGroup($form->get('order'));

echo '</div>';

echo '<div class="col-md-12">';

echo $this->formControlGroup($form->get('allRecipientsSign'));

echo '</div>';

echo '<div class="col-md-12">';

echo $this->formSubmit($form->get('submit'));

echo '</div>';

echo '</div>';

echo $this->form()->closeTag($form);



?>
@@ -33,32 +17,24 @@ echo $this->form()->closeTag($form); 


<script>



    function formElement()

    {

        return $('#<?= $form->getAttribute('id') ?>');

    }



    function toggleViewElements(init)

    toggleViewElements = function ()

    {

        var method = formElement().find('[name=recipientMethod]').val();

        document.querySelectorAll('[name="recipientMethod"]').forEach(element => {

            // Vérifier la valeur de chaque élément

            element.removeEventListener("change", toggleViewElements);

            element.addEventListener("change", toggleViewElements);

            let method = element.value

            let elementRole = element.parentElement.nextSibling;



            if (method == 'by_etablissement' || method == 'by_etablissement_and_intervenant') {

            console.log('show');

            $('#roleEtablissement').show();

                elementRole.style.display = "block";



            } else {

            console.log('hide')

            $('#roleEtablissement').hide();

        }

        console.log(init);

        if (init !== true) {

            console.log(init);

            $('#roleEablissement').hide();

                elementRole.style.display = "none";

            }

        });

    }

    toggleViewElements();



    $(function () {

        formElement().find('[name=recipientMethod]').on('change', toggleViewElements);

        toggleViewElements(true);

    });



</script>
 
 No newline at end of file

public/ext/jquery-ui-1.14.1/AUTHORS.txt

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file