Skip to content

Commit 88a1403

Browse files
committed
feat: Gestione attivazione task
1 parent f98ef58 commit 88a1403

4 files changed

Lines changed: 24 additions & 16 deletions

File tree

‎cron.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
}
133133

134134
// Aggiornamento dei cron disponibili
135-
$tasks = Task::all();
135+
$tasks = Task::all()->where('enabled', 1);
136136
foreach ($tasks as $task) {
137137
$adesso = new Carbon();
138138

‎modules/gestione_task/actions.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
$task->setTranslation('title', $name);
3333
$task->class = post('class');
3434
$task->expression = post('expression');
35+
$task->enabled = post('enabled');
3536
$task->save();
3637
}
3738

‎modules/gestione_task/edit.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,13 @@
7575
</div>
7676
</div>
7777
<div class="row">
78-
<div class="col-md-6">
78+
<div class="col-md-4">
79+
{[ "type": "checkbox", "label": "'.tr('Stato task').'", "name": "enabled", "value": "$enabled$" ]}
80+
</div>
81+
<div class="col-md-4">
7982
{[ "type": "date", "label": "'.tr('Data prossima esecuzione').'", "name": "next_execution_at", "value": "$next_execution_at$", "readonly": 1, "icon-before": "<i class=\"fa fa-calendar-plus-o\"></i>" ]}
8083
</div>
81-
<div class="col-md-6">
84+
<div class="col-md-4">
8285
{[ "type": "date", "label": "'.tr('Data precedente esecuzione').'", "name": "last_executed_at", "value": "$last_executed_at$", "readonly": 1, "icon-before": "<i class=\"fa fa-calendar-check-o\"></i>" ]}
8386
</div>
8487
</div>

‎update/2_9.sql‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -174,25 +174,25 @@ ALTER TABLE `co_provvigioni` ADD CONSTRAINT `co_provvigioni_ibfk_1` FOREIGN KEY
174174
ALTER TABLE `co_provvigioni` ADD CONSTRAINT `co_provvigioni_ibfk_2` FOREIGN KEY (`idarticolo`) REFERENCES `mg_articoli`(`id`) ON DELETE CASCADE ON UPDATE RESTRICT;
175175

176176
-- Modulo per log esecuzione task
177-
INSERT INTO `zz_modules` (`name`, `directory`, `options`, `options2`, `icon`, `version`, `compatibility`, `order`, `parent`, `default`, `enabled`) VALUES ('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');
177+
INSERT INTO `zz_modules` (`name`, `directory`, `options`, `options2`, `icon`, `version`, `compatibility`, `order`, `parent`, `default`, `enabled`) VALUES ('Log eventi', 'log_task', 'SELECT |select|FROM(SELECT name, zz_tasks_logs.level, zz_tasks_logs.message, IF( LEVEL = \'info\', \'#dff0d8\', IF(LEVEL = \'error\', \'#f2dede\', \'#fcf8e3\') ) AS \'_bg_\', IF( CHAR_LENGTH(CONTEXT) > 200, CONCAT( SUBSTRING(CONTEXT, 1, 200), \'<a title=\"\', REPLACE(CONTEXT, \'\">\', \'[...]\'), \'</a>\' ), CONTEXT ) AS \'Contesto\', CONTEXT AS \'contesto_esteso\', zz_tasks_logs.created_at AS \'Data inizio\', zz_tasks_logs.updated_at AS \'Data fine\', CONCAT( TIMESTAMPDIFF( SECOND, zz_tasks_logs.created_at, zz_tasks_logs.updated_at ), \' secondi\' ) AS \'Eseguito in\'FROM `zz_tasks_logs` INNER JOIN `zz_tasks` ON `zz_tasks`.`id`=`zz_tasks_logs`.`id_task` WHERE 1=1 HAVING 2=2 UNION ALL SELECT NAME, zz_api_log.level, zz_api_log.message, IF( LEVEL = \'info\', \'#dff0d8\', IF(LEVEL = \'error\', \'#f2dede\', \'#fcf8e3\') ) AS \'_bg_\', IF( CHAR_LENGTH(CONTEXT) > 200, CONCAT( SUBSTRING(CONTEXT, 1, 200), \'<a title=\"\', REPLACE(CONTEXT, \'\">\',\'[...]\'), \'</a>\' ), CONTEXT ) AS \'Contesto\', CONTEXT AS \'contesto_esteso\', zz_api_log.created_at AS \'Data inizio\', zz_api_log.updated_at AS \'Data fine\', CONCAT( TIMESTAMPDIFF( SECOND, zz_api_log.created_at, zz_api_log.updated_at ), \' secondi\' ) AS \'Eseguito in\'FROM `zz_api_log`WHERE 1=1 HAVING 2=2 ) AS dati ORDER BY `Data inizio` DESC', '', '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');
178178

