standardebooks/web
1
0
Fork 0
mirror of https://github.com/standardebooks/web.git synced 2025-07-14 18:42:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor Library::FilterArtwork and artworks/index.php to accept ArtworkSort

Browse source
This commit is contained in:
Mike Colagrosso 2024-01-30 00:17:00 -07:00 • committed by Alex Cabal
parent 004a4a27c3
commit 94dce1009a
2 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/Library.php
View file

@ -159,10 +159,10 @@ class Library{
/** /**
* @param string $query * @param string $query
* @param string $status * @param string $status
* @param string $sort * @param ArtworkSort $sort
* @return Array<mixed> * @return Array<mixed>
*/ */
public static function FilterArtwork(string $query = null, string $status = null, string $sort = null, int $submitterUserId = null, int $page = 1, int $perPage = ARTWORK_PER_PAGE): array{ public static function FilterArtwork(string $query = null, string $status = null, ArtworkSort $sort = null, int $submitterUserId = null, int $page = 1, int $perPage = ARTWORK_PER_PAGE): array{
// Returns an array of: // Returns an array of:
// ['artworks'] => Array<Artwork>, // ['artworks'] => Array<Artwork>,
// ['artworksCount'] => int // ['artworksCount'] => int
@ -210,10 +210,10 @@ class Library{
} }
$orderBy = 'art.Created desc'; $orderBy = 'art.Created desc';
if($sort == ArtworkSort::ArtistAlpha->value){ if($sort == ArtworkSort::ArtistAlpha){
$orderBy = 'a.Name'; $orderBy = 'a.Name';
} }
elseif($sort == ArtworkSort::CompletedNewest->value){ elseif($sort == ArtworkSort::CompletedNewest){
$orderBy = 'art.CompletedYear desc'; $orderBy = 'art.CompletedYear desc';
} }

16
www/artworks/index.php
View file

@ -5,7 +5,7 @@ $query = HttpInput::Str(GET, 'query');
$queryEbookUrl = HttpInput::Str(GET, 'query-ebook-url'); $queryEbookUrl = HttpInput::Str(GET, 'query-ebook-url');
$status = HttpInput::Str(GET, 'status'); $status = HttpInput::Str(GET, 'status');
$filterArtworkStatus = $status; $filterArtworkStatus = $status;
$sort = HttpInput::Str(GET, 'sort'); $sort = ArtworkSort::tryFrom(HttpInput::Str(GET, 'sort') ?? '');
$pages = 0; $pages = 0;
$totalArtworkCount = 0; $totalArtworkCount = 0;
$pageDescription = ''; $pageDescription = '';
@ -26,11 +26,7 @@ try{
// If we're passed string values that are the same as the defaults, // If we're passed string values that are the same as the defaults,
// set them to null so that we can have cleaner query strings in the navigation footer // set them to null so that we can have cleaner query strings in the navigation footer
if($sort !== null){ if($sort == ArtworkSort::CreatedNewest){
$sort = mb_strtolower($sort);
}
if($sort == 'created-newest'){
$sort = null; $sort = null;
} }
@ -94,7 +90,7 @@ try{
} }
if($sort !== null){ if($sort !== null){
$queryStringParams['sort'] = $sort; $queryStringParams['sort'] = $sort->value;
} }
if($perPage !== ARTWORK_PER_PAGE){ if($perPage !== ARTWORK_PER_PAGE){
@ -142,9 +138,9 @@ catch(Exceptions\PageOutOfBoundsException){
<span>Sort</span> <span>Sort</span>
<span> <span>
<select name="sort"> <select name="sort">
<option value="<?= ArtworkSort::CreatedNewest->value ?>"<? if($sort == ArtworkSort::CreatedNewest->value){ ?> selected="selected"<? } ?>>Date added (new &#x2192; old)</option> <option value="<?= ArtworkSort::CreatedNewest->value ?>"<? if($sort == ArtworkSort::CreatedNewest){ ?> selected="selected"<? } ?>>Date added (new &#x2192; old)</option>
<option value="<?= ArtworkSort::ArtistAlpha->value ?>"<? if($sort == ArtworkSort::ArtistAlpha->value){ ?> selected="selected"<? } ?>>Artist name (a &#x2192; z)</option> <option value="<?= ArtworkSort::ArtistAlpha->value ?>"<? if($sort == ArtworkSort::ArtistAlpha){ ?> selected="selected"<? } ?>>Artist name (a &#x2192; z)</option>
<option value="<?= ArtworkSort::CompletedNewest->value ?>"<? if($sort == ArtworkSort::CompletedNewest->value){ ?> selected="selected"<? } ?>>Date of artwork completion (new &#x2192; old)</option> <option value="<?= ArtworkSort::CompletedNewest->value ?>"<? if($sort == ArtworkSort::CompletedNewest){ ?> selected="selected"<? } ?>>Date of artwork completion (new &#x2192; old)</option>
</select> </select>
</span> </span>
</label> </label>