From ffef1ef64f8b8524a580a5008413750a979ca538 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 5 Dec 2012 13:55:00 -0500 Subject: [PATCH] [SIGNED-OFF] Bug 9219 - Show damaged and lost statuses for issues on circulation.pl as they are on moremember.pl Content-Type: text/plain; charset="utf-8" This patch adds the lost and damaged status for an issued item to the table of issued items on circulation.pl to make it align more closely to the same table on moremember.pl Test Plan: 1) Apply patch 2) Issue an item 3) Set the item's damaged status 4) Verify the status is showing near the date due on circulation.pl 5) Clear the damaged status and set the lost status again 6) Repeat step 4 Signed-off-by: Owen Leonard http://bugs.koha-community.org/show_bug.cgi?id=6739 --- .../prog/en/modules/circ/circulation.tt | 30 ++++++++++++++++++-- 1 file changed, 27 insertions(+), 3 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 39548f8..d21132b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1,4 +1,5 @@ [% USE KohaDates %] +[% USE KohaAuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] [% SET destination = "circ" %] Koha › Circulation @@ -787,7 +788,14 @@ No patron matched <span class="ex">[% message %]</span> <tr class="highlight"> [% END %] [% IF ( todayissue.od ) %]<td class="od">[% ELSE %]<td>[% END %] - [% todayissue.dd %] + [% todayissue.dd %] + + [% IF ( todayissue.itemlost ) %] + <span class="lost">[% KohaAuthorisedValues.GetByCode( 'LOST', todayissue.itemlost ) %]</span> + [% END %] + [% IF ( todayissue.damaged ) %] + <span class="dmg">[% KohaAuthorisedValues.GetByCode( 'DAMAGED', todayissue.damaged ) %]</span> + [% END %] </td> <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&type=intra"><strong>[% todayissue.title |html %]</strong></a>[% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- <span class="circ-hlt">[% todayissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% todayissue.biblionumber %]&itemnumber=[% todayissue.itemnumber %]#item[% todayissue.itemnumber %]">[% todayissue.barcode %]</a></td> <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td> @@ -866,7 +874,15 @@ No patron matched <span class="ex">[% message %]</span> <tr class="highlight"> [% END %] [% IF ( previssue.od ) %]<td class="od">[% ELSE %]<td>[% END %] - [% previssue.dd %] + + [% previssue.dd %] + + [% IF ( previssue.itemlost ) %] + <span class="lost">[% KohaAuthorisedValues.GetByCode( 'LOST', previssue.itemlost ) %]</span> + [% END %] + [% IF ( previssue.damaged ) %] + <span class="dmg">[% KohaAuthorisedValues.GetByCode( 'DAMAGED', previssue.damaged ) %]</span> + [% END %] </td> <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% previssue.biblionumber %]&type=intra"><strong>[% previssue.title |html %]</strong></a>[% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% previssue.biblionumber %]&itemnumber=[% previssue.itemnumber %]#item[% previssue.itemnumber %]">[% previssue.barcode %]</a></td> <td> @@ -997,7 +1013,15 @@ No patron matched <span class="ex">[% message %]</span> <tr class="highlight"> [% END %] [% IF ( relissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %] - [% relissue.dd %]</td> + [% relissue.dd %] + + [% IF ( relissue.itemlost ) %] + <span class="lost">[% KohaAuthorisedValues.GetByCode( 'LOST', relissue.itemlost ) %]</span> + [% END %] + [% IF ( relissue.damaged ) %] + <span class="dmg">[% KohaAuthorisedValues.GetByCode( 'DAMAGED', relissue.damaged ) %]</span> + [% END %] + </td> <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissue.biblionumber %]&type=intra"><strong>[% relissue.title |html %]</strong></a>[% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- <span class="circ-hlt">[% relissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissue.biblionumber %]&itemnumber=[% relissue.itemnumber %]#item[% relissue.itemnumber %]">[% relissue.barcode %]</a></td> <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td> <td>[% relissue.displaydate %]</td> -- 1.7.9.5