feat: Miglioramento gestione log task con modulo di consultazione eventi

BeppeJQ · BeppeJQ · commit bb9828920e78 · 2025-07-14T10:02:15.000+02:00
diff --git a/modules/backups/src/BackupTask.php b/modules/backups/src/BackupTask.php
@@ -35,8 +35,25 @@ public function needsExecution()
 
     public function execute()
     {
+        $result = [
+            'response' => 1,
+            'message' => tr('Backup generato correttamente!'),
+        ];
+
         if (setting('Backup automatico') && !\Backup::isDailyComplete()) {
             \Backup::daily();
+        }elseif(!setting('Backup automatico')){
+            $result = [
+                'response' => 2,
+                'message' => tr('Backup automatico disattivato'),
+            ];
+        }else{
+            $result = [
+                'response' => 2,
+                'message' => tr('Backup già eseguito'),
+            ];
         }
+
+        return $result;
     }
 }
diff --git a/modules/emails/src/EmailTask.php b/modules/emails/src/EmailTask.php
@@ -36,8 +36,20 @@ public function needsExecution()
 
     public function execute()
     {
+        $result = [
+            'response' => 1,
+            'message' => tr('Email inviate correttamente!'),
+        ];
+
         $lista = database()->fetchArray('SELECT * FROM em_emails WHERE (sent_at IS NULL OR failed_at IS NOT NULL) AND attempt<'.prepare(setting('Numero massimo di tentativi')).' ORDER BY created_at LIMIT 0,'.setting('Numero email da inviare in contemporanea per account'));
 
+        if( empty($lista) ){
+            $result = [
+                'response' => 1,
+                'message' => tr('Nessuna email da inviare'),
+            ];
+        }
+
         foreach ($lista as $mail) {
             $mail = Mail::find($mail['id']);
 
@@ -46,9 +58,14 @@ public function execute()
                 $email->send();
             } catch (Exception $e) {
                 echo $e;
+
+                $result['response'] = 2;
+                $result['message'] = tr('Errore durante l\'invio delle email: _ERR_', [
+                    '_ERR_' => $e->getMessage(),
+                ])."<br>";
             }
         }
 
-        return $lista;
+        return $result;
     }
 }
diff --git a/modules/scadenzario/src/SollecitoTask.php b/modules/scadenzario/src/SollecitoTask.php
@@ -44,6 +44,11 @@ public function needsExecution()
 
     public function execute()
     {
+        $result = [
+            'response' => 1,
+            'message' => tr('Solleciti inviati correttamente!'),
+        ];
+
         if (setting('Invio solleciti in automatico') > 0) {
             $giorni_promemoria = setting('Intervallo di giorni in anticipo per invio promemoria scadenza');
             $giorni_scadenza = setting('Ritardo in giorni della scadenza della fattura per invio sollecito pagamento');
@@ -264,6 +269,13 @@ public function execute()
                     }
                 }
             }
+        }else{
+            $result = [
+                'response' => 2,
+                'message' => tr('Invio solleciti disattivato'),
+            ];
         }
+
+        return $result;
     }
 }
diff --git a/modules/stato_email/src/EliminaMailTask.php b/modules/stato_email/src/EliminaMailTask.php
@@ -44,12 +44,31 @@ public function needsExecution()
 
     public function execute()
     {
+        $result = [
+            'response' => 1,
+            'message' => tr('Email eliminate correttamente!'),
+        ];
+
         if (setting('Numero di giorni mantenimento coda di invio') > 0) {
             $rs = database()->fetchArray('SELECT * FROM em_emails WHERE sent_at<DATE_SUB(NOW(), INTERVAL '.setting('Numero di giorni mantenimento coda di invio').' DAY) AND id_newsletter IS NOT NULL');
 
+            if( empty($rs) ){
+                $result = [
+                    'response' => 1,
+                    'message' => tr('Nessuna email da eliminare'),
+                ];
+            }
+
             foreach ($rs as $r) {
                 database()->query('DELETE FROM em_emails WHERE id='.prepare($r['id']));
             }
+        }else{
+            $result = [
+                'response' => 2,
+                'message' => tr('Eliminazione automatica disattivata'),
+            ];
         }
+
+        return $result;
     }
 }
