From 3abfe484f94720992a25855cada94b3b5aab4e34 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 7 May 2024 09:45:56 +0100
Subject: [PATCH] Bug 36757: Sync concerns tables

This patch re-syncs the two catalog concerns display tables markup. We
add the 'Title' field into the catalog/detail version of the table and
split the columns settings so you can control the table distinctly from
the cataloguing module version so we can hide 'title' by default in the
details display tab.

This results in the table matching the display from the cataloguing
module page, i.e. the assignee and status detail displays.

Signed-off-by: Andrew Fuerste Henry <andrewfh@dubcolib.org>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 admin/columns_settings.yml                    | 18 +++++++++
 .../prog/en/modules/catalogue/detail.tt       | 38 ++++++++++++++++---
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index b7e0bf441f..a745675e46 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -573,6 +573,24 @@ modules:
               cannot_be_toggled: 1
               cannot_be_modified: 1
 
+    concerns:
+      table_concerns:
+        default_sort_order: 0
+        columns:
+            -
+              columnname: reported
+            -
+              columnname: details
+            -
+              columnname: title
+              is_hidden: 1
+            -
+              columnname: status
+            -
+              columnname: actions
+              cannot_be_toggled: 1
+              cannot_be_modified: 1
+
   cataloguing:
     addbooks:
       reservoir-table:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 8787cfc305..ac0904c3ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -673,6 +673,7 @@
             <tr>
                 <th>Reported</th>
                 <th>Details</th>
+                <th>Title</th>
                 <th>Status</th>
                 <th data-class-name="actions noExport">Actions</th>
             </tr>
@@ -1024,7 +1025,7 @@
      [% IF ( ( Koha.Preference('CatalogConcerns') || Koha.Preference('OpacCatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue ) %]
          <script>
             $(document).ready(function() {
-                var table_settings = [% TablesSettings.GetTableSettings( 'cataloguing', 'concerns', 'table_concerns', 'json' ) | $raw %];
+                var table_settings = [% TablesSettings.GetTableSettings( 'catalogue', 'concerns', 'table_concerns', 'json' ) | $raw %];
 
                 var filtered = false;
                 let additional_filters = {
@@ -1045,13 +1046,16 @@
                         "url": tickets_url
                     },
                     "embed": [
+                        "assignee",
                         "reporter",
                         "resolver",
+                        "biblio",
                         "updates+count",
+                        "+strings"
                     ],
                     'emptyTable': '<div class="dialog message">' + _("Congratulations, there are no catalog concerns.") + '</div>',
                     "columnDefs": [ {
-                        "targets": [0,1,2],
+                        "targets": [0,1,2,3],
                         "render": function (data, type, row, meta) {
                             if ( type == 'display' ) {
                                 if ( data != null ) {
@@ -1093,7 +1097,17 @@
                             "orderable": true
                         },
                         {
-                            "data": "resolved_date",
+                            "data": "biblio.title",
+                            "render": function(data, type, row, meta) {
+                                return $biblio_to_html(row.biblio, {
+                                    link: 1
+                                });
+                            },
+                            "searchable": true,
+                            "orderable": true
+                        },
+                        {
+                            "data": "assignee.firstname:assignee.surname:resolver.firstname:resolver.surname:resolved_date:status",
                             "render": function(data, type, row, meta) {
                                 let result = '';
                                 if (row.resolved_date) {
@@ -1101,9 +1115,23 @@
                                         display_cardnumber: false,
                                         url: true
                                     }) + '</span>';
+                                    if (row.status) {
+                                        result += ' ' + _("as") + ' ';
+                                        result += row._strings.status ? escape_str(row._strings.status.str) : "";
+                                    }
                                     result += '<span class="clearfix">' + $datetime(row.resolved_date) + '</span>';
                                 } else {
-                                    result += _("Open");
+                                    if (row.status) {
+                                        result += row._strings.status ? escape_str(row._strings.status.str) : "";
+                                    } else {
+                                        result += _("Open");
+                                    }
+                                    if (row.assignee) {
+                                        result += '<span class="clearfix">' + _("Assigned to: ") + $patron_to_html(row.assignee, {
+                                            display_cardnumber: false,
+                                            url: true
+                                        }) + '</span>';
+                                    }
                                 }
                                 return result;
                             },
@@ -1113,7 +1141,7 @@
                         {
                             "data": function(row, type, val, meta) {
                                 let resolved = ( row.resolved_date ) ? true : false;
-                                let result = '<a class="btn btn-default btn-xs" role="button" href="#" data-toggle="modal" data-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '" data-resolved="' + resolved + '"><i class="fa-solid fa-eye" aria-hidden="true"></i> ' + _("Details") + '</a>';
+                                let result = '<a class="btn btn-default btn-xs" role="button" href="#" data-toggle="modal" data-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '" data-resolved="' + resolved + '" data-assignee="'+$patron_to_html(row.assignee, { display_cardnumber: false, url: false })+'"><i class="fa-solid fa-eye" aria-hidden="true"></i> ' + _("Details") + '</a>';
                                 return result;
                             },
                             "searchable": false,
-- 
2.39.5