Skip to content

Commit 5fc7495

Browse files
Pek5892Pek5892
committed
refactor: miglioria query aggiornamento
1 parent 710d2c5 commit 5fc7495

6 files changed

Lines changed: 187 additions & 237 deletions

File tree

‎update/2_7.sql‎

Lines changed: 63 additions & 81 deletions
Large diffs are not rendered by default.

‎update/2_7_2.sql‎

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,39 @@
1-
ALTER TABLE `co_pianodeiconti3` CHANGE `descrizione` `descrizione` VARCHAR(255) NOT NULL;
1+
ALTER TABLE `co_pianodeiconti3` CHANGE `descrizione` `descrizione` VARCHAR(255) NOT NULL;
22

3-
SELECT @id_module := `id` FROM `zz_modules` WHERE `name` = 'Contratti';
4-
INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `html_format`, `search_inside`, `order_by`, `visible`, `summable`, `default`) VALUES
5-
(@id_module, 'Residuo contratto', "IF((righe.totale_imponibile - spesacontratto.somma) != 0, righe.totale_imponibile - spesacontratto.somma, '')", '20', '1', '0', '0', '0', '', '', '1', '0', '0');
3+
INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `html_format`, `search_inside`, `order_by`, `visible`, `summable`, `default`) VALUES
4+
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Contratti'), 'Residuo contratto', "IF((righe.totale_imponibile - spesacontratto.somma) != 0, righe.totale_imponibile - spesacontratto.somma, '')", '20', '1', '0', '0', '0', '', '', '1', '0', '0');
65