diff --git a/plugins/receiptFE/src/ReceiptTask.php b/plugins/receiptFE/src/ReceiptTask.php
@@ -31,17 +31,35 @@ class ReceiptTask extends Manager
 {
     public function execute()
     {
+        $result = [
+            'response' => 1,
+            'message' => tr('Ricevute importate correttamente!'),
+        ];
+
         if (!Interaction::isEnabled()) {
-            return;
+            $result = [
+                'response' => 2,
+                'message' => tr('Importazione automatica disattivata'),
+            ];
+            return $result; 
         }
 
         $list = Interaction::getReceiptList();
 
+        if( empty($list) ){
+            $result = [
+                'response' => 1,
+                'message' => tr('Nessuna ricevuta da importare'),
+            ];
+        }
+
         // Esecuzione dell'importazione
         foreach ($list as $element) {
             $name = $element['name'];
 
             Ricevuta::process($name);
         }
+
+        return $result;
     }
 }
diff --git a/src/Tasks/Task.php b/src/Tasks/Task.php
@@ -44,10 +44,12 @@ class Task extends Model
         'last_executed_at' => 'datetime',
     ];
 
-    public function log($level, $message, $context = [])
+    public function log($level, $message, $context = [], $log = null)
     {
         if (!empty($context)) {
-            $log = new Log();
+            if( empty($log) ){
+                $log = new Log();
+            }
 
             $log->level = $level;
             $log->message = $message;
@@ -57,12 +59,14 @@ public function log($level, $message, $context = [])
 
             $log->save();
         }
+
+        return $log;
     }
 
     public function execute()
     {
         // Registrazione dell'inizio nei log
-        $this->log('info', 'Inizio esecuzione');
+        $log = $this->log('warning', 'Inizio esecuzione');
 
         // Individuazione del gestore
         $class = $this->attributes['class'];
@@ -79,7 +83,8 @@ public function execute()
         $this->save();
 
         // Registrazione del completamento nei log
-        $this->log('info', 'Fine esecuzione');
+        $level = ($result['response']==1 ? 'info' : ($result['response']==2 ? 'warning' : 'error'));
+        $this->log($level, 'Fine esecuzione', $result['message'], $log);
 
         return $result;
     }
