View | Details | Raw Unified | Return to bug 35329
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-7 / +38 lines)
Lines 427-433 Link Here
427
                                "searchable": false,
427
                                "searchable": false,
428
                                "orderable": false,
428
                                "orderable": false,
429
                                "render": function( data, type, row, meta ) {
429
                                "render": function( data, type, row, meta ) {
430
                                    return "<label for='check" + data + "' class='content_hidden'>" + _("Select patron") + "</label><input type='checkbox' class='check" + data + "' class='selection' name='borrowernumber' value='" + data + "' />";
430
                                    return "<label for='check" + data + "' class='content_hidden'>" + _("Select patron") + "</label><input type='checkbox' class='check" + data + " selection' name='borrowernumber' value='" + data + "' />";
431
                                }
431
                                }
432
                            }
432
                            }
433
                            [% CASE 'cardnumber' %]
433
                            [% CASE 'cardnumber' %]
Lines 658-663 Link Here
658
658
659
            patron_search_form.on('submit', filter);
659
            patron_search_form.on('submit', filter);
660
            patron_search_form.on('submit', update_search_type);
660
            patron_search_form.on('submit', update_search_type);
661
            patron_search_form.on('submit', function(){
662
                parent_block.find(".searchheader").show();
663
            });
664
661
665
662
            $(".filterByLetter").on("click",function(e){
666
            $(".filterByLetter").on("click",function(e){
663
                e.preventDefault();
667
                e.preventDefault();
Lines 914-927 Link Here
914
918
915
                    <div id="[% search_results_block_id | html %]"> <!-- FIXME removed style from #searchresults, is that bad? -->
919
                    <div id="[% search_results_block_id | html %]"> <!-- FIXME removed style from #searchresults, is that bad? -->
916
                        [% IF columns.grep('checkbox').size %]
920
                        [% IF columns.grep('checkbox').size %]
917
                            <div class="searchheader fh-fixedHeader" id="searchheader" style="display:none;">
921
                            <div class="searchheader fh-fixedHeader" style="display:none;">
918
                                <div>
922
                                <div>
919
                                    <a href="#" class="btn btn-link" id="select_all"><i class="fa fa-check"></i> Select all</a>
923
                                    <a href="#" class="btn btn-link select_all"><i class="fa fa-check"></i> Select all</a>
920
                                    |
924
                                    |
921
                                    <a href="#" class="btn btn-link" id="clear_all"><i class="fa fa-remove"></i> Clear all</a>
925
                                    <a href="#" class="btn btn-link clear_all"><i class="fa fa-remove"></i> Clear all</a>
922
                                    [% IF selection_type == 'add' %]
926
                                    <button class="add-selected" class="btn btn-sm btn-default" type="submit">Add selected patrons</button>
923
                                    <button id="add-selected" class="btn btn-sm btn-default" type="submit">Add selected patrons</button>
924
                                    [% END %]
925
                                </div>
927
                                </div>
926
                            </div>
928
                            </div>
927
                        [% END %]
929
                        [% END %]
Lines 935-938 Link Here
935
        </div>
937
        </div>
936
    </div>
938
    </div>
937
    <div id="patron_preview_modal" class="basicModal"></div>
939
    <div id="patron_preview_modal" class="basicModal"></div>
940
941
    <script>
942
        $(document).ready(function() {
943
            let parent_block = $("#[% search_results_block_id | html %]");
944
            parent_block.find(".select_all").on("click",function(e){
945
                e.preventDefault();
946
                parent_block.find(".selection").prop("checked", true).change();
947
            });
948
            parent_block.find(".clear_all").on("click",function(e){
949
                e.preventDefault();
950
                parent_block.find(".selection").prop("checked", false).change();
951
            });
952
            parent_block.find(".searchheader").hide();
953
            parent_block.find(".clear_search").on("click",function(e){$("#searchheader").hide();});
954
955
            parent_block.find('.add-selected').on('click', function(e) {
956
                e.preventDefault();
957
                var counter = 0;
958
                parent_block.find('tr:has(.selection:checked) .add_user').each(function(){
959
                    var borrowernumber = $(this).data('borrowernumber');
960
                    var firstname = $(this).data('firstname');
961
                    var surname = $(this).data('surname');
962
                    add_user( borrowernumber, firstname + ' ' + surname );
963
                    counter++;
964
                });
965
                parent_block.find('.info').html(_("%s Patrons added.").format(counter)).show();
966
            });
967
        });
968
    </script>
938
[% END %]
969
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt (-10 / +12 lines)
Lines 2-7 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% PROCESS 'i18n.inc' %]
3
[% PROCESS 'i18n.inc' %]
4
[% SET footerjs = 1 %]
4
[% SET footerjs = 1 %]
5
[% PROCESS 'patron-search.inc' %]
5
    [% INCLUDE 'doc-head-open.inc' %]
6
    [% INCLUDE 'doc-head-open.inc' %]
6
    <title>[% FILTER collapse %]
7
    <title>[% FILTER collapse %]
7
        [% IF ( batch_id ) %]
8
        [% IF ( batch_id ) %]
Lines 83-89 Link Here
83
                                </div>
84
                                </div>
84
                            </form>
85
                            </form>
85
                            <div id="batch-manage" class="action">
86
                            <div id="batch-manage" class="action">
86
                                <a class="btn btn-default" id="additems" href="#"><i class="fa fa-plus"></i> Add patron(s)</a>[% IF ( table_loop ) %]
87
                                <a class="btn btn-default" id="additems" href="#patron_search_modal" data-toggle="modal"><i class="fa fa-plus"></i> Add patron(s)</a>[% IF ( table_loop ) %]
87
                                <a class="btn btn-default" id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a>
88
                                <a class="btn btn-default" id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a>
88
                                <a class="btn btn-default" id="removeitems" href="#"><i class="fa fa-trash-can"></i> Remove selected patrons</a>
89
                                <a class="btn btn-default" id="removeitems" href="#"><i class="fa fa-trash-can"></i> Remove selected patrons</a>
89
                                <a class="btn btn-default" id="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a>
90
                                <a class="btn btn-default" id="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a>
Lines 199-211 Link Here
199
        function Add() {
200
        function Add() {
200
            var bor_nums = document.getElementById("bor_num_list");
201
            var bor_nums = document.getElementById("bor_num_list");
201
            if (bor_nums.value == '') {
202
            if (bor_nums.value == '') {
202
                window.open("/cgi-bin/koha/members/search.pl?columns=checkbox,cardnumber,name,category,branch,dateexpiry,borrowernotes,action&selection_type=add",
203
                return true;
203
               'PatronPopup',
204
               'width=1024,height=768,location=yes,toolbar=no,'
205
               + 'scrollbars=yes,resize=yes');
206
            } else {
207
                document.forms["add_by_bor_num"].submit();
208
            }
204
            }
205
206
            document.forms["add_by_bor_num"].submit();
207
            return false
209
        };
208
        };
210
209
211
        function add_user(borrowernumber) {
210
        function add_user(borrowernumber) {
Lines 290-297 Link Here
290
                "autoWidth": false
289
                "autoWidth": false
291
            }));
290
            }));
292
            $("#additems").click(function(){
291
            $("#additems").click(function(){
293
                Add();
292
                return Add();
294
                return false;
295
            });
293
            });
296
            $("#removeitems").click(function(){
294
            $("#removeitems").click(function(){
297
                Remove();
295
                Remove();
Lines 376-381 Link Here
376
            });
374
            });
377
        });
375
        });
378
    </script>
376
    </script>
377
378
    [% INCLUDE 'select2.inc' %]
379
    [% SET columns = ['checkbox','cardnumber','name','category','branch','dateexpiry','borrowernotes','action'] %]
380
    [% PROCESS patron_search_modal columns => columns, modal_title => t("Add patrons") %]
381
    [% PROCESS patron_search_js columns => columns, actions => ["add"], preview_on_name_click => 1 %]
379
[% END %]
382
[% END %]
380
383
381
[% INCLUDE 'intranet-bottom.inc' %]
384
[% INCLUDE 'intranet-bottom.inc' %]
382
- 

Return to bug 35329