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 426-432 Link Here
426
                                "searchable": false,
426
                                "searchable": false,
427
                                "orderable": false,
427
                                "orderable": false,
428
                                "render": function( data, type, row, meta ) {
428
                                "render": function( data, type, row, meta ) {
429
                                    return "<label for='check" + data + "' class='content_hidden'>" + _("Select patron") + "</label><input type='checkbox' class='check" + data + "' class='selection' name='borrowernumber' value='" + data + "' />";
429
                                    return "<label for='check" + data + "' class='content_hidden'>" + _("Select patron") + "</label><input type='checkbox' class='check" + data + " selection' name='borrowernumber' value='" + data + "' />";
430
                                }
430
                                }
431
                            }
431
                            }
432
                            [% CASE 'cardnumber' %]
432
                            [% CASE 'cardnumber' %]
Lines 657-662 Link Here
657
657
658
            patron_search_form.on('submit', filter);
658
            patron_search_form.on('submit', filter);
659
            patron_search_form.on('submit', update_search_type);
659
            patron_search_form.on('submit', update_search_type);
660
            patron_search_form.on('submit', function(){
661
                parent_block.find(".searchheader").show();
662
            });
663
660
664
661
            $(".filterByLetter").on("click",function(e){
665
            $(".filterByLetter").on("click",function(e){
662
                e.preventDefault();
666
                e.preventDefault();
Lines 913-926 Link Here
913
917
914
                    <div id="[% search_results_block_id | html %]"> <!-- FIXME removed style from #searchresults, is that bad? -->
918
                    <div id="[% search_results_block_id | html %]"> <!-- FIXME removed style from #searchresults, is that bad? -->
915
                        [% IF columns.grep('checkbox').size %]
919
                        [% IF columns.grep('checkbox').size %]
916
                            <div class="searchheader fh-fixedHeader" id="searchheader" style="display:none;">
920
                            <div class="searchheader fh-fixedHeader" style="display:none;">
917
                                <div>
921
                                <div>
918
                                    <a href="#" class="btn btn-link" id="select_all"><i class="fa fa-check"></i> Select all</a>
922
                                    <a href="#" class="btn btn-link select_all"><i class="fa fa-check"></i> Select all</a>
919
                                    |
923
                                    |
920
                                    <a href="#" class="btn btn-link" id="clear_all"><i class="fa fa-remove"></i> Clear all</a>
924
                                    <a href="#" class="btn btn-link clear_all"><i class="fa fa-remove"></i> Clear all</a>
921
                                    [% IF selection_type == 'add' %]
925
                                    <button class="add-selected" class="btn btn-sm btn-default" type="submit">Add selected patrons</button>
922
                                    <button id="add-selected" class="btn btn-sm btn-default" type="submit">Add selected patrons</button>
923
                                    [% END %]
924
                                </div>
926
                                </div>
925
                            </div>
927
                            </div>
926
                        [% END %]
928
                        [% END %]
Lines 934-937 Link Here
934
        </div>
936
        </div>
935
    </div>
937
    </div>
936
    <div id="patron_preview_modal" class="basicModal"></div>
938
    <div id="patron_preview_modal" class="basicModal"></div>
939
940
    <script>
941
        $(document).ready(function() {
942
            let parent_block = $("#[% search_results_block_id | html %]");
943
            parent_block.find(".select_all").on("click",function(e){
944
                e.preventDefault();
945
                parent_block.find(".selection").prop("checked", true).change();
946
            });
947
            parent_block.find(".clear_all").on("click",function(e){
948
                e.preventDefault();
949
                parent_block.find(".selection").prop("checked", false).change();
950
            });
951
            parent_block.find(".searchheader").hide();
952
            parent_block.find(".clear_search").on("click",function(e){$("#searchheader").hide();});
953
954
            parent_block.find('.add-selected').on('click', function(e) {
955
                e.preventDefault();
956
                var counter = 0;
957
                parent_block.find('tr:has(.selection:checked) .add_user').each(function(){
958
                    var borrowernumber = $(this).data('borrowernumber');
959
                    var firstname = $(this).data('firstname');
960
                    var surname = $(this).data('surname');
961
                    add_user( borrowernumber, firstname + ' ' + surname );
962
                    counter++;
963
                });
964
                parent_block.find('.info').html(_("%s Patrons added.").format(counter)).show();
965
            });
966
        });
967
    </script>
937
[% END %]
968
[% 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 85-91 Link Here
85
                                </div>
86
                                </div>
86
                            </form>
87
                            </form>
87
                            <div id="batch-manage" class="action">
88
                            <div id="batch-manage" class="action">
88
                                <a class="btn btn-default" id="additems" href="#"><i class="fa fa-plus"></i> Add patron(s)</a>
89
                                <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 ) %]
89
                                [% IF ( table_loop ) %]
90
                                [% IF ( table_loop ) %]
90
                                <a class="btn btn-default" id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a>
91
                                <a class="btn btn-default" id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a>
91
                                <a class="btn btn-default" id="removeitems" href="#"><i class="fa fa-trash-can"></i> Remove selected patrons</a>
92
                                <a class="btn btn-default" id="removeitems" href="#"><i class="fa fa-trash-can"></i> Remove selected patrons</a>
Lines 222-234 Link Here
222
        function Add() {
223
        function Add() {
223
            var bor_nums = document.getElementById("bor_num_list");
224
            var bor_nums = document.getElementById("bor_num_list");
224
            if (bor_nums.value == '') {
225
            if (bor_nums.value == '') {
225
                window.open("/cgi-bin/koha/members/search.pl?columns=checkbox,cardnumber,name,category,branch,dateexpiry,borrowernotes,action&selection_type=add",
226
                return true;
226
               'PatronPopup',
227
               'width=1024,height=768,location=yes,toolbar=no,'
228
               + 'scrollbars=yes,resize=yes');
229
            } else {
230
                document.forms["add_by_bor_num"].submit();
231
            }
227
            }
228
229
            document.forms["add_by_bor_num"].submit();
230
            return false
232
        };
231
        };
233
232
234
        function add_user(borrowernumber) {
233
        function add_user(borrowernumber) {
Lines 316-323 Link Here
316
                "autoWidth": false
315
                "autoWidth": false
317
            }));
316
            }));
318
            $("#additems").click(function(){
317
            $("#additems").click(function(){
319
                Add();
318
                return Add();
320
                return false;
321
            });
319
            });
322
            $("#removeitems").click(function(){
320
            $("#removeitems").click(function(){
323
                Remove();
321
                Remove();
Lines 385-390 Link Here
385
            });
383
            });
386
        });
384
        });
387
    </script>
385
    </script>
386
387
    [% INCLUDE 'select2.inc' %]
388
    [% SET columns = ['checkbox','cardnumber','name','category','branch','dateexpiry','borrowernotes','action'] %]
389
    [% PROCESS patron_search_modal columns => columns, modal_title => t("Add patrons") %]
390
    [% PROCESS patron_search_js columns => columns, actions => ["add"], preview_on_name_click => 1 %]
388
[% END %]
391
[% END %]
389
392
390
[% INCLUDE 'intranet-bottom.inc' %]
393
[% INCLUDE 'intranet-bottom.inc' %]
391
- 

Return to bug 35329