diff --git a/update/2_9.sql b/update/2_9.sql
@@ -172,3 +172,56 @@ DELETE FROM `co_provvigioni` WHERE `idagente` NOT IN (SELECT `id` FROM `an_anagr
 -- Aggiunta foreign key su co_provvigioni
 ALTER TABLE `co_provvigioni` ADD CONSTRAINT `co_provvigioni_ibfk_1` FOREIGN KEY (`idagente`) REFERENCES `an_anagrafiche`(`idanagrafica`) ON DELETE CASCADE ON UPDATE RESTRICT;
 ALTER TABLE `co_provvigioni` ADD CONSTRAINT `co_provvigioni_ibfk_2` FOREIGN KEY (`idarticolo`) REFERENCES `mg_articoli`(`id`) ON DELETE CASCADE ON UPDATE RESTRICT;
+
+-- Modulo per log esecuzione task
+INSERT INTO `zz_modules` (`id`, `name`, `directory`, `options`, `options2`, `icon`, `version`, `compatibility`, `order`, `parent`, `default`, `enabled`) VALUES (NULL, 'Log task', 'log_task', 'SELECT |select| FROM `zz_tasks_logs` WHERE 1=1 HAVING 2=2', '', 'fa fa-calendar', '2.5.7.1', '2.5.7.1', '5', (SELECT `id` FROM `zz_modules` t WHERE t.`name` = 'Gestione task '), '1', '1');
+
+SELECT @id_module := MAX(id) FROM zz_modules;
+INSERT INTO `zz_modules_lang` (`id`, `id_lang`, `id_record`, `title`) VALUES 
+(NULL, '1', @id_module, 'Log task'),
+(NULL, '2', @id_module, 'Log task');
+
+INSERT INTO `zz_views` (`id`, `id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `search_inside`, `order_by`, `visible`, `summable`, `default`, `html_format`) VALUES 
+(NULL, @id_module, 'id', 'id', '1', '0', '0', '0', NULL, NULL, '0', '0', '0', '0'),
+(NULL, @id_module, 'Nome task', '(SELECT `name` FROM `zz_tasks` WHERE `id` = `zz_tasks_logs`.`id_task`)', '2', '1', '0', '0', NULL, NULL, '1', '0', '0', '0'),
+(NULL, @id_module, 'Livello', 'level', '3', '1', '0', '0', NULL, NULL, '1', '0', '0', '0'),
+(NULL, @id_module, 'Messaggio', 'message', '4', '1', '0', '0', NULL, NULL, '1', '0', '0', '0'),
+(NULL, @id_module, 'Contesto', 'IF(CHAR_LENGTH(context) > 200, CONCAT(SUBSTRING(context, 1, 200), \'<a title="\', REPLACE(context, \'"\', \'&quot;\'), \'">\', \'[...]\', \'</a>\') , context )', '5', '1', '0', '0', NULL, NULL, '1', '0', '0', '1'),
+(NULL, @id_module, 'contesto_esteso', 'context', '5', '1', '0', '0', NULL, NULL, '0', '0', '0', '1'),
+(NULL, @id_module, 'Data inizio', 'created_at', '6', '1', '0', '1', NULL, NULL, '1', '0', '0', '0'),
+(NULL, @id_module, 'Data fine', 'updated_at', '6', '1', '0', '1', NULL, NULL, '1', '0', '0', '0'),
+(NULL, @id_module, '_bg_', 'IF(level=\'info\', \'#dff0d8\', IF(level=\'error\', \'#f2dede\', \'#fcf8e3\'))
+', '4', '1', '0', '0', NULL, NULL, '0', '0', '0', '0'),
+(NULL, @id_module, 'Eseguito in', 'CONCAT(TIMESTAMPDIFF(SECOND, created_at, updated_at), \'secondi\')', '7', '1', '0', '1', NULL, NULL, '0', '0', '0', '0');
+
+INSERT INTO `zz_views_lang` (`id`, `id_lang`, `id_record`, `title`) VALUES 
+(NULL, '1', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'id'), 'id'),
+(NULL, '2', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'id'), 'id'),
+(NULL, '1', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Nome task'), 'Nome task'),
+(NULL, '2', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Nome task'), 'Task name'),
+(NULL, '1', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Livello'), 'Livello'),
+(NULL, '2', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Livello'), 'Level'),
+(NULL, '1', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Messaggio'), 'Messaggio'),
+(NULL, '2', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Messaggio'), 'Message'),
+(NULL, '1', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Contesto'), 'Contesto'),
+(NULL, '2', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Contesto'), 'Context'),
+(NULL, '1', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Data inizio'), 'Data inizio'),
+(NULL, '2', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Data inizio'), 'Start date'),
+(NULL, '1', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Data fine'), 'Data fine'),
+(NULL, '2', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Data fine'), 'End date'),
+(NULL, '1', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'contesto_esteso'), 'contesto_esteso'),
+(NULL, '2', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'contesto_esteso'), 'contesto_esteso'),
+(NULL, '1', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Eseguito in'), 'Eseguito in'),
+(NULL, '2', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Eseguito in'), 'Executed in'),
+(NULL, '1', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = '_bg_'), '_bg_'),
+(NULL, '2', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = '_bg_'), '_bg_');
+
+INSERT INTO `zz_segments` (`id`, `id_module`, `name`, `clause`, `position`, `pattern`, `note`, `dicitura_fissa`, `predefined`, `predefined_accredito`, `predefined_addebito`, `autofatture`, `for_fe`, `is_sezionale`, `is_fiscale`) VALUES 
+(NULL, @id_module, 'Tutti', '1=1', 'WHR', '####', '', '', '1', '0', '0', '0', '0', '0', '1'), 
+(NULL, @id_module, 'Errori', '1=1 AND Livello=error', 'WHR', '####', '', '', '0', '0', '0', '0', '0', '0', '0');
+
+INSERT INTO `zz_segments_lang` (`id`, `id_lang`, `id_record`, `title`) VALUES 
+(NULL, '1', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Tutti'), 'Tutti'),
+(NULL, '2', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Tutti'), 'All'),
+(NULL, '1', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Errori'), 'Errori'),
+(NULL, '2', (SELECT `id` FROM `zz_views` WHERE `id_module` = @id_module AND `name` = 'Errori'), 'Errors'):

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,11 @@ public function needsExecution()`
`44`	`44`
`45`	`45`	`public function execute()`
`46`	`46`	`{`
	`47`	`+ $result = [`
	`48`	`+ 'response' => 1,`
	`49`	`+ 'message' => tr('Solleciti inviati correttamente!'),`
	`50`	`+ ];`
	`51`	`+`
`47`	`52`	`if (setting('Invio solleciti in automatico') > 0) {`
`48`	`53`	`$giorni_promemoria = setting('Intervallo di giorni in anticipo per invio promemoria scadenza');`
`49`	`54`	`$giorni_scadenza = setting('Ritardo in giorni della scadenza della fattura per invio sollecito pagamento');`
`@@ -264,6 +269,13 @@ public function execute()`
`264`	`269`	`}`
`265`	`270`	`}`
`266`	`271`	`}`
	`272`	`+ }else{`
	`273`	`+ $result = [`
	`274`	`+ 'response' => 2,`
	`275`	`+ 'message' => tr('Invio solleciti disattivato'),`
	`276`	`+ ];`
`267`	`277`	`}`
	`278`	`+`
	`279`	`+ return $result;`
`268`	`280`	`}`
`269`	`281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,17 +31,35 @@ class ReceiptTask extends Manager`
`31`	`31`	`{`
`32`	`32`	`public function execute()`
`33`	`33`	`{`
	`34`	`+ $result = [`
	`35`	`+ 'response' => 1,`
	`36`	`+ 'message' => tr('Ricevute importate correttamente!'),`
	`37`	`+ ];`
	`38`	`+`
`34`	`39`	`if (!Interaction::isEnabled()) {`
`35`		`- return;`
	`40`	`+ $result = [`
	`41`	`+ 'response' => 2,`
	`42`	`+ 'message' => tr('Importazione automatica disattivata'),`
	`43`	`+ ];`
	`44`	`+ return $result;`
`36`	`45`	`}`
`37`	`46`
`38`	`47`	`$list = Interaction::getReceiptList();`
`39`	`48`
	`49`	`+ if( empty($list) ){`
	`50`	`+ $result = [`
	`51`	`+ 'response' => 1,`
	`52`	`+ 'message' => tr('Nessuna ricevuta da importare'),`
	`53`	`+ ];`
	`54`	`+ }`
	`55`	`+`
`40`	`56`	`// Esecuzione dell'importazione`
`41`	`57`	`foreach ($list as $element) {`
`42`	`58`	`$name = $element['name'];`
`43`	`59`
`44`	`60`	`Ricevuta::process($name);`
`45`	`61`	`}`
	`62`	`+`
	`63`	`+ return $result;`
`46`	`64`	`}`
`47`	`65`	`}`