Attachment #167542 for bug #32890

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




            -
              columnname: status

    curbside_pickups:
      to_be_stagedt:
        columns:
          -
            columnname: pickup_datetime
          -
            columnname: patron
          -
            columnname: items_for_pickup
          -
            columnname: action
            cannot_be_toggled: 1
            cannot_be_modified: 1
      staged_and_readyt:
        columns:
          -
            columnname: pickup_datetime
          -
            columnname: patron
          -
            columnname: items_for_pickup
          -
            columnname: staged_by
          -
            columnname: action
            cannot_be_toggled: 1
            cannot_be_modified: 1
      patron_is_outsidet:
        columns:
          -
            columnname: pickup_datetime
          -
            columnname: patron
          -
            columnname: items_for_pickup
          -
            columnname: staged_by
          -
            columnname: action
            cannot_be_toggled: 1
            cannot_be_modified: 1
      delivered_todayt:
        columns:
          -
            columnname: delivery_datetime
          -
            columnname: patron
          -
            columnname: items_checked_out

    returns:
      checkedintable:
        columns:




[% USE raw %]
[% USE To %]
[% PROCESS 'i18n.inc' %]
[% USE TablesSettings %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>[% FILTER collapse %]

[% END %]

[% BLOCK patron_info %]
    [% INCLUDE 'patron-title.inc' patron=cp.patron invert_name = 1 hide_patron_infos_if_needed=1 %]
    [% IF cp.notes %]
        <br/>
        <span>Notes: </span>[% cp.notes | html %]

                        <div id="to-be-staged" role="tabpanel" class="tab-pane">
                        [% END %]
                            [% IF to_be_staged.count %]
                                <table id="to_be_stagedt" class="table table-striped">
                                    <thead>
                                        <tr>
                                            <th>Pickup date/time</th>
                                            <th>Patron</th>
                                            <th>Items for pickup</th>
                                            <th class="NoSort noExport">Action</th>
                                        </tr>
                                    </thead>
                                    <tbody>
                                        [% FOREACH cp IN to_be_staged %]
                                            [% UNLESS cp.staged_datetime %]
                                                <tr class="[% class | html %]">
                                                    <td data-order="[% cp.scheduled_pickup_datetime | html %]">[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
                                                    <td>
                                                        [% PROCESS patron_info %]
                                                    </td>

                        <div id="staged-and-ready" role="tabpanel" class="tab-pane">
                        [% END %]
                            [% IF staged_and_ready.count %]
                                <table id="staged_and_readyt" class="table table-striped">
                                    <thead>
                                        <tr>
                                            <th>Pickup date/time</th>
                                            <th>Patron</th>
                                            <th>Items for pickup</th>
                                            <th>Staged by</th>
                                            <th class="NoSort noExport">Action</th>
                                        </tr>
                                    </thead>
                                    <tbody>
                                        [% FOREACH cp IN staged_and_ready %]
                                            [% IF cp.staged_datetime && !cp.arrival_datetime %]
                                                <tr class="[% class | html %]">
                                                    <td data-order="[% cp.scheduled_pickup_datetime | html %]">[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
                                                    <td>
                                                        [% PROCESS patron_info %]
                                                    </td>

                        <div id="patron-is-outside" role="tabpanel" class="tab-pane">
                        [% END %]
                            [% IF patron_outside.count %]
                                <table id="patron_is_outsidet" class="table table-striped">
                                    <thead>
                                        <tr>
                                            <th>Pickup date/time</th>
                                            <th>Patron</th>
                                            <th>Items for pickup</th>
                                            <th>Staged by</th>
                                            <th class="NoSort noExport">Action</th>
                                        </tr>
                                    </thead>
                                    <tbody>
                                        [% FOREACH cp IN patron_outside %]
                                            [% IF cp.arrival_datetime && !cp.delivered_datetime %]
                                                <tr class="[% class | html %]">
                                                    <td data-order="[% cp.scheduled_pickup_datetime | html %]">[% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %]</td>
                                                    <td>
                                                        [% PROCESS patron_info %]
                                                    </td>

                        <div id="delivered-today" role="tabpanel" class="tab-pane">
                        [% END %]
                            [% IF delivered_today.count %]
                                <table id="delivered_todayt" class="table table-striped">
                                    <thead>
                                        <tr>
                                            <th>Deliver date/time</th>

                                        [% FOREACH cp IN delivered_today %]
                                            [% IF cp.delivered_datetime %]
                                                <tr class="[% class | html %]">
                                                    <td data-order="[% cp.delivered_datetime | html %]">[% cp.delivered_datetime | $KohaDates with_hours = 1 %]</td>
                                                    <td>
                                                        [% PROCESS patron_info %]
                                                    </td>

    <script>dayjs.extend(window.dayjs_plugin_customParseFormat)</script>
    [% INCLUDE 'calendar.inc' %]
    [% INCLUDE 'js-patron-format.inc' %]
    [% INCLUDE 'datatables.inc' %]
    [% INCLUDE 'columns_settings.inc' %]
    <script>
        let pickups = [% To.json(curbside_pickups.unblessed) | $raw %];
        let policy = [% To.json(policy.unblessed) | $raw %];


            set_interval_if_needed();


            let dt_settings = [];
            dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'to_be_stagedt', 'json') | $raw %] );
            dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'staged_and_readyt', 'json') | $raw %] );
            dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'patron_is_outsidet', 'json') | $raw %] );
            dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'delivered_todayt', 'json') | $raw %] );

            let dt_tables = new Array("to_be_stagedt", "staged_and_readyt", "patron_is_outsidet", "delivered_todayt");
            dt_tables.forEach(function( id, index ){
                KohaTable( id , {
                    "autoWidth": false
                }, dt_settings[ index ] );
            });


        });

        let refresh_interval_id = 0;
