From 5b4e69ed21916c0b751c581fbf97acd5552d097c Mon Sep 17 00:00:00 2001 From: Enrique Camargo Date: Tue, 28 Feb 2017 14:39:23 +0100 Subject: [PATCH] Merge branch '74-muestra-last-contact-en-rojo-no-deberia-2' into 'develop' Check interval filter agents without modules and disabled modules - #74 See merge request !217 --- pandora_console/include/functions_agents.php | 2 +- pandora_console/include/functions_modules.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 7beb900349..a66df8460f 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -1407,7 +1407,7 @@ function agents_get_interval_status ($agent) { $time = ui_print_timestamp ($last_time, true, array('style' => 'font-size:6.5pt')); $min_interval = modules_get_agentmodule_mininterval_no_async($agent['id_agente']); $return = $time; - if ($diferencia > ($min_interval["min_interval"] * 2)) + if ($diferencia > ($min_interval["min_interval"] * 2) && $min_interval['num_interval'] > 0) $return = ''.$time.''; return $return; diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index a172ad9a71..b864976ad6 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -2428,10 +2428,10 @@ function modules_get_agentmodule_mininterval($id_agent) { } function modules_get_agentmodule_mininterval_no_async($id_agent) { - $sql = 'SELECT MIN(tae.current_interval) AS min_interval + $sql = 'SELECT COUNT(tae.current_interval) AS num_interval, MIN(tae.current_interval) AS min_interval FROM tagente_estado tae INNER JOIN tagente_modulo tam ON tae.id_agente_modulo = tam.id_agente_modulo - INNER JOIN ttipo_modulo ttm ON tam.id_tipo_modulo = ttm.id_tipo where ttm.nombre not like "async%" and tae.id_agente = '.$id_agent; + INNER JOIN ttipo_modulo ttm ON tam.id_tipo_modulo = ttm.id_tipo where ttm.nombre not like "async%" and tae.id_agente = '.$id_agent.' and tam.disabled = 0'; return db_get_row_sql($sql); }