From f0e721f441168d674e9872e280153aaace19c08e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 14 Nov 2022 16:12:04 +0000 Subject: [PATCH] Bug 32193: Reindent item details template This patch performs general template cleanup to the lists template: Make indentation consistent, replace tabs with spaces, and trim trailing whitespace. To test, apply the patch and confirm that the layout of the page is unchanged. Test the various operations on the page: - Setting lost status - Setting damaged status - Setting withdrawn status - Setting local holds priority status - Adding a public or non-public note Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/catalogue/moredetail.tt | 746 ++++++++++-------- 1 file changed, 419 insertions(+), 327 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 01dfde5d84..053d8b9401 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -17,24 +17,24 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - + [% END %]
@@ -42,343 +42,435 @@
-

Item details for [% INCLUDE 'biblio-title-head.inc' %]

+

Item details for [% INCLUDE 'biblio-title-head.inc' %]

-[% INCLUDE 'cat-toolbar.inc' %] + [% INCLUDE 'cat-toolbar.inc' %] -
+
-

[% title | html %]

- [% IF ( subtitle ) %]

[% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]

[% END %] - [% IF ( author ) %]

by [% author | html %]

[% END %] -
-
-
    -
  1. Biblionumber: [% biblionumber | html %] 
    2. - [% UNLESS ( item_level_itypes ) %] -
  2. Item type: [% itemtypename | html %] 
    3. - [% END %] - [% IF ( rentalcharge ) %]
  3. Rental charge:[% rentalcharge | $Price %] 
    4. [% END %] - [% IF ( rentalcharge_daily ) %]
  4. Daily rental charge:[% rentalcharge_daily | $Price %] 
    5. [% END %] - [% IF ( rentalcharge_hourly ) %]
  5. Hourly rental charge:[% rentalcharge_hourly | $Price %] 
    6. [% END %] -
  6. ISBN: [% isbn | html %] 
    7. -
  7. Publication details:[% place | html %] [% publishercode | html %] [% publicationyear | html %] 
    8. - [% IF ( volumeddesc ) %]
  8. Volume: [% volumeddesc | html %]
    9. [% END %] -
  9. Physical details: [% pages | html %] [% illus | html %] [% size | html %] 
    10. - [% IF ( bnotes ) %]
  10. Notes: [% bnotes | html %]
    11. [% END %] -
  11. No. of items: [% count | html %] [% IF ( hiddencount ) %]total ([% showncount | html %] shown / [% hiddencount | html %] hidden) -Show all items[% END %]
    12. -
-
-
- - [% IF ONLY_ONE || updated_exclude_from_local_holds_priority.defined %] -
- [% END %] - - [% IF ( ONLY_ONE ) %] -
You are only viewing one item. View all
- [% END %] +

[% title | html %]

+ [% IF ( subtitle ) %] +

[% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]

+ [% END %] + [% IF ( author ) %] +

by [% author | html %]

+ [% END %] - [% IF updated_exclude_from_local_holds_priority.defined %] -
- [% IF updated_exclude_from_local_holds_priority %] - Exclude from local holds priority updated to 'Yes' - [% ELSE %] - Exclude from local holds priority updated to 'No' - [% END %] -
- [% END %] +
+
+
    +
  1. Biblionumber: [% biblionumber | html %] 
    2. + [% UNLESS ( item_level_itypes ) %] +
  2. Item type: [% itemtypename | html %] 
    3. + [% END %] + [% IF ( rentalcharge ) %] +
  3. Rental charge:[% rentalcharge | $Price %] 
    4. + [% END %] + [% IF ( rentalcharge_daily ) %] +
  4. Daily rental charge:[% rentalcharge_daily | $Price %] 
    5. + [% END %] + [% IF ( rentalcharge_hourly ) %] +
  5. Hourly rental charge:[% rentalcharge_hourly | $Price %] 
    6. + [% END %] +
  6. ISBN: [% isbn | html %] 
    7. +
  7. Publication details:[% place | html %] [% publishercode | html %] [% publicationyear | html %] 
    8. + [% IF ( volumeddesc ) %] +
  8. Volume: [% volumeddesc | html %]
    9. + [% END %] +
  9. Physical details: [% pages | html %] [% illus | html %] [% size | html %] 
    10. + [% IF ( bnotes ) %] +
  10. Notes: [% bnotes | html %]
    11. + [% END %] +
  11. + No. of items: + [% count | html %] + [% IF ( hiddencount ) %] + total ([% showncount | html %] shown / [% hiddencount | html %] hidden) + Show all items + [% END %] +
    12. +
