{[ "type": "date", "label": "", "name": "data_richiesta", "required": 1, "value": "-now-" ]}
+
{[ "type": "date", "label": "", "name": "data", "required": 1, "value": "" ]}
-
+
{[ "type": "select", "label": "", "name": "idzona", "values": "query=SELECT id, nome AS descrizione FROM an_zone ORDER BY nome", "value": "" ]}
diff --git a/update/2_3.php b/update/2_3.php
index 976b9a3c3..013078da7 100644
--- a/update/2_3.php
+++ b/update/2_3.php
@@ -159,7 +159,7 @@ $dirs = [
'zone',
];
-$pieces = array_chunk($tables, 5);
+$pieces = array_chunk($dirs, 5);
foreach ($pieces as $piece) {
$files = glob($docroot.'/modules/{'.implode(',', $piece).'}/*.html', GLOB_BRACE);
diff --git a/update/2_3.sql b/update/2_3.sql
index 3c959d209..35e63801d 100644
--- a/update/2_3.sql
+++ b/update/2_3.sql
@@ -952,5 +952,9 @@ ALTER TABLE `or_righe_ordini` CHANGE `data_evasione` `data_evasione` date;
-- ALTER TABLE `my_componenti_interventi` ADD PRIMARY KEY (`id_intervento`, `id_componente`);
-- ALTER TABLE `my_impianti_interventi` ADD PRIMARY KEY (`idintervento`, `idimpianto`);
+-- Fix di alcuni problemi con le query dei widget
UPDATE `zz_widgets` SET `query` = 'SELECT CONCAT_WS(" ", REPLACE(REPLACE(REPLACE(FORMAT(SUM(qta),2), ",", "#"), ".", ","), "#", "."), "unità") AS dato FROM mg_articoli WHERE qta>0' WHERE `name` = 'Articoli in magazzino';
UPDATE `zz_widgets` SET `query` = 'SELECT CONCAT_WS(" ", REPLACE(REPLACE(REPLACE(FORMAT(SUM(prezzo_acquisto*qta),2), ",", "#"), ".", ","), "#", "."), "€") AS dato FROM mg_articoli WHERE qta>0' WHERE `name` = 'Valore magazzino';
+
+-- Fix per le sessioni di lavoro dei tecnici precedenti
+UPDATE `in_interventi_tecnici` SET `idtipointervento` = (SELECT `idtipointervento` FROM `in_interventi` WHERE `idintervento` = `in_interventi`.`id`) WHERE `idtipointervento` = '';
diff --git a/update/api.php b/update/api.php
index 2f79aff39..ce26e66fe 100644
--- a/update/api.php
+++ b/update/api.php
@@ -90,33 +90,20 @@ $tables = [
'zz_semaphores',
];
-$pieces = array_chunk($tables, 10);
+foreach ($tables as $table) {
+ if ($database->fetchNum('SHOW TABLES WHERE `Tables_in_'.$database->getDatabaseName().'` = '.prepare($table))) {
+ $query = 'SHOW COLUMNS FROM '.$table.' FROM '.$database->getDatabaseName()." WHERE Field='|field|'";
-foreach ($pieces as $piece) {
- $implode = [];
- foreach ($piece as $table) {
- $implode[] = prepare($table);
- }
+ $created_at = $database->fetchArray(str_replace('|field|', 'created_at', $query));
+ if (empty($created_at)) {
+ $database->query('ALTER TABLE `'.$table.'` ADD `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP');
+ }
- $query = 'SELECT table_name FROM INFORMATION_SCHEMA.TABLES T WHERE T.TABLE_SCHEMA = '.prepare($database->getDatabaseName()).' AND
- T.TABLE_NAME IN('.implode(',', $implode).") AND
- NOT EXISTS (
- SELECT table_name
- FROM INFORMATION_SCHEMA.COLUMNS C
- WHERE
- C.TABLE_SCHEMA = T.TABLE_SCHEMA AND
- C.TABLE_NAME = T.TABLE_NAME AND
- C.COLUMN_NAME = '|field|')";
-
- $created_at = $database->fetchArray(str_replace('|field|', 'created_at', $query));
- foreach ($created_at as $table) {
- $database->query('ALTER TABLE `'.$table['table_name'].'` ADD `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP');
- }
-
- if (API::isCompatible()) {
- $updated_at = $database->fetchArray(str_replace('|field|', 'updated_at', $query));
- foreach ($updated_at as $table) {
- $database->query('ALTER TABLE `'.$table['table_name'].'` `updated_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP');
+ if (API::isCompatible()) {
+ $updated_at = $database->fetchArray(str_replace('|field|', 'updated_at', $query));
+ if (empty($updated_at)) {
+ $database->query('ALTER TABLE `'.$table.'` ADD `updated_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP');
+ }
}
}
}