From d97a9c5e32b98920ab475dcc1d31bbad3af696c4 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Fri, 7 Aug 2020 12:52:26 +0530
Subject: [PATCH] Fixes #1409, #1410 Date range filter selection
---
modules/CustomView/models/Record.php | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/modules/CustomView/models/Record.php b/modules/CustomView/models/Record.php
index e0161d030..413727480 100644
--- a/modules/CustomView/models/Record.php
+++ b/modules/CustomView/models/Record.php
@@ -410,7 +410,18 @@ class CustomView_Record_Model extends Vtiger_Base_Model {
$val[$x] = DateTimeField::convertToDBFormat(
trim($temp_val[$x]));
} elseif($fieldType == 'datetime') {
- $val[$x] = $date->getDBInsertDateTimeValue();
+ if ($advFilterComparator == 'bw' || $advFilterComparator == 'custom' ) {
+ $dates = explode(' ', $temp_val[$x]);
+ if(empty($dates[1])) {
+ if ($x == '0') {
+ $filterValue = trim($temp_val[$x]). ' 00:00:00';
+ } elseif ($x == '1') {
+ $filterValue = trim($temp_val[$x]). ' 23:59:59';
+ }
+ }
+ $date = new DateTimeField($filterValue);
+ }
+ $val[$x] = $date->getDBInsertDateTimeValue();
} else {
$val[$x] = $date->getDBInsertTimeValue();
}
--
GitLab