From f940ee8d8cb16eae0241185af66167f890784a6b Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 23 Jan 2019 14:48:31 +0000
Subject: [PATCH] Bug 22190: Add column configuration to patron category
 administration

This patch adds column configuration to the table of patron categories
in administration. No new defaults for the table are defined.

To test, apply the patch and clear your browser cache if necessary.

 - Go to Administration -> Patron categoires.
   - Test that the "Column visibility" button works to show and hide
     columns. The "actions" column should be excluded.
   - Test that export options (Excel, CSV, etc) exclude the "actions"
     column.
 - Go to Administration -> Columns settings and edit the default
   configuration of the patron categories table. Confirm that these
   changes are reflected in patron category administration.

Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 admin/columns_settings.yml                    | 34 +++++++++++++++++++
 .../prog/en/modules/admin/categories.tt       |  5 ++-
 koha-tmpl/intranet-tmpl/prog/js/categories.js |  7 ++--
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 8176529d76..8d636f1455 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -124,6 +124,40 @@ modules:
         -
           columnname: actions
 
+    categories:
+      patron_categories:
+        -
+          columnname: code
+        -
+          columnname: category_name
+        -
+          columnname: type
+        -
+          columnname: enrollment_period
+        -
+          columnname: age_required
+        -
+          columnname: upper_age_limit
+        -
+          columnname: enrollment_fee
+        -
+          columnname: overdue
+        -
+          columnname: lost_items
+        -
+          columnname: hold_fee
+        -
+          columnname: messaging
+        -
+          columnname: branches_limitations
+        -
+          columnname: default_privacy
+        -
+          columnname: actions
+          cannot_be_toggled: 1
+          cannot_be_modified: 1
+
+
   catalogue:
     detail:
       acquisitiondetails-table:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
index fd656f497d..d50e40615c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
@@ -3,6 +3,7 @@
 [% USE Koha %]
 [% USE KohaDates %]
 [% USE Price %]
+[% USE ColumnsSettings %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo; Patron categories &rsaquo; [% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode | html %]'[% ELSE %]New category[% END %][% END %]
@@ -338,7 +339,7 @@
         You Searched for [% searchfield | html %]</span>
     [% END %]
     [% IF categories%]
-        <table id="table_categorie">
+        <table id="patron_categories">
             <thead>
                 <tr>
                     <th scope="col">Code</th>
@@ -500,9 +501,11 @@
     [% Asset.js("js/messaging-preference-form.js") | $raw %]
     [% INCLUDE 'calendar.inc' %]
     [% INCLUDE 'datatables.inc' %]
+    [% INCLUDE 'columns_settings.inc' %]
     <script>
         var MSG_CATEGORYCODE_CHARS = _("Category code can only contain the following characters: letters, numbers, - and _.");
         var MSG_ONE_ENROLLMENTPERIOD = ("Please choose an enrollment period in months OR by date.");
+        var columns_settings = [% ColumnsSettings.GetColumns( 'admin', 'categories', 'patron_categories', 'json' ) | $raw %];
     </script>
     [% Asset.js("js/categories.js") | $raw %]
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/categories.js b/koha-tmpl/intranet-tmpl/prog/js/categories.js
index 2751afdd53..fb6aafb989 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/categories.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/categories.js
@@ -21,7 +21,7 @@ jQuery.validator.addMethod( "enrollment_period", function(){
 
 
 $(document).ready(function() {
-    $("#table_categorie").dataTable($.extend(true, {}, dataTablesDefaults, {
+    KohaTable("patron_categories", {
         "aoColumnDefs": [{
             "aTargets": [-1],
             "bSortable": false,
@@ -33,8 +33,9 @@ $(document).ready(function() {
         "aaSorting": [
             [1, "asc"]
         ],
-        "sPaginationType": "four_button"
-    }));
+        "sPaginationType": "four_button",
+        "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12],
+    }, columns_settings);
 
     $("#enrolmentperioddate").datepicker({
         minDate: 1
-- 
2.39.5