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

(-)a/ill/ill-requests.pl (+1 lines)
Lines 477-482 $template->param( Link Here
477
    types    => [ "Book", "Article", "Journal" ],
477
    types    => [ "Book", "Article", "Journal" ],
478
    op       => $op,
478
    op       => $op,
479
    branches => Koha::Libraries->search,
479
    branches => Koha::Libraries->search,
480
    illreq_tabs => C4::Context->yaml_preference('ILLRequestsTabs'),
480
);
481
);
481
482
482
output_html_with_http_headers( $cgi, $cookie, $template->output );
483
output_html_with_http_headers( $cgi, $cookie, $template->output );
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-filter.inc (-1 / +1 lines)
Lines 19-25 Link Here
19
            </li>
19
            </li>
20
            <li>
20
            <li>
21
                <label for="illfilter_status">Status:</label>
21
                <label for="illfilter_status">Status:</label>
22
                <select name="illfilter_status" id="illfilter_status"> </select>
22
                <select name="illfilter_status" id="illfilter_status" multiple="multiple" style="height:auto"> </select>
23
            </li>
23
            </li>
24
            <li>
24
            <li>
25
                <label for="illfilter_dateplaced_start">Date placed between:</label>
25
                <label for="illfilter_dateplaced_start">Date placed between:</label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc (-1 lines)
Lines 3-9 Link Here
3
    var ill_borrower_details = _("View patron details");
3
    var ill_borrower_details = _("View patron details");
4
    var ill_manage = _("Manage request");
4
    var ill_manage = _("Manage request");
5
    var ill_manage_select_backend_first = _("Select a backend first");
5
    var ill_manage_select_backend_first = _("Select a backend first");
6
    var ill_all_statuses = _("All statuses");
7
    var ill_all_status_aliases = _("All status aliases");
6
    var ill_all_status_aliases = _("All status aliases");
8
    var ill_no_status_alias = _("No status alias");
7
    var ill_no_status_alias = _("No status alias");
9
    var ill_status_aliases = _("Status aliases");
8
    var ill_status_aliases = _("Status aliases");
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (+12 lines)
Lines 766-771 Link Here
766
                    [% END %]
766
                    [% END %]
767
                </h1>
767
                </h1>
768
                <div id="results" class="page-section">
768
                <div id="results" class="page-section">
769
                    [% WRAPPER tabs id= "ill-list-tabs" %]
770
                        [% WRAPPER tabs_nav %]
771
                            [% WRAPPER tab_item tabname= "ill-list-tab-all" bt_active= 1 %]
772
                                <span>All</span>
773
                            [% END %]
774
                            [% FOREACH illreq_tab IN illreq_tabs %]
775
                                [% WRAPPER tab_item tabname= "ill-list-tab-${loop.index}" %]
776
                                    <span data-statuses="[% illreq_tab.status.join('|') | html %]">[% illreq_tab.name | html %]</span>
777
                                [% END %]
778
                            [% END %]
779
                        [% END # /WRAPPER tabs_nav %]
780
                    [% END %]
769
                    <h2>Details for all requests</h2>
781
                    <h2>Details for all requests</h2>
770
                    [% INCLUDE 'ill-list-table.inc' %]
782
                    [% INCLUDE 'ill-list-table.inc' %]
771
                </div>
783
                </div>
(-)a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js (-5 / +12 lines)
Lines 17-22 $(document).ready(function () { Link Here
17
        $("#addcomment").toggleClass("content_hidden");
17
        $("#addcomment").toggleClass("content_hidden");
18
    });
18
    });
19
19
20
    $("div#ill-list-tabs a[id^='ill-list-tab'").on("click", function (e) {
21
        e.preventDefault();
22
        if ($(this).children('span').attr("data-statuses")) {
23
            console.log($(this).children('span').attr("data-statuses").split('|'));
24
            $("#illfilter_status").val($(this).children('span').attr("data-statuses").split('|')).trigger("change");
25
        } else {
26
            $("#illfilter_status").val("").trigger("change");
27
        }
28
        filter();
29
    });
30
20
    // Filter partner list
31
    // Filter partner list
21
    // Record the list of all options
32
    // Record the list of all options
22
    var ill_partner_options = $("#partners > option");
33
    var ill_partner_options = $("#partners > option");
Lines 116-122 $(document).ready(function () { Link Here
116
                subquery_and.push(patronquery);
127
                subquery_and.push(patronquery);
117
            }
128
            }
118
129
119
            if (status) {
130
            if (status && status.length > 0) {
120
                subquery_and.push({ "me.status": { "=": status } });
131
                subquery_and.push({ "me.status": { "=": status } });
121
            }
132
            }
122
            if (status_alias) {
133
            if (status_alias) {
Lines 540-548 $(document).ready(function () { Link Here
540
551
541
    function addStatusOptions(statuses) {
552
    function addStatusOptions(statuses) {
542
        $("#illfilter_status").children().remove();
553
        $("#illfilter_status").children().remove();
543
        $("#illfilter_status").append(
544
            '<option value="">' + ill_all_statuses + "</option>"
545
        );
546
        statuses
554
        statuses
547
            .sort((a, b) => a.str.localeCompare(b.str))
555
            .sort((a, b) => a.str.localeCompare(b.str))
548
            .forEach(function (status) {
556
            .forEach(function (status) {
549
- 

Return to bug 30200