From efdb7b89092502002ff1ab2dc804f271b3a11f3b Mon Sep 17 00:00:00 2001 From: wescopeland Date: Tue, 9 May 2023 21:32:27 -0400 Subject: [PATCH 01/12] feat(setRequestList): add 'Show only unclaimed games' filter --- app_legacy/Helpers/database/set-request.php | 8 ++- public/setRequestList.php | 74 ++++++++++++++++++--- 2 files changed, 70 insertions(+), 12 deletions(-) diff --git a/app_legacy/Helpers/database/set-request.php b/app_legacy/Helpers/database/set-request.php index 2cddea60e5..63b8909670 100644 --- a/app_legacy/Helpers/database/set-request.php +++ b/app_legacy/Helpers/database/set-request.php @@ -232,7 +232,7 @@ function getSetRequestorsList(int $gameID, bool $getEmailInfo = false): array /** * Gets a list of the most requested sets without core achievements. */ -function getMostRequestedSetsList(array|int|null $console, int $offset, int $count): array +function getMostRequestedSetsList(array|int|null $console, int $offset, int $count, bool $unclaimedOnly = false): array { sanitize_sql_inputs($offset, $count); @@ -249,7 +249,7 @@ function getMostRequestedSetsList(array|int|null $console, int $offset, int $cou FROM SetRequest sr LEFT JOIN - SetClaim sc ON (sr.GameID = sc.GameID) + SetClaim sc ON (sr.GameID = sc.GameID AND sc.Status = 0) LEFT JOIN GameData gd ON (sr.GameID = gd.ID) LEFT JOIN @@ -264,6 +264,10 @@ function getMostRequestedSetsList(array|int|null $console, int $offset, int $cou $query .= " AND c.ID = $console "; } + if ($unclaimedOnly) { + $query .= " AND sc.ID IS NULL "; + } + $query .= " GROUP BY sr.GameID diff --git a/public/setRequestList.php b/public/setRequestList.php index c4dde2c1ef..30ea7ca338 100644 --- a/public/setRequestList.php +++ b/public/setRequestList.php @@ -8,11 +8,13 @@ $maxCount = 50; $offset = 0; +$unclaimedOnly = false; $username = requestInputSanitized('u'); $selectedConsoleId = (int) request()->input('s'); $count = (int) request()->input('c', $maxCount); $offset = (int) request()->input('o', $offset); +$unclaimedOnly = (bool) request()->input('x', $unclaimedOnly); $flag = (int) request()->input('f', 0); // 0 - display only active user set requests, else display all user set requests if ($offset < 0) { $offset = 0; @@ -33,13 +35,13 @@ $validConsoles[] = $console['ID']; } } - $setRequestList = getMostRequestedSetsList($validConsoles, $offset, $count); + $setRequestList = getMostRequestedSetsList($validConsoles, $offset, $count, $unclaimedOnly); $totalRequestedGames = getGamesWithRequests($validConsoles); } elseif ($selectedConsoleId == -1) { - $setRequestList = getMostRequestedSetsList(null, $offset, $count); + $setRequestList = getMostRequestedSetsList(null, $offset, $count, $unclaimedOnly); $totalRequestedGames = getGamesWithRequests(null); } else { - $setRequestList = getMostRequestedSetsList($selectedConsoleId, $offset, $count); + $setRequestList = getMostRequestedSetsList($selectedConsoleId, $offset, $count, $unclaimedOnly); $totalRequestedGames = getGamesWithRequests($selectedConsoleId); } } else { @@ -49,6 +51,46 @@ RenderContentStart("Set Requests"); ?> + +
$totalRequestedGames Requested Sets
"; + echo ""; - echo "
"; + echo "
$totalRequestedGames Requested Sets"; + echo "
"; + + echo "
"; echo "Filter by console: "; - echo ""; if ($selectedConsoleId == null) { echo ""; } else { @@ -74,7 +119,7 @@ if ($selectedConsoleId == -1) { echo ""; } else { - echo ""; + echo ""; } /** @var System $console */ @@ -84,15 +129,24 @@ if ($selectedConsoleId == $console['ID']) { echo ""; } else { - echo ""; + echo ""; echo "" . $consoleName . "
"; } } - - echo ""; echo ""; echo "
"; + $checkedAttribute = $unclaimedOnly ? "checked" : ""; + echo << + + Show only unclaimed games + + HTML; + + echo "
"; + echo "
"; + echo "
"; // Create table headers From 846786189dbbb1636f583c77db113d4634a4a7d4 Mon Sep 17 00:00:00 2001 From: wescopeland Date: Wed, 10 May 2023 00:07:17 -0400 Subject: [PATCH 02/12] fix: remediate pagination --- public/setRequestList.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/public/setRequestList.php b/public/setRequestList.php index 30ea7ca338..52f28210f1 100644 --- a/public/setRequestList.php +++ b/public/setRequestList.php @@ -175,24 +175,25 @@ function handleConsoleChanged(event) { // Add page traversal links echo "
"; + $unclaimedOnlyParam = isset($unclaimedOnly) ? "&x=$unclaimedOnly" : ""; if ($offset > 0) { $prevOffset = $offset - $maxCount; if (!empty($selectedConsoleId)) { - echo "First - "; - echo "< Previous $maxCount - "; + echo "First - "; + echo "< Previous $maxCount - "; } else { - echo "First - "; - echo "< Previous $maxCount - "; + echo "First - "; + echo "< Previous $maxCount - "; } } if ($gameCounter == $maxCount && $offset != $totalRequestedGames - $maxCount) { $nextOffset = $offset + $maxCount; if (!empty($selectedConsoleId)) { - echo "Next $maxCount >"; - echo " - Last"; + echo "Next $maxCount >"; + echo " - Last"; } else { - echo "Next $maxCount >"; - echo " - Last"; + echo "Next $maxCount >"; + echo " - Last"; } } echo "
"; From 565d042b60f5ebea11afff1d6dba158d11a8c9df Mon Sep 17 00:00:00 2001 From: wescopeland Date: Wed, 10 May 2023 00:09:26 -0400 Subject: [PATCH 03/12] chore: lint --- public/setRequestList.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/setRequestList.php b/public/setRequestList.php index 52f28210f1..3183270ffa 100644 --- a/public/setRequestList.php +++ b/public/setRequestList.php @@ -175,7 +175,7 @@ function handleConsoleChanged(event) { // Add page traversal links echo "
"; - $unclaimedOnlyParam = isset($unclaimedOnly) ? "&x=$unclaimedOnly" : ""; + $unclaimedOnlyParam = "&x=$unclaimedOnly"; if ($offset > 0) { $prevOffset = $offset - $maxCount; if (!empty($selectedConsoleId)) { From d538ed8a339b49a0aeb935c16a9d7d1f700ef0b7 Mon Sep 17 00:00:00 2001 From: wescopeland Date: Wed, 10 May 2023 19:04:48 -0400 Subject: [PATCH 04/12] chore: work through pr feedback --- app_legacy/Helpers/database/set-request.php | 25 +++- public/setRequestList.php | 135 +++++------------- .../request-list/meta-panel.blade.php | 97 +++++++++++++ 3 files changed, 150 insertions(+), 107 deletions(-) create mode 100644 resources/views/community/components/request-list/meta-panel.blade.php diff --git a/app_legacy/Helpers/database/set-request.php b/app_legacy/Helpers/database/set-request.php index 63b8909670..8392eb1d67 100644 --- a/app_legacy/Helpers/database/set-request.php +++ b/app_legacy/Helpers/database/set-request.php @@ -232,7 +232,7 @@ function getSetRequestorsList(int $gameID, bool $getEmailInfo = false): array /** * Gets a list of the most requested sets without core achievements. */ -function getMostRequestedSetsList(array|int|null $console, int $offset, int $count, bool $unclaimedOnly = false): array +function getMostRequestedSetsList(array|int|null $console, int $offset, int $count, int $claimStatus = 0): array { sanitize_sql_inputs($offset, $count); @@ -264,7 +264,9 @@ function getMostRequestedSetsList(array|int|null $console, int $offset, int $cou $query .= " AND c.ID = $console "; } - if ($unclaimedOnly) { + if ($claimStatus === 1) { + $query .= " AND sc.ID IS NOT NULL "; + } else if ($claimStatus === 2) { $query .= " AND sc.ID IS NULL "; } @@ -292,7 +294,7 @@ function getMostRequestedSetsList(array|int|null $console, int $offset, int $cou /** * Gets the number of set-less games with at least one set request. */ -function getGamesWithRequests(array|int|null $console): int +function getGamesWithRequests(array|int|null $console, int $claimStatus = 0): int { $query = " SELECT @@ -304,9 +306,14 @@ function getGamesWithRequests(array|int|null $console): int LEFT JOIN GameData gd ON (sr.GameID = gd.ID) LEFT JOIN - Console c ON (gd.ConsoleID = c.ID) - WHERE - GameID NOT IN (SELECT DISTINCT(GameID) FROM Achievements where Flags = '3') "; + Console c ON (gd.ConsoleID = c.ID) "; + + if ($claimStatus === 2) { + $query .= "LEFT OUTER JOIN SetClaim sc ON (sr.GameID = sc.GameID AND sc.Status = 0) "; + } + + $query .= "WHERE sr.GameID NOT IN (SELECT DISTINCT(GameID) FROM Achievements where Flags = '3') "; + if (is_array($console)) { $query .= ' AND c.ID IN (' . implode(',', $console) . ') '; @@ -315,6 +322,12 @@ function getGamesWithRequests(array|int|null $console): int $query .= " AND c.ID = $console "; } + // if ($claimStatus === 1) { + // $query .= " AND sc.ID IS NOT NULL "; + // } else if ($claimStatus === 2) { + // $query .= " AND sc.ID IS NULL "; + // } + $dbResult = s_mysql_query($query); if (!$dbResult) { diff --git a/public/setRequestList.php b/public/setRequestList.php index 3183270ffa..ba529f4f51 100644 --- a/public/setRequestList.php +++ b/public/setRequestList.php @@ -8,13 +8,12 @@ $maxCount = 50; $offset = 0; -$unclaimedOnly = false; $username = requestInputSanitized('u'); $selectedConsoleId = (int) request()->input('s'); +$selectedRequestStatus = (int) request()->input('x'); $count = (int) request()->input('c', $maxCount); $offset = (int) request()->input('o', $offset); -$unclaimedOnly = (bool) request()->input('x', $unclaimedOnly); $flag = (int) request()->input('f', 0); // 0 - display only active user set requests, else display all user set requests if ($offset < 0) { $offset = 0; @@ -35,14 +34,14 @@ $validConsoles[] = $console['ID']; } } - $setRequestList = getMostRequestedSetsList($validConsoles, $offset, $count, $unclaimedOnly); - $totalRequestedGames = getGamesWithRequests($validConsoles); + $setRequestList = getMostRequestedSetsList($validConsoles, $offset, $count, $selectedRequestStatus); + $totalRequestedGames = getGamesWithRequests($validConsoles, $selectedRequestStatus); } elseif ($selectedConsoleId == -1) { - $setRequestList = getMostRequestedSetsList(null, $offset, $count, $unclaimedOnly); - $totalRequestedGames = getGamesWithRequests(null); + $setRequestList = getMostRequestedSetsList(null, $offset, $count, $selectedRequestStatus); + $totalRequestedGames = getGamesWithRequests(null, $selectedRequestStatus); } else { - $setRequestList = getMostRequestedSetsList($selectedConsoleId, $offset, $count, $unclaimedOnly); - $totalRequestedGames = getGamesWithRequests($selectedConsoleId); + $setRequestList = getMostRequestedSetsList($selectedConsoleId, $offset, $count, $selectedRequestStatus); + $totalRequestedGames = getGamesWithRequests($selectedConsoleId, $selectedRequestStatus); } } else { $setRequestList = getUserRequestList($username); @@ -51,46 +50,6 @@ RenderContentStart("Set Requests"); ?> - -
"; - echo "
$totalRequestedGames Requested Sets"; - echo "
"; - - echo "
"; - echo "Filter by console: "; - echo ""; - echo "
"; - - $checkedAttribute = $unclaimedOnly ? "checked" : ""; - echo << - - Show only unclaimed games - - HTML; - - echo "
"; + echo "
"; + echo Blade::render( + '', [ + 'consoles' => $consoles, + 'totalRequestedGames' => $totalRequestedGames, + 'selectedConsoleId' => $selectedConsoleId, + 'selectedRequestStatus' => $selectedRequestStatus, + ] + ); echo "
"; - - echo "
"; + + echo "
"; // Create table headers echo ""; echo ""; echo ""; - echo ""; + echo ""; echo ""; // Loop through each set request and display its information @@ -169,31 +102,31 @@ function handleConsoleChanged(event) { echo "
"; } echo ""; - echo ""; + echo ""; } echo "
GameClaimed ByRequestsRequests
" . $request['Requests'] . "" . $request['Requests'] . "
"; // Add page traversal links echo "
"; - $unclaimedOnlyParam = "&x=$unclaimedOnly"; + $requestStatusParam = "&x=$selectedRequestStatus"; if ($offset > 0) { $prevOffset = $offset - $maxCount; if (!empty($selectedConsoleId)) { - echo "First - "; - echo "< Previous $maxCount - "; + echo "First - "; + echo "< Previous $maxCount - "; } else { - echo "First - "; - echo "< Previous $maxCount - "; + echo "First - "; + echo "< Previous $maxCount - "; } } if ($gameCounter == $maxCount && $offset != $totalRequestedGames - $maxCount) { $nextOffset = $offset + $maxCount; if (!empty($selectedConsoleId)) { - echo "Next $maxCount >"; - echo " - Last"; + echo "Next $maxCount >"; + echo " - Last"; } else { - echo "Next $maxCount >"; - echo " - Last"; + echo "Next $maxCount >"; + echo " - Last"; } } echo "
"; diff --git a/resources/views/community/components/request-list/meta-panel.blade.php b/resources/views/community/components/request-list/meta-panel.blade.php new file mode 100644 index 0000000000..14e8e6b95e --- /dev/null +++ b/resources/views/community/components/request-list/meta-panel.blade.php @@ -0,0 +1,97 @@ + + +@props([ + 'consoles' => [], + 'requestedSetsCount' => 0, + 'selectedConsoleId' => null, + 'selectedRequestStatus' => null, +]) + +
+

{{ localized_number($requestedSetsCount) }} Requested Sets

+ +
+
+ + +
+ +
+

Filter by request status:

+
+
+ + +
+ +
+ + +
+ +
+ + +
+
+
+
+
\ No newline at end of file From ed7c3b272d131886f75d86a647e58012367fa4fc Mon Sep 17 00:00:00 2001 From: wescopeland Date: Wed, 10 May 2023 19:05:06 -0400 Subject: [PATCH 05/12] chore: lint --- app_legacy/Helpers/database/set-request.php | 3 +-- public/setRequestList.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app_legacy/Helpers/database/set-request.php b/app_legacy/Helpers/database/set-request.php index 8392eb1d67..56da2380db 100644 --- a/app_legacy/Helpers/database/set-request.php +++ b/app_legacy/Helpers/database/set-request.php @@ -266,7 +266,7 @@ function getMostRequestedSetsList(array|int|null $console, int $offset, int $cou if ($claimStatus === 1) { $query .= " AND sc.ID IS NOT NULL "; - } else if ($claimStatus === 2) { + } elseif ($claimStatus === 2) { $query .= " AND sc.ID IS NULL "; } @@ -313,7 +313,6 @@ function getGamesWithRequests(array|int|null $console, int $claimStatus = 0): in } $query .= "WHERE sr.GameID NOT IN (SELECT DISTINCT(GameID) FROM Achievements where Flags = '3') "; - if (is_array($console)) { $query .= ' AND c.ID IN (' . implode(',', $console) . ') '; diff --git a/public/setRequestList.php b/public/setRequestList.php index ba529f4f51..43f1f6ed69 100644 --- a/public/setRequestList.php +++ b/public/setRequestList.php @@ -79,7 +79,7 @@ ] ); echo "
"; - + echo "
"; // Create table headers From ae2d350d6c2433c6de367af6ada773f5003d6ce7 Mon Sep 17 00:00:00 2001 From: wescopeland Date: Wed, 10 May 2023 19:37:09 -0400 Subject: [PATCH 06/12] feat: more ux improvements --- app_legacy/Helpers/database/set-request.php | 12 ++-- .../meta-console-filter.blade.php | 22 +++++++ .../request-list/meta-panel.blade.php | 58 +++++-------------- .../meta-request-status-filter.blade.php | 41 +++++++++++++ 4 files changed, 84 insertions(+), 49 deletions(-) create mode 100644 resources/views/community/components/request-list/meta-console-filter.blade.php create mode 100644 resources/views/community/components/request-list/meta-request-status-filter.blade.php diff --git a/app_legacy/Helpers/database/set-request.php b/app_legacy/Helpers/database/set-request.php index 56da2380db..e712eea3de 100644 --- a/app_legacy/Helpers/database/set-request.php +++ b/app_legacy/Helpers/database/set-request.php @@ -308,7 +308,7 @@ function getGamesWithRequests(array|int|null $console, int $claimStatus = 0): in LEFT JOIN Console c ON (gd.ConsoleID = c.ID) "; - if ($claimStatus === 2) { + if ($claimStatus === 1 || $claimStatus === 2) { $query .= "LEFT OUTER JOIN SetClaim sc ON (sr.GameID = sc.GameID AND sc.Status = 0) "; } @@ -321,11 +321,11 @@ function getGamesWithRequests(array|int|null $console, int $claimStatus = 0): in $query .= " AND c.ID = $console "; } - // if ($claimStatus === 1) { - // $query .= " AND sc.ID IS NOT NULL "; - // } else if ($claimStatus === 2) { - // $query .= " AND sc.ID IS NULL "; - // } + if ($claimStatus === 1) { + $query .= " AND sc.ID IS NOT NULL "; + } elseif ($claimStatus === 2) { + $query .= " AND sc.ID IS NULL "; + } $dbResult = s_mysql_query($query); diff --git a/resources/views/community/components/request-list/meta-console-filter.blade.php b/resources/views/community/components/request-list/meta-console-filter.blade.php new file mode 100644 index 0000000000..b194430662 --- /dev/null +++ b/resources/views/community/components/request-list/meta-console-filter.blade.php @@ -0,0 +1,22 @@ + + \ No newline at end of file diff --git a/resources/views/community/components/request-list/meta-panel.blade.php b/resources/views/community/components/request-list/meta-panel.blade.php index 14e8e6b95e..7790e27fb6 100644 --- a/resources/views/community/components/request-list/meta-panel.blade.php +++ b/resources/views/community/components/request-list/meta-panel.blade.php @@ -48,50 +48,22 @@ function handleRequestStatusChanged(event) {

{{ localized_number($requestedSetsCount) }} Requested Sets

-
-
- - -
- -
-

Filter by request status:

-
-
- - -
- -
- - -
- -
- - -
+
+
+
-
+ +
+ +
+
\ No newline at end of file diff --git a/resources/views/community/components/request-list/meta-request-status-filter.blade.php b/resources/views/community/components/request-list/meta-request-status-filter.blade.php new file mode 100644 index 0000000000..b125d505a6 --- /dev/null +++ b/resources/views/community/components/request-list/meta-request-status-filter.blade.php @@ -0,0 +1,41 @@ + +
+ +
\ No newline at end of file From 8db2a68f6601e5de7adc9aa70c53a6aaecad2069 Mon Sep 17 00:00:00 2001 From: wescopeland Date: Wed, 10 May 2023 19:40:10 -0400 Subject: [PATCH 07/12] fix: remediate templating issues --- .../meta-request-status-filter.blade.php | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/resources/views/community/components/request-list/meta-request-status-filter.blade.php b/resources/views/community/components/request-list/meta-request-status-filter.blade.php index b125d505a6..b87a97da4a 100644 --- a/resources/views/community/components/request-list/meta-request-status-filter.blade.php +++ b/resources/views/community/components/request-list/meta-request-status-filter.blade.php @@ -1,41 +1,17 @@
\ No newline at end of file From 63af716e5c30380dc4013f3bdd623aa975ceb4a8 Mon Sep 17 00:00:00 2001 From: wescopeland Date: Wed, 10 May 2023 20:46:13 -0400 Subject: [PATCH 08/12] fix: refactor blade --- app_legacy/Community/Enums/RequestStatus.php | 12 +++++++++ app_legacy/Helpers/database/set-request.php | 15 ++++++----- public/setRequestList.php | 7 +++-- ...meta-request-status-filter-radio.blade.php | 15 +++++++++++ .../meta-request-status-filter.blade.php | 27 +++++++++++-------- 5 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 app_legacy/Community/Enums/RequestStatus.php create mode 100644 resources/views/community/components/request-list/meta-request-status-filter-radio.blade.php diff --git a/app_legacy/Community/Enums/RequestStatus.php b/app_legacy/Community/Enums/RequestStatus.php new file mode 100644 index 0000000000..074f1fbc94 --- /dev/null +++ b/app_legacy/Community/Enums/RequestStatus.php @@ -0,0 +1,12 @@ +input('x'); +$selectedRequestStatus = RequestStatus::tryFrom($selectedRequestStatusValue) ?? RequestStatus::ANY; + $username = requestInputSanitized('u'); $selectedConsoleId = (int) request()->input('s'); -$selectedRequestStatus = (int) request()->input('x'); $count = (int) request()->input('c', $maxCount); $offset = (int) request()->input('o', $offset); $flag = (int) request()->input('f', 0); // 0 - display only active user set requests, else display all user set requests @@ -108,7 +111,7 @@ // Add page traversal links echo "
"; - $requestStatusParam = "&x=$selectedRequestStatus"; + $requestStatusParam = "&x=" . $selectedRequestStatus->value; if ($offset > 0) { $prevOffset = $offset - $maxCount; if (!empty($selectedConsoleId)) { diff --git a/resources/views/community/components/request-list/meta-request-status-filter-radio.blade.php b/resources/views/community/components/request-list/meta-request-status-filter-radio.blade.php new file mode 100644 index 0000000000..bf500b5012 --- /dev/null +++ b/resources/views/community/components/request-list/meta-request-status-filter-radio.blade.php @@ -0,0 +1,15 @@ + + +@props([ + 'selectedRequestStatus' => $any, + 'value' => $any, +]) + + \ No newline at end of file diff --git a/resources/views/community/components/request-list/meta-request-status-filter.blade.php b/resources/views/community/components/request-list/meta-request-status-filter.blade.php index b87a97da4a..25d8027018 100644 --- a/resources/views/community/components/request-list/meta-request-status-filter.blade.php +++ b/resources/views/community/components/request-list/meta-request-status-filter.blade.php @@ -1,17 +1,22 @@ + +
- + + Any + - + - -
\ No newline at end of file + +
From bc05ef54f406b25548b90fc9c708e3662dc5d04f Mon Sep 17 00:00:00 2001 From: wescopeland Date: Wed, 10 May 2023 21:00:46 -0400 Subject: [PATCH 09/12] feat: add juice --- app_legacy/Community/Enums/RequestStatus.php | 17 +++++++++++++---- app_legacy/Helpers/database/set-request.php | 14 +++++++------- public/setRequestList.php | 7 ++----- .../meta-request-status-filter-radio.blade.php | 6 +++--- .../meta-request-status-filter.blade.php | 6 +++--- 5 files changed, 28 insertions(+), 22 deletions(-) diff --git a/app_legacy/Community/Enums/RequestStatus.php b/app_legacy/Community/Enums/RequestStatus.php index 074f1fbc94..afc8bb116c 100644 --- a/app_legacy/Community/Enums/RequestStatus.php +++ b/app_legacy/Community/Enums/RequestStatus.php @@ -4,9 +4,18 @@ namespace LegacyApp\Community\Enums; -enum RequestStatus: int +abstract class RequestStatus { - case ANY = 0; - case CLAIMED = 1; - case UNCLAIMED = 2; + public const Any = 0; + public const Claimed = 1; + public const Unclaimed = 2; + + public static function cases(): array + { + return [ + self::Any, + self::Claimed, + self::Unclaimed, + ]; + } } diff --git a/app_legacy/Helpers/database/set-request.php b/app_legacy/Helpers/database/set-request.php index 91f29bfb44..fe16abd8a1 100644 --- a/app_legacy/Helpers/database/set-request.php +++ b/app_legacy/Helpers/database/set-request.php @@ -233,7 +233,7 @@ function getSetRequestorsList(int $gameID, bool $getEmailInfo = false): array /** * Gets a list of the most requested sets without core achievements. */ -function getMostRequestedSetsList(array|int|null $console, int $offset, int $count, RequestStatus $requestStatus = RequestStatus::ANY): array +function getMostRequestedSetsList(array|int|null $console, int $offset, int $count, int $requestStatus = RequestStatus::Any): array { sanitize_sql_inputs($offset, $count); @@ -265,9 +265,9 @@ function getMostRequestedSetsList(array|int|null $console, int $offset, int $cou $query .= " AND c.ID = $console "; } - if ($requestStatus === RequestStatus::CLAIMED) { + if ($requestStatus === RequestStatus::Claimed) { $query .= " AND sc.ID IS NOT NULL "; - } elseif ($requestStatus === RequestStatus::UNCLAIMED) { + } elseif ($requestStatus === RequestStatus::Unclaimed) { $query .= " AND sc.ID IS NULL "; } @@ -295,7 +295,7 @@ function getMostRequestedSetsList(array|int|null $console, int $offset, int $cou /** * Gets the number of set-less games with at least one set request. */ -function getGamesWithRequests(array|int|null $console, RequestStatus $requestStatus = RequestStatus::ANY): int +function getGamesWithRequests(array|int|null $console, int $requestStatus = RequestStatus::Any): int { $query = " SELECT @@ -309,7 +309,7 @@ function getGamesWithRequests(array|int|null $console, RequestStatus $requestSta LEFT JOIN Console c ON (gd.ConsoleID = c.ID) "; - if ($requestStatus !== RequestStatus::ANY) { + if ($requestStatus !== RequestStatus::Any) { $query .= "LEFT OUTER JOIN SetClaim sc ON (sr.GameID = sc.GameID AND sc.Status = 0) "; } @@ -322,9 +322,9 @@ function getGamesWithRequests(array|int|null $console, RequestStatus $requestSta $query .= " AND c.ID = $console "; } - if ($requestStatus === RequestStatus::CLAIMED) { + if ($requestStatus === RequestStatus::Claimed) { $query .= " AND sc.ID IS NOT NULL "; - } elseif ($requestStatus === RequestStatus::UNCLAIMED) { + } elseif ($requestStatus === RequestStatus::Unclaimed) { $query .= " AND sc.ID IS NULL "; } diff --git a/public/setRequestList.php b/public/setRequestList.php index 3a7112fd93..e9f236019d 100644 --- a/public/setRequestList.php +++ b/public/setRequestList.php @@ -1,6 +1,5 @@ input('x'); -$selectedRequestStatus = RequestStatus::tryFrom($selectedRequestStatusValue) ?? RequestStatus::ANY; - $username = requestInputSanitized('u'); $selectedConsoleId = (int) request()->input('s'); +$selectedRequestStatus = (int) request()->input('x'); $count = (int) request()->input('c', $maxCount); $offset = (int) request()->input('o', $offset); $flag = (int) request()->input('f', 0); // 0 - display only active user set requests, else display all user set requests @@ -111,7 +108,7 @@ // Add page traversal links echo "
"; - $requestStatusParam = "&x=" . $selectedRequestStatus->value; + $requestStatusParam = "&x=" . $selectedRequestStatus; if ($offset > 0) { $prevOffset = $offset - $maxCount; if (!empty($selectedConsoleId)) { diff --git a/resources/views/community/components/request-list/meta-request-status-filter-radio.blade.php b/resources/views/community/components/request-list/meta-request-status-filter-radio.blade.php index bf500b5012..ae27a737cf 100644 --- a/resources/views/community/components/request-list/meta-request-status-filter-radio.blade.php +++ b/resources/views/community/components/request-list/meta-request-status-filter-radio.blade.php @@ -1,7 +1,7 @@ @props([ @@ -9,7 +9,7 @@ 'value' => $any, ]) -