From 13176b2936f97b9d5a32d568b0596ac240ce551c Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 21 Dec 2023 15:58:41 +0000
Subject: [PATCH] Bug 35628: Add resolution states to Catalog concerns

This patch adds ticket status to the catalog concerns feature. It
allows libraries to define a list of 'TICKET_STATUS' authorized
values from which librarians can then pick at the point of updateing
a catalog concern.

To test:
1) Apply the patches and run the database updates
2) Enable catalog concerns (staff or opac will do the trick)
3) Submit a catalog concern
4) Confirm that you can still update a concern from the catalog
   concerns management page as before.
5) Add some values to the new TICKET_STATUS authorized values
6) Submit a new catalog concern
7) Confirm that the 'Update' button in the management modal is now a
   split button with a dropdown containing the list of status values
   defined above.

Signed-off-by: Esther Melander <esther@bywatersolutions.com>
Signed-off-by: Ray Delahunty <lib-systems@arts.ac.uk>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 Koha/REST/V1/Tickets.pm                       |  6 ++++++
 .../en/includes/modals/display_ticket.inc     | 21 ++++++++++++++++++-
 .../prog/en/modules/cataloguing/concerns.tt   |  8 +++++--
 .../prog/js/modals/display_ticket.js          | 10 ++++++++-
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/Koha/REST/V1/Tickets.pm b/Koha/REST/V1/Tickets.pm
index 63fe386b64..17512a86d4 100644
--- a/Koha/REST/V1/Tickets.pm
+++ b/Koha/REST/V1/Tickets.pm
@@ -202,6 +202,12 @@ sub add_update {
             )->store;
         }
 
+        # Update ticket status if needed
+        if ( $ticket_update->{status} ) {
+            my $ticket = $update->ticket;
+            $ticket->set( { status => $ticket_update->{status} } )->store;
+        }
+
         # Optionally add to message_queue here to notify reporter
         if ( $update->public ) {
             my $notice =
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/display_ticket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/display_ticket.inc
index 3bf471ae4f..29c258d21b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/display_ticket.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/display_ticket.inc
@@ -1,3 +1,5 @@
+[% USE AuthorisedValues %]
+[% SET status = AuthorisedValues.GetAuthValueDropbox('TICKET_STATUS') %]
 <!-- Display updates concern modal -->
 <div class="modal" id="ticketDetailsModal" tabindex="-1" role="dialog" aria-labelledby="ticketDetailsLabel">
     <div class="modal-dialog modal-lg" role="document">
@@ -24,7 +26,24 @@
             <div class="modal-footer">
                 <input type="hidden" name="ticket_id" id="ticket_id">
                 <button type="button" class="btn btn-default" id="resolveTicket">Resolve <i id="resolve-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
-                <button type="submit" class="btn btn-primary" id="updateTicket">Comment <i id="comment-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
+                [% IF status.count %]
+                <div class="btn-group">
+                  <button type="button" class="btn btn-primary" id="updateTicket">Update <i id="comment-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
+                  <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <span class="caret"></span>
+                    <span class="sr-only">Select status</span>
+                  </button>
+                  <ul class="dropdown-menu">
+                    [% FOR st IN status %]
+                    <li>
+                      <a class="dropdown-item updateSubmit" type="button" data-status="[% st.authorised_value | html %]">[% st.lib | html_entity %]</a>
+                    </li>
+                    [% END %]
+                  </ul>
+                </div>
+                [% ELSE %]
+                <button type="submit" class="btn btn-primary updateSubmit" id="updateTicket">Update <i id="comment-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
+                [% END %]
             </div> <!-- /.modal-footer -->
         </div> <!-- /.modal-content -->
     </div> <!-- /.modal-dialog -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
index eeae5a31d6..98f638106b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
@@ -156,7 +156,7 @@
                         "orderable": true
                     },
                     {
-                        "data": "resolver.firstname:resolver.surname:resolved_date",
+                        "data": "resolver.firstname:resolver.surname:resolved_date:status",
                         "render": function(data, type, row, meta) {
                             let result = '';
                             if (row.resolved_date) {
@@ -166,7 +166,11 @@
                                 }) + '</span>';
                                 result += '<span class="clearfix">' + $datetime(row.resolved_date) + '</span>';
                             } else {
-                                result += _("Open");
+                                if (row.status) {
+                                    result += row.status;
+                                } else {
+                                    result += _("Open");
+                                }
                             }
                             return result;
                         },
diff --git a/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js b/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js
index a4541bc8ca..e180144267 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js
@@ -66,6 +66,12 @@ $(document).ready(function () {
                         " (" +
                         $datetime(item.date) +
                         ")</span>";
+                    if (item.status) {
+                        updates +=
+                            '<span class="pull-right">' +
+                            item.status +
+                            "</span>";
+                    }
                     updates += "</div>";
                 });
                 updates_display.html(updates);
@@ -77,12 +83,14 @@ $(document).ready(function () {
         $("#public").prop("checked", false);
     });
 
-    $("#ticketDetailsModal").on("click", "#updateTicket", function (e) {
+    $("#ticketDetailsModal").on("click", ".updateSubmit", function (e) {
+        let clicked = $(this);
         let ticket_id = $("#ticket_id").val();
         let params = {
             public: $("#public").is(":checked"),
             message: $("#update_message").val(),
             user_id: logged_in_user_borrowernumber,
+            status: clicked.data("status"),
         };
 
         $("#comment-spinner").show();
-- 
2.39.2