From 46725327bb46fa1635d2537da0b5e933ecd8dd29 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 4 Jan 2023 17:43:14 +0000 Subject: [PATCH] Bug 32568: Add page-section to checkedin table To test: 1. Apply patch 2. Checkin some items that are checked out/ 3. Make sure the page-section looks right. Note: There are some indentation changes. Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 3eea589ca10956fb18ec53f32c93cfe5defb9756) Signed-off-by: Matt Blenkinsop --- .../prog/en/modules/circ/returns.tt | 208 +++++++++--------- 1 file changed, 105 insertions(+), 103 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index ae30cd238d..6cecaf49c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -1194,113 +1194,115 @@ [% IF ( riloop ) %] -

Checked-in items

- - - - - - - - - - - - - - - - - - - - - [% FOREACH riloo IN riloop %] - - + + + [% END # /FOREACH riloo %] +
Due dateTitleAuthorBarcodeHome libraryTransfer toShelving locationCall numberDate acquiredRecord-level itemtypeItem typeCollectionPatronNote
- [% IF ( riloo.duedate ) %] - [% IF ( riloo.return_overdue ) %] - [% riloo.duedate | $KohaDates as_due_date => 1 %] (overdue) +
+

Checked-in items

+ + + + + + + + + + + + + + + + + + + + + [% FOREACH riloo IN riloop %] + + - - - - - - - - - - - - + + + + + + + + + + + + - - - [% END # /FOREACH riloo %] -
Due dateTitleAuthorBarcodeHome libraryTransfer toShelving locationCall numberDate acquiredRecord-level itemtypeItem typeCollectionPatronNote
+ [% IF ( riloo.duedate ) %] + [% IF ( riloo.return_overdue ) %] + [% riloo.duedate | $KohaDates as_due_date => 1 %] (overdue) + [% ELSE %] + [% riloo.duedate | $KohaDates as_due_date => 1 %] + [% END %] [% ELSE %] - [% riloo.duedate | $KohaDates as_due_date => 1 %] + Not checked out [% END %] - [% ELSE %] - Not checked out - [% END %] - [% IF ( riloo.damaged ) %] - [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => riloo.damaged ) | html %] - [% END %] - - - [% riloo.itemtitle | html %] - [% FOREACH subtitle IN riloo.subtitle.split(' \\| ') %] [% subtitle | html %][% END %] - [% FOREACH part_number IN riloo.part_number.split(' \\| ') %] [% part_number | html %][% END %] - [% FOREACH part_name IN riloo.part_name.split(' \\| ') %] [% part_name | html %][% END %] - - [% IF ( riloo.enumchron ) %] -
- [% riloo.enumchron | html %] - [% END %] - 		[% riloo.itemauthor | html %] - [% riloo.barcode | html %] - - [% Branches.GetName( riloo.homebranch ) | html %] - - [% Branches.GetName( riloo.transferbranch ) | html %] - - [% riloo.location | html %] - - [% riloo.itemcallnumber | html %] - - [% riloo.dateaccessioned | $KohaDates %] - - [% ItemTypes.GetDescription( riloo.recordtype ) | html %] - - [% ItemTypes.GetDescription( riloo.itemtype ) | html %] - - [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => riloo.ccode) | html %] - - [% IF ( riloo.duedate ) %] - [% INCLUDE 'patron-title.inc' patron=riloo.patron hide_patron_infos_if_needed=1 invert_name=1 %] - [% IF riloo.borissuescount %] - - Checkouts: - - [% riloo.borissuescount | html %] + [% IF ( riloo.damaged ) %] + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => riloo.damaged ) | html %] + [% END %] + + + [% riloo.itemtitle | html %] + [% FOREACH subtitle IN riloo.subtitle.split(' \\| ') %] [% subtitle | html %][% END %] + [% FOREACH part_number IN riloo.part_number.split(' \\| ') %] [% part_number | html %][% END %] + [% FOREACH part_name IN riloo.part_name.split(' \\| ') %] [% part_name | html %][% END %] + + [% IF ( riloo.enumchron ) %] +
+ [% riloo.enumchron | html %] + [% END %] + 		[% riloo.itemauthor | html %] + [% riloo.barcode | html %] + + [% Branches.GetName( riloo.homebranch ) | html %] + + [% Branches.GetName( riloo.transferbranch ) | html %] + + [% riloo.location | html %] + + [% riloo.itemcallnumber | html %] + + [% riloo.dateaccessioned | $KohaDates %] + + [% ItemTypes.GetDescription( riloo.recordtype ) | html %] + + [% ItemTypes.GetDescription( riloo.itemtype ) | html %] + + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => riloo.ccode) | html %] + + [% IF ( riloo.duedate ) %] + [% INCLUDE 'patron-title.inc' patron=riloo.patron hide_patron_infos_if_needed=1 invert_name=1 %] + [% IF riloo.borissuescount %] + + Checkouts: + + [% riloo.borissuescount | html %] + - + [% END %] + Print checkin slip + [% ELSE %] + Not checked out [% END %] - Print checkin slip - [% ELSE %] - Not checked out - [% END %] - - [% IF ( riloo.patron.borrowernotes ) %] -

[% riloo.patron.borrowernotes | html %]

- [% END %] - [% IF ( riloo.itemnote ) %] -

[% riloo.itemnote | html %]

- [% END %] - [% IF ( riloo.itemnotes_nonpublic ) %] -

[% riloo.itemnotes_nonpublic | html %]

- [% END %] -
+
+ [% IF ( riloo.patron.borrowernotes ) %] +

[% riloo.patron.borrowernotes | html %]

+ [% END %] + [% IF ( riloo.itemnote ) %] +

[% riloo.itemnote | html %]

+ [% END %] + [% IF ( riloo.itemnotes_nonpublic ) %] +

[% riloo.itemnotes_nonpublic | html %]

+ [% END %] +
+ [% END # /IF riloop %] [% IF Koha.Preference('CircSidebar') %] -- 2.39.5