From 98838736eaad096df3e8800eb47d47f59162da84 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 22 Apr 2024 16:05:21 +0000 Subject: [PATCH 1/2] Bug 36671: Reindent item transfer template (branchtransfers.tt) This patch reindents the item transfer template so that it has consistent indentation, with tab indentation coverted to space. To test, apply the patch and go to Circulation -> Transfer. Test some transfers, including transfers which trigger a hold notification. Everything should work correctly. If you view the diff while ignoring whitespace the only changes should be places where line breaks were introduced. --- .../prog/en/modules/circ/branchtransfers.tt | 440 +++++++++--------- 1 file changed, 219 insertions(+), 221 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 1a1963ff0b..1edbef4640 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -12,244 +12,242 @@ [% END %] [% INCLUDE 'doc-head-close.inc' %] - -[% WRAPPER 'header.inc' %] - [% INCLUDE 'circ-search.inc' %] -[% END %] + + [% WRAPPER 'header.inc' %] + [% INCLUDE 'circ-search.inc' %] + [% END %] -[% WRAPPER 'sub-header.inc' %] - [% WRAPPER breadcrumbs %] - [% WRAPPER breadcrumb_item %] - Circulation - [% END %] - [% WRAPPER breadcrumb_item bc_active= 1 %] - Transfers - [% END %] - [% END #/ WRAPPER breadcrumbs %] -[% END #/ WRAPPER sub-header.inc %] + [% WRAPPER 'sub-header.inc' %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Circulation + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Transfers + [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %] -
-
- [% IF Koha.Preference('CircSidebar') %] -
- [% ELSE %] -
- [% END %] -
- [% INCLUDE 'messages.inc' %] +
+
+ [% IF Koha.Preference('CircSidebar') %] +
+ [% ELSE %] +
+ [% END %] +
+ [% INCLUDE 'messages.inc' %] -

Transfer items

+

Transfer items

-[% IF ( found ) %] -

Reserve found

-
- - - - - - - [% IF ( reserved ) %] - - - - - [% 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 ) %] - Transfer item to [% Branches.GetName( hold.branchcode ) | html %]: - [% END %] - [% IF ( waiting or transferred ) %]Cancel hold and then attempt transfer: [% END %] - -
- [% INCLUDE 'csrf-token.inc' %] - [% FOREACH trsfitemloo IN trsfitemloop %] - - - - [% END %] - - - - - - [% IF ( waiting or transferred or processing ) %] - - + [% IF ( found ) %] +

Reserve found

+
+ + + + + + + [% IF ( reserved ) %] + + + + + [% 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 ) %] + Transfer item to [% Branches.GetName( hold.branchcode ) | html %]: + [% END %] + [% IF ( waiting or transferred ) %]Cancel hold and then attempt transfer: [% END %] + + + [% INCLUDE 'csrf-token.inc' %] + [% FOREACH trsfitemloo IN trsfitemloop %] + + + + [% END %] + + + + + + [% IF ( waiting or transferred or processing ) %] + + + [% END %] + [% IF ( reserved ) %] + + + [% END %] + +
Cancel hold and then attempt transfer: +
+ [% INCLUDE 'csrf-token.inc' %] + [% FOREACH trsfitemloo IN trsfitemloop %] + + + + [% END %] + + + + + + + +
+
Ignore and return to transfers: +
+ + + [% FOREACH trsfitemloo IN trsfitemloop %] + + + + [% END %] + +
+
+
+ [% ELSE %] + [% IF ( reqmessage ) %] +
+
    + [% IF ( cancelled ) %] +
  • Reserve cancelled
    • + [% END %] + [% IF ( settransit ) %] +
  • Item is now in transit to [% Branches.GetName(tobranchcd) | html %]
    • + [% END %] +
