Attachment 80282 Details for Bug 20581 – Bug 20581: Add display of status_alias to staff vw

[patch] Bug 20581: Add display of status_alias to staff vw

Bug-20581-Add-display-of-statusalias-to-staff-vw.patch (text/plain), 7.72 KB, created by Andrew Isherwood on 2018-10-09 14:36:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2018-10-09 14:36:39 UTC

Size: 7.72 KB

patch

obsolete

>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

Actions: View | Diff | Splinter Review

Attachments on bug 20581: 74323 | 74324 | 74325 | 74326 | 74327 | 74362 | 75333 | 75334 | 75810 | 77819 | 77820 | 77821 | 77822 | 77823 | 77824 | 77825 | 77826 | 78376 | 78377 | 78378 | 78379 | 78380 | 78381 | 78382 | 78383 | 78384 | 78431 | 78515 | 78516 | 78517 | 78518 | 78519 | 78520 | 78521 | 78522 | 78523 | 80279 | 80280 | 80281 | 80282 | 80283 | 80284 | 80285 | 80286 | 80474 | 80475 | 80501 | 80503 | 80505 | 80598 | 80599 | 80600 | 82063 | 82064 | 82065 | 82066 | 82067 | 82068 | 82069 | 82070 | 82071 | 82072 | 82073 | 82074 | 82075 | 82076 | 82443 | 82444 | 82445 | 82446 | 82447 | 82448 | 82449 | 82450 | 82451 | 82452 | 82453 | 82454 | 82455 | 82456 | 82457 | 82458 | 82459 | 82460 | 82461 | 82462 | 82463 | 82464 | 82465 | 82466 | 82467 | 82468 | 82472 | 82483 | 82484 | 82485 | 82486 | 82487 | 82488 | 82489 | 82490 | 82491 | 82492 | 82493 | 82494 | 82495 | 82496 | 82733 | 84202 | 84404 | 84768 | 84770 | 84771 | 84772 | 84773 | 84774 | 84775 | 84776 | 84777 | 84778 | 84779 | 84780 | 84781 | 84782 | 84783 | 84784 | 84785 | 84791 | 84814 | 84818 | 84819 | 84844 | 84911 | 84912 | 84913 | 84914 | 84915 | 84916 | 84917 | 84918 | 84919 | 84920 | 84921 | 84922 | 84923 | 84924 | 84925 | 84926 | 84927 | 84928 | 84929 | 84930 | 84931 | 84964 | 85075 | 85076 | 85077 | 85078 | 85079 | 85080 | 85081 | 85082 | 85083 | 85084 | 85085 | 85086 | 85087 | 85088 | 85089 | 85090 | 85091 | 85092 | 85093 | 85094 | 85095 | 85096