Merge branch 'ent-4993-Diferentes-bugs-tiempos' into 'develop'

Changed date format to last remote contact

See merge request artica/pandorafms!2898
This commit is contained in:
Alejandro Fraguas 2019-12-24 11:48:25 +01:00
commit f0848d4feb
2 changed files with 2 additions and 2 deletions

View File

@ -4009,7 +4009,7 @@ function events_page_details($event, $server='')
$data = [];
$data[0] = '<div style="font-weight:normal; margin-left: 20px;">'.__('Last contact').'</div>';
$data[1] = ($agent['ultimo_contacto'] == '1970-01-01 00:00:00') ? '<i>'.__('N/A').'</i>' : date_w_fixed_tz($agent['ultimo_contacto']);
$data[1] = ($agent['ultimo_contacto'] == '1970-01-01 00:00:00') ? '<i>'.__('N/A').'</i>' : ui_print_timestamp($agent['ultimo_contacto'], true);
$table_details->data[] = $data;
$data = [];

View File

@ -624,7 +624,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
if ($agent['ultimo_contacto_remoto'] == '01-01-1970 00:00:00') {
$last_remote_contact = __('Never');
} else {
$last_remote_contact = ui_print_timestamp($agent['ultimo_contacto_remoto'], true);
$last_remote_contact = date_w_fixed_tz($agent['ultimo_contacto_remoto']);
}
$row = [];