+
[% END %] - [% IF ( reserved ) %] - - + + [% IF ( errmsgloop ) %] +
+
    + [% FOREACH errmsgloo IN errmsgloop %] + [% IF ( errmsgloo.errbadcode ) %] +
  • No item with barcode: [% errmsgloo.msg | html %]
    • + [% END %] + [% IF ( errmsgloo.errispermanent ) %] +
  • Please return item to home library: [% Branches.GetName( errmsgloo.msg ) | html %]
    • + [% END %] + [% IF ( errmsgloo.errnotallowed ) %] +
  • Transfer is not allowed for: +
      + [% IF ( Koha.Preference('BranchTransferLimitsType') == 'itemtype' ) %] +
    1. Item type: [% ItemTypes.GetDescription( errmsgloo.code ) | html %]
      2. + [% ELSE %] +
    2. Collection: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => errmsgloo.code ) | html %]
      3. + [% END %] +
    3. Originating library: [% Branches.GetName( errmsgloo.fbr ) | html %]
      4. +
    4. Destination library: [% Branches.GetName( errmsgloo.tbr ) | html %]
      5. +
    +
    • + [% END %] + [% IF ( errmsgloo.errdesteqholding ) %] +
  • Item is already at destination library.
    • + [% END %] + [% IF ( errmsgloo.errwasreturned ) %] +
  • Item was on loan to + [% errmsgloo.patron.firstname | html %] [% errmsgloo.patron.surname | html %] + ([% errmsgloo.patron.cardnumber | html %]) and has been returned.
    • + [% END %] + [% END %] +
+
[% END %] - -
Cancel hold and then attempt transfer: -
+ +
+ [% INCLUDE 'csrf-token.inc' %] +
+ Transfer +
    +
  1. + + +
    2. +
  2. + + +
    3. +
+
[% FOREACH trsfitemloo IN trsfitemloop %] [% END %] - - - - - - - + -
Ignore and return to transfers: -
- - + + + [% IF ( trsfitemloop ) %] +
+ + + + + + + + + + + + + [% FOREACH trsfitemloo IN trsfitemloop %] - - - + + + + + + + + + + + [% END %] - - - - -
Transferred items
TitleAuthorBarcodeShelving locationCall numberItem typeCollectionOriginDestination
+ [% 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 %]
-
-[% ELSE %] - [% IF ( reqmessage ) %] -
-
    - [% IF ( cancelled ) %] -
  • Reserve cancelled
    • - [% END %] - [% IF ( settransit ) %] -
  • Item is now in transit to [% Branches.GetName(tobranchcd) | html %]
    • - [% END %] -
-
- [% END %] - - [% IF ( errmsgloop ) %] -
-
    - [% FOREACH errmsgloo IN errmsgloop %] - [% IF ( errmsgloo.errbadcode ) %] -
  • No item with barcode: [% errmsgloo.msg | html %]
    • - [% END %] - [% IF ( errmsgloo.errispermanent ) %] -
  • Please return item to home library: [% Branches.GetName( errmsgloo.msg ) | html %]
    • - [% END %] - [% IF ( errmsgloo.errnotallowed ) %] -
  • Transfer is not allowed for: -
      - [% IF ( Koha.Preference('BranchTransferLimitsType') == 'itemtype' ) %] -
    1. Item type: [% ItemTypes.GetDescription( errmsgloo.code ) | html %]
      2. - [% ELSE %] -
    2. Collection: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => errmsgloo.code ) | html %]
      3. - [% END %] -
    3. Originating library: [% Branches.GetName( errmsgloo.fbr ) | html %]
      4. -
    4. Destination library: [% Branches.GetName( errmsgloo.tbr ) | html %]
      5. -
    -
    • - [% END %] - [% IF ( errmsgloo.errdesteqholding ) %] -
  • Item is already at destination library.
    • - [% END %] - [% IF ( errmsgloo.errwasreturned ) %] -
  • Item was on loan to - [% errmsgloo.patron.firstname | html %] [% errmsgloo.patron.surname | html %] - ([% errmsgloo.patron.cardnumber | html %]) and has been returned.
    • - [% END %] - [% END %] -
-
+
+
[% END %] + [% END %] +
+
-
-
- [% INCLUDE 'csrf-token.inc' %] -
- Transfer -
    -
  1. - - -
    2. -
  2. - - -
    3. -
-
- [% FOREACH trsfitemloo IN trsfitemloop %] - - - - [% END %] - -
-
- - [% IF ( trsfitemloop ) %] -
- - - - - - - - - - - - - - [% FOREACH trsfitemloo IN trsfitemloop %] - - - - - - - - - - - - [% END %] -
Transferred items
TitleAuthorBarcodeShelving locationCall numberItem typeCollectionOriginDestination
- [% 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 %] - -
-
- [% IF Koha.Preference('CircSidebar') %] -
- -
- [% END %] -
+ [% IF Koha.Preference('CircSidebar') %] +
+ +
+ [% END %] +
[% INCLUDE 'intranet-bottom.inc' %] -- 2.39.2