#use warnings; FIXME - Bug 2505
use CGI;
use Text::CSV;
+use URI::Escape;
use C4::Reports::Guided;
-use C4::Auth;
+use C4::Auth qw/:DEFAULT get_session/;
use C4::Output;
use C4::Dates;
use C4::Debug;
debug => 1,
}
);
+my $session = $cookie ? get_session($cookie->value) : undef;
+
+my $filter;
+if ( $input->param("filter_set") ) {
+ $filter = {};
+ $filter->{$_} = $input->param("filter_$_") foreach qw/date author keyword/;
+ $session->param('report_filter', $filter) if $session;
+ $template->param( 'filter_set' => 1 );
+}
+elsif ($session) {
+ $filter = $session->param('report_filter');
+}
+
- my @errors = ();
+my @errors = ();
if ( !$phase ) {
$template->param( 'start' => 1 );
# show welcome page
elsif ( $phase eq 'Use saved' ) {
# use a saved report
# get list of reports and display them
- $template->param( 'saved1' => 1 );
- $template->param( 'savedreports' => get_saved_reports() );
+ $template->param(
+ 'saved1' => 1,
+ 'savedreports' => get_saved_reports($filter),
+ );
+ if ($filter) {
+ while ( my ($k, $v) = each %$filter ) {
+ $template->param( "filter_$k" => $v ) if $v;
+ }
+ }
}
elsif ( $phase eq 'Delete Saved') {
elsif ( $phase eq 'Show SQL'){
my $id = $input->param('reports');
- my $sql = get_sql($id);
+ my ($sql,$type,$reportname,$notes) = get_saved_report($id);
$template->param(
- 'sql' => $sql,
+ 'id' => $id,
+ 'reportname' => $reportname,
+ 'notes' => $notes,
+ 'sql' => $sql,
'showsql' => 1,
);
}
update_sql( $id, $sql, $reportname, $notes );
$template->param(
'save_successful' => 1,
+ 'reportname' => $reportname,
'id' => $id,
);
}
my $id = save_report( $borrowernumber, $sql, $name, $type, $notes );
$template->param(
'save_successful' => 1,
+ 'reportname' => $name,
'id' => $id,
);
}
for(my $i=0;$i<($#split/2);$i++) {
my ($text,$authorised_value) = split /\|/,$split[$i*2+1];
my $input;
- if ($authorised_value) {
+ if ($authorised_value eq "date") {
+ $input = 'date';
+ }
+ elsif ($authorised_value) {
my $dbh=C4::Context->dbh;
my @authorised_values;
my %authorised_lib;
my $totpages = int($total/$limit) + (($total % $limit) > 0 ? 1 : 0);
my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report&phase=Run%20this%20report";
+ if (@sql_params) {
+ $url = join('&sql_params=', $url, map { URI::Escape::uri_escape($_) } @sql_params);
+ }
$template->param(
'results' => \@rows,
'sql' => $sql,
+ 'id' => $report,
'execute' => 1,
'name' => $name,
'notes' => $notes,
}
elsif ($phase eq 'Export'){
- binmode STDOUT, ':utf8';
+ binmode STDOUT, ':encoding(UTF-8)';
# export results to tab separated text or CSV
my $sql = $input->param('sql'); # FIXME: use sql from saved report ID#, not new user-supplied SQL!
}
foreach (1..6) {
- $template->param('build' . $_) and $template->param(buildx => $_) and last;
+ $template->{VARS}->{'build' . $_} and $template->{VARS}->{'buildx' . $_} and last;
}
$template->param( 'referer' => $input->referer(),
'DHTMLcalendar_dateformat' => C4::Dates->DHTMLcalendar(),