- 

Return to bug 32890

Lines 1616-1621 modules: Link Here

(-)a/admin/columns_settings.yml (+50 lines)
1616	-	1616	-
1617	columnname: status	1617	columnname: status
1618		1618
		1619	curbside_pickups:
		1620	to_be_stagedt:
		1621	columns:
		1622	-
		1623	columnname: pickup_datetime
		1624	-
		1625	columnname: patron
		1626	-
		1627	columnname: items_for_pickup
		1628	-
		1629	columnname: action
		1630	cannot_be_toggled: 1
		1631	cannot_be_modified: 1
		1632	staged_and_readyt:
		1633	columns:
		1634	-
		1635	columnname: pickup_datetime
		1636	-
		1637	columnname: patron
		1638	-
		1639	columnname: items_for_pickup
		1640	-
		1641	columnname: staged_by
		1642	-
		1643	columnname: action
		1644	cannot_be_toggled: 1
		1645	cannot_be_modified: 1
		1646	patron_is_outsidet:
		1647	columns:
		1648	-
		1649	columnname: pickup_datetime
		1650	-
		1651	columnname: patron
		1652	-
		1653	columnname: items_for_pickup
		1654	-
		1655	columnname: staged_by
		1656	-
		1657	columnname: action
		1658	cannot_be_toggled: 1
		1659	cannot_be_modified: 1
		1660	delivered_todayt:
		1661	columns:
		1662	-
		1663	columnname: delivery_datetime
		1664	-
		1665	columnname: patron
		1666	-
		1667	columnname: items_checked_out
		1668
1619	returns:	1669	returns:
1620	checkedintable:	1670	checkedintable:
1621	columns:	1671	columns:

