projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a60c1b7)
Bug 27016: Make the pickup locations dropdowns use Select2
authorTomas Cohen Arazi <tomascohen@theke.io>
Tue, 17 Nov 2020 15:08:39 +0000 (12:08 -0300)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 4 Jan 2021 15:33:15 +0000 (16:33 +0100)
On the shoulders of bug 27015, this patch makes the pickup locations
dropdowns use Select2 to handle both fetching the pickup location
on-deman through the API, and also searching for them.

This provides a better user experience for really big lists.

To test:
1. Have some holds on a biblio
=> SUCCESS: Bug 26988 works, made it load the data when you click on the
dropdowns.
2. Apply this patch
3. Reload the page
=> SUCCESS: Similar-ish behaviour
=> SUCCESS: Notice you can search for branch names and make the list
shrink
4. Sign off :-D

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt patch | blob | history
koha-tmpl/intranet-tmpl/prog/js/holds.js patch | blob | history

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index f479387c7efb39e33639db6517782bd7e558b39b..95f55fd9605e6b1b26a2c1211e1f8eabd4a37d55 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -19,6 +19,9 @@
 </head>
 
 <body id="circ_request" class="catalog">
+<script>
+    var select2Width = "100%";
+</script>
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'circ-search.inc' %]
 
@@ -985,7 +988,7 @@
     [% INCLUDE 'columns_settings.inc' %]
     [% Asset.js("lib/hc-sticky.js") | $raw %]
     [% Asset.js("js/circ-patron-search-results.js") | $raw %]
-    [% Asset.js("js/holds.js") | $raw %]
+    [% INCLUDE 'select2.inc' %]
     <script>
         var Sticky;
         var biblionumber = "[% biblionumber | $raw %]";
@@ -1150,6 +1153,38 @@
                 });
             [% END %]
 
+            $(".pickup_location_dropdown").each( function () {
+                var this_dropdown = $(this);
+                var hold_id = $(this).data('hold_id');
+
+                this_dropdown.select2({
+                    ajax: {
+                        url: '/api/v1/holds/' + encodeURIComponent(hold_id) + '/pickup_locations',
+                        allowClear: false,
+                        delay: 300, // wait 300 milliseconds before triggering the request
+                        dataType: 'json',
+                        data: function (params) {
+                            var search_term = (params.term === undefined) ? '' : params.term;
+                            var query = {
+                                "q": JSON.stringify({"name":{"-like":search_term+'%'}})
+                            };
+                            return query;
+                        },
+                        processResults: function (data) {
+                            var results = [];
+                            data.forEach( function ( library ) {
+                                results.push(
+                                    {
+                                        "id": library.library_id.escapeHtml(),
+                                        "text": library.name.escapeHtml()
+                                    }
+                                );
+                            });
+                            return { "results": results };
+                        }
+                    }
+                });
+            });
         });
 
         function check() {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js
index 66dd265a14ea5c6fd89618f0a0baa54e5964f8c2..134194bbfd97dbcd8d13cfcc4c901ab124b12bef 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/js/holds.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js
@@ -301,35 +301,4 @@ $(document).ready(function() {
           }
         });
     });
-
-    $(".pickup_location_dropdown").on( "focus",function(){
-        var this_dropdown = $(this);
-        if(this_dropdown.data('loaded')===1){ return true};
-        var hold_id = $(this).data('hold_id');
-        $(".loading_"+hold_id).show();
-        var preselected = $(this).data('selected');
-        var api_url = '/api/v1/holds/' + encodeURIComponent(hold_id) + '/pickup_locations';
-        $.ajax({
-            method: "GET",
-            url: api_url,
-            success: function( data ){
-                var dropdown = "";
-                $.each(data, function(index,library) {
-                    if( preselected == library.library_id ){
-                        selected = ' selected="selected" ';
-                    } else { selected = ""; }
-                    dropdown += '<option value="' + library.library_id.escapeHtml() + '"' + selected + '>' + library.name.escapeHtml() + '</option>';
-                });
-                this_dropdown.html(dropdown);
-                this_dropdown.data("loaded",1);
-                $(".loading_"+hold_id).hide();
-            },
-            error: function( jqXHR, textStatus, errorThrown) {
-                alert('There was an error:'+textStatus+" "+errorThrown);
-                $(".loading_"+hold_id).hide();
-            },
-        });
-    });
-
-
 });
Main Koha release repository