Continue work diagnostics

This commit is contained in:
Daniel Barbero Martin 2019-10-17 15:17:28 +02:00
parent 13a72426cd
commit 4e56f6751a
5 changed files with 752 additions and 218 deletions

File diff suppressed because it is too large Load Diff

View File

@ -3881,11 +3881,11 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined=false
$img_content = join("\n", $result); $img_content = join("\n", $result);
if ($params['return_img_base_64']) { if ($params['return_img_base_64']) {
// To be used in alerts // To be used in alerts.
$width_img = 500; $width_img = 500;
return $img_content; return $img_content;
} else { } else {
// to be used in PDF files // to be used in PDF files.
$config['temp_images'][] = $img_path; $config['temp_images'][] = $img_path;
return '<img src="'.$img_url.'" />'; return '<img src="'.$img_url.'" />';
} }

View File

@ -2996,6 +2996,10 @@ function ui_print_datatable(array $parameters)
$parameters['default_pagination'] = $config['block_size']; $parameters['default_pagination'] = $config['block_size'];
} }
if (!isset($parameters['paging'])) {
$parameters['paging'] = true;
}
$no_sortable_columns = []; $no_sortable_columns = [];
if (isset($parameters['no_sortable_columns'])) { if (isset($parameters['no_sortable_columns'])) {
$no_sortable_columns = json_encode($parameters['no_sortable_columns']); $no_sortable_columns = json_encode($parameters['no_sortable_columns']);
@ -3156,7 +3160,7 @@ function ui_print_datatable(array $parameters)
$table = '<table id="'.$table_id.'" '; $table = '<table id="'.$table_id.'" ';
$table .= 'class="'.$parameters['class'].'"'; $table .= 'class="'.$parameters['class'].'"';
$table .= 'style="'.$parameters['style'].'">'; $table .= 'style="'.$parameters['style'].'">';
$table .= '<thead><tr>'; $table .= '<thead><tr class="datatables_thead_tr">';
if (isset($parameters['column_names']) if (isset($parameters['column_names'])
&& is_array($parameters['column_names']) && is_array($parameters['column_names'])
@ -3205,7 +3209,7 @@ function ui_print_datatable(array $parameters)
}, },
processing: true, processing: true,
serverSide: true, serverSide: true,
paging: true, paging: '.$parameters['paging'].',
pageLength: '.$parameters['default_pagination'].', pageLength: '.$parameters['default_pagination'].',
searching: false, searching: false,
responsive: true, responsive: true,
@ -3305,10 +3309,18 @@ function ui_print_datatable(array $parameters)
$("#'.$form_id.'_search_bt").click(function (){ $("#'.$form_id.'_search_bt").click(function (){
dt_'.$table_id.'.draw().page(0) dt_'.$table_id.'.draw().page(0)
}); });';
});
</script>'; if (isset($parameters['caption']) === true
&& empty($parameters['caption']) === false
) {
$js .= '$("#'.$table_id.'").append("<caption>'.$parameters['caption'].'</caption>");';
$js .= '$(".datatables_thead_tr").css("height", 0);';
}
$js .= '});';
$js .= '</script>';
// Order. // Order.
$err_msg = '<div id="error-'.$table_id.'"></div>'; $err_msg = '<div id="error-'.$table_id.'"></div>';

View File

@ -1,3 +1,6 @@
/* global $ */
/* exported load_modal */
var ENTERPRISE_DIR = "enterprise"; var ENTERPRISE_DIR = "enterprise";
/* Function to hide/unhide a specific Div id */ /* Function to hide/unhide a specific Div id */
@ -1872,8 +1875,6 @@ function logo_preview(icon_name, icon_path, incoming_options) {
} }
// Advanced Form control. // Advanced Form control.
/* global $ */
/* exported load_modal */
function load_modal(settings) { function load_modal(settings) {
var AJAX_RUNNING = 0; var AJAX_RUNNING = 0;
var data = new FormData(); var data = new FormData();
@ -1987,3 +1988,23 @@ function load_modal(settings) {
} }
}); });
} }
/**
* Function for AJAX request.
*
* @param {string} id Id container append data.
* @param {json} settings Json with settings.
*
* @return {void}
*/
function ajaxRequest(id, settings) {
$.ajax({
type: settings.type,
dataType: settings.html,
url: settings.url,
data: settings.data,
success: function(data) {
$("#" + id).append(data);
}
});
}

View File

@ -5903,3 +5903,49 @@ table.table_modal_alternate tr td:first-child {
.flot-text { .flot-text {
width: 101%; width: 101%;
} }
.title-self-monitoring,
.caption_table caption {
text-align: center;
font-size: 1.5em;
font-weight: bolder;
color: #fff;
background: #282828;
padding: 8px;
}
.datatables-td-title {
width: 25% !important;
font-weight: bolder;
}
.datatables-td-max {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}
.datatables-td-max img {
margin-right: 10px;
}
.datatables-td-max span {
width: 400px;
display: inline-block;
word-wrap: break-word;
}
.container-self-monitoring {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}
.element-self-monitoring {
flex: 2 1 600px;
}
.footer-self-monitoring {
margin: 30px;
font-style: italic;
}