# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
+#use warnings; FIXME - Bug 2505
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;
+use C4::Dates;
+use C4::Form::MessagingPreferences;
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 ?) order by category_type,description");
+ 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){
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {parameters => 1, management => 1},
+ flagsrequired => {parameters => 1},
debug => 1,
});
my $data;
if ($categorycode) {
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired,category_type from categories where categorycode=?");
+ my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired,category_type from categories where categorycode=?");
$sth->execute($categorycode);
$data=$sth->fetchrow_hashref;
$sth->finish;
}
+ $data->{'enrolmentperioddate'} = undef if ($data->{'enrolmentperioddate'} eq '0000-00-00');
+
$template->param(description => $data->{'description'},
enrolmentperiod => $data->{'enrolmentperiod'},
+ enrolmentperioddate => C4::Dates::format_date($data->{'enrolmentperioddate'}),
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 ",
+ DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+ "type_".$data->{'category_type'} => 1,
);
+ if (C4::Context->preference('EnhancedMessagingPreferences')) {
+ C4::Form::MessagingPreferences::set_form_values({ categorycode => $categorycode } , $template);
+ }
# 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,reservefee,overduenoticerequired,category_type) values (?,?,?,?,?,?,?,?,?)");
- $sth->execute(map { $input->param($_) } ('categorycode','description','enrolmentperiod','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','overduenoticerequired','category_type'));
- $sth->finish;
+ if($input->param('enrolmentperioddate')){
+ $input->param('enrolmentperioddate' => C4::Dates::format_date_in_iso($input->param('enrolmentperioddate')) );
+ }
+
+ if ($is_a_modif) {
+ my $sth=$dbh->prepare("UPDATE categories SET description=?,enrolmentperiod=?, enrolmentperioddate=?,upperagelimit=?,dateofbirthrequired=?,enrolmentfee=?,reservefee=?,overduenoticerequired=?,category_type=? WHERE categorycode=?");
+ $sth->execute(map { $input->param($_) } ('description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','overduenoticerequired','category_type','categorycode'));
+ $sth->finish;
+ } else {
+ my $sth=$dbh->prepare("INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,overduenoticerequired,category_type) values (?,?,?,?,?,?,?,?,?,?)");
+ $sth->execute(map { $input->param($_) } ('categorycode','description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','overduenoticerequired','category_type'));
+ $sth->finish;
+ }
+ if (C4::Context->preference('EnhancedMessagingPreferences')) {
+ C4::Form::MessagingPreferences::handle_form_action($input,
+ { categorycode => $input->param('categorycode') }, $template);
+ }
print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=categorie.pl\"></html>";
exit;
$sth->finish;
$template->param(total => $total->{'total'});
- my $sth2=$dbh->prepare("select categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired,category_type from categories where categorycode=?");
+ my $sth2=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired,category_type from categories where categorycode=?");
$sth2->execute($categorycode);
my $data=$sth2->fetchrow_hashref;
$sth2->finish;
$template->param(totalgtzero => 1);
}
- $template->param(description => $data->{'description'},
+ $template->param( description => $data->{'description'},
enrolmentperiod => $data->{'enrolmentperiod'},
+ enrolmentperioddate => C4::Dates::format_date($data->{'enrolmentperioddate'}),
upperagelimit => $data->{'upperagelimit'},
dateofbirthrequired => $data->{'dateofbirthrequired'},
- enrolmentfee => $data->{'enrolmentfee'},
+ enrolmentfee => sprintf("%.2f",$data->{'enrolmentfee'}),
overduenoticerequired => $data->{'overduenoticerequired'},
issuelimit => $data->{'issuelimit'},
- reservefee => $data->{'reservefee'},
- category_type => $data->{'category_type'}
+ reservefee => sprintf("%.2f",$data->{'reservefee'}),
+ category_type => $data->{'category_type'},
);
# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
# END $OP eq DELETE_CONFIRMED
} else { # DEFAULT
$template->param(else => 1);
- my $env;
my @loop;
- my ($count,$results)=StringSearch($env,$searchfield,'web');
- my $toggle = 0;
+ 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'},
- overduenoticerequired => $results->[$i]{'overduenoticerequired'},
- issuelimit => $results->[$i]{'issuelimit'},
- reservefee => $results->[$i]{'reservefee'},
- category_type => $results->[$i]{'category_type'},
- toggle => $toggle );
+ my %row = (
+ categorycode => $results->[$i]{'categorycode'},
+ description => $results->[$i]{'description'},
+ enrolmentperiod => $results->[$i]{'enrolmentperiod'},
+ enrolmentperioddate => C4::Dates::format_date($results->[$i]{'enrolmentperioddate'}),
+ upperagelimit => $results->[$i]{'upperagelimit'},
+ dateofbirthrequired => $results->[$i]{'dateofbirthrequired'},
+ enrolmentfee => sprintf("%.2f",$results->[$i]{'enrolmentfee'}),
+ overduenoticerequired => $results->[$i]{'overduenoticerequired'},
+ issuelimit => $results->[$i]{'issuelimit'},
+ 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;
- if ( $toggle eq 0 )
- {
- $toggle = 1;
- }
- else
- {
- $toggle = 0;
- }
}
$template->param(loop => \@loop);
# check that I (institution) and C (child) exists. otherwise => warning to the user
} #---- 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;
+}