Merge branch 'ent-13521-widget-module-value-muestra-colores-incorrectos' into 'develop'

Ent 13521 Widget Module Value muestra colores incorrectos

See merge request artica/pandorafms!7320
This commit is contained in:
Enrique Martin 2024-04-29 16:30:04 +00:00
commit a191ef3732
1 changed files with 12 additions and 19 deletions

View File

@ -447,25 +447,18 @@ class ModuleValueWidget extends Widget
$sizeLabel = (isset($this->values['sizeLabel']) === true) ? $this->values['sizeLabel'] : 40; $sizeLabel = (isset($this->values['sizeLabel']) === true) ? $this->values['sizeLabel'] : 40;
$sizeValue = (isset($this->values['sizeValue']) === true) ? $this->values['sizeValue'] : 40; $sizeValue = (isset($this->values['sizeValue']) === true) ? $this->values['sizeValue'] : 40;
$sql = 'SELECT min_warning, $db_status = modules_get_agentmodule_status($this->values['moduleId']);
max_warning, $module_value = modules_get_last_value($this->values['moduleId']);
min_critical, $status = 0;
max_critical, $title = '';
str_warning, modules_get_status($this->values['moduleId'], $db_status, $module_value, $status, $title);
str_critical $color = match ($status) {
FROM tagente_modulo STATUS_MODULE_NO_DATA => COL_NOTINIT,
WHERE id_agente_modulo = '.(int) $this->values['moduleId']; STATUS_MODULE_CRITICAL => COL_CRITICAL,
$sql_data = db_get_row_sql($sql); STATUS_MODULE_WARNING => COL_WARNING,
STATUS_MODULE_OK => COL_NORMAL,
$last = modules_get_last_value($this->values['moduleId']); STATUS_MODULE_UNKNOWN => COL_UNKNOWN,
};
if (($last >= $sql_data['min_warning']) && ($last < $sql_data['max_warning'])) {
$color = COL_WARNING;
}
if ($last >= $sql_data['max_warning']) {
$color = COL_CRITICAL;
}
$uuid = uniqid(); $uuid = uniqid();
$output .= '<div class="container-center" id="container-'.$uuid.'">'; $output .= '<div class="container-center" id="container-'.$uuid.'">';