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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc (-6 / +1 lines)
Lines 4-15 Link Here
4
        <td id="totaldue" style="text-align: right;"></td>
4
        <td id="totaldue" style="text-align: right;"></td>
5
        <td id="totalfine" style="text-align: right;"></td>
5
        <td id="totalfine" style="text-align: right;"></td>
6
        <td id="totalprice" style="text-align: right;"></td>
6
        <td id="totalprice" style="text-align: right;"></td>
7
        [% IF Koha.Preference('ExportCircHistory') %]
7
        <td colspan="4">
8
            [% SET td_colspan = 4 %]
9
        [% ELSE %]
10
            [% SET td_colspan = 3 %]
11
        [% END %]
12
        <td colspan="[% td_colspan | html %]">
13
            <div class="date-select">
8
            <div class="date-select">
14
                <p><label for="newduedate">Renewal due date:</label> <input type="text" size="20" id="newduedate" name="newduedate" value="" class="flatpickr" data-flatpickr-enable-time="true" /></p>
9
                <p><label for="newduedate">Renewal due date:</label> <input type="text" size="20" id="newduedate" name="newduedate" value="" class="flatpickr" data-flatpickr-enable-time="true" /></p>
15
                <p id="newonholdduedate"
10
                <p id="newonholdduedate"
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (-22 / +22 lines)
Lines 20-51 Link Here
20
        <table id="issues-table" style="width: 100% !Important; display: none;">
20
        <table id="issues-table" style="width: 100% !Important; display: none;">
21
            <thead>
21
            <thead>
22
                <tr>
22
                <tr>
23
                    <th scope="col">&nbsp;</th>
23
                    <th data-colname="sort_order" scope="col">&nbsp;</th>
24
                    <th scope="col">&nbsp;</th>
24
                    <th data-colname="todays_or_previous_checkouts" scope="col">&nbsp;</th>
25
                    <th scope="col">Due date</th>
25
                    <th data-colname="due_date_unformatted" scope="col">Due date</th>
26
                    <th scope="col">Due date</th>
26
                    <th data-colname="due_date" scope="col">Due date</th>
27
                    <th scope="col">Title</th>
27
                    <th data-colname="title" scope="col">Title</th>
28
                    <th scope="col">Record-level item type</th>
28
                    <th data-colname="record_type" scope="col">Record-level item type</th>
29
                    <th scope="col">Item type</th>
29
                    <th data-colname="item_type" scope="col">Item type</th>
30
                    <th scope="col">Collection</th>
30
                    <th data-colname="collection" scope="col">Collection</th>
31
                    <th scope="col">Location</th>
31
                    <th data-colname="location" scope="col">Location</th>
32
                    <th scope="col">Home library</th>
32
                    <th data-colname="homebranch" scope="col">Home library</th>
33
                    <th scope="col">&nbsp;</th>
33
                    <th data-colname="checkout_on_unformatted" scope="col">&nbsp;</th>
34
                    <th scope="col">Checked out on</th>
34
                    <th data-colname="checkout_on" scope="col">Checked out on</th>
35
                    <th scope="col">Checked out from</th>
35
                    <th data-colname="checkout_from" scope="col">Checked out from</th>
36
                    <th scope="col">Call number</th>
36
                    <th data-colname="callno" scope="col">Call number</th>
37
                    <th scope="col">Copy number</th>
37
                    <th data-colname="copynumber" scope="col">Copy number</th>
38
                    <th scope="col">Charge</th>
38
                    <th data-colname="charge" scope="col">Charge</th>
39
                    <th scope="col">Fine</th>
39
                    <th data-colname="fine" scope="col">Fine</th>
40
                    <th scope="col">Price</th>
40
                    <th data-colname="price" scope="col">Price</th>
41
                    <th scope="col"
41
                    <th data-colname="renew" scope="col"
42
                        >Renew <p class="column-tool"><a href="#" id="CheckAllRenewals">select all</a> | <a href="#" id="UncheckAllRenewals">none</a></p></th
42
                        >Renew <p class="column-tool"><a href="#" id="CheckAllRenewals">select all</a> | <a href="#" id="UncheckAllRenewals">none</a></p></th
