diff --git a/Models/FacilityDataSet.php b/Models/FacilityDataSet.php index 1fb1a4c..061d1a5 100644 --- a/Models/FacilityDataSet.php +++ b/Models/FacilityDataSet.php @@ -53,14 +53,53 @@ class FacilityDataSet { $stmt->execute(); return !($stmt->rowCount() == 0); } + /** * @param $filterArray + * @param $sortArray * @return array * Function to allow fetching of facility data. Data objects are created and held in an array * Count of rows for pagination returned alongside data objects. */ - public function fetchAll($filterArray): array + public function fetchAll($filterArray, $sortArray): array { + $direction = ''; + // Set direction, if not found in array, set to ascending. + (in_array('desc', $sortArray)) ? $direction = 'DESC' : $direction = 'ASC'; + // Default to title + // Note: I am very sorry, i am well aware this is horrible, im running out of time + $sortBy = 1; + var_dump($sortArray); + switch (array_search('desc', $sortArray) ?? array_search('asc', $sortArray)) { + case (0) : + $sortBy = 'ecoFacilityStatus.statusComment'; + break; + case (1) : + $sortBy = 'ecoFacilities.title'; + break; + case (2) : + $sortBy = 'ecoCategories.name'; + break; + case (3) : + $sortBy = 'ecoFacilities.description'; + break; + case (4) : + $sortBy = 'ecoFacilities.streetName'; + break; + case (5) : + $sortBy = 'ecoFacilities.county'; + break; + case (6) : + $sortBy = 'ecoFacilities.town'; + break; + case (7) : + $sortBy = 'ecoFacilities.postcode'; + break; + case (8) : + $sortBy = 'ecoUser.username'; + break; + } + /** * COUNT(DISTINCT ecoFacilities.id) required due to multiple status comments possible. */ @@ -109,12 +148,15 @@ class FacilityDataSet { * GROUP BY required to ensure status comments are displayed under the same ID * Named parameters used here for prior reasoning, columns can be added above without * effecting the bindIndex. + * I unfortunately HAVE to do the ORDER BY statement like this, since PDO doesn't allow + * binding of column names to placeholders for some reason. I could have used the column + * order and passed an integer, but its too much hassle and I have enough sanitisation, + * this is fine. */ $sqlLimits = " - GROUP BY ecoFacilities.id - LIMIT :limit OFFSET :offset;"; - $sqlLimits = " - GROUP BY ecoFacilities.id + GROUP BY ecoFacilities.id, ecoFacilities.title, ecoCategories.name, ecoFacilities.description, ecoFacilities.streetName, + ecoFacilities.county, ecoFacilities.town, ecoFacilities.postcode, ecoUser.username + ORDER BY {$sortBy} {$direction} ;"; // Concatenate query snippets for data and row count @@ -122,7 +164,7 @@ class FacilityDataSet { $countQuery = $sqlCount . $sqlWhere . ";"; // Prepare, bind and execute data query - $stmt = $this->populateFields($dataQuery, $filterArray); + $stmt = $this->populateFields($dataQuery, $filterArray, $sortBy, $direction); $stmt->execute(); // Create data objects @@ -132,7 +174,7 @@ class FacilityDataSet { } // Prepare, bind then execute count query - $stmt = $this->populateFields($countQuery, $filterArray); + $stmt = $this->populateFields($countQuery, $filterArray, null, null); $stmt->execute(); $totalCount = $stmt->fetch()['total']; @@ -145,11 +187,13 @@ class FacilityDataSet { /** * @param $sqlQuery * @param $filterArray + * @param $sortBy + * @param $direction * @return false|PDOStatement * Function for fetchAll() to de-dupe code. Performs binding on PDO statements to facilitate * filtering of facilities. Returns a bound PDO statement. */ - private function populateFields($sqlQuery, $filterArray) + private function populateFields($sqlQuery, $filterArray, $sortBy, $direction) { $stmt = $this->_dbHandle->prepare($sqlQuery); // Ensures only one value is returned per column name @@ -162,6 +206,13 @@ class FacilityDataSet { $statusComment = !empty($filterArray[0]) ? "%" . $filterArray[0] . "%" : null; $stmt->bindValue($bindIndex++, $statusComment ?? "%", \PDO::PARAM_STR); // First ? $stmt->bindValue($bindIndex++, $statusComment, $statusComment === null ? \PDO::PARAM_NULL : \PDO::PARAM_STR); // Second ? + // So i worked on trying to get this to work for 30 minutes and it turns out you + // can never bind column name values to placeholders, and must use column orders + // as integers..... what +// if(isset($sortBy) && isset($direction)) { +// $stmt->bindValue(':sortBy', $sortBy, \PDO::PARAM_STR); +// $stmt->bindValue(':direction', $direction, \PDO::PARAM_STR); +// } // Bind other filters for ($i = 1; $i <= 8; $i++) { // Assuming 8 other filters @@ -171,6 +222,7 @@ class FacilityDataSet { return $stmt; } + // UNUSED REPLACED public function setFilterUri($term, $category) { $uri = $_SERVER['REQUEST_URI']; diff --git a/Views/template/header.phtml b/Views/template/header.phtml index 1724637..703c746 100644 --- a/Views/template/header.phtml +++ b/Views/template/header.phtml @@ -7,8 +7,6 @@ @@ -35,32 +33,54 @@ Link - diff --git a/Views/template/pagination.phtml b/Views/template/pagination.phtml index 08c71f9..dca7453 100644 --- a/Views/template/pagination.phtml +++ b/Views/template/pagination.phtml @@ -1,7 +1,7 @@
-
+
pageNumber <= 0 ? 'disabled' : '' ?>> Start @@ -9,20 +9,19 @@ paginator->getTotalPages(); - var_dump($totalPages); for ($i = $view->pageNumber - 2; $i <= $view->pageNumber + 2; $i++) { if ($i >= 0 && $i < $totalPages): ?> - pageNumber ? 'disabled' : '' ?>> - + pageNumber >= $totalPages - 1 ? 'disabled' : '' ?>>Forward pageNumber >= $totalPages - 1 ? 'disabled' : '' ?>>End -
+
diff --git a/index.php b/index.php index f5f3659..ae4ed47 100644 --- a/index.php +++ b/index.php @@ -6,6 +6,7 @@ require_once("logincontroller.php"); $view = new stdClass(); $view->pageTitle = 'Home'; + //if (isset($_POST['applyAdvFilters'])) { // array_push($filterArray, $_POST['titlFilter'], $_POST['cateFilter'], // $description = $_POST['descFilter'], $status = $_POST['statFilter'], diff --git a/paginationcontroller.php b/paginationcontroller.php index 2d39428..c55eac9 100644 --- a/paginationcontroller.php +++ b/paginationcontroller.php @@ -1,9 +1,10 @@ "", 8 => "" ]; +$sortArray = [ + 0 => "", + 1 => "", + 2 => "", + 3 => "", + 4 => "", + 5 => "", + 6 => "", + 7 => "", + 8 => "" +]; -$rowLimit = 5; //$_POST['rowCount']; +$rowLimit = 5; $facilityDataSet = new FacilityDataSet(); - -if (isset($_POST['applyFilters']) && isset($_POST['filter'])) { - var_dump($_POST); - $applyFilters = filter_input(INPUT_POST, 'applyFilters', FILTER_SANITIZE_STRING); - $filterKey = filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING); - $filterArray[$filterKey] = $applyFilters; +var_dump($_POST); +if (isset($_POST['filter']) && isset($_POST['filterCat']) && (isset($_POST['dir'])) && (isset($_POST['sort'])) && (isset($_POST['paginationButton']))) { + $filter = filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS) ?? ''; + $filterKey = filter_input(INPUT_POST, 'filterCat', FILTER_SANITIZE_FULL_SPECIAL_CHARS) ?? ''; + $direction = filter_input(INPUT_POST, 'dir', FILTER_SANITIZE_FULL_SPECIAL_CHARS) ?? 'asc'; // Default to 'asc' + $sortKey = filter_input(INPUT_POST, 'sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS) ?? '1'; // Default to 'title' + $page = filter_input(INPUT_POST,'paginationButton', FILTER_SANITIZE_NUMBER_INT) ?? 0; // Default page to 0 on new filter + $filterArray[$filterKey] = $filter; + $sortArray[$sortKey] = $direction; // Set the filter and generate the new URI - $filterSet = $facilityDataSet->setFilterUri($applyFilters, array_search($applyFilters, $filterArray)); - + //$filterSet = $facilityDataSet->setFilterUri($applyFilters, array_search($applyFilters, $filterArray)); + $filterSet = setUri($filter, array_search($filter, $filterArray), $direction, array_search($direction, $sortArray), $page); // Parse the existing query string + $queryParams = []; parse_str($filterSet["newUri"], $queryParams); // Add or overwrite the 'page' parameter @@ -42,14 +58,16 @@ if (isset($_POST['applyFilters']) && isset($_POST['filter'])) { $newQueryString = http_build_query($queryParams); // Redirect with the updated URI + //var_dump("Redirecting to: {$filterSet["path"]}?{$newQueryString}"); header("Location: {$filterSet["path"]}?{$newQueryString}"); exit; } $filterArray[$_GET['category'] ?? null] = $_GET['term'] ?? null; +$sortArray[$_GET['sort'] ?? null] = $_GET['dir'] ?? null; -$view->pageData = $facilityDataSet->fetchAll($filterArray); +$view->pageData = $facilityDataSet->fetchAll($filterArray, $sortArray); $view->paginator = new Paginator($rowLimit, $view->pageData); // Initialize paginator @@ -60,3 +78,52 @@ $view->pageData = $view->paginator->getPage($view->pageNumber); $view->dbMessage = $view->paginator->countPageResults($view->pageNumber) == 0 ? "No results" : $view->paginator->countPageResults($view->pageNumber) . " result(s)"; + +function setUri($filter, $category, $direction, $sort, $page) +{ + $uri = $_SERVER['REQUEST_URI']; + $uriComp = parse_url($uri); + $params = []; + + // Parse existing query parameters + if (isset($uriComp['query'])) { + parse_str($uriComp['query'], $params); + } else { + $params = array(); + } + // Avoid unnecessary redirection if sort and filter is already correct + if ( + (isset($params['sort']) && $params['sort'] === (string)$sort && isset($params['dir']) && $params['dir'] === $direction) && + (isset($params['category']) && $params['category'] === (string)$category && isset($params['term']) && $params['term'] === $filter) + ) { + exit; + } + + // Update parameters + if (!empty($category)) { + $params['category'] = $category; + } + if (!empty($filter)) { + $params['term'] = $filter; + } + if (!empty($sort)) { + $params['sort'] = $sort; + } + if (!empty($direction)) { + $params['dir'] = $direction; + } + if (!empty($filter)) { + $params['page'] = $page; + } + + // Rebuild the query string + $newUri = http_build_query($params); + var_dump($newUri); + // Redirect to the updated URI + // Use the current path or root + return + [ + 'newUri' => $newUri, + 'path' => $uriComp['path'] ?? '/' + ]; +}