From 7d792d531a06d4bde956de4f343a15592c8ea27d Mon Sep 17 00:00:00 2001 From: Remdex Date: Wed, 11 Oct 2017 12:18:51 +0200 Subject: [PATCH] Add support for filterlt in date filter --- lhc_web/lib/core/lhcore/lhsearchhandler.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lhc_web/lib/core/lhcore/lhsearchhandler.php b/lhc_web/lib/core/lhcore/lhsearchhandler.php index f0fe03cf50..c22276aaea 100644 --- a/lhc_web/lib/core/lhcore/lhsearchhandler.php +++ b/lhc_web/lib/core/lhcore/lhsearchhandler.php @@ -168,8 +168,10 @@ public static function getParams($params = array()) } else { $filter['filtergte'][$field['filter_table_field']] = $inputParams->$key; } - } elseif ($field['filter_type'] == 'filterlte') { - + } elseif ($field['filter_type'] == 'filterlte' || $field['filter_type'] == 'filterlt') { + + $filterType = $field['filter_type']; + if (isset($field['range_from']) && isset($filter['filtergte'][$fields[$field['range_from']]['filter_table_field']]) && $filter['filtergte'][$fields[$field['range_from']]['filter_table_field']] == $inputParams->$key) { unset($filter['filtergte'][$fields[$field['range_from']]['filter_table_field']]); $filter['filter'][$field['filter_table_field']] = $inputParams->$key; @@ -179,13 +181,13 @@ public static function getParams($params = array()) $dateFormated = self::formatDateToTimestamp($inputParams->$key); if ($dateFormated != false) { - $filter['filterlte'][$field['filter_table_field']] = $dateFormated; + $filter[$filterType][$field['filter_table_field']] = $dateFormated; } } elseif (isset($field['datatype']) && $field['datatype'] == 'date_ymd') { $dateFormated = self::formatDateToDateYmd($inputParams->$key); if ($dateFormated != false) { - $filter['filterlte'][$field['filter_table_field']] = $dateFormated; + $filter[$filterType][$field['filter_table_field']] = $dateFormated; } } elseif (isset($field['datatype']) && $field['datatype'] == 'datetime') { @@ -215,12 +217,13 @@ public static function getParams($params = array()) $minutes = 0; } - $filter['filterlte'][$field['filter_table_field']] = $dateFormated+$hours+$minutes; + $filter[$filterType][$field['filter_table_field']] = $dateFormated+$hours+$minutes; } } else { - $filter['filterlte'][$field['filter_table_field']] = $inputParams->$key; + $filter[$filterType][$field['filter_table_field']] = $inputParams->$key; } } + } elseif ($field['filter_type'] == 'filter_join') { $filter['filterin'][$field['filter_table_field']] = $inputParams->$key; $filter['filter_join'][$field['join_table_name']] = $field['join_attributes'];