From 300dbe5d72fbf57d6dc376e30d79acb52b92a8f4 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 29 Apr 2011 22:01:49 -0400 Subject: [PATCH] Fix for Bug 6284, Reports Filters Need Prettying 1. Moved the form to the left under the menu 2. Added a calendar next to date (and a date format tip) 3. Styled the form like other filter forms for consistency's sake 4. Formatted on-screen message to match standard style Signed-off-by: Nicole C. Engard Signed-off-by: Chris Cormack --- .../modules/reports/guided_reports_start.tt | 81 ++++++++++++------- reports/guided_reports.pl | 1 + 2 files changed, 55 insertions(+), 27 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 b4dff278ab..24c5a13f85 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 @@ -123,29 +123,6 @@ canned reports and writing custom SQL reports.

[% IF ( saved1 ) %] [% IF ( savedreports ) %]

Saved Reports

-

Choose the report to run from the list

- -
-
- - - - - - - - - - - - - - - - -

Filter


Date:
Author:
Keyword:
-
-
 page(s) : @@ -189,7 +166,7 @@ canned reports and writing custom SQL reports.

[% savedreport.notes %] [% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %]) [% savedreport.date_created %] -[% IF ( savedreport.date_run ) %][% savedreport.date_run %][% END %] +[% IF ( savedreport.date_run ) %][% savedreport.date_run %][% END %] Show @@ -206,11 +183,30 @@ canned reports and writing custom SQL reports.

[% END %] -[% ELSE %]

There are no saved reports. +[% ELSE %]
+ [% IF (filter_set) %] +

No saved reports match your criteria.

+ [% IF ( CAN_user_reports_create_reports ) %] + + + + + +
+ + + + +
+ + [% END %] + [% ELSE %] +

There are no saved reports.

[% IF ( CAN_user_reports_create_reports ) %] - Build new? + Build a new report? [% END %] -

+ [% END %] + [% END %] [% END %] @@ -670,6 +666,37 @@ Sub report: + +
+

Filter

+
    +
  1. +
    [% INCLUDE 'date-format.inc' %]
    + +
    2. +
    3. +
    4. +
+
+ + +[% END %] + + [% INCLUDE 'guided-reports-view.inc' %] diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl index 5abdf17684..600ac29890 100755 --- a/reports/guided_reports.pl +++ b/reports/guided_reports.pl @@ -68,6 +68,7 @@ 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'); -- 2.39.5