Improving borrowers statitics management

diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_stats.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_stats.tmpl
index 8941a86..378c92a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_stats.tmpl
@@ -103,12 +103,14 @@
                                <td ><!-- TMPL_VAR NAME="CGISort1" --></td>
                                </tr>
                        <!-- /TMPL_IF -->
-                       <tr class="hilighted" >
-                       <td>Sort2</td>
-                       <td align="center"><input type="radio" name="Line" value="sort2"></td>
-                       <td align="center"><input type="radio" name="Column" value="sort2"></td>
-                       <td><!-- TMPL_VAR NAME="CGISort2" --></td>
-                       </tr>
+                       <!-- TMPL_IF name="hassort2" -->
+                               <tr class="hilighted" >
+                               <td>Sort2</td>
+                               <td align="center"><input type="radio" name="Line" value="sort2"></td>
+                               <td align="center"><input type="radio" name="Column" value="sort2"></td>
+                               <td><!-- TMPL_VAR NAME="CGISort2" --></td>
+                               </tr>
+                       <!-- /TMPL_IF -->
                </tbody>
        </table>
        

diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl
index 0ff8aca..99cca7a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl
@@ -11,7 +11,7 @@
        <ul>
                <li><a href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></li>
                <li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
-               <li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Inventory/Stocktaking</a></li>
+               <li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue statistics</a></li>
        </ul>
        <h2 class="reports">Stats on issues</h2>
        <ul>

diff --git a/reports/borrowers_stats.pl b/reports/borrowers_stats.pl
index b12386f..797209c 100755 (executable)
--- a/reports/borrowers_stats.pl
+++ b/reports/borrowers_stats.pl
@@ -140,8 +140,12 @@ if ($do_it) {
        $req->execute;
        my @select_sort2;
        push @select_sort2,"";
+       my $hassort2;
        while (my ($value) =$req->fetchrow) {
-               push @select_sort2, $value;
+               if ($value) {
+                       $hassort2 = 1;
+                       push @select_sort2, $value;
+               }
        }
        my $CGIsort2=CGI::scrolling_list( -name     => 'Filter',
                                -id => 'Filter',
@@ -172,6 +176,7 @@ if ($do_it) {
                                        CGISort1 => $CGIsort1,
                                        hassort1 => $hassort1,
                                        CGISort2 => $CGIsort2,
+                                       hassort2 => $hassort2,
                                        CGIextChoice => $CGIextChoice,
                                        CGIsepChoice => $CGIsepChoice
                                        );