From ae955d641074ea5ad3e15e94ccfbe26ab2cd3158 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 17 Mar 2020 00:55:05 +0000 Subject: [PATCH] Bug 24886: Reindent reports template This patch reindents the template for saved reports, replacing tabs with spaces and making indentation consistent. Some lines have been split up. To test, apply the patch and go to Reports -> Use saved. - Test adding, editing, viewing, and running reports - Test filtering by group and subgroup - Test the process of adding a guided report Everything should work as expected. Use your preferred method for checking the differences between files while ignoring whitespace. I use diff with the "-w" flag, but I'm not your dad. The only changes you see should be split lines. Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize --- .../modules/reports/guided_reports_start.tt | 2180 +++++++++-------- 1 file changed, 1188 insertions(+), 992 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 131f8b6d46..de395abbf1 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 @@ -19,27 +19,41 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Reports › Guided reports wizard [%- IF ( saved1 ) -%]› Saved reports -[%- ELSIF ( create ) -%]› Create from SQL -[%- ELSIF ( showsql ) -%]› Saved reports › SQL view -[%- ELSIF ( execute ) -%]› Saved reports › [% name | html %] Report -[%- ELSIF ( editsql ) -%]› Saved reports › Edit SQL report -[%- END -%] -[%- IF ( build1 ) -%]› Build a report, step 1 of 6: Choose a module -[%- ELSIF ( build2 ) -%]› Build a report, step 2 of 6: Pick a report type -[%- ELSIF ( build3 ) -%]› Build a report, step 3 of 6: Select columns for display -[%- ELSIF ( build4 ) -%]› Build a report, step 4 of 6: Select criteria to limit on -[%- ELSIF ( build5 ) -%]› Build a report, step 5 of 6: Pick which columns to total -[%- ELSIF ( build6 ) -%]› Build a report, step 6 of 6: Select how you want the report ordered -[%- END -%] + + Koha › Reports › Guided reports wizard + [%- IF ( saved1 ) -%] + › Saved reports + [%- ELSIF ( create ) -%] + › Create from SQL + [%- ELSIF ( showsql ) -%] + › Saved reports › SQL view + [%- ELSIF ( execute ) -%] + › Saved reports › [% name | html %] Report + [%- ELSIF ( editsql ) -%] + › Saved reports › Edit SQL report + [%- END -%] + [%- IF ( build1 ) -%] + › Build a report, step 1 of 6: Choose a module + [%- ELSIF ( build2 ) -%] + › Build a report, step 2 of 6: Pick a report type + [%- ELSIF ( build3 ) -%] + › Build a report, step 3 of 6: Select columns for display + [%- ELSIF ( build4 ) -%] + › Build a report, step 4 of 6: Select criteria to limit on + [%- ELSIF ( build5 ) -%] + › Build a report, step 5 of 6: Pick which columns to total + [%- ELSIF ( build6 ) -%] + › Build a report, step 6 of 6: Select how you want the report ordered + [%- END -%] + [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("lib/codemirror/codemirror.min.css") | $raw %] [% Asset.css("css/reports.css") | $raw %] [% Asset.css("lib/d3c3/c3.min.css") | $raw %] @@ -49,41 +63,54 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'circ-search.inc' %] - - [% MACRO jsinclude BLOCK %] [% Asset.js("js/charts.js") | $raw %] [% Asset.js("lib/d3c3/d3.min.js") | $raw %] @@ -1151,7 +1348,6 @@ canned reports and writing custom SQL reports.

validator.resetForm();//remove error class on name elements and clear history validator.reset();//remove all error and success data } - [% END %] [% IF ( showsql ) %] @@ -1180,7 +1376,6 @@ canned reports and writing custom SQL reports.

} $(document).ready(function(){ - $("body").on('click',".fetch_chart_data",function(){ if( [% unlimited_total || 0 | $raw %] > 1000 ){ if( confirm("Fetching full chart data for reports with many rows can cause performance issues. Are you sure you with to chart this report?") ){ @@ -1571,6 +1766,7 @@ canned reports and writing custom SQL reports.

load_group_subgroups(); }); [% END %] + $(".delete").on("click",function(){ return confirmDelete(MSG_CONFIRM_DELETE); });