From 5869bccfc367a93063b552fbcf9d5dc90f0f0cdb Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 13 Nov 2014 12:03:42 -0500 Subject: [PATCH] Bug 12778 - Regression: Item lost status doesn't show in list of checkouts When using the longoverdue script it's possible that items marked lost remain on the patron account. I think it's important for staff to see that some items are marked lost - currently the list of checkouts doesn't show any sign of the lost status. Test Plan: 1) Find a patron with a checked out lost item 2) Note the lost status is not displayed in the checkouts table 3) Apply this patch 4) Refresh the page, note the lost status now displays 5) Repeat this test plan for a damaged item Signed-off-by: Owen Leonard Tested successfully with damaged and multiple lost values. Signed-off-by: Katrin Fischer Works as described, no problems found. Signed-off-by: Tomas Cohen Arazi Conflicts: koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js --- .../intranet-tmpl/prog/en/js/checkouts.js | 19 +++++++++++++++---- svc/checkouts | 9 +++++++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js index b5ec4a776c..8ffb04b5e9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js @@ -160,10 +160,21 @@ $(document).ready(function() { { "iDataSort": 1, // Sort on hidden unformatted date due column "mDataProp": function( oObj ) { - if ( oObj.date_due_overdue ) { - return "" + oObj.date_due_formatted + ""; - } else { - return oObj.date_due_formatted; + var due = oObj.date_due_formatted; + + if ( oObj.date_due_overdue ) { + due = "" + due + ""; + } + + if ( oObj.lost ) { + due += "" + oObj.lost + ""; + } + + if ( oObj.damaged ) { + due += "" + oObj.damaged + ""; + } + + return due; } } }, diff --git a/svc/checkouts b/svc/checkouts index 11f0895a58..4489ac03b0 100755 --- a/svc/checkouts +++ b/svc/checkouts @@ -25,8 +25,8 @@ use JSON qw(to_json); use C4::Auth qw(check_cookie_auth); use C4::Biblio qw(GetMarcBiblio GetFrameworkCode GetRecordValue ); -use C4::Circulation - qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate); +use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate); +use C4::Koha qw(GetAuthorisedValueByCode); use C4::Context; use Koha::DateUtils; @@ -84,6 +84,9 @@ my $sql = ' firstname, cardnumber, + itemlost, + damaged, + DATEDIFF( issuedate, CURRENT_DATE() ) AS not_issued_today FROM issues LEFT JOIN items USING ( itemnumber ) @@ -172,6 +175,8 @@ while ( my $c = $sth->fetchrow_hashref() ) { GetMarcBiblio( $c->{biblionumber} ), GetFrameworkCode( $c->{biblionumber} ) ), + lost => $c->{itemlost} ? GetAuthorisedValueByCode( 'LOST', $c->{itemlost} ) : undef, + damaged => $c->{damaged} ? GetAuthorisedValueByCode( 'DAMAGED', $c->{damaged} ) : undef, borrower => { surname => $c->{surname}, firstname => $c->{firstname}, -- 2.39.5