diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index 6cf735c6dc..b88cfe3f89 100755 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -178,62 +178,33 @@ $table->style[0] = 'text-align:center;'; $table->data = array (); $table->data[0][0] = html_print_image("images/reporting32.png", true, array("width" => "32", "height" => "32")); -if (defined("METACONSOLE")) { - if ($report['description'] != '') { - $table->data[0][1] = '
' . __("Description: ") . $report['description'] . '
'; - } - else { - $table->data[0][1] = '
' . __("Name: ") . $report['name'] . '
'; - } - - $table->data[0][1] .= '
'.__('Set initial date') . html_print_checkbox('enable_init_date', 1, $enable_init_date, true); - $html_enterprise = enterprise_hook('reporting_print_button_PDF', array($id_report)); - if ($html_enterprise !== ENTERPRISE_NOT_HOOK) { - $table->data[0][1] .= $html_enterprise; - } - $table->data[0][1] .= '
'; - - $table->data[1][1] = '
' . __('From') . ': '; - $table->data[1][1] .= html_print_input_text ('date_init', $date_init, '', 12, 10, true). ' '; - $table->data[1][1] .= html_print_input_text ('time_init', $time_init, '', 10, 7, true). '
'; - $table->data[1][2] = '
' . __('Items period before') . ':'; - $table->data[1][2] .= html_print_input_text ('date', $date, '', 12, 10, true) . ' '; - $table->data[1][2] .= html_print_input_text ('time', $time, '', 10, 7, true) . ' '; - $table->data[1][2] .= html_print_submit_button (__('Update'), 'date_submit', false, 'class="sub next"', true) . '
'; - $table->data[1][2] .= '
' . __('to') . ':'; - $table->data[1][2] .= html_print_input_text ('date', $date, '', 12, 10, true) . ' '; - $table->data[1][2] .= html_print_input_text ('time', $time, '', 10, 7, true) . ' '; - $table->data[1][2] .= html_print_submit_button (__('Update'), 'date_submit', false, 'class="sub next"', true) . '
'; + +if (reporting_get_description($id_report)) { + $table->data[0][1] = '
' . + reporting_get_description($id_report) . '
'; } else { - if (reporting_get_description($id_report)) { - $table->data[0][1] = '
' . - reporting_get_description($id_report) . '
'; - } - else { - $table->data[0][1] = '
' . - reporting_get_name($id_report) . '
'; - } - - $table->data[0][1] .= '
'.__('Set initial date') . html_print_checkbox('enable_init_date', 1, $enable_init_date, true); - $html_enterprise = enterprise_hook('reporting_print_button_PDF', - array($id_report)); - if ($html_enterprise !== ENTERPRISE_NOT_HOOK) { - $table->data[0][1] .= $html_enterprise; - } - $table->data[0][1] .= '
'; - - $table->data[1][1] = '
' . __('From') . ':
'; - $table->data[1][1] .= html_print_input_text ('date_init', $date_init, '', 12, 10, true). ' '; - $table->data[1][1] .= html_print_input_text ('time_init', $time_init, '', 10, 7, true). ' '; - $table->data[1][2] = '
' . __('Items period before') . ':
'; - $table->data[1][2] .= '
' . __('to') . ':
'; - $table->data[1][2] .= html_print_input_text ('date', $date, '', 12, 10, true). ' '; - $table->data[1][2] .= html_print_input_text ('time', $time, '', 10, 7, true). ' '; - $table->data[1][2] .= html_print_submit_button (__('Update'), 'date_submit', false, 'class="sub next"', true); - + $table->data[0][1] = '
' . + reporting_get_name($id_report) . '
'; } +$table->data[0][1] .= '
'.__('Set initial date') . html_print_checkbox('enable_init_date', 1, $enable_init_date, true); +$html_enterprise = enterprise_hook('reporting_print_button_PDF', + array($id_report)); +if ($html_enterprise !== ENTERPRISE_NOT_HOOK) { + $table->data[0][1] .= $html_enterprise; +} +$table->data[0][1] .= '
'; + +$table->data[1][1] = '
' . __('From') . ':
'; +$table->data[1][1] .= html_print_input_text ('date_init', $date_init, '', 12, 10, true). ' '; +$table->data[1][1] .= html_print_input_text ('time_init', $time_init, '', 10, 7, true). ' '; +$table->data[1][2] = '
' . __('Items period before') . ':
'; +$table->data[1][2] .= '
' . __('to') . ':
'; +$table->data[1][2] .= html_print_input_text ('date', $date, '', 12, 10, true). ' '; +$table->data[1][2] .= html_print_input_text ('time', $time, '', 10, 7, true). ' '; +$table->data[1][2] .= html_print_submit_button (__('Update'), 'date_submit', false, 'class="sub next"', true); + echo '
'; html_print_table ($table); html_print_input_hidden ('id_report', $id_report);