From 2d4e87b1f50571af3ef6904283c3d9fa5426ae0d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr> Date: Mon, 17 Oct 2022 16:47:47 +0200 Subject: [PATCH] Text pour les selectEntity + tinymce ... --- src/UnicaenAutoform/Entity/Db/Categorie.php | 4 ++-- src/UnicaenAutoform/Entity/Db/Champ.php | 4 ++-- src/UnicaenAutoform/Entity/Db/Formulaire.php | 4 ++-- src/UnicaenAutoform/Entity/Db/FormulaireInstance.php | 4 ++-- src/UnicaenAutoform/Entity/Db/FormulaireReponse.php | 5 +++-- src/UnicaenAutoform/Entity/Db/Validation.php | 5 +++-- .../View/Helper/partial/input/entity-multiple.phtml | 5 +++++ .../View/Helper/partial/input/entity.phtml | 5 +++++ .../View/Helper/partial/input/select.phtml | 8 ++++++-- .../View/Helper/partial/input/textarea.phtml | 2 +- 10 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/UnicaenAutoform/Entity/Db/Categorie.php b/src/UnicaenAutoform/Entity/Db/Categorie.php index a872ed0..1fb638e 100644 --- a/src/UnicaenAutoform/Entity/Db/Categorie.php +++ b/src/UnicaenAutoform/Entity/Db/Categorie.php @@ -3,9 +3,9 @@ namespace UnicaenAutoform\Entity\Db; use Doctrine\Common\Collections\ArrayCollection; -use UnicaenApp\Entity\HistoriqueAwareInterface; -use UnicaenApp\Entity\HistoriqueAwareTrait; use UnicaenAutoform\Entity\HasMotsClefsAwareTrait; +use UnicaenUtilisateur\Entity\Db\HistoriqueAwareInterface; +use UnicaenUtilisateur\Entity\Db\HistoriqueAwareTrait; class Categorie implements HistoriqueAwareInterface { use HistoriqueAwareTrait; diff --git a/src/UnicaenAutoform/Entity/Db/Champ.php b/src/UnicaenAutoform/Entity/Db/Champ.php index fe921ea..9399520 100644 --- a/src/UnicaenAutoform/Entity/Db/Champ.php +++ b/src/UnicaenAutoform/Entity/Db/Champ.php @@ -3,8 +3,8 @@ namespace UnicaenAutoform\Entity\Db; use UnicaenAutoform\Entity\HasMotsClefsAwareTrait; -use UnicaenApp\Entity\HistoriqueAwareInterface; -use UnicaenApp\Entity\HistoriqueAwareTrait; +use UnicaenUtilisateur\Entity\Db\HistoriqueAwareInterface; +use UnicaenUtilisateur\Entity\Db\HistoriqueAwareTrait; class Champ implements HistoriqueAwareInterface { use HistoriqueAwareTrait; diff --git a/src/UnicaenAutoform/Entity/Db/Formulaire.php b/src/UnicaenAutoform/Entity/Db/Formulaire.php index f5c04a8..5f661a5 100644 --- a/src/UnicaenAutoform/Entity/Db/Formulaire.php +++ b/src/UnicaenAutoform/Entity/Db/Formulaire.php @@ -3,8 +3,8 @@ namespace UnicaenAutoform\Entity\Db; use Doctrine\Common\Collections\ArrayCollection; -use UnicaenApp\Entity\HistoriqueAwareInterface; -use UnicaenApp\Entity\HistoriqueAwareTrait; +use UnicaenUtilisateur\Entity\Db\HistoriqueAwareInterface; +use UnicaenUtilisateur\Entity\Db\HistoriqueAwareTrait; class Formulaire implements HistoriqueAwareInterface { use HistoriqueAwareTrait; diff --git a/src/UnicaenAutoform/Entity/Db/FormulaireInstance.php b/src/UnicaenAutoform/Entity/Db/FormulaireInstance.php index 8ad53cd..687491f 100644 --- a/src/UnicaenAutoform/Entity/Db/FormulaireInstance.php +++ b/src/UnicaenAutoform/Entity/Db/FormulaireInstance.php @@ -3,8 +3,8 @@ namespace UnicaenAutoform\Entity\Db; use Doctrine\Common\Collections\ArrayCollection; -use UnicaenApp\Entity\HistoriqueAwareInterface; -use UnicaenApp\Entity\HistoriqueAwareTrait; +use UnicaenUtilisateur\Entity\Db\HistoriqueAwareInterface; +use UnicaenUtilisateur\Entity\Db\HistoriqueAwareTrait; class FormulaireInstance implements HistoriqueAwareInterface { use HistoriqueAwareTrait; diff --git a/src/UnicaenAutoform/Entity/Db/FormulaireReponse.php b/src/UnicaenAutoform/Entity/Db/FormulaireReponse.php index 3a86604..531e675 100644 --- a/src/UnicaenAutoform/Entity/Db/FormulaireReponse.php +++ b/src/UnicaenAutoform/Entity/Db/FormulaireReponse.php @@ -2,8 +2,9 @@ namespace UnicaenAutoform\Entity\Db; -use UnicaenApp\Entity\HistoriqueAwareInterface; -use UnicaenApp\Entity\HistoriqueAwareTrait; + +use UnicaenUtilisateur\Entity\Db\HistoriqueAwareInterface; +use UnicaenUtilisateur\Entity\Db\HistoriqueAwareTrait; class FormulaireReponse implements HistoriqueAwareInterface { use HistoriqueAwareTrait; diff --git a/src/UnicaenAutoform/Entity/Db/Validation.php b/src/UnicaenAutoform/Entity/Db/Validation.php index dc7cfbf..c99905c 100644 --- a/src/UnicaenAutoform/Entity/Db/Validation.php +++ b/src/UnicaenAutoform/Entity/Db/Validation.php @@ -3,9 +3,10 @@ namespace UnicaenAutoform\Entity\Db; use Doctrine\Common\Collections\ArrayCollection; -use UnicaenApp\Entity\HistoriqueAwareTrait; +use UnicaenUtilisateur\Entity\Db\HistoriqueAwareInterface; +use UnicaenUtilisateur\Entity\Db\HistoriqueAwareTrait; -class Validation { +class Validation implements HistoriqueAwareInterface { use HistoriqueAwareTrait; const TYPE_SUMPPS = "SUMPPS"; diff --git a/src/UnicaenAutoform/View/Helper/partial/input/entity-multiple.phtml b/src/UnicaenAutoform/View/Helper/partial/input/entity-multiple.phtml index 95aaa5e..a7e9cb8 100644 --- a/src/UnicaenAutoform/View/Helper/partial/input/entity-multiple.phtml +++ b/src/UnicaenAutoform/View/Helper/partial/input/entity-multiple.phtml @@ -14,6 +14,11 @@ $splits = explode(";", $reponse); <label for="textarea_<?php echo $champ->getId()?>" class="control-label"> <strong><?php echo $champ->getLibelle()?> :</strong> </label> + <?php if ($champ->getTexte() !== null AND trim($champ->getTexte()) !== '') : ?> + <p> + <?php echo $champ->getTexte(); ?> + </p> + <?php endif; ?> <div class="col-md-offset-2 col-md-10"> <?php foreach ($options as $id => $option) : ?> <input type="checkbox" name="<?php echo $champ->getId()?>_<?php echo $id; ?>" diff --git a/src/UnicaenAutoform/View/Helper/partial/input/entity.phtml b/src/UnicaenAutoform/View/Helper/partial/input/entity.phtml index bd54aa5..b96ac42 100644 --- a/src/UnicaenAutoform/View/Helper/partial/input/entity.phtml +++ b/src/UnicaenAutoform/View/Helper/partial/input/entity.phtml @@ -13,6 +13,11 @@ use UnicaenAutoform\Entity\Db\Champ; <label for="textarea_<?php echo $champ->getId()?>" class="col-sm-2 control-label"> <?php echo $champ->getLibelle(); ?> : </label> + <?php if ($champ->getTexte() !== null AND trim($champ->getTexte()) !== '') : ?> + <p> + <?php echo $champ->getTexte(); ?> + </p> + <?php endif; ?> <div class="col-sm-10"> <select class="selectpicker form-control" name="<?php echo $champ->getId(); ?>" data-live-search="true"> <option value="null"></option> diff --git a/src/UnicaenAutoform/View/Helper/partial/input/select.phtml b/src/UnicaenAutoform/View/Helper/partial/input/select.phtml index ece46fe..3e8f3dc 100644 --- a/src/UnicaenAutoform/View/Helper/partial/input/select.phtml +++ b/src/UnicaenAutoform/View/Helper/partial/input/select.phtml @@ -10,11 +10,11 @@ $options = explode(';', $champ->getOptions()); ?> <div class="row"> <div class="form-group" style="display: block;"> - <label for="textarea_<?php echo $champ->getId()?>" class="col-sm-3 control-label"> + <label for="<?php echo $champ->getId()?>" class="col-sm-3 control-label"> <?php echo $champ->getLibelle(); ?> : </label> <div class="col-sm-9"> - <select class="form-control" name="<?php echo $champ->getId(); ?>"> + <select class="form-control" name="<?php echo $champ->getId(); ?>" id="<?php echo $champ->getId(); ?>"> <option value="null"></option> <?php foreach ($options as $option) : ?> <option value="<?php echo $option; ?>" @@ -31,3 +31,7 @@ $options = explode(';', $champ->getOptions()); </div> </div> +<script> + //$('#<?php //echo $champ->getId(); ?>').selectpicker(); +</script> + diff --git a/src/UnicaenAutoform/View/Helper/partial/input/textarea.phtml b/src/UnicaenAutoform/View/Helper/partial/input/textarea.phtml index 917d968..6aa4d9f 100644 --- a/src/UnicaenAutoform/View/Helper/partial/input/textarea.phtml +++ b/src/UnicaenAutoform/View/Helper/partial/input/textarea.phtml @@ -33,7 +33,7 @@ $options = explode(';', $champ->getOptions()); <script> $(document).ready(function() { - tinymce.remove(); + //tinymce.remove(); tinymce.init({ selector: '.autoform-textarea', toolbar: 'newdocument undo redo | bold italic underline removeformat | bullist', -- GitLab