Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Add unit test for screenModel::getChartFilters.

Browse Source
This commit is contained in:
wangxuepeng
2023-12-01 16:05:55 +08:00
parent 6cdc1787bb
commit 035f19da8e
3 changed files with 144 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/screen/model.php
+4 -3
View File
@@ -787,13 +787,14 @@ class screenModel extends model
*/
public function setDefaultByDate(array &$filter): void
{
$filter['default'] = null;
$filter['default'] = $filter['default'] ?? null;
if(isset($filter['default']))
{
extract($filter['default']);
if(empty($begin) || empty($end)) $filter['default'] = empty($begin) ? strtotime($end) * 1000 : strtotime($begin) * 1000;
if(!empty($begin) || !empty($end)) $filter['default'] = array(strtotime($begin) * 1000, strtotime($end) * 1000);
if(empty($begin) || empty($end)) $filter['default'] = empty($begin) ? strtotime($end) * 1000 : strtotime($begin) * 1000;
if(!empty($begin) && !empty($end)) $filter['default'] = array(strtotime($begin) * 1000, strtotime($end) * 1000);
if(empty($begin) && empty($end)) $filter['default'] = null;
}
}