From 50c0ae09a12e10b851022d6b3fe18aa0b345a98b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 11 Feb 2011 22:22:16 -0500 Subject: [PATCH] Partial fix for Bug 5745, Overdues with fines report not showing titles - Adding title, subtitle, and author to output - Reworking display of shelving location selection Patch does not address the contents of 'overdue status' and 'notified by' Signed-off-by: Nicole Engard Signed-off-by: Chris Cormack --- C4/Overdues.pm | 2 ++ circ/branchoverdues.pl | 9 ++++++- .../prog/en/modules/circ/branchoverdues.tmpl | 27 +++++-------------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/C4/Overdues.pm b/C4/Overdues.pm index 032ca938e1..adba9793b7 100644 --- a/C4/Overdues.pm +++ b/C4/Overdues.pm @@ -1176,12 +1176,14 @@ sub GetOverduesForBranch { borrowers.phone, borrowers.email, biblio.title, + biblio.author, biblio.biblionumber, issues.date_due, issues.returndate, issues.branchcode, branches.branchname, items.barcode, + items.homebranch, items.itemcallnumber, items.location, items.itemnumber, diff --git a/circ/branchoverdues.pl b/circ/branchoverdues.pl index 905af94396..5c1dcafea6 100755 --- a/circ/branchoverdues.pl +++ b/circ/branchoverdues.pl @@ -27,6 +27,7 @@ use C4::Overdues; # AddNotifyLine use C4::Biblio; use C4::Koha; use C4::Debug; +use C4::Branch; =head1 branchoverdues.pl @@ -103,21 +104,27 @@ my ($tag,$subfield) = GetMarcFromKohaField('items.location',''); my $tagslib = &GetMarcStructure(1,''); if ($tagslib->{$tag}->{$subfield}->{authorised_value}) { my $values= GetAuthorisedValues($tagslib->{$tag}->{$subfield}->{authorised_value}); + for (@$values) { $_->{selected} = 1 if $location eq $_->{authorised_value} } $template->param(locationsloop => $values); } # now display infos foreach my $num (@getoverdues) { - my %overdueforbranch; + my $record = GetMarcBiblio($num->{biblionumber}); + if ($record){ + $overdueforbranch{'subtitle'} = GetRecordValue('subtitle',$record,'')->[0]->{subfield}; + } $overdueforbranch{'date_due'} = format_date( $num->{'date_due'} ); $overdueforbranch{'title'} = $num->{'title'}; $overdueforbranch{'description'} = $num->{'description'}; $overdueforbranch{'barcode'} = $num->{'barcode'}; $overdueforbranch{'biblionumber'} = $num->{'biblionumber'}; + $overdueforbranch{'author'} = $num->{'author'}; $overdueforbranch{'borrowersurname'} = $num->{'surname'}; $overdueforbranch{'borrowerfirstname'} = $num->{'firstname'}; $overdueforbranch{'borrowerphone'} = $num->{'phone'}; $overdueforbranch{'borroweremail'} = $num->{'email'}; + $overdueforbranch{'homebranch'} = GetBranchName($num->{'homebranch'}); $overdueforbranch{'itemcallnumber'} = $num->{'itemcallnumber'}; $overdueforbranch{'borrowernumber'} = $num->{'borrowernumber'}; $overdueforbranch{'itemnumber'} = $num->{'itemnumber'}; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl index 8458208a42..fb14577269 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl @@ -17,29 +17,16 @@

Circulation: Overdues at

- - -

Location selected

-
-
    -
  • - You are working actually on the overdues for the location : - -
  • -
-
-
- + - +
- @@ -56,12 +43,12 @@ @@ -109,7 +96,7 @@
- -   () + by +
Barcode :
- ">  

+ ">,

?subject=Overdue: ">
-
There are no overdues for today.
+
There are no overdues for today at the selected location.
-- 2.39.5