gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug 7198: show patron name in overdue list even if name column is null 

If the surname or firstname of a patron is NULL, the MySQL concat()
function (properly) returns NULL, leading to the patron name not
displaying in the overdue report.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
This commit is contained in:
Galen Charlton 2011-11-08 20:44:25 -05:00 committed by Paul Poulain
parent 4fad65cc26
commit 18e06ecf0b
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
circ/overdue.pl
View File

@ -236,7 +236,8 @@ if ($noreport) {
my $strsth="SELECT date_due,
borrowers.title as borrowertitle,
concat(surname,' ', firstname) as borrower,
borrowers.surname,
borrowers.firstname,
borrowers.streetnumber,
borrowers.streettype,
borrowers.address,
@ -282,11 +283,12 @@ if ($noreport) {
$strsth =~ s/WHERE 1=1/WHERE 1=1 AND borrowers.borrowernumber IN ($bnlist)/ if $bnlist;
$strsth =~ s/WHERE 1=1/WHERE 0=1/ if $have_pattr_filter_data && !$bnlist; # no match if no borrowers matched patron attrs
$strsth.=" ORDER BY " . (
($order eq "borrower" or $order eq "borrower desc") ? "$order, date_due" :
($order eq "title" or $order eq "title desc") ? "$order, date_due, borrower" :
($order eq "barcode" or $order eq "barcode desc") ? "items.$order, date_due, borrower" :
($order eq "date_due desc") ? "date_due DESC, borrower" :
"date_due, borrower" # default sort order
($order eq "borrower") ? "surname, firstname, date_due" :
($order eq "borrower desc") ? "surname desc, firstname desc, date_due" :
($order eq "title" or $order eq "title desc") ? "$order, date_due, surname, firstname" :
($order eq "barcode" or $order eq "barcode desc") ? "items.$order, date_due, surname, firstname" :
($order eq "date_due desc") ? "date_due DESC, surname, firstname" :
"date_due, surname, firstname" # default sort order
);
$template->param(sql=>$strsth);
my $sth=$dbh->prepare($strsth);
@ -315,7 +317,8 @@ if ($noreport) {
itemnum => $data->{itemnumber},
issuedate => format_date($data->{issuedate}),
borrowertitle => $data->{borrowertitle},
name => $data->{borrower},
surname => $data->{surname},
firstname => $data->{firstname},
streetnumber => $data->{streetnumber},
streettype => $data->{streettype},
address => $data->{address},

2
koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
View File

@ -116,7 +116,7 @@
<tbody>[% FOREACH overdueloo IN overdueloop %]
<tr>
<td>[% overdueloo.duedate %]</td>
<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overdueloo.borrowernumber %]">[% overdueloo.name %]</a>
<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overdueloo.borrowernumber %]">[% overdueloo.surname %] [% overdueloo.firstname %]</a>
[% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email %]?subject=Overdue: [% overdueloo.title |html %]">email</a>][% END %]
[% IF ( overdueloo.phone ) %]([% overdueloo.phone %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro %])[% END %]</td>
<td>[% overdueloo.branchcode %]</td>