Merge branch 'ent-10660-update-journal-usar-las-opciones-de-visual-styles' into 'develop'

Ent 10660 update journal usar las opciones de visual styles

See merge request artica/pandorafms!5798
This commit is contained in:
Matias Didier 2023-07-03 11:50:06 +00:00
commit b3d098794d
1 changed files with 59 additions and 11 deletions

View File

@ -129,19 +129,67 @@ if ($method === 'draw') {
$count = db_get_value('count(*)', '('.$sql.') t');
if ($data) {
if ($config['prominent_time'] === 'timestamp') {
$data = array_reduce(
$data,
function ($carry, $item) {
// Transforms array of arrays $data into an array
// of objects, making a post-process of certain fields.
$tmp = (object) $item;
$tmp->utimestamp = human_time_comparation($tmp->utimestamp);
date_default_timezone_set($user_timezone);
$title = human_time_comparation($tmp->utimestamp);
$tmp->utimestamp = '<span title="'.$title.'">'.modules_format_timestamp($tmp->utimestamp).'</span>';
$carry[] = $tmp;
return $carry;
}
);
} else if ($config['prominent_time'] === 'comparation') {
$data = array_reduce(
$data,
function ($carry, $item) {
// Transforms array of arrays $data into an array
// of objects, making a post-process of certain fields.
$tmp = (object) $item;
date_default_timezone_set($user_timezone);
$title = modules_format_timestamp($tmp->utimestamp);
$tmp->utimestamp = '<span title="'.$title.'">'.human_time_comparation($tmp->utimestamp).'</span>';
$carry[] = $tmp;
return $carry;
}
);
} else if ($config['prominent_time'] === 'compact') {
$data = array_reduce(
$data,
function ($carry, $item) {
// Transforms array of arrays $data into an array
// of objects, making a post-process of certain fields.
$tmp = (object) $item;
date_default_timezone_set($user_timezone);
$title = modules_format_timestamp($tmp->utimestamp);
$tmp->utimestamp = '<span title="'.$title.'">'.human_time_comparation($tmp->utimestamp, 'tiny').'</span>';
$carry[] = $tmp;
return $carry;
}
);
} else {
$data = array_reduce(
$data,
function ($carry, $item) {
// Transforms array of arrays $data into an array
// of objects, making a post-process of certain fields.
$tmp = (object) $item;
date_default_timezone_set($user_timezone);
$title = modules_format_timestamp($tmp->utimestamp);
$tmp->utimestamp = '<span title="'.$title.'">'.human_time_comparation($tmp->utimestamp).'</span>';
$carry[] = $tmp;
return $carry;
}
);
}
}
// Datatables format: RecordsTotal && recordsfiltered.