@@ -, +, @@
- 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.
---
.../en/modules/reports/guided_reports_start.tt | 2132 +++++++++++---------
1 file changed, 1164 insertions(+), 968 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
@@ -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' %]
-
Home
-› Reports
-› Guided reports wizard
-
-[% IF ( saved1 ) %]› Saved reports
-[% ELSIF ( create ) %]› Create from SQL
-[% ELSIF ( showsql ) %]› Saved reports › SQL view
-[% ELSIF ( editsql ) %]› Saved reports › Edit SQL report
-[% ELSIF ( execute ) %]› Saved reports › [% name | html %] Report
-[% ELSIF ( build1 || build2 || build3 || build4 || build5 || build6 ) %]› Build a report
- [% IF ( build1 ) %]› Step 1 of 6: Choose a module
- [% ELSIF ( build2 ) %]› Step 2 of 6: Pick a report type
- [% ELSIF ( build3 ) %]› Step 3 of 6: Select columns for display
- [% ELSIF ( build4 ) %]› Step 4 of 6: Select criteria to limit on
- [% ELSIF ( build5 ) %]› Step 5 of 6: Pick which columns to total
- [% ELSIF ( build6 ) %]› Step 6 of 6: Select how you want the report ordered
+
+ Home
+ › Reports
+ › Guided reports wizard
+
+ [% IF ( saved1 ) %]
+ › Saved reports
+ [% ELSIF ( create ) %]
+ › Create from SQL
+ [% ELSIF ( showsql ) %]
+ › Saved reports › SQL view
+ [% ELSIF ( editsql ) %]
+ › Saved reports › Edit SQL report
+ [% ELSIF ( execute ) %]
+ › Saved reports › [% name | html %] Report
+ [% ELSIF ( build1 || build2 || build3 || build4 || build5 || build6 ) %]
+ › Build a report
+ [% IF ( build1 ) %]
+ › Step 1 of 6: Choose a module
+ [% ELSIF ( build2 ) %]
+ › Step 2 of 6: Pick a report type
+ [% ELSIF ( build3 ) %]
+ › Step 3 of 6: Select columns for display
+ [% ELSIF ( build4 ) %]
+ › Step 4 of 6: Select criteria to limit on
+ [% ELSIF ( build5 ) %]
+ › Step 5 of 6: Pick which columns to total
+ [% ELSIF ( build6 ) %]
+ › Step 6 of 6: Select how you want the report ordered
+ [% END %]
[% END %]
-[% END %]
-
-
-
-
Update SQL
-
-
-
Loading
-
-
-
+
+
+
+
Update SQL
+
+
+
Loading
+
+
+
@@ -92,991 +119,1161 @@
- [% INCLUDE "reports-toolbar.inc" %]
+ [% INCLUDE "reports-toolbar.inc" %]
-[% IF ( start ) %]
-
Guided reports
-
Use the guided reports engine to create non standard reports.
-This feature aims to provide some middle ground between the built in
-canned reports and writing custom SQL reports.
+ [% IF ( start ) %]
+
Guided reports
+
Use the guided reports engine to create non standard reports. This feature aims to provide some middle ground between the built in canned reports and writing custom SQL reports.
-
Build and run reports
- [% IF ( CAN_user_reports_create_reports ) %]
-
- [% END %]
- [% IF ( CAN_user_reports_execute_reports ) %]
-
- [% END %]
- [% IF ( CAN_user_reports_create_reports ) %]
-
- [% END %]
-
Reports Dictionary
-
Use the reports dictionary to define custom criteria to use in your reports
-
-[% END %]
+
Build and run reports
-[% IF report_converted %]
-
- The report "[% report_converted | html %]" has been converted.
-
-[% END %]
+ [% IF ( CAN_user_reports_create_reports ) %]
+
+ [% END %]
-[% IF report_converted %]
-
- The report "[% report_converted | html %]" has been converted.
-
-[% END %]
+ [% IF ( CAN_user_reports_execute_reports ) %]
+
+ [% END %]
+ [% IF ( CAN_user_reports_create_reports ) %]
+
+ [% END %]
-[% IF ( saved1 ) %]
-[% IF ( savedreports ) %]
Saved reports
+
Reports Dictionary
+
Use the reports dictionary to define custom criteria to use in your reports
+
+ [% END %]
-[% IF ( filters.date || filters.author || filters.keyword ) %]
-
Filtered by:
-
- [% IF ( filters.date ) %]
- Date: [% filters.date | html %]
- [% END %]
- [% IF ( filters.author ) %]
- Author: [% filters.author | html %]
- [% END %]
- [% IF ( filters.keyword ) %]
- Keyword: [% filters.keyword | html %]
- [% END %]
- Clear
-
-
-[% END %]
+ [% IF report_converted %]
+
+ The report "[% report_converted | html %]" has been converted.
+
+ [% INCLUDE 'mana/mana-share-report.inc' %]
- [% END %]
- [% ELSE %]
-
There are no saved reports.
- [% IF ( CAN_user_reports_create_reports ) %]
- Build a new report?
- [% END %]
- [% END %]
-
-[% END %]
-[% END %]
-
-[% INCLUDE 'mana/mana-share-report.inc' %]
+ [% IF ( build1 ) %]
+ [% IF ( cache_error) %]
+
+ Please choose a cache_expiry less than 30 days
+
+ [% END %]
-[% IF ( build1 ) %]
-[% IF ( cache_error) %]
-
- Please choose a cache_expiry less than 30 days
-
-[% END %]
-
Build a report
-
-
-
-
-[% END %]
+
Build a report
+
+
+
+
+ [% END %]
-[% IF ( build2 ) %]
-
Build a report
-
-
-
-
-
-
-
-
+ [% IF ( build2 ) %]
+
Build a report
+
+
+
+
+
+
+
+
+ [% END %]
-[% END %]
+ [% IF ( build3 ) %]
+
Build a report
+
Step 3 of 6: Select columns for display
+
Note: Be careful selecting when selecting columns. If your choice is too broad it could result in a very large report that will either not complete, or slow your system down.
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+ [% END %]
-[% END %]
+ [% IF ( build5 ) %]
+
Build a report
+
Step 5 of 6: Pick which columns to total
+
+
+
+
+
+
+
+
+
+
+ [% FOREACH total_b IN total_by %]
+
+
+
+
+
+
+
+
+
+ [% END %]
+
+
+
+
+
+
+
+
+ [% END %]
-[% IF ( build4 ) %]
-
Build a report
-
-
-
-
-
-
-
-
- [% FOREACH criteri IN criteria %]
-
-
-
-
-
- [% IF ( criteri.date ) %]
-
-
- [% INCLUDE 'date-format.inc' %]
-
-
- [% ELSE %]
- [% IF ( criteri.textrange ) %]
-
from
- to
-
-
-
- [% ELSE %]
- [% IF ( criteri.daterange ) %]
-
from
-
- to
-
- [% INCLUDE 'date-format.inc' %]
-
-
- [% ELSE %]
-
-
-
-
- [% END %]
- [% END %]
- [% END %]
- [% END %]
-
-
-
-[% IF ( definitions ) %]
-
-
-[% FOREACH definition IN definitions %]
-
[% definition.name | html %]
-[% END %]
-
-
-[% END %]
-
-
-
-
-[% END %]
+ [% IF ( showreport ) %]
+
Confirm custom report
+
Your report will be generated with the following SQL statement.
+
+ [% sql | html %]
+
+
+
+
+
+
+
+
You will need to save the report before you can execute it
+
+
+
+
+ [% END %]
+ [% IF ( save ) %]
+
+
+
+
+
+
+
+
+
+
+
+
+ Required
+
+ [% PROCESS group_and_subgroup_selection %]
+
+
+
+
+
+
+
+
+
+
+ [% END %]
-[% IF ( build5 ) %]
-
Build a report
-
Step 5 of 6: Pick which columns to total
-
-
-
-
-
-
-
-
-
-[% FOREACH total_b IN total_by %]
-
-
-
-[% FOREACH selec IN total_b.select %]
-
-[% END %]
-
+ [% IF ( warn_authval_problem ) %]
+
+
Errors found when processing parameters for report: [% name | html %]
+ [% FOREACH problematic_authval IN problematic_authvals %]
+
+ [% problematic_authval.name | html %]: The authorized value category ([% problematic_authval.authval | html %])
+ you selected does not exist.
+
-The following error was encountered:
-[% FOREACH error IN errors %]
- [% IF ( error.sqlerr ) %]This report contains the SQL keyword [% error.sqlerr | html %].
- Use of this keyword is not allowed in Koha reports due to security and data integrity risks. Only SELECT queries are allowed.
- Please return to the "Saved Reports" screen and delete this report or retry creating a new one.
- [% ELSIF ( error.queryerr ) %]The database returned the following error: [% error.queryerr | html %] Please check the log for further details.
- [% ELSIF ( error.cache_expiry ) %]Please select a cache expiry less than 30 days.
- [% ELSE %]
- [% END %]
-
+ The following error was encountered:
+ [% FOREACH error IN errors %]
+ [% IF ( error.sqlerr ) %]
+ This report contains the SQL keyword [% error.sqlerr | html %].
+ Use of this keyword is not allowed in Koha reports due to security and data integrity risks. Only SELECT queries are allowed.
+ Please return to the "Saved Reports" screen and delete this report or retry creating a new one.
+ [% ELSIF ( error.queryerr ) %]
+ The database returned the following error:
+ [% error.queryerr | html %] Please check the log for further details.
+ [% ELSIF ( error.cache_expiry ) %]
+ Please select a cache expiry less than 30 days.
+ [% ELSE %]
+ [% END %]
+
-
[% 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);
});
--