gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 30578: Fix multi-terms search 

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Jonathan Druart 2022-06-13 20:58:44 +02:00 committed by Tomas Cohen Arazi
parent 8e321e8d76
commit 88becf3dce
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
koha-tmpl/intranet-tmpl/prog/js/patron-autocomplete.js
View File

@ -13,33 +13,43 @@ function patron_autocomplete(node, options) {
on_select_callback = options['on-select-callback'];
}
}
const search_fields = ['me.surname', 'me.firstname', 'me.cardnumber'];
return node.autocomplete({
source: function( request, response ) {
let params = {
'_page': 1,
'_per_page': 10,
'q': JSON.stringify([
{"me.firstname": {"like": "%"+request.term+"%"}},
{"me.surname": {"like": "%"+request.term+"%"}},
{"me.cardnumber": {"like": request.term+"%"}}
]),
'_order_by': '+me.surname,+me.firstname',
};
$.ajax({
data: params,
type: 'GET',
url: '/api/v1/patrons',
headers: {
"x-koha-embed": "library"
},
success: function(data) {
return response(data);
},
error: function() {
alert( _("An error occurred. Check the logs") );
return response();
}
let subquery_and = [];
request.term.split(' ')
.filter(function(s){ return s.length })
.forEach(function(pattern,i){
subquery_and.push(
[
{'me.surname': {'like': '%' + pattern + '%'}},
{'me.firstname': {'like': '%' + pattern + '%'}},
{'me.cardnumber': {'like': pattern + '%'}},
]
);
});
let q = {"-and": subquery_and};
let params = {
'_page': 1,
'_per_page': 10,
'q': JSON.stringify(q),
'_order_by': '+me.surname,+me.firstname',
};
$.ajax({
data: params,
type: 'GET',
url: '/api/v1/patrons',
headers: {
"x-koha-embed": "library"
},
success: function(data) {
return response(data);
},
error: function() {
alert( _("An error occurred. Check the logs") );
return response();
}
});
},
minLength: 3,
select: function( event, ui ) {