From 2ab9af076c31689508168de724b6b9a2d41f36ea Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 5 Jun 2023 13:07:35 +0000 Subject: [PATCH] Bug 33893: Use template wrapper for tabs: OPAC checkout history This patch updates the OPAC checkout history page so that it uses the new WRAPPER syntax to generate tabs markup. To test, apply the patch and make sure the OnSiteCheckouts system preference is set to "disabled." - Log into the OPAC as a patron with checkouts. - View the checkout history page. The checkout history information should be displayed without any tabs. - Enable the OnSiteCheckouts system preference and if necessary check out some on-site checkouts to your patron. - On the OPAC history page there should now be three tabs: All, Checkouts, and On-site checokuts. - Switching between the tabs should filter the table accordingly. --- .../en/modules/opac-readingrecord.tt | 249 +++++++++--------- 1 file changed, 127 insertions(+), 122 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt index 7277a12824..19e521b6ad 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -53,11 +53,11 @@ [% ELSE %]
- [% IF savings %] -
- Congratulations, you have saved a total of [% savings | $Price with_symbol => 1 %] by using the library. -
- [% END %] + [% IF savings %] +
+ Congratulations, you have saved a total of [% savings | $Price with_symbol => 1 %] by using the library. +
+ [% END %]
@@ -82,122 +82,28 @@ [% END %] [% IF Koha.Preference( 'OnSiteCheckouts' ) == 1 %] -
- -
- [% END %] -
- - - - - - - - - - - - - [% IF ( OPACMySummaryHTML ) %] - - [% END %] - - - - [% FOREACH issue IN READING_RECORD %] - - - - - - - - - [% IF issue.returndate %] - - [% IF OPACMySummaryHTML %] - - [% END %] - - [% END # / FOREACH issue %] - -
Checkout history
TitleAuthorItem typeCall numberVol infoDateLinks
- [% IF issue.onsite_checkout %][% issuetype = 'onsite_checkout' %] - [% ELSE %][% issuetype = 'standard_checkout' %] - [% END %] - [% issuetype | html %] - - [% IF OPACAmazonCoverImages %] - [% IF issue.normalized_isbn %] - - [% ELSE %] - No cover image available - [% END %] - [% END %] - - [% IF GoogleJackets %] - [% IF issue.normalized_isbn %] -
- [% ELSE %] - No cover image available - [% END %] - [% END %] - - [% IF BakerTaylorEnabled %] - [% bt_id = ( issue.normalized_upc || issue.normalized_isbn ) %] - [% IF ( bt_id ) %] - See Baker & Taylor - [% ELSE %] - No cover image available - [% END %] - [% END %] - - [% IF SyndeticsEnabled && SyndeticsCoverImages %] - - [% END %] -
- [% INCLUDE 'biblio-title.inc' biblio=issue, link => 1 %] - [% IF ( Koha.Preference( 'OpacStarRatings' ) == 'all' ) %] - [% INCLUDE 'user-star-ratings.inc' item=issue %] - [% END %] - [% issue.author | html %] - [% UNLESS ( Koha.Preference('OpacNoItemTypeImages') ) %] - [% IF ( issue.imageurl ) %] - - [% END %] - [% END %] - Item type: - [% issue.translated_description | html %] - Call number: - [% issue.itemcallnumber | html %] - - [% IF issue.enumchron %] - [% issue.enumchron | html %] - [% END %] - - Check-in date: - [% issue.returndate | $KohaDates %] - [% ELSE %] - - (Checked out) - [% END %] - [% issue.MySummaryHTML | $raw %]
-
- [% IF ( Koha.Preference( 'OnSiteCheckouts' ) == 1 ) %] -
-
+ [% WRAPPER tabs id= "tabs" %] + [% WRAPPER tabs_nav %] + [% WRAPPER tab_item tabname= "all_checkouts" bt_active= 1 %] + All + [% END %] + [% WRAPPER tab_item tabname= "checkout" %] + Checkouts + [% END %] + [% WRAPPER tab_item tabname= "onsite_checkout" %] + On-site checkouts + [% END %] + [% END # /WRAPPER tabs_nav %] + [% WRAPPER tab_panels %] + [% WRAPPER tab_panel tabname="tabs-container" bt_active= 1 %] + [% PROCESS checkout_history_table %] + [% END # /tab_panel# %] + [% END # /WRAPPER tab_panels %] + [% END # /WRAPPER tabs %] + [% ELSE %] + [% PROCESS checkout_history_table %] [% END %] +
[% END # / IF READING_RECORD.size %]
@@ -206,6 +112,105 @@ +[% BLOCK checkout_history_table %] + + + + + + + + + + + + + [% IF ( OPACMySummaryHTML ) %] + + [% END %] + + + + [% FOREACH issue IN READING_RECORD %] + + + + + + + + + [% IF issue.returndate %] + + [% IF OPACMySummaryHTML %] + + [% END %] + + [% END # / FOREACH issue %] + +
Checkout history
TitleAuthorItem typeCall numberVol infoDateLinks
+ [% IF issue.onsite_checkout %][% issuetype = 'onsite_checkout' %] + [% ELSE %][% issuetype = 'standard_checkout' %] + [% END %] + [% issuetype | html %] + + [% IF OPACAmazonCoverImages %] + [% IF issue.normalized_isbn %] + + [% ELSE %] + No cover image available + [% END %] + [% END %] + + [% IF GoogleJackets %] + [% IF issue.normalized_isbn %] +
+ [% ELSE %] + No cover image available + [% END %] + [% END %] + + [% IF BakerTaylorEnabled %] + [% bt_id = ( issue.normalized_upc || issue.normalized_isbn ) %] + [% IF ( bt_id ) %] + See Baker & Taylor + [% ELSE %] + No cover image available + [% END %] + [% END %] + + [% IF SyndeticsEnabled && SyndeticsCoverImages %] + + [% END %] +
+ [% INCLUDE 'biblio-title.inc' biblio=issue, link => 1 %] + [% IF ( Koha.Preference( 'OpacStarRatings' ) == 'all' ) %] + [% INCLUDE 'user-star-ratings.inc' item=issue %] + [% END %] + [% issue.author | html %] + [% UNLESS ( Koha.Preference('OpacNoItemTypeImages') ) %] + [% IF ( issue.imageurl ) %] + + [% END %] + [% END %] + Item type: + [% issue.translated_description | html %] + Call number: + [% issue.itemcallnumber | html %] + + [% IF issue.enumchron %] + [% issue.enumchron | html %] + [% END %] + + Check-in date: + [% issue.returndate | $KohaDates %] + [% ELSE %] + + (Checked out) + [% END %] + [% issue.MySummaryHTML | $raw %]
+[% END %] + [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %] [% INCLUDE 'datatables.inc' %] @@ -229,9 +234,9 @@ $("#tabs a[data-toggle='tab']").on("shown.bs.tab", function (e) { var id = e.target.id; - if ( id == "tab_checkout" ) { + if ( id == "checkout-tab" ) { table.fnFilter("standard_checkout", 0); - } else if ( id == "tab_onsite_checkout" ) { + } else if ( id == "onsite_checkout-tab" ) { table.fnFilter("onsite_checkout", 0); } else { // all table.fnFilter('', 0); -- 2.30.2