From 82a9aa27210ed7f996a3f89b1ce0816e3f37e6f3 Mon Sep 17 00:00:00 2001 From: vgilc Date: Tue, 14 Feb 2012 17:29:40 +0000 Subject: [PATCH] 2012-02-14 Vanessa Gil * operation/events/events_list: Display all fields including empty values. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5599 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 4 + .../operation/events/events_list.php | 202 ++++++++++-------- 2 files changed, 121 insertions(+), 85 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 83f659f9f4..1f6ebb3c5a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,7 @@ +2012-02-14 Vanessa Gil + * operation/events/events_list: Display all fields including + empty values. + 2012-02-13 Juan Manuel Ramon * extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Migrate diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index d609996296..b6c69742a5 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -842,88 +842,91 @@ foreach ($result as $event) { $data[$i] = html_print_checkbox_extended ("eventid[]", $event["id_evento"], false, false, false, 'class="chk"', true); array_push ($table->data, $data); } - //Hiden row with description form - $string = '';//$string = '
'; - $string .= ''; - $string .= ''; - $string .= '
'; - $string .= '' . __('Comment:') . '' . html_print_textarea("comment_".$event["id_evento"], 2, 10, '', 'style="min-height: 10px; width: 250px;"', true) . ''; - $string .= '
'; - - if($event["estado"] == 0) { - $string .= html_print_select(array('1' => __('Validate'), '2' => __('Set in process'), '3' => __('Add comment')), 'select_validate_'.$event["id_evento"], '', '', '', 0, true, false, false, 'select_validate').'

'; - } - if($event["estado"] == 2) { - $string .= html_print_select(array('1' => __('Validate'), '3' => __('Add comment')), 'select_validate_'.$event["id_evento"], '', '', '', 0, true, false, false, 'select_validate').'

'; - } - - $string .= ''; - - $string .= html_print_button (__('Change status'), 'validate', false, '', 'class="sub ok validate_event" id="validate-'.$event["id_evento"].'"', true).'
'; - $string .= ''; - $string .= '		'; - if($event["id_alert_am"] != 0) { - $string .= ''; - } - $string .= '
'; //
'; - $data = array($string); + //Hiden row with description form + $string = '';//$string = '
'; + $string .= ''; + $string .= ''; + $string .= '
'; + $string .= '' . __('Comment:') . '' . html_print_textarea("comment_".$event["id_evento"], 2, 10, '', 'style="min-height: 10px; width: 250px;"', true) . ''; + $string .= '
'; + + if($event["estado"] == 0) { + $string .= html_print_select(array('1' => __('Validate'), '2' => __('Set in process'), '3' => __('Add comment')), 'select_validate_'.$event["id_evento"], '', '', '', 0, true, false, false, 'select_validate').'

'; + } + if($event["estado"] == 2) { + $string .= html_print_select(array('1' => __('Validate'), '3' => __('Add comment')), 'select_validate_'.$event["id_evento"], '', '', '', 0, true, false, false, 'select_validate').'

