Attachment 93529 Details for Bug 23049 – Bug 23049: Use a filtered table instead of two tables

[patch] Bug 23049: Use a filtered table instead of two tables

Bug-23049-Use-a-filtered-table-instead-of-two-tabl.patch (text/plain), 5.85 KB, created by Martin Renvoize (ashimema) on 2019-10-03 08:37:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-10-03 08:37:40 UTC

Size: 5.85 KB

patch

obsolete

>From 651480eb4b5fe9aa90301dde75720d73ca1b5c81 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
>
>Test Plan
>* Apply this patch and comment on new page design.
>---
> admin/debit_types.pl                          |  7 +--
> .../prog/en/modules/admin/debit_types.tt      | 55 ++++++++-----------
> 2 files changed, 25 insertions(+), 37 deletions(-)
>
>diff --git a/admin/debit_types.pl b/admin/debit_types.pl
>index 3b1dc0fc18..56bd5fd286 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 8a90137e0c..174656440a 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> 
>@@ -241,23 +223,34 @@
> 
>     <script>
>         $(document).ready(function() {
>-            $("#table_debit_types").dataTable($.extend(true, {}, dataTablesDefaults, {
>-                "aoColumnDefs": [
>-                    { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
>-                ],
>-                "aaSorting": [[ 1, "asc" ]],
>-                "iDisplayLength": 10,
>-                "sPaginationType": "full_numbers"
>-            }));
>-            
>-            $("#table_system_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');
>+            });
>+
>+            //Start filtered
>+            $('#filter_system').click();
>         });
>     </script>
> [% END %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 23049: 93513 | 93514 | 93515 | 93516 | 93518 | 93519 | 93520 | 93521 | 93522 | 93523 | 93529 | 93557 | 93564 | 93565 | 93567 | 93568 | 93569 | 93570 | 93571 | 93572 | 93573 | 93574 | 93575 | 93576 | 93577 | 93578 | 93579 | 93960 | 93961 | 93962 | 93963 | 93964 | 93965 | 93966 | 93967 | 93968 | 93969 | 93970 | 93972 | 93973 | 93974 | 93975 | 93976 | 93977 | 93978 | 93979 | 93989 | 93990 | 93991 | 93992 | 93993 | 93994 | 93995 | 93996 | 93997 | 93998 | 93999 | 94000 | 94001 | 94002 | 94003 | 94004 | 94005 | 94006 | 94007 | 94008 | 94073 | 94074 | 94075 | 94076 | 94077 | 94078 | 94079 | 94080 | 94081 | 94082 | 94083 | 94084 | 94085 | 94086 | 94087 | 94088 | 94089 | 94090 | 94091 | 94092 | 94093 | 94111 | 94112 | 94113 | 94114 | 94115 | 94116 | 94117 | 94118 | 94119 | 94120 | 94121 | 94122 | 94123 | 94124 | 94125 | 94126 | 94127 | 94128 | 94129 | 94130 | 94131 | 94132 | 94133 | 94134 | 94135 | 94136 | 94137 | 94138 | 94139 | 94140 | 94141 | 94142 | 94143 | 94144 | 94145 | 94146 | 94147 | 94148 | 94149 | 94150 | 94151 | 94152 | 94165 | 94307 | 94308 | 94309 | 94310 | 94311 | 94312 | 94313 | 94314 | 94315 | 94316 | 94317 | 94318 | 94319 | 94320 | 94321 | 94323 | 94324 | 94325 | 94326 | 94327 | 94328 | 94329 | 94331 | 94332 | 94333 | 94334 | 94335 | 94336 | 94337 | 94338 | 94339 | 94340 | 94341 | 94342 | 94343 | 94344 | 94345 | 94346 | 94347 | 94348 | 94349 | 94350 | 94351 | 94352 | 94648