From 361b0350754a4910291db74722c588810c748a95 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Sat, 13 Jan 2024 22:26:03 +0000
Subject: [PATCH] Bug 35807: Update catalog statistics search form and result
 list

This makes some small changes to the form to be
more consistent with other parts of Koha:

Search form
* Koha full call number => Item call number
* Filter barcode => Barcode

Result list
* The result table had a white background with a shadow.
  It was changed to the nromal "page-section" white
  background without a shadow/3D effect.

To test:
* Verify current layout as described above
* Apply patch and run yarn build to update CSS
* Verify changes
---
 .../prog/css/src/staff-global.scss            |  1 -
 .../en/modules/reports/catalogue_stats.tt     | 84 ++++++++++---------
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index 44b3fd1946..d8ab0c57a4 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -1884,7 +1884,6 @@ li {
     }
 }
 
-#catalogue_stats_wrapper,
 #tbl_cash_register_stats_wrapper,
 #resulttable_wrapper,
 #numberpatternst_wrapper {
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 db8843e6f0..b112ed67f6 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,48 +53,50 @@
                             [% END %]
                         [% END %]
 
-                        <table id="catalogue_stats">
-                            <thead>
-                                <tr>
-                                    <th>[% mainloo.line | html %] / [% mainloo.column | html %]</th>
-                                    [% FOREACH loopco IN mainloo.loopcol %]
-                                        <th>[% loopco.coltitle | html %]</th>
-                                    [% END %]
-                                    <th>TOTAL</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                [% FOREACH loopro IN mainloo.looprow %]
+                        <div class="page-section">
+                            <table id="catalogue_stats">
+                                <thead>
                                     <tr>
-                                        [% IF ( loopro.hilighted ) %]<td class="hilighted">[% ELSE %]<td>[% END %]
-                                            [% loopro.rowtitle | html %]</td>
-                                            [% FOREACH loopcel IN loopro.loopcell %]
-                                                [% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
-                                                    [% IF ( loopcel.value ) %]
-                                                        [% loopcel.value | html %]
-                                                    [% ELSE %]
-                                                        &nbsp;
-                                                    [% END %]
-                                                </td>
-                                            [% END %]
-                                            [% IF ( loopro.hilighted ) %]<td>[% ELSE %]<td>[% END %]
-                                            [% loopro.totalrow | html %]
-                                        </td>
+                                        <th>[% mainloo.line | html %] / [% mainloo.column | html %]</th>
+                                        [% FOREACH loopco IN mainloo.loopcol %]
+                                            <th>[% loopco.coltitle | html %]</th>
+                                        [% END %]
+                                        <th>TOTAL</th>
                                     </tr>
-                                [% END %]
-                            </tbody>
-                            <tfoot>
-                                <tr>
-                                    <th>TOTAL (all results)</th>
-                                    [% FOREACH loopfoote IN mainloo.loopfooter %]
-                                        <th>
-                                            [% loopfoote.totalcol | html %]
-                                        </th>
+                                </thead>
+                                <tbody>
+                                    [% FOREACH loopro IN mainloo.looprow %]
+                                        <tr>
+                                            [% IF ( loopro.hilighted ) %]<td class="hilighted">[% ELSE %]<td>[% END %]
+                                                [% loopro.rowtitle | html %]</td>
+                                                [% FOREACH loopcel IN loopro.loopcell %]
+                                                    [% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
+                                                        [% IF ( loopcel.value ) %]
+                                                            [% loopcel.value | html %]
+                                                        [% ELSE %]
+                                                            &nbsp;
+                                                        [% END %]
+                                                    </td>
+                                                [% END %]
+                                                [% IF ( loopro.hilighted ) %]<td>[% ELSE %]<td>[% END %]
+                                                [% loopro.totalrow | html %]
+                                            </td>
+                                        </tr>
                                     [% END %]
-                                    <th>[% mainloo.total | html %]</th>
-                                </tr>
-                            </tfoot>
-                        </table>
+                                </tbody>
+                                <tfoot>
+                                    <tr>
+                                        <th>TOTAL (all results)</th>
+                                        [% FOREACH loopfoote IN mainloo.loopfooter %]
+                                            <th>
+                                                [% loopfoote.totalcol | html %]
+                                            </th>
+                                        [% END %]
+                                        <th>[% mainloo.total | html %]</th>
+                                    </tr>
+                                </tfoot>
+                            </table>
+                        </div>
                     [% END %]
                 [% ELSE %]
                     <form method="post" action="/cgi-bin/koha/reports/catalogue_stats.pl">
@@ -111,7 +113,7 @@
                                 </thead>
                                 <tbody>
                                     <tr>
-                                        <td>Koha full call number</td>
+                                        <td>Item call number</td>
                                         <td><input type="radio" name="Line" value="items.itemcallnumber" /></td>
                                         <td><input type="radio" name="Column" value="items.itemcallnumber" /></td>
                                         <td><label for="callnoFrom">From</label> <input type="text" name="Filter" id="callnoFrom" /> <label for="callnoTo">To</label> <input type="text" name="Filter" id="callnoTo" /></td>
@@ -256,7 +258,7 @@
                                         </tr>
                                     [% END %]
                                     <tr>
-                                        <td colspan="3">Filter barcode</td>
+                                        <td colspan="3">Barcode</td>
                                         <td>
                                             <select name="Filter" id="like">
                                                 <option value="1">like</option>
-- 
2.30.2