Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Search on basis of age in Library #1815

Merged
merged 3 commits into from Apr 23, 2024
Merged

Search on basis of age in Library #1815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1db261d
added the functionality to search on basis of age in "Browse the Libr…
WakMun Mar 28, 2024
00e144c
Updated the placement of "Reader Age" search criteria on advanced sea…
WakMun Mar 29, 2024
36ce954
Apply suggestions from code review
WakMun Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 14 additions & 3 deletions modules/Library/library_browse.php
View file
Open in desktop
Expand Up @@ -48,6 +48,7 @@
$location = trim($_REQUEST['location'] ?? '');
$locationToggle = trim($_REQUEST['locationToggle'] ?? '');
$everything = trim($_REQUEST['everything'] ?? '');
$readerAge = trim($_REQUEST['readerAge'] ?? 0);

$gibbonLibraryItemID = trim($_GET['gibbonLibraryItemID'] ?? '');

Expand Down Expand Up @@ -84,7 +85,7 @@
$row->addSearchSubmit($session, __('Clear Search'))->addClass('sm:col-start-3 md:col-start-5 lg:col-start-7');

$row = $form->addRow();
$row->setClass('advancedOptions hidden grid grid-cols-6 gap-4');
$row->setClass('advancedOptions hidden grid grid-cols-7 gap-4');

$col = $row->addColumn()->setClass('quarterWidth');
$col->addLabel('name', __('Title'));
Expand Down Expand Up @@ -118,15 +119,22 @@
->selected($collection)
->placeholder();

$col = $row->addColumn()->setClass('fullWidth');
$col->addLabel('readerAge', __('Readers Age'));
$ageArray=range(2,21);
$col->addSelect('readerAge')->fromArray($ageArray)->setClass('fullWidth')->selected($readerAge)->placeholder();

$col = $row->addColumn()->setClass('quarterWidth');
$col->addCheckBox('locationToggle')->description('Include Books Outside of Library?')->checked(($locationToggle == 'on'))->setValue('on');



$row = $form->addRow();
$row->addAdvancedOptionsToggle()->addClass('pt-2');

echo $form->getOutput();

if(empty($everything) && empty($collection) && empty($producer) && empty($name) && empty($location)){
if(empty($everything) && empty($collection) && empty($producer) && empty($name) && empty($location) && empty($readerAge)){
// Display a collection of books on visual library shelves
$libraryShelves = [];
$shelfNames = [];
Expand Down Expand Up @@ -190,8 +198,11 @@
$locationName = $pdo->select($locationSql)->fetch();
}



$criteria = $gateway->newQueryCriteria()
->sortBy('id')
->filterBy('agecheck',$readerAge)
->filterBy('name', $name)
->filterBy('producer', $producer)
->filterBy('type', $type)
Expand All @@ -200,7 +211,7 @@
->filterBy('everything', $everything)
->pageSize(100)
->fromPOST();

$searchItems = $gateway->queryBrowseItems($criteria)->toArray();
$searchTerms = ['Everything' => $everything, 'Name' => $name, 'Producer' => $producer, 'Collection' => $collection, 'Location' => $locationName['name']];

Expand Down
8 changes: 8 additions & 0 deletions src/Domain/Library/LibraryGateway.php
View file
Open in desktop
Expand Up @@ -193,6 +193,14 @@ public function queryBrowseItems(QueryCriteria $criteria)
->where('gibbonSpace.name LIKE :location')
->bindValue('location', $location);
},
'agecheck' => function ($query, $readerAge) {
return $query
->where('gibbonLibraryItem.fields->\'$."Reader Age (Youngest)"\' != ""
AND gibbonLibraryItem.fields->\'$."Reader Age (Oldest)"\' != ""
AND gibbonLibraryItem.fields->\'$."Reader Age (Youngest)"\'+0 <= :readerAge
AND gibbonLibraryItem.fields->\'$."Reader Age (Oldest)"\'+0 >= :readerAge')
->bindValue('readerAge', $readerAge);
},
'everything' => function ($query, $needle) {
$globalSearch = "(";
foreach ($query->getCols() as $col) {
Expand Down