[Koha-patches] [PATCH] [followup](bug #4051) separate firstname and surname
Nahuel ANGELINETTI
nahuel.angelinetti at biblibre.com
Tue Jan 19 14:36:49 CET 2010
this patch separate firstname and surname in two columns in csv export.
---
circ/overdue.pl | 16 +++++++++-------
.../prog/en/modules/circ/overdue.tmpl | 2 +-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/circ/overdue.pl b/circ/overdue.pl
index 2360028..0b2780b 100755
--- a/circ/overdue.pl
+++ b/circ/overdue.pl
@@ -114,7 +114,8 @@ $bornamefilter =~s/\*/\%/g;
$bornamefilter =~s/\?/\_/g;
my $strsth="SELECT date_due,
- concat(surname,' ', firstname) as borrower,
+ surname,
+ firstname,
borrowers.address,
borrowers.city,
borrowers.zipcode,
@@ -143,11 +144,11 @@ $strsth.=" AND biblioitems.itemtype = '" . $itemtypefilter . "' " if $itemtype
$strsth.=" AND borrowers.flags = '" . $borflagsfilter . "' " if $borflagsfilter;
$strsth.=" AND borrowers.branchcode = '" . $branchfilter . "' " if $branchfilter;
$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 "surname" or $order eq "surname desc") ? "$order, date_due" :
+ ($order eq "title" or $order eq "title desc") ? "$order, date_due, surname" :
+ ($order eq "barcode" or $order eq "barcode desc") ? "items.$order, date_due, surname" :
+ ($order eq "date_due desc") ? "date_due DESC, surname" :
+ "date_due, surname" # default sort order
);
$template->param(sql=>$strsth);
my $sth=$dbh->prepare($strsth);
@@ -159,11 +160,12 @@ while (my $data=$sth->fetchrow_hashref) {
push @overduedata, {
issuedate => format_date($data->{issuedate}),
duedate => format_date($data->{date_due}),
+ surname => $data->{surname},
+ firstname => $data->{firstname},
borrowernumber => $data->{borrowernumber},
barcode => $data->{barcode},
itemnum => $data->{itemnumber},
itemcallnumber => $data->{itemcallnumber},
- name => $data->{borrower},
address => $data->{address},
city => $data->{city},
zipcode => $data->{zipcode},
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
index d0cd5aa..ae99e90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
@@ -39,7 +39,7 @@
<tbody><!-- TMPL_LOOP NAME="overdueloop" -->
<tr>
<td><!-- TMPL_VAR NAME="duedate" --></td>
- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber"-->"><!-- TMPL_VAR NAME="name" --></a>
+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber"-->"><!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR NAME="firstname" --></a>
<!-- TMPL_IF NAME="email" -->[<a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->">email</a>]<!-- /TMPL_IF -->
(<!--TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSIF NAME="mobile" --><!-- TMPL_VAR NAME="mobile" --><!-- TMPL_ELSIF NAME="phonepro" --><!-- TMPL_VAR NAME="phonepro" --><!-- /TMPL_IF -->)</td>
<td><!-- TMPL_VAR name="branchcode" --></td>
--
1.6.3.3
More information about the Koha-patches
mailing list