X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fcategorie.pl;h=315076c6975e6b7510a54d766ef15851e3e976f1;hb=76f405c9cf7cf6eb6a1f15a9bca46dcd10b28261;hp=b491fde00fbff9fce19aa0caac03ebf8f7609968;hpb=73953baf99c55abc44ff1a0493fbb787845d6f8d;p=koha.git diff --git a/admin/categorie.pl b/admin/categorie.pl index b491fde00f..315076c697 100755 --- a/admin/categorie.pl +++ b/admin/categorie.pl @@ -39,19 +39,16 @@ use strict; use CGI; use C4::Context; -use C4::Output; -use C4::Search; -use HTML::Template; use C4::Auth; -use C4::Interface::CGI::Output; +use C4::Output; sub StringSearch { - my ($env,$searchstring,$type)=@_; + my ($searchstring,$type)=@_; my $dbh = C4::Context->dbh; $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,categorycode"); $sth->execute("$data[0]%"); my @results; while (my $data=$sth->fetchrow_hashref){ @@ -69,7 +66,7 @@ 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, @@ -92,29 +89,42 @@ 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'} => 1, + ); # 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 $is_a_modif = $input->param("is_a_modif"); 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')); - $sth->finish; + if ($is_a_modif) { + my $sth=$dbh->prepare("UPDATE categories SET description=?,enrolmentperiod=?,upperagelimit=?,dateofbirthrequired=?,enrolmentfee=?,reservefee=?,overduenoticerequired=?,category_type=? WHERE categorycode=?"); + $sth->execute(map { $input->param($_) } ('description','enrolmentperiod','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','overduenoticerequired','category_type','categorycode')); + $sth->finish; + } else { + my $sth=$dbh->prepare("INSERT INTO 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"; + exit; + # END $OP eq ADD_VALIDATE ################## DELETE_CONFIRM ################################## # called by default form, used to confirm deletion of data in DB @@ -128,7 +138,7 @@ if ($op eq 'add_form') { $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 +150,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,42 +166,41 @@ 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"; + 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 ($count,$results)=StringSearch($searchfield,'web'); 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'}, - toggle => $toggle ); - push @loop, \%row; - if ( $toggle eq 'white' ) - { - $toggle = '#ffffcc'; - } - else - { - $toggle = 'white'; - } + reservefee => sprintf("%.2f",$results->[$i]{'reservefee'}), + category_type => $results->[$i]{'category_type'}, + "type_".$results->[$i]{'category_type'} => 1); + if (C4::Context->preference('EnhancedMessagingPreferences')) { + my $brief_prefs = _get_brief_messaging_prefs($results->[$i]{'categorycode'}); + $row{messaging_prefs} = $brief_prefs if @$brief_prefs; + } + + push @loop, \%row; } $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 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); @@ -199,8 +208,25 @@ if ($op eq 'add_form') { } #---- END $OP eq DEFAULT - - - output_html_with_http_headers $input, $cookie, $template->output; +exit 0; + +sub _get_brief_messaging_prefs { + my $categorycode = shift; + my $messaging_options = C4::Members::Messaging::GetMessagingOptions(); + my $results = []; + PREF: foreach my $option ( @$messaging_options ) { + my $pref = C4::Members::Messaging::GetMessagingPreferences( { categorycode => $categorycode, + message_name => $option->{'message_name'} } ); + next unless $pref->{'transports'}; + my $brief_pref = { message_attribute_id => $option->{'message_attribute_id'}, + message_name => $option->{'message_name'}, + }; + foreach my $transport ( @{$pref->{'transports'}} ) { + push @{ $brief_pref->{'transports'} }, { transport => $transport }; + } + push @$results, $brief_pref; + } + return $results; +}