[Koha-cvs] koha C4/Members.pm koha-tmpl/intranet-tmpl/prog... [rel_3_0]
paul poulain
paul at koha-fr.org
Thu Jan 25 11:27:15 CET 2007
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: paul poulain <tipaul> 07/01/25 10:27:15
Modified files:
C4 : Members.pm
koha-tmpl/intranet-tmpl/prog/en/members: member.tmpl
members : member.pl
Log message:
- showing category_type in result list
- hilighting members with odues or fines
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.28&r2=1.32.2.29
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/members/member.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.13.2.1&r2=1.13.2.2
Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.32.2.28
retrieving revision 1.32.2.29
diff -u -b -r1.32.2.28 -r1.32.2.29
--- C4/Members.pm 12 Jan 2007 18:10:19 -0000 1.32.2.28
+++ C4/Members.pm 25 Jan 2007 10:27:14 -0000 1.32.2.29
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Members.pm,v 1.32.2.28 2007/01/12 18:10:19 toins Exp $
+# $Id: Members.pm,v 1.32.2.29 2007/01/25 10:27:14 tipaul Exp $
use strict;
require Exporter;
@@ -30,7 +30,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.32.2.28 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.32.2.29 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -112,33 +112,36 @@
if ( $type eq "simple" ) # simple search for one letter only
{
$query =
- "Select * from borrowers where surname like ? order by $orderby";
+ "SELECT * FROM borrowers
+ LEFT JOIN categories ON borrowers.categorycode=categories.categorycode
+ WHERE surname LIKE ? ORDER BY $orderby";
@bind = ("$searchstring%");
}
else # advanced search looking in surname, firstname and othernames
{
@data = split( ' ', $searchstring );
$count = @data;
- $query = "Select * from borrowers
- where ((surname like ? or surname like ?
- or firstname like ? or firstname like ?
- or othernames like ? or othernames like ?)
+ $query = "SELECT * FROM borrowers
+ LEFT JOIN categories ON borrowers.categorycode=categories.categorycode
+ WHERE ((surname LIKE ? OR surname LIKE ?
+ OR firstname LIKE ? OR firstname LIKE ?
+ OR othernames LIKE ? OR othernames LIKE ?)
";
@bind = (
"$data[0]%", "% $data[0]%", "$data[0]%", "% $data[0]%",
"$data[0]%", "% $data[0]%"
);
for ( my $i = 1 ; $i < $count ; $i++ ) {
- $query = $query . " and (" . " surname like ? or surname like ?
- or firstname like ? or firstname like ?
- or othernames like ? or othernames like ?)";
+ $query = $query . " AND (" . " surname LIKE ? OR surname LIKE ?
+ OR firstname LIKE ? OR firstname LIKE ?
+ OR othernames LIKE ? OR othernames LIKE ?)";
push( @bind,
"$data[$i]%", "% $data[$i]%", "$data[$i]%",
"% $data[$i]%", "$data[$i]%", "% $data[$i]%" );
# FIXME - .= <<EOT;
}
- $query = $query . ") or cardnumber like ?
+ $query = $query . ") OR cardnumber LIKE ?
order by $orderby";
push( @bind, $searchstring );
Index: koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl 17 Nov 2006 14:57:22 -0000 1.2.2.3
+++ koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl 25 Jan 2007 10:27:15 -0000 1.2.2.4
@@ -21,17 +21,20 @@
<th>Card</th>
<th>Name</th>
<th>Cat</th>
- <th>Address</th>
<th>OD/Issues</th>
- <th>Charges</th>
+ <th>Fines</th>
<th>Notes</th>
</tr>
<!-- TMPL_LOOP NAME="resultsloop" -->
+ <!-- TMPL_IF EXPR="odissue+fines > 0" -->
+ <tr class="problem">
+ <!-- TMPL_ELSE -->
<tr>
+ <!-- /TMPL_IF -->
<td><!-- TMPL_VAR NAME="cardnumber" --></td>
- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> </td>
- <td><!-- TMPL_VAR NAME="categorycode" --></td>
- <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
+ <td><p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a></p>
+ <p><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></p> </td>
+ <td><!-- TMPL_VAR NAME="category_description" --> (<!-- TMPL_VAR name="category_type" -->)</td>
<td><!-- TMPL_VAR NAME="odissue" --></td>
<td><!-- TMPL_VAR NAME="fines" --></td>
<td><!-- TMPL_VAR NAME="borrowernotes" --></td>
Index: members/member.pl
===================================================================
RCS file: /sources/koha/koha/members/member.pl,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -b -r1.13.2.1 -r1.13.2.2
--- members/member.pl 18 Dec 2006 16:35:19 -0000 1.13.2.1
+++ members/member.pl 25 Jan 2007 10:27:15 -0000 1.13.2.2
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: member.pl,v 1.13.2.1 2006/12/18 16:35:19 toins Exp $
+# $Id: member.pl,v 1.13.2.2 2007/01/25 10:27:15 tipaul Exp $
#script to do a borrower enquiery/brin up borrower details etc
#written 20/12/99 by chris at katipo.co.nz
@@ -95,6 +95,8 @@
surname => $results->[$i]{'surname'},
firstname => $results->[$i]{'firstname'},
categorycode => $results->[$i]{'categorycode'},
+ category_type => $results->[$i]{'category_type'},
+ category_description => $results->[$i]{'description'},
streetaddress => $results->[$i]{'streetaddress'},
city => $results->[$i]{'city'},
branchcode => $results->[$i]{'branchcode'},
More information about the Koha-cvs
mailing list