From d92a84ac17f49a98427d0013b0753726873c968f Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 13 Jan 2024 19:03:14 +0000 Subject: [PATCH] Bug 33452: Update patron statistics search form and result list This makes changes to terminology, spelling and capitalization. Terminology used should be the same as on the normal patron form. To test: * Go to Reports > Patrons statistics * Compare search form before and after patch. List of changes: * Gender: * Add option 'Other' * Change men and women to 'Male' and 'Female' * Sort*: * Labels changed from "Sortx" to "Sort x" * Note: to see Sort 1 you need to add an AV for bsort1 * Patron status: * Options changed to start with a capital letter * 'Lost' changed to 'Lost card' * Patron activity: * Options changed to start with a capital letter * 'no active' changed to 'Not active' * Patron attributes: * Switched code and description in label, so description is first * Do a search, compare result table before and after patch. * Added white background (page-section) to results --- .../en/modules/reports/borrowers_stats.tt | 89 ++++++++++--------- 1 file changed, 46 insertions(+), 43 deletions(-) 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 a1a86beb29..c3be44acf9 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 @@ -61,41 +61,43 @@

[% 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 %] @@ -131,9 +133,9 @@ @@ -150,8 +152,8 @@ @@ -218,14 +220,15 @@ [% IF ( SORT1_LOOP ) %] - Sort1 + Sort 1 @@ -242,7 +245,7 @@ [% END %] [% IF ( SORT2_LOOP ) %] - Sort2 + Sort 2 @@ -264,15 +267,15 @@ [% FOREACH pa_loo IN patron_attributes %] [% IF (pa_loo.class) %] - [% pa_loo.class | html %] ([% pa_loo.lib | html %]) + [% pa_loo.lib | html %] ([% pa_loo.class | html %]) [% END %] [% FOREACH patron_attribute IN pa_loo.items %] - [% patron_attribute.code | html %] - ([% patron_attribute.description | html %]) + [% patron_attribute.description | html %] + ([% patron_attribute.code | html %])