#506 Liste des actions de...

#506 Liste des actions de protection : Nouvelles Colonnes

src/Domain/Registry/Controller/MesurementController.php

@@ -346,8 +346,10 @@ class MesurementController extends CRUDController
             3 => 'cout',
             4 => 'charge',
             5 => 'priorite',
-            6 => 'responsable_action',
-            7 => 'actions',
+            6 => 'responsable_action', 
+            7 => 'description',
+            8 => 'observation',
+            9 => 'actions',
         ];
     }
 
@@ -363,16 +365,6 @@ class MesurementController extends CRUDController
         /** @var Model\Mesurement $action */
         foreach ($actions as $action) {
 
-            // Réduit la longueur du texte à 105 caractères
-            $description = $action->getDescription();
-            if(isset($description) && strlen($description) > 105) {
-                $description = substr($description, 0, 105).'...';
-            }
-            $observation = $action->getComment();
-            if(isset($observation) && strlen($observation) > 105) {
-                $observation = substr($observation, 0, 105).'...';
-            }
-
             $reponse['data'][] = [
                 'id'                 => $action->getId(),
                 'nom'                => !$isActionPlan ? $this->generateShowLink($action) : $action->getName(),
@@ -383,8 +375,8 @@ class MesurementController extends CRUDController
                 'priorite'           => !\is_null($action->getPriority()) ? MesurementPriorityDictionary::getPriorities()[$action->getPriority()] : null,
                 'date_planification' => !\is_null($action->getPlanificationDate()) ? \date_format($action->getPlanificationDate(), 'd/m/Y') : null,
                 'responsable_action' => $action->getManager(),
-                'description'        => $description,
-                'observation'        => $observation,
+                'description'        => $action->getDescription(),
+                'observation'        => $action->getComment(),
                 'actions'            => $this->generateActionCell($action, $isActionPlan),
             ];
         }

src/Domain/Reporting/Generator/Word/MesurementGenerator.php

@@ -193,6 +193,10 @@ class MesurementGenerator extends AbstractGenerator implements ImpressionGenerat
                         ? ($mesurement->getPlanificationDate() ? $this->getDate($mesurement->getPlanificationDate()) : null)
                         : 'Non applicable',
                 ],
+                [
+                    'Observations',
+                    $mesurement->getComment(),
+                ],
             ];
 
             $historyData = [

templates/Registry/Mesurement/action_plan.html.twig

@@ -121,8 +121,16 @@
         order:  [
             [5, 'desc' ]
         ],
+        addSubstr : [7, 8],
     } %}
 
+    <script>
+        function substrColRenderFunction (data, type, full, meta){
+            let content = data && data.length > 105 ? `<span data-toggle="tooltip" data-placement="bottom" title="${data}">${data.substring(0, 105)}...</span>` : data
+            return content;
+        }
+    </script>
+
     {{ include('_Utils/_serverside_datatable.html.twig') }}
 
     <script>

templates/Registry/Mesurement/list.html.twig

@@ -95,15 +95,19 @@
                             <th>
                                 <input class="form-control" type="text" id="search_responsable_action" placeholder="Responsable" style="width: 100%;">
                             </th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
                         </tr>
                         <tr>
-                            <th>{{ 'registry.mesurement.list.name'|trans }}</th>
-                            <th>{{ 'registry.mesurement.list.collectivity'|trans }}</th>
-                            <th>{{ 'registry.mesurement.list.status'|trans }}</th>
-                            <th>{{ 'registry.mesurement.list.cost'|trans }}</th>
-                            <th>{{ 'registry.mesurement.list.charge'|trans }}</th>
-                            <th>{{ 'registry.mesurement.list.priority'|trans }}</th>
-                            <th>{{ 'registry.mesurement.list.responsable'|trans }}</th>
+                            <th scope="col">{{ 'registry.mesurement.list.name'|trans }}</th>
+                            <th scope="col">{{ 'registry.mesurement.list.collectivity'|trans }}</th>
+                            <th scope="col">{{ 'registry.mesurement.list.status'|trans }}</th>
+                            <th scope="col">{{ 'registry.mesurement.list.cost'|trans }}</th>
+                            <th scope="col">{{ 'registry.mesurement.list.charge'|trans }}</th>
+                            <th scope="col">{{ 'registry.mesurement.list.priority'|trans }}</th>
+                            <th scope="col">{{ 'registry.mesurement.list.responsable'|trans }}</th>
+                            <th scope="col">{{ 'registry.mesurement.list.description'|trans }}</th>
+                            <th scope="col">{{ 'registry.mesurement.list.observation'|trans }}</th>
                             {% if is_granted('ROLE_USER') %}
                                 <th>{{ 'label.actions'|trans }}</th>
                             {% endif %}
@@ -140,18 +144,29 @@
             {"data": "charge"},
             {"data": "priorite"},
             {"data": "responsable_action"},
+            {"data": "description", "visible": false, "orderable": false},
+            {"data": "observation", "visible": false, "orderable": false},
             {"data": "actions", "orderable": false, "className": "noVis", "visible": actionIsVisible},
         ],
         order:  [
             [5, 'desc' ]
         ],
+        addSubstr : [7, 8],
     } %}
 
+    <script>
+        function substrColRenderFunction (data, type, full, meta){
+            let content = data && data.length > 105 ? `<span data-toggle="tooltip" data-placement="bottom" title="${data}">${data.substring(0, 105)}...</span>` : data
+            return content;
+        }
+    </script>
+
     {{ include('_Utils/_serverside_datatable.html.twig') }}
 
     <script>
         $(document).ready(function() {
             $('#table_filter').hide();
+
             var oTable = $('#table').DataTable();
 
             oTable.on( 'draw', function () {
@@ -202,6 +217,7 @@
             $('#search_responsable_action').keyup($.debounce(250, function(){
                 oTable.column('6').search($(this).val()).draw() ;
             }));
+
         } );
     </script>
 {% endblock %}

templates/_Utils/_serverside_datatable_base.html.twig

@@ -94,6 +94,17 @@
             delete options.addcheckbox;
         }
 
+        if ( options.addSubstr ) {
+            options.columnDefs = [{
+                targets: options.addSubstr,
+                searchable: false,
+                orderable: false,
+                render: substrColRenderFunction,
+            }];
+
+            delete options.addSubstr;
+        }
+
         var fullData = [];
 
         var strip = function ( str ) {