From a1f074ee8dc3e04d44c6c3ccb19646434be1f41c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 12 Oct 2021 10:32:05 +0000 Subject: [PATCH] Bug 28450: Make Account summary print tables configurable This patch adds table settings for the three tables which appear on the patron's "Print summary" view. This will allow the administrator to set a default configuration for columns on the print summary page. To test, apply the patch and restart-all to load the revised columns settings YAML. Rebuild the staff interface SCSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). - Go to Administration -> Table settings -> Circulation. - Under the "Circulation tables" heading you should see a "Jump to" link to "print_summary." - In the settings for the print_summary page you should see three tables: print-summary-checkouts, print-summary-fines, and print-summary-holds. - Locate a patron account which has checkouts, fines, and holds. - From the patron detail view click "Print -> Print summary." - A new window should open with the print summary view. All tables should display correctly. - Test that the "Columns" buttons work correctly to show and hide columns. - Make changes to the default settings for these tables to confirm that they work on the print summary page. Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- admin/columns_settings.yml | 50 ++++ koha-tmpl/intranet-tmpl/prog/css/print.css | 4 +- .../intranet-tmpl/prog/css/src/_tables.scss | 27 ++ .../prog/css/src/staff-global.scss | 10 + .../en/modules/members/moremember-print.tt | 281 ++++++++++++------ 5 files changed, 278 insertions(+), 94 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 7ae940217c..18f4ce0c0e 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -1343,6 +1343,56 @@ modules: - columnname: non-public_note + print_summary: + print-summary-checkouts: + columns: + - + columnname: title + - + columnname: author + - + columnname: call_number + - + columnname: item_type + - + columnname: date_due + - + columnname: barcode + - + columnname: inventory_number + - + columnname: charge + - + columnname: price + - + columnname: status + + print-summary-holds: + columns: + - + columnname: title + - + columnname: author + - + columnname: placed_on + - + columnname: expires_on + - + columnname: pick up_location + + print-summary-fines: + columns: + - + columnname: date + - + columnname: description_of_charges + - + columnname: note + - + columnname: amount + - + columnname: outstanding + opac: biblio-detail: holdingst: diff --git a/koha-tmpl/intranet-tmpl/prog/css/print.css b/koha-tmpl/intranet-tmpl/prog/css/print.css index aa012990f5..71915fc930 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/print.css +++ b/koha-tmpl/intranet-tmpl/prog/css/print.css @@ -213,6 +213,7 @@ tfoot td, tfoot td:last-child { } td.credit, td.debit, td.sum { + color: #000; font-family : "Courier New", Courier, monospace; text-align : right; } @@ -307,7 +308,8 @@ fieldset.action, .print, .ui-tabs-nav, .browse-controls, -.cart-controls { +.cart-controls, +button.dt-button { display: none; } diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss index 44e2b32ae4..138764992f 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss @@ -26,6 +26,33 @@ table { margin: 0 .5em 0 0; } } + + button { + &.dt-button { + background: transparent none; + border: 0; + color: #595959; + font-size: 60%; + margin: 0 .5em; + + &:hover:not(.disabled):active:not(.disabled) { + background: transparent none; + border: 0; + box-shadow: none; + color: #000; + } + + &:hover:not(.disabled) { + background: transparent none; + border: 0; + color: #000; + } + } + } + + div.dt-button-collection { + font-size: 70%; + } } &.invis { diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index c2d2ff032b..a10fb9ef12 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -2279,6 +2279,16 @@ td { min-height: unset; padding: 0; } + + &.credit, + &.debit, + &.total { + text-align: right; + + tfoot & { + color: #000; + } + } } .cover-image { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt index 5de14933b3..874df51a62 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt @@ -3,6 +3,7 @@ [% USE KohaDates %] [% USE Price %] [% USE ItemTypes %] +[% USE TablesSettings %] [% PROCESS 'member-display-address-style.inc' %] [% SET footerjs = 1 %] @@ -31,72 +32,108 @@ [% IF ( issues ) %] - +
- - - - - - - - - - - - - - [% FOREACH issue IN issues %] - [% IF ( issue.overdue ) %][% ELSE %][% END %] - + + + + + + + + + + + + + + + [% FOREACH issue IN issues %] + + + + + + + + + [% IF ( issue.charge <= 0 ) %] + + [% IF ( issue.replacementprice <= 0 ) %] + + + + [% END %] + + + + + + + + + + + [% IF ( totaldue <= 0 ) %] + + [% IF ( totalprice <= 0 ) %] + - - - - - - - - - + - [% END %] - - - - - - - - - [% END %] + + + [% END %] [% IF ( reserves ) %] - +
- - - - - - - - - [% FOREACH reserve IN reserves %] + - - - - - + + + + + - [% END %] + + + [% FOREACH reserve IN reserves %] + + + + + + + + [% END %] + [% END %] [% IF accounts && totaldue != 0 %] - +
@@ -107,46 +144,62 @@ - - [% FOREACH account IN accounts %] - - - - - [% IF ( account.amount < 0 ) %] - - [% IF ( account.amountoutstanding < 0 ) %] - - - [% END %] - + + [% FOREACH account IN accounts %] + + + + + [% IF ( account.amount <= 0 ) %] + + [% IF ( account.amountoutstanding <= 0 ) %] + + + [% END %] + - - + + + + [% IF ( totaldue < 0 ) %] + + [% IF ( totaldue < 0 ) %] + @@ -154,6 +207,48 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'slip-print.inc' #printThenClose %] + [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'columns_settings.inc' %] + [% END %] [% INCLUDE 'intranet-bottom.inc' %] -- 2.39.5