From 3a08183a5145ca9b134f9eadae91b8b7f0440da1 Mon Sep 17 00:00:00 2001
From: Pedro Amorim <pjamorim91@gmail.com>
Date: Tue, 8 Nov 2022 14:53:07 -0100
Subject: [PATCH] Bug 30719: Batch requests minor misc improvements

- Fix wrong link in message in case there are no requests batch
- Detail of batch update - View status of any request within a batch
- Fix typo to correctly display status code on batch statuses list
---
 .../prog/en/includes/ill-batch-modal.inc             |  1 +
 .../prog/en/modules/admin/ill_batch_statuses.tt      |  4 ++--
 koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js   | 12 +++++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal.inc
index f0abfa8a64..d6df6f5bc7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal.inc
@@ -74,6 +74,7 @@
                                 <th scope="col">Identifier value</th>
                                 <th scope="col">Metadata</th>
                                 <th scope="col">Request ID</th>
+                                <th scope="col">Request Status</th>
                                 <th scope="col"></th>
                             </tr>
                         </thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt
index 0bf6e5f53d..c47cc27e2c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt
@@ -132,7 +132,7 @@
                                 [% FOREACH status IN statuses %]
                                 <tr>
                                     <td>[% status.name | html %]</td>
-                                    <td>[% name.code | html %]</td>
+                                    <td>[% status.code | html %]</td>
                                     <td>[% status.is_system ? "Yes" : "No" | html %]</td>
                                     <td class="actions">
                                         <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/ill_batch_statuses.pl?op=add_form&amp;code=[% status.code | uri %]"><i class="fa fa-pencil"></i> Edit</a>
@@ -146,7 +146,7 @@
                         </table>
                     [% ELSE %]
                         <div class="dialog message">
-                            There are no batch statuses defined. <a href="/cgi-bin/koha/admin/debit_types.pl?op=add_form">Create new batch status</a>
+                            There are no batch statuses defined. <a href="/cgi-bin/koha/admin/ill_batch_statuses.pl?op=add_form">Create new batch status</a>
                         </div>
                     [% END %]
                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js b/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js
index 70f9e29c5a..829b344eee 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js
@@ -299,6 +299,7 @@
                 tableContent.data = tableContent.data.map(function (row) {
                     if (row.value === identifier) {
                         row.requestId = data.illrequest_id;
+                        row.requestStatus = data.status;
                     }
                     return row;
                 });
@@ -893,6 +894,10 @@
         return data.requestId || '-';
     }
 
+    function createRequestStatus(x, y, data) {
+        return data.requestStatus || '-';
+    }
+
     function buildTable(identifiers) {
         table = KohaTable('identifier-table', {
             processing: true,
@@ -918,9 +923,14 @@
                 },
                 {
                     data: 'requestId',
-                    width: '13%',
+                    width: '6.5%',
                     render: createRequestId
                 },
+                {
+                    data: 'requestStatus',
+                    width: '6.5%',
+                    render: createRequestStatus
+                },
                 {
                     width: '18%',
                     render: createActions,
-- 
2.25.1