extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Importexport: Fix filtering by date customfields

Browse Source 
Date customfields can have different data formats (default Y-m-d) and we were only considering timestamps
This commit is contained in:
nathan 2023-09-13 15:10:36 -06:00
parent 4a7f775a97
commit b97c58c016
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
importexport/inc/class.importexport_export_ui.inc.php
View File

@ -286,9 +286,15 @@ class importexport_export_ui {
{ {
unset($filter[$key]); unset($filter[$key]);
} }
// Format for date from/to
$date_format = 'ts';
if($key[0] == Api\Storage::CF_PREFIX && ($cf = (Api\Storage\Customfields::get($_appname) ?: [])[substr($key, 1)]))
{
$date_format = $cf['values']['format'] ?? ($cf['type'] == 'date' ? 'Y-m-d' : "Y-m-d H:i:s");
}
if(is_array($value) && array_key_exists('from', $value) && $value['from']) if(is_array($value) && array_key_exists('from', $value) && $value['from'])
{ {
$filter[$key]['from'] = Api\DateTime::to($value['from'],'ts'); $filter[$key]['from'] = Api\DateTime::to($value['from'], $date_format);
} }
// If user selects an end date, they most likely want entries including that date // If user selects an end date, they most likely want entries including that date
if(is_array($value) && array_key_exists('to',$value) && $value['to'] ) if(is_array($value) && array_key_exists('to',$value) && $value['to'] )
@ -296,7 +302,7 @@ class importexport_export_ui {
// Adjust time to 23:59:59 // Adjust time to 23:59:59
$filter[$key]['to'] = new Api\DateTime($value['to']); $filter[$key]['to'] = new Api\DateTime($value['to']);
$filter[$key]['to']->setTime(23,59,59); $filter[$key]['to']->setTime(23,59,59);
$filter[$key]['to'] = $filter[$key]['to']->format('ts'); $filter[$key]['to'] = $filter[$key]['to']->format($date_format);
} }
} }
} }