X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fcategorie.pl;h=b33dcc00f2daf1510b1260637dfb7ff862f5ede6;hb=cc9524a875d8b032a40fa943de3973d4c93854bf;hp=6bffa9da1a90e74be1c1d9624cc807167745f975;hpb=7457de546a44fbdf8cc62e92e0aeaef2ec0a9975;p=koha.git

diff --git a/admin/categorie.pl b/admin/categorie.pl
index 6bffa9da1a..b33dcc00f2 100755
--- a/admin/categorie.pl
+++ b/admin/categorie.pl
@@ -51,7 +51,7 @@ sub StringSearch  {
 	$searchstring=~ s/\'/\\\'/g;
 	my @data=split(' ',$searchstring);
 	my $count=@data;
-	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){
@@ -69,11 +69,11 @@ my $categorycode=$input->param('categorycode');
 my $op = $input->param('op');
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "parameters/categorie.tmpl",
+    = get_template_and_user({template_name => "admin/categorie.tmpl",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
+			     flagsrequired => {parameters => 1, management => 1},
 			     debug => 1,
 			     });
 
@@ -92,29 +92,35 @@ if ($op eq 'add_form') {
 	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'},
+				enrolmentfee            => sprintf("%.2f",$data->{'enrolmentfee'}),
 				overduenoticerequired   => $data->{'overduenoticerequired'},
 				issuelimit              => $data->{'issuelimit'},
-				reservefee              => $data->{'reservefee'});
+				reservefee              => sprintf("%.2f",$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,issuelimit,reservefee,overduenoticerequired) values (?,?,?,?,?,?,?,?,?)");
-	$sth->execute(map { $input->param($_) } ('categorycode','description','enrolmentperiod','upperagelimit','dateofbirthrequired','enrolmentfee','issuelimit','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
@@ -122,13 +128,13 @@ if ($op eq 'add_form') {
 	$template->param(delete_confirm => 1);
 
 	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select count(*) as total from categoryitem where categorycode=?");
+	my $sth=$dbh->prepare("select count(*) as total from borrowers where categorycode=?");
 	$sth->execute($categorycode);
 	my $total = $sth->fetchrow_hashref;
 	$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;
@@ -140,12 +146,12 @@ if ($op eq 'add_form') {
                                 enrolmentperiod         => $data->{'enrolmentperiod'},
                                 upperagelimit           => $data->{'upperagelimit'},
                                 dateofbirthrequired     => $data->{'dateofbirthrequired'},
-                                enrolmentfee            => $data->{'enrolmentfee'},
+                                enrolmentfee            =>  sprintf("%.2f",$data->{'enrolmentfee'}),
                                 overduenoticerequired   => $data->{'overduenoticerequired'},
                                 issuelimit              => $data->{'issuelimit'},
-                                reservefee              => $data->{'reservefee'});
-
-
+                                reservefee              =>  sprintf("%.2f",$data->{'reservefee'}),
+                                category_type           => $data->{'category_type'}
+                                );
 													# END $OP eq DELETE_CONFIRM
 ################## DELETE_CONFIRMED ##################################
 # called by delete_confirm, used to effectively confirm deletion of data in DB
@@ -156,41 +162,58 @@ if ($op eq 'add_form') {
 	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);
 	my $env;
 	my @loop;
 	my ($count,$results)=StringSearch($env,$searchfield,'web');
-	my $toggle = 'white';
+	my $toggle = 0;
 	for (my $i=0; $i < $count; $i++){
 		my %row = (categorycode => $results->[$i]{'categorycode'},
 				description => $results->[$i]{'description'},
 				enrolmentperiod => $results->[$i]{'enrolmentperiod'},
 				upperagelimit => $results->[$i]{'upperagelimit'},
 				dateofbirthrequired => $results->[$i]{'dateofbirthrequired'},
-				enrolmentfee => $results->[$i]{'enrolmentfee'},
+				enrolmentfee => sprintf("%.2f",$results->[$i]{'enrolmentfee'}),
 				overduenoticerequired => $results->[$i]{'overduenoticerequired'},
 				issuelimit => $results->[$i]{'issuelimit'},
-				reservefee => $results->[$i]{'reservefee'},
+				reservefee => sprintf("%.2f",$results->[$i]{'reservefee'}),
+				category_type => $results->[$i]{'category_type'},
 				toggle => $toggle );	
 		push @loop, \%row;
-		if ( $toggle eq 'white' )
+		if ( $toggle eq 0 )
 		{
-			$toggle = '#ffffcc';
+			$toggle = 1;
 		}
 		else
 		{
-			$toggle = 'white';
+			$toggle = 0;
 		}
 	}
 	$template->param(loop => \@loop);
-
+	# check that I (institution) and C (child) exists. otherwise => warning to the user
+	my $dbh = C4::Context->dbh;
+	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 category_type from categories where category_type='I'");
+	$sth->execute;
+	my ($categoryInstitution) = $sth->fetchrow;
+	$template->param(categoryInstitution => $categoryInstitution);
+	$sth->finish;
 
 
 } #---- END $OP eq DEFAULT
 
 
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+		IntranetNav => C4::Context->preference("IntranetNav"),
+		);
 output_html_with_http_headers $input, $cookie, $template->output;