From b05cbc415d2461a3909db593b9b12d5cc506e35d Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Fri, 17 Apr 2015 15:24:36 +0200
Subject: [PATCH] Bug 14008: Display active filters when searching for reports

On the saved report list, the filters on the left are not displayed.
It means that some can be set, but the user has not visible feedbacks.

How filters work here:
If a user set a filter, it is saved in the session. Next time he will
come on this search, the previous values will be kept.

This patch just displayed the filter's values in the input fields.

Test plan:
Search for reports by date, author and keyword.
The filters should be displayed after you have clicked on the submit
button ("Apply filter").

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 .../prog/en/modules/reports/guided_reports_start.tt      | 9 +++------
 reports/guided_reports.pl                                | 1 +
 2 files changed, 4 insertions(+), 6 deletions(-)

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 d77824d883..e614f06790 100644
--- 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
@@ -167,9 +167,6 @@ $(document).ready(function(){
         }
     });
 [% END %]
-  // redefine the datepicker's default because reports require ISO
-  // http://jqueryui.com/demos/datepicker/#option-dateFormat
-  $( ".datepicker" ).datepicker( "option", "dateFormat", "yy-mm-dd" );
 
 [% IF (create || editsql || save) %]
     $("#select_group").change(function() {
@@ -1026,12 +1023,12 @@ Sub report:<select name="subreport">
   <fieldset class="brief">
   <h3>Filter</h3>
   <ol>
-    <li><label for="filter_date">Date:</label> <input type="text" id="filter_date" name="filter_date" size="10" value="[% filter_date %]" class="datepicker" />
+    <li><label for="filter_date">Date:</label> <input type="text" id="filter_date" name="filter_date" size="10" value="[% filters.date %]" class="datepicker" />
     <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
 
     </li>
-    <li><label for="filter_author">Author:</label> <input type="text" id="filter_author" name="filter_author" value="[% filter_author %]" /></li>
-    <li><label for="filter_keyword">Keyword:</label> <input type="text" id="filter_keyword" name="filter_keyword" value="[% filter_keyword %]" /></li>
+    <li><label for="filter_author">Author:</label> <input type="text" id="filter_author" name="filter_author" value="[% filters.author %]" /></li>
+    <li><label for="filter_keyword">Keyword:</label> <input type="text" id="filter_keyword" name="filter_keyword" value="[% filters.keyword %]" /></li>
   </ol>
   </fieldset>
   <fieldset class="action"><input type="submit" value="Apply filter" /></fieldset>
diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index 366a12de1d..2238259139 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -107,6 +107,7 @@ elsif ( $phase eq 'Build new' ) {
         'savedreports' => get_saved_reports($filter),
         'usecache' => $usecache,
         'groups_with_subgroups'=> groups_with_subgroups($group, $subgroup),
+        filters => $filter,
     );
 }
 
-- 
2.20.1