From 06cde076c7b19a8fb3b8f784aaeda02f90e06f53 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Tue, 23 Dec 2014 11:45:11 +0100
Subject: [PATCH] Bug 13492: Add the column configuration for the checkouts
 table - morember.pl

Test plan:
1/ Verify that you can show/hide columns on the checkouts table (moremember.pl).
2/ Play with the column configuration admin page (admin/columns_settings.pl),
and confirm the behavior is correct (depends on what you have selected).

Amended patch: replace 'un' and 'deux' with 'sort_order' and
'todays_or_previous_checkouts' in the yml file.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 admin/columns_settings.yml                    | 50 ++++++++++++++++++-
 .../prog/en/modules/members/moremember.tt     |  4 ++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index a01f6feb67..fc972ebc38 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -111,6 +111,52 @@ modules:
           cannot_be_toggled: 1
           cannot_be_modified: 1
 
+    moremember:
+      issues-table:
+        -
+          columnname: sort_order
+          cannot_be_toggled: 1
+          cannot_be_modified: 1
+          is_hidden: 1
+        -
+          columnname: todays_or_previous_checkouts
+          cannot_be_toggled: 1
+          cannot_be_modified: 1
+          is_hidden: 1
+        -
+          columnname: due_date_unformatted
+          cannot_be_toggled: 1
+          cannot_be_modified: 1
+          is_hidden: 1
+        -
+          columnname: due_date
+        -
+          columnname: title
+        -
+          columnname: item_type
+        -
+          columnname: checkout_on
+        -
+          columnname: checkout_from
+        -
+          columnname: callno
+        -
+          columnname: charge
+        -
+          columnname: price
+        -
+          columnname: renew
+          cannot_be_toggled: 1
+          cannot_be_modified: 1
+        -
+          columnname: checkin
+          cannot_be_toggled: 1
+          cannot_be_modified: 1
+        -
+          columnname: export
+          cannot_be_toggled: 1
+          cannot_be_modified: 1
+
   reports:
     lostitems:
       lostitems-table:
@@ -147,12 +193,12 @@ modules:
     circulation:
       issues-table:
         -
-          columnname: un
+          columnname: sort_order
           cannot_be_toggled: 1
           cannot_be_modified: 1
           is_hidden: 1
         -
-          columnname: deux
+          columnname: todays_or_previous_checkouts
           cannot_be_toggled: 1
           cannot_be_modified: 1
           is_hidden: 1
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index d01573b519..9536a22dd0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -1,5 +1,6 @@
 [% USE Koha %]
 [% USE KohaDates %]
+[% USE ColumnsSettings %]
 [% IF Koha.Preference('ExportRemoveFields') OR Koha.Preference('ExportWithCsvProfile') %]
    [% SET exports_enabled = 1 %]
 [% END %]
@@ -15,6 +16,7 @@
 [% INCLUDE 'calendar.inc' %]
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables.css" />
 [% INCLUDE 'datatables.inc' %]
+[% INCLUDE 'columns_settings.inc' %]
 [% INCLUDE 'strings.inc' %]
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script>
@@ -41,6 +43,8 @@ var relatives_borrowernumbers = new Array();
 var MSG_ADD_MESSAGE = _("Add a new message");
 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
 
+columns_settings = [% ColumnsSettings.GetColumns( 'member', 'moremember', 'issues-table', 'json' ) %]
+
 $(document).ready(function() {
     $('#finesholdsissues').tabs({
         // Correct table sizing for tables hidden in tabs
-- 
2.39.5