diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index cd049f1d83..f8c54abbf3 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -120,6 +120,8 @@ require_once $config['homedir'].'/include/functions_reports.php';
// Load enterprise extensions.
enterprise_include('operation/reporting/custom_reporting.php');
enterprise_include_once('include/functions_metaconsole.php');
+enterprise_include_once('include/functions_tasklist.php');
+enterprise_include_once('include/functions_cron.php');
@@ -782,7 +784,7 @@ switch ($action) {
'',
'filter_form',
'',
- false,
+ true,
false,
'',
'white-box-content',
@@ -1251,7 +1253,12 @@ switch ($action) {
array_push($table->data, $data);
}
- html_print_table($table);
+ $reports_table = '
';
+ $reports_table .= '';
+ $reports_table .= html_print_table($table, true);
+ $reports_table .= '
';
+ echo $reports_table;
+
$tablePagination = ui_pagination(
$total_reports,
$url,
@@ -1259,7 +1266,7 @@ switch ($action) {
$pagination,
true,
'offset',
- false,
+ false
);
} else {
ui_print_info_message(
@@ -1270,6 +1277,19 @@ switch ($action) {
);
}
+ $report_task_data = enterprise_hook('tasklist_showListConsoleTask', [$object, true]);
+ if (is_array($report_task_data) === true || strpos($report_task_data, 'class="nf"') === false) {
+ $task_table = '';
+ $task_table .= '
';
+ $task_table .= $report_task_data;
+ $task_table .= '
';
+ echo $task_table;
+ } else {
+ ui_print_info_message($report_task_data.__('To schedule a report, do it from the editing view of each report.'));
+ }
+
if (check_acl($config['id_user'], 0, 'RW')
|| check_acl($config['id_user'], 0, 'RM')
) {
diff --git a/pandora_console/godmode/servers/discovery.php b/pandora_console/godmode/servers/discovery.php
index 3df3342f52..0fb36b4cfb 100755
--- a/pandora_console/godmode/servers/discovery.php
+++ b/pandora_console/godmode/servers/discovery.php
@@ -161,7 +161,7 @@ if ($classname_selected === null) {
$wiz_data = [];
foreach ($classes as $classpath) {
if (is_reporting_console_node() === true) {
- if ($classpath !== '/var/www/html/pandora_console/godmode/wizards/DiscoveryTaskList.class.php') {
+ if ($classpath !== $config['homedir'].'/godmode/wizards/DiscoveryTaskList.class.php') {
continue;
}
}
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 12e557de87..dd4110f7ff 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -129,6 +129,11 @@ class DiscoveryTaskList extends HTML
}
$delete_console_task = (bool) get_parameter('delete_console_task');
+ $report_task = (bool) get_parameter('report_task', 0);
+ if ($report_task === true) {
+ $this->url = ui_get_full_url('index.php?sec=reporting&sec2=godmode/reporting/reporting_builder');
+ }
+
if ($delete_console_task === true) {
return $this->deleteConsoleTask();
}
@@ -287,6 +292,10 @@ class DiscoveryTaskList extends HTML
}
$id_console_task = (int) get_parameter('id_console_task');
+ $report_task = (bool) get_parameter('report_task', 0);
+ if ($report_task === true) {
+ $this->url = ui_get_full_url('index.php?sec=reporting&sec2=godmode/reporting/reporting_builder');
+ }
if ($id_console_task != null) {
// --------------------------------
@@ -352,6 +361,10 @@ class DiscoveryTaskList extends HTML
}
$id_console_task = (int) get_parameter('id_console_task');
+ $report_task = (bool) get_parameter('report_task', 0);
+ if ($report_task === true) {
+ $this->url = ui_get_full_url('index.php?sec=reporting&sec2=godmode/reporting/reporting_builder');
+ }
if ($id_console_task > 0) {
$result = db_process_sql_update(
diff --git a/pandora_console/images/report-task.svg b/pandora_console/images/report-task.svg
new file mode 100644
index 0000000000..b16b7144da
--- /dev/null
+++ b/pandora_console/images/report-task.svg
@@ -0,0 +1,8 @@
+
+
+ Reportes programados@svg
+
+
+
+
+
\ No newline at end of file