From 4fdb6a6c94f14ca2c68afc92daad81ada9537ce9 Mon Sep 17 00:00:00 2001 From: Pek5892 Date: Tue, 30 Apr 2024 18:03:45 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20controllo=20numerazione=20attivit=C3=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/interventi/edit.php | 1 + modules/interventi/init.php | 5 +++-- modules/segmenti/init.php | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/interventi/edit.php b/modules/interventi/edit.php index a641724ce..c2c1f1205 100755 --- a/modules/interventi/edit.php +++ b/modules/interventi/edit.php @@ -26,6 +26,7 @@ include_once __DIR__.'/../../core.php'; $block_edit = $record['flag_completato']; $id_modulo_anagrafiche = (new Module())->getByField('title', 'Anagrafiche', Models\Locale::getPredefined()->id); +$id_segment = $record['id_segment']; // Verifica aggiuntive sulla sequenzialità dei numeri $numero_previsto = verifica_numero_intervento($intervento, $id_segment); diff --git a/modules/interventi/init.php b/modules/interventi/init.php index 20cd410c7..6e4227af8 100755 --- a/modules/interventi/init.php +++ b/modules/interventi/init.php @@ -25,7 +25,8 @@ use Modules\Interventi\Intervento; if (!empty($id_record)) { $intervento = Intervento::find($id_record); - $record = $dbo->fetchOne('SELECT *, + $record = $dbo->fetchOne('SELECT + `in_interventi`.*, `in_interventi`.`descrizione` AS descrizione, `in_interventi`.`codice` AS codice, `an_anagrafiche`.`tipo` AS tipo_anagrafica, @@ -37,7 +38,7 @@ if (!empty($id_record)) { `in_interventi`.`id_contratto` as idcontratto, `in_interventi`.`id_ordine` as idordine FROM - in_interventi + `in_interventi` INNER JOIN `an_anagrafiche` ON `in_interventi`.`idanagrafica` = `an_anagrafiche`.`idanagrafica` LEFT JOIN `an_sedi` ON `in_interventi`.`idsede_destinazione` = `an_sedi`.`id` INNER JOIN `in_statiintervento` ON `in_interventi`.`idstatointervento` = `in_statiintervento`.`id` diff --git a/modules/segmenti/init.php b/modules/segmenti/init.php index fafaf3bea..f260b569d 100755 --- a/modules/segmenti/init.php +++ b/modules/segmenti/init.php @@ -24,6 +24,7 @@ use PHPSQLParser\PHPSQLParser; if (!empty($id_record)) { $record = $dbo->fetchOne('SELECT `zz_segments`.*, + `zz_segments_lang`.`title`, `zz_modules`.`options`, `zz_modules_lang`.`title` AS modulo, (SELECT COUNT(`t`.`id`) FROM `zz_segments` t WHERE `t`.`id_module` = `zz_segments`.`id_module`) AS n_sezionali