[Koha-cvs] koha C4Members.pm koha-tmpl/intranet-tmpl/prog/...

[Bruno Toumi]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     Bruno Toumi <btoumi>    06/06/12 13:00:40

Modified files:
        C4             : Members.pm 
        koha-tmpl/intranet-tmpl/prog/en/members: memberentryC.tmpl 
                                                 memberentryP.tmpl 
        members        : memberentry.pl moremember.pl 

Log message:
        Members.pm: modify getborrowercategory function  to return 
dateofbirthrequired and upperagelimit
        memberentryC and P  : add error message ERROR_age_limitations
        memberentry.pl : replace sql request  by function getborrowercategory 
for return upperagelimit and dateofbirthrequired
        moremember.pl: modify call to function getborrowercategory

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&r1=1.23&r2=1.24

Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- C4/Members.pm       7 Jun 2006 14:55:36 -0000       1.24
+++ C4/Members.pm       12 Jun 2006 13:00:40 -0000      1.25
@@ -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.24 2006/06/07 14:55:36 btoumi Exp $
+# $Id: Members.pm,v 1.25 2006/06/12 13:00:40 btoumi Exp $
 
 use strict;
 require Exporter;
@@ -31,7 +31,7 @@
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
-$VERSION = do { my @v = '$Revision: 1.24 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.25 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -1174,13 +1174,15 @@
     my $dbh       = C4::Context->dbh;
     my $sth       =
       $dbh->prepare(
-        "SELECT description FROM categories WHERE categorycode = ?");
+        "SELECT description,dateofbirthrequired,upperagelimit FROM categories 
WHERE categorycode = ?");
     $sth->execute($catcode);
-    my $description = $sth->fetchrow();
+    my ($description,$dateofbirthrequired,$upperagelimit) = $sth->fetchrow();
     $sth->finish();
-    return $description;
+    return ($description,$dateofbirthrequired,$upperagelimit);
 }    # sub getborrowercategory
 
+
+
 =head2 ethnicitycategories
 
   ($codes_arrayref, $labels_hashref) = &ethnicitycategories();
@@ -1305,4 +1307,7 @@
     $sth->finish();
 
 }    # sub add_member_orgs
+
+END { }       # module clean-up code here (global destructor)
+
 1;

Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl   9 Jun 2006 
11:34:39 -0000       1.5
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl   12 Jun 2006 
13:00:40 -0000      1.6
@@ -38,6 +38,9 @@
                        <!-- TMPL_IF NAME="ERROR_login_exist" -->
                                <p>login/password already exist</p>
                        <!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="ERROR_age_limitations" -->
+                                Member is too young or too old for this 
category
+                        <!-- /TMPL_IF -->
                </div>
        <!-- /TMPL_IF -->
 

Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl   9 Jun 2006 
11:34:39 -0000       1.5
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl   12 Jun 2006 
13:00:40 -0000      1.6
@@ -38,6 +38,9 @@
                        <!-- TMPL_IF NAME="ERROR_login_exist" -->
                                <p>login/password already exist</p>
                        <!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="ERROR_age_limitations" -->
+                                Member is too young or too old for this 
category
+                        <!-- /TMPL_IF -->
                </div>
        <!-- /TMPL_IF -->
 

Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- members/memberentry.pl      9 Jun 2006 15:10:39 -0000       1.28
+++ members/memberentry.pl      12 Jun 2006 13:00:40 -0000      1.29
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: memberentry.pl,v 1.28 2006/06/09 15:10:39 btoumi Exp $
+# $Id: memberentry.pl,v 1.29 2006/06/12 13:00:40 btoumi Exp $
 
 # Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
@@ -148,20 +148,10 @@
                        }
                     }
                 if ($categorycode ne 'I') {
-                    # is the age of the borrower compatible with age 
limitations of
-                    # the borrower category
-                    my $query = '
-SELECT upperagelimit,
-       dateofbirthrequired
-  FROM categories
-  WHERE categorycode = ?
-';
-                    my $sth=$dbh->prepare($query);
-                    $sth->execute($categorycode);
-                    my $category_info = $sth->fetchrow_hashref;
                     my $age = get_age(format_date_in_iso($data{dateofbirth}));
-                    if ($age > $category_info->{upperagelimit}
-                            or $age < $category_info->{dateofbirthrequired}
+                my 
(undef,$agelimitmin,$agelimitmax)=getborrowercategory($data{'categorycode'});   
+               if ($age > $agelimitmax
+                            or $age < $agelimitmin
                         ) {
                         push @errors, 'ERROR_age_limitations';
                         $nok = 1;

Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- members/moremember.pl       18 Apr 2006 10:32:24 -0000      1.23
+++ members/moremember.pl       12 Jun 2006 13:00:40 -0000      1.24
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: moremember.pl,v 1.23 2006/04/18 10:32:24 plg Exp $
+# $Id: moremember.pl,v 1.24 2006/06/12 13:00:40 btoumi Exp $
 
 # script to do a borrower enquiry/bring up borrower details etc
 # Displays all the details about a borrower
@@ -147,7 +147,7 @@
 $data->{'branchname'} = &getbranchdetail($data->{'branchcode'});
 
 # Converts the categorycode to the description
-$data->{'categorycode'} = &getborrowercategory($data->{'categorycode'});
+($data->{'categorycode'},undef,undef) = 
&getborrowercategory($data->{'categorycode'});
 
 my ($numaccts,$accts,$total)=getboracctrecord('',\%bor);