Bugzilla – Attachment 132759 Details for
Bug 30063
Make the main patron search use the /patrons REST API route
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30063: Number of checkouts
Bug-30063-Number-of-checkouts.patch (text/plain), 7.04 KB, created by
Martin Renvoize (ashimema)
on 2022-03-31 13:21:25 UTC
(
hide
)
Description:
Bug 30063: Number of checkouts
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-03-31 13:21:25 UTC
Size:
7.04 KB
patch
obsolete
>From 5468b83bcf145c43cad721bd6620b209ed04a2dd Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Fri, 11 Feb 2022 09:39:12 +0100 >Subject: [PATCH] Bug 30063: Number of checkouts >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Signed-off-by: Séverine Queune <severine.queune@bulac.fr> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > api/v1/swagger/definitions/patron.yaml | 5 ++++ > api/v1/swagger/paths/patrons.yaml | 1 + > .../prog/en/includes/patron-search.inc | 30 ++++++++++++++++--- > .../prog/en/modules/members/search.tt | 2 +- > 4 files changed, 33 insertions(+), 5 deletions(-) > >diff --git a/api/v1/swagger/definitions/patron.yaml b/api/v1/swagger/definitions/patron.yaml >index 3d7e60b884..9185b90a51 100644 >--- a/api/v1/swagger/definitions/patron.yaml >+++ b/api/v1/swagger/definitions/patron.yaml >@@ -344,6 +344,11 @@ properties: > description: patron's extended attributes > items: > $ref: "patron_extended_attribute.yaml" >+ checkouts_count: >+ type: >+ - integer >+ - "null" >+ description: Number of checkouts > additionalProperties: false > required: > - surname >diff --git a/api/v1/swagger/paths/patrons.yaml b/api/v1/swagger/paths/patrons.yaml >index 5b2b953372..7afce6892b 100644 >--- a/api/v1/swagger/paths/patrons.yaml >+++ b/api/v1/swagger/paths/patrons.yaml >@@ -385,6 +385,7 @@ > - acquisition: "order_manage" > x-koha-embed: > - extended_attributes >+ - checkouts+count > post: > x-mojo-to: Patrons#add > operationId: addPatron >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >index d088ebc2e5..16681de048 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >@@ -105,6 +105,7 @@ > [% CASE 'dateexpiry' %]<th>Expires on</td> > [% CASE 'borrowernotes' %]<th>Notes</th> > [% CASE 'phone' %]<th>Phone</th> >+ [% CASE 'checkouts' %]<th>Checkouts</th> > [% CASE 'action' %]<th> </th> > [% END %] > [% END %] >@@ -153,8 +154,8 @@ > return map; > }, {}); > >- [% IF Koha.Preference('ExtendedPatronAttributes') %] >- let extended_attribute_types = [% To.json(attribute_type_codes || []) | $raw %]; >+ [% IF Koha.Preference('ExtendedPatronAttributes') && extended_attribute_types %] >+ let extended_attribute_types = [% To.json(extended_attribute_types || []) | $raw %]; > [% END %] > > </script> >@@ -189,7 +190,7 @@ > [% FOR search_field IN search_fields.split(',') %] > {"me.[% search_field | html %]":{"like":"%"+filter+"%"}}, > [% END %] >- [% IF Koha.Preference('ExtendedPatronAttributes') %] >+ [% IF Koha.Preference('ExtendedPatronAttributes') && extended_attribute_types %] > { > "extended_attributes.value": { "like": "%" + filter + "%" }, > "extended_attributes.code": extended_attribute_types >@@ -202,6 +203,7 @@ > [% default_sort_column = "name" %] > [% END %] > [% SET order_column_index = 0 %] >+ [% SET embed = ['extended_attributes'] %] > patrons_table = $("#[% table_id | html %]").kohaTable({ > "ajax": { > [% SWITCH filter %] >@@ -228,7 +230,6 @@ > return json.data; > } > }, >- embed: ['extended_attributes'], > "drawCallback": function( settings ) { > var api = this.api(); > var data = api.data(); >@@ -255,6 +256,17 @@ > [% order_column_index = loop.count - 1%] > [% END %] > [% SWITCH column %] >+ [% CASE 'checkbox' %] >+ { >+ "data": "borrowernumber", >+ "searchable": true, >+ "orderable": true, >+ "render": function( data, type, row, meta ) { >+ return "<input type=\"checkbox\" name="data ? escape_str($date(data) + " (" + _("%s years").format($get_age(data)) + ")") : ""; >+ >+ return "<label for='check" + data + "' class='content_hidden'>" + _("Select patron") + "</label><input type='checkbox' id='check" + data + "' class='selection' name='borrowernumber' value='" + data + "' />", >+ } >+ } > [% CASE 'cardnumber' %] > { > "data": "cardnumber", >@@ -373,6 +385,15 @@ > return escape_str(data); > } > } >+ [% CASE 'checkouts' %][% embed.push('checkouts+count') %] >+ { >+ "data": "", >+ "searchable": false, >+ "orderable": false, >+ "render": function( data, type, row, meta ) { >+ return escape_str(row.checkouts_count); >+ } >+ } > [% CASE 'action' %] > { > "data": function( row, type, val, meta ) { >@@ -391,6 +412,7 @@ > [% UNLESS loop.last %],[% END %] > [% END %] > ], >+ 'embed': [% To.json(embed) | $raw %], > "order": [[ [% order_column_index | html %], "asc" ]], > 'bAutoWidth': false, > 'sPaginationType': 'full_numbers', >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >index 1374918a2a..0106acc4ce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >@@ -28,7 +28,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- [% PROCESS patron_search_js table_id => 'memberresultst', categories => categories, libraries => libraries, extended_attribute_types => extended_attribute_types, columns => columns, filter => filter, selection_type => selection_type, callback => callback %] >+ [% PROCESS patron_search_js table_id => 'memberresultst', categories => categories, libraries => libraries, extended_attribute_types => attribute_type_codes, columns => columns, filter => filter, selection_type => selection_type, callback => callback %] > [% END %] > > [% SET popup_window = 1 %] >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30063
:
130608
|
130609
|
130610
|
130611
|
130612
|
130613
|
130614
|
130615
|
132387
|
132552
|
132731
|
132732
|
132733
|
132734
|
132735
|
132736
|
132737
|
132738
|
132739
|
132740
|
132741
|
132742
|
132743
|
132744
|
132745
|
132746
|
132747
|
132748
|
132749
| 132759 |
132760
|
132761
|
132762
|
132763
|
132764
|
132765
|
132766
|
132767
|
132768
|
132769
|
132770
|
132771
|
132772
|
132773
|
132774
|
132775
|
132776
|
132777
|
132958