From 75b9e35acbdacf4ccc169ad561fb0697f3049bae Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Thu, 13 Oct 2022 22:18:32 +0000 Subject: [PATCH] Bug 31781: Add page-section to branchtransfers page This patch adds the page-section div to 2 tables on the branch transfer page. To test: 1. Apply patch 2. Place an item level hold on a few items. 3. Now go to the branch transfer page and try transferring your items that have holds on them. 4. This should bring up a 'Reserve found' page. Look at the table and make sure it looks good with the page-section div added. 5. Now try some transfers that do not have holds. Make sure the table that populates also goods good with the page-section div added. Note: There are some indentation changes. Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/circ/branchtransfers.tt | 189 +++++++++--------- 1 file changed, 96 insertions(+), 93 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt index 526b8a85a4..ca153d719b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -42,85 +42,86 @@ [% IF ( found ) %]

Reserve found

- - - - + [% END %] + + + + +
- [% IF ( reserved ) %] - Hold found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] ([% borrowernumber | html %]). - [% END %] - [% IF ( waiting ) %] - Item is marked waiting at [% branchname | html %] for [% name | html %] ([% borrowernumber | html %]). - [% END %] - [% IF ( transferred ) %] - Item has been trapped to fill a hold and is in transit for [% name | html %] ([% borrowernumber | html %]). - [% END %] -
+
+ + + - [% IF ( reserved ) %] - - - - - [% END %] - - + [% END %] + [% IF ( reserved ) %] + + + [% END %] + + + + [% IF ( reserved ) %] + + - -
[% IF ( reserved ) %] - Transfer item to [% Branches.GetName( hold.branchcode ) | html %]: + Hold found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] ([% borrowernumber | html %]). [% END %] - [% IF ( waiting or transferred ) %]Cancel hold and then attempt transfer: [% END %] - -
-
- [% FOREACH trsfitemloo IN trsfitemloop %] - - - - [% END %] - - - - - - [% IF ( waiting or transferred or processing ) %] - - - [% END %] + [% IF ( waiting ) %] + Item is marked waiting at [% branchname | html %] for [% name | html %] ([% borrowernumber | html %]). + [% END %] + [% IF ( transferred ) %] + Item has been trapped to fill a hold and is in transit for [% name | html %] ([% borrowernumber | html %]). + [% END %] + +
[% IF ( reserved ) %] - - + Transfer item to [% Branches.GetName( hold.branchcode ) | html %]: [% END %] - - -
Cancel hold and then attempt transfer: -
- [% FOREACH trsfitemloo IN trsfitemloop %] - - - - [% END %] - - - - - + [% IF ( waiting or transferred ) %]Cancel hold and then attempt transfer: [% END %] + +
+ + [% FOREACH trsfitemloo IN trsfitemloop %] + + + + [% END %] + + + + + + [% IF ( waiting or transferred or processing ) %] + - -
Ignore and return to transfers:
Cancel hold and then attempt transfer:
- - [% FOREACH trsfitemloo IN trsfitemloop %] [% END %] - + + + + + +
- +
Ignore and return to transfers: +
+ + + [% FOREACH trsfitemloo IN trsfitemloop %] + + + + [% END %] + +
+
+ [% ELSE %] [% IF ( reqmessage ) %]
@@ -197,36 +198,38 @@
[% IF ( trsfitemloop ) %] - - - - - - - - - - - - - - [% FOREACH trsfitemloo IN trsfitemloop %] +
+
Transferred items
TitleAuthorBarcodeShelving locationCall numberItem typeCollectionOriginDestination
+ - - - - - - - - - + + + + + + + + + - [% END %] -
Transferred items
- [% INCLUDE 'biblio-title.inc' biblio=trsfitemloo.item.biblio link=1 %] - - [% trsfitemloo.item.biblio.author | html %][% trsfitemloo.item.barcode | html %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => trsfitemloo.item.location ) | html %][% trsfitemloo.item.itemcallnumber | html %][% ItemTypes.GetDescription( trsfitemloo.item.effective_itemtype ) | html %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => trsfitemloo.item.ccode ) | html %][% Branches.GetName( trsfitemloo.frombrcd ) | html %][% Branches.GetName( trsfitemloo.tobrcd ) | html %]TitleAuthorBarcodeShelving locationCall numberItem typeCollectionOriginDestination
+ [% FOREACH trsfitemloo IN trsfitemloop %] + + + [% INCLUDE 'biblio-title.inc' biblio=trsfitemloo.item.biblio link=1 %] + + + [% trsfitemloo.item.biblio.author | html %] + [% trsfitemloo.item.barcode | html %] + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => trsfitemloo.item.location ) | html %] + [% trsfitemloo.item.itemcallnumber | html %] + [% ItemTypes.GetDescription( trsfitemloo.item.effective_itemtype ) | html %] + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => trsfitemloo.item.ccode ) | html %] + [% Branches.GetName( trsfitemloo.frombrcd ) | html %] + [% Branches.GetName( trsfitemloo.tobrcd ) | html %] + + [% END %] + + [% END %] -- 2.39.5