Bug 5698: Followup: Add date picker option to SQL Runtime Parameters

Move html

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 137fdbf..03b007d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -486,7 +486,21 @@ canned reports and writing custom SQL reports.</p>
         <h1>Enter parameters for report [% name %]:</h1>
         [% IF ( notes ) %]<p>[% notes %]</p>[% END %]
         [% FOREACH sql_param IN sql_params %]
-            <p>[% sql_param.entry %]: [% sql_param.input %]</p>
+            [% IF sql_param.input == 'date' %]
+                <p>
+                [% sql_param.entry %]: <input id="date_[% sql_param_entry %]" type="text" value="" size="10" name="sql_params">
+                <img id="date_picker_[% sql_param_entry %]" alt="Show Calendar" src="/intranet-tmpl/prog/en/lib/calendar/cal.gif">
+                <script type="text/javascript">
+                      Calendar.setup( {
+                         inputField : "date_[% sql_param_entry %]",
+                         ifFormat : "%Y-%m-%d",
+                         button : "date_picker_[% sql_param_entry %]"
+                      } );
+                </script>
+                </p>
+            [% ELSE %]
+                <p>[% sql_param.entry %]: [% sql_param.input %]</p>
+            [% END %]
         [% END %]
         <input type='submit' value='Run the report'/>
     </form>

diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index ce9370a..5d53791 100755 (executable)
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -421,18 +421,7 @@ elsif ($phase eq 'Run this report'){
             my ($text,$authorised_value) = split /\|/,$split[$i*2+1];
             my $input;
             if ($authorised_value eq "date") {
-               $input = qq(<input id="date_$text" type="text" value="" size="10" name="sql_params">
-                         <img id="date_picker_$text" alt="Show Calendar" src="/intranet-tmpl/prog/en/lib/calendar/cal.gif">
-                         <script type="text/javascript">
-                              Calendar.setup(
-                              {
-                                 inputField : "date_$text",
-                                 ifFormat : "%Y-%m-%d",
-                                 button : "date_picker_$text"
-                              }
-                              );
-                         </script>
-                         );
+               $input = 'date';
             }
             elsif ($authorised_value) {
                 my $dbh=C4::Context->dbh;