[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha C4Members.pm koha-tmpl/intranet-tmpl/prog/...
|
From: |
Bruno Toumi |
|
Subject: |
[Koha-cvs] koha C4Members.pm koha-tmpl/intranet-tmpl/prog/... |
|
Date: |
Thu, 15 Jun 2006 14:05:24 +0000 |
CVSROOT: /sources/koha
Module name: koha
Changes by: Bruno Toumi <btoumi> 06/06/15 14:05:23
Modified files:
C4 : Members.pm
koha-tmpl/intranet-tmpl/prog/en/members: moremember.tmpl
members : memberentry.pl moremember.pl
Log message:
Members.pm:add a field in sql request (sub getborrowercategory) to
return category_type
memberentry.pl:modify call to getborrowercategory
moremember.tmpl:modify condition to display "add child" option (only
for adult)
moremember.pl:add condition,call to getborrowercategory , change
variable name
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&r1=1.25&r2=1.26
Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- C4/Members.pm 12 Jun 2006 15:12:11 -0000 1.26
+++ C4/Members.pm 15 Jun 2006 14:05:23 -0000 1.27
@@ -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.26 2006/06/12 15:12:11 btoumi Exp $
+# $Id: Members.pm,v 1.27 2006/06/15 14:05:23 btoumi Exp $
use strict;
require Exporter;
@@ -31,7 +31,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.26 $' =~ /\d+/g; shift(@v) . "." . join(
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.27 $' =~ /\d+/g; shift(@v) . "." . join(
"_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -1162,10 +1162,10 @@
=head2 getborrowercategory
- $description = &getborrowercategory($categorycode);
+ $description,$dateofbirthrequired,$upperagelimit,$category_type =
&getborrowercategory($categorycode);
Given the borrower's category code, the function returns the corresponding
-description for a comprehensive information display.
+description , dateofbirthrequired , upperagelimit and category type for a
comprehensive information display.
=cut
@@ -1174,11 +1174,11 @@
my $dbh = C4::Context->dbh;
my $sth =
$dbh->prepare(
- "SELECT description,dateofbirthrequired,upperagelimit FROM categories
WHERE categorycode = ?");
+ "SELECT description,dateofbirthrequired,upperagelimit,category_type
FROM categories WHERE categorycode = ?");
$sth->execute($catcode);
- my ($description,$dateofbirthrequired,$upperagelimit) = $sth->fetchrow();
+ my ($description,$dateofbirthrequired,$upperagelimit,$category_type) =
$sth->fetchrow();
$sth->finish();
- return ($description,$dateofbirthrequired,$upperagelimit);
+ return ($description,$dateofbirthrequired,$upperagelimit,$category_type);
} # sub getborrowercategory
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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 13 Jun 2006
15:25:17 -0000 1.11
+++ koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 15 Jun 2006
14:05:23 -0000 1.12
@@ -6,13 +6,11 @@
<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!--
TMPL_VAR NAME="cardnumber" -->)</h1>
<ul>
- <!-- TMPL_UNLESS name="guarantorborrowernumber" -->
+ <!-- TMPL_IF name="adultborrower" -->
<a href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=<!--
TMPL_VAR NAME="borrowernumber" -->&category_type=C">Add child</a>
- <!-- /TMPL_UNLESS -->
- <a
href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!--
TMPL_VAR NAME="bornum" -->&category_type=<!-- TMPL_VAR NAME="category_type"-->">
+ <!-- /TMPL_IF -->
- Edit this Record
- </a>
+ <a
href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!--
TMPL_VAR NAME="bornum" -->&category_type=<!-- TMPL_VAR
NAME="category_type"-->">Edit this Record</a>
<a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR
NAME=bornum -->">
Change Member's Password
</a>
Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- members/memberentry.pl 14 Jun 2006 15:59:38 -0000 1.33
+++ members/memberentry.pl 15 Jun 2006 14:05:23 -0000 1.34
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: memberentry.pl,v 1.33 2006/06/14 15:59:38 btoumi Exp $
+# $Id: memberentry.pl,v 1.34 2006/06/15 14:05:23 btoumi Exp $
# Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
#
@@ -114,7 +114,6 @@
($check_categorytype,undef)=getcategorytype($check_category);
}
-
#recover all data from guarantor address phone ,fax...
if ($category_type eq 'C' and $guarantorid ne '' ){
my $guarantordata=getguarantordata($guarantorid);
@@ -148,7 +147,7 @@
}
if ($categorycode ne 'I') {
my $age = get_age(format_date_in_iso($data{dateofbirth}));
- my
(undef,$agelimitmin,$agelimitmax)=getborrowercategory($data{'categorycode'});
+ my
(undef,$agelimitmin,$agelimitmax,undef)=getborrowercategory($data{'categorycode'});
if ($age > $agelimitmax
or $age < $agelimitmin
) {
@@ -284,7 +283,7 @@
-default=>$default_category,
-labels=>$labels);
#test in city
- $select_city=getidcity($data{'city'}) if ($guarantorid ne '');
+ $select_city=getidcity($data{'city'}) if ($guarantorid ne '0');
($default_city=$select_city) if ($step eq 0);
if ($select_city eq '' ){
my $selectcity=&getidcity($data{'city'});
Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- members/moremember.pl 12 Jun 2006 13:40:08 -0000 1.25
+++ members/moremember.pl 15 Jun 2006 14:05:23 -0000 1.26
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: moremember.pl,v 1.25 2006/06/12 13:40:08 btoumi Exp $
+# $Id: moremember.pl,v 1.26 2006/06/15 14:05:23 btoumi Exp $
# script to do a borrower enquiry/bring up borrower details etc
# Displays all the details about a borrower
@@ -70,13 +70,11 @@
});
my $bornum=$input->param('bornum');
-
#start the page and read in includes
-
my $data=borrdata('',$bornum);
+my
(undef,undef,undef,$category_type)=getborrowercategory($data->{'categorycode'});
$template->param($data->{'categorycode'} => 1); # in template <TMPL_IF
name="I"> => instutitional (A for Adult & C for children)
-
$data->{'dateenrolled'} = format_date($data->{'dateenrolled'});
$data->{'dateexpiry'} = format_date($data->{'dateexpiry'});
$data->{'dateofbirth'} = format_date($data->{'dateofbirth'});
@@ -90,7 +88,7 @@
$data->{&expand_sex_into_predicate($data->{'sex'})} = 1;
-if ($data->{'categorycode'} eq 'C'){
+if ($category_type eq 'C' and $data->{'guarantorid'} ne '0' ){
my $data2=borrdata('',$data->{'guarantorid'});
$data->{'address'}=$data2->{'address'};
$data->{'city'}=$data2->{'city'};
@@ -101,12 +99,10 @@
$data->{'zipcode'} = $data2->{'zipcode'};
}
-
if ($data->{'ethnicity'} || $data->{'ethnotes'}) {
$template->param(printethnicityline => 1);
}
-
-if ($data->{'category_type'} ne 'C'){
+if ($category_type ne 'C'){
$template->param(isguarantee => 1);
# FIXME
# It looks like the $i is only being returned to handle walking through
@@ -118,9 +114,10 @@
push (@guaranteedata, {borrowernumber =>
$guarantees->[$i]->{'borrowernumber'},
cardnumber =>
$guarantees->[$i]->{'cardnumber'},
name =>
$guarantees->[$i]->{'firstname'} . " " . $guarantees->[$i]->{'surname'}});
+ warn"le type de categorie ".$category_type."voila ";
}
$template->param(guaranteeloop => address@hidden);
-
+ ($template->param(adultborrower=>1)) if ($category_type eq 'A');
} else {
my ($guarantorid)=findguarantor($data->{guarantorid});
if ($guarantorid->{'borrowernumber'}){