diff --git a/src/UnicaenAutoform/Service/Formulaire/FormulaireReponseService.php b/src/UnicaenAutoform/Service/Formulaire/FormulaireReponseService.php index 4141d278d1accc1b0350d7a84abf7e3450a45970..2848a5eb681ee546170029630c140892d0c20509 100644 --- a/src/UnicaenAutoform/Service/Formulaire/FormulaireReponseService.php +++ b/src/UnicaenAutoform/Service/Formulaire/FormulaireReponseService.php @@ -186,7 +186,7 @@ class FormulaireReponseService if (isset($data[$champ->getId()])) { $value = $data[$champ->getId()]; if ($value != null && str_ends_with($data[$champ->getId()], '*') && isset($data['text_complementaire_'.$champ->getId()])) { - return $data[$champ->getId()] . ":::" . $data['text_complementaire'.$champ->getId()]; + return $data[$champ->getId()] . ":::" . $data['text_complementaire_'.$champ->getId()]; } else { return ($value !== 'null') ? $value : null; } diff --git a/src/UnicaenAutoform/View/Helper/ChampAsResultHelper.php b/src/UnicaenAutoform/View/Helper/ChampAsResultHelper.php index cecf11035067cdd4cbe2ecf741d6da754f709a85..24966acf947db1ee4244ab5ead3d859a8defdb9e 100644 --- a/src/UnicaenAutoform/View/Helper/ChampAsResultHelper.php +++ b/src/UnicaenAutoform/View/Helper/ChampAsResultHelper.php @@ -51,8 +51,9 @@ class ChampAsResultHelper extends AbstractHelper $texte .= $view->partial('result/select', ['champ' => $champ, 'data' => $data]); break; case Champ::TYPE_SELECT_TEXT : - $texte .= $view->partial('result/select_text', ['champ' => $champ, 'data' => $data]); - break; + $reponse = explode(":::", (string)$data); + $texte .= $view->partial('result/select_text', ['champ' => $champ, 'data' => $reponse]); + break; case Champ::TYPE_ANNEE : $texte .= $view->partial('result/annee', ['champ' => $champ, 'data' => $data]); break; diff --git a/src/UnicaenAutoform/View/Helper/partial/input/select_text.phtml b/src/UnicaenAutoform/View/Helper/partial/input/select_text.phtml index d19b66572bb27cde428c82b88055d173caf30c4c..170f88226e997e7e1ed3cde5b185b799d7c492f3 100644 --- a/src/UnicaenAutoform/View/Helper/partial/input/select_text.phtml +++ b/src/UnicaenAutoform/View/Helper/partial/input/select_text.phtml @@ -15,7 +15,7 @@ $reponse = explode(':::', $reponse); <label for="<?php echo $champ->getId() ?>" class="control-label"> <strong><?php echo $champ->getLibelle(); ?> :</strong> </label> - <select class="form-control col-md-12" name="<?php echo $champ->getId(); ?>" id="<?php echo $champ->getId(); ?>" + <select class="form-control col-md-12 select_text" name="<?php echo $champ->getId(); ?>" id="<?php echo $champ->getId(); ?>" onchange="showComplement(this.value, this.name)"> <option value="null"></option> <?php foreach ($options as $option) : ?> @@ -49,7 +49,6 @@ $reponse = explode(':::', $reponse); function showComplement(option, name) { - console.log(option.substring(option.length - 1)); if (option !== "") { if (option.substring(option.length - 1) === '*') { document.getElementById("text_complementaire_" + name).style.display = ''; @@ -60,5 +59,18 @@ $reponse = explode(':::', $reponse); document.getElementById("text_complementaire_" + name).style.display = 'none'; } } + + function instancieSelect(element) + { + showComplement(element.value,element.id) + } + + $( document ).ready(function() { + selects = document.getElementsByClassName("select_text"); + console.log(selects); + for (var i = 0; i < selects.length; i++) { + instancieSelect(selects[i]); + } + }); </script> diff --git a/src/UnicaenAutoform/View/Helper/partial/result/select_text.phtml b/src/UnicaenAutoform/View/Helper/partial/result/select_text.phtml index b4eddc71b10a16932fc5fd8dd38e41238c800dd3..2a1329fd5d80983a355296f75bf515c8361810d5 100644 --- a/src/UnicaenAutoform/View/Helper/partial/result/select_text.phtml +++ b/src/UnicaenAutoform/View/Helper/partial/result/select_text.phtml @@ -1,13 +1,17 @@ <?php /** * @var Champ $champ - * @var string $data + * @var array $data */ use UnicaenAutoform\Entity\Db\Champ; ?> -<?php if ($data !== 'null') : ?> -<?php echo $champ->getLibelle(); ?> : <?php echo $data; ?> + <strong><?php echo $champ->getLibelle(); ?> :</strong><br> +<?php if (isset($data[0])) : ?> + <?php echo "Réponse sélectionner : ". $data[0]; ?> + <?php if (isset($data[1])) : ?> + <br><?php echo 'complément de réponse : '.$data[1]; ?> + <?php endif; ?> <?php endif; ?> \ No newline at end of file