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

(-)a/admin/columns_settings.yml (+50 lines)
Lines 1750-1755 modules: Link Here
1750
            -
1750
            -
1751
              columnname: status
1751
              columnname: status
1752
1752
1753
    curbside_pickups:
1754
      to_be_stagedt:
1755
        columns:
1756
          -
1757
            columnname: pickup_datetime
1758
          -
1759
            columnname: patron
1760
          -
1761
            columnname: items_for_pickup
1762
          -
1763
            columnname: action
1764
            cannot_be_toggled: 1
1765
            cannot_be_modified: 1
1766
      staged_and_readyt:
1767
        columns:
1768
          -
1769
            columnname: pickup_datetime
1770
          -
1771
            columnname: patron
1772
          -
1773
            columnname: items_for_pickup
1774
          -
1775
            columnname: staged_by
1776
          -
1777
            columnname: action
1778
            cannot_be_toggled: 1
1779
            cannot_be_modified: 1
1780
      patron_is_outsidet:
1781
        columns:
1782
          -
1783
            columnname: pickup_datetime
1784
          -
1785
            columnname: patron
1786
          -
1787
            columnname: items_for_pickup
1788
          -
1789
            columnname: staged_by
1790
          -
1791
            columnname: action
1792
            cannot_be_toggled: 1
1793
            cannot_be_modified: 1
1794
      delivered_todayt:
1795
        columns:
1796
          -
1797
            columnname: delivery_datetime
1798
          -
1799
            columnname: patron
1800
          -
1801
            columnname: items_checked_out
1802
1753
    returns:
1803
    returns:
1754
      checkedintable:
1804
      checkedintable:
1755
        columns:
1805
        columns:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt (-13 / +30 lines)
Lines 7-12 Link Here
7
[% USE raw %]
7
[% USE raw %]
8
[% USE To %]
8
[% USE To %]
9
[% PROCESS 'i18n.inc' %]
9
[% PROCESS 'i18n.inc' %]
10
[% USE TablesSettings %]
10
[% SET footerjs = 1 %]
11
[% SET footerjs = 1 %]
11
[% INCLUDE 'doc-head-open.inc' %]
12
[% INCLUDE 'doc-head-open.inc' %]
12
<title>[% FILTER collapse %]
13
<title>[% FILTER collapse %]
Lines 66-72 Link Here
66
[% END %]
67
[% END %]
67
68
68
[% BLOCK patron_info %]
69
[% BLOCK patron_info %]
69
    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% cp.borrowernumber | uri %]">[% cp.patron.firstname | html %] [% cp.patron.surname | html %] ([% cp.patron.cardnumber | html %])</a>
70
    [% INCLUDE 'patron-title.inc' patron=cp.patron invert_name = 1 hide_patron_infos_if_needed=1 %]
70
    [% IF cp.notes %]
71
    [% IF cp.notes %]
71
        <br/>
72
        <br/>
72
        <span>Notes: </span>[% cp.notes | html %]
73
        <span>Notes: </span>[% cp.notes | html %]
Lines 192-211 Link Here
192
                    [% WRAPPER tab_panels %]
193
                    [% WRAPPER tab_panels %]
193
                        [% WRAPPER tab_panel tabname="to-be-staged" bt_active= to_be_staged_active %]
194
                        [% WRAPPER tab_panel tabname="to-be-staged" bt_active= to_be_staged_active %]
194
                            [% IF to_be_staged.count %]
195
                            [% IF to_be_staged.count %]
195
                                <table class="table table-striped">
196
                                <table id="to_be_stagedt" class="table table-striped">
196
                                    <thead>
197
                                    <thead>
197
                                        <tr>
198
                                        <tr>
198
                                            <th>Pickup date/time</th>
199
                                            <th>Pickup date/time</th>
199
                                            <th>Patron</th>
200
                                            <th>Patron</th>
200
                                            <th>Items for pickup</th>
201
                                            <th>Items for pickup</th>
201
                                            <th>Action</th>
202
                                            <th class="NoSort noExport">Action</th>
202
                                        </tr>
