From 0f83b0fe20a80b52060106dd2882fbf2f711fc62 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 16 Dec 2021 11:34:02 +0100
Subject: [PATCH] Bug 29648: Improve existing code

We already have 2 tables that are configurable, on acqui/basket and
reports/orders_by_budget.
This patch is modifying a bit the existing code to transfer the
responsability/logic to the KohaTable constructor instead of the
template that is creating the object.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 C4/Utils/DataTables/TablesSettings.pm               |  8 +++++++-
 Koha/Template/Plugin/TablesSettings.pm              |  3 +++
 .../prog/en/includes/columns_settings.inc           | 11 ++++++++++-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt   | 13 +++++--------
 .../prog/en/modules/reports/orders_by_budget.tt     |  7 ++-----
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/C4/Utils/DataTables/TablesSettings.pm b/C4/Utils/DataTables/TablesSettings.pm
index 79c9417569..13157a71a3 100644
--- a/C4/Utils/DataTables/TablesSettings.pm
+++ b/C4/Utils/DataTables/TablesSettings.pm
@@ -88,7 +88,13 @@ sub get_table_settings {
             tablename => $tablename,
         }
     )->next;
-    return $rs ? $rs : $list->{modules}{$module}{$page}{$tablename};
+
+    return {
+        default_display_length => $rs ? $rs->default_display_length
+        : $list->{modules}{$module}{$page}{$tablename}{default_display_length},
+        default_sort_order => $rs ? $rs->default_sort_order
+        : $list->{modules}{$module}{$page}{$tablename}{default_sort_order}
+    };
 }
 
 sub get_modules {
diff --git a/Koha/Template/Plugin/TablesSettings.pm b/Koha/Template/Plugin/TablesSettings.pm
index 25df84e0ae..720b67445a 100644
--- a/Koha/Template/Plugin/TablesSettings.pm
+++ b/Koha/Template/Plugin/TablesSettings.pm
@@ -132,6 +132,9 @@ sub GetTableSettings {
     $format //= q{};
 
     my $settings = C4::Utils::DataTables::TablesSettings::get_table_settings( $module, $page, $table );
+    my $columns = C4::Utils::DataTables::TablesSettings::get_columns( $module, $page, $table );
+
+    $settings->{columns} = $columns;
 
     return $format eq 'json'
         ? to_json( $settings || {} )
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
index 42d4fb09bc..4d61b10534 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
@@ -3,12 +3,14 @@
 <!-- columns_settings.inc -->
 
 <script>
-function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) {
+function KohaTable(id_selector, dt_parameters, table_settings, add_filters) {
     var counter = 0;
     var hidden_ids = [];
     var included_ids = [];
     var selector = '#' + id_selector;
 
+    var columns_settings = table_settings['columns'];
+
     $(columns_settings).each( function() {
         var named_id = $( 'thead th[data-colname="' + this.columnname + '"]', selector ).index( selector + ' th' );
         var used_id = dt_parameters.bKohaColumnsUseNames ? named_id : counter;
@@ -182,6 +184,13 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) {
         });
     }
 
+    if ( table_settings.hasOwnProperty('default_display_length') ) {
+        new_parameters["pageLength"] = table_settings['default_display_length'];
+    }
+    if ( table_settings.hasOwnProperty('default_sort_order') ) {
+        new_parameters["order"] = [[ table_settings['default_sort_order'], 'asc' ]];
+    }
+
     table.dataTable(new_parameters);
     table.DataTable().on("column-visibility.dt", function(){
         if( typeof columnsInit == 'function' ){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index a716d459ae..e1ae56b631 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -982,19 +982,16 @@
         [% END %]
     [% END %]
     <script>
-        var columns_settings = [% TablesSettings.GetColumns( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
-        [% IF !(Koha.Preference('EDIFACT') && ediaccount) %]
-        columns_settings.splice(13,1);
-        [% END %]
-        [% SET table_settings = TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders' ) %];
         $(document).ready(function() {
+            var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
+            [% IF !(Koha.Preference('EDIFACT') && ediaccount) %]
+                table_settings['columns'].splice(13, 1);
+            [% END %]
             KohaTable("orders", {
                 "sPaginationType": "full",
                 "autoWidth": false,
                 "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13],
-                "iDisplayLength": [% table_settings.default_display_length | html %],
-                "order": [[ [% table_settings.default_sort_order | html %], 'asc']],
-            }, columns_settings);
+            }, table_settings);
 
             var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "sPaginationType": "full"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
index 96edad15e2..5055f29776 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
@@ -171,14 +171,11 @@
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'columns_settings.inc' %]
     <script>
-        var columns_settings = [% TablesSettings.GetColumns( 'reports', 'orders_by_fund', 'funds-table', 'json' ) | $raw %];
-        [% SET table_settings = TablesSettings.GetTableSettings( 'reports', 'orders_by_fund', 'funds-table' ) %];
+        var table_settings = [% TablesSettings.GetTableSettings( 'reports', 'orders_by_fund', 'funds-table', 'json' ) %];
         $(document).ready( function () {
             var funds_table = KohaTable("funds", {
-                "pageLength": [% table_settings.default_display_length | html %],
-                "order": [[ [% table_settings.default_sort_order | html %], 'asc']],
                 'autoWidth': false,
-            }, columns_settings );
+            }, table_settings );
 
             showallbudgets = $('#budgetfilter').html();
             $('#budgetfilter .b_inactive').remove();
-- 
2.39.5