From 888842c44ae24921f586fee062726d62b6508eec Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 21 Mar 2023 16:43:06 +0000 Subject: [PATCH] Bug 33294: Use template wrapper for tabs: Checkout history This patch updates the checkout history template so that it uses the new WRAPPER directive to build tabbed navigation. In order to make the template logic a little easier to parse I moved the table of checkouts into its own BLOCK to be used when on-site checkouts are enabled or disabled. To test, apply the patch and locate a patron who has a checkout history. - If you have on-site checkouts enabled you will see three tabs: All, Checkouts, and On-site checkouts. - Each tab should work correctly: The checkouts tab showing only regular checkouts, the on-site checkouts tab showing only on-site checkouts. - If you have on-site checkouts disabled there should be no tabs, the table of checkouts should be displayed inside a "page-section" div instead. Signed-off-by: Paul Derscheid Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 84cdc74ba72163495d431ba93682f8fc8c024f1f) Signed-off-by: Jacob O'Mara --- .../prog/en/modules/members/readingrec.tt | 210 +++++++++--------- 1 file changed, 107 insertions(+), 103 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt index 22a477d366..16c6bc3776 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -47,107 +47,111 @@ [% ELSIF ( !loop_reading ) %]
This patron has no circulation history.
[% ELSE %] -
- - -
- [% IF Koha.Preference('OnSiteCheckouts') %] - -
-
- [% ELSE %] -
- [% END %] - - - - - - - - - - - - - - [% IF Koha.Preference('RecordStaffUserOnCheckout') %] - + + + [% BLOCK table_readingrec %] +
TypeDateTitleAuthorCall numberVol infoBarcodeNumber of renewalsChecked out onChecked out fromChecked out by
+ + + + + + + + + + + + + [% IF Koha.Preference('RecordStaffUserOnCheckout') %] + + [% END %] + + + + + + [% FOREACH issue IN loop_reading %] + [% IF issue.returndate %][% ELSE %][% END %] + + + + + + + + + + + + + + + [% IF Koha.Preference('RecordStaffUserOnCheckout') %] + + [% END %] + + [% IF issue.returndate %] + + + [% END %] + +
TypeDateTitleAuthorCall numberVol infoBarcodeNumber of renewalsChecked out onChecked out fromChecked out byDate dueReturn date
+ [% IF issue.onsite_checkout %][% issuetype = 'onsite_checkout' | html %] + [% ELSE %][% issuetype = 'standard_checkout' | html %] + [% END %] + [% issuetype | html %] + + [% issue.issuestimestamp | $KohaDates with_hours => 1 %] + + [% INCLUDE 'biblio-title.inc' biblio=issue link = 1 %] + [% issue.author | html %] + [% IF issue.classification %] + [% issue.classification | html %] + [% ELSE %] + [% issue.itemcallnumber | html %] + [% END %] + + [% IF issue.enumchron %] + [% issue.enumchron | html %] + [% END %] + [% issue.barcode | html %] + [% issue.renewals_count | html %] + [% IF issue.renewals_count > 0 %] + [ View ] + [% END %] + + [% issue.issuedate |$KohaDates with_hours => 1 %] + [% Branches.GetName( issue.branchcode ) | html %][% issue.firstname | html %] [% issue.surname | html %] + [% issue.date_due |$KohaDates with_hours => 1 %] + + [% issue.returndate |$KohaDates with_hours => 1 %] + [% ELSE %] + + Checked out + [% END %] +
[% END %] - Date due - Return date - - - - [% FOREACH issue IN loop_reading %] - [% IF issue.returndate %][% ELSE %][% END %] - - [% IF issue.onsite_checkout %][% issuetype = 'onsite_checkout' | html %] - [% ELSE %][% issuetype = 'standard_checkout' | html %] - [% END %] - [% issuetype | html %] - - - [% issue.issuestimestamp | $KohaDates with_hours => 1 %] - - - [% INCLUDE 'biblio-title.inc' biblio=issue link = 1 %] - - - [% issue.author | html %] - - - [% IF issue.classification %] - [% issue.classification | html %] - [% ELSE %] - [% issue.itemcallnumber | html %] - [% END %] - - - - [% IF issue.enumchron %] - [% issue.enumchron | html %] - [% END %] - - - [% issue.barcode | html %] - - [% issue.renewals_count | html %] - [% IF issue.renewals_count > 0 %] - [ View ] - [% END %] - - - [% issue.issuedate |$KohaDates with_hours => 1 %] - - [% Branches.GetName( issue.branchcode ) | html %] - [% IF Koha.Preference('RecordStaffUserOnCheckout') %] - [% issue.firstname | html %] [% issue.surname | html %] - [% END %] - - [% issue.date_due |$KohaDates with_hours => 1 %] - - [% IF issue.returndate %] - - [% issue.returndate |$KohaDates with_hours => 1 %] - [% ELSE %] - - Checked out - [% END %] - - - [% END %] - - -
- [% IF Koha.Preference('OnSiteCheckouts') %] -
- [% END %] -
+ + [% IF Koha.Preference('OnSiteCheckouts') %] + [% WRAPPER tabs id= "tabs" %] + [% WRAPPER tabs_nav %] + [% WRAPPER tab_item tabname= "tab_all" bt_active= 1 %] All [% END %] + [% WRAPPER tab_item tabname= "tab_checkout" %] Checkouts [% END %] + [% WRAPPER tab_item tabname= "tab_onsite_checkout" %] On-site checkouts [% END %] + [% END # /WRAPPER tabs_nav %] + [% WRAPPER tab_panels %] + [% WRAPPER tab_panel tabname="readingrec" bt_active= 1 %] + [% INCLUDE table_readingrec %] + [% END # /tab_panel# %] + [% END # /WRAPPER tab_panels %] + [% END # /WRAPPER tabs %] + [% ELSE %] +
+ [% INCLUDE table_readingrec %] +
+ [% END # /IF Koha.Preference('OnSiteCheckouts') %] + [% END %] @@ -178,10 +182,10 @@ }, table_settings); $("#tabs a[data-toggle='tab']").on("shown.bs.tab", function (e) { - active_tab = $(this).data("tabname"); - if( active_tab == "checkouts" ){ + active_tab = $(this).attr("href"); + if( active_tab == "#tab_checkout_panel" ){ table.fnFilter("standard_checkout", 0); - } else if( active_tab == "onsite" ){ + } else if( active_tab == "#tab_onsite_checkout_panel" ){ table.fnFilter("onsite_checkout", 0); } else { table.fnFilter('', 0); -- 2.39.5