From 4f7ffa1f305fabc318a5fb0db2d9fca1f2260463 Mon Sep 17 00:00:00 2001 From: Cliff Parnitzky Date: Thu, 7 Nov 2019 23:58:42 +0100 Subject: [PATCH 1/2] Fixed filtering via search field effecting the filtered view (closes #5) --- .../classes/MonitoringResponseTimeGraph.php | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/system/modules/MonitoringResponseTimeGraph/classes/MonitoringResponseTimeGraph.php b/system/modules/MonitoringResponseTimeGraph/classes/MonitoringResponseTimeGraph.php index 721e10a..1e6595f 100644 --- a/system/modules/MonitoringResponseTimeGraph/classes/MonitoringResponseTimeGraph.php +++ b/system/modules/MonitoringResponseTimeGraph/classes/MonitoringResponseTimeGraph.php @@ -56,12 +56,29 @@ public function __construct() public function navigateToMonitoringResponseTimeGraph() { $arrFilter = \Session::getInstance()->get('filter')['tl_monitoring']; + $arrSearch = \Session::getInstance()->get('search')['tl_monitoring']; unset($arrFilter['limit']); $select = "SELECT id FROM tl_monitoring"; - if (!empty($arrFilter)) + if (!empty($arrFilter) || !empty($arrSearch['value'])) { - $select .= " WHERE " . implode(" = ? AND ", array_keys($arrFilter)) . " = ?"; + $select .= " WHERE "; + + if (!empty($arrFilter)) + { + $select .= implode(" = ? AND ", array_keys($arrFilter)) . " = ?"; + } + + if (!empty($arrSearch['value'])) + { + if (!empty($arrFilter)) + { + $select .= " AND "; + } + $select .= " " . $arrSearch['field'] . " LIKE ?"; + // add the value to the paramters array + $arrFilter[$arrSearch['field']] = "%" . $arrSearch['value'] . "%"; + } } $objIds = \Database::getInstance()->prepare($select) From 3cff255585c533257063b19d5d65bbdaedf81770 Mon Sep 17 00:00:00 2001 From: Cliff Parnitzky Date: Thu, 7 Nov 2019 23:58:51 +0100 Subject: [PATCH 2/2] Update history --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0568318..0dea94f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ Contao Extension "MonitoringResponseTimeGraph" ============================================== +Version 1.2.2 (2019-11-08) +-------------------------- +- fixed filtering via search field effecting the filtered view (see #5) + +Version 1.2.1 (2019-11-07) +-------------------------- +- fixed creating a legend for monitored entry without tests (see #4) + Version 1.2.0 (2018-04-11) -------------------------- - Added option to filter full response graph view (see #1)