+
+
- [% FOREACH ITEM_DAT IN ITEM_DATA %] - [% SET not_for_loan = 0 %] - [% IF ITEM_DAT.notforloan || ITEM_DAT.effective_itemtype.notforloan %] - [% SET not_for_loan = 1 %] - [% SET not_for_loan_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan ) %] - [% END %] -
-

Barcode [% ITEM_DAT.barcode | html %] [% IF not_for_loan %][% not_for_loan_description | html %] [% END %]

+ [% IF ONLY_ONE || updated_exclude_from_local_holds_priority.defined %] +
+ [% END %] -

Item information [% UNLESS ( ITEM_DAT.nomod ) %] - [% IF ( CAN_user_editcatalogue_edit_items ) %] - Edit item - [% END %] - [% END %]

-
-
    -
  1. Home library: [% Branches.GetName( ITEM_DAT.homebranch ) | html %] 
    2. - [% IF ( item_level_itypes ) %] -
  2. Item type: [% ITEM_DAT.itype | html %] 
    3. - [% END %] - [% IF ( ITEM_DAT.ccode) %]
  3. Collection: [% ITEM_DAT.ccode | html %]
    4. [% END %] -
  4. Item callnumber: [% ITEM_DAT.itemcallnumber | html %] 
    5. - [% IF ( ITEM_DAT.displaycopy ) %]
  5. Copy number: [% ITEM_DAT.copyvol | html %] 
    6. [% END %] - [% IF ( ITEM_DAT.replacementprice ) %]
  6. Replacement price: [% ITEM_DAT.replacementprice | $Price %] 
    7. [% END %] - [% IF ITEM_DAT.materials %]
  7. Materials specified: [% ITEM_DAT.materials | html %]
    8. [% END %] -
-

Statuses [% IF ( ITEM_DAT.status_advisory ) %]( - [% IF ( not_for_loan ) %] - [% IF not_for_loan_description %] - [% not_for_loan_description | html %] - [% ELSE %] - Not for loan + [% IF ( ONLY_ONE ) %] +
You are only viewing one item. View all
[% END %] - [% END %] - [% IF ( ITEM_DAT.itemlost ) %]Lost[% END %] - [% IF ( ITEM_DAT.damaged ) %]Damaged[% END %] - [% IF ( ITEM_DAT.withdrawn ) %]Withdrawn[% END %] - )[% END %]

