From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Wed, 18 Mar 2015 11:56:07 +0000 (+0100)
Subject: Bug 13864: Columns configuration - Late orders
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=31df3893376adcde95612f7eb4b6848114806fce;p=koha.git

Bug 13864: Columns configuration - Late orders

This patch adds the ability to hide columns on the late orders page
(acqui/lateorders.pl).

Test plan:
Go on the late orders page and confirm you are able to hide columns.
You can also play with the columns configuration admin page and confirm
that the behaviors are consistent.

Signed-off-by: Marc Véron <veron@veron.ch>

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

http://bugs.koha-community.org/show_bug.cgi?id=13875
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 9e9a49ce95..5222253489 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -1,4 +1,34 @@
 modules:
+  acqui:
+    lateorders:
+      late_orders:
+        -
+          columnname: checkbox
+          cannot_be_toggled: 1
+          cannot_be_modified: 1
+        -
+          columnname: order_date
+        -
+          columnname: estimated_delivery_date
+        -
+          columnname: vendor
+        -
+          columnname: information
+        -
+          columnname: total_cost
+        -
+          columnname: basket
+        -
+          columnname: basket_group
+        -
+          columnname: library
+        -
+          columnname: fund
+        -
+          columnname: claims_count
+        -
+          columnname: claimed_date
+
   admin:
     currency:
       currencies-table:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index d794d74f0b..70a15be948 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -1,10 +1,12 @@
 [% USE KohaDates %]
 [% USE Branches %]
+[% USE ColumnsSettings %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Late orders</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'datatables.inc' %]
+[% INCLUDE 'columns_settings.inc' %]
 <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 [% INCLUDE 'calendar.inc' %]
 <script type="text/javascript">
@@ -23,7 +25,8 @@ function check_uncheck() {
 
 $(document).ready(function() {
 
-    late_orderst = $("#late_orders").dataTable($.extend(true, {}, dataTablesDefaults, {
+    var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'lateorders', 'late_orders', 'json' ) %];
+    late_orderst = KohaTable("#late_orders", {
         "aoColumnDefs": [
             { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false },
             { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
@@ -37,7 +40,7 @@ $(document).ready(function() {
                 $('input:checkbox[name=ordernumber]').bind('click', check_uncheck);
             };
         }
-    } ) );
+    }, columns_settings );
     $('input:checkbox[name=ordernumber]').bind('click', check_uncheck);
     $('#CheckAll').click(function(){ $(late_orderst.fnGetNodes()).find("td").checkCheckboxes();});
     $('#CheckNone').click(function(){ $(late_orderst.fnGetNodes()).find("td").unCheckCheckboxes();});