From a59fc8d385c1bd5c93e7c9dafe8e092b13ed7cde Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 15 Nov 2022 11:47:16 +0000 Subject: [PATCH] Bug 32207: Add page-section to some circulation pages This patch adds a .page-section div to various circ-related pages in order to provide a consistent page structure. To test, apply the patch and view the following pages in Circulation to confirm that the primary page content is wrapped in a container with a white background: - Overdues - Overdues with fines - Transfers to receive: Your system should have items which have been transfered from at least two other libraries. - Transfers to send: Your system must have one or more items in the branchtransfers table with the datesent value = null. - On-site checkouts - Catalog -> Bibliographic record -> Items -> View item's checkout history Signed-off-by: David Nind --- .../prog/en/modules/circ/bookcount.tt | 63 ++++++++------- .../prog/en/modules/circ/branchoverdues.tt | 58 +++++++------- .../prog/en/modules/circ/on-site_checkouts.tt | 62 ++++++++------- .../prog/en/modules/circ/overdue.tt | 2 +- .../prog/en/modules/circ/transfers_to_send.tt | 78 ++++++++++--------- .../en/modules/circ/transferstoreceive.tt | 2 + 6 files changed, 139 insertions(+), 126 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt index 9d7954bfdf..43dc82d75f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt @@ -50,38 +50,43 @@ [% INCLUDE 'blocking_errors.inc' %]

Barcode [% barcode | html %]

- - +
+
Home libraryCurrent libraryDate arrived
at current library 		Number of checkouts
since last transfer
+ - - - - - -
Home libraryCurrent libraryDate arrived
at current library 		Number of checkouts
since last transfer
[% Branches.GetName( homebranch ) | html %][% Branches.GetName( holdingbranch ) | html %][% IF ( lastdate ) %][% lastdate | $KohaDates %][% ELSE %]Item has no transfer record[% END %][% count | html %]
- - - - - - - [% FOREACH library IN libraries %] - [% IF library.selected %] - - [% ELSE %] + + + + + +
LibraryNo. of times checked outLast seen
[% Branches.GetName( homebranch ) | html %][% Branches.GetName( holdingbranch ) | html %][% IF ( lastdate ) %][% lastdate | $KohaDates %][% ELSE %]Item has no transfer record[% END %][% count | html %]
+ + +
+ - [% END %] - - - + + + - [% END %] -
[% library.branchname | html %][% library.issues | html %][% IF library.seen %] - [% library.seen | $KohaDates with_hours => 1 %] - [% ELSE %] - Never - [% END %] - LibraryNo. of times checked outLast seen
+ [% FOREACH library IN libraries %] + [% IF library.selected %] + + [% ELSE %] + + [% END %] + [% library.branchname | html %] + [% library.issues | html %] + [% IF library.seen %] + [% library.seen | $KohaDates with_hours => 1 %] + [% ELSE %] + Never + [% END %] + + + [% END %] + +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt index 98280e2000..82cad8605f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt @@ -49,40 +49,42 @@ [% IF ( overduesloop ) %] - - - - - - - - [% FOREACH overduesloo IN overduesloop %] +
+
Date dueTitlePatronLocation
- - - - + + + + - [% END %] -
- [% overduesloo.date_due | html %] - - [% INCLUDE 'biblio-title.inc' biblio=overduesloo link = 1 %] [% IF ( overduesloo.author ) %] by [% overduesloo.author | html %][% END %] - -
Barcode : [% overduesloo.barcode | html %] - 		- [% overduesloo.borrowersurname | html %], [% overduesloo.borrowerfirstname | html %] -
[% overduesloo.cardnumber | html %] -
[% overduesloo.borrowerphone | html %]
- [% IF ( overduesloo.borroweremail ) %] - [% overduesloo.borroweremail | html %][% END %] - 		[% Branches.GetName( overduesloo.homebranch ) | html %] [% overduesloo.itemcallnumber | html %] - Date dueTitlePatronLocation
+ [% FOREACH overduesloo IN overduesloop %] + + + [% overduesloo.date_due | html %] + + + [% INCLUDE 'biblio-title.inc' biblio=overduesloo link = 1 %] [% IF ( overduesloo.author ) %] by [% overduesloo.author | html %][% END %] + +
Barcode : [% overduesloo.barcode | html %] + + + [% overduesloo.borrowersurname | html %], [% overduesloo.borrowerfirstname | html %] +
[% overduesloo.cardnumber | html %] +
[% overduesloo.borrowerphone | html %]
+ [% IF ( overduesloo.borroweremail ) %] + [% overduesloo.borroweremail | html %][% END %] + + [% Branches.GetName( overduesloo.homebranch ) | html %] [% overduesloo.itemcallnumber | html %] + + + [% END %] + + [% ELSE %]
There are no overdues for today[% IF ( location ) %] at the selected location[% END %].
[% END %] [% IF ( todayoverduesloop ) %] -
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt index 7e23cfd4e1..1124ce92e8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt @@ -47,36 +47,38 @@

