From db601414b33d3fc5d78bb771b3b76d7b863e75e6 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 12 Feb 2025 16:34:47 +0000 Subject: [PATCH] Bug 39053: Add page-section div to reports results pages This patch adds a "page-section" wrapping div around reports results pages where it is missing. Note: This patch contains indentation changes. To test, apply the patch and test the following reports, confirming that the results page looks correct: - Patrons with the most checkouts - Acquisitions statistics - Patrons with no checkouts - Patrons statistics - Most-circulated items - Catalog statistics - Average loan time - Circulation statistics - Lost items - Catalog by item types - Holds statistics Sponsored-by: Athens County Public Libraries Signed-off-by: David Nind --- .../en/modules/reports/acquisitions_stats.tt | 58 +++++----- .../prog/en/modules/reports/bor_issues_top.tt | 57 +++++----- .../prog/en/modules/reports/borrowers_out.tt | 29 ++--- .../en/modules/reports/borrowers_stats.tt | 45 ++++---- .../prog/en/modules/reports/cat_issues_top.tt | 51 +++++---- .../en/modules/reports/catalogue_stats.tt | 69 ++++++------ .../en/modules/reports/issues_avg_stats.tt | 45 ++++---- .../prog/en/modules/reports/issues_stats.tt | 45 ++++---- .../prog/en/modules/reports/itemslost.tt | 105 +++++++++--------- .../prog/en/modules/reports/itemtypes.tt | 43 +++---- .../prog/en/modules/reports/reserves_stats.tt | 57 +++++----- 11 files changed, 318 insertions(+), 286 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt index 5db05792ab3..2f60945b090 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt @@ -79,38 +79,40 @@

