From a5c960ca95be8f4f92ad332ef469a9648d985a2e Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 29 Nov 2022 16:26:51 +0000 Subject: [PATCH] Bug 32368: Add page-section to report results This patch adds the page-section container to the results page after running a report Signed-off-by: David Nind Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 96804dfb5fb20a61f7734094354d2a1fca85f6bd) Signed-off-by: Martin Renvoize --- .../modules/reports/guided_reports_start.tt | 537 +++++++++--------- 1 file changed, 269 insertions(+), 268 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 cb5cc11f38..f5f2f7f7b3 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 @@ -908,294 +908,295 @@ [% IF ( execute ) %]

[% name | html %] Report ID: [% id | html %]

- [% IF ( notes ) %] -

Notes: [% notes | html %]

- [% END %] - [% IF ( unlimited_total ) %] -

- Total number of results: - [% unlimited_total | html %] - [% IF unlimited_total >= limit %] - ([% results.size | html %] shown) - [% END %] -

- [% END %] - - +
+ [% IF ( notes ) %] +

Notes: [% notes | html %]

+ [% END %] + [% IF ( unlimited_total ) %] +

+ Total number of results: + [% unlimited_total | html %] + [% IF unlimited_total >= limit %] + ([% results.size | html %] shown) + [% END %] +

+ [% END %] - -
+ - [% IF ( execute ) %] - [% UNLESS ( errors ) %] -
- - - [% # Preserve the whitespace of the following textarea in order to format the values correctly %] - -
- -
- - - [% # Preserve the whitespace of the following textarea in order to format the values correctly %] - -
- -
- - [% FOREACH result IN results %] - [% FOREACH cells IN result.cells %] - [% place = loop.index %] - [% NEXT UNLESS cells.cell.match('^(\d+)$') %] - [% IF header_row.$place.cell == 'itemnumber' || header_types.item(header_row.$place.cell) == 'itemnumber' %] - [% SET batch_itemnumbers = 1 %] - [% SET header_row.$place.has_itemnumbers = 1 %] - + +
+ + [% IF ( execute ) %] + [% UNLESS ( errors ) %] + + + + [% # Preserve the whitespace of the following textarea in order to format the values correctly %] + +
+ +
+ + + [% # Preserve the whitespace of the following textarea in order to format the values correctly %] + +
+ +
+ + [% FOREACH result IN results %] + [% FOREACH cells IN result.cells %] + [% place = loop.index %] + [% NEXT UNLESS cells.cell.match('^(\d+)$') %] + [% IF header_row.$place.cell == 'itemnumber' || header_types.item(header_row.$place.cell) == 'itemnumber' %] + [% SET batch_itemnumbers = 1 %] + [% SET header_row.$place.has_itemnumbers = 1 %] + + [% END %] [% END %] [% END %] - [% END %] -
- -
- - - [% FOREACH result IN results %] - [% FOREACH cells IN result.cells %] - [% place = loop.index %] - [% NEXT UNLESS cells.cell.match('^(\d+)$') %] - [% IF header_row.$place.cell == 'itemnumber' || header_types.item(header_row.$place.cell) == 'itemnumber' %] - [% SET batch_itemnumbers = 1 %] - [% SET header_row.$place.has_itemnumbers = 1 %] - +
+ +
+ + + [% FOREACH result IN results %] + [% FOREACH cells IN result.cells %] + [% place = loop.index %] + [% NEXT UNLESS cells.cell.match('^(\d+)$') %] + [% IF header_row.$place.cell == 'itemnumber' || header_types.item(header_row.$place.cell) == 'itemnumber' %] + [% SET batch_itemnumbers = 1 %] + [% SET header_row.$place.has_itemnumbers = 1 %] + + [% END %] [% END %] [% END %] - [% END %] -
- -
- [% FOREACH result IN results %] - [% FOREACH cells IN result.cells %] - [% place = loop.index %] - [% NEXT UNLESS cells.cell.match('^(\d+)$') %] - [% IF header_row.$place.cell == 'biblionumber' || header_types.item(header_row.$place.cell) == 'biblionumber' %] - [% SET batch_biblionumbers = 1 %] - [% SET header_row.$place.has_biblionumbers = 1 %] - +
+ +
+ [% FOREACH result IN results %] + [% FOREACH cells IN result.cells %] + [% place = loop.index %] + [% NEXT UNLESS cells.cell.match('^(\d+)$') %] + [% IF header_row.$place.cell == 'biblionumber' || header_types.item(header_row.$place.cell) == 'biblionumber' %] + [% SET batch_biblionumbers = 1 %] + [% SET header_row.$place.has_biblionumbers = 1 %] + + [% END %] [% END %] [% END %] - [% END %] -
- -
- - [% # Preserve the whitespace of the following textarea in order to format the values correctly %] - -
- - [% BLOCK batch_list %] - [%- FOREACH result IN results %] - [%- FOREACH cells IN result.cells %] - [%- place = loop.index %] - [%- IF header_row.$place.cell == batch_type || header_types.item(header_row.$place.cell) == batch_type %] -[%# We must not add whitespace to the cardnumbers %][% cells.cell | html %] + + +
+ + [% # Preserve the whitespace of the following textarea in order to format the values correctly %] + +
+ + [% BLOCK batch_list %] + [%- FOREACH result IN results %] + [%- FOREACH cells IN result.cells %] + [%- place = loop.index %] + [%- IF header_row.$place.cell == batch_type || header_types.item(header_row.$place.cell) == batch_type %] + [%# We must not add whitespace to the cardnumbers %][% cells.cell | html %] + [%- END %] [%- END %] - [%- END %] - [%- END -%] - [% END %] - -
- - - [% FOREACH p IN sql_params %] - - [% END %] - [% FOREACH n IN param_names %] - + [%- END -%] [% END %] - -
- - [% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) || ( unlimited_total > 10 && limit <= 1000 ) %] -
- [% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) %] -
- -
    - [% FOREACH header_ro IN header_row %] - [% IF header_ro.has_biblionumbers && ( header_ro.cell == 'biblionumber' || header_types.item( header_ro.cell ) == 'biblionumber' ) %] -
  • Bibliographic records
    • -
  • - Batch record modification -
    • -
  • - Batch record deletion -
    • -
  • - Add to list -
    • - [% END %] - [% IF header_ro.has_itemnumbers && ( header_ro.cell == 'itemnumber' || header_types.item( header_ro.cell ) == 'itemnumber' ) %] -
  • Item records
    • -
  • - Batch item modification -
    • -
  • - Batch item deletion -
    • - [% END %] - [% IF header_ro.cell == 'cardnumber' || header_types.item( header_ro.cell ) == 'cardnumber' %] -
  • Patron records
    • -
  • - Batch patron modification -
    • - [% END %] - [% END # /FOREACH header_ro %] -
-
- [% END # /IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) %] - - [% IF ( unlimited_total > 10 && limit <= 1000 ) %] -
- -
    - [% limits = [ 10, 20, 50, 100, 200, 300, 400, 500, 1000 ] %] - [% FOREACH l IN limits %] - [% IF l == limit %] -
  • - [% l | html %] -
    • + +
    + + + [% FOREACH p IN sql_params %] + + [% END %] + [% FOREACH n IN param_names %] + + [% END %] + +
    + + [% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) || ( unlimited_total > 10 && limit <= 1000 ) %] +
    + [% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) %] +
    + +
      + [% FOREACH header_ro IN header_row %] + [% IF header_ro.has_biblionumbers && ( header_ro.cell == 'biblionumber' || header_types.item( header_ro.cell ) == 'biblionumber' ) %] +
    • Bibliographic records
      • +
    • + Batch record modification +
      • +
    • + Batch record deletion +
      • +
    • + Add to list +
      • + [% END %] + [% IF header_ro.has_itemnumbers && ( header_ro.cell == 'itemnumber' || header_types.item( header_ro.cell ) == 'itemnumber' ) %] +
    • Item records
      • +
    • + Batch item modification +
      • +
    • + Batch item deletion +
      • + [% END %] + [% IF header_ro.cell == 'cardnumber' || header_types.item( header_ro.cell ) == 'cardnumber' %] +
    • Patron records
      • +
    • + Batch patron modification +
      • + [% END %] + [% END # /FOREACH header_ro %] +
    +
    + [% END # /IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) %] + + [% IF ( unlimited_total > 10 && limit <= 1000 ) %] +
    +
-
- [% END # /IF ( unlimited_total > 10 && limit <= 1000 ) %] - - [% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) %] - - - - - Hide data menus - - [% END %] -
- [% END # /IF batch operations || ( unlimited_total > 10 && limit <= 1000 ) %] + + +
    + [% limits = [ 10, 20, 50, 100, 200, 300, 400, 500, 1000 ] %] + [% FOREACH l IN limits %] + [% IF l == limit %] +
  • + [% l | html %] +
    • + [% ELSE %] +
  • + [% l | html %] +
    • + [% END %] + [% END %] +
+
+ [% END # /IF ( unlimited_total > 10 && limit <= 1000 ) %] + + [% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) %] + + + + + Hide data menus + + [% END %] + + [% END # /IF batch operations || ( unlimited_total > 10 && limit <= 1000 ) %] -
- [% pagination_bar | $raw %] -
+
+ [% pagination_bar | $raw %] +
- [% END # UNLESS ( errors ) %] - [% END # IF ( execute ) %] + [% END # UNLESS ( errors ) %] + [% END # IF ( execute ) %] - [% UNLESS ( errors ) %] - - - - [% FOREACH header_ro IN header_row %] - [% IF header_ro.has_itemnumbers && ( header_ro.cell == 'itemnumber' || header_types.item( header_ro.cell ) == 'itemnumber' ) %] - - [% ELSIF header_ro.has_biblionumbers && ( header_ro.cell == 'biblionumber' || header_types.item( header_ro.cell ) == 'biblionumber' ) %] - - [% ELSIF header_ro.cell == 'cardnumber' || header_types.item( header_ro.cell ) == 'cardnumber' %] - - [% ELSIF header_ro.cell == 'borrowernumber' || header_types.item( header_ro.cell ) == 'borrowernumber' %] - - [% ELSE %] - - [% END %] - [% END %] - - - - [% FOREACH result IN results %] + [% UNLESS ( errors ) %] +
[% header_ro.cell | html %][% header_ro.cell | html %][% header_ro.cell | html %][% header_ro.cell | html %][% header_ro.cell | html %]
+ - [% FOREACH cells IN result.cells %] - [% place = loop.index %] - [%- IF header_row.$place.cell == 'itemnumber' || header_types.item(header_row.$place.cell) == 'itemnumber' %] - - [% ELSIF header_row.$place.cell == 'biblionumber' || header_types.item(header_row.$place.cell) == 'biblionumber' %] - - [% ELSIF header_row.$place.cell == 'borrowernumber' || header_types.item(header_row.$place.cell) == 'borrowernumber' %] - - [% ELSIF header_row.$place.cell == 'cardnumber' || header_types.item(header_row.$place.cell) == 'cardnumber' %] - + [% FOREACH header_ro IN header_row %] + [% IF header_ro.has_itemnumbers && ( header_ro.cell == 'itemnumber' || header_types.item( header_ro.cell ) == 'itemnumber' ) %] + + [% ELSIF header_ro.has_biblionumbers && ( header_ro.cell == 'biblionumber' || header_types.item( header_ro.cell ) == 'biblionumber' ) %] + + [% ELSIF header_ro.cell == 'cardnumber' || header_types.item( header_ro.cell ) == 'cardnumber' %] + + [% ELSIF header_ro.cell == 'borrowernumber' || header_types.item( header_ro.cell ) == 'borrowernumber' %] + [% ELSE %] - + [% END %] [% END %] - [% END %] - -
- [% cells.cell | $raw %] - - - [% cells.cell | $raw %] - - - [% cells.cell | $raw %] - - - [% cells.cell | $raw %] - - [% header_ro.cell | html %][% header_ro.cell | html %][% header_ro.cell | html %][% header_ro.cell | html %] - [% cells.cell | $raw %] - [% header_ro.cell | html %]
- [% END %] -
[% pagination_bar | $raw %]
- + + + [% FOREACH result IN results %] + + [% FOREACH cells IN result.cells %] + [% place = loop.index %] + [%- IF header_row.$place.cell == 'itemnumber' || header_types.item(header_row.$place.cell) == 'itemnumber' %] + + [% cells.cell | $raw %] + + + [% ELSIF header_row.$place.cell == 'biblionumber' || header_types.item(header_row.$place.cell) == 'biblionumber' %] + + [% cells.cell | $raw %] + + + [% ELSIF header_row.$place.cell == 'borrowernumber' || header_types.item(header_row.$place.cell) == 'borrowernumber' %] + + [% cells.cell | $raw %] + + + [% ELSIF header_row.$place.cell == 'cardnumber' || header_types.item(header_row.$place.cell) == 'cardnumber' %] + + [% cells.cell | $raw %] + + + [% ELSE %] + + [% cells.cell | $raw %] + + [% END %] + [% END %] + + [% END %] + + + [% END %] +
[% pagination_bar | $raw %]
+ [% INCLUDE 'chart.inc' %] [% END #/IF ( execute ) %] -- 2.39.5