diff --git a/templates/Registry/Conformite_traitement/list.html.twig b/templates/Registry/Conformite_traitement/list.html.twig index 956f440ebd9d02483cc94b4f82849838c18aaa87..cad9d3c18a502f147e5ae5ac712a7377271e6f62 100644 --- a/templates/Registry/Conformite_traitement/list.html.twig +++ b/templates/Registry/Conformite_traitement/list.html.twig @@ -175,7 +175,7 @@ {% set dataTableOptions = { columns: cols, - excludeId : true, + excludeId : false, order: [ [1, 'asc' ] ], diff --git a/templates/_Utils/_serverside_datatable_base.html.twig b/templates/_Utils/_serverside_datatable_base.html.twig index 6193df7ecac68df90f13d0b853f564921cd1136a..be0610b9d462d033c36002cc1c886c2f20a0ce45 100644 --- a/templates/_Utils/_serverside_datatable_base.html.twig +++ b/templates/_Utils/_serverside_datatable_base.html.twig @@ -139,6 +139,7 @@ async: false }); var exportBody = jsonResult.responseJSON.data; + var colNames = params.columns.map(function(c) { return c.data }).filter(i => i !== 'actions') return exportBody.map(function (el) { return colNames.map(function (key) { @@ -154,18 +155,27 @@ var visible = api.columns().visible(); var params = api.ajax.params(); + var headers = [] params.columns = params.columns.filter(function(c, i) { - return visible[i] && c.data !== 'actions' + var ret = visible[i] && c.data !== 'actions' + if (options.excludeId) { + ret = ret && c.data !== "id" + } + if (ret) { + headers.push(api.columns().header()[i].textContent) + } + return ret; }) - if (options.excludeId) { - params.columns = params.columns.filter( (c) => c.data !== "id") - } var exportBody = getFullData(params); d.body = []; d.body.length = 0; d.body.push.apply(d.body, exportBody); + + d.header = []; + d.header.length = 0; + d.header.push.apply(d.header, headers); }) } catch { }