@@ -, +, @@ report parameter entry --- .../en/modules/reports/guided_reports_start.tt | 16 +++++++++++----- reports/guided_reports.pl | 8 ++++++-- 2 files changed, 17 insertions(+), 7 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -501,16 +501,22 @@ canned reports and writing custom SQL reports.

Enter parameters for report [% name %]:

[% IF ( notes ) %]

[% notes %]

[% END %] +
+
    [% FOREACH sql_param IN sql_params %] [% IF sql_param.input == 'date' %] -

    - [% sql_param.entry %]: -

    +
  1. + +
  2. + [% ELSIF ( sql_param.input == 'text' ) %] +
  3. [% ELSE %] -

    [% sql_param.entry %]: [% sql_param.input %]

    +
  4. [% sql_param.input %]
  5. [% END %] [% END %] - +
+
+
[% END %] --- a/reports/guided_reports.pl +++ a/reports/guided_reports.pl @@ -508,6 +508,7 @@ elsif ($phase eq 'Run this report'){ for(my $i=0;$i<($#split/2);$i++) { my ($text,$authorised_value) = split /\|/,$split[$i*2+1]; my $input; + my $labelid; if ($authorised_value eq "date") { $input = 'date'; } @@ -563,8 +564,11 @@ elsif ($phase eq 'Run this report'){ $authorised_lib{$value} = $lib; } } + $labelid = $text; + $labelid =~ s/\W//g; $input =CGI::scrolling_list( # FIXME: factor out scrolling_list -name => "sql_params", + -id => "sql_params_".$labelid, -values => \@authorised_values, # -default => $value, -labels => \%authorised_lib, @@ -575,9 +579,9 @@ elsif ($phase eq 'Run this report'){ ); } else { - $input = ""; + $input = "text"; } - push @tmpl_parameters, {'entry' => $text, 'input' => $input }; + push @tmpl_parameters, {'entry' => $text, 'input' => $input, 'labelid' => $labelid }; } $template->param('sql' => $sql, 'name' => $name, --