From 47848faa6d0b3a7e7bd6fcc1e15cdadc7433b615 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 3 May 2022 08:39:09 +0200
Subject: [PATCH] Bug 32030: Add table settings

Signed-off-by: Jonathan Field <jonathan.field@ptfs-europe.com>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 admin/columns_settings.yml                    | 23 +++++++++++++++++++
 .../prog/en/modules/admin/columns_settings.tt | 16 +++++++++++++
 .../prog/en/modules/erm/agreements.tt         |  2 +-
 .../js/vue/components/ERM/AgreementsList.vue  |  2 +-
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 53e0c4c3aa..ac2264aeef 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -719,6 +719,29 @@ modules:
               cannot_be_toggled: 1
               cannot_be_modified: 1
 
+  erm:
+    agreements:
+      agreements:
+        columns:
+            -
+              columnname: name
+            -
+              columnname: vendor
+            -
+              columnname: description
+            -
+              columnname: status
+            -
+              columnname: closure_reason
+            -
+              columnname: is_perpetual
+            -
+              columnname: renewal_priority
+            -
+              columnname: actions
+              cannot_be_toggled: 1
+              cannot_be_modified: 1
+
   illrequests:
     ill-requests:
       ill-requests:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
index 294fa77af0..d30f90d483 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
@@ -314,6 +314,22 @@
                                     </div> <!-- /.panel-collapse -->
                                 </div>
 
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" role="tab" id="ermHeading">
+                                        <h2 class="panel-title">
+                                            <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#erm" aria-expanded="false" aria-controls="collapseOne">
+                                                 Electronic resources management
+                                            </a>
+                                        </h2>
+                                    </div> <!-- /.panel-heading -->
+                                    <div id="erm" class="panel-collapse collapse" role="tabpanel" aria-labelledby="ermHeading">
+                                        <div class="panel-body">
+                                            <h3>Electronic resources management tables</h3>
+                                            [% PROCESS pagelist module=modules.erm modulename="erm" %]
+                                        </div> <!-- /.panel-body -->
+                                    </div> <!-- /.panel-collapse -->
+                                </div>
+
                                 <div class="panel panel-default">
                                     <div class="panel-heading" role="tab" id="illrequestsHeading">
                                         <h2 class="panel-title">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/erm/agreements.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/erm/agreements.tt
index 76c217a4b7..8680c6542d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/erm/agreements.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/erm/agreements.tt
@@ -73,7 +73,7 @@
         const agreement_renewal_priorities = [% To.json(AuthorisedValues.Get('ERM_AGREEMENT_RENEWAL_PRIORITY')) | $raw %];
         const agreement_user_roles = [% To.json(AuthorisedValues.Get('ERM_AGREEMENT_USER_ROLES')) | $raw %];
 
-        var columns_settings = [% TablesSettings.GetColumns( 'erm', 'agreements', 'table_agreements', 'json' ) | $raw %];
+        var table_settings = [% TablesSettings.GetTableSettings( 'erm', 'agreements', 'agreements', 'json' ) | $raw %];
         var agreements_table_url = '/api/v1/erm/agreements?';
 
         [% IF agreement_name_filter %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
index 9bf0bca56f..33d44afbee 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
@@ -179,7 +179,7 @@ export default {
                 $("#" + table_id).find("thead th").eq(6).attr('data-filter', 'av_renewal_priorities')
             }
 
-        }, columns_settings, 1)
+        }, table_settings, 1)
     },
     beforeUnmount() {
         $('#my_table')
-- 
2.39.5