diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 42ed9e80a3..47dd90a26a 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -433,13 +433,13 @@ function reporting_html_SLA($table, $item, $mini) {
}
elseif ($sla['sla_status']) {
$row[] = '' .
- remove_right_zeros(number_format($sla['sla_value'], $config['graph_precision'])) . "%" . '';
+ sla_truncate($sla['sla_value'], $config['graph_precision']) . "%" . '';
$row[] = '' .
__('OK') . '';
}
else {
$row[] = '' .
- remove_right_zeros(number_format($sla['sla_value'], $config['graph_precision'])) . "%" . '';
+ sla_truncate($sla['sla_value'], $config['graph_precision']) . "%" . '';
$row[] = '' .
__('Fail') . '';
}
@@ -493,7 +493,15 @@ function reporting_html_SLA($table, $item, $mini) {
$row = array();
$row[] = $sla['agent'];
$row[] = $sla['module'];
- $row[] = remove_right_zeros(number_format($sla['max'], $config['graph_precision'])) . " / " . remove_right_zeros(number_format($sla['min'], $config['graph_precision']));
+
+ if(is_numeric($sla['dinamic_text'])){
+ $row[] = remove_right_zeros(number_format($sla['max'], $config['graph_precision'])) . " / " .
+ remove_right_zeros(number_format($sla['min'], $config['graph_precision']));
+ }
+ else{
+ $row[] = $sla['dinamic_text'];
+ }
+
$row[] = round($sla['sla_limit'], 2) . "%";
if ($sla['sla_value_unknown']) {
@@ -504,13 +512,13 @@ function reporting_html_SLA($table, $item, $mini) {
}
elseif ($sla['sla_status']) {
$row[] = '' .
- remove_right_zeros(number_format($sla['sla_value'], $config['graph_precision'])) . "%" . '';
+ sla_truncate($sla['sla_value'], $config['graph_precision']) . "%" . '';
$row[] = '' .
__('OK') . '';
}
else {
$row[] = '' .
- remove_right_zeros(number_format($sla['sla_value'], $config['graph_precision'])) . "%" . '';
+ sla_truncate($sla['sla_value'], $config['graph_precision']) . "%" . '';
$row[] = '' .
__('Fail') . '';
}
@@ -2022,7 +2030,7 @@ function reporting_html_availability(&$table, $item) {
else
$table_row[] = '--';
- $table_row[] = '' .remove_right_zeros(number_format($row['SLA'], $config['graph_precision'])). '%';
+ $table_row[] = '' . sla_truncate($row['SLA'], $config['graph_precision']). '%';
$table_row2 = array();
$table_row2[] = $row['agent'];
@@ -2068,7 +2076,7 @@ function reporting_html_availability(&$table, $item) {
else
$table_row[] = '--';
- $table_row[] = '' .remove_right_zeros(number_format($row['SLA'], $config['graph_precision'])). '%';
+ $table_row[] = '' . sla_truncate($row['SLA'], $config['graph_precision']). '%';
$table_row2 = array();
$table_row2[] = $row['agent'];
@@ -2130,9 +2138,9 @@ function reporting_html_availability(&$table, $item) {
$table1->data[] = array(
'max_text' => $item['resume']['max_text'],
- 'max' => remove_right_zeros(number_format($item['resume']['max'], $config['graph_precision'])) . "%",
+ 'max' => sla_truncate($item['resume']['max'], $config['graph_precision']) . "%",
'min_text' => $item['resume']['min_text'],
- 'min' => remove_right_zeros(number_format($item['resume']['min'], $config['graph_precision'])) . "%",
+ 'min' => sla_truncate($item['resume']['min'], $config['graph_precision']) . "%",
'avg' => '' .remove_right_zeros(number_format($item['resume']['avg'], $config['graph_precision'])) . "%"
);