From 6130d44b40032f748b5a9d9bc13eb9ba4756988d Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
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

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../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 @@
                                 </p>
                             [% END %]
                         [% END %]
-                        <table>
-                            <tr>
-                                <th>[% mainloo.line | html %] / [% mainloo.column | html %]</th>
-                                [% FOREACH loopco IN mainloo.loopcol %]
-                                    <th>
-                                        [% IF ( loopco.coltitle_display ) %][% loopco.coltitle_display | html %][% ELSE %][% loopco.coltitle | html %][% END %]
-                                    </th>
-                                [% END %]
-                                <th>TOTAL</th>
-                            </tr>
-                            [% FOREACH loopro IN mainloo.looprow %]
+                        <div class="page-section">
+                            <table>
                                 <tr>
-                                    <td>
-                                        [% IF ( loopro.rowtitle_display ) %][% loopro.rowtitle_display | html %][% ELSE %][% loopro.rowtitle | html %][% END %]
-                                    </td>
-                                    [% FOREACH loopcel IN loopro.loopcell %]
-                                    <td>
-                                        [% IF ( loopcel.value ) %]
-                                            [% loopcel.value | html %]
-                                        [% ELSE %]
-                                            &nbsp;
-                                        [% END %]
-                                    </td>
+                                    <th>[% mainloo.line | html %] / [% mainloo.column | html %]</th>
+                                    [% FOREACH loopco IN mainloo.loopcol %]
+                                        <th>
+                                            [% IF ( loopco.coltitle_display ) %][% loopco.coltitle_display | html %][% ELSE %][% loopco.coltitle | html %][% END %]
+                                        </th>
                                     [% END %]
-                                    <td>[% loopro.totalrow | html %]</td>
+                                    <th>TOTAL</th>
                                 </tr>
-                            [% END %]
-                            <tr>
-                                <th>TOTAL</th>
-                                [% FOREACH loopfoote IN mainloo.loopfooter %]
-                                    <th>[% loopfoote.totalcol | html %]</th>
+                                [% FOREACH loopro IN mainloo.looprow %]
+                                    <tr>
+                                        <td>
+                                            [% IF ( loopro.rowtitle_display ) %][% loopro.rowtitle_display | html %][% ELSE %][% loopro.rowtitle | html %][% END %]
+                                        </td>
+                                        [% FOREACH loopcel IN loopro.loopcell %]
+                                        <td>
+                                            [% IF ( loopcel.value ) %]
+                                                [% loopcel.value | html %]
+                                            [% ELSE %]
+                                                &nbsp;
+                                            [% END %]
+                                        </td>
+                                        [% END %]
+                                        <td>[% loopro.totalrow | html %]</td>
+                                    </tr>
                                 [% END %]
-                                <th>[% mainloo.total | html %]</th>
-                            </tr>
-                        </table>
+                                <tr>
+                                    <th>TOTAL</th>
+                                    [% FOREACH loopfoote IN mainloo.loopfooter %]
+                                        <th>[% loopfoote.totalcol | html %]</th>
+                                    [% END %]
+                                    <th>[% mainloo.total | html %]</th>
+                                </tr>
+                            </table>
+                        </div>
                     [% END %]
                 [% ELSE %]
 
@@ -131,9 +133,9 @@
                                         <td>
                                             <select name="status">
                                                 <option value=""> </option>
-                                                <option value="debarred">restricted</option>
-                                                <option value="gonenoadress">gone no address</option>
-                                                <option value="lost">lost</option>
+                                                <option value="debarred">Restricted</option>
+                                                <option value="gonenoadress">Gone no address</option>
+                                                <option value="lost">Lost card</option>
                                             </select>
                                         </td>
                                     </tr>
@@ -150,8 +152,8 @@
                                         <td>
                                             <select name="activity">
                                                 <option value=""> </option>
-                                                <option value="active">active</option>
-                                                <option value="nonactive">no active</option>
+                                                <option value="active">Active</option>
+                                                <option value="nonactive">Not active</option>
                                             </select>
                                         </td>
                                     </tr>
@@ -218,14 +220,15 @@
                                         <td>
                                             <select id="sex" name="Filter">
                                                 <option value="" />
-                                                <option value="M">Men</option>
-                                                <option value="F">Women</option>
+                                                <option value="M">Male</option>
+                                                <option value="F">Female</option>
+                                                <option value="O">[% tp('gender', 'Other') | html %]</option>
                                             </select>
                                         </td>
                                     </tr>
                                     [% IF ( SORT1_LOOP ) %]
                                         <tr>
-                                            <td>Sort1</td>
+                                            <td>Sort 1</td>
                                             <td><input type="radio" name="Line" value="sort1" /></td>
                                             <td><input type="radio" name="Column" value="sort1" /></td>
                                             <td>
@@ -242,7 +245,7 @@
                                     [% END %]
                                     [% IF ( SORT2_LOOP ) %]
                                         <tr>
-                                            <td>Sort2</td>
+                                            <td>Sort 2</td>
                                             <td><input type="radio" name="Line" value="sort2" /></td>
                                             <td><input type="radio" name="Column" value="sort2" /></td>
                                             <td>
@@ -264,15 +267,15 @@
                                         [% FOREACH pa_loo IN patron_attributes %]
                                             [% IF (pa_loo.class) %]
                                                 <tr>
-                                                    <th>[% pa_loo.class | html %] ([% pa_loo.lib | html %])</th>
+                                                    <th>[% pa_loo.lib | html %] ([% pa_loo.class | html %])</th>
                                                     <th colspan="3"></th>
                                                 </tr>
                                             [% END %]
                                             [% FOREACH patron_attribute IN pa_loo.items %]
                                                 <tr data-category_code="[% patron_attribute.category_code | html %]">
                                                     <td>
-                                                        [% patron_attribute.code | html %]
-                                                        ([% patron_attribute.description | html %])
+                                                        [% patron_attribute.description | html %]
+                                                        ([% patron_attribute.code | html %])
                                                     </td>
                                                     <td>
                                                         <input type="radio" name="Line"
-- 
2.30.2