203
                                        </tr>
203
                                    </thead>
204
                                    </thead>
204
                                    <tbody>
205
                                    <tbody>
205
                                        [% FOREACH cp IN to_be_staged %]
206
                                        [% FOREACH cp IN to_be_staged %]
206
                                            [% UNLESS cp.staged_datetime %]
207
                                            [% UNLESS cp.staged_datetime %]
207
                                                <tr class="[% class | html %]">
208
                                                <tr class="[% class | html %]">
208
                                                    <td>[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
209
                                                    <td data-order="[% cp.scheduled_pickup_datetime | html %]">[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
209
                                                    <td>
210
                                                    <td>
210
                                                        [% PROCESS patron_info %]
211
                                                        [% PROCESS patron_info %]
211
                                                    </td>
212
                                                    </td>
Lines 244-264 Link Here
244
                        [% END # /tab_panel %]
245
                        [% END # /tab_panel %]
245
                        [% WRAPPER tab_panel tabname="staged-and-ready" bt_active = staged_and_ready_active %]
246
                        [% WRAPPER tab_panel tabname="staged-and-ready" bt_active = staged_and_ready_active %]
246
                            [% IF staged_and_ready.count %]
247
                            [% IF staged_and_ready.count %]
247
                                <table class="table table-striped">
248
                                <table id="staged_and_readyt" class="table table-striped">
248
                                    <thead>
249
                                    <thead>
249
                                        <tr>
250
                                        <tr>
250
                                            <th>Pickup date/time</th>
251
                                            <th>Pickup date/time</th>
251
                                            <th>Patron</th>
252
                                            <th>Patron</th>
252
                                            <th>Items for pickup</th>
253
                                            <th>Items for pickup</th>
253
                                            <th>Staged by</th>
254
                                            <th>Staged by</th>
254
                                            <th>Action</th>
255
                                            <th class="NoSort noExport">Action</th>
255
                                        </tr>
256
                                        </tr>
256
                                    </thead>
257
                                    </thead>
257
                                    <tbody>
258
                                    <tbody>
258
                                        [% FOREACH cp IN staged_and_ready %]
259
                                        [% FOREACH cp IN staged_and_ready %]
259
                                            [% IF cp.staged_datetime && !cp.arrival_datetime %]
260
                                            [% IF cp.staged_datetime && !cp.arrival_datetime %]
260
                                                <tr class="[% class | html %]">
261
                                                <tr class="[% class | html %]">
261
                                                    <td>[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
262
                                                    <td data-order="[% cp.scheduled_pickup_datetime | html %]">[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
262
                                                    <td>
263
                                                    <td>
263
                                                        [% PROCESS patron_info %]
264
                                                        [% PROCESS patron_info %]
264
                                                    </td>
265
                                                    </td>
Lines 310-330 Link Here
310
                        [% END # /tab_panel %]
311
                        [% END # /tab_panel %]
311
                        [% WRAPPER tab_panel tabname="patron-is-outside" bt_active = patron_is_outside_active %]
312
                        [% WRAPPER tab_panel tabname="patron-is-outside" bt_active = patron_is_outside_active %]
312
                            [% IF patron_outside.count %]
313
                            [% IF patron_outside.count %]
313
                                <table class="table table-striped">
314
                                <table id="patron_is_outsidet" class="table table-striped">
314
                                    <thead>
315
                                    <thead>
315
                                        <tr>
316
                                        <tr>
316
                                            <th>Pickup date/time</th>
317
                                            <th>Pickup date/time</th>
317
                                            <th>Patron</th>
318
                                            <th>Patron</th>
318
                                            <th>Items for pickup</th>
319
                                            <th>Items for pickup</th>
319
                                            <th>Staged by</th>
320
                                            <th>Staged by</th>
320
                                            <th>Action</th>
321
                                            <th class="NoSort noExport">Action</th>
321
                                        </tr>
322
                                        </tr>
322
                                    </thead>
323
                                    </thead>
323
                                    <tbody>
324
                                    <tbody>
324
                                        [% FOREACH cp IN patron_outside %]
325
                                        [% FOREACH cp IN patron_outside %]
325
                                            [% IF cp.arrival_datetime && !cp.delivered_datetime %]
326
                                            [% IF cp.arrival_datetime && !cp.delivered_datetime %]
326
                                                <tr class="[% class | html %]">
327
                                                <tr class="[% class | html %]">
327
                                                    <td>[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
328
                                                    <td data-order="[% cp.scheduled_pickup_datetime | html %]">[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
328
                                                    <td>
329
                                                    <td>
329
                                                        [% PROCESS patron_info %]
330
                                                        [% PROCESS patron_info %]
330
                                                    </td>
331
                                                    </td>
Lines 376-382 Link Here
376
                        [% END # /tab_panel %]
377
                        [% END # /tab_panel %]
377
                        [% WRAPPER tab_panel tabname="delivered-today" bt_active = delivered_today_active %]
378
                        [% WRAPPER tab_panel tabname="delivered-today" bt_active = delivered_today_active %]
378
                            [% IF delivered_today.count %]
379
                            [% IF delivered_today.count %]
379
                                <table class="table table-striped">
380
                                <table id="delivered_todayt" class="table table-striped">
380
                                    <thead>
381
                                    <thead>
381
                                        <tr>
382
                                        <tr>
382
                                            <th>Deliver date/time</th>
383
                                            <th>Deliver date/time</th>
Lines 388-394 Link Here
388
                                        [% FOREACH cp IN delivered_today %]
389
                                        [% FOREACH cp IN delivered_today %]
389
                                            [% IF cp.delivered_datetime %]
390
                                            [% IF cp.delivered_datetime %]
390
                                                <tr class="[% class | html %]">
391
                                                <tr class="[% class | html %]">
391
                                                    <td>[% cp.delivered_datetime | $KohaDates with_hours = 1 %]</td>
392
                                                    <td data-order="[% cp.delivered_datetime | html %]">[% cp.delivered_datetime | $KohaDates with_hours = 1 %]</td>
392
                                                    <td>
393
                                                    <td>
393
                                                        [% PROCESS patron_info %]
394
                                                        [% PROCESS patron_info %]
394
                                                    </td>
395
                                                    </td>
Lines 501-506 Link Here
501
    <script>dayjs.extend(window.dayjs_plugin_customParseFormat)</script>
502
    <script>dayjs.extend(window.dayjs_plugin_customParseFormat)</script>
502
    [% INCLUDE 'calendar.inc' %]
503
    [% INCLUDE 'calendar.inc' %]
503
    [% INCLUDE 'js-patron-format.inc' %]
504
    [% INCLUDE 'js-patron-format.inc' %]
505
    [% INCLUDE 'datatables.inc' %]
506
    [% INCLUDE 'columns_settings.inc' %]
504
    <script>
507
    <script>
505
        let pickups = [% To.json(curbside_pickups.unblessed) | $raw %];
508
        let pickups = [% To.json(curbside_pickups.unblessed) | $raw %];
506
        let policy = [% To.json(policy.unblessed) | $raw %];
509
        let policy = [% To.json(policy.unblessed) | $raw %];
Lines 661-666 Link Here
661
664
662
            set_interval_if_needed();
665
            set_interval_if_needed();
663
666
667
668
            let dt_settings = [];
669
            dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'to_be_stagedt', 'json') | $raw %] );
670
            dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'staged_and_readyt', 'json') | $raw %] );
671
            dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'patron_is_outsidet', 'json') | $raw %] );
672
            dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'delivered_todayt', 'json') | $raw %] );
673
674
            let dt_tables = new Array("to_be_stagedt", "staged_and_readyt", "patron_is_outsidet", "delivered_todayt");
675
            dt_tables.forEach(function( id, index ){
676
                KohaTable( id , {
677
                    "autoWidth": false
678
                }, dt_settings[ index ] );
679
            });
680
681
664
        });
682
        });
665
683
666
        let refresh_interval_id = 0;
684
        let refresh_interval_id = 0;
667
- 

Return to bug 32890