From 1101a6f102540ae3cff8bc0c9319b1b43b4d94d0 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 21 Feb 2025 15:46:05 +0000 Subject: [PATCH] Bug 39043: (follow-up) Re-number the steps, add back button to more steps --- .../modules/reports/guided_reports_start.tt | 77 +++++++++++-------- 1 file changed, 45 insertions(+), 32 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 53d77d6c132..e705b841b57 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 @@ -49,22 +49,25 @@ [% END %] [% IF ( build1 ) %] - [% t("Build a report, step 1 of 6: Choose a module") | html %] + [% t("Build a report, step 1 of 7: Choose a module") | html %] › [% ELSIF ( build2 ) %] - [% t("Build a report, step 2 of 6: Pick a report type") | html %] + [% t("Build a report, step 2 of 7: Pick a report type") | html %] › [% ELSIF ( build3 ) %] - [% t("Build a report, step 3 of 6: Select columns for display") | html %] + [% t("Build a report, step 3 of 7: Select columns for display") | html %] › [% ELSIF ( build4 ) %] - [% t("Build a report, step 4 of 6: Select criteria to limit on") | html %] + [% t("Build a report, step 4 of 7: Select criteria to limit on") | html %] › [% ELSIF ( build5 ) %] - [% t("Build a report, step 5 of 6: Pick which columns to total") | html %] + [% t("Build a report, step 5 of 7: Pick which columns to total") | html %] › [% ELSIF ( build6 ) %] - [% t("Build a report, step 6 of 6: Select how you want the report ordered") | html %] + [% t("Build a report, step 6 of 7: Select how you want the report ordered") | html %] + › + [% ELSIF ( showreport ) %] + [% t("Build a report, step 7 of 7: Confirm custom report") | html %] › [% END %] [% t("Guided reports wizard") | html %] @@ -171,23 +174,25 @@ [% WRAPPER breadcrumb_item bc_active= 1 %] Run [% END %] - [% ELSIF ( build1 || build2 || build3 || build4 || build5 || build6 ) %] + [% ELSIF ( build1 || build2 || build3 || build4 || build5 || build6 || showreport ) %] [% WRAPPER breadcrumb_item %] Build a report [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] [% IF ( build1 ) %] - Step 1 of 6: Choose a module + Step 1 of 7: Choose a module [% ELSIF ( build2 ) %] - Step 2 of 6: Pick a report type + Step 2 of 7: Pick a report type [% ELSIF ( build3 ) %] - Step 3 of 6: Select columns for display + Step 3 of 7: Select columns for display [% ELSIF ( build4 ) %] - Step 4 of 6: Select criteria to limit on + Step 4 of 7: Select criteria to limit on [% ELSIF ( build5 ) %] - Step 5 of 6: Pick which columns to total + Step 5 of 7: Pick which columns to total [% ELSIF ( build6 ) %] - Step 6 of 6: Select how you want the report ordered + Step 6 of 7: Select how you want the report ordered + [% ELSIF ( showreport ) %] + Step 7 of 7: Confirm custom report [% END # /IF ( build1 ) %] [% END # /WRAPPER breadcrumb_item %] [% END # /IF ( saved1 ) %] @@ -227,7 +232,7 @@

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

+

Build and run reports

[% IF ( CAN_user_reports_create_reports ) %] Build new @@ -241,7 +246,7 @@ Create report from SQL [% END %] -

Reports Dictionary

+

Reports Dictionary

Use the reports dictionary to define custom criteria to use in your reports

View dictionary [% END # /IF (start) %] @@ -503,7 +508,7 @@
[% INCLUDE 'csrf-token.inc' %]
- Step 1 of 6: Choose a module to report on,[% IF (usecache) %]Set cache expiry,[% END %] and choose report visibility + Step 1 of 7: Choose a module to report on,[% IF (usecache) %]Set cache expiry,[% END %] and choose report visibility
  1. @@ -561,7 +566,7 @@
    - Step 2 of 6: Pick a report type + Step 2 of 7: Pick a report type
    1. @@ -584,8 +589,6 @@ [% 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.

      [% INCLUDE 'csrf-token.inc' %] @@ -594,6 +597,9 @@
      + Step 3 of 7: 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.

      +
      - Step 4 of 6: Select criteria to limit on + Step 4 of 7: Select criteria to limit on [% FOREACH criteri IN criteria %] @@ -726,7 +732,6 @@ [% IF ( build5 ) %]

      Build a report

      -

      Step 5 of 6: Pick which columns to total

      [% INCLUDE 'csrf-token.inc' %] @@ -737,6 +742,7 @@
      + Step 5 of 7: Pick which columns to total
      [% FOREACH total_b IN total_by %] @@ -766,7 +772,6 @@ [% IF ( build6 ) %]

      Build a report

      -

      Step 6 of 6: Choose how you want the report ordered

      [% INCLUDE 'csrf-token.inc' %] @@ -778,6 +783,7 @@
      + Step 6 of 7: Choose how you want the report ordered
      [% FOREACH order_b IN order_by %] @@ -798,15 +804,20 @@
      - + +
      [% END #/ IF ( build6 ) %] [% IF ( showreport ) %] -

      Confirm custom report

      -

      Your report will be generated with the following SQL statement.

      -

      [% sql | html %]

      +

      Build a report

      +
      +

      Step 7 of 7: Confirm custom report

      +

      Your report will be generated with the following SQL statement.

      + +
      You may add a title to your report in the next step.
      +
      [% INCLUDE 'csrf-token.inc' %] @@ -814,10 +825,10 @@ -

      You will need to save the report before you can execute it

      - + +
      [% END #/ IF ( showreport ) %] @@ -1496,9 +1507,11 @@ [% UNLESS ( errors ) %]
      -
      -

      Your report "[% reportname | html %]" has been saved

      -
      + [% IF ( reportname ) %] +
      Your report "[% reportname | html %]" has been saved
      + [% ELSE %] +
      Your report has been saved without a title
      + [% END %]
      [% END %] [% END %] @@ -1883,7 +1896,7 @@ } [% END %] - [% IF ( showsql ) %] + [% IF ( showsql || showreport ) %] var editor = CodeMirror.fromTextArea(sql, { lineNumbers: false, -- 2.39.5