use C4::Reports::Guided;
use C4::Auth qw/:DEFAULT get_session/;
use C4::Output;
-use C4::Dates qw/format_date/;
use C4::Debug;
use C4::Branch; # XXX subfield_is_koha_internal_p
-use C4::Koha qw/IsAuthorisedValueCategory GetFrameworksLoop/;
+use C4::Koha qw/GetFrameworksLoop/;
+use C4::Context;
+use C4::Log;
+use Koha::DateUtils qw/dt_from_string output_pref/;
+use Koha::AuthorisedValue;
+use Koha::AuthorisedValues;
=head1 NAME
my $input = new CGI;
my $usecache = C4::Context->ismemcached;
-my $phase = $input->param('phase');
+my $phase = $input->param('phase') // '';
my $flagsrequired;
if ( $phase eq 'Build new' or $phase eq 'Delete Saved' ) {
$flagsrequired = 'create_reports';
$session->param('report_filter', $filter) if $session;
$template->param( 'filter_set' => 1 );
}
-elsif ($session) {
+elsif ($session and not $input->param('clear_filters')) {
$filter = $session->param('report_filter');
}
subgroup => $subgroup,
notes => $notes,
public => $public,
+ cache_expiry => $cache_expiry,
} );
$template->param(
'save_successful' => 1,
'reportname' => $reportname,
'id' => $id,
);
+ logaction( "REPORTS", "MODIFY", $id, "$reportname | $sql" ) if C4::Context->preference("ReportsLog");
}
if ( $usecache ) {
$template->param(
my $tovalue = $input->param( "to_" . $crit . "_value" );
# If the range values are dates
- if ($fromvalue =~ C4::Dates->regexp('syspref') && $tovalue =~ C4::Dates->regexp('syspref')) {
- $fromvalue = C4::Dates->new($fromvalue)->output("iso");
- $tovalue = C4::Dates->new($tovalue)->output("iso");
+ my $fromvalue_dt;
+ $fromvalue_dt = eval { dt_from_string( $fromvalue ); } if ( $fromvalue );
+ my $tovalue_dt;
+ $tovalue_dt = eval { dt_from_string( $tovalue ); } if ($tovalue);
+ if ( $fromvalue_dt && $tovalue_dt ) {
+ $fromvalue = output_pref( { dt => dt_from_string( $fromvalue_dt ), dateonly => 1, dateformat => 'iso' } );
+ $tovalue = output_pref( { dt => dt_from_string( $tovalue_dt ), dateonly => 1, dateformat => 'iso' } );
}
if ($fromvalue && $tovalue) {
} else {
# If value is a date
- if ($value =~ C4::Dates->regexp('syspref')) {
- $value = C4::Dates->new($value)->output("iso");
+ my $value_dt;
+ $value_dt = eval { dt_from_string( $value ); } if ( $value );
+ if ( $value_dt ) {
+ $value = output_pref( { dt => dt_from_string( $value_dt ), dateonly => 1, dateformat => 'iso' } );
}
# don't escape runtime parameters, they'll be at runtime
if ($value =~ /<<.*>>/) {
cache_expiry => $cache_expiry,
public => $public,
} );
+ logaction( "REPORTS", "ADD", $id, "$name | $sql" ) if C4::Context->preference("ReportsLog");
$template->param(
'save_successful' => 1,
'reportname' => $name,
#---- "true" authorised value
}
else {
- if ( IsAuthorisedValueCategory($authorised_value) ) {
+ if ( Koha::AuthorisedValues->search({ category => $authorised_value })->count ) {
my $query = '
SELECT authorised_value,lib
FROM authorised_values
my @split = split /<<|>>/,$sql;
my @tmpl_parameters;
for(my $i=0;$i<$#split/2;$i++) {
- my $quoted = C4::Context->dbh->quote($sql_params[$i]);
+ my $quoted = $sql_params[$i];
# if there are special regexp chars, we must \ them
$split[$i*2+1] =~ s/(\||\?|\.|\*|\(|\)|\%)/\\$1/g;
+ if ($split[$i*2+1] =~ /\|\s*date\s*$/) {
+ $quoted = output_pref({ dt => dt_from_string($quoted), dateformat => 'iso', dateonly => 1 }) if $quoted;
+ }
+ $quoted = C4::Context->dbh->quote($quoted);
$sql =~ s/<<$split[$i*2+1]>>/$quoted/;
}
my ($sth, $errors) = execute_query($sql, $offset, $limit);
unless ($sth) {
die "execute_query failed to return sth for report $report_id: $sql";
} else {
- my $headers= header_cell_loop($sth);
+ my $headers = header_cell_loop($sth);
$template->param(header_row => $headers);
while (my $row = $sth->fetchrow_arrayref()) {
my @cells = map { +{ cell => $_ } } @$row;
if ($format eq 'tab') {
$type = 'application/octet-stream';
$content .= join("\t", header_cell_values($sth)) . "\n";
+ $content = Encode::decode('UTF-8', $content);
while (my $row = $sth->fetchrow_arrayref()) {
$content .= join("\t", @$row) . "\n";
}
my $delimiter = C4::Context->preference('delimiter') || ',';
if ( $format eq 'csv' ) {
$type = 'application/csv';
- my $csv = Text::CSV::Encoded->new({ encoding_out => 'utf8', sep_char => $delimiter});
+ my $csv = Text::CSV::Encoded->new({ encoding_out => 'UTF-8', sep_char => $delimiter});
$csv or die "Text::CSV::Encoded->new({binary => 1}) FAILED: " . Text::CSV::Encoded->error_diag();
if ($csv->combine(header_cell_values($sth))) {
- $content .= $csv->string(). "\n";
+ $content .= Encode::decode('UTF-8', $csv->string()) . "\n";
} else {
push @$q_errors, { combine => 'HEADER ROW: ' . $csv->error_diag() } ;
}
# pass $sth, get back a TMPL_LOOP-able set of names for the column headers
sub header_cell_loop {
- my @headers = map { +{ cell => $_ } } header_cell_values (shift);
+ my @headers = map { +{ cell => decode('UTF-8',$_) } } header_cell_values (shift);
return \@headers;
}
foreach (1..6) {
- $template->{VARS}->{'build' . $_} and $template->{VARS}->{'buildx' . $_} and last;
+ $template->{VARS}->{'build' . $_} and last;
}
$template->param( 'referer' => $input->referer(),
);
my $report_groups = C4::Reports::Guided::get_report_groups;
if (not exists $report_groups->{$group}) {
my $groupdesc = $input->param('groupdesc') // $group;
- C4::Koha::AddAuthorisedValue('REPORT_GROUP', $group, $groupdesc);
+ Koha::AuthorisedValue->new({
+ category => 'REPORT_GROUP',
+ authorised_value => $group,
+ lib => $groupdesc,
+ })->store;
}
if (defined $subgroup and $subgroup ne '') {
if (not exists $report_groups->{$group}->{subgroups}->{$subgroup}) {
my $subgroupdesc = $input->param('subgroupdesc') // $subgroup;
- C4::Koha::AddAuthorisedValue('REPORT_SUBGROUP', $subgroup, $subgroupdesc, $group);
+ Koha::AuthorisedValue->new({
+ category => 'REPORT_SUBGROUP',
+ authorised_value => $subgroup,
+ lib => $subgroupdesc,
+ lib_opac => $group,
+ })->store;
}
}
}