Pending on-site checkouts

[% IF pending_onsite_checkouts %] -
Today's notifications
- - - - - - - [% FOREACH item IN pending_onsite_checkouts %] - - - - - - - - - - [% END %] - -
DatePatronTitleCall numberBarcodeLibraryLocation
- [% IF item.is_overdue %][% END %] - [% item.date_due | $KohaDates %] - [% IF item.is_overdue %][% END %] - - [% item.firstname | html %] [% item.surname | html %] - - [% item.title | html %][% IF ( item.author ) %], by [% item.author | html %][% END %][% IF ( item.itemnotes ) %]- [% item.itemnotes | $raw %][% END %] - [% item.itemcallnumber | html %] - [% item.barcode | html %] - [% Branches.GetName(item.branchcode) | html %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %]
+
+ + + + + + + + [% FOREACH item IN pending_onsite_checkouts %] + + + + + + + + + + [% END %] + +
DatePatronTitleCall numberBarcodeLibraryLocation
+ [% IF item.is_overdue %][% END %] + [% item.date_due | $KohaDates %] + [% IF item.is_overdue %][% END %] + + [% item.firstname | html %] [% item.surname | html %] + + [% item.title | html %][% IF ( item.author ) %], by [% item.author | html %][% END %][% IF ( item.itemnotes ) %]- [% item.itemnotes | $raw %][% END %] + [% item.itemcallnumber | html %] + [% item.barcode | html %] + [% Branches.GetName(item.branchcode) | html %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %]
+
[% ELSE %]

No pending on-site checkout.

[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt index 206af1e488..bc29885b4d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -80,7 +80,7 @@ 

[% sql | html %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt index a99c318bb1..38b90835b8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt @@ -51,45 +51,47 @@
[% FOREACH library IN libraries %] [% IF ( library.branchcode ) %] -
- - - - - - - - - - - - - - [% FOREACH transfer IN library.inbound_transfers %] - [% UNLESS transfer.datesent %] - - - - - - - - +
Sending to [% library.branchname | html %]
Date of requestTitleReasonOn loanHome libraryCall numberActions
- [% transfer.daterequested | $KohaDates %] - - [% INCLUDE 'biblio-title.inc' biblio = transfer.item.biblio link = 1 %][% IF ( transfer.item.biblio.author ) %] by [% transfer.item.biblio.author | html %][% END %] - [% IF ( transfer.item.effective_itemtype ) %] ([% ItemTypes.GetDescription( transfer.item.effective_itemtype ) | html %])[% END %] -
Barcode: [% transfer.item.barcode | html %] -

[% PROCESS transfer_reason transfer=transfer %]

[% IF transfer.item.onloan %]Due [% transfer.item.onloan | $KohaDates %][% ELSE %]On shelf[% END %][% Branches.GetName( transfer.item.homebranch ) | html %][% transfer.item.itemcallnumber | html %] - [% IF transfer.reason == 'StockrotationAdvance' %] - Mark "In demand" +
+ + + + + + + + + + + + + + + [% FOREACH transfer IN library.inbound_transfers %] + [% UNLESS transfer.datesent %] + + + + + + + + + [% END %] - - - [% END %] - [% END %] - -
Sending to [% library.branchname | html %]
Date of requestTitleReasonOn loanHome libraryCall numberActions
+ [% transfer.daterequested | $KohaDates %] + + [% INCLUDE 'biblio-title.inc' biblio = transfer.item.biblio link = 1 %][% IF ( transfer.item.biblio.author ) %] by [% transfer.item.biblio.author | html %][% END %] + [% IF ( transfer.item.effective_itemtype ) %] ([% ItemTypes.GetDescription( transfer.item.effective_itemtype ) | html %])[% END %] +
Barcode: [% transfer.item.barcode | html %] +

[% PROCESS transfer_reason transfer=transfer %]

[% IF transfer.item.onloan %]Due [% transfer.item.onloan | $KohaDates %][% ELSE %]On shelf[% END %][% Branches.GetName( transfer.item.homebranch ) | html %][% transfer.item.itemcallnumber | html %] + [% IF transfer.reason == 'StockrotationAdvance' %] + Mark "In demand" + [% END %] +
+ [% END %] +
+
[% END %] [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt index 200f66268b..2834af58b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt @@ -51,6 +51,7 @@
[% FOREACH branchesloo IN branchesloop %] [% IF ( branchesloo.branchcode ) %] +
@@ -97,6 +98,7 @@ [% END %]
Coming from [% branchesloo.branchname | html %]
+
[% END %] [% END %]
-- 2.30.2