Lines 7-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt (-13 / +30 lines)
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 194-213 Link Here
194	<div id="to-be-staged" role="tabpanel" class="tab-pane">	195	<div id="to-be-staged" role="tabpanel" class="tab-pane">
195	[% END %]	196	[% END %]
196	[% IF to_be_staged.count %]	197	[% IF to_be_staged.count %]
197	<table class="table table-striped">	198	<table id="to_be_stagedt" class="table table-striped">
198	<thead>	199	<thead>
199	<tr>	200	<tr>
200	<th>Pickup date/time</th>	201	<th>Pickup date/time</th>
201	<th>Patron</th>	202	<th>Patron</th>
202	<th>Items for pickup</th>	203	<th>Items for pickup</th>
203	<th>Action</th>	204	<th class="NoSort noExport">Action</th>
204	</tr>	205	</tr>
205	</thead>	206	</thead>
206	<tbody>	207	<tbody>
207	[% FOREACH cp IN to_be_staged %]	208	[% FOREACH cp IN to_be_staged %]
208	[% UNLESS cp.staged_datetime %]	209	[% UNLESS cp.staged_datetime %]
209	<tr class="[% class \| html %]">	210	<tr class="[% class \| html %]">
210	<td>[% cp.scheduled_pickup_datetime \| $KohaDates with_hours = 1 %]</td>	211	<td data-order="[% cp.scheduled_pickup_datetime \| html %]">[% cp.scheduled_pickup_datetime \| $KohaDates with_hours = 1 %]</td>
211	<td>	212	<td>
212	[% PROCESS patron_info %]	213	[% PROCESS patron_info %]
213	</td>	214	</td>
Lines 251-271 Link Here
251	<div id="staged-and-ready" role="tabpanel" class="tab-pane">	252	<div id="staged-and-ready" role="tabpanel" class="tab-pane">
252	[% END %]	253	[% END %]
253	[% IF staged_and_ready.count %]	254	[% IF staged_and_ready.count %]
254	<table class="table table-striped">	255	<table id="staged_and_readyt" class="table table-striped">
255	<thead>	256	<thead>
256	<tr>	257	<tr>
257	<th>Pickup date/time</th>	258	<th>Pickup date/time</th>
258	<th>Patron</th>	259	<th>Patron</th>
259	<th>Items for pickup</th>	260	<th>Items for pickup</th>
260	<th>Staged by</th>	261	<th>Staged by</th>
261	<th>Action</th>	262	<th class="NoSort noExport">Action</th>
262	</tr>	263	</tr>
263	</thead>	264	</thead>
264	<tbody>	265	<tbody>
265	[% FOREACH cp IN staged_and_ready %]	266	[% FOREACH cp IN staged_and_ready %]
266	[% IF cp.staged_datetime && !cp.arrival_datetime %]	267	[% IF cp.staged_datetime && !cp.arrival_datetime %]
267	<tr class="[% class \| html %]">	268	<tr class="[% class \| html %]">
268	<td>[% cp.scheduled_pickup_datetime \| $KohaDates with_hours = 1 %]</td>	269	<td data-order="[% cp.scheduled_pickup_datetime \| html %]">[% cp.scheduled_pickup_datetime \| $KohaDates with_hours = 1 %]</td>
269	<td>	270	<td>
270	[% PROCESS patron_info %]	271	[% PROCESS patron_info %]
271	</td>	272	</td>
Lines 322-342 Link Here
322	<div id="patron-is-outside" role="tabpanel" class="tab-pane">	323	<div id="patron-is-outside" role="tabpanel" class="tab-pane">
323	[% END %]	324	[% END %]
324	[% IF patron_outside.count %]	325	[% IF patron_outside.count %]
325	<table class="table table-striped">	326	<table id="patron_is_outsidet" class="table table-striped">
326	<thead>	327	<thead>
327	<tr>	328	<tr>
328	<th>Pickup date/time</th>	329	<th>Pickup date/time</th>
329	<th>Patron</th>	330	<th>Patron</th>
330	<th>Items for pickup</th>	331	<th>Items for pickup</th>
331	<th>Staged by</th>	332	<th>Staged by</th>
332	<th>Action</th>	333	<th class="NoSort noExport">Action</th>
333	</tr>	334	</tr>
334	</thead>	335	</thead>
335	<tbody>	336	<tbody>
336	[% FOREACH cp IN patron_outside %]	337	[% FOREACH cp IN patron_outside %]
337	[% IF cp.arrival_datetime && !cp.delivered_datetime %]	338	[% IF cp.arrival_datetime && !cp.delivered_datetime %]
338	<tr class="[% class \| html %]">	339	<tr class="[% class \| html %]">
339	<td>[% cp.scheduled_pickup_datetime \| $KohaDates with_hours = 1 %]</td>	340	<td data-order="[% cp.scheduled_pickup_datetime \| html %]">[% cp.scheduled_pickup_datetime \| $KohaDates with_hours = 1 %]</td>
340	<td>	341	<td>
341	[% PROCESS patron_info %]	342	[% PROCESS patron_info %]
342	</td>	343	</td>
Lines 393-399 Link Here
393	<div id="delivered-today" role="tabpanel" class="tab-pane">	394	<div id="delivered-today" role="tabpanel" class="tab-pane">
394	[% END %]	395	[% END %]
395	[% IF delivered_today.count %]	396	[% IF delivered_today.count %]
396	<table class="table table-striped">	397	<table id="delivered_todayt" class="table table-striped">
397	<thead>	398	<thead>
398	<tr>	399	<tr>
399	<th>Deliver date/time</th>	400	<th>Deliver date/time</th>
Lines 405-411 Link Here
405	[% FOREACH cp IN delivered_today %]	406	[% FOREACH cp IN delivered_today %]
406	[% IF cp.delivered_datetime %]	407	[% IF cp.delivered_datetime %]
407	<tr class="[% class \| html %]">	408	<tr class="[% class \| html %]">
408	<td>[% cp.delivered_datetime \| $KohaDates with_hours = 1 %]</td>	409	<td data-order="[% cp.delivered_datetime \| html %]">[% cp.delivered_datetime \| $KohaDates with_hours = 1 %]</td>
409	<td>	410	<td>
410	[% PROCESS patron_info %]	411	[% PROCESS patron_info %]
411	</td>	412	</td>
Lines 523-528 Link Here
523	<script>dayjs.extend(window.dayjs_plugin_customParseFormat)</script>	524	<script>dayjs.extend(window.dayjs_plugin_customParseFormat)</script>
524	[% INCLUDE 'calendar.inc' %]	525	[% INCLUDE 'calendar.inc' %]
525	[% INCLUDE 'js-patron-format.inc' %]	526	[% INCLUDE 'js-patron-format.inc' %]
		527	[% INCLUDE 'datatables.inc' %]
		528	[% INCLUDE 'columns_settings.inc' %]
