[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha C4/Members.pm koha-tmpl/intranet-tmpl/prog... [rel_3_0]
|
From: |
Bruno Toumi |
|
Subject: |
[Koha-cvs] koha C4/Members.pm koha-tmpl/intranet-tmpl/prog... [rel_3_0] |
|
Date: |
Wed, 15 Nov 2006 15:47:07 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Bruno Toumi <btoumi> 06/11/15 15:47:07
Modified files:
C4 : Members.pm
koha-tmpl/intranet-tmpl/prog/en/members: moremember.tmpl
members : moremember.pl
Log message:
add more details from borrowers in moremember template
( streetnumber and roadtype if exist)
create sub to have road details
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.14&r2=1.32.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.12.2.9&r2=1.12.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.5&r2=1.28.2.6
Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.32.2.14
retrieving revision 1.32.2.15
diff -u -b -r1.32.2.14 -r1.32.2.15
--- C4/Members.pm 15 Nov 2006 09:07:20 -0000 1.32.2.14
+++ C4/Members.pm 15 Nov 2006 15:47:07 -0000 1.32.2.15
@@ -19,7 +19,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.14 2006/11/15 09:07:20 toins Exp $
+# $Id: Members.pm,v 1.32.2.15 2006/11/15 15:47:07 btoumi Exp $
use strict;
require Exporter;
@@ -31,7 +31,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.32.2.14 $' =~ /\d+/g; shift(@v) . "." .
join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.32.2.15 $' =~ /\d+/g; shift(@v) . "." .
join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -66,7 +66,7 @@
ðnicitycategories get_institutions add_member_orgs
&get_age &GetBorrowersFromSurname &GetBranchCodeFromBorrowers
&GetFlagsAndBranchFromBorrower
- &GetCities &GetRoadTypes &GetBorNotifyAcctRecord
+ &GetCities &GetRoadTypes &GetRoadTypeDetails &GetBorNotifyAcctRecord
&GetMembeReregistration
&GetSortDetails
@@ -593,10 +593,11 @@
# It looks like the $i is only being returned to handle walking through
# the array, which is probably better done as a foreach loop.
#
- my $guaquery ="update borrowers set
streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',
-
streetcity='$data{'streetcity'}',phoneday='$data{'phoneday'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}'
- ,streetaddress='$data{'address'}'
- where borrowernumber='$guarantees->[$i]->{'borrowernumber'}'";
+ my $guaquery = qq|UPDATE borrowers
+ SET address='$data{'address'}',fax='$data{'fax'}',
+
B_city='$data{'B_city'}',mobile='$data{'mobile'}',city='$data{'city'}',phone='$data{'phone'}'
+ WHERE
borrowernumber='$guarantees->[$i]->{'borrowernumber'}'
+ |;
my $sth3 = $dbh->prepare($guaquery);
$sth3->execute;
$sth3->finish;
@@ -1617,6 +1618,47 @@
}
}
+=head2 GetRoadTypeDetails (OUEST-PROVENCE)
+
+ ($roadtype) = &GetRoadTypeDetails($roadtypeid);
+
+Returns the description of roadtype
+C<&$roadtype>return description of road type
+C<&$roadtypeid>this is the value of roadtype s
+
+=cut
+sub GetRoadTypeDetails {
+ my ($roadtypeid)address@hidden;
+ my $dbh = C4::Context->dbh;
+ my $query=qq|SELECT road_type
+ FROM roadtype
+ WHERE roadtypeid=?|;
+ my $sth=$dbh->prepare($query);
+ $sth->execute($roadtypeid);
+ my $roadtype=$sth->fetchrow;
+ return ($roadtype);
+}
+
+
+
+=head2 delmember
+
+ () = &delmember($member);
+
+delete all data fo borrowers and add record to deletedborrowers table
+C<&$member>this is the borrowernumber
+
+
+
+
+
+
+
+
+
+
+
+
END { } # module clean-up code here (global destructor)
Index: koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.12.2.9
retrieving revision 1.12.2.10
diff -u -b -r1.12.2.9 -r1.12.2.10
--- koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 9 Nov 2006
10:50:40 -0000 1.12.2.9
+++ koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 15 Nov 2006
15:47:07 -0000 1.12.2.10
@@ -81,7 +81,7 @@
<p><label>Last Name: </label><!-- TMPL_VAR NAME="surname" --></p>
<p><label>Othernames: </label><!-- TMPL_VAR NAME="othernames" --></p>
<p><label>Initials: </label><!-- TMPL_VAR NAME="initials" --></p>
- <p><label>Address: </label><!-- TMPL_VAR NAME="address" --></p>
+ <p><label>Address: </label><!-- TMPL_VAR NAME="streetnumber" -->
,<!--TMPL_IF NAME="roaddetails"> <!-- TMPL_VAR NAME="roaddetails" -->,<!--
/TMPL_IF --><!-- TMPL_VAR NAME="address" --></p>
<p><label>City: </label><!-- TMPL_VAR NAME="city" --></p>
<p><label>Zip Code: </label><!-- TMPL_VAR NAME="zipcode" --></p>
<!-- TMPL_UNLESS NAME="I"-->
Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.28.2.5
retrieving revision 1.28.2.6
diff -u -b -r1.28.2.5 -r1.28.2.6
--- members/moremember.pl 2 Nov 2006 14:11:05 -0000 1.28.2.5
+++ members/moremember.pl 15 Nov 2006 15:47:07 -0000 1.28.2.6
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: moremember.pl,v 1.28.2.5 2006/11/02 14:11:05 btoumi Exp $
+# $Id: moremember.pl,v 1.28.2.6 2006/11/15 15:47:07 btoumi Exp $
# script to do a borrower enquiry/bring up borrower details etc
# Displays all the details about a borrower
@@ -157,7 +157,7 @@
# current issues
#
my ($count,$issue)=borrissues($bornum);
-
+my $roaddetails=&GetRoadTypeDetails($data->{'streettype'});
my $today=ParseDate('today');
my @issuedata;
my $totalprice = 0;
@@ -234,6 +234,7 @@
};
$template->param($data);
$template->param(
+ roaddetails => $roaddetails,
bornum => $bornum,
reregistration =>$reregistration,
totalprice =>sprintf("%.2f",$totalprice),