View | Details | Raw Unified | Return to bug 34058
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js (-15 / +15 lines)
Lines 86-111 $(document).ready(function() { Link Here
86
            let patron = $("#illfilter_patron").val();
86
            let patron = $("#illfilter_patron").val();
87
            let status = $("#illfilter_status").val();
87
            let status = $("#illfilter_status").val();
88
            let filters = [];
88
            let filters = [];
89
            let patron_sub_or = [];
90
            let status_sub_or = [];
89
            let status_sub_or = [];
91
            let subquery_and = [];
90
            let subquery_and = [];
92
91
93
            if (!patron && !status) return "";
92
            if (!patron && !status) return "";
94
93
95
            if(patron){
94
            if(patron){
96
                const patron_search_fields = "me.borrowernumber,patron.cardnumber,patron.firstname,patron.surname";
95
                let patronquery = buildPatronSearchQuery(
97
                patron_search_fields.split(',').forEach(function(attr){
96
                    patron,
98
                    let operator = "=";
97
                    {
99
                    let patron_data = patron;
98
                        table_prefix: 'patron',
100
                    if ( attr != "me.borrowernumber" && attr != "patron.cardnumber") {
101
                        operator = "like";
102
                        patron_data = "%" + patron + "%";
103
                    }
99
                    }
104
                    patron_sub_or.push({
100
                );
105
                        [attr]:{[operator]: patron_data }
101
                subquery_and.push(patronquery);
106
                    });
107
                });
108
                subquery_and.push(patron_sub_or);
109
            }
102
            }
110
103
111
            if(status){
104
            if(status){
Lines 154-160 $(document).ready(function() { Link Here
154
            let filters = [];
147
            let filters = [];
155
            let subquery_and = [];
148
            let subquery_and = [];
156
149
157
            const search_fields = "me.illrequest_id,me.borrowernumber,me.biblio_id,me.due_date,me.branchcode,library.name,me.status,me.status_alias,me.placed,me.replied,me.updated,me.completed,me.medium,me.accessurl,me.cost,me.price_paid,me.notesopac,me.notesstaff,me.orderid,me.backend,patron.firstname,patron.surname";
150
            const search_fields = "me.illrequest_id,me.biblio_id,me.due_date,me.branchcode,library.name,me.status,me.status_alias,me.placed,me.replied,me.updated,me.completed,me.medium,me.accessurl,me.cost,me.price_paid,me.notesopac,me.notesstaff,me.orderid,me.backend";
158
            let sub_or = [];
151
            let sub_or = [];
159
            search_fields.split(',').forEach(function(attr){
152
            search_fields.split(',').forEach(function(attr){
160
                sub_or.push({
153
                sub_or.push({
Lines 164-169 $(document).ready(function() { Link Here
164
            subquery_and.push(sub_or);
157
            subquery_and.push(sub_or);
165
            filters.push({"-and": subquery_and});
158
            filters.push({"-and": subquery_and});
166
159
160
            let patronquery = buildPatronSearchQuery(
161
                keyword,
162
                {
163
                    table_prefix: 'patron',
164
                }
165
            );
166
            filters.push(patronquery);
167
167
            const extended_attributes = "title,type,author,article_title,pages,issue,volume,year";
168
            const extended_attributes = "title,type,author,article_title,pages,issue,volume,year";
168
            let extended_sub_or = [];
169
            let extended_sub_or = [];
169
            subquery_and = [];
170
            subquery_and = [];
170
- 

Return to bug 34058