526	<script>	529	<script>
527	let pickups = [% To.json(curbside_pickups.unblessed) \| $raw %];	530	let pickups = [% To.json(curbside_pickups.unblessed) \| $raw %];
528	let policy = [% To.json(policy.unblessed) \| $raw %];	531	let policy = [% To.json(policy.unblessed) \| $raw %];
Lines 679-684 Link Here
679		682
680	set_interval_if_needed();	683	set_interval_if_needed();
681		684
		685
		686	let dt_settings = [];
		687	dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'to_be_stagedt', 'json') \| $raw %] );
		688	dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'staged_and_readyt', 'json') \| $raw %] );
		689	dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'patron_is_outsidet', 'json') \| $raw %] );
		690	dt_settings.push( [% TablesSettings.GetTableSettings('circ', 'curbside_pickups', 'delivered_todayt', 'json') \| $raw %] );
		691
		692	let dt_tables = new Array("to_be_stagedt", "staged_and_readyt", "patron_is_outsidet", "delivered_todayt");
		693	dt_tables.forEach(function( id, index ){
		694	KohaTable( id , {
		695	"autoWidth": false
		696	}, dt_settings[ index ] );
		697	});
		698
		699
682	});	700	});
683		701
684	let refresh_interval_id = 0;	702	let refresh_interval_id = 0;
685	-