'; + } + + $string .= ''; + + $string .= html_print_button (__('Change status'), 'validate', false, '', 'class="sub ok validate_event" id="validate-'.$event["id_evento"].'"', true).'
'; + $string .= ''; + $string .= '		'; + if($event["id_alert_am"] != 0) { + $string .= ''; + } + $string .= '
'; //
'; - $idx++; + $data = array($string); - $table->rowclass[$idx] = 'event_form_' . $event["id_evento"].' event_form'; - $table->colspan[$idx][0] = 10; - $table->rowstyle[$idx] = 'display: none;'; - array_push ($table->data, $data); + $idx++; + + $table->rowclass[$idx] = 'event_form_' . $event["id_evento"].' event_form'; + $table->colspan[$idx][0] = 10; + $table->rowstyle[$idx] = 'display: none;'; + array_push ($table->data, $data); - //Hiden row with extended description - $string = ''; - $string .= ''; + //Hiden row with extended description + $string = '
'; - $string .= '' . __('Event ID') . ''; - $string .= io_safe_output($event["id_evento"]); - $string .= '
'; + $string .= ''; - $string .= ''; - $string .= ''; + $string .= ''; - $string .= ''; - $string .= ''; - $string .= ''; - - $odd = 'rowOdd'; - - if ($event["id_agente"] != 0) { - $string .= ''; - //$odd = 'rowOdd'; - $odd = ($odd == '')? 'rowOdd' : ''; + $string .= ' '.get_priority_name ($event["criticity"]); + $string .= ''; + $string .= ''; + $string .= ''; + $string .= ''; + + $odd = 'rowOdd'; + + $string .= ''; + //$odd = 'rowOdd'; + $odd = ($odd == '')? 'rowOdd' : ''; if ($event["id_agentmodule"] != 0) { $string .= ''; //$odd = 'rowOdd'; $odd = ($odd == '')? 'rowOdd' : ''; + } else { + $string .= ''; + $odd = ($odd == '')? 'rowOdd' : ''; + // Module group + $string .= ''; + $odd = ($odd == '')? 'rowOdd' : ''; } + $string .= ''; //$odd = ''; $odd = ($odd == '')? 'rowOdd' : ''; - + if ($event["criticity_alert"] != 0) { $string .= ''; $odd = ($odd == '')? 'rowOdd' : ''; - } + } + } else { + $string .= '- ' . __('Empty') . ' -'; + $string .= ''; + $odd = ($odd == '')? 'rowOdd' : ''; } $string .= ''; - $odd = ($odd == '')? 'rowOdd' : ''; + } else { + $string .= '- ' . __('Empty') . ' -'; } + $string .= ''; + $odd = ($odd == '')? 'rowOdd' : ''; + $string .= ''; + $odd = ($odd == '')? 'rowOdd' : ''; + + $string .= ''; $string .= '
'; + $string .= '' . __('Event ID') . ''; + $string .= io_safe_output($event["id_evento"]); + $string .= '
'; - $string .= '' . __('Event name') . ''; - $string .= io_safe_output($event["evento"]); - $string .= '
'; - $string .= '' . __('Severity') . ''; - $string .= html_print_image ($img_sev, true, + $string .= ''; + $string .= '' . __('Event name') . ''; + $string .= io_safe_output($event["evento"]); + $string .= '
'; + $string .= '' . __('Severity') . ''; + $string .= html_print_image ($img_sev, true, array ("class" => "image_status", "width" => 12, "height" => 12, "title" => get_priority_name ($event["criticity"]))); - $string .= ' '.get_priority_name ($event["criticity"]); - $string .= '
'; - $string .= '' . __('Type') . ''; - $string .= events_print_type_img ($event["event_type"], true).' '.events_print_type_description($event["event_type"], true); - $string .= '
'; - $string .= '' . __('Status') . ''; - $string .= $title_st; - $string .= '
'; - $string .= '' . __('Timestamp') . ''; - if ($group_rep == 1) { - $string .= date ($config["date_format"], $event['timestamp_rep']); - } - else { - $string .= date ($config["date_format"], strtotime($event["timestamp"])); - } - $string .= '
'; - $string .= '' . __('Agent name') . ''; - $string .= ui_print_agent_name ($event["id_agente"], true); - $string .= '
'; + $string .= '' . __('Type') . ''; + $string .= events_print_type_img ($event["event_type"], true).' '.events_print_type_description($event["event_type"], true); + $string .= '
'; + $string .= '' . __('Status') . ''; + $string .= $title_st; + $string .= '
'; + $string .= '' . __('Timestamp') . ''; + if ($group_rep == 1) { + $string .= date ($config["date_format"], $event['timestamp_rep']); } + else { + $string .= date ($config["date_format"], strtotime($event["timestamp"])); + } + $string .= '
'; + $string .= '' . __('Agent name') . ''; + if ($event["id_agente"] != 0) { + $string .= ui_print_agent_name ($event["id_agente"], true); + } else { + $string .= '- ' . __('Empty') . ' -'; + } + $string .= '
'; @@ -943,11 +946,23 @@ foreach ($result as $event) { $string .= '
'; + $string .= '' . __('Agent module') . ''; + $string .= '- ' . __('Empty') . ' -'; + $string .= '
'; + $string .= '' . __('Module group') . ''; + $string .= '- ' . __('Empty') . ' -'; + $string .= '
'; + $string .= '' . __('Alert source') . ''; if ($event["id_alert_am"] != 0) { - $string .= ''; - $string .= '' . __('Alert source') . ''; $string .= ''; $standby = db_get_value('standby', 'talert_template_modules', 'id', $event["id_alert_am"]); if(!$standby) { @@ -958,27 +973,31 @@ foreach ($result as $event) { $string .= html_print_image ("images/bell_pause.png", true, array ("title" => __('Go to data overview'))); } - + $sql = 'SELECT name FROM talert_templates WHERE id IN (SELECT id_alert_template FROM talert_template_modules WHERE id = ' . $event["id_alert_am"] . ');'; - + $templateName = db_get_sql($sql); - + $string .= $templateName; - + $string .= '
' . '' . __('Criticity alert') . ''; $string .= $event["criticity_alert"]; $string .= '
'; @@ -1034,17 +1053,19 @@ foreach ($result as $event) { } $string = rtrim($string, ','); $odd = ($odd == '')? 'rowOdd' : ''; - } - else { + } else { $string .= '- ' . __('Empty') . ' -'; $odd = ($odd == '')? 'rowOdd' : ''; } + $string .= '
' . '' . __('Criticity') . ''; if ($event["criticity"] != 0) { - $string .= '
' . '' . __('Criticity') . ''; $string .= $event["criticity"]; - $string .= '
' . '' . __('Source') . ''; if ($event["source"] != '') { $string .= $event["source"]; @@ -1063,6 +1084,17 @@ foreach ($result as $event) { $string .= '- ' . __('Empty') . ' -'; } $string .= '
' . '' . __('User name') . ''; + if ($event["id_usuario"]!= '0') { + $string .= $event["id_usuario"]; + } + else { + $string .= '- ' . __('Empty') . ' -'; + } + + $string .= '
'; $data = array($string);