-
-
    -
  1. Current library: [% Branches.GetName( ITEM_DAT.holdingbranch ) | html %] 
    2. -
  2. Checkout status: - [% SET checkout = ITEM_DAT.object.checkout %] - [% IF ( checkout ) %]Checked out to - [% INCLUDE 'patron-title.inc' patron => checkout.patron hide_patron_infos_if_needed=1 %] - [% IF ( checkout.lastreneweddate ) %] - Last renewed [% checkout.lastreneweddate | $KohaDates %], - [% END %] - [% IF ( checkout.date_due ) %] - Due back on [% checkout.date_due | $KohaDates %] - [% ELSE %] - Not checked out - [% END %] - [% END %] -  
    3. -
  3. Current renewals: - [% ITEM_DAT.renewals | html %] - [% IF ITEM_DAT.renewals %] - [ View ] - [% END %] -
    4. - [% IF itemlostloop %] -
  4. Lost status: - [% IF ( CAN_user_circulate ) %] - [% SET ClaimReturnedLostValue = Koha.Preference('ClaimReturnedLostValue') %] -
    - - - + [% IF updated_exclude_from_local_holds_priority.defined %] +
    + [% IF updated_exclude_from_local_holds_priority %] + Exclude from local holds priority updated to 'Yes' + [% ELSE %] + Exclude from local holds priority updated to 'No' + [% END %] +
    + [% END %] - [% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %] - + [% FOREACH ITEM_DAT IN ITEM_DATA %] + [% SET not_for_loan = 0 %] + [% IF ITEM_DAT.notforloan || ITEM_DAT.effective_itemtype.notforloan %] + [% SET not_for_loan = 1 %] + [% SET not_for_loan_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan ) %] [% END %] - - [% FOREACH itemlostloo IN itemlostloop %] - [% IF ClaimReturnedLostValue && !ITEM_DAT.itemlost && itemlostloo.authorised_value == ClaimReturnedLostValue #Filter claims returned status from pulldown %] - - [% ELSIF itemlostloo.authorised_value == ITEM_DAT.itemlost %] - - [% ELSE %] - +
    +

    + Barcode [% ITEM_DAT.barcode | html %] [% IF not_for_loan %][% not_for_loan_description | html %] [% END %] +

    + +

    + Item information + [% UNLESS ( ITEM_DAT.nomod ) %] + [% IF ( CAN_user_editcatalogue_edit_items ) %] + Edit item [% END %] [% END %] - - - +

    - [% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %] - -

    Item has been claimed as returned.

    - [% ELSE %] - - - [% END %] - - [% ELSE %] - [% FOREACH itemlostloo IN itemlostloop %] - [% IF ( itemlostloo.selected ) %] - [% itemlostloo.lib | html %] - [% END %] - [% END %] -   - [% END %] -
    5. - [% IF ITEM_DAT.itemlost != "" && ITEM_DAT.itemlost_on %] -
  5. Lost on:[% ITEM_DAT.itemlost_on | $KohaDates %]  
    6. - [% END %] - [% END %] - [% IF itemdamagedloop %] -
  6. Damaged status: - [% IF ( CAN_user_circulate ) %] -
    - - - - - -
    - [% ELSE %] - [% FOREACH itemdamagedloo IN itemdamagedloop %] - [% IF ( itemdamagedloo.selected ) %] - [% itemdamagedloo.lib | html %] - [% END %] - [% END %] -   - [% END %] -
    7. - [% IF ITEM_DAT.damaged != "" && ITEM_DAT.damaged_on %] -
  7. Damaged on:[% ITEM_DAT.damaged_on | $KohaDates %]  
    8. - [% END %] - [% END %] +
    +
      +
    1. Home library: [% Branches.GetName( ITEM_DAT.homebranch ) | html %] 
      2. + [% IF ( item_level_itypes ) %] +
    2. Item type: [% ITEM_DAT.itype | html %] 
      3. + [% END %] + [% IF ( ITEM_DAT.ccode) %] +
    3. Collection: [% ITEM_DAT.ccode | html %]
      4. + [% END %] +
    4. Item callnumber: [% ITEM_DAT.itemcallnumber | html %] 
      5. + [% IF ( ITEM_DAT.displaycopy ) %] +
    5. Copy number: [% ITEM_DAT.copyvol | html %] 
      6. + [% END %] + [% IF ( ITEM_DAT.replacementprice ) %] +
    6. Replacement price: [% ITEM_DAT.replacementprice | $Price %] 
      7. + [% END %] + [% IF ITEM_DAT.materials %] +
    7. Materials specified: [% ITEM_DAT.materials | html %]
      8. + [% END %] +
    +
    +
- [% IF itemwithdrawnloop %] -
  • Withdrawn status: - [% IF ( CAN_user_circulate ) %] -
    - - - - - -
    - [% ELSE %] - [% FOREACH itemwithdrawn IN itemwithdrawnloop %] - [% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %] - [% itemwithdrawn.lib | html %] - [% END %] - [% END %] -   - [% END %] -
    • - [% IF ITEM_DAT.withdrawn != "" && ITEM_DAT.withdrawn_on %] -
  • Withdrawn on:[% ITEM_DAT.withdrawn_on | $KohaDates %]  
    • - [% END %] - [% END %] + -
    +
    +
      +
    1. Current library: [% Branches.GetName( ITEM_DAT.holdingbranch ) | html %] 
      2. +
    2. + Checkout status: + [% SET checkout = ITEM_DAT.object.checkout %] + [% IF ( checkout ) %] + Checked out to [% INCLUDE 'patron-title.inc' patron => checkout.patron hide_patron_infos_if_needed=1 %] + [% IF ( checkout.lastreneweddate ) %] + Last renewed [% checkout.lastreneweddate | $KohaDates %], + [% END %] + [% IF ( checkout.date_due ) %] + Due back on [% checkout.date_due | $KohaDates %] + [% ELSE %] + Not checked out + [% END %] + [% END %] +
      3. +
    3. + Current renewals: + [% ITEM_DAT.renewals | html %] + [% IF ITEM_DAT.renewals %] + [ View ] + [% END %] +
      4. + [% IF itemlostloop %] +
    4. + Lost status: + [% IF ( CAN_user_circulate ) %] + [% SET ClaimReturnedLostValue = Koha.Preference('ClaimReturnedLostValue') %] +
      + + + -

      Priority

      -
      -
        -
      1. - Exclude from local holds priority: - - - - - - -
        2. - -
      -
      -
      + [% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %] + + [% END %] + + [% FOREACH itemlostloo IN itemlostloop %] + [% IF ClaimReturnedLostValue && !ITEM_DAT.itemlost && itemlostloo.authorised_value == ClaimReturnedLostValue #Filter claims returned status from pulldown %] + + [% ELSIF itemlostloo.authorised_value == ITEM_DAT.itemlost %] + + [% ELSE %] + + [% END %] + [% END %] + + + -

      History

      -
      -
        + [% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %] + +

        Item has been claimed as returned.

        + [% ELSE %] + + + [% END %] + + [% ELSE %] + [% FOREACH itemlostloo IN itemlostloop %] + [% IF ( itemlostloo.selected ) %] + [% itemlostloo.lib | html %] + [% END %] + [% END %] + [% END %] + + [% IF ITEM_DAT.itemlost != "" && ITEM_DAT.itemlost_on %] +
      1. Lost on:[% ITEM_DAT.itemlost_on | $KohaDates %]
        2. + [% END %] + [% END %] - [% IF ITEM_DAT.basketno %] -
      2. Order date: - [% IF ( CAN_user_acquisition_order_manage ) %] - [% ITEM_DAT.orderdate | $KohaDates %] - [% ELSE %] - [% ITEM_DAT.orderdate | $KohaDates %] - [% END %] -
        3. -
      3. Vendor: - [% ITEM_DAT.vendor | html %] -
        4. - [% END %] + [% IF itemdamagedloop %] +
      4. + Damaged status: + [% IF ( CAN_user_circulate ) %] +
        + + + + + + +
        + [% ELSE %] + [% FOREACH itemdamagedloo IN itemdamagedloop %] + [% IF ( itemdamagedloo.selected ) %] + [% itemdamagedloo.lib | html %] + [% END %] + [% END %] + [% END %] +
        5. + [% IF ITEM_DAT.damaged != "" && ITEM_DAT.damaged_on %] +
      5. Damaged on:[% ITEM_DAT.damaged_on | $KohaDates %]
        6. + [% END %] + [% END %] - [% IF ITEM_DAT.dateaccessioned %] -
      6. Accession date: - [% IF ( CAN_user_acquisition_order_receive && ITEM_DAT.invoiceid ) %] - [% ITEM_DAT.dateaccessioned | $KohaDates %] - [% ELSE %] - [% ITEM_DAT.dateaccessioned | $KohaDates %] - [% END %] -
        7. - [% END %] - [% IF ( ITEM_DAT.invoicenumber ) %] -
      7. Invoice number: - [% ITEM_DAT.invoicenumber | html %] -
        8. - [% END %] + [% IF itemwithdrawnloop %] +
      8. + Withdrawn status: + [% IF ( CAN_user_circulate ) %] +
        + + + + + + +
        + [% ELSE %] + [% FOREACH itemwithdrawn IN itemwithdrawnloop %] + [% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %] + [% itemwithdrawn.lib | html %] + [% END %] + [% END %] + [% END %] +
        9. + [% IF ITEM_DAT.withdrawn != "" && ITEM_DAT.withdrawn_on %] +
      9. Withdrawn on:[% ITEM_DAT.withdrawn_on | $KohaDates %]
        10. + [% END %] + [% END %] +
      +
      +
      -
    5. Total checkouts: - [% IF ( ITEM_DAT.issues ) %] - [% ITEM_DAT.issues | html %] - [% ELSE %] - 0 - [% END %] (View item's checkout history)
      6. +
      +

      Priority

      +
      +
        +
      1. + Exclude from local holds priority: +
        + + + + + + +
        +
        2. +
      +
      +
      -
    6. Last seen:[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen | $KohaDates %] [%END %] 
      7. -
    7. Last borrowed:[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %] 
      8. - [% IF Koha.Preference('StoreLastBorrower') && ITEM_DAT.object.last_returned_by %] -
    8. Last returned by: [% ITEM_DAT.object.last_returned_by.cardnumber | html %] 
      9. - [% END %] - [% IF ( ITEM_DAT.card0 ) %]
    9. Last borrower: [% ITEM_DAT.card0 | html %] 
      10. [% END %] - [% IF ( ITEM_DAT.card1 ) %]
    10. Previous borrower: [% ITEM_DAT.card1 | html %] 
      11. [% END %] - [% IF ( ITEM_DAT.card2 ) %]
    11. Previous borrower: [% ITEM_DAT.card2 | html %] 
      12. [% END %] - [% IF ( ITEM_DAT.paidfor ) %]
    12. Paid for?: [% INCLUDE 'patron-title.inc' patron=ITEM_DAT.paidfor.patron hide_patron_infos_if_needed=1 %] on [% ITEM_DAT.paidfor.created_on | $KohaDates %]
      13. [% END %] +
      +

      History

      +
      +
        - [% IF ( ITEM_DAT.enumchron ) %]
      1. Serial enumeration: [% ITEM_DAT.enumchron | html %] 
        2. [% END %] + [% IF ITEM_DAT.basketno %] +
      2. + Order date: + [% IF ( CAN_user_acquisition_order_manage ) %] + [% ITEM_DAT.orderdate | $KohaDates %] + [% ELSE %] + [% ITEM_DAT.orderdate | $KohaDates %] + [% END %] +
        3. +
      3. + Vendor: + [% ITEM_DAT.vendor | html %] +
        4. + [% END %] -
      4. - Public note: - [% IF ( CAN_user_editcatalogue_edit_items ) %] -
        - - - -
        - [% ELSE %] - [% ITEM_DAT.itemnotes | html %] -   - [% END %] -
        5. + [% IF ITEM_DAT.dateaccessioned %] +
      5. + Accession date: + [% IF ( CAN_user_acquisition_order_receive && ITEM_DAT.invoiceid ) %] + [% ITEM_DAT.dateaccessioned | $KohaDates %] + [% ELSE %] + [% ITEM_DAT.dateaccessioned | $KohaDates %] + [% END %] +
        6. + [% END %] -
      6. - Non-public note: - [% IF ( CAN_user_editcatalogue_edit_items ) %] -
        - - - -
        - [% ELSE %] - [% ITEM_DAT.itemnotes_nonpublic | html %] -   - [% END %] -
        7. -
      -
      -
      -[% END %] + [% IF ( ITEM_DAT.invoicenumber ) %] +
    13. + Invoice number: + [% ITEM_DAT.invoicenumber | html %] +
      14. + [% END %] -
    +
  • + Total checkouts: + [% IF ( ITEM_DAT.issues ) %] + [% ITEM_DAT.issues | html %] + [% ELSE %] + 0 + [% END %] + (View item's checkout history) +
    • +
  • + Last seen: + [% IF ( ITEM_DAT.datelastseen ) %] + [% ITEM_DAT.datelastseen | $KohaDates %] + [%END %] +
    • +
  • + Last borrowed: + [% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %] +
    • + [% IF Koha.Preference('StoreLastBorrower') && ITEM_DAT.object.last_returned_by %] +
  • + Last returned by: + [% ITEM_DAT.object.last_returned_by.cardnumber | html %] +
    • + [% END %] + [% IF ( ITEM_DAT.card0 ) %] +
  • + Last borrower: + [% ITEM_DAT.card0 | html %]  +
    • + [% END %] + [% IF ( ITEM_DAT.card1 ) %] +
  • + Previous borrower: + [% ITEM_DAT.card1 | html %]  +
    • + [% END %] + [% IF ( ITEM_DAT.card2 ) %] +
  • + Previous borrower: + [% ITEM_DAT.card2 | html %]  +
    • + [% END %] + [% IF ( ITEM_DAT.paidfor ) %] +
  • + Paid for?: + [% INCLUDE 'patron-title.inc' patron=ITEM_DAT.paidfor.patron hide_patron_infos_if_needed=1 %] on [% ITEM_DAT.paidfor.created_on | $KohaDates %] +
    • + [% END %] + + [% IF ( ITEM_DAT.enumchron ) %] +
  • + Serial enumeration: + [% ITEM_DAT.enumchron | html %]  +
    • + [% END %] + +
  • + Public note: + [% IF ( CAN_user_editcatalogue_edit_items ) %] +
    + + + +
    + [% ELSE %] + [% ITEM_DAT.itemnotes | html %] + [% END %] +
    • + +
  • + Non-public note: + [% IF ( CAN_user_editcatalogue_edit_items ) %] +
    + + + +
    + [% ELSE %] + [% ITEM_DAT.itemnotes_nonpublic | html %] + [% END %] +
    • + +
    +
    + [% END %] +
    -- 2.39.5