tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9798-13905-meta-availability-graphs-con-100-ok-muestra-grafico-en-gris' into 'develop' 

fixed 24*7 availavility report pandora_enterprise#9798

See merge request artica/pandorafms!5263
This commit is contained in:
Daniel Rodriguez 2022-11-22 09:16:45 +00:00
parent ad812e1643 a7d59fa0b3
commit 8963cc86d9
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_db.php
View File

@ -795,6 +795,10 @@ function db_uncompress_module_data(
$flag_async = true; $flag_async = true;
} }
if (strstr($module_type_str, 'async_string') !== false) {
$flag_async = true;
}
if (strstr($module_type_str, 'async_proc') !== false) { if (strstr($module_type_str, 'async_proc') !== false) {
$flag_async = true; $flag_async = true;
} }

4
pandora_console/include/functions_reporting.php
View File

@ -8682,8 +8682,8 @@ function reporting_availability($report, $content, $date=false, $time=false)
$item['id_agent_module'] $item['id_agent_module']
); );
if (isset($item['compare']) === true if (isset($item['compare']) === false
&& empty($item['compare']) === true || empty($item['compare']) === true
) { ) {
$row['data']['compare'] = false; $row['data']['compare'] = false;
} else { } else {

5
pandora_console/include/functions_reporting_html.php
View File

@ -4007,7 +4007,7 @@ function reporting_html_text(&$table, $item)
*/ */
function reporting_html_availability($table, $item, $pdf=0) function reporting_html_availability($table, $item, $pdf=0)
{ {
$retun_pdf = ''; $return_pdf = '';
$style = db_get_value( $style = db_get_value(
'style', 'style',
@ -4234,7 +4234,7 @@ function reporting_html_availability($table, $item, $pdf=0)
} else { } else {
$table_row[] = $row['agent']; $table_row[] = $row['agent'];
$item_name = $row['availability_item']; $item_name = $row['availability_item'];
if ((bool) $row['compare'] === false) { if ((bool) $row['compare'] === true) {
$item_name .= ' ('.__('24 x 7').')'; $item_name .= ' ('.__('24 x 7').')';
} }
@ -4422,6 +4422,7 @@ function reporting_html_availability($table, $item, $pdf=0)
$table2->data[] = $table_row2; $table2->data[] = $table_row2;
} }
} else { } else {
$table = new stdClass();
$table->colspan['error']['cell'] = 3; $table->colspan['error']['cell'] = 3;
$table->data['error']['cell'] = __( $table->data['error']['cell'] = __(
'There are no Agent/Modules defined' 'There are no Agent/Modules defined'