7-
SELECT @id_module := `id` FROM `zz_modules` WHERE `name` = 'Contratti';
86
INSERT INTO `zz_views_lang` (`id_lang`, `id_record`, `title`) VALUES
9-
(1, (SELECT `id` FROM `zz_views` WHERE `name` = 'Residuo contratto' AND `id_module` = @id_module), 'Residuo contratto'),
10-
(2, (SELECT `id` FROM `zz_views` WHERE `name` = 'Residuo contratto' AND `id_module` = @id_module), 'Contract Residual');
7+
(1, (SELECT `id` FROM `zz_views` WHERE `name` = 'Residuo contratto' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Contratti')), 'Residuo contratto'),
8+
(2, (SELECT `id` FROM `zz_views` WHERE `name` = 'Residuo contratto' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Contratti')), 'Contract Residual');
119

1210

1311
-- Aggiunta colonna Note interne in Preventivi
14-
SELECT @id_module := `id` FROM `zz_modules` WHERE `name` = 'Preventivi';
15-
INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `html_format`, `search_inside`, `order_by`, `visible`, `summable`, `default`) VALUES
16-
(@id_module, 'Note interne', "`co_preventivi`.`informazioniaggiuntive`", '18', '1', '0', '0', '0', '', '', '0', '0', '0');
12+
INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `html_format`, `search_inside`, `order_by`, `visible`, `summable`, `default`) VALUES
13+
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Preventivi'), 'Note interne', "`co_preventivi`.`informazioniaggiuntive`", '18', '1', '0', '0', '0', '', '', '0', '0', '0');
1714

18-
SELECT @id_module := `id` FROM `zz_modules` WHERE `name` = 'Preventivi';
1915
INSERT INTO `zz_views_lang` (`id_lang`, `id_record`, `title`) VALUES
20-
(1, (SELECT `id` FROM `zz_views` WHERE `name` = 'Note interne' AND `id_module` = @id_module), 'Note interne'),
21-
(2, (SELECT `id` FROM `zz_views` WHERE `name` = 'Note interne' AND `id_module` = @id_module), 'Notes');
16+
(1, (SELECT `id` FROM `zz_views` WHERE `name` = 'Note interne' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Preventivi')), 'Note interne'),
17+
(2, (SELECT `id` FROM `zz_views` WHERE `name` = 'Note interne' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Preventivi')), 'Notes');
2218

2319
-- Aggiunta colonna Note interne in Contratti
24-
SELECT @id_module := `id` FROM `zz_modules` WHERE `name` = 'Contratti';
25-
INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `html_format`, `search_inside`, `order_by`, `visible`, `summable`, `default`) VALUES
26-
(@id_module, 'Note interne', "`co_contratti`.`informazioniaggiuntive`", '18', '1', '0', '0', '0', '', '', '0', '0', '0');
20+
INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `html_format`, `search_inside`, `order_by`, `visible`, `summable`, `default`) VALUES
21+
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Contratti'), 'Note interne', "`co_contratti`.`informazioniaggiuntive`", '18', '1', '0', '0', '0', '', '', '0', '0', '0');
2722

28-
SELECT @id_module := `id` FROM `zz_modules` WHERE `name` = 'Contratti';
2923
INSERT INTO `zz_views_lang` (`id_lang`, `id_record`, `title`) VALUES
30-
(1, (SELECT `id` FROM `zz_views` WHERE `name` = 'Note interne' AND `id_module` = @id_module), 'Note interne'),
31-
(2, (SELECT `id` FROM `zz_views` WHERE `name` = 'Note interne' AND `id_module` = @id_module), 'Notes');
24+
(1, (SELECT `id` FROM `zz_views` WHERE `name` = 'Note interne' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Contratti')), 'Note interne'),
25+
(2, (SELECT `id` FROM `zz_views` WHERE `name` = 'Note interne' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Contratti')), 'Notes');
3226

3327
-- Aggiunta colonna _bg_ in Articoli
34-
SELECT @id_module := `id` FROM `zz_modules` WHERE `name` = 'Articoli';
35-
INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `html_format`, `search_inside`, `order_by`, `visible`, `summable`, `default`) VALUES
36-
(@id_module, '_bg_', "IF(giacenze.stato_giacenza!=0, IF(giacenze.stato_giacenza>0, '#CCFFCC', '#ec5353'), '')", '16', '1', '0', '0', '0', '', '', '0', '0', '0');
28+
INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `html_format`, `search_inside`, `order_by`, `visible`, `summable`, `default`) VALUES
29+
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli'), '_bg_', "IF(giacenze.stato_giacenza!=0, IF(giacenze.stato_giacenza>0, '#CCFFCC', '#ec5353'), '')", '16', '1', '0', '0', '0', '', '', '0', '0', '0');
3730

38-
SELECT @id_module := `id` FROM `zz_modules` WHERE `name` = 'Articoli';
3931
INSERT INTO `zz_views_lang` (`id_lang`, `id_record`, `title`) VALUES
40-
(1, (SELECT `id` FROM `zz_views` WHERE `name` = '_bg_' AND `id_module` = @id_module), '_bg_'),
41-
(2, (SELECT `id` FROM `zz_views` WHERE `name` = '_bg_' AND `id_module` = @id_module), '_bg_');
32+
(1, (SELECT `id` FROM `zz_views` WHERE `name` = '_bg_' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli')), '_bg_'),
33+
(2, (SELECT `id` FROM `zz_views` WHERE `name` = '_bg_' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli')), '_bg_');
34+
35+
UPDATE `zz_views` LEFT JOIN `zz_modules` ON `zz_views`.`id_module` = `zz_modules`.`id` SET `query` = '`mg_articoli`.`qta`' WHERE `zz_views`.`name` = 'Q.tà' AND `zz_modules`.`name` = 'Articoli';
36+
UPDATE `zz_views` LEFT JOIN `zz_modules` ON `zz_views`.`id_module` = `zz_modules`.`id` SET `query` = '`mg_articoli`.`qta`-IFNULL(a.qta_impegnata, 0)' WHERE `zz_views`.`name` = 'Q.tà disponibile' AND `zz_modules`.`name` = 'Articoli';
4237

43-
UPDATE `zz_views` SET `query` = '`mg_articoli`.`qta`' WHERE `zz_views`.`name` = 'Q.tà' AND `zz_views`.`id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli');
44-
UPDATE `zz_views` SET `query` = '`mg_articoli`.`qta`-IFNULL(a.qta_impegnata, 0)' WHERE `zz_views`.`name` = 'Q.tà disponibile' AND `zz_views`.`id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli');
45-
4638
UPDATE `an_anagrafiche` SET `capitale_sociale` = 0 WHERE `capitale_sociale` NOT REGEXP '^[0-9]{1,15}(\\.[0-9]{1,6})?$';
4739
ALTER TABLE `an_anagrafiche` CHANGE `capitale_sociale` `capitale_sociale` DECIMAL(15,6) NOT NULL DEFAULT 0;

‎update/2_8.sql‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,30 +78,27 @@ INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`,
7878
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Categorie impianti'), 'Note', '`nota`', 3, 1, 0, 0, 0, '', '', 1, 0, 0, 0),
7979
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Categorie impianti'), '_bg_', '`colore`', 4, 1, 0, 0, 0, '', '', 0, 0, 0, 0);
8080

81-
SELECT @id:= MAX(`id`) FROM `zz_views`;
8281
INSERT INTO `zz_views_lang` (`id_lang`, `id_record`, `title`) VALUES
83-
(1, @id-1, 'Note'),
84-
(2, @id-1, 'Note'),
85-
(1, @id, '_bg_'),
86-
(2, @id, '_bg_');
82+
(1, (SELECT `id` FROM `zz_views` WHERE `name` = 'Note' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Categorie impianti')), 'Note'),
83+
(2, (SELECT `id` FROM `zz_views` WHERE `name` = 'Note' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Categorie impianti')), 'Note'),
84+
(1, (SELECT `id` FROM `zz_views` WHERE `name` = '_bg_' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Categorie impianti')), '_bg_'),
85+
(2, (SELECT `id` FROM `zz_views` WHERE `name` = '_bg_' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Categorie impianti')), '_bg_');
8786

8887
-- Miglioria plugin Assicurazione crediti
8988
UPDATE `zz_plugins` SET `options` = '{ \"main_query\": [ { \"type\": \"table\", \"fields\": \"Fido assicurato, Data inizio, Data fine, Totale, Residuo\", \"query\": \"SELECT id, DATE_FORMAT(data_inizio,\'%d/%m/%Y\') AS \'Data inizio\', DATE_FORMAT(data_fine,\'%d/%m/%Y\') AS \'Data fine\', ROUND(fido_assicurato, 2) AS \'Fido assicurato\', ROUND(totale, 2) AS Totale, ROUND(fido_assicurato - totale, 2) AS Residuo, IF((fido_assicurato - totale) < 0, \'#f4af1b\', \'#4dc347\') AS _bg_ FROM an_assicurazione_crediti WHERE 1=1 AND id_anagrafica = |id_parent| HAVING 2=2 ORDER BY an_assicurazione_crediti.id DESC\"} ]}' WHERE `zz_plugins`.`name` = 'Assicurazione crediti';
9089

9190
ALTER TABLE `my_impianti` ADD `note` VARCHAR(255) NULL AFTER `descrizione`;
9291

9392
-- Aggiunta colonne marche e Modello nella vista Articoli (nascoste di default)
94-
SELECT @id_module := `id` FROM `zz_modules` WHERE `name` = 'Articoli';
9593
INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `html_format`, `search_inside`, `order_by`, `visible`, `summable`, `avg`, `default`) VALUES
96-
(@id_module, 'Marche', '(SELECT `name` FROM `zz_marche` WHERE `zz_marche`.`id` = `mg_articoli`.`id_marca`)', 15, 1, 0, 0, 0, '', '', 0, 0, 0, 0),
97-
(@id_module, 'Modello', '`mg_articoli`.`id_modello`', 16, 1, 0, 0, 0, '', '', 0, 0, 0, 0);
94+
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli'), 'Marche', '(SELECT `name` FROM `zz_marche` WHERE `zz_marche`.`id` = `mg_articoli`.`id_marca`)', 15, 1, 0, 0, 0, '', '', 0, 0, 0, 0),
95+
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli'), 'Modello', '`mg_articoli`.`id_modello`', 16, 1, 0, 0, 0, '', '', 0, 0, 0, 0);
9896

99-
SELECT @id:= MAX(`id`) FROM `zz_views`;
10097
INSERT INTO `zz_views_lang` (`id_lang`, `id_record`, `title`) VALUES
101-
(1, @id-1, 'Marche'),
102-
(2, @id-1, 'Brand'),
103-
(1, @id, 'Modello'),
104-
(2, @id, 'Model');
98+
(1, (SELECT `id` FROM `zz_views` WHERE `name` = 'Marche' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli')), 'Marche'),
99+
(2, (SELECT `id` FROM `zz_views` WHERE `name` = 'Marche' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli')), 'Brand'),
100+
(1, (SELECT `id` FROM `zz_views` WHERE `name` = 'Modello' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli')), 'Modello'),
101+
(2, (SELECT `id` FROM `zz_views` WHERE `name` = 'Modello' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli')), 'Model');
105102

106103
INSERT INTO `zz_storage_adapters` (`name`, `class`, `options`, `can_delete`, `is_default`, `is_local`) VALUES
107104
('Backup', '\\Modules\\FileAdapters\\Adapters\\LocalAdapter', '{ \"directory\":\"/files/backups\" }', 1, 0, 1);
@@ -150,7 +147,7 @@ UPDATE `zz_settings` SET `tipo` = 'query=SELECT `in_statiintervento`.`id`, `name
150147
UPDATE `zz_settings` SET `tipo` = 'query=SELECT `in_statiintervento`.`id`, `name` AS text FROM `in_statiintervento` LEFT JOIN `in_statiintervento_lang` ON (`in_statiintervento_lang`.`id_record` = `in_statiintervento`.`id` AND `in_statiintervento_lang`.`id_lang` = (SELECT `valore` FROM `zz_settings` WHERE `nome` = "Lingua")) WHERE is_bloccato = 1' WHERE `zz_settings`.`nome` = "Stato dell'attività dopo la firma";
151148

152149
-- Aggiornamento viste per Stati dei preventivi e Stati dei contratti
153-
UPDATE `zz_views` SET `query` = 'IF(is_bloccato, ''Sì'', ''No'')' WHERE `name` = 'Completato' AND `id_module` IN (SELECT `id` FROM `zz_modules` WHERE `name` IN ('Stati dei preventivi', 'Stati dei contratti'));
150+
UPDATE `zz_views` LEFT JOIN `zz_modules` ON `zz_views`.`id_module` = `zz_modules`.`id` SET `query` = 'IF(is_bloccato, ''Sì'', ''No'')' WHERE `zz_views`.`name` = 'Completato' AND `zz_modules`.`name` IN ('Stati dei preventivi', 'Stati dei contratti');
154151

155152
-- Tabella dt_statiddt
156153
ALTER TABLE `dt_statiddt` CHANGE `completato` `is_bloccato` BOOLEAN NOT NULL DEFAULT FALSE;
@@ -159,10 +156,10 @@ ALTER TABLE `dt_statiddt` CHANGE `completato` `is_bloccato` BOOLEAN NOT NULL DEF
159156
ALTER TABLE `or_statiordine` CHANGE `completato` `is_bloccato` BOOLEAN NOT NULL DEFAULT FALSE;
160157

161158
-- Aggiornamento viste per Stati degli ordini e Stati DDT
162-
UPDATE `zz_views` SET `query` = 'IF(is_bloccato, ''Sì'', ''No'')' WHERE `name` = 'Completato' AND `id_module` IN (SELECT `id` FROM `zz_modules` WHERE `name` IN ('Stati degli ordini', 'Stati DDT'));
159+
UPDATE `zz_views` LEFT JOIN `zz_modules` ON `zz_views`.`id_module` = `zz_modules`.`id` SET `query` = 'IF(is_bloccato, ''Sì'', ''No'')' WHERE `zz_views`.`name` = 'Completato' AND `zz_modules`.`name` IN ('Stati degli ordini', 'Stati DDT');
163160

164161
-- Rinomina le colonne "Completato" in "Bloccato" nelle viste
165-
UPDATE `zz_views` SET `name` = 'Bloccato' WHERE `name` = 'Completato' AND `id_module` IN (SELECT `id` FROM `zz_modules` WHERE `name` IN ('Stati dei preventivi', 'Stati dei contratti', 'Stati degli ordini', 'Stati DDT'));
162+
UPDATE `zz_views` LEFT JOIN `zz_modules` ON `zz_views`.`id_module` = `zz_modules`.`id` SET `zz_views`.`name` = 'Bloccato' WHERE `zz_views`.`name` = 'Completato' AND `zz_modules`.`name` IN ('Stati dei preventivi', 'Stati dei contratti', 'Stati degli ordini', 'Stati DDT');
166163

167164
-- Aggiornamento delle traduzioni nelle viste
168165
UPDATE `zz_views_lang` SET `title` = 'Bloccato' WHERE `id_record` IN (SELECT `id` FROM `zz_views` WHERE `name` = 'Bloccato');

‎update/2_8_1.sql‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ INSERT INTO `co_pianodeiconti3` (`numero`, `descrizione`, `idpianodeiconti2`, `d
3030
INSERT INTO `zz_settings` (`nome`, `valore`, `tipo`, `editable`, `sezione`, `order`, `is_user_setting`) VALUES
3131
('Conto per Iva transitoria', (SELECT `id` FROM `co_pianodeiconti3` WHERE `descrizione` = 'Iva transitoria'), "query=SELECT `id`, CONCAT_WS(' - ', `numero`, `descrizione`) AS descrizione FROM `co_pianodeiconti3` ORDER BY `descrizione` ASC", '1', 'Piano dei conti', NULL, '0');
3232

33-
SELECT @id_record := `id` FROM `zz_settings` WHERE `nome` = 'Conto per Iva transitoria';
3433
INSERT INTO `zz_settings_lang` (`id_lang`, `id_record`, `title`, `help`) VALUES
35-
('1', @id_record, 'Conto per Iva transitoria', ''),
36-
('2', @id_record, 'Conto per Iva transitoria', '');
34+
('1', (SELECT `id` FROM `zz_settings` WHERE `nome` = 'Conto per Iva transitoria'), 'Conto per Iva transitoria', ''),
35+
('2', (SELECT `id` FROM `zz_settings` WHERE `nome` = 'Conto per Iva transitoria'), 'Conto per Iva transitoria', '');
3736

3837
-- Pulizia dei permessi sui segmenti per gruppi che non hanno accesso al modulo (esclusi gli Amministratori)
3938
DELETE `zz_group_segment` FROM `zz_group_segment`

0 commit comments

Comments
 (0)