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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (-38 / +20 lines)
Lines 10-37 Link Here
10
    <thead>
10
    <thead>
11
        <tr>
11
        <tr>
12
            <th data-colname="title" class="all anti-the">Title</th>
12
            <th data-colname="title" class="all anti-the">Title</th>
13
            [% IF ( showpriority ) %]
13
            <th data-colname="placed_on" class="psort">Placed on</th>
14
                <th data-colname="placed_on">Placed on</th>
15
            [% ELSE %]
16
                <th data-colname="placed_on" class="psort">Placed on</th>
17
            [% END %]
18
            <th data-colname="expires_on">Expires on</th>
14
            <th data-colname="expires_on">Expires on</th>
19
            [% UNLESS( singleBranchMode) %]
15
            <th data-colname="pickup_location">Pickup location</th>
20
                <th data-colname="pickup_location">Pickup location</th>
16
            <th data-colname="priority" class="psort">Priority</th>
21
            [% END %]
17
            <th data-colname="notes">Notes</th>
22
            [% IF ( showpriority ) %]
23
                <th data-colname="priority" class="psort">Priority</th>
24
            [% END %]
25
            [% IF Koha.Preference('OpacHoldNotes') %]
26
                <th data-colname="notes">Notes</th>
27
            [% END %]
28
            <th>Status</th>
18
            <th>Status</th>
29
            [% IF SuspendHoldsOpac and ! onlyinfo %]
19
            <th data-colname="suspend" class="nosort">Suspend</th>
30
                <th data-colname="suspend" class="nosort">Suspend</th>
20
            <th data-colname="modify" class="nosort">Modify</th>
31
            [% END %]
32
            [% IF ! onlyinfo %]
33
                <th data-colname="modify" class="nosort">Modify</th>
34
            [% END %]
35
            <th></th>
21
            <th></th>
36
        </tr>
22
        </tr>
37
    </thead>
23
    </thead>
Lines 94-101 Link Here
94
                        -
80
                        -
95
                    [% END %]
81
                    [% END %]
96
                </td>
82
                </td>
97
                [% UNLESS( singleBranchMode) %]
83
                <td class="branch">
98
                    <td class="branch">
84
                    [% IF !singleBranchMode %]
99
                        [% HOLD.branch.branchname | html %]
85
                        [% HOLD.branch.branchname | html %]
100
                        [% IF ( HOLD.can_update_pickup_location_opac ) %]
86
                        [% IF ( HOLD.can_update_pickup_location_opac ) %]
101
                            <button type="button" class="btn btn-sm btn-link" data-bs-toggle="modal" data-bs-target="#changePickup[% HOLD.reserve_id | html %]"> <i class="fa fa-pencil-alt" aria-hidden="true"></i> Change </button>
87
                            <button type="button" class="btn btn-sm btn-link" data-bs-toggle="modal" data-bs-target="#changePickup[% HOLD.reserve_id | html %]"> <i class="fa fa-pencil-alt" aria-hidden="true"></i> Change </button>
Lines 131-144 Link Here
131
                            </div>
117
                            </div>
132
                            <!-- /.modal -->
118
                            <!-- /.modal -->
133
                        [% END %]
119
                        [% END %]
134
                    </td>
120
                    [% END %]
135
                [% END %]
121
                </td>
136
                [% IF ( showpriority ) %]
122
                <td data-order="[% HOLD.priority | html %]" class="priority"> [% IF showpriority %][% HOLD.priority | html %][% END %] </td>
137
                    <td data-order="[% HOLD.priority | html %]" class="priority"> [% HOLD.priority | html %] </td>
123
                <td> [% IF Koha.Preference('OpacHoldNotes') %][% HOLD.reservenotes | html | html_line_break %][% END %] </td>
138
                [% END %]
139
                [% IF Koha.Preference('OpacHoldNotes') %]
140
                    <td>[% HOLD.reservenotes | html | html_line_break %]</td>
141
                [% END %]
142
                <td class="status">
124
                <td class="status">
143
                    [% IF ( HOLD.is_waiting ) %]
125
                    [% IF ( HOLD.is_waiting ) %]
144
                        <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
126
                        <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
Lines 180-187 Link Here
180
                        [% END %]
162
                        [% END %]
181
                    [% END %]
163
                    [% END %]
182
                </td>
164
                </td>
183
                [% IF SuspendHoldsOpac and ! onlyinfo %]
165
                <td>
184
                    <td>
166
                    [% IF SuspendHoldsOpac and ! onlyinfo %]
185
                        [% IF ( HOLD.is_cancelable_from_opac ) %]
167
                        [% IF ( HOLD.is_cancelable_from_opac ) %]
186
                            [% IF HOLD.suspend %]
168
                            [% IF HOLD.suspend %]
187
                                <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
169
                                <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
