[Koha-cvs] koha/admin categorie.pl

[paul poulain]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         
Changes by:     paul poulain <address@hidden>   06/04/14 09:31:24

Modified files:
        admin          : categorie.pl 

Log message:
        improvements from SAN Ouest Provence :
        * introducing a category_type into categories. It can be A (adult), C 
(children), P (Professionnal), I (institution/organisation).
        * each category_type has it's own forms to create members.
        * the borrowers table has been heavily modified (many fields changed), 
to get something more logic & readable
        * reintroducing guarantor/guanrantee system that is now independant 
from hardcoded C/A for categories
        * updating templates to fit template rules
        
        (see mail feb, 17 on koha-devel "new features for borrowers" for more 
details)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/admin/categorie.pl.diff?tr1=1.19&tr2=1.20&r1=text&r2=text

Patches:
Index: koha/admin/categorie.pl
diff -u koha/admin/categorie.pl:1.19 koha/admin/categorie.pl:1.20
--- koha/admin/categorie.pl:1.19        Fri Feb 24 11:15:01 2006
+++ koha/admin/categorie.pl     Fri Apr 14 09:31:24 2006
@@ -51,7 +51,7 @@
        $searchstring=~ s/\'/\\\'/g;
        my @data=split(' ',$searchstring);
        my address@hidden;
-       my $sth=$dbh->prepare("Select * from categories where (description like 
?)");
+       my $sth=$dbh->prepare("Select * from categories where (description like 
?) order by category_type,description");
        $sth->execute("$data[0]%");
        my @results;
        while (my $data=$sth->fetchrow_hashref){
@@ -92,29 +92,35 @@
        my $data;
        if ($categorycode) {
                my $dbh = C4::Context->dbh;
-               my $sth=$dbh->prepare("select 
categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired
 from categories where categorycode=?");
+               my $sth=$dbh->prepare("select 
categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired,category_type
 from categories where categorycode=?");
                $sth->execute($categorycode);
                $data=$sth->fetchrow_hashref;
                $sth->finish;
        }
 
-       $template->param(description             => $data->{'description'},
+       $template->param(description        => $data->{'description'},
                                enrolmentperiod         => 
$data->{'enrolmentperiod'},
                                upperagelimit           => 
$data->{'upperagelimit'},
                                dateofbirthrequired     => 
$data->{'dateofbirthrequired'},
                                enrolmentfee            => 
$data->{'enrolmentfee'},
                                overduenoticerequired   => 
$data->{'overduenoticerequired'},
                                issuelimit              => 
$data->{'issuelimit'},
-                               reservefee              => 
$data->{'reservefee'});
+                               reservefee              => 
$data->{'reservefee'},
+                               category_type           => 
$data->{'category_type'},
+                               "type_".$data->{'category_type'} => " SELECTED 
",
+                               );
                                                                                
                        # END $OP eq ADD_FORM
 ################## ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
 } elsif ($op eq 'add_validate') {
        $template->param(add_validate => 1);
        my $dbh = C4::Context->dbh;
-       my $sth=$dbh->prepare("replace categories 
(categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,overduenoticerequired)
 values (?,?,?,?,?,?,?,?)");
-       $sth->execute(map { $input->param($_) } 
('categorycode','description','enrolmentperiod','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','overduenoticerequired'));
+       my $sth=$dbh->prepare("replace categories 
(categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,overduenoticerequired,category_type)
 values (?,?,?,?,?,?,?,?,?)");
+       $sth->execute(map { $input->param($_) } 
('categorycode','description','enrolmentperiod','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','overduenoticerequired','category_type'));
        $sth->finish;
+       print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; 
URL=categorie.pl\"></html>";
+       exit;
+
                                                                                
                        # END $OP eq ADD_VALIDATE
 ################## DELETE_CONFIRM ##################################
 # called by default form, used to confirm deletion of data in DB
@@ -128,7 +134,7 @@
        $sth->finish;
        $template->param(total => $total->{'total'});
        
-       my $sth2=$dbh->prepare("select 
categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired
 from categories where categorycode=?");
+       my $sth2=$dbh->prepare("select 
categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired,category_type
 from categories where categorycode=?");
        $sth2->execute($categorycode);
        my $data=$sth2->fetchrow_hashref;
        $sth2->finish;
@@ -143,9 +149,9 @@
                                 enrolmentfee            => 
$data->{'enrolmentfee'},
                                 overduenoticerequired   => 
$data->{'overduenoticerequired'},
                                 issuelimit              => 
$data->{'issuelimit'},
-                                reservefee              => 
$data->{'reservefee'});
-
-
+                                reservefee              => 
$data->{'reservefee'},
+                                category_code           => 
$data->{'category_code'}
+                                );
                                                                                
                        # END $OP eq DELETE_CONFIRM
 ################## DELETE_CONFIRMED ##################################
 # called by delete_confirm, used to effectively confirm deletion of data in DB
@@ -156,6 +162,9 @@
        my $sth=$dbh->prepare("delete from categories where categorycode=?");
        $sth->execute($categorycode);
        $sth->finish;
+       print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; 
URL=categorie.pl\"></html>";
+       exit;
+
                                                                                
                        # END $OP eq DELETE_CONFIRMED
 } else { # DEFAULT
        $template->param(else => 1);
@@ -173,6 +182,7 @@
                                overduenoticerequired => 
$results->[$i]{'overduenoticerequired'},
                                issuelimit => $results->[$i]{'issuelimit'},
                                reservefee => $results->[$i]{'reservefee'},
+                               category_type => 
$results->[$i]{'category_type'},
                                toggle => $toggle );    
                push @loop, \%row;
                if ( $toggle eq 0 )
@@ -187,11 +197,11 @@
        $template->param(loop => address@hidden);
        # check that I (institution) and C (child) exists. otherwise => warning 
to the user
        my $dbh = C4::Context->dbh;
-       my $sth=$dbh->prepare("select categorycode from categories where 
categorycode='C'");
+       my $sth=$dbh->prepare("select category_type from categories where 
category_type='C'");
        $sth->execute;
        my ($categoryChild) = $sth->fetchrow;
        $template->param(categoryChild => $categoryChild);
-       $sth=$dbh->prepare("select categorycode from categories where 
categorycode='I'");
+       $sth=$dbh->prepare("select category_type from categories where 
category_type='I'");
        $sth->execute;
        my ($categoryInstitution) = $sth->fetchrow;
        $template->param(categoryInstitution => $categoryInstitution);