diff --git a/src/UnicaenAutoform/Entity/Db/Categorie.php b/src/UnicaenAutoform/Entity/Db/Categorie.php index a872ed005a936fa4b04594ed29b7cc5e997e1311..1fb638edc16acf89d83f032235d643324a348052 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 fe921eaca86c37c28b91971ad8c88c9a5aa1ae1c..9399520e12f01e5b1500c3d421c474b699f78cf3 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 f5c04a864e24daaf00d064eab7312aa891feb000..5f661a580bbd2581113c831db2f6837c9b415321 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 8ad53cd8d272446f04a03ce4403f06805ef84526..687491f5e4c30397dc32edbabe623ab85f7a3193 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 3a866043d5663821debebdce366ef7386d6d554a..531e675c9b2366e549d23ef71a7b4b41d03acc6e 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 dc7cfbf881d9cad4a8cabebd23ad4ff1636bd5ab..c99905c38c47ba32f06ea6c47db415b24e578823 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 95aaa5e8d8eba27bb60942779db00c34f9c8c651..a7e9cb843b5c0aa41e077901fb38ad8db8585814 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 bd54aa5a6fffc71c3c29ddf7d9a9c2e09d53be1b..b96ac421d73225a2e43f509e9e24b968fa174ece 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 ece46fe6781ac10736433ec1ee06d4806b2eebf2..3e8f3dc7a14cd982c2341390eee98d46f42cbd52 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 917d9680366894d0d590f4d8ed33f2a130e5cd98..6aa4d9fe09cc5fae0b8dadbb881b079aac01ce98 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',