[% END %] [% END %] - - - - - [% FOREACH loopco IN mainloo.loopcol %] - - [% END %] - - - [% FOREACH loopro IN mainloo.looprow %] +
+
[% mainloo.line | html %] / [% mainloo.column | html %][% loopco.coltitle | html %]TOTAL
- - [% FOREACH loopcel IN loopro.loopcell %] - + + [% FOREACH loopco IN mainloo.loopcol %] + [% END %] - + - [% END %] - - - [% FOREACH loopfoote IN mainloo.loopfooter %] - + [% FOREACH loopro IN mainloo.looprow %] + + + [% FOREACH loopcel IN loopro.loopcell %] + + [% END %] + + [% END %] - - -
[% loopro.rowtitle | html %] - [% IF ( loopcel.value ) %] - [% loopcel.value | html %] - [% ELSE %] -   - [% END %] - [% mainloo.line | html %] / [% mainloo.column | html %][% loopco.coltitle | html %] [% loopro.totalrow | html %] TOTAL
TOTAL [% loopfoote.totalcol | html %]
[% loopro.rowtitle | html %] + [% IF ( loopcel.value ) %] + [% loopcel.value | html %] + [% ELSE %] +   + [% END %] + [% loopro.totalrow | html %]
[% mainloo.total | html %]
+ + TOTAL + [% FOREACH loopfoote IN mainloo.loopfooter %] + [% loopfoote.totalcol | html %] + [% END %] + [% mainloo.total | html %] + + + + [% END %] [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt index 44f6d005ed7..2d5ae2b623d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt @@ -80,36 +80,39 @@ [% END %] [% END %] - - - - - - [% FOREACH loopco IN mainloo.loopcol %] - - [% END %] - - - [% FOREACH loopco IN mainloo.loopcol %] - - [% END %] - - [% FOREACH loopro IN mainloo.looprow %] +
+
RankPatronTotal[% loopco.coltitle | html %]
Checkout count
- - - [% FOREACH loopcel IN loopro.loopcell %] - + + + + [% FOREACH loopco IN mainloo.loopcol %] + [% END %] - [% END %] -
[% loopro.rowtitle | html %] - [% IF ( loopro.reference ) %] - [% IF ( loopro.patron ) %][% loopro.patron | html %][% END %] - [% ELSE %] - [% IF ( loopro.patron ) %][% loopro.patron | html %][% END %] - [% END %] - [% IF ( loopcel.count ) %][% loopcel.count | html %][% END %] RankPatronTotal[% loopco.coltitle | html %]
+ + [% FOREACH loopco IN mainloo.loopcol %] + Checkout count + [% END %] + + [% FOREACH loopro IN mainloo.looprow %] + + [% loopro.rowtitle | html %] + + [% IF ( loopro.reference ) %] + [% IF ( loopro.patron ) %][% loopro.patron | html %][% END %] + [% ELSE %] + [% IF ( loopro.patron ) %][% loopro.patron | html %][% END %] + [% END %] + + [% FOREACH loopcel IN loopro.loopcell %] + [% IF ( loopcel.count ) %][% loopcel.count | html %][% END %] + [% END %] + + [% END %] + + + [% END %] [% ELSE %]

Patrons with the most checkouts

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt index b6439f3e9ca..779fd5beb15 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt @@ -49,22 +49,25 @@ [% END %] [% END %] - - - - [% FOREACH loopco IN mainloo.loopcol %] - - [% END %] - - [% FOREACH loopro IN mainloo.looprow %] +
+
Num/Patrons[% loopco.coltitle | html %]
- - [% FOREACH loopcel IN loopro.loopcell %] - + + [% FOREACH loopco IN mainloo.loopcol %] + [% END %] - [% END %] -
[% loopro.rowtitle | html %][% IF ( loopcel.value ) %][% loopcel.value | html %][% END %] Num/Patrons[% loopco.coltitle | html %]
+ [% FOREACH loopro IN mainloo.looprow %] + + [% loopro.rowtitle | html %] + [% FOREACH loopcel IN loopro.loopcell %] + [% IF ( loopcel.value ) %][% loopcel.value | html %][% END %] + [% END %] + + [% END %] + + + [% END %] [% ELSE %]

Patrons with no checkouts

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt index bf6c5904fac..4a488a78134 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt @@ -62,31 +62,34 @@

[% loopfilte.crit | html %] = [% loopfilte.filter | html %]

[% END %] [% END %] - - - - [% FOREACH loopco IN mainloo.loopcol %] - - [% END %] - - - [% FOREACH loopro IN mainloo.looprow %] +
+
[% mainloo.line | html %] / [% mainloo.column | html %][% IF ( loopco.coltitle_display ) %][% loopco.coltitle_display | html %][% ELSE %][% loopco.coltitle | html %][% END %] TOTAL
- - [% FOREACH loopcel IN loopro.loopcell %] - + + [% FOREACH loopco IN mainloo.loopcol %] + [% END %] - + - [% END %] - - - [% FOREACH loopfoote IN mainloo.loopfooter %] - + [% FOREACH loopro IN mainloo.looprow %] + + + [% FOREACH loopcel IN loopro.loopcell %] + + [% END %] + + [% END %] - - -
[% IF ( loopro.rowtitle_display ) %][% loopro.rowtitle_display | html %][% ELSE %][% loopro.rowtitle | html %][% END %] [% IF ( loopcel.value ) %][% loopcel.value | html %][% ELSE %] [% END %] [% mainloo.line | html %] / [% mainloo.column | html %][% IF ( loopco.coltitle_display ) %][% loopco.coltitle_display | html %][% ELSE %][% loopco.coltitle | html %][% END %] [% loopro.totalrow | html %]TOTAL
TOTAL[% loopfoote.totalcol | html %]
[% IF ( loopro.rowtitle_display ) %][% loopro.rowtitle_display | html %][% ELSE %][% loopro.rowtitle | html %][% END %] [% IF ( loopcel.value ) %][% loopcel.value | html %][% ELSE %] [% END %] [% loopro.totalrow | html %]
[% mainloo.total | html %]
+ + TOTAL + [% FOREACH loopfoote IN mainloo.loopfooter %] + [% loopfoote.totalcol | html %] + [% END %] + [% mainloo.total | html %] + + + + [% END %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt index bef36543e80..cc93170aef1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt @@ -55,33 +55,36 @@ [% END %] [% END %] - - - [% FOREACH loopco IN mainloo.loopcol %] - - [% END %] - - - [% FOREACH loopco IN mainloo.loopcol %] - - - [% END %] - - [% FOREACH loopro IN mainloo.looprow %] +
+
Rank/Biblioitemnumbers[% loopco.coltitle | html %]
 ItemCount of checkouts
- - [% FOREACH loopcel IN loopro.loopcell %] - - + [% FOREACH loopco IN mainloo.loopcol %] + + [% END %] + + + [% FOREACH loopco IN mainloo.loopcol %] + + [% END %] - [% END %] -
[% loopro.rowtitle | html %] - [% IF ( loopcel.reference ) %] - [% loopcel.value | html %] - [% END %] - [% IF ( loopcel.count ) %][% loopcel.count | html %][% END %] Rank/Biblioitemnumbers[% loopco.coltitle | html %]
 ItemCount of checkouts
+ [% FOREACH loopro IN mainloo.looprow %] + + [% loopro.rowtitle | html %] + [% FOREACH loopcel IN loopro.loopcell %] + + [% IF ( loopcel.reference ) %] + [% loopcel.value | html %] + [% END %] + + [% IF ( loopcel.count ) %][% loopcel.count | html %][% END %] + [% END %] + + [% END %] + + + [% END %] [% ELSE %]

Most-circulated items

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt index d5f2ca9184c..2c22e8c435a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt @@ -53,43 +53,46 @@ [% END %] [% END %] - - - - - [% FOREACH loopco IN mainloo.loopcol %] - - [% END %] - - - - - [% FOREACH loopro IN mainloo.looprow %] +
+
[% mainloo.line | html %] / [% mainloo.column | html %][% loopco.coltitle | html %]TOTAL
+ - - [% FOREACH loopcel IN loopro.loopcell %] - + + [% FOREACH loopco IN mainloo.loopcol %] + [% END %] - + - [% END %] - - - - - [% FOREACH loopfoote IN mainloo.loopfooter %] - + + + [% FOREACH loopro IN mainloo.looprow %] + + + [% FOREACH loopcel IN loopro.loopcell %] + + [% END %] + + [% END %] - - - -
[% loopro.rowtitle | html %] - [% IF ( loopcel.value ) %] - [% loopcel.value | html %] - [% ELSE %] -   - [% END %] - [% mainloo.line | html %] / [% mainloo.column | html %][% loopco.coltitle | html %] [% loopro.totalrow | html %] TOTAL
TOTAL (all results) [% loopfoote.totalcol | html %]
[% loopro.rowtitle | html %] + [% IF ( loopcel.value ) %] + [% loopcel.value | html %] + [% ELSE %] +   + [% END %] + [% loopro.totalrow | html %]
[% mainloo.total | html %]
+ + + + TOTAL (all results) + [% FOREACH loopfoote IN mainloo.loopfooter %] + [% loopfoote.totalcol | html %] + [% END %] + [% mainloo.total | html %] + + + + + [% END %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt index e3c99267819..180f63cde44 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt @@ -49,31 +49,34 @@ [% END %] [% END %] - - - - [% FOREACH loopco IN mainloo.loopcol %] - - [% END %] - - - [% FOREACH loopro IN mainloo.looprow %] +
+
[% mainloo.line | html %] / [% mainloo.column | html %][% loopco.coltitle | html %]TOTAL
- - [% FOREACH loopcel IN loopro.loopcell %] - + + [% FOREACH loopco IN mainloo.loopcol %] + [% END %] - + - [% END %] - - - [% FOREACH loopfoote IN mainloo.loopfooter %] - + [% FOREACH loopro IN mainloo.looprow %] + + + [% FOREACH loopcel IN loopro.loopcell %] + + [% END %] + + [% END %] - - -
[% loopro.rowtitle | html %] [% IF ( loopcel.value ) %][% loopcel.value | html %][% END %] [% mainloo.line | html %] / [% mainloo.column | html %][% loopco.coltitle | html %] [% loopro.totalrow | html %] TOTAL
TOTAL [% loopfoote.totalcol | html %]
[% loopro.rowtitle | html %] [% IF ( loopcel.value ) %][% loopcel.value | html %][% END %] [% loopro.totalrow | html %]
[% mainloo.total | html %]
+ + TOTAL + [% FOREACH loopfoote IN mainloo.loopfooter %] + [% loopfoote.totalcol | html %] + [% END %] + [% mainloo.total | html %] + + + + [% END %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt index 22ce43db7a0..4ef937e635c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt @@ -104,31 +104,34 @@ [% END %] - - - - [% FOREACH loopco IN mainloo.loopcol %] - - [% END %] - - - [% FOREACH loopro IN mainloo.looprow %] +
+
[% mainloo.line | html %] / [% mainloo.column | html %][% loopco.coltitle_display | html %]TOTAL
- - [% FOREACH loopcel IN loopro.loopcell %] - + + [% FOREACH loopco IN mainloo.loopcol %] + [% END %] - + - [% END %] - - - [% FOREACH loopfoote IN mainloo.loopfooter %] - + [% FOREACH loopro IN mainloo.looprow %] + + + [% FOREACH loopcel IN loopro.loopcell %] + + [% END %] + + [% END %] - - -
[% loopro.rowtitle_display or "UNKNOWN VALUE" | html %][% loopcel.value || 0 | html %][% mainloo.line | html %] / [% mainloo.column | html %][% loopco.coltitle_display | html %][% loopro.totalrow | html %]TOTAL
TOTAL[% loopfoote.totalcol | html %]
[% loopro.rowtitle_display or "UNKNOWN VALUE" | html %][% loopcel.value || 0 | html %][% loopro.totalrow | html %]
[% mainloo.total | html %]
+ + TOTAL + [% FOREACH loopfoote IN mainloo.loopfooter %] + [% loopfoote.totalcol | html %] + [% END %] + [% mainloo.total | html %] + + + + [% END %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt index 7d79c849dff..36fccf9c8fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt @@ -76,61 +76,64 @@
[% END %] - - - - [% IF csv_profiles.count %] - - [% END %] - - - - - - - - - - - - - - - - - - - - [% FOREACH item IN items %] +
+
TitleAuthorLost statusLost onBarcodeCall numberDate last seenPriceRep.priceLibraryItem typeCollectionCurrent libraryLocationNot for loan statusNotes
+ [% IF csv_profiles.count %] - + [% END %] - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - [% END %] - -
- - - [% item.biblio.title | html %] - [% item.biblio.author | html %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => item.itemlost ) | html %] [% item.itemlost_on | $KohaDates %] - [% item.barcode | html %] - [% item.itemcallnumber | html %][% item.datelastseen | $KohaDates with_hours => 1 %][% item.price | $Price %][% item.replacementprice | $Price %][% Branches.GetName(item.homebranch) | html %][% ItemTypes.GetDescription(item.effective_itemtype) | html %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => item.ccode ) | html %][% Branches.GetName(item.holdingbranch) | html %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan ) | html %] [% item.itemnotes | $raw %]TitleAuthorLost statusLost onBarcodeCall numberDate last seenPriceRep.priceLibraryItem typeCollectionCurrent libraryLocationNot for loan statusNotes
+ + + [% FOREACH item IN items %] + + [% IF csv_profiles.count %] + + + + [% END %] + + [% item.biblio.title | html %] + + [% item.biblio.author | html %] + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => item.itemlost ) | html %] [% item.itemlost_on | $KohaDates %] + + [% item.barcode | html %] + + [% item.itemcallnumber | html %] + [% item.datelastseen | $KohaDates with_hours => 1 %] + [% item.price | $Price %] + [% item.replacementprice | $Price %] + [% Branches.GetName(item.homebranch) | html %] + [% ItemTypes.GetDescription(item.effective_itemtype) | html %] + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => item.ccode ) | html %] + [% Branches.GetName(item.holdingbranch) | html %] + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %] + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan ) | html %] [% item.itemnotes | $raw %] + + [% END %] + + + + [% END %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt index 19978f90969..8cb034f2c1b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt @@ -47,28 +47,31 @@ [% IF ( do_it ) %] [% FOREACH mainloo IN mainloop %]

Reports on item types [% IF branch %]held at [% Branches.GetName( branch ) | html %][% END %]

- - - - - - - - - - - - - - - [% FOREACH loopitemtyp IN mainloo.loopitemtype %] +
+
Item typeCount
TOTAL[% mainloo.total | html %]
+ - - + + - [% END %] - -
[% ItemTypes.GetDescription( loopitemtyp.itemtype ) | html %][% loopitemtyp.count | html %]Item typeCount
+ + + + TOTAL + [% mainloo.total | html %] + + + + [% FOREACH loopitemtyp IN mainloo.loopitemtype %] + + [% ItemTypes.GetDescription( loopitemtyp.itemtype ) | html %] + [% loopitemtyp.count | html %] + + [% END %] + + + + [% END %] [% ELSE %]

View a count of items held at your library grouped by item type

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt index b6bd70130f9..8a90fde48db 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt @@ -91,37 +91,40 @@ [% END %] [% FOREACH mainloo IN mainloop %] - - - - [% FOREACH loopco IN mainloo.loopcol %] - - [% END %] - - - [% FOREACH loopro IN mainloo.looprow %] +
+
[% mainloo.line | html %] / [% mainloo.column | html %][% PROCESS reservestatus field=mainloo.column value=loopco.coltitle_display %]TOTAL
- - [% FOREACH loopcel IN loopro.loopcell %] - + + [% FOREACH loopco IN mainloo.loopcol %] + [% END %] - + - [% END %] - - - [% FOREACH loopfoote IN mainloo.loopfooter %] - + [% FOREACH loopro IN mainloo.looprow %] + + + [% FOREACH loopcel IN loopro.loopcell %] + + [% END %] + + [% END %] - - -
[% PROCESS reservestatus field=mainloo.line value=loopro.rowtitle_display %] - [% IF ( loopcel.url_complement ) %] - [% loopcel.value | html %] - [% ELSE %] - [% loopcel.value | html %] - [% END %] - [% mainloo.line | html %] / [% mainloo.column | html %][% PROCESS reservestatus field=mainloo.column value=loopco.coltitle_display %][% loopro.totalrow | html %]TOTAL
TOTAL[% loopfoote.totalcol | html %]
[% PROCESS reservestatus field=mainloo.line value=loopro.rowtitle_display %] + [% IF ( loopcel.url_complement ) %] + [% loopcel.value | html %] + [% ELSE %] + [% loopcel.value | html %] + [% END %] + [% loopro.totalrow | html %]
[% mainloo.total | html %]
+ + TOTAL + [% FOREACH loopfoote IN mainloo.loopfooter %] + [% loopfoote.totalcol | html %] + [% END %] + [% mainloo.total | html %] + + + + [% END %] [% END %] [% ELSE %] -- 2.39.5