179179
SELECT @id_module := id FROM zz_modules WHERE `name` = 'Log task';
180180
INSERT INTO `zz_modules_lang` (`id_lang`, `id_record`, `title`) VALUES
181-
('1', @id_module, 'Log task'),
182-
('2', @id_module, 'Log task');
181+
('1', @id_module, 'Log eventi'),
182+
('2', @id_module, 'Events log');
183183

184184
SELECT @id_module := id FROM zz_modules WHERE `name` = 'Log task';
185185
INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `search_inside`, `order_by`, `visible`, `summable`, `default`, `html_format`) VALUES
186186
(@id_module, 'id', 'id', '1', '0', '0', '0', NULL, NULL, '0', '0', '0', '0'),
187-
(@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'),
188-
(@id_module, 'Livello', 'level', '3', '1', '0', '0', NULL, NULL, '1', '0', '0', '0'),
189-
(@id_module, 'Messaggio', 'message', '4', '1', '0', '0', NULL, NULL, '1', '0', '0', '0'),
190-
(@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'),
191-
(@id_module, 'contesto_esteso', 'context', '5', '1', '0', '0', NULL, NULL, '0', '0', '0', '1'),
192-
(@id_module, 'Data inizio', 'created_at', '6', '1', '0', '1', NULL, NULL, '1', '0', '0', '0'),
193-
(@id_module, 'Data fine', 'updated_at', '6', '1', '0', '1', NULL, NULL, '1', '0', '0', '0'),
194-
(@id_module, '_bg_', 'IF(level="info", "#dff0d8", IF(level="error", "#f2dede", "#fcf8e3"))', '0', '1', '0', '0', NULL, NULL, '0', '0', '0', '0'),
195-
(@id_module, 'Eseguito in', 'CONCAT(TIMESTAMPDIFF(SECOND, created_at, updated_at), \'secondi\')', '7', '1', '0', '1', NULL, NULL, '0', '0', '0', '0');
187+
(@id_module, 'Nome task', 'name', '2', '1', '0', '0', NULL, 'name', '1', '0', '0', '0'),
188+
(@id_module, 'Livello', 'level', '3', '1', '0', '0', NULL, 'level', '1', '0', '0', '0'),
189+
(@id_module, 'Messaggio', 'message', '4', '1', '0', '0', NULL, 'message', '1', '0', '0', '0'),
190+
(@id_module, 'Contesto', '`Contesto`', '5', '1', '0', '0', NULL, 'contesto_esteso', '1', '0', '0', '1'),
191+
(@id_module, 'contesto_esteso', 'contesto_esteso', '5', '1', '0', '0', NULL, 'contesto_esteso', '0', '0', '0', '1'),
192+
(@id_module, 'Data inizio', '`Data inizio`', '6', '1', '0', '1', NULL, '`Data inizio`', '1', '0', '0', '0'),
193+
(@id_module, 'Data fine', '`Data fine`', '6', '1', '0', '1', NULL, '`Data fine`', '1', '0', '0', '0'),
194+
(@id_module, '_bg_', '_bg_', '0', '1', '0', '0', NULL, NULL, '0', '0', '0', '0'),
195+
(@id_module, 'Eseguito in', '`Eseguito in`', '7', '1', '0', '1', NULL, '`Eseguito in`', '0', '0', '0', '0');
196196

197197
SELECT @id_module := id FROM zz_modules WHERE `name` = 'Log task';
198198
INSERT INTO `zz_views_lang` (`id`, `id_lang`, `id_record`, `title`) VALUES
@@ -272,4 +272,8 @@ INSERT INTO `zz_settings_lang` (`id_lang`, `id_record`, `title`, `help`) VALUES
272272
INSERT INTO `zz_settings_lang` (`id_lang`, `id_record`, `title`, `help`) VALUES ('2', (SELECT id FROM `zz_settings` WHERE `nome` = 'Conto predefinito per gli ammortamenti'), 'Default account for depreciation', '');
273273

274274
-- Gestione salvataggio allegati email
275-
CREATE TABLE `em_email_attachment` (`id` INT NOT NULL AUTO_INCREMENT , `id_email` INT NOT NULL , `id_file` INT NOT NULL , `name` VARCHAR(255) NULL , `type` VARCHAR(255) NOT NULL , PRIMARY KEY (`id`));
275+
CREATE TABLE `em_email_attachment` (`id` INT NOT NULL AUTO_INCREMENT , `id_email` INT NOT NULL , `id_file` INT NOT NULL , `name` VARCHAR(255) NULL , `type` VARCHAR(255) NOT NULL , PRIMARY KEY (`id`));
276+
277+
-- Tasto per disattivazione dei task
278+
ALTER TABLE `zz_tasks` ADD `enabled` TINYINT NOT NULL DEFAULT '0';
279+
UPDATE `zz_tasks` SET `enabled` = '1';

0 commit comments

Comments
 (0)