Bug 29002: Use buildPatronSearchQuery in patron select

Rebased to use the standardised patron search query builder that has
been introduced more recently.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Janet McGowan <janet.mcgowan@ptfs-europe.com>
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Laurence Rault <laurence.rault@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Martin Renvoize 2023-10-19 16:59:20 +01:00 committed by Tomas Cohen Arazi
parent 131a87567b
commit ea4cb8ff85
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
1 changed files with 14 additions and 24 deletions

View File

@ -39,28 +39,11 @@ $('#placeBookingModal').on('show.bs.modal', function(e) {
"x-koha-embed": "library"
},
data: function(params) {
let search_term = (params.term === undefined) ? '' : params.term;
let q = buildPatronSearchQuery(params.term);
let query = {
'q': JSON.stringify({
"-or": [{
"firstname": {
"-like": search_term + '%'
}
},
{
"surname": {
"-like": search_term + '%'
}
},
{
"cardnumber": {
"-like": search_term + '%'
}
}
]
}),
'_order_by': '+me.surname,+me.firstname',
'q': JSON.stringify(q),
'_page': params.page,
'_order_by': '+me.surname,+me.firstname',
};
return query;
},
@ -92,15 +75,22 @@ $('#placeBookingModal').on('show.bs.modal', function(e) {
? escape_str(patron.firstname) + " "
: "") +
(patron.cardnumber
? " (" + escape_str(patron.cardnumber) + ") "
? " (" + escape_str(patron.cardnumber) + ")"
: "") +
"<small>" +
(patron.date_of_birth
? '<small><span class="age_years">' +
? ' <span class="age_years">' +
$get_age(patron.date_of_birth) +
" " +
__("years") +
"</span></small>"
: "")
"</span>"
: "") +
(patron.library ?
" <span class=\"ac-library\">" +
escape_str(patron.library.name) +
"</span>"
: "") +
"</small>"
)
.addClass(loggedInClass);
return $patron;