diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 2939ec367a..929d234c17 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -5174,6 +5174,10 @@ echo "
".__('Please select a group.').'';
echo '
';
+echo "";
+echo "
".__('Please insert max item number.').'
';
+echo '
';
+
ui_require_javascript_file(
'pandora_inventory',
ENTERPRISE_DIR.'/include/javascript/'
@@ -5507,7 +5511,7 @@ $(document).ready (function () {
return false;
}
break;
- case 'permissions_report':
+ case 'permissions_report':
if ($("#checkbox-select_by_group").prop("checked") && $("select#users_groups>option:selected").val() == undefined) {
dialog_message('#message_no_group');
return false;
@@ -5517,6 +5521,30 @@ $(document).ready (function () {
return false;
}
break;
+ case 'list_checks':
+ if ($("#text-text_agent").val() == '') {
+ dialog_message('#message_no_agent');
+ return false;
+ }
+ break;
+ case 'top_n_agents_sh':
+ if ($("#text-max_items").val() == '') {
+ dialog_message('#message_no_max_item');
+ return false;
+ }
+ break;
+ case 'top_n_checks_failed':
+ if ($("#text-max_items").val() == '') {
+ dialog_message('#message_no_max_item');
+ return false;
+ }
+ break;
+ case 'top_n_categories_checks':
+ if ($("#text-max_items").val() == '') {
+ dialog_message('#message_no_max_item');
+ return false;
+ }
+ break;
default:
break;
}
@@ -5587,13 +5615,14 @@ $(document).ready (function () {
});
- $("#submit-edit_item").click(function () {
+ $("#button-edit_item").click(function () {
var type = $('#type').val();
if($('#text-name').val() == ''){
dialog_message('#message_no_name');
return false;
}
+
switch (type){
case 'agent_module':
case 'agent_module_status':
@@ -5646,6 +5675,30 @@ $(document).ready (function () {
return false;
}
break;
+ case 'list_checks':
+ if ($("#text-text_agent").val() == '') {
+ dialog_message('#message_no_agent');
+ return false;
+ }
+ break;
+ case 'top_n_agents_sh':
+ if ($("#text-max_items").val() == '') {
+ dialog_message('#message_no_max_item');
+ return false;
+ }
+ break;
+ case 'top_n_checks_failed':
+ if ($("#text-max_items").val() == '') {
+ dialog_message('#message_no_max_item');
+ return false;
+ }
+ break;
+ case 'top_n_categories_checks':
+ if ($("#text-max_items").val() == '') {
+ dialog_message('#message_no_max_item');
+ return false;
+ }
+ break;
default:
break;
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 85672b6052..dd391d27c2 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -547,9 +547,9 @@ function reporting_html_scoring($table, $item, $pdf=0)
$table1->class = 'info_table';
$table1->titleclass = 'title_table_pdf';
$table1->rowclass[0] = '';
- $table1->head[0] = ''.__('Id').'';
- $table1->head[1] = ''.__('Category').'';
- $table1->head[2] = ''.__('Total Failed').'';
+ $table1->head[0] = ''.__('Date').'';
+ $table1->head[1] = ''.__('Agent').'';
+ $table1->head[2] = ''.__('Score').'';
$row = 1;
foreach ($item['data'] as $key => $check) {
diff --git a/pandora_console/operation/reporting/reporting_xml.php b/pandora_console/operation/reporting/reporting_xml.php
index a39e0c7e00..351c7776ca 100755
--- a/pandora_console/operation/reporting/reporting_xml.php
+++ b/pandora_console/operation/reporting/reporting_xml.php
@@ -97,29 +97,12 @@ $filename = (string) get_parameter('filename');
$date_mode = get_parameter('date_mode', 'none');
-$period = null;
-switch ($date_mode) {
- case 'none':
- case 'end_time':
- // Get different date to search the report.
- $date = (string) get_parameter('date', date('Y-m-j'));
- $time = (string) get_parameter('time', date('h:iA'));
- break;
-
- case 'init_and_end_time':
- // Get different date to search the report.
- $date = (string) get_parameter('date', date('Y-m-j'));
- $time = (string) get_parameter('time', date('h:iA'));
-
- // Calculations in order to modify init date of the report
- $date_init_less = (strtotime(date('Y-m-j')) - SECONDS_1DAY);
-
- $date_init = get_parameter('date_init', date('Y-m-j', $date_init_less));
- $time_init = get_parameter('time_init', date('h:iA'));
- $datetime_init = strtotime($date_init.' '.$time_init);
-
- $period = (strtotime($date.' '.$time) - $datetime_init);
- break;
+$date_init = get_parameter('date_init', '');
+if (empty($date_init) === false) {
+ $date_end = get_parameter('date_end', time());
+ $period = ($date_end - $date_init);
+ $date = date('Y-m-d', $date_end);
+ $time = date('H:i:s', $date_end);
}