From 91adc0968f6b6f58ce9e41f27d64de1ece5396b2 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                                | 11 +++++-
 .../prog/en/modules/ill/ill-requests.tt            | 44 +++++++++++++++++-----
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/ill/ill-requests.pl b/ill/ill-requests.pl
index 77a8d05560..a940b64157 100755
--- a/ill/ill-requests.pl
+++ b/ill/ill-requests.pl
@@ -167,8 +167,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:
@@ -179,6 +182,10 @@ if ( $backends_available ) {
             $request->price_paid($params->{price_paid});
             $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 e4fbfcb7c1..20eed87e62 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
@@ -192,7 +192,25 @@
                                 <li class="status">
                                     <label class="status">Status:</label>
                                     [% stat = request.status %]
-                                    [% request.capabilities.$stat.name | html %]
+                                    [% 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>
@@ -326,7 +344,11 @@
                                     </li>
                                     <li 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 %]
                                     </li>
                                     <li class="updated">
                                         <span class="label updated">Last updated:</span>
@@ -716,14 +738,18 @@
 
             // 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;
-                    return getStatusName(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;
+                        return getStatusName(status_name);
+                    } else {
+                        return '';
+                    }
                 }
             };
 
-- 
2.11.0