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

(-)a/admin/columns_settings.yml (+50 lines)
Lines 1432-1437 modules: Link Here
1432
              columnname: phone
1432
              columnname: phone
1433
              is_hidden: 1
1433
              is_hidden: 1
1434
1434
1435
    curbside_pickups:
1436
      to_be_stagedt:
1437
        columns:
1438
          -
1439
            columnname: pickup_datetime
1440
          -
1441
            columnname: patron
1442
          -
1443
            columnname: items_for_pickup
1444
          -
1445
            columnname: action
1446
            cannot_be_toggled: 1
1447
            cannot_be_modified: 1
1448
      staged_and_readyt:
1449
        columns:
1450
          -
1451
            columnname: pickup_datetime
1452
          -
1453
            columnname: patron
1454
          -
1455
            columnname: items_for_pickup
1456
          -
1457
            columnname: staged_by
1458
          -
1459
            columnname: action
1460
            cannot_be_toggled: 1
1461
            cannot_be_modified: 1
1462
      patron_is_outsidet:
1463
        columns:
1464
          -
1465
            columnname: pickup_datetime
1466
          -
1467
            columnname: patron
1468
          -
1469
            columnname: items_for_pickup
1470
          -
1471
            columnname: staged_by
1472
          -
1473
            columnname: action
1474
            cannot_be_toggled: 1
1475
            cannot_be_modified: 1
1476
      delivered_todayt:
1477
        columns:
1478
          -
1479
            columnname: delivery_datetime
1480
          -
1481
            columnname: patron
1482
          -
1483
            columnname: items_checked_out
1484
1435
    returns:
1485
    returns:
1436
      checkedintable:
1486
      checkedintable:
1437
        columns:
1487
        columns:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt (-13 / +30 lines)
