Merge branch 'ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa' into 'develop'
Ent 10640 meter programador de informes en la vista de edicion de un informe en una nueva solapa See merge request artica/pandorafms!5858
This commit is contained in:
Daniel Rodriguez
commit
4b6be6596e
|
|
@ -116,10 +116,13 @@ if (!$report_r && !$report_w && !$report_m) {
|
|||
}
|
||||
|
||||
require_once $config['homedir'].'/include/functions_reports.php';
|
||||
require_once $config['homedir'].'/godmode/wizards/DiscoveryTaskList.class.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 +785,7 @@ switch ($action) {
|
|||
'<span class="subsection_header_title">'.__('Filters').'</span>',
|
||||
'filter_form',
|
||||
'',
|
||||
false,
|
||||
true,
|
||||
false,
|
||||
'',
|
||||
'white-box-content',
|
||||
|
|
@ -1251,7 +1254,12 @@ switch ($action) {
|
|||
array_push($table->data, $data);
|
||||
}
|
||||
|
||||
html_print_table($table);
|
||||
$reports_table = '<div class="white_box">';
|
||||
$reports_table .= '<span class="white_table_graph_header">'.__('Reports').'</span>';
|
||||
$reports_table .= html_print_table($table, true);
|
||||
$reports_table .= '<br></div>';
|
||||
echo $reports_table;
|
||||
|
||||
$tablePagination = ui_pagination(
|
||||
$total_reports,
|
||||
$url,
|
||||
|
|
@ -1259,7 +1267,7 @@ switch ($action) {
|
|||
$pagination,
|
||||
true,
|
||||
'offset',
|
||||
false,
|
||||
false
|
||||
);
|
||||
} else {
|
||||
ui_print_info_message(
|
||||
|
|
@ -1270,6 +1278,21 @@ switch ($action) {
|
|||
);
|
||||
}
|
||||
|
||||
$discovery_tasklist = new DiscoveryTaskList();
|
||||
$report_task_data = $discovery_tasklist->showListConsoleTask(true);
|
||||
|
||||
if (is_array($report_task_data) === true || strpos($report_task_data, 'class="nf"') === false) {
|
||||
$task_table = '<div class="mrgn_top_15px white_box">';
|
||||
$task_table .= '<span class="white_table_graph_header">'.__('Report tasks');
|
||||
$task_table .= ui_print_help_tip(__('To schedule a report, do it from the editing view of each report.'), true);
|
||||
$task_table .= '</span><div>';
|
||||
$task_table .= $report_task_data;
|
||||
$task_table .= '</div></div>';
|
||||
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')
|
||||
) {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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(
|
||||
|
|
@ -1096,9 +1109,9 @@ class DiscoveryTaskList extends HTML
|
|||
*
|
||||
* @return boolean Success or not.
|
||||
*/
|
||||
public function showListConsoleTask()
|
||||
public function showListConsoleTask($report_task=false)
|
||||
{
|
||||
return enterprise_hook('tasklist_showListConsoleTask', [$this]);
|
||||
return enterprise_hook('tasklist_showListConsoleTask', [$this, $report_task]);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>Reportes programados@svg</title>
|
||||
<g id="Reportes-programados" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<path d="M8.00059781,0 C8.54059781,0 9.00059781,0.363636364 9.00059781,0.909090909 L9.00059781,4.07934284 C9.00059781,5.35207011 9.69059781,6 10.9505978,6 L14.1005978,6 C14.6405978,6 15.0005978,6.45454545 15.0005978,7 L15.0005978,16.3636364 C15.0005978,18.3636364 13.3805978,20 11.4005978,20 L5.24310254,20.0009635 C7.48899044,18.7052484 9.00059781,16.2791516 9.00059781,13.5 C9.00059781,9.35786438 5.64273343,6 1.50059781,6 C0.986687841,6 0.484850221,6.05168787 -2.12052598e-14,6.15014855 L0.000597808993,3.63636364 C0.000597808993,1.63636364 1.62059781,0 3.60059781,0 Z M10.0001439,1 L14.0005978,5 L11.0001439,5 C10.4478591,5 10.0001439,4.55228475 10.0001439,4 L10.0001439,1 Z" id="Shape" fill="#3F3F3F" transform="translate(7.500299, 10.000482) scale(-1, 1) translate(-7.500299, -10.000482) "></path>
|
||||
<path d="M13.5,7 C17.0898509,7 20,9.91014913 20,13.5 C20,17.0898509 17.0898509,20 13.5,20 C9.91014913,20 7,17.0898509 7,13.5 C7,9.91014913 9.91014913,7 13.5,7 Z M14.0002191,9 C13.4873832,9 13.0647119,9.38604019 13.0069468,9.88337887 L13.0002191,10 L13.0002191,13.382 L11.4068856,14.2067645 C10.9481913,14.4361116 10.742785,14.9704208 10.9135349,15.4410874 L10.959672,15.5484052 C11.1890192,16.0070996 11.7233284,16.2125059 12.193995,16.0417559 L12.3013128,15.9956188 L14.4474327,14.8944272 C14.748574,14.7438565 14.9511225,14.4535358 14.9924154,14.1248553 L15.0002191,14 L15.0002191,10 C15.0002191,9.44771525 14.5525038,9 14.0002191,9 Z" id="Oval-2" fill="#3F3F3F"></path>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.8 KiB |
Loading…
Reference in New Issue