Modification

Module.php

@@ -17,16 +17,6 @@ class Module
         $moduleRouteListener = new ModuleRouteListener();
         $moduleRouteListener->attach($eventManager);
 
-        /* Active un layout spécial si la requête est de type AJAX. Valable pour TOUS les modules de l'application. */
-        $eventManager->getSharedManager()->attach('Zend\Mvc\Controller\AbstractActionController', 'dispatch',
-            function (MvcEvent $e) {
-                $request = $e->getRequest();
-                if ($request instanceof HttpRequest && $request->isXmlHttpRequest()) {
-                    $e->getTarget()->layout('layout/ajax.phtml');
-                }
-            }
-        );
-
     }
 
     public function getConfig()

src/UnicaenAutoform/Entity/Db/Categorie.php

@@ -5,9 +5,11 @@ namespace UnicaenAutoform\Entity\Db;
 use Doctrine\Common\Collections\ArrayCollection;
 use UnicaenApp\Entity\HistoriqueAwareInterface;
 use UnicaenApp\Entity\HistoriqueAwareTrait;
+use UnicaenAutoform\Entity\HasMotsClefsAwareTrait;
 
 class Categorie implements HistoriqueAwareInterface {
     use HistoriqueAwareTrait;
+    use HasMotsClefsAwareTrait;
 
     /** @var integer */
     private $id;

src/UnicaenAutoform/Entity/Db/FormulaireInstance.php

@@ -190,7 +190,12 @@ class FormulaireInstance implements HistoriqueAwareInterface {
     public function fetchChampReponseByMotsClefs(array $mots) : string
     {
         foreach ($this->getReponses() as $reponse) {
-            if ($reponse->getChamp()->hasMotsClefs($mots) AND $reponse->estNonHistorise()) return $reponse->getReponse();
+            if ($reponse->getChamp()->hasMotsClefs($mots) AND $reponse->estNonHistorise()) {
+                if ($reponse->getChamp()->getElement() !== 'Multiple') return $reponse->getReponse();
+                else {
+                    return str_replace('on_','',$reponse->getReponse());
+                }
+            }
         }
         return "";
     }

src/UnicaenAutoform/Entity/Db/Mapping/UnicaenAutoform.Entity.Db.Categorie.dcm.xml

@@ -9,6 +9,7 @@
         <field name="code"              column="code"               type="string"    length="64"     nullable="false" />
         <field name="libelle"           column="libelle"            type="string"    length="256"    nullable="false" />
         <field name="ordre"             column="ordre"              type="integer"                   nullable="false" />
+        <field name="motsClefs"         column="mots_clefs"         type="string"    length="1024"   nullable="true" />
 
         <many-to-one target-entity="UnicaenAutoform\Entity\Db\Formulaire"  field="formulaire">
             <join-column name="formulaire" referenced-column-name="id"/>

src/UnicaenAutoform/View/Helper/partial/input/custom.phtml

@@ -32,7 +32,7 @@ $reponses = explode(';', $reponse);
                     <?php $found = true; ?>
                     <input class="form-control" type="text"
                            id="<?php echo $champ->getId()?>_<?php echo $position; ?>" name="<?php echo $champ->getId()?>_<?php echo $position; ?>"
-                           value="<?php echo trim($reponses[$position]); ?>"
+                           value="<?php echo isset($reponses[$position])?trim($reponses[$position]):null; ?>"
                     />
                 <?php endif; ?>
                 <?php if ($params[0] === 'texte long') : ?>
@@ -47,7 +47,8 @@ $reponses = explode(';', $reponse);
                             id="<?php echo $champ->getId(); ?>_<?php echo $position; ?>" name="<?php echo $champ->getId(); ?>_<?php echo $position; ?>"
                     >
                             <?php for ($param_position = 2; $param_position < count($params) ; $param_position++) : ?>
-                                <option value="<?php echo $params[$param_position]; ?>" <?php if ($params[$param_position]===$reponses[$position]) echo " selected "; ?>>
+                                <?php $creponse = isset($reponses[$position])?trim($reponses[$position]):null; ?>
+                                <option value="<?php echo $params[$param_position]; ?>" <?php if ($params[$param_position]===$creponse) echo " selected "; ?>>
                                     <?php echo $params[$param_position]; ?>
                                 </option>
                             <?php endfor; ?>

view/unicaen-autoform/formulaire/afficher-formulaire.phtml

@@ -48,7 +48,9 @@ $a=1;
                     </div>
                     <div class="panel-body body-reductible">
                         <?php foreach ($champs as $champ) : ?>
-                            <div> <?php echo $this->champAsInput()->render($champ, $reponses); ?> </div>
+                            <div>
+                                <?php echo $this->champAsInput()->render($champ, $reponses); ?>
+                            </div>
                         <?php endforeach; ?>
                     </div>
                 </div>

view/unicaen-autoform/formulaire/modifier.phtml

@@ -83,6 +83,15 @@ $canDetruireChamp           = $this->isAllowed(ChampPrivileges::getResourceId(Ch
                     <?php if ($categorie->estHistorise()) : ?>
                         <small>(<?php echo count($categorie->getChamps()); ?> champs)</small>
                     <?php endif; ?>
+                    <br/>
+                    <?php
+                    $mots = explode(";",$categorie->getMotsClefs());
+                    $mots = array_filter($mots, function ($a) { return trim($a) !== '';});
+                    ?>
+
+                    <?php foreach ($mots as $motclef) : ?>
+                        <span class="motclef"> <?php echo $motclef; ?> </span>
+                    <?php endforeach; ?>
                 </div>
                 <div class="col-md-2">
 
@@ -159,6 +168,14 @@ $canDetruireChamp           = $this->isAllowed(ChampPrivileges::getResourceId(Ch
                             <?php
                                 echo $this->champAsInput()->render($champ);
                             ?>
+                            <?php
+                                $mots = explode(";",$champ->getMotsClefs());
+                                $mots = array_filter($mots, function ($a) { return trim($a) !== '';});
+                            ?>
+
+                            <?php foreach ($mots as $motclef) : ?>
+                                <span class="motclef"> <?php echo $motclef; ?> </span>
+                            <?php endforeach; ?>
                         </div>
                         <div class="col-md-2">
                             <?php if ($canModifierChamp) : ?>
@@ -233,3 +250,17 @@ $canDetruireChamp           = $this->isAllowed(ChampPrivileges::getResourceId(Ch
         });
     });
 </script>
+
+<style>
+    .motclef {
+        background: lightgrey;
+        color: black;
+        font-family: monospace;
+        border: 1px grey solid;
+        border-radius: 0.5rem;
+        margin-left: 0.5rem;
+        margin-bottom: 0.5rem;
+        padding-left: 1rem;
+        padding-right: 1rem;
+    }
+</style>
\ No newline at end of file