Lines 6-11 Link Here
6
[% USE Asset %]
6
[% USE Asset %]
7
[% USE raw %]
7
[% USE raw %]
8
[% USE To %]
8
[% USE To %]
9
[% USE TablesSettings %]
9
[% SET footerjs = 1 %]
10
[% SET footerjs = 1 %]
10
[% INCLUDE 'doc-head-open.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
11
<title>Curbside pickups &rsaquo; Circulation &rsaquo; Koha</title>
12
<title>Curbside pickups &rsaquo; Circulation &rsaquo; Koha</title>
Lines 61-67 Link Here
61
[% END %]
62
[% END %]
62
63
63
[% BLOCK patron_info %]
64
[% BLOCK patron_info %]
64
    <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>
65
    [% INCLUDE 'patron-title.inc' patron=cp.patron invert_name = 1 hide_patron_infos_if_needed=1 %]
65
    [% IF cp.notes %]
66
    [% IF cp.notes %]
66
        <br/>
67
        <br/>
67
        <span>Notes: </span>[% cp.notes | html %]
68
        <span>Notes: </span>[% cp.notes | html %]
Lines 188-207 Link Here
188
                        <div id="to-be-staged" role="tabpanel" class="tab-pane">
189
                        <div id="to-be-staged" role="tabpanel" class="tab-pane">
189
                        [% END %]
190
                        [% END %]
190
                            [% IF to_be_staged.count %]
191
                            [% IF to_be_staged.count %]
191
                                <table class="table table-striped">
192
                                <table id="to_be_stagedt" class="table table-striped">
192
                                    <thead>
193
                                    <thead>
193
                                        <tr>
194
                                        <tr>
194
                                            <th>Pickup date/time</th>
195
                                            <th>Pickup date/time</th>
195
                                            <th>Patron</th>
196
                                            <th>Patron</th>
196
                                            <th>Items for pickup</th>
197
                                            <th>Items for pickup</th>
197
                                            <th>Action</th>
198
                                            <th class="NoSort noExport">Action</th>
198
                                        </tr>
199
                                        </tr>
199
                                    </thead>
200
                                    </thead>
200
                                    <tbody>
201
                                    <tbody>
201
                                        [% FOREACH cp IN to_be_staged %]
202
                                        [% FOREACH cp IN to_be_staged %]
202
                                            [% UNLESS cp.staged_datetime %]
203
                                            [% UNLESS cp.staged_datetime %]
203
                                                <tr class="[% class | html %]">
204
                                                <tr class="[% class | html %]">
204
                                                    <td>[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
205
                                                    <td data-order="[% cp.scheduled_pickup_datetime | html %]">[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
205
                                                    <td>
206
                                                    <td>
206
                                                        [% PROCESS patron_info %]
207
                                                        [% PROCESS patron_info %]
207
                                                    </td>
208
                                                    </td>
Lines 243-263 Link Here
243
                        <div id="staged-and-ready" role="tabpanel" class="tab-pane">
244
                        <div id="staged-and-ready" role="tabpanel" class="tab-pane">
244
                        [% END %]
245
                        [% END %]
245
                            [% IF staged_and_ready.count %]
246
                            [% IF staged_and_ready.count %]
246
                                <table class="table table-striped">
247
                                <table id="staged_and_readyt" class="table table-striped">
247
                                    <thead>
248
                                    <thead>
248
                                        <tr>
249
                                        <tr>
249
                                            <th>Pickup date/time</th>
250
                                            <th>Pickup date/time</th>
250
                                            <th>Patron</th>
251
                                            <th>Patron</th>
251
                                            <th>Items for pickup</th>
252
                                            <th>Items for pickup</th>
252
                                            <th>Staged by</th>
253
                                            <th>Staged by</th>
253
                                            <th>Action</th>
254
                                            <th class="NoSort noExport">Action</th>
254
                                        </tr>
255
                                        </tr>
255
                                    </thead>
256
                                    </thead>
256
                                    <tbody>
257
                                    <tbody>
257
                                        [% FOREACH cp IN staged_and_ready %]
258
                                        [% FOREACH cp IN staged_and_ready %]
258
                                            [% IF cp.staged_datetime && !cp.arrival_datetime %]
259
                                            [% IF cp.staged_datetime && !cp.arrival_datetime %]
259
                                                <tr class="[% class | html %]">
260
                                                <tr class="[% class | html %]">
260
                                                    <td>[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
261
                                                    <td data-order="[% cp.scheduled_pickup_datetime | html %]">[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
261
                                                    <td>
262
                                                    <td>
262
                                                        [% PROCESS patron_info %]
263
                                                        [% PROCESS patron_info %]
263
                                                    </td>
264
                                                    </td>
Lines 311-331 Link Here
311
                        <div id="patron-is-outside" role="tabpanel" class="tab-pane">
312
                        <div id="patron-is-outside" role="tabpanel" class="tab-pane">
312
                        [% END %]
313
                        [% END %]
313
                            [% IF patron_outside.count %]
314
                            [% IF patron_outside.count %]
314
                                <table class="table table-striped">
315
                                <table id="patron_is_outsidet" class="table table-striped">
315
                                    <thead>
316
                                    <thead>
316
                                        <tr>
317
                                        <tr>
317
                                            <th>Pickup date/time</th>
318
                                            <th>Pickup date/time</th>
318
                                            <th>Patron</th>
319
                                            <th>Patron</th>
319
                                            <th>Items for pickup</th>
320
                                            <th>Items for pickup</th>
320
                                            <th>Staged by</th>
321
                                            <th>Staged by</th>
321
                                            <th>Action</th>
322
                                            <th class="NoSort noExport">Action</th>
322
                                        </tr>
323
                                        </tr>
323
                                    </thead>
324
                                    </thead>
324
                                    <tbody>
325
                                    <tbody>
325
                                        [% FOREACH cp IN patron_outside %]
326
                                        [% FOREACH cp IN patron_outside %]
326
                                            [% IF cp.arrival_datetime && !cp.delivered_datetime %]
327
                                            [% IF cp.arrival_datetime && !cp.delivered_datetime %]
327
                                                <tr class="[% class | html %]">
328
                                                <tr class="[% class | html %]">
328
                                                    <td>[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
329
                                                    <td data-order="[% cp.scheduled_pickup_datetime | html %]">[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
329
                                                    <td>
330
                                                    <td>
330
                                                        [% PROCESS patron_info %]
331
                                                        [% PROCESS patron_info %]
331
                                                    </td>
332
                                                    </td>
Lines 379-385 Link Here
379
                        <div id="delivered-today" role="tabpanel" class="tab-pane">
380
                        <div id="delivered-today" role="tabpanel" class="tab-pane">
380
                        [% END %]
381
                        [% END %]
381
                            [% IF delivered_today.count %]
382
                            [% IF delivered_today.count %]
382
                                <table class="table table-striped">
383
                                <table id="delivered_todayt" class="table table-striped">
383
                                    <thead>
384
                                    <thead>
384
                                        <tr>
385
                                        <tr>
385
                                            <th>Deliver date/time</th>
386
                                            <th>Deliver date/time</th>
Lines 391-397 Link Here
391
                                        [% FOREACH cp IN delivered_today %]
392
                                        [% FOREACH cp IN delivered_today %]
392
                                            [% IF cp.delivered_datetime %]
393
                                            [% IF cp.delivered_datetime %]
393
                                                <tr class="[% class | html %]">
394
                                                <tr class="[% class | html %]">
394
                                                    <td>[% cp.delivered_datetime | $KohaDates with_hours = 1 %]</td>
395
                                                    <td data-order="[% cp.delivered_datetime | html %]">[% cp.delivered_datetime | $KohaDates with_hours = 1 %]</td>
395
                                                    <td>
396
                                                    <td>
396
                                                        [% PROCESS patron_info %]
397
                                                        [% PROCESS patron_info %]
397
                                                    </td>
398
                                                    </td>
Lines 506-511 Link Here
506
    <script>dayjs.extend(window.dayjs_plugin_customParseFormat)</script>
507
    <script>dayjs.extend(window.dayjs_plugin_customParseFormat)</script>
507
    [% INCLUDE 'calendar.inc' %]
508
    [% INCLUDE 'calendar.inc' %]
508
    [% INCLUDE 'js-patron-format.inc' %]
509
    [% INCLUDE 'js-patron-format.inc' %]
510
    [% INCLUDE 'datatables.inc' %]
511
    [% INCLUDE 'columns_settings.inc' %]
509
    <script>
512
    <script>
510
        let pickups = [% To.json(curbside_pickups.unblessed) | $raw %];
513
        let pickups = [% To.json(curbside_pickups.unblessed) | $raw %];
511
        let policy = [% To.json(policy.unblessed) | $raw %];
514
        let policy = [% To.json(policy.unblessed) | $raw %];
Lines 662-667 Link Here
662
665
663
            set_interval_if_needed();
666
            set_interval_if_needed();
664
667
668
669
            let dt_settings = [];
670
            dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'to_be_stagedt', 'json') | $raw %] );
671
            dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'staged_and_readyt', 'json') | $raw %] );
672
            dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'patron_is_outsidet', 'json') | $raw %] );
673
            dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'delivered_todayt', 'json') | $raw %] );
674
675
            let dt_tables = new Array("to_be_stagedt", "staged_and_readyt", "patron_is_outsidet", "delivered_todayt");
676
            dt_tables.forEach(function( id, index ){
677
                KohaTable( id , {
678
                    "autoWidth": false
679
                }, dt_settings[ index ] );
680
            });
681
682
665
        });
683
        });
666
684
667
        let refresh_interval_id = 0;
685
        let refresh_interval_id = 0;
668
- 

Return to bug 32890