From 8f4e81fc4c421efc121948331478c3e846316a7f Mon Sep 17 00:00:00 2001 From: sebastien <dupuy@datakode.fr> Date: Wed, 22 Jun 2022 08:46:46 +0200 Subject: [PATCH] =?UTF-8?q?Suppression=20de=20la=20colonne=20collectivit?= =?UTF-8?q?=C3=A9s=20pour=20les=20gestionnaires?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/Aipd/Analyse_impact/list.html.twig | 50 +++++++++++++++----- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/templates/Aipd/Analyse_impact/list.html.twig b/templates/Aipd/Analyse_impact/list.html.twig index c3f9ea413..80e682db6 100644 --- a/templates/Aipd/Analyse_impact/list.html.twig +++ b/templates/Aipd/Analyse_impact/list.html.twig @@ -52,7 +52,9 @@ <th>{{ 'aipd.analyse_impact.list.date_creation'|trans }}</th> <th>{{ 'aipd.analyse_impact.list.date_validation'|trans }}</th> <th style="width: 15%">{{ 'aipd.analyse_impact.list.modele'|trans }}</th> - <th>{{ 'aipd.analyse_impact.list.collectivite'|trans }}</th> + {% if is_granted('ROLE_REFERENT') %} + <th>{{ 'aipd.analyse_impact.list.collectivite'|trans }}</th> + {% endif %} <th>{{ 'aipd.analyse_impact.list.avis_referent'|trans }}</th> <th>{{ 'aipd.analyse_impact.list.avis_dpd'|trans }}</th> <th>{{ 'aipd.analyse_impact.list.avis_representant'|trans }}</th> @@ -75,8 +77,20 @@ {% set collectivityIsVisible = true %} {% endif %} - {% set dataTableOptions = { - columns: [ + {% set cols = [ + {"data": "traitement", "className": "noVis"}, + {"data": "dateDeCreation"}, + {"data": "dateDeValidation"}, + {"data": "modele"}, + {"data": "avisReferent"}, + {"data": "avisDpd"}, + {"data": "avisRepresentant"}, + {"data": "avisResponsable"}, + {"data": "actions", "className": "noVis", "orderable": false} + ]%} + + {% if is_granted('ROLE_REFERENT') %} + {% set cols = [ {"data": "traitement", "className": "noVis"}, {"data": "dateDeCreation"}, {"data": "dateDeValidation"}, @@ -86,8 +100,12 @@ {"data": "avisDpd"}, {"data": "avisRepresentant"}, {"data": "avisResponsable"}, - {"data": "actions", "className": "noVis", "orderable": false}, - ], + {"data": "actions", "className": "noVis", "orderable": false} + ] %} + {% endif %} + + {% set dataTableOptions = { + columns: cols, order: [ [0, 'asc' ] ], @@ -98,18 +116,26 @@ <script> $(document).ready(function () { var oTable = $('#table').DataTable(); + + $('#search_traitement').off('keyup'); $('#search_traitement').keyup($.debounce(250, function(){ oTable.column('0').search($(this).val()).draw() ; })); - $('#search_date_de_creation').off('change').change(function(){ + + $('#search_date_de_creation').off('keyup'); + $('#search_date_de_creation').keyup($.debounce(250, function(){ oTable.column('1').search($(this).val()).draw(); - }); - $('#search_date_de_validation').off('change').change(function(){ + })); + + $('#search_date_de_validation').off('keyup'); + $('#search_date_de_validation').keyup($.debounce(250, function(){ oTable.column('2').search($(this).val()).draw(); - }); - $('#search_modele').off('change').change(function(){ - oTable.column('3').search($(this).val()).draw(); - }); + })); + + $('#search_modele').off('keyup'); + $('#search_modele').keyup($.debounce(250, function(){ + oTable.column('3').search($(this).val()).draw() ; + })); }) </script> -- GitLab