From b436bf2fdfe50a9e714a2b35f560db7de57b7295 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Thu, 21 Mar 2024 16:37:13 +0000 Subject: [PATCH] Bug 31981: Add classes to each NEEDSCONFIRM message in circ/circulation.tt This patch adds a 'needsconfirm' class and a unique class to each NEEDSCONFIRM message on circ/circulation.tt to make these easier to style individually. To test: 1. APPLY patch 2. Review the diff to see each of the NEEDSCONFIRMATION messages. 3. Add some CSS to IntranetUserCSS like this: .needsconfirm { padding: 1em; color: #fff; } .reserved { background: blue; } .debt { background: red; } .reserve_waiting { background: orange; } .rentalcharge { background: purple; } .renew_issue { background: limegreen; } 4. Place a hold on an item for Patron A, do not trigger the hold, and check the item out to Patron B. The message background is blue. 5. Then check the item in, confirm the hold, then check the item out to Patron B. The message background is orange 6. Check something out that is already checked out to that patron, message background is lime green. 7. Have too much debt and check something out to a patron, message is red. Note: There are plenty more NEEDSCONFIRMATION messages but I don't think we need to test every single one. Note: These background colors are more testing purposes only. Signed-off-by: Donna Signed-off-by: Katrin Fischer (cherry picked from commit 2c8196cc077501d1b970f1077f94fd3f25b1385a) Signed-off-by: Fridolin Somers --- .../prog/en/modules/circ/circulation.tt | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 882a55692b..92cbac67eb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -117,7 +117,7 @@
    [%IF ( AGE_RESTRICTION ) %] -
  • +
  • Age restriction [% AGE_RESTRICTION | html %]. [% IF CAN_user_circulate_force_checkout %] Check out anyway? @@ -127,43 +127,43 @@ [% IF ( DEBT ) %] -
  • The patron has a debt of [% DEBT | $Price %].
    • +
  • The patron has a debt of [% DEBT | $Price %].
    • [% END %] [% IF ( DEBT_GUARANTEES ) %] -
  • The patron's guarantees collectively have a debt of [% DEBT_GUARANTEES | $Price %].
    • +
  • The patron's guarantees collectively have a debt of [% DEBT_GUARANTEES | $Price %].
    • [% END %] [% IF ( DEBT_GUARANTORS ) %] -
  • The patron's guarantors and their other guarantees collectively have a debt of [% DEBT_GUARANTORS | $Price %].
    • +
  • The patron's guarantors and their other guarantees collectively have a debt of [% DEBT_GUARANTORS | $Price %].
    • [% END %] [% IF ( RENTALCHARGE && RENTALCHARGE > 0 ) %] -
  • Rental charge for this item: [% RENTALCHARGE | $Price %]
    • +
  • Rental charge for this item: [% RENTALCHARGE | $Price %]
    • [% END %] [% IF ( RENEW_ISSUE ) %] -
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) is currently checked out to this patron. Renew?
    • +
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) is currently checked out to this patron. Renew?
    • [% END %] [% IF ( RESERVE_WAITING ) %] -
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) has been waiting for [% resfirstname | html %] [% ressurname | html %] ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% reswaitingdate | $KohaDates %]
    • +
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) has been waiting for [% resfirstname | html %] [% ressurname | html %] ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% reswaitingdate | $KohaDates %]
    • [% END %] [% IF ( TRANSFERRED ) %] -
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) is on hold for [% resfirstname | html %] [% ressurname | html %] ([% rescardnumber | html %]) and being transferred to [% Branches.GetName( resbranchcode ) | html %]
    • +
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) is on hold for [% resfirstname | html %] [% ressurname | html %] ([% rescardnumber | html %]) and being transferred to [% Branches.GetName( resbranchcode ) | html %]
    • [% END %] [% IF ( PROCESSING ) %] -
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) is being processed for [% resfirstname | html %] [% ressurname | html %] ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %]
    • +
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) is being processed for [% resfirstname | html %] [% ressurname | html %] ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %]
    • [% END %] [% IF ( RESERVED ) %] -
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) has been on hold for [% resfirstname | html %] [% ressurname | html %] ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% resreservedate | $KohaDates %]
    • +
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) has been on hold for [% resfirstname | html %] [% ressurname | html %] ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% resreservedate | $KohaDates %]
    • [% END %] [% IF ( ISSUED_TO_ANOTHER ) %] -
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) is checked out to [% issued_firstname | html %] [% issued_surname | html %] ([% issued_cardnumber | html %]). +
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) is checked out to [% issued_firstname | html %] [% issued_surname | html %] ([% issued_cardnumber | html %]). [% IF CAN_user_circulate_force_checkout %] Check in and check out? [% END %] @@ -171,35 +171,35 @@ [% END %] [% IF TOO_MANY and TOO_MANY == 'TOO_MANY_CHECKOUTS' %] -
  • Too many checked out. [% current_loan_count | html %] checked out, only [% max_loans_allowed | html %] are allowed.
    • -
  • +
  • Too many checked out. [% current_loan_count | html %] checked out, only [% max_loans_allowed | html %] are allowed.
    • +
  • Maximum checkouts calculated from the circulation rule for [% INCLUDE circulation_rule_criteria rule=circulation_rule_TOO_MANY %]
    • [% END %] [% IF TOO_MANY and TOO_MANY == 'TOO_MANY_ONSITE_CHECKOUTS' %] -
  • Too many on-site checked out. [% current_loan_count | html %] on-site checked out, only [% max_loans_allowed | html %] are allowed.
    • -
  • +
  • Too many on-site checked out. [% current_loan_count | html %] on-site checked out, only [% max_loans_allowed | html %] are allowed.
    • +
  • Maximum checkouts calculated from the circulation rule for [% INCLUDE circulation_rule_criteria rule=circulation_rule_TOO_MANY %]
    • [% END %] [% IF ( BORRNOTSAMEBRANCH ) %] -
  • This patron is from a different library ([% Branches.GetName( BORRNOTSAMEBRANCH ) | html %])
    • +
  • This patron is from a different library ([% Branches.GetName( BORRNOTSAMEBRANCH ) | html %])
    • [% END %] [% IF ( PATRON_CANT ) %] -
  • This patron can't check out this item per library circulation policy.
    • +
  • This patron can't check out this item per library circulation policy.
    • [% END %] [% IF ( TOO_MANY and TOO_MANY == 'NO_RULE_DEFINED' ) %] -
  • No circulation rule is defined for this patron and itemtype combination.
    • +
  • No circulation rule is defined for this patron and itemtype combination.
    • [% END %] [% IF ( NOT_FOR_LOAN_FORCING ) %] -
  • +
  • [% IF ( itemtype_notforloan ) %] Item type is normally not for loan. [% ELSIF ( item_notforloan ) %] @@ -213,7 +213,7 @@ [% END %] [% IF ( USERBLOCKEDOVERDUE ) %] -
  • Patron has [% USERBLOCKEDOVERDUE %] overdue item(s). +
  • Patron has [% USERBLOCKEDOVERDUE %] overdue item(s). [% IF CAN_user_circulate_force_checkout %] Check out anyway? [% END %] @@ -221,7 +221,7 @@ [% END %] [% IF ( ITEM_LOST ) %] -
  • This item has been lost with a status of "[% ITEM_LOST | html %]". +
  • This item has been lost with a status of "[% ITEM_LOST | html %]". [% IF CAN_user_circulate_force_checkout %] Check out anyway? [% END %] @@ -229,15 +229,15 @@ [% END %] [% IF HIGHHOLDS %] -
  • High demand item. Loan period shortened to [% HIGHHOLDS.duration | html %] days (due [% HIGHHOLDS.returndate | $KohaDates %]). Check out anyway?
    • +
  • High demand item. Loan period shortened to [% HIGHHOLDS.duration | html %] days (due [% HIGHHOLDS.returndate | $KohaDates %]). Check out anyway?
    • [% END %] [% IF PREVISSUE %] -
  • Patron has previously checked out this title: [% biblio.title | html %] [% IF biblio.author %] by [% biblio.author | html %][% END %]. Check out anyway?
    • +
  • Patron has previously checked out this title: [% biblio.title | html %] [% IF biblio.author %] by [% biblio.author | html %][% END %]. Check out anyway?
    • [% END %] [% IF BIBLIO_ALREADY_ISSUED %] -
  • +
  • Patron has already checked out another item from this record. [% IF CAN_user_circulate_force_checkout %] Check out anyway? @@ -246,27 +246,27 @@ [% END %] [% IF ADDITIONAL_MATERIALS %] -
  • +
  • Please confirm that the accompanying materials are present: [% ADDITIONAL_MATERIALS | html %]
    • [% END %] [% IF RECALLED %] [% IF RECALLED.waiting %] -
  • Item [% RECALLED.biblio.title | html %] ([% RECALLED.item.barcode | html %]) has been waiting for [% RECALLED.patron.firstname | html %] [% RECALLED.patron.surname | html %] ([% RECALLED.patron.cardnumber | html %]) at [% Branches.GetName( RECALLED.pickup_library_id ) | html %] since [% RECALLED.waiting_date | $KohaDates %]
    • +
  • Item [% RECALLED.biblio.title | html %] ([% RECALLED.item.barcode | html %]) has been waiting for [% RECALLED.patron.firstname | html %] [% RECALLED.patron.surname | html %] ([% RECALLED.patron.cardnumber | html %]) at [% Branches.GetName( RECALLED.pickup_library_id ) | html %] since [% RECALLED.waiting_date | $KohaDates %]
    • [% ELSIF RECALLED.requested or RECALLED.overdue %] -
  • Item [% RECALLED.biblio.title | html %] [% IF RECALLED.item %]([% RECALLED.item.barcode | html %])[% END %] has been recalled by [% RECALLED.patron.firstname | html %] [% RECALLED.patron.surname | html %] ([% RECALLED.patron.cardnumber | html %]) at [% Branches.GetName( RECALLED.pickup_library_id ) | html %] since [% RECALLED.created_date | $KohaDates %]
    • +
  • Item [% RECALLED.biblio.title | html %] [% IF RECALLED.item %]([% RECALLED.item.barcode | html %])[% END %] has been recalled by [% RECALLED.patron.firstname | html %] [% RECALLED.patron.surname | html %] ([% RECALLED.patron.cardnumber | html %]) at [% Branches.GetName( RECALLED.pickup_library_id ) | html %] since [% RECALLED.created_date | $KohaDates %]
    • [% END %] [% END %] [% IF ( BOOKED_TO_ANOTHER ) %] -
  • +
  • Due for another patron booking by: [% BOOKED_TO_ANOTHER.start_date | $KohaDates %]
    • [% END %] [% IF ( BOOKED_EARLY ) %] -
  • +
  • Patron has this item booked for checkout on [% BOOKED_EARLY.start_date | $KohaDates %]
    • [% END %] -- 2.39.5