From 9b22b07dcf01fc0ea785b4ab7c5f8190d4afa47c Mon Sep 17 00:00:00 2001 From: Pek5892 Date: Tue, 8 Nov 2022 15:07:51 +0100 Subject: [PATCH] Fix selezione colori #1102 --- modules/anagrafiche/edit.php | 2 +- modules/categorie_articoli/add.php | 2 +- modules/categorie_articoli/edit.php | 2 +- modules/categorie_impianti/add.php | 2 +- modules/categorie_impianti/edit.php | 2 +- modules/provenienze/add.php | 2 +- modules/provenienze/edit.php | 2 +- modules/relazioni_anagrafiche/add.php | 2 +- modules/relazioni_anagrafiche/edit.php | 2 +- modules/settori_merceologici/add.php | 9 --------- modules/settori_merceologici/edit.php | 9 --------- modules/stati_intervento/add.php | 2 +- modules/stati_intervento/edit.php | 2 +- modules/stati_preventivo/add.php | 2 +- modules/stati_preventivo/edit.php | 2 +- update/2_4_38.sql | 8 ++++++++ 16 files changed, 21 insertions(+), 31 deletions(-) create mode 100644 update/2_4_38.sql diff --git a/modules/anagrafiche/edit.php b/modules/anagrafiche/edit.php index 515f2acfb..78a18c1c7 100755 --- a/modules/anagrafiche/edit.php +++ b/modules/anagrafiche/edit.php @@ -612,7 +612,7 @@ if ($is_cliente or $is_fornitore or $is_tecnico) {
- {[ "type": "text", "label": "'.tr('Colore').'", "name": "colore", "id": "colore_t", "class": "colorpicker text-center", "value": "$colore$", "maxlength": "7", "icon-after": "
" ]} + {[ "type": "text", "label": "'.tr('Colore').'", "name": "colore", "id": "colore_t", "class": "colorpicker text-center", "value": "$colore$", "maxlength": "30", "icon-after": "
" ]}
'; diff --git a/modules/categorie_articoli/add.php b/modules/categorie_articoli/add.php index 9bad36961..30be4e068 100755 --- a/modules/categorie_articoli/add.php +++ b/modules/categorie_articoli/add.php @@ -44,7 +44,7 @@ if (isset($id_original)) {
- {[ "type": "text", "label": "", "name": "colore", "id": "colore_", "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength=\"7\"", "icon-after": "
" ]} + {[ "type": "text", "label": "", "name": "colore", "id": "colore_", "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength=\"30\"", "icon-after": "
" ]}
diff --git a/modules/categorie_articoli/edit.php b/modules/categorie_articoli/edit.php index e6b3feabd..46659f007 100755 --- a/modules/categorie_articoli/edit.php +++ b/modules/categorie_articoli/edit.php @@ -36,7 +36,7 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "text", "label": "", "name": "colore", "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength='7'", "icon-after": "
" ]} + {[ "type": "text", "label": "", "name": "colore", "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength='30'", "icon-after": "
" ]}
diff --git a/modules/categorie_impianti/add.php b/modules/categorie_impianti/add.php index d984fccb8..4ae9c938a 100755 --- a/modules/categorie_impianti/add.php +++ b/modules/categorie_impianti/add.php @@ -35,7 +35,7 @@ if (isset($id_record)) {
- {[ "type": "text", "label": "", "name": "colore", "id": "colore_", "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength=\"7\"", "icon-after": "
" ]} + {[ "type": "text", "label": "", "name": "colore", "id": "colore_", "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength=\"30\"", "icon-after": "
" ]}
diff --git a/modules/categorie_impianti/edit.php b/modules/categorie_impianti/edit.php index 6e2242703..36d89f88b 100755 --- a/modules/categorie_impianti/edit.php +++ b/modules/categorie_impianti/edit.php @@ -36,7 +36,7 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "text", "label": "", "name": "colore", "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength='7'", "icon-after": "
" ]} + {[ "type": "text", "label": "", "name": "colore", "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength='30'", "icon-after": "
" ]}
diff --git a/modules/provenienze/add.php b/modules/provenienze/add.php index 128f30d00..482e12291 100644 --- a/modules/provenienze/add.php +++ b/modules/provenienze/add.php @@ -29,7 +29,7 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "text", "label": "", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "", "extra": "maxlength='7'", "icon-after": "
" ]} + {[ "type": "text", "label": "", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "", "extra": "maxlength='30'", "icon-after": "
" ]}
diff --git a/modules/provenienze/edit.php b/modules/provenienze/edit.php index 4626b85e0..f5ecde0b0 100644 --- a/modules/provenienze/edit.php +++ b/modules/provenienze/edit.php @@ -36,7 +36,7 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "text", "label": "", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength='7'", "icon-after": "
" ]} + {[ "type": "text", "label": "", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength='30'", "icon-after": "
" ]}
diff --git a/modules/relazioni_anagrafiche/add.php b/modules/relazioni_anagrafiche/add.php index fe213642a..6f08c1d78 100755 --- a/modules/relazioni_anagrafiche/add.php +++ b/modules/relazioni_anagrafiche/add.php @@ -33,7 +33,7 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "text", "label": "", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "", "extra": "maxlength='7'", "icon-after": "
" ]} + {[ "type": "text", "label": "", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "", "extra": "maxlength='30'", "icon-after": "
" ]}
diff --git a/modules/relazioni_anagrafiche/edit.php b/modules/relazioni_anagrafiche/edit.php index 02c275740..ed954bd7b 100755 --- a/modules/relazioni_anagrafiche/edit.php +++ b/modules/relazioni_anagrafiche/edit.php @@ -40,7 +40,7 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "text", "label": "", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength='7'", "icon-after": "
" ]} + {[ "type": "text", "label": "", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength='30'", "icon-after": "
" ]}
diff --git a/modules/settori_merceologici/add.php b/modules/settori_merceologici/add.php index 442a60abd..3fc7a45c4 100644 --- a/modules/settori_merceologici/add.php +++ b/modules/settori_merceologici/add.php @@ -36,12 +36,3 @@ include_once __DIR__.'/../../core.php'; - - diff --git a/modules/settori_merceologici/edit.php b/modules/settori_merceologici/edit.php index 9b71f1217..f308d2adf 100644 --- a/modules/settori_merceologici/edit.php +++ b/modules/settori_merceologici/edit.php @@ -61,12 +61,3 @@ if (!empty($righe)) { } ?> - - diff --git a/modules/stati_intervento/add.php b/modules/stati_intervento/add.php index e49e65050..6b7e44ea2 100755 --- a/modules/stati_intervento/add.php +++ b/modules/stati_intervento/add.php @@ -33,7 +33,7 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "text", "label": "", "name": "colore", "id": "colore_", "required": 1, "class": "colorpicker text-center", "value": "#ffffff", "extra": "maxlength='7'", "icon-after": "
" ]} + {[ "type": "text", "label": "", "name": "colore", "id": "colore_", "required": 1, "class": "colorpicker text-center", "value": "#ffffff", "extra": "maxlength='30'", "icon-after": "
" ]}
diff --git a/modules/stati_intervento/edit.php b/modules/stati_intervento/edit.php index 44f6d9c7d..31886295d 100755 --- a/modules/stati_intervento/edit.php +++ b/modules/stati_intervento/edit.php @@ -43,7 +43,7 @@ if ($record['can_delete']) {
- {[ "type": "text", "label": "", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength='7'", "icon-after": "
" ]} + {[ "type": "text", "label": "", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength='30'", "icon-after": "
" ]}
diff --git a/modules/stati_preventivo/add.php b/modules/stati_preventivo/add.php index a26653c38..63a093b46 100755 --- a/modules/stati_preventivo/add.php +++ b/modules/stati_preventivo/add.php @@ -29,7 +29,7 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "text", "label": "", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength='7'", "icon-after": "
" ]} + {[ "type": "text", "label": "", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength='30'", "icon-after": "
" ]}
diff --git a/modules/stati_preventivo/edit.php b/modules/stati_preventivo/edit.php index cda0a67bc..1b8ebb3d7 100755 --- a/modules/stati_preventivo/edit.php +++ b/modules/stati_preventivo/edit.php @@ -42,7 +42,7 @@ if ($record['can_delete']) {
- {[ "type": "text", "label": "", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength='7'", "icon-after": "
" ]} + {[ "type": "text", "label": "", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "$colore$", "extra": "maxlength='30'", "icon-after": "
" ]}
diff --git a/update/2_4_38.sql b/update/2_4_38.sql new file mode 100644 index 000000000..1047d030a --- /dev/null +++ b/update/2_4_38.sql @@ -0,0 +1,8 @@ +-- +ALTER TABLE `an_anagrafiche` CHANGE `colore` `colore` VARCHAR(30) NOT NULL DEFAULT '#FFFFFF'; +ALTER TABLE `mg_categorie` CHANGE `colore` `colore` VARCHAR(30) NOT NULL; +ALTER TABLE `my_impianti_categorie` CHANGE `colore` `colore` VARCHAR(30) NOT NULL; +ALTER TABLE `an_provenienze` CHANGE `colore` `colore` VARCHAR(30) NOT NULL; +ALTER TABLE `an_relazioni` CHANGE `colore` `colore` VARCHAR(30) NOT NULL; +ALTER TABLE `in_statiintervento` CHANGE `colore` `colore` VARCHAR(30) NOT NULL DEFAULT '#FFFFFF'; +ALTER TABLE `co_statipreventivi` CHANGE `colore` `colore` VARCHAR(30) NOT NULL; \ No newline at end of file