From 5eaad0e99820d6cde0ef7c2046efa5b03eb6d5f4 Mon Sep 17 00:00:00 2001 From: Thomas Zilio Date: Tue, 19 Sep 2017 17:02:17 +0200 Subject: [PATCH] Bugfix sui nuovi plugin --- assets/src/css/datatables.css | 4 ++-- assets/src/css/style.css | 1 - update/2_3.sql | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/assets/src/css/datatables.css b/assets/src/css/datatables.css index f8a9943b3..765d58180 100644 --- a/assets/src/css/datatables.css +++ b/assets/src/css/datatables.css @@ -173,7 +173,6 @@ div.DTS { display: block !important; } -div.DTS tbody th, div.DTS tbody td { white-space: normal; } @@ -195,6 +194,7 @@ div.DTS div.dataTables_length { display: none; } + /* Custom */ div.dataTables_wrapper { @@ -216,6 +216,6 @@ div.dataTables_wrapper { transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s; } -.dataTables_info .select-info{ +.dataTables_info .select-info { display: none; } diff --git a/assets/src/css/style.css b/assets/src/css/style.css index 897cee617..4281e6ebc 100644 --- a/assets/src/css/style.css +++ b/assets/src/css/style.css @@ -552,7 +552,6 @@ span.form-control { div.DTS tbody td, div.DTS tbody th { - word-wrap: break-word; max-width: 500px; } diff --git a/update/2_3.sql b/update/2_3.sql index 3919f9353..ade2aa2d4 100644 --- a/update/2_3.sql +++ b/update/2_3.sql @@ -962,5 +962,5 @@ UPDATE `zz_modules` `t1` INNER JOIN (SELECT MAX(`order`) AS `order` FROM `zz_mod UPDATE `zz_modules` SET `title` = `name` WHERE `title` = ''; -- Nuova struttura per i plugin Ddt del cliente e Impianti del cliente in Anagrafiche -UPDATE `zz_plugins` SET `script` = '', `options` = ' { "main_query": [ { "type": "table", "fields": "Numero, Data, Descrizione, Qtà", "query": "SELECT dt_ddt.id, (SELECT `id` FROM `zz_modules` WHERE `name` = \'Ddt di vendita\') AS _link_module_, dt_ddt.id AS _link_record_, IF(dt_ddt.numero_esterno = \'\', dt_ddt.numero, dt_ddt.numero_esterno) AS Numero, dt_ddt.data AS Data, dt_righe_ddt.descrizione AS `Descrizione`, CONCAT(dt_righe_ddt.qta, \' \', dt_righe_ddt.um) AS `Qtà` FROM dt_ddt JOIN dt_righe_ddt ON dt_ddt.id=dt_righe_ddt.idddt WHERE dt_ddt.idanagrafica=|idanagrafica| HAVING 2=2 ORDER BY dt_ddt.id DESC"} ]}', `directory` = '', `version` = '2.3', `compatibility` = '2.*' WHERE `name` = 'Ddt del cliente'; -UPDATE `zz_plugins` SET `script` = '', `options` = ' { "main_query": [ { "type": "table", "fields": "Matricola, Nome, Data, Descrizione", "query": "SELECT id, (SELECT `id` FROM `zz_modules` WHERE `name` = \'MyImpianti\') AS _link_module_, id AS _link_record_, matricola AS Matricola, nome AS Nome, data AS Data, descrizione AS Descrizione FROM my_impianti WHERE idanagrafica=|idanagrafica| HAVING 2=2 ORDER BY id DESC"} ]}', `directory` = '', `version` = '2.3', `compatibility` = '2.*' WHERE `name` = 'Impianti del cliente'; +UPDATE `zz_plugins` SET `script` = '', `options` = ' { "main_query": [ { "type": "table", "fields": "Numero, Data, Descrizione, Qtà", "query": "SELECT dt_ddt.id, (SELECT `id` FROM `zz_modules` WHERE `name` = \'Ddt di vendita\') AS _link_module_, dt_ddt.id AS _link_record_, IF(dt_ddt.numero_esterno = \'\', dt_ddt.numero, dt_ddt.numero_esterno) AS Numero, DATE_FORMAT(dt_ddt.data, ''%d/%m/%Y'') AS Data, dt_righe_ddt.descrizione AS `Descrizione`, CONCAT(REPLACE(REPLACE(REPLACE(FORMAT(dt_righe_ddt.qta, 2), \',\', \'#\'), \'.\', \',\'), \'#\', \'.\'), \' \', dt_righe_ddt.um) AS `Qtà` FROM dt_ddt JOIN dt_righe_ddt ON dt_ddt.id=dt_righe_ddt.idddt WHERE dt_ddt.idanagrafica=|idanagrafica| HAVING 2=2 ORDER BY dt_ddt.id DESC"} ]}', `directory` = '', `version` = '2.3', `compatibility` = '2.*' WHERE `name` = 'Ddt del cliente'; +UPDATE `zz_plugins` SET `script` = '', `options` = ' { "main_query": [ { "type": "table", "fields": "Matricola, Nome, Data, Descrizione", "query": "SELECT id, (SELECT `id` FROM `zz_modules` WHERE `name` = \'MyImpianti\') AS _link_module_, id AS _link_record_, matricola AS Matricola, nome AS Nome, DATE_FORMAT(data, ''%d/%m/%Y'') AS Data, descrizione AS Descrizione FROM my_impianti WHERE idanagrafica=|idanagrafica| HAVING 2=2 ORDER BY id DESC"} ]}', `directory` = '', `version` = '2.3', `compatibility` = '2.*' WHERE `name` = 'Impianti del cliente';