From a98f922f9b9cb30fc69b67d4b3931723bd840b8a Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 7 Dec 2020 15:05:00 +0100 Subject: [PATCH] wip #3753 @1 --- src/app/Magic/Fields/Datetime.php | 1 + src/app/Magic/Fields/Field.php | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/app/Magic/Fields/Datetime.php b/src/app/Magic/Fields/Datetime.php index 23ab912..e73c44c 100644 --- a/src/app/Magic/Fields/Datetime.php +++ b/src/app/Magic/Fields/Datetime.php @@ -11,6 +11,7 @@ class Datetime extends Field protected $_databaseType = 'datetime'; protected $_columnType = 'datetime'; protected $_columnFormat = 'Y-m-d, H:i'; + protected $_filterType = 'date_range'; public function _mutator($value) { diff --git a/src/app/Magic/Fields/Field.php b/src/app/Magic/Fields/Field.php index b21541c..ac77922 100644 --- a/src/app/Magic/Fields/Field.php +++ b/src/app/Magic/Fields/Field.php @@ -214,6 +214,10 @@ class Field implements \ArrayAccess $crud->addClause('where', $name, $value); } else if ($type === 'select2_multiple') { $crud->addClause('whereIn', $name, json_decode($value)); + } else if ($type === 'date_range') { + $dates = json_decode($value); + $crud->addClause('where', $name, '>=', trim($dates->from)); + $crud->addClause('where', $name, '<=', trim($dates->to)); } } -- 2.39.5