diff --git a/assets/src/css/style.css b/assets/src/css/style.css index 9248576d7..f9cfa3dbc 100755 --- a/assets/src/css/style.css +++ b/assets/src/css/style.css @@ -376,9 +376,8 @@ span.form-control { font-size: 1rem; } -.colorpicker, -.colorpicker * { - z-index: 9999; +.colorpicker { + z-index: 1 !important; } .signature-pad { @@ -1587,6 +1586,10 @@ body:not(.sidebar-collapse) .sidebar .nav-treeview .nav-treeview .nav-link { box-shadow: 0px 0px 3px rgba(0,0,0,0.1); } +.dropdown-menu { + z-index: 99999 !important; +} + @media screen and (max-width: 767px) { .navbar-left { display: inline-block; diff --git a/modules/categorie_articoli/edit.php b/modules/categorie_articoli/edit.php index ccdce8fa3..6886b7cf4 100755 --- a/modules/categorie_articoli/edit.php +++ b/modules/categorie_articoli/edit.php @@ -81,15 +81,13 @@ use Models\Module; - fetchArray('SELECT `mg_articoli`.`id`, `mg_articoli`.`codice`, `mg_articoli`.`barcode` FROM `mg_articoli` WHERE (`id_categoria`='.prepare($id_record).' OR `id_sottocategoria`='.prepare($id_record).' OR `id_sottocategoria` IN (SELECT `id` FROM `mg_categorie` WHERE `parent`='.prepare($id_record).')) AND `deleted_at` IS NULL'); diff --git a/modules/categorie_impianti/edit.php b/modules/categorie_impianti/edit.php index 031d2b349..7286f1680 100755 --- a/modules/categorie_impianti/edit.php +++ b/modules/categorie_impianti/edit.php @@ -83,15 +83,13 @@ use Models\Module; - fetchArray('SELECT `my_impianti`.`id`, `my_impianti`.`matricola`, `my_impianti`.`nome` FROM `my_impianti` WHERE (`id_categoria`='.prepare($id_record).' OR `id_sottocategoria`='.prepare($id_record).' OR `id_sottocategoria` IN (SELECT `id` FROM `my_impianti_categorie` WHERE `parent`='.prepare($id_record).'))'); diff --git a/modules/provenienze/add.php b/modules/provenienze/add.php index d43788229..acfe31d3d 100644 --- a/modules/provenienze/add.php +++ b/modules/provenienze/add.php @@ -42,10 +42,10 @@ include_once __DIR__.'/../../core.php'; + $(document).ready(function() { + $('.colorpicker').colorpicker({ format: 'hex' }).on('changeColor', function() { + $(this).parent().find('.square').css('background', $(this).val()); + }); + $('.colorpicker').parent().find('.square').css('background', $('.colorpicker').val()); + }); + \ No newline at end of file diff --git a/modules/relazioni_anagrafiche/add.php b/modules/relazioni_anagrafiche/add.php index 13b00c858..1e62f78c2 100755 --- a/modules/relazioni_anagrafiche/add.php +++ b/modules/relazioni_anagrafiche/add.php @@ -46,10 +46,10 @@ include_once __DIR__.'/../../core.php'; diff --git a/modules/relazioni_anagrafiche/edit.php b/modules/relazioni_anagrafiche/edit.php index e4d08a81b..93fe054ec 100755 --- a/modules/relazioni_anagrafiche/edit.php +++ b/modules/relazioni_anagrafiche/edit.php @@ -67,10 +67,10 @@ if (!empty($righe)) { + $(document).ready(function() { + $('.colorpicker').colorpicker({ format: 'hex' }).on('changeColor', function() { + $(this).parent().find('.square').css('background', $(this).val()); + }); + $('.colorpicker').parent().find('.square').css('background', $('.colorpicker').val()); + }); + \ No newline at end of file diff --git a/modules/stati_contratto/add.php b/modules/stati_contratto/add.php index fb8afcc25..af01ff9ae 100755 --- a/modules/stati_contratto/add.php +++ b/modules/stati_contratto/add.php @@ -59,11 +59,10 @@ include_once __DIR__.'/../../core.php'; + $(document).ready(function() { + $('.colorpicker').colorpicker({ format: 'hex' }).on('changeColor', function() { + $(this).parent().find('.square').css('background', $(this).val()); + }); + $('.colorpicker').parent().find('.square').css('background', $('.colorpicker').val()); + }); + \ No newline at end of file diff --git a/modules/stati_contratto/edit.php b/modules/stati_contratto/edit.php index 2837fa341..11b604df9 100755 --- a/modules/stati_contratto/edit.php +++ b/modules/stati_contratto/edit.php @@ -84,12 +84,12 @@ if (!empty($record['can_delete'])) { ?> + + \ No newline at end of file diff --git a/modules/stati_fattura/edit.php b/modules/stati_fattura/edit.php index 15538d482..8a5b2930d 100644 --- a/modules/stati_fattura/edit.php +++ b/modules/stati_fattura/edit.php @@ -63,12 +63,12 @@ if (!empty($record['can_delete'])) { ?> + + \ No newline at end of file diff --git a/modules/stati_intervento/add.php b/modules/stati_intervento/add.php index cd2cd0207..f8029d711 100755 --- a/modules/stati_intervento/add.php +++ b/modules/stati_intervento/add.php @@ -45,12 +45,14 @@ include_once __DIR__.'/../../core.php'; - + + \ No newline at end of file diff --git a/modules/stati_intervento/edit.php b/modules/stati_intervento/edit.php index b2439bfb1..fa6d893f9 100755 --- a/modules/stati_intervento/edit.php +++ b/modules/stati_intervento/edit.php @@ -114,14 +114,16 @@ if ($record['can_delete']) { } ?> + $(document).ready(function() { + $('.colorpicker').colorpicker({ format: 'hex' }).on('changeColor', function() { + $(this).parent().find('.square').css('background', $(this).val()); + }); + $('.colorpicker').parent().find('.square').css('background', $('.colorpicker').val()); + }); + \ No newline at end of file diff --git a/modules/stati_ordine/edit.php b/modules/stati_ordine/edit.php index 90c5d166c..40a3033aa 100644 --- a/modules/stati_ordine/edit.php +++ b/modules/stati_ordine/edit.php @@ -83,12 +83,12 @@ if (!empty($record['can_delete'])) { ?> + + \ No newline at end of file diff --git a/modules/stati_preventivo/add.php b/modules/stati_preventivo/add.php index deb767fa1..addd1b463 100755 --- a/modules/stati_preventivo/add.php +++ b/modules/stati_preventivo/add.php @@ -59,11 +59,10 @@ include_once __DIR__.'/../../core.php'; + $(document).ready(function() { + $('.colorpicker').colorpicker({ format: 'hex' }).on('changeColor', function() { + $(this).parent().find('.square').css('background', $(this).val()); + }); + $('.colorpicker').parent().find('.square').css('background', $('.colorpicker').val()); + }); + \ No newline at end of file diff --git a/modules/stati_preventivo/edit.php b/modules/stati_preventivo/edit.php index 54fe80d4f..8b7ffdd10 100755 --- a/modules/stati_preventivo/edit.php +++ b/modules/stati_preventivo/edit.php @@ -84,14 +84,13 @@ if (!empty($record['can_delete'])) { } ?> - + + \ No newline at end of file