Lines 211-220 Link Here
211
                                [% END # / IF AutoResumeSuspendedHolds %]
193
                                [% END # / IF AutoResumeSuspendedHolds %]
212
                            [% END # / IF HOLD.suspend %]
194
                            [% END # / IF HOLD.suspend %]
213
                        [% END # / IF ( HOLD.is_cancelable_from_opac ) %]
195
                        [% END # / IF ( HOLD.is_cancelable_from_opac ) %]
214
                    </td>
196
                    [% END # / IF SuspendHoldsOpac %]
215
                [% END # / IF SuspendHoldsOpac %]
197
                </td>
216
                [% IF ! onlyinfo %]
198
                <td class="modify">
217
                    <td class="modify">
199
                    [% IF ! onlyinfo %]
218
                        [% IF ( HOLD.is_cancelable_from_opac ) %]
200
                        [% IF ( HOLD.is_cancelable_from_opac ) %]
219
                            <form id="delete_hold_[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
201
                            <form id="delete_hold_[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
220
                                [% INCLUDE 'csrf-token.inc' %]
202
                                [% INCLUDE 'csrf-token.inc' %]
Lines 236-243 Link Here
236
                                >
218
                                >
237
                            </form>
219
                            </form>
238
                        [% END %]
220
                        [% END %]
239
                    </td>
221
                    [% END # / IF onlyinfo %]
240
                [% END # / IF onlyinfo %]
222
                </td>
241
                <td></td>
223
                <td></td>
242
            </tr>
224
            </tr>
243
        [% END # /FOREACH HOLDS %]
225
        [% END # /FOREACH HOLDS %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt (-9 / +13 lines)
Lines 71-77 Link Here
71
                    [% IF !holds %]
71
                    [% IF !holds %]
72
                        No data available
72
                        No data available
73
                    [% ELSE %]
73
                    [% ELSE %]
74
                        [% SET show_itemtype_column = Koha.Preference('AllowHoldItemTypeSelection') %]
75
                        <div id="opac-user-holdsrec">
74
                        <div id="opac-user-holdsrec">
76
                            <div id="tabs-container">
75
                            <div id="tabs-container">
77
                                <div class="controls">
76
                                <div class="controls">
Lines 105-113 Link Here
105
                                            <th data-colname="expiration_date">Expiration date</th>
104
                                            <th data-colname="expiration_date">Expiration date</th>
106
                                            <th data-colname="waiting_date">Waiting date</th>
105
                                            <th data-colname="waiting_date">Waiting date</th>
107
                                            <th data-colname="cancellation_date">Cancellation date</th>
106
                                            <th data-colname="cancellation_date">Cancellation date</th>
108
                                            [% IF show_itemtype_column %]
107
                                            <th data-colname="item_type">Requested item type</th>
109
                                                <th data-colname="item_type">Requested item type</th>
110
                                            [% END %]
111
                                            <th data-colname="status">Status</th>
108
                                            <th data-colname="status">Status</th>
112
                                        </tr>
109
                                        </tr>
113
                                    </thead>
110
                                    </thead>
Lines 139-153 Link Here
139
                                                        [% hold.cancellationdate | $KohaDates %]
136
                                                        [% hold.cancellationdate | $KohaDates %]
140
                                                    [% END %]
137
                                                    [% END %]
141
                                                </td>
138
                                                </td>
142
                                                [% IF show_itemtype_column %]
139
                                                <td>
143
                                                    <td>
140
                                                    [% IF show_itemtype_column %]
144
                                                        [% IF hold.itemtype %]
141
                                                        [% IF hold.itemtype %]
145
                                                            [% ItemTypes.GetDescription( hold.itemtype ) | html %]
142
                                                            [% ItemTypes.GetDescription( hold.itemtype ) | html %]
146
                                                        [% ELSE %]
143
                                                        [% ELSE %]
147
                                                            <span>Any item type</span>
144
                                                            <span>Any item type</span>
148
                                                        [% END %]
145
                                                        [% END %]
149
                                                    </td>
146
                                                    [% END %]
150
                                                [% END %]
147
                                                </td>
151
                                                <td>
148
                                                <td>
152
                                                    [% IF hold.found == 'F' %]
149
                                                    [% IF hold.found == 'F' %]
153
                                                        <span>Fulfilled</span>
150
                                                        <span>Fulfilled</span>
Lines 196-204 Link Here
196
            $("#sort").change(function () {
193
            $("#sort").change(function () {
197
                $("#sortform").submit();
194
                $("#sortform").submit();
198
            });
195
            });
199
            var table_settings = [% TablesSettings.GetColumns( 'opac', 'patron_details', 'table_holdshistory', 'json') | $raw %];
196
            let table_settings = [% TablesSettings.GetTableSettings( 'opac', 'patron_details', 'table_holdshistory', 'json') | $raw %];
197
            [% IF ! Koha.Preference('AllowHoldItemTypeSelection') %]
198
            let itemtype_column = table_settings.columns.find(c => c.columnname == 'item_type');
199
            itemtype_column.is_hidden = 1;
200
            itemtype_column.cannot_be_toggled = 1;
201
            itemtype_column.force_visibility = 1;
202
            [% END %]
200
            var table = $("#table_holdshistory").kohaTable({
203
            var table = $("#table_holdshistory").kohaTable({
201
                dom: '<"top"<"table_entries"i><"table_controls"fB>>t',
204
                dom: '<"top"<"table_entries"i><"table_controls"fB>>t',
205
                bKohaColumnsUseNames: true,
202
                autoWidth: false,
206
                autoWidth: false,
203
                order: [[4, "desc"]],
207
                order: [[4, "desc"]],
204
                language: {
208
                language: {
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt (-6 / +9 lines)
Lines 126-134 Link Here
126
                <th data-colname="vol_info">Vol info</th>
126
                <th data-colname="vol_info">Vol info</th>
127
                <th data-colname="date">Date</th>
127
                <th data-colname="date">Date</th>
128
                <th data-colname="checkout_branch">Checkout branch</th>
128
                <th data-colname="checkout_branch">Checkout branch</th>
129
                [% IF Koha.Preference('OPACMySummaryHTML') %]
129
                <th data-colname="links" class="no-sort no-export">Links</th>
130
                    <th data-colname="links" class="no-sort no-export">Links</th>
131
                [% END %]
132
                <th class="dtr-control-col"></th>
130
                <th class="dtr-control-col"></th>
133
            </tr>
131
            </tr>
134
        </thead>
132
        </thead>
Lines 217-225 Link Here
217
                        </td>
215
                        </td>
218
                    [% END %]
216
                    [% END %]
219
                    <td> [% checkout.library.branchname | html %] </td>
217
                    <td> [% checkout.library.branchname | html %] </td>
220
                    [% IF Koha.Preference('OPACMySummaryHTML') %]
218
                    <td> [% IF Koha.Preference('OPACMySummaryHTML') %][% biblio.opac_summary_html | $raw %][% END %]</td>
221
                        <td>[% biblio.opac_summary_html | $raw %]</td>
222
                    [% END %]
223
                    <td></td>
219
                    <td></td>
224
                </tr>
220
                </tr>
225
            [% END # / FOREACH checkout %]
221
            [% END # / FOREACH checkout %]
Lines 238-246 Link Here
238
            });
234
            });
239
235
240
            var table_settings = [% TablesSettings.GetTableSettings( 'opac', 'patron_details', 'readingrec', 'json') | $raw %];
236
            var table_settings = [% TablesSettings.GetTableSettings( 'opac', 'patron_details', 'readingrec', 'json') | $raw %];
237
            [% IF !Koha.Preference('OPACMySummaryHTML') %]
238
            let opac_summary_column = table_settings.columns.find(c => c.columnname == 'links');
239
            opac_summary_column.is_hidden = 1;
240
            opac_summary_column.cannot_be_toggled = 1;
241
            opac_summary_column.force_visibility = 1;
242
            [% END %]
241
            var table = $("#readingrec").kohaTable(
243
            var table = $("#readingrec").kohaTable(
242
                {
244
                {
243
                    dom: '<"top"<"table_entries"i><"table_controls"fB>>t',
245
                    dom: '<"top"<"table_entries"i><"table_controls"fB>>t',
246
                            bKohaColumnsUseNames: true,
244
                    language: {
247
                    language: {
245
                        search: "_INPUT_",
248
                        search: "_INPUT_",
246
                        searchPlaceholder: _("Search"),
249
                        searchPlaceholder: _("Search"),
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-50 / +181 lines)
Lines 322-340 Link Here
322
                                                    <th id="checkoutdate" data-colname="checkoutdate" class="psort">Checked out on</th>
322
                                                    <th id="checkoutdate" data-colname="checkoutdate" class="psort">Checked out on</th>
323
                                                    <th id="duedate" data-colname="duedate" class="psort">Due</th>
323
                                                    <th id="duedate" data-colname="duedate" class="psort">Due</th>
324
                                                    <th id="checkout_branch" data-colname="checkout_branch">Checkout branch</th>
324
                                                    <th id="checkout_branch" data-colname="checkout_branch">Checkout branch</th>
325
                                                    [% IF ( Koha.Preference('BiblioItemtypeInfo') || !item_level_itypes ) %]
325
                                                    <th data-colname="itemtype">Item type</th>
326
                                                        <th data-colname="itemtype">Item type</th>
326
                                                    <th data-colname="barcode">Barcode</th>
327
                                                    [% END %]
328
                                                    [% IF ( show_barcode ) %]
329
                                                        <th data-colname="barcode">Barcode</th>
330
                                                    [% END %]
331
                                                    <th data-colname="callnumber">Call number</th>
327
                                                    <th data-colname="callnumber">Call number</th>
332
                                                    [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions_contains('renew') ) ) %]
328
                                                    <th data-colname="renew">Renew</th>
333
                                                        <th data-colname="renew">Renew</th>
329
                                                    <th data-colname="fines">Fines</th>
334
                                                    [% END %]
335
                                                    [% IF ( OPACFinesTab ) %]
336
                                                        <th data-colname="fines">Fines</th>
337
                                                    [% END %]
338
                                                    [% IF Koha.Preference('OPACMySummaryHTML') %]
330
                                                    [% IF Koha.Preference('OPACMySummaryHTML') %]
339
                                                        <th class="no-sort" data-colname="links">Links</th>
331
                                                        <th class="no-sort" data-colname="links">Links</th>
340
                                                    [% END %]
332
                                                    [% END %]
Lines 415-433 Link Here
415
                                                            <td class="date_due" data-order="[% ISSUE.date_due | html %]"> [% ISSUE.date_due | $KohaDates as_due_date => 1 %] </td>
407
                                                            <td class="date_due" data-order="[% ISSUE.date_due | html %]"> [% ISSUE.date_due | $KohaDates as_due_date => 1 %] </td>
416
                                                        [% END %]
408
                                                        [% END %]
417
                                                        <td class="checkout_branch" data-order="[% ISSUE.branchname | html %]">[% ISSUE.branchname | html %]</td>
409
                                                        <td class="checkout_branch" data-order="[% ISSUE.branchname | html %]">[% ISSUE.branchname | html %]</td>
418
                                                        [% IF ( Koha.Preference('BiblioItemtypeInfo') || !item_level_itypes ) %]
410
                                                        <td class="itype">
419
                                                            <td class="itype">
411
                                                            [% IF ( Koha.Preference('BiblioItemtypeInfo') || !item_level_itypes ) %]
420
                                                                [% IF ( ISSUE.imageurl && !Koha.Preference('OpacNoItemTypeImages') ) %]
412
                                                                [% IF ( ISSUE.imageurl && !Koha.Preference('OpacNoItemTypeImages') ) %]
421
                                                                    <img class="itemtype-image" src="[% ISSUE.imageurl | html %]" title="[% ISSUE.description | html %]" alt="[% ISSUE.description | html %]" />
413
                                                                    <img class="itemtype-image" src="[% ISSUE.imageurl | html %]" title="[% ISSUE.description | html %]" alt="[% ISSUE.description | html %]" />
422
                                                                [% END %] <span class="itypetext">[% ISSUE.description | html %]</span>
414
                                                                [% END %] <span class="itypetext">[% ISSUE.description | html %]</span>
423
                                                            </td>
415
                                                            [% END %]
424
                                                        [% END %]
416
                                                        </td>
425
                                                        [% IF ( show_barcode ) %]
417
                                                        <td class="barcode"> [% IF ( show_barcode ) %][% ISSUE.barcode | html %][% END %] </td>
426
                                                            <td class="barcode"> [% ISSUE.barcode | html %] </td>
427
                                                        [% END %]
428
                                                        <td class="call_no"> [% ISSUE.itemcallnumber | html %] </td>
418
                                                        <td class="call_no"> [% ISSUE.itemcallnumber | html %] </td>
429
                                                        [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions_contains('renew') ) ) %]
419
                                                        <td class="renew" data-order="[% ISSUE.status && canrenew ? ISSUE.renewsleft : 0 | html %]">
430
                                                            <td class="renew" data-order="[% ISSUE.status && canrenew ? ISSUE.renewsleft : 0 | html %]">
420
                                                            [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions_contains('renew') ) ) %]
431
                                                                [% IF ISSUE.renewed %]<span class="badge text-bg-success">Renewed!</span><br />[% END %]
421
                                                                [% IF ISSUE.renewed %]<span class="badge text-bg-success">Renewed!</span><br />[% END %]
432
                                                                [% IF ( ISSUE.status ) %]
422
                                                                [% IF ( ISSUE.status ) %]
433
                                                                    [% IF ( canrenew ) %]
423
                                                                    [% IF ( canrenew ) %]
Lines 493-502 Link Here
493
                                                                [% IF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %]
483
                                                                [% IF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %]
494
                                                                    <br /><span class="usr-msg automatic-renewal">This item is scheduled for auto renewal.</span>
484
                                                                    <br /><span class="usr-msg automatic-renewal">This item is scheduled for auto renewal.</span>
495
                                                                [% END %]
485
                                                                [% END %]
496
                                                            </td>
486
                                                            [% END %]
497
                                                        [% END %]
487
                                                        </td>
498
                                                        [% IF ( OPACFinesTab ) %]
488
                                                        <td class="fines">
499
                                                            <td class="fines">
489
                                                            [% IF ( OPACFinesTab ) %]
500
                                                                [% IF ( ISSUE.charges ) %]
490
                                                                [% IF ( ISSUE.charges ) %]
501
                                                                    <span>Yes (Item overdue or lost)</span>
491
                                                                    <span>Yes (Item overdue or lost)</span>
502
                                                                [% ELSIF ( ISSUE.rentalfines ) %]
492
                                                                [% ELSIF ( ISSUE.rentalfines ) %]
Lines 504-511 Link Here
504
                                                                [% ELSE %]
494
                                                                [% ELSE %]
505
                                                                    <span>No</span>
495
                                                                    <span>No</span>
506
                                                                [% END %]
496
                                                                [% END %]
507
                                                            </td>
497
                                                            [% END %]
508
                                                        [% END %]
498
                                                        </td>
509
                                                        [% IF Koha.Preference('OPACMySummaryHTML') %]
499
                                                        [% IF Koha.Preference('OPACMySummaryHTML') %]
510
                                                            <td class="links">[% ISSUE.biblio_object.opac_summary_html| $raw %]</td>
500
                                                            <td class="links">[% ISSUE.biblio_object.opac_summary_html| $raw %]</td>
511
                                                        [% END %]
501
                                                        [% END %]
Lines 705-721 Link Here
705
                                            <tr>
695
                                            <tr>
706
                                                [% IF ( JacketImages ) %]<th class="no-sort">&nbsp;</th>[% END %]
696
                                                [% IF ( JacketImages ) %]<th class="no-sort">&nbsp;</th>[% END %]
707
                                                <th data-colname="title" class="all anti-the">Title</th>
697
                                                <th data-colname="title" class="all anti-the">Title</th>
708
                                                [% UNLESS ( item_level_itypes ) %]<th data-colname="itemtype">Item type</th>[% END %]
698
                                                <th data-colname="itemtype">Item type</th>
709
                                                [% IF ( show_barcode ) %]<th data-colname="barcode">Barcode</th>[% END %]
699
                                                <th data-colname="barcode">Barcode</th>
710
                                                <th data-colname="callnumber">Call number</th>
700
                                                <th data-colname="callnumber">Call number</th>
711
                                                <th data-colname="checkoutdate">Checked out on</th>
701
                                                <th data-colname="checkoutdate">Checked out on</th>
712
                                                <th data-colname="duedate" class="psort">Due</th>
702
                                                <th data-colname="duedate" class="psort">Due</th>
713
                                                [% IF ( OpacRenewalAllowed ) %]
703
                                                <th data-colname="renew" class="no-sort">Renew</th>
714
                                                    <th data-colname="renew" class="no-sort">Renew</th>
704
                                                <th data-colname="fines">Fines</th>
715
                                                [% END %]
716
                                                [% IF ( OPACFinesTab ) %]
717
                                                    <th data-colname="fines">Fines</th>
718
                                                [% END %]
719
                                                <th class="dtr-control-col"></th>
705
                                                <th class="dtr-control-col"></th>
720
                                            </tr>
706
                                            </tr>
721
                                        </thead>
707
                                        </thead>
Lines 767-789 Link Here
767
                                                        <span class="item-details">[% OVERDUE.author | html %]</span>
753
                                                        <span class="item-details">[% OVERDUE.author | html %]</span>
768
                                                    </td>
754
                                                    </td>
769
755
770
                                                    [% UNLESS ( item_level_itypes ) %]
756
                                                    <td>
771
                                                        <td>
757
                                                        [% IF ( !item_level_itypes ) %]
772
                                                            [% IF ( OVERDUE.imageurl  && !Koha.Preference('OpacNoItemTypeImages') ) %]
758
                                                            [% IF ( OVERDUE.imageurl  && !Koha.Preference('OpacNoItemTypeImages') ) %]
773
                                                                <img src="[% OVERDUE.imageurl | html %]" title="[% OVERDUE.description | html %]" alt="[% OVERDUE.description | html %]" />
759
                                                                <img src="[% OVERDUE.imageurl | html %]" title="[% OVERDUE.description | html %]" alt="[% OVERDUE.description | html %]" />
774
                                                            [% END %]
760
                                                            [% END %]
775
                                                            [% OVERDUE.description | html %]
761
                                                            [% OVERDUE.description | html %]
776
                                                        </td>
762
                                                        [% END %]
777
                                                    [% END %]
763
                                                    </td>
778
                                                    [% IF ( show_barcode ) %]
764
                                                    <td> [% IF ( show_barcode ) %][% OVERDUE.barcode | html %][% END %] </td>
779
                                                        <td> [% OVERDUE.barcode | html %] </td>
780
                                                    [% END %]
781
                                                    <td> [% OVERDUE.itemcallnumber | html %] </td>
765
                                                    <td> [% OVERDUE.itemcallnumber | html %] </td>
782
                                                    <td data-order="[% OVERDUE.issuedate | html %]"> [% OVERDUE.issuedate | $KohaDates as_due_date => 1 %] </td>
766
                                                    <td data-order="[% OVERDUE.issuedate | html %]"> [% OVERDUE.issuedate | $KohaDates as_due_date => 1 %] </td>
783
                                                    <td data-order="[% OVERDUE.date_due | html %]"> [% OVERDUE.date_due | $KohaDates as_due_date => 1 %] </td>
767
                                                    <td data-order="[% OVERDUE.date_due | html %]"> [% OVERDUE.date_due | $KohaDates as_due_date => 1 %] </td>
784
                                                    <td class="checkout_branch" data-order="[% OVERDUE.branchname | html %]">[% OVERDUE.branchname | html %]</td>
768
                                                    <td class="checkout_branch" data-order="[% OVERDUE.branchname | html %]">[% OVERDUE.branchname | html %]</td>
785
                                                    [% IF ( OpacRenewalAllowed ) %]
769
                                                    <td>
786
                                                        <td>
770
                                                        [% IF ( OpacRenewalAllowed ) %]
787
                                                            [% IF ( OVERDUE.debarred ) %]
771
                                                            [% IF ( OVERDUE.debarred ) %]
788
                                                                Account frozen
772
                                                                Account frozen
789
                                                            [% ELSIF ( OVERDUE.status ) %]
773
                                                            [% ELSIF ( OVERDUE.status ) %]
Lines 814-830 Link Here
814
                                                            [% ELSE %]
798
                                                            [% ELSE %]
815
                                                                <span>No renewals left</span>
799
                                                                <span>No renewals left</span>
816
                                                            [% END %]
800
                                                            [% END %]
817
                                                        </td>
801
                                                        [% END %]
818
                                                    [% END %]
802
                                                    </td>
819
                                                    [% IF ( OPACFinesTab ) %]
803
                                                    <td>
820
                                                        <td>
804
                                                        [% IF ( OPACFinesTab ) %]
821
                                                            [% IF ( OVERDUE.charges ) %]
805
                                                            [% IF ( OVERDUE.charges ) %]
822
                                                                <span>Yes</span>
806
                                                                <span>Yes</span>
823
                                                            [% ELSE %]
807
                                                            [% ELSE %]
824
                                                                <span>No</span>
808
                                                                <span>No</span>
825
                                                            [% END %]
809
                                                            [% END %]
826
                                                        </td>
810
                                                        [% END %]
827
                                                    [% END %]
811
                                                    </td>
828
                                                    <td></td>
812
                                                    <td></td>
829
                                                </tr>
813
                                                </tr>
830
                                            [% END %]
814
                                            [% END %]
Lines 1192-1197 Link Here
1192
            [% FOREACH table IN ['checkoutst', 'holdst', 'overduest','opac_user_relative_issues_table'] %]
1176
            [% FOREACH table IN ['checkoutst', 'holdst', 'overduest','opac_user_relative_issues_table'] %]
1193
            tables_settings.set("[% table | $raw %]", [% TablesSettings.GetTableSettings( 'opac', 'patron_details', table, 'json') | $raw %]);
1177
            tables_settings.set("[% table | $raw %]", [% TablesSettings.GetTableSettings( 'opac', 'patron_details', table, 'json') | $raw %]);
1194
            [% END %]
1178
            [% END %]
1179
1180
            [% IF !(Koha.Preference('BiblioItemtypeInfo') || !item_level_itypes) %]
1181
                var checkoutst_settings = tables_settings.get('checkoutst');
1182
                if (checkoutst_settings && checkoutst_settings.columns) {
1183
                    var itemtype_column = checkoutst_settings.columns.find(c => c.columnname == 'itemtype');
1184
                    if (itemtype_column) {
1185
                        itemtype_column.is_hidden = 1;
1186
                        itemtype_column.cannot_be_toggled = 1;
1187
                        itemtype_column.force_visibility = 1;
1188
                    }
1189
                }
1190
            [% END %]
1191
1192
            [% IF !show_barcode %]
1193
                var checkoutst_settings = tables_settings.get('checkoutst');
1194
                if (checkoutst_settings && checkoutst_settings.columns) {
1195
                    var barcode_column = checkoutst_settings.columns.find(c => c.columnname == 'barcode');
1196
                    if (barcode_column) {
1197
                        barcode_column.is_hidden = 1;
1198
                        barcode_column.cannot_be_toggled = 1;
1199
                        barcode_column.force_visibility = 1;
1200
                    }
1201
                }
1202
1203
                var overduest_settings = tables_settings.get('overduest');
1204
                if (overduest_settings && overduest_settings.columns) {
1205
                    var barcode_column = overduest_settings.columns.find(c => c.columnname == 'barcode');
1206
                    if (barcode_column) {
1207
                        barcode_column.is_hidden = 1;
1208
                        barcode_column.cannot_be_toggled = 1;
1209
                        barcode_column.force_visibility = 1;
1210
                    }
1211
                }
1212
            [% END %]
1213
1214
            [% IF !(OpacRenewalAllowed && !(logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions_contains('renew'))) %]
1215
                var checkoutst_settings = tables_settings.get('checkoutst');
1216
                if (checkoutst_settings && checkoutst_settings.columns) {
1217
                    var renew_column = checkoutst_settings.columns.find(c => c.columnname == 'renew');
1218
                    if (renew_column) {
1219
                        renew_column.is_hidden = 1;
1220
                        renew_column.cannot_be_toggled = 1;
1221
                        renew_column.force_visibility = 1;
1222
                    }
1223
                }
1224
            [% END %]
1225
1226
            [% IF !OpacRenewalAllowed %]
1227
                var overduest_settings = tables_settings.get('overduest');
1228
                if (overduest_settings && overduest_settings.columns) {
1229
                    var renew_column = overduest_settings.columns.find(c => c.columnname == 'renew');
1230
                    if (renew_column) {
1231
                        renew_column.is_hidden = 1;
1232
                        renew_column.cannot_be_toggled = 1;
1233
                        renew_column.force_visibility = 1;
1234
                    }
1235
                }
1236
            [% END %]
1237
1238
            [% IF !OPACFinesTab %]
1239
                var checkoutst_settings = tables_settings.get('checkoutst');
1240
                if (checkoutst_settings && checkoutst_settings.columns) {
1241
                    var fines_column = checkoutst_settings.columns.find(c => c.columnname == 'fines');
1242
                    if (fines_column) {
1243
                        fines_column.is_hidden = 1;
1244
                        fines_column.cannot_be_toggled = 1;
1245
                        fines_column.force_visibility = 1;
1246
                    }
1247
                }
1248
1249
                var overduest_settings = tables_settings.get('overduest');
1250
                if (overduest_settings && overduest_settings.columns) {
1251
                    var fines_column = overduest_settings.columns.find(c => c.columnname == 'fines');
1252
                    if (fines_column) {
1253
                        fines_column.is_hidden = 1;
1254
                        fines_column.cannot_be_toggled = 1;
1255
                        fines_column.force_visibility = 1;
1256
                    }
1257
                }
1258
            [% END %]
1259
1260
            [% IF item_level_itypes %]
1261
                var overduest_settings = tables_settings.get('overduest');
1262
                if (overduest_settings && overduest_settings.columns) {
1263
                    var itemtype_column = overduest_settings.columns.find(c => c.columnname == 'itemtype');
1264
                    if (itemtype_column) {
1265
                        itemtype_column.is_hidden = 1;
1266
                        itemtype_column.cannot_be_toggled = 1;
1267
                        itemtype_column.force_visibility = 1;
1268
                    }
1269
                }
1270
            [% END %]
1271
1272
            // Hide holds table columns conditionally
1273
            var holdst_settings = tables_settings.get('holdst');
1274
            if (holdst_settings && holdst_settings.columns) {
1275
                // Hide pickup_location column if singleBranchMode
1276
                [% IF singleBranchMode %]
1277
                    var pickup_location_column = holdst_settings.columns.find(c => c.columnname == 'pickup_location');
1278
                    if (pickup_location_column) {
1279
                        pickup_location_column.is_hidden = 1;
1280
                        pickup_location_column.cannot_be_toggled = 1;
1281
                        pickup_location_column.force_visibility = 1;
1282
                    }
1283
                [% END %]
1284
1285
                // Hide priority column if !showpriority
1286
                [% IF !showpriority %]
1287
                    var priority_column = holdst_settings.columns.find(c => c.columnname == 'priority');
1288
                    if (priority_column) {
1289
                        priority_column.is_hidden = 1;
1290
                        priority_column.cannot_be_toggled = 1;
1291
                        priority_column.force_visibility = 1;
1292
                    }
1293
                [% END %]
1294
1295
                // Hide notes column if !OpacHoldNotes
1296
                [% IF !Koha.Preference('OpacHoldNotes') %]
1297
                    var notes_column = holdst_settings.columns.find(c => c.columnname == 'notes');
1298
                    if (notes_column) {
1299
                        notes_column.is_hidden = 1;
1300
                        notes_column.cannot_be_toggled = 1;
1301
                        notes_column.force_visibility = 1;
1302
                    }
1303
                [% END %]
1304
1305
                // Hide suspend column if !SuspendHoldsOpac or onlyinfo
1306
                [% IF !SuspendHoldsOpac || onlyinfo %]
1307
                    var suspend_column = holdst_settings.columns.find(c => c.columnname == 'suspend');
1308
                    if (suspend_column) {
1309
                        suspend_column.is_hidden = 1;
1310
                        suspend_column.cannot_be_toggled = 1;
1311
                        suspend_column.force_visibility = 1;
1312
                    }
1313
                [% END %]
1314
1315
                // Hide modify column if onlyinfo
1316
                [% IF onlyinfo %]
1317
                    var modify_column = holdst_settings.columns.find(c => c.columnname == 'modify');
1318
                    if (modify_column) {
1319
                        modify_column.is_hidden = 1;
1320
                        modify_column.cannot_be_toggled = 1;
1321
                        modify_column.force_visibility = 1;
1322
                    }
1323
                [% END %]
1324
            }
1195
            var dTables = $("#checkoutst,#holdst,#overduest,#opac-user-relative-issues-table");
1325
            var dTables = $("#checkoutst,#holdst,#overduest,#opac-user-relative-issues-table");
1196
            dTables.each(function(){
1326
            dTables.each(function(){
1197
                var thIndex = $(this).find("th.psort").index();
1327
                var thIndex = $(this).find("th.psort").index();
Lines 1201-1206 Link Here
1201
                    .kohaTable({
1331
                    .kohaTable({
1202
                    order: [[ thIndex, 'asc' ]],
1332
                    order: [[ thIndex, 'asc' ]],
1203
                    dom: '<"top"<"table_entries"><"table_controls"fB>>t',
1333
                    dom: '<"top"<"table_entries"><"table_controls"fB>>t',
1334
                    bKohaColumnsUseNames:true,
1204
                    columnDefs: [
1335
                    columnDefs: [
1205
                        { visible: false, "targets" : [ "hidden" ] },
1336
                        { visible: false, "targets" : [ "hidden" ] },
1206
                        { className: 'dtr-control', orderable: false, targets: -1 }
1337
                        { className: 'dtr-control', orderable: false, targets: -1 }
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-4 / +64 lines)
Lines 6-11 Link Here
6
[% USE To %]
6
[% USE To %]
7
[% USE Price %]
7
[% USE Price %]
8
[% USE AdditionalContents %]
8
[% USE AdditionalContents %]
9
[% USE TablesSettings %]
9
[% USE Branches %]
10
[% USE Branches %]
10
[% SET SCOMainUserBlock = AdditionalContents.get( location => "SCOMainUserBlock", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
11
[% SET SCOMainUserBlock = AdditionalContents.get( location => "SCOMainUserBlock", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
11
[% PROCESS 'html_helpers.inc' %]
12
[% PROCESS 'html_helpers.inc' %]
Lines 385-391 Link Here
385
                </div>
386
                </div>
386
                <!-- / .container-fluid -->
387
                <!-- / .container-fluid -->
387
            [% END # / IF validuser %]
388
            [% END # / IF validuser %]
388
        [% ELSE # / UNLESS ( hide_main %]
389
        [% ELSE # / UNLESS ( hide_main ) %]
389
            <div class="container-fluid">
390
            <div class="container-fluid">
390
                <div class="row">
391
                <div class="row">
391
                    <div class="[% main_div_class | html %]">
392
                    <div class="[% main_div_class | html %]">
Lines 476-485 Link Here
476
                    dofocus();
477
                    dofocus();
477
                    [% IF ( patronid ) %]sco_init();[% END %]
478
                    [% IF ( patronid ) %]sco_init();[% END %]
478
479
480
                    // Hide holds table columns conditionally
481
                    let holdst_settings = [% TablesSettings.GetTableSettings( 'opac', 'patron_details', 'holdst', 'json') | $raw %];
482
                    if (holdst_settings && holdst_settings.columns) {
483
                        // Hide pickup_location column if singleBranchMode
484
                        [% IF singleBranchMode %]
485
                            var pickup_location_column = holdst_settings.columns.find(c => c.columnname == 'pickup_location');
486
                            if (pickup_location_column) {
487
                                pickup_location_column.is_hidden = 1;
488
                                pickup_location_column.cannot_be_toggled = 1;
489
                                pickup_location_column.force_visibility = 1;
490
                            }
491
                        [% END %]
492
493
                        // Hide priority column if !showpriority
494
                        [% IF !showpriority %]
495
                            var priority_column = holdst_settings.columns.find(c => c.columnname == 'priority');
496
                            if (priority_column) {
497
                                priority_column.is_hidden = 1;
498
                                priority_column.cannot_be_toggled = 1;
499
                                priority_column.force_visibility = 1;
500
                            }
501
                        [% END %]
502
503
                        // Hide notes column if !OpacHoldNotes
504
                        [% IF !Koha.Preference('OpacHoldNotes') %]
505
                            var notes_column = holdst_settings.columns.find(c => c.columnname == 'notes');
506
                            if (notes_column) {
507
                                notes_column.is_hidden = 1;
508
                                notes_column.cannot_be_toggled = 1;
509
                                notes_column.force_visibility = 1;
510
                            }
511
                        [% END %]
512
513
                        // Hide suspend column if !SuspendHoldsOpac or onlyinfo
514
                        [% IF !SuspendHoldsOpac || onlyinfo %]
515
                            var suspend_column = holdst_settings.columns.find(c => c.columnname == 'suspend');
516
                            if (suspend_column) {
517
                                suspend_column.is_hidden = 1;
518
                                suspend_column.cannot_be_toggled = 1;
519
                                suspend_column.force_visibility = 1;
520
                            }
521
                        [% END %]
522
523
                        // Hide modify column if onlyinfo
524
                        [% IF onlyinfo %]
525
                            var modify_column = holdst_settings.columns.find(c => c.columnname == 'modify');
526
                            if (modify_column) {
527
                                modify_column.is_hidden = 1;
528
                                modify_column.cannot_be_toggled = 1;
529
                                modify_column.force_visibility = 1;
530
                            }
531
                        [% END %]
532
                    }
479
                    var dTables = $("#loanTable, #holdst, #finestable");
533
                    var dTables = $("#loanTable, #holdst, #finestable");
480
                    dTables.each(function(){
534
                    dTables.each(function(){
481
                        var thIndex = $(this).find("th.psort").index();
535
                        var thIndex = $(this).find("th.psort").index();
482
                        $(this).kohaTable({
536
                        koha_table_def={
483
                            order: [[thIndex, "asc"]],
537
                            order: [[thIndex, "asc"]],
484
                            dom: '<"top"<"table_entries"><"table_controls"f>>t<"clear">',
538
                            dom: '<"top"<"table_entries"><"table_controls"f>>t<"clear">',
485
                            columnDefs: [
539
                            columnDefs: [
Lines 497-503 Link Here
497
                                    target: -1,
551
                                    target: -1,
498
                                },
552
                                },
499
                            },
553
                            },
500
                        });
554
                        };
555
                        if (this.id == 'holdst') {
556
                            koha_table_def['bKohaColumnsUseNames'] = true;
557
                            $(this).kohaTable(koha_table_def,holdst_settings);
558
                        }
559
                        else{
560
                            $(this).kohaTable(koha_table_def);
561
                        }
501
                    });
562
                    });
502
563
503
                    $('a[data-bs-toggle="tab"]').on('shown.bs.tab', function (event) {
564
                    $('a[data-bs-toggle="tab"]').on('shown.bs.tab', function (event) {
504
- 

Return to bug 30221