Attachment 102291 Details for Bug 23173 – Bug 23173: (follow-up) Display available partners

[patch] Bug 23173: (follow-up) Display available partners

Bug-23173-follow-up-Display-available-partners.patch (text/plain), 3.95 KB, created by Kyle M Hall (khall) on 2020-04-02 11:59:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2020-04-02 11:59:13 UTC

Size: 3.95 KB

patch

obsolete

>From 8f18620735318e19629c5427643d852682a3208f Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Mon, 16 Mar 2020 12:06:03 +0000
>Subject: [PATCH] Bug 23173: (follow-up) Display available partners
>
>When selecting partners for search during the "Place request with
>partner libraries" workflow, there was no indication of which partners
>could actually be searched (i.e. are attached to a Z target and enabled
>for partner search). We now list them
>
>Signed-off-by: Niamh Walker-Headon <Niamh.Walker-Headon@tudublin.ie>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> .../prog/css/src/staff-global.scss            |  4 ++++
> .../prog/en/modules/ill/ill-requests.tt       |  5 ++++-
> .../prog/js/ill-availability-partner.js       | 19 ++++++++++++++++++-
> 3 files changed, 26 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>index 403f00e1e9..a9f1b247d7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -3760,6 +3760,10 @@ input.renew {
>         transform: translateY(-50%);
>     }
> 
>+    #generic_confirm_search_count {
>+        margin: 1em 0 1em 10em;
>+    }
>+
>     #generic_confirm_search {
>         display: block;
>         visibility: hidden;
>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 e2166f89d9..39768608b5 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
>@@ -298,7 +298,10 @@
>                                             [% END %]
>                                         </select>
>                                         [% IF Koha.Preference('ILLCheckAvailability') %]
>-                                            <button type="button" id="generic_confirm_search">Search selected partners</button>
>+                                            <div id="generic_confirm_search_count">Partners available for searching: <span id="generic_confirm_enabled">none</span></div>
>+                                            <div id="generic_confirm_search">
>+                                                <button type="button">Search selected partners</button>
>+                                            </div>
>                                         [% END %]
>                                     </li>
>                                     <li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/ill-availability-partner.js b/koha-tmpl/intranet-tmpl/prog/js/ill-availability-partner.js
>index 07f3664c20..cc5074bbf1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/ill-availability-partner.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/ill-availability-partner.js
>@@ -1,8 +1,21 @@
> $(document).ready(function() {
>+    var enabled_names = [];
>+    $('#partners option').each(function() {
>+        var partner = $(this);
>+        var partner_id = partner.data('partner-id');
>+        if (isEnabled(partner_id)) {
>+            enabled_names.push(partner.text().trim());
>+        }
>+    });
>+    $('#generic_confirm_enabled').text(enabled_names.join(', '));
>+
>     $('#partners').change(function() {
>         var selected = [];
>         $('#partners option:selected').each(function() {
>-            selected.push($(this).data('partner-id'));
>+            var partner_id = $(this).data('partner-id');
>+            if (isEnabled(partner_id)) {
>+                selected.push(partner_id);
>+            }
>         });
>         if (selected.length > 0) {
>             $('#generic_confirm_search').css('visibility', 'initial');
>@@ -21,4 +34,8 @@ $(document).ready(function() {
>     $('#partnerSearch').on('hide.bs.modal', function() {
>         $.fn.dataTable.tables({ api: true }).destroy();
>     });
>+
>+    function isEnabled(id) {
>+        return services[0].enabled.indexOf(id.toString()) > -1;
>+    };
> });
>-- 
>2.24.1 (Apple Git-126)

Actions: View | Diff | Splinter Review

Attachments on bug 23173: 91464 | 91465 | 92107 | 92108 | 92539 | 92540 | 92550 | 92551 | 92640 | 92641 | 92693 | 92694 | 92695 | 92715 | 92716 | 92717 | 93146 | 93147 | 93148 | 93909 | 93910 | 93911 | 95268 | 95269 | 95270 | 98521 | 99083 | 100724 | 100725 | 100740 | 102179 | 102180 | 102181 | 102182 | 102183 | 102184 | 102286 | 102287 | 102288 | 102289 | 102290 | 102291 | 102292 | 102293 | 102294