From ea9cbb69731ca663e70da1747010f55f9b9a5a5f Mon Sep 17 00:00:00 2001
From: "tatiana.llorente@artica.es" <tatiana.llorente@artica.es>
Date: Tue, 13 Nov 2018 11:20:27 +0100
Subject: [PATCH] Changed visual styles - #2784
---
pandora_console/include/ajax/module.php | 40 +++++++++++++------------
1 file changed, 21 insertions(+), 19 deletions(-)
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index f15b47cc7f..8d4fca2cb8 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -1316,7 +1316,7 @@ if($build_table_child_custom_fields){
tam.min_warning, tam.max_warning,
tam.min_critical, tam.max_critical,
tae.estado, tae.current_interval,
- tae.utimestamp
+ tae.utimestamp, tae.datos
FROM tagente_modulo tam
INNER JOIN tagente_estado tae
ON tam.id_agente_modulo = tae.id_agente_modulo
@@ -1336,26 +1336,30 @@ if($build_table_child_custom_fields){
$table_modules->head = array();
$table_modules->head[0] = __('Name');
- $table_modules->head[1] = __('Min Warning');
- $table_modules->head[2] = __('Max Warning');
- $table_modules->head[3] = __('Min Critical');
- $table_modules->head[4] = __('Max Critical');
- $table_modules->head[5] = __('Status');
+ $table_modules->head[1] = __('Data');
+ $table_modules->head[2] = __('Min Warning');
+ $table_modules->head[3] = __('Max Warning');
+ $table_modules->head[4] = __('Min Critical');
+ $table_modules->head[5] = __('Max Critical');
$table_modules->head[6] = __('Current interval');
- $table_modules->head[7] = __('utimestamp');
+ $table_modules->head[7] = __('Date');
+ $table_modules->head[8] = __('Status');
$table_modules->data = array();
if(isset($modules) && is_array($modules)){
foreach ($modules as $key => $value) {
$table_modules->data[$key][0] = $value['nombre'];
- $table_modules->data[$key][1] = $value['min_warning'];
- $table_modules->data[$key][2] = $value['max_warning'];
- $table_modules->data[$key][3] = $value['min_critical'];
- $table_modules->data[$key][4] = $value['max_critical'];
+ $table_modules->data[$key][1] = $value['datos'];
+ $table_modules->data[$key][2] = $value['min_warning'];
+ $table_modules->data[$key][3] = $value['max_warning'];
+ $table_modules->data[$key][4] = $value['min_critical'];
+ $table_modules->data[$key][5] = $value['max_critical'];
+ $table_modules->data[$key][6] = $value['current_interval'];
+ $table_modules->data[$key][7] = date('d/m/Y h:i:s', $value['utimestamp']);
switch ($value['estado']) {
case 0:
case 300:
- $table_modules->data[$key][5] = '('. $value['estado'] . ') ' . html_print_image(
+ $table_modules->data[$key][8] = html_print_image(
'images/status_sets/default/severity_normal.png',
true,
array(
@@ -1365,7 +1369,7 @@ if($build_table_child_custom_fields){
break;
case 1:
case 100:
- $table_modules->data[$key][5] = '('. $value['estado'] . ') ' . html_print_image(
+ $table_modules->data[$key][8] = html_print_image(
'images/status_sets/default/severity_critical.png',
true,
array(
@@ -1375,7 +1379,7 @@ if($build_table_child_custom_fields){
break;
case 2:
case 200:
- $table_modules->data[$key][5] = '('. $value['estado'] . ') ' . html_print_image(
+ $table_modules->data[$key][8] = html_print_image(
'images/status_sets/default/severity_warning.png',
true,
array(
@@ -1384,7 +1388,7 @@ if($build_table_child_custom_fields){
);
break;
case 3:
- $table_modules->data[$key][5] = '('. $value['estado'] . ') ' . html_print_image(
+ $table_modules->data[$key][8] = html_print_image(
'images/status_sets/default/severity_maintenance.png',
true,
array(
@@ -1394,7 +1398,7 @@ if($build_table_child_custom_fields){
break;
case 4:
case 5:
- $table_modules->data[$key][5] = '('. $value['estado'] . ') ' . html_print_image(
+ $table_modules->data[$key][8] = html_print_image(
'images/status_sets/default/severity_informational.png',
true,
array(
@@ -1403,7 +1407,7 @@ if($build_table_child_custom_fields){
);
break;
default:
- $table_modules->data[$key][5] = '('. $value['estado'] . ') ' . html_print_image(
+ $table_modules->data[$key][8] = html_print_image(
'images/status_sets/default/severity_normal.png',
true,
array(
@@ -1412,8 +1416,6 @@ if($build_table_child_custom_fields){
);
break;
}
- $table_modules->data[$key][6] = $value['current_interval'];
- $table_modules->data[$key][7] = date('d/m/Y h:i:s', $value['utimestamp']);
}
}