From b6433914f19df12310eae73cca1e04a09f6e7097 Mon Sep 17 00:00:00 2001
From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
Date: Tue, 17 Apr 2018 12:03:07 +0100
Subject: [PATCH] Bug 20581: Add display of status_alias to staff vw

- This patch adds display of the new status_alias value, when set, in
favour of the request's status value.
- It also allows the user to set a status_alias for an existing request.
When set, this value will be displayed in preference to the status.

Signed-off-by: Niamh.Walker-Headon@it-tallaght.ie
---
 ill/ill-requests.pl                                | 12 +++-
 .../prog/en/modules/ill/ill-requests.tt            | 83 ++++++++++++++--------
 2 files changed, 63 insertions(+), 32 deletions(-)

diff --git a/ill/ill-requests.pl b/ill/ill-requests.pl
index 48190b6a26..74037415da 100755
--- a/ill/ill-requests.pl
+++ b/ill/ill-requests.pl
@@ -61,7 +61,6 @@ if ( $backends_available ) {
     if ( $op eq 'illview' ) {
         # View the details of an ILL
         my $request = Koha::Illrequests->find($params->{illrequest_id});
-
         $template->param(
             request => $request
         );
@@ -119,8 +118,11 @@ if ( $backends_available ) {
                 value   => {}
             };
             $template->param(
-                whole   => $backend_result,
-                request => $request
+                whole          => $backend_result,
+                request        => $request,
+                status_aliases => scalar Koha::AuthorisedValues->search(
+                    { category => 'ILLSTATUS' }
+                )
             );
         } else {
             # Commit:
@@ -130,6 +132,10 @@ if ( $backends_available ) {
             $request->branchcode($params->{branchcode});
             $request->notesopac($params->{notesopac});
             $request->notesstaff($params->{notesstaff});
+            my $alias = ($params->{status_alias} =~ /\d/) ?
+                $params->{status_alias} :
+                undef;
+            $request->status_alias($alias);
             $request->store;
             my $backend_result = {
                 error   => 0,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
index 465c25d438..057cec7762 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -128,33 +128,36 @@
 
         // Render function for request status
         var createStatus = function(data, type, row, meta) {
-            var origData = meta.settings.oInit.originalData;
-            if (origData.length > 0) {
-                var status_name = meta.settings.oInit.originalData[0].capabilities[
-                    row.status
-                ].name;
-                switch( status_name ) {
-                    case "New request":
-                        return _("New request");
-                    case "Requested":
-                        return _("Requested");
-                    case "Requested from partners":
-                        return _("Requested from partners");
-                    case "Request reverted":
-                        return _("Request reverted");
-                    case "Queued request":
-                        return _("Queued request");
-                    case "Cancellation requested":
-                        return _("Cancellation requested");
-                    case "Completed":
-                        return _("Completed");
-                    case "Delete request":
-                        return _("Delete request");
-                    default:
-                        return status_name;
-                }
+            if (row.status_alias) {
+                return row.status_alias.authorised_value;
             } else {
-                return '';
+                var origData = meta.settings.oInit.originalData;
+                if (origData.length > 0) {
+                    var status_name = meta.settings.oInit.originalData[0]
+                        .capabilities[row.status].name;
+                    switch( status_name ) {
+                        case "New request":
+                            return _("New request");
+                        case "Requested":
+                            return _("Requested");
+                        case "Requested from partners":
+                            return _("Requested from partners");
+                        case "Request reverted":
+                            return _("Request reverted");
+                        case "Queued request":
+                            return _("Queued request");
+                        case "Cancellation requested":
+                            return _("Cancellation requested");
+                        case "Completed":
+                            return _("Completed");
+                        case "Delete request":
+                            return _("Delete request");
+                        default:
+                            return status_name;
+                    }
+                } else {
+                    return '';
+                }
             }
         };
 
@@ -428,8 +431,26 @@
                                 </li>
                                 <li class="status">
                                     <label class="status">Status:</label>
-                                    [% stat = request.status | html %]
-                                    [% request.capabilities.$stat.name | html %]
+                                    [% stat = request.status %]
+                                    [% current_alias = request.status_alias %]
+                                    <select id="status_alias" name="status_alias">
+                                        [% IF !current_alias %]
+                                        <option value="" selected>
+                                        [% ELSE %]
+                                        <option value="">
+                                        [% END %]
+                                            [% request.capabilities.$stat.name | html %]
+                                        </option>
+                                        [% FOREACH alias IN status_aliases %]
+                                            [% IF alias.id == current_alias %]
+                                            <option value="[% alias.id %]" selected>
+                                            [% ELSE %]
+                                            <option value="[% alias.id %]">
+                                            [% END %]
+                                                [% alias.authorised_value | html %]
+                                            </option>
+                                        [% END %]
+                                    </select>
                                 </li>
                                 <li class="updated">
                                     <label class="updated">Last updated:</label>
@@ -529,7 +550,11 @@
                                 </div>
                                 <div class="status">
                                     <span class="label status">Status:</span>
-                                    [% request.capabilities.$req_status.name | html %]
+                                    [% IF request.statusalias %]
+                                        [% request.statusalias.authorised_value | html %]
+                                    [% ELSE %]
+                                        [% request.capabilities.$req_status.name | html%]
+                                    [% END %]
                                 </div>
                                 <div class="updated">
                                     <span class="label updated">Last updated:</span>
-- 
2.11.0