Bugzilla – Attachment 95737 Details for
Bug 11281
Add column configuration to 'Holds awaiting pickup' tables allowing to print both tables separately
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11281: Printing holds awaiting pickup prints both tabs
Bug-11281-Printing-holds-awaiting-pickup-prints-bo.patch (text/plain), 6.11 KB, created by
Owen Leonard
on 2019-11-22 19:44:33 UTC
(
hide
)
Description:
Bug 11281: Printing holds awaiting pickup prints both tabs
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2019-11-22 19:44:33 UTC
Size:
6.11 KB
patch
obsolete
>From 60517b8cc9bb3b78eaac9f7a1521e1b84d5bc87f Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 22 Nov 2019 19:29:53 +0000 >Subject: [PATCH] Bug 11281: Printing holds awaiting pickup prints both tabs > >This patch adds columns configuration to the holds awaiting pickup >tables. Doing so helps solve the printing issue by adding a "Print" >option to both tables. Using this print function will provide a >printable version of only that table. > >To test you should have multiple holds in your system which are marked >"waiting" and some which have been waiting longer than the value >specified in the ReservesMaxPickUpDelay system preference. > >Apply the patch and go to Circulation -> Holds awaiting pickup. > > - On both the "Holds waiting" and "Holds waiting over..." tabs the > DataTable should display correctly and all the controls should work, > including the columns settings and the choices in the export menu. > - Confirm that the "Print" action creates a printable version of only > the table you are viewing. > > - Go to Administration -> Columns settings -> Circulation. > - Change some visibility controls for the tables under the > "holds_awaiting_pickup" heading (id=holdso and id=holdst). Confirm > that these changes are reflected in the "Holds waiting" interface. >--- > admin/columns_settings.yml | 49 ++++++++++++++++++++++ > .../prog/en/includes/waiting_holds.inc | 2 +- > .../prog/en/modules/circ/waitingreserves.tt | 32 ++++++++++---- > 3 files changed, 74 insertions(+), 9 deletions(-) > >diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml >index c1fdf398cac..c0d078f6ad6 100644 >--- a/admin/columns_settings.yml >+++ b/admin/columns_settings.yml >@@ -959,6 +959,55 @@ modules: > - > columnname: items_needed > >+ holds_awaiting_pickup: >+ holdst: >+ - >+ columnname: waiting_since >+ - >+ columnname: date_hold_placed >+ - >+ columnname: title >+ - >+ columnname: patron >+ - >+ columnname: home_library >+ - >+ columnname: current_location >+ - >+ columnname: shelving_location >+ - >+ columnname: call_number >+ - >+ columnname: copy_number >+ - >+ columnname: enumeration >+ - >+ columnname: action >+ >+ holdso: >+ - >+ columnname: waiting_since >+ - >+ columnname: date_hold_placed >+ - >+ columnname: title >+ - >+ columnname: patron >+ - >+ columnname: home_library >+ - >+ columnname: current_location >+ - >+ columnname: shelving_location >+ - >+ columnname: call_number >+ - >+ columnname: copy_number >+ - >+ columnname: enumeration >+ - >+ columnname: action >+ > overdues: > circ-overdues: > - >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc >index f8a3045f56a..3ec275f7fb5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc >@@ -13,7 +13,7 @@ > <th>Call number</th> > <th>Copy number</th> > <th>Enumeration</th> >- <th>Action</th> >+ <th class="NoSort noExport">Actions</th> > </tr> > </thead> > <tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >index b4dd22773b6..43a26845a0e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -3,6 +3,7 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >+[% USE ColumnsSettings %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Holds awaiting pickup</title> >@@ -27,7 +28,7 @@ > [% IF Koha.Preference('CircSidebar') %] > <div class="col-sm-10 col-sm-push-2"> > [% ELSE %] >- <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> >+ <div class="col-sm-12"> > [% END %] > > <h2>Holds awaiting pickup for your library on: [% show_date | $KohaDates %] >@@ -120,18 +121,33 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >+ [% INCLUDE 'columns_settings.inc' %] > <script> >+ var holdst_columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'holds_awaiting_pickup', 'holdst', 'json' ) | $raw %]; >+ var holdso_columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'holds_awaiting_pickup', 'holdso', 'json' ) | $raw %]; >+ > $(document).ready(function() { >- $('#resultlist').tabs(); >- $("th a").hide(); >- $("#holdst,#holdso").dataTable($.extend(true, {}, dataTablesDefaults, { >+ >+ KohaTable("holdst", { >+ "aoColumnDefs": [ >+ { "sortable": false, "searchable": false, 'targets': [ 'NoSort' ] }, >+ { "type": "anti-the", "targets" : [ "anti-the" ] }, >+ { "type": "title-string", "targets" : [ "title-string" ] } >+ ], >+ "sPaginationType": "full" >+ }, holdst_columns_settings); >+ >+ KohaTable("holdso", { > "aoColumnDefs": [ >- { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, >- { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, >- { "sType": "title-string", "aTargets" : [ "title-string" ] } >+ { "sortable": false, "searchable": false, 'targets': [ 'NoSort' ] }, >+ { "type": "anti-the", "targets" : [ "anti-the" ] }, >+ { "type": "title-string", "targets" : [ "title-string" ] } > ], > "sPaginationType": "full" >- })); >+ }, holdso_columns_settings); >+ >+ $('#resultlist').tabs(); >+ > }); > </script> > [% END %] >-- >2.11.0
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 11281
:
95737
|
98371
|
98617