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 82-107 $(document).ready(function() { Link Here
82
            let patron = $("#illfilter_patron").val();
82
            let patron = $("#illfilter_patron").val();
83
            let status = $("#illfilter_status").val();
83
            let status = $("#illfilter_status").val();
84
            let filters = [];
84
            let filters = [];
85
            let patron_sub_or = [];
86
            let status_sub_or = [];
85
            let status_sub_or = [];
87
            let subquery_and = [];
86
            let subquery_and = [];
88
87
89
            if (!patron && !status) return "";
88
            if (!patron && !status) return "";
90
89
91
            if(patron){
90
            if(patron){
92
                const patron_search_fields = "me.borrowernumber,patron.cardnumber,patron.firstname,patron.surname";
91
                let patronquery = buildPatronSearchQuery(
93
                patron_search_fields.split(',').forEach(function(attr){
92
                    patron,
94
                    let operator = "=";
93
                    {
95
                    let patron_data = patron;
94
                        table_prefix: 'patron',
96
                    if ( attr != "me.borrowernumber" && attr != "patron.cardnumber") {
97
                        operator = "like";
98
                        patron_data = "%" + patron + "%";
99
                    }
95
                    }
100
                    patron_sub_or.push({
96
                );
101
                        [attr]:{[operator]: patron_data }
97
                subquery_and.push(patronquery);
102
                    });
103
                });
104
                subquery_and.push(patron_sub_or);
105
            }
98
            }
106
99
107
            if(status){
100
            if(status){
Lines 150-156 $(document).ready(function() { Link Here
150
            let filters = [];
143
            let filters = [];
151
            let subquery_and = [];
144
            let subquery_and = [];
152
145
153
            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";
146
            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";
154
            let sub_or = [];
147
            let sub_or = [];
155
            search_fields.split(',').forEach(function(attr){
148
            search_fields.split(',').forEach(function(attr){
156
                sub_or.push({
149
                sub_or.push({
Lines 160-165 $(document).ready(function() { Link Here
160
            subquery_and.push(sub_or);
153
            subquery_and.push(sub_or);
161
            filters.push({"-and": subquery_and});
154
            filters.push({"-and": subquery_and});
162
155
156
            let patronquery = buildPatronSearchQuery(
157
                keyword,
158
                {
159
                    table_prefix: 'patron',
160
                }
161
            );
162
            filters.push(patronquery);
163
163
            const extended_attributes = "title,type,author,article_title,pages,issue,volume,year";
164
            const extended_attributes = "title,type,author,article_title,pages,issue,volume,year";
164
            let extended_sub_or = [];
165
            let extended_sub_or = [];
165
            subquery_and = [];
166
            subquery_and = [];
166
- 

Return to bug 34058