From 85bf6d9a3d1d3ba065c713532bf96c63116ce271 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 3 Oct 2019 09:36:24 +0100
Subject: [PATCH] Bug 23049: Use a filtered table instead of two tables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test Plan
* Apply this patch and comment on new page design.

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
---
 admin/debit_types.pl                               |  7 +--
 .../prog/en/modules/admin/debit_types.tt           | 53 ++++++++++------------
 2 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/admin/debit_types.pl b/admin/debit_types.pl
index 3b1dc0f..56bd5fd 100755
--- a/admin/debit_types.pl
+++ b/admin/debit_types.pl
@@ -134,14 +134,9 @@ elsif ( $op eq 'delete_confirmed' ) {
 }
 
 if ( $op eq 'list' ) {
-    my $defaults = Koha::Account::DebitType::defaults;
-    my $system_types =
-      Koha::Account::DebitTypes->search( { code => { 'in' => $defaults } } );
-    my $debit_types = Koha::Account::DebitTypes->search(
-        { code => { 'not_in' => $defaults } } );
+    my $debit_types = Koha::Account::DebitTypes->search();
     $template->param(
         debit_types  => $debit_types,
-        system_types => $system_types
     );
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
index c963881..1746564 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
@@ -152,10 +152,10 @@
                     </div>
 
                     <h3>Account debit types</h3>
-                    <h4>Custom types</h4>
                     [% IF debit_types.count %]
                         <table id="table_debit_types">
                             <thead>
+                                <th>System</th>
                                 <th>Account type code</th>
                                 <th>Description</th>
                                 <th>Default amount</th>
@@ -166,6 +166,7 @@
                             <tbody>
                                 [% FOREACH debit_type IN debit_types %]
                                 <tr>
+                                    <td>[% debit_type.is_system | html %]</td>
                                     <td>[% debit_type.code | html %]</td>
                                     <td>[% debit_type.description | html %]</td>
                                     <td>[% debit_type.default_amount | $Price %]</td>
@@ -205,25 +206,6 @@
                             There are no account debit types defined. <a href="/cgi-bin/koha/admin/debit_types.pl?op=add_form&type=debit">Create new debit type</a>
                         </div>
                     [% END %]
-                    <h4>System types</h4>
-                    <table id="table_system_types">
-                        <thead>
-                            <th>Account type code</th>
-                            <th>Description</th>
-                            <th>Default amount</th>
-                            <th>Can be added manually</th>
-                        </thead>
-                        <tbody>
-                            [% FOREACH system_type IN system_types %]
-                            <tr>
-                                <td>[% system_type.code | html %]</td>
-                                <td>[% system_type.description | html %]</td>
-                                <td>[% system_type.default_amount | $Price %]</td>
-                                <td>[% IF system_type.can_be_added_manually %]Yes[% ELSE %]No[% END %]</td>
-                            </tr>
-                            [% END %]
-                        </tbody>
-                    </table>
                 [% END %]
             </main>
         </div> <!-- /.col-sm-10.col-sm-push-2 -->
@@ -241,23 +223,34 @@
 
     <script>
         $(document).ready(function() {
-            $("#table_debit_types").dataTable($.extend(true, {}, dataTablesDefaults, {
+            var txtActivefilter = _("Filter system debit types");
+            var txtInactivefilter = _("Show all debit types");
+            var table_debit_types = $("#table_debit_types").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "aoColumnDefs": [
                     { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
+                    { "aTargets": [ 0 ], "bSortable": false, "bVisible": false },
                 ],
                 "aaSorting": [[ 1, "asc" ]],
-                "iDisplayLength": 10,
+                "sDom": 'C<"top pager"ilpfB><"#filter_s">tr<"bottom pager"ip>',
+                "iDisplayLength": 20,
                 "sPaginationType": "full_numbers"
             }));
+            $("#filter_s").html('<p><a href="#" id="filter_system"><i class="fa fa-filter"></i> '+txtActivefilter+'</a>');
+            $('#filter_system').click(function(e) {
+                e.preventDefault();
+                if ($(this).hasClass('filtered')) {
+                    var filteredValue = '';
+                    $(this).html('<i class="fa fa-filter"></i> '+txtActivefilter);
+                } else { //Not filtered. Let's do it!
+                    var filteredValue = '0';
+                    $(this).html('<i class="fa fa-filter"></i> '+txtInactivefilter);
+                }
+                table_debit_types.fnFilter(filteredValue, 0, false, false);
+                $(this).toggleClass('filtered');
+            });
 
-            $("#table_system_types").dataTable($.extend(true, {}, dataTablesDefaults, {
-                "aoColumnDefs": [
-                    { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
-                ],
-                "aaSorting": [[ 1, "asc" ]],
-                "iDisplayLength": 10,
-                "sPaginationType": "full_numbers"
-            }));
+            //Start filtered
+            $('#filter_system').click();
         });
     </script>
 [% END %]
-- 
2.7.4