43
                    >
43
                    >
44
                    <th scope="col"
44
                    <th data-colname="checkin" scope="col"
45
                        >Check in <p class="column-tool"><a href="#" id="CheckAllCheckins">select all</a> | <a href="#" id="UncheckAllCheckins">none</a></p></th
45
                        >Check in <p class="column-tool"><a href="#" id="CheckAllCheckins">select all</a> | <a href="#" id="UncheckAllCheckins">none</a></p></th
46
                    >
46
                    >
47
                    <th scope="col">Return claims</th>
47
                    <th data-colname="claims_returned" scope="col">Return claims</th>
48
                    <th scope="col"
48
                    <th data-colname="export" scope="col"
49
                        >Export <p class="column-tool"><a href="#" id="CheckAllExports">select all</a> | <a href="#" id="UncheckAllExports">none</a></p></th
49
                        >Export <p class="column-tool"><a href="#" id="CheckAllExports">select all</a> | <a href="#" id="UncheckAllExports">none</a></p></th
50
                    >
50
                    >
51
                </tr>
51
                </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-13 / +32 lines)
Lines 36-59 function LoadIssuesTable() { Link Here
36
    $("#issues-table").show();
36
    $("#issues-table").show();
37
    $("#issues-table-actions").show();
37
    $("#issues-table-actions").show();
38
    var msg_loading = __("Loading... you may continue scanning.");
38
    var msg_loading = __("Loading... you may continue scanning.");
39
    let renew_column = table_settings_issues_table.columns.find(
40
        c => c.columnname == "renew"
41
    );
42
    let checkin_column = table_settings_issues_table.columns.find(
43
        c => c.columnname == "checkin"
44
    );
45
39
    if (!AllowCirculate) {
46
    if (!AllowCirculate) {
40
        table_settings_issues_table.columns.find(
47
        renew_column.is_hidden = 1;
41
            c => c.columnname == "renew"
48
        renew_column.force_visibility = 1;
42
        ).is_hidden = 42;
49
    } else {
43
        table_settings_issues_table.columns.find(
50
        renew_column.is_hidden = 0;
44
            c => c.columnname == "checkin"
51
        checkin_column.is_hidden = 0;
45
        ).is_hidden = 1;
46
    }
52
    }
53
    renew_column.force_visibility = 1;
54
    checkin_column.force_visibility = 1;
55
56
    let claims_returned_column = table_settings_issues_table.columns.find(
57
        c => c.columnname == "claims_returned"
58
    );
47
    if (!ClaimReturnedLostValue) {
59
    if (!ClaimReturnedLostValue) {
48
        table_settings_issues_table.columns.find(
60
        claims_returned_column.is_hidden = 1;
49
            c => c.columnname == "claims_returned"
61
    } else {
50
        ).is_hidden = 1;
62
        claims_returned_column.is_hidden = 0;
51
    }
63
    }
64
    claims_returned_column.force_visibility = 1;
65
66
    let export_column = table_settings_issues_table.columns.find(
67
        c => c.columnname == "export"
68
    );
52
    if (!exports_enabled) {
69
    if (!exports_enabled) {
53
        table_settings_issues_table.columns.find(
70
        export_column.is_hidden = 1;
54
            c => c.columnname == "export"
71
    } else {
55
        ).is_hidden = 1;
72
        export_column.is_hidden = 0;
56
    }
73
    }
74
    export_column.force_visibility = 1;
75
57
    issuesTable = $("#issues-table").kohaTable(
76
    issuesTable = $("#issues-table").kohaTable(
58
        {
77
        {
59
            language: {
78
            language: {
Lines 665-670 function LoadIssuesTable() { Link Here
665
                ),
684
                ),
666
            },
685
            },
667
            bKohaAjaxSVC: true,
686
            bKohaAjaxSVC: true,
687
            bKohaColumnsUseNames: true,
668
            rowGroup: {
688
            rowGroup: {
669
                dataSrc: "issued_today",
689
                dataSrc: "issued_today",
670
                startRender: function (rows, group) {
690
                startRender: function (rows, group) {
671
- 

Return to bug 41314