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

Merge branch '4689-mostrar-instrucciones-en-la-vista-de-eventos' into 'develop' 

Fixed issue with instructions in events view

See merge request artica/pandorafms!2752
This commit is contained in:
Daniel Rodriguez 2019-10-03 16:59:03 +02:00
parent b2157f4b32 b25c9ca793
commit 5f463e51b8
3 changed files with 6996 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pandora_console/include/functions_events.php
View File

@ -6879,3 +6879,56 @@ function events_get_field_value_by_event_id(
return $value;
}
function events_get_instructions($event)
{
if (!is_array($event)) {
return '';
}
switch ($event['event_type']) {
case 'going_unknown':
if ($event['unknown_instructions'] != '') {
$value = str_replace("\n", '<br>', io_safe_output($event['unknown_instructions']));
}
break;
case 'going_up_warning':
case 'going_down_warning':
if ($event['warning_instructions'] != '') {
$value = str_replace("\n", '<br>', io_safe_output($event['warning_instructions']));
}
break;
case 'going_up_critical':
case 'going_down_critical':
if ($event['critical_instructions'] != '') {
$value = str_replace("\n", '<br>', io_safe_output($event['critical_instructions']));
}
break;
}
if (!isset($value)) {
return '';
}
$max_text_length = 300;
$over_text = io_safe_output($value);
if (strlen($over_text) > ($max_text_length + 3)) {
$over_text = substr($over_text, 0, $max_text_length).'...';
}
$output = '<div id="hidden_event_instructions_'.$event['id_evento'].'"';
$output .= ' style="display: none; width: 100%; height: 100%; overflow: auto; padding: 10px; font-size: 14px; line-height: 16px; font-family: mono,monospace; text-align: left">';
$output .= $value;
$output .= '</div>';
$output .= '<center>';
$output .= '<span id="value_event_'.$event['id_evento'].'" style="white-space: nowrap;">';
$output .= '<span id="value_event_text_'.$event['id_evento'].'"></span>';
$output .= '<a href="javascript:show_instructions('.$event['id_evento'].')">';
$output .= html_print_image('images/default_list.png', true, ['title' => $over_text]).'</a></span>';
$output .= '</center>';
return $output;
}

6934
pandora_console/include/functions_events.php.orig Normal file
View File

File diff suppressed because it is too large Load Diff

9
pandora_console/operation/events/events.php
View File

@ -309,6 +309,8 @@ if (is_ajax()) {
$tmp->data = format_numeric($tmp->data, 1);
$tmp->instructions = events_get_instructions($item);
$tmp->b64 = base64_encode(json_encode($tmp));
$carry[] = $tmp;
@ -2371,5 +2373,12 @@ function datetime_picker_callback() {
datetime_picker_callback();
function show_instructions(id){
title = "<?php echo __('Instructions'); ?>";
$('#hidden_event_instructions_' + id).dialog({
title: title,
width: 600
});
}
</script>