Attachment #168264 for bug #37158

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




                                            <th>Pickup location</th>
                                            <th>Status</th>
                                            <th>Due date</th>
                                            <th class="nosort">Modify</th>
                                            <th></th>
                                        </tr>
                                    </thead>

                                                    [% RECALL.biblio.author | html %]
                                                </td>
                                                <td class="recalldate" data-order="[% RECALL.created_date | html %]">
                                                    [% RECALL.created_date | $KohaDates %]
                                                        <span class="tdlabel">Recall date:</span>
                                                            [% RECALL.created_date | $KohaDates %]
                                                    </span>
                                                </td>
                                                <td class="expirationdate" data-order="[% RECALL.expiration_date | html %]">
                                                    [% IF ( RECALL.expiration_date ) %]
                                                        [% RECALL.expiration_date | $KohaDates %]
                                                    [% ELSIF ( !RECALL.completed ) %]
                                                        <span>Never expires</span>
                                                    [% ELSE %]
                                                        -
                                                    [% END %]
                                                </td>
                                                <td class="branch">
                                                    [% RECALL.library.branchname | html %]
                                                </td>
                                                <td class="status">
                                                    [% IF ( RECALL.in_transit ) %]
                                                        <span>In transit to [% RECALL.library.branchname | html %]</span>
                                                    [% ELSIF ( RECALL.waiting ) %]
                                                        <span>Ready for pickup</span>
                                                    [% ELSIF ( RECALL.overdue ) %]
                                                        <span>Overdue to be returned</span>
                                                    [% ELSIF ( RECALL.expired ) %]
                                                        <span>Expired on [% RECALL.expiration_date | $KohaDates %]</span>
                                                    [% ELSIF ( RECALL.cancelled ) %]
                                                        <span>Cancelled on [% RECALL.completed_date | $KohaDates %]</span>
                                                    [% ELSIF ( RECALL.fulfilled ) %]
                                                        <span>Fulfilled</span>
                                                    [% ELSE %]
                                                        <span>Requested</span>
                                                    [% END %]
                                                </td>
                                                <td class="due_date">
                                                    [% IF ( RECALL.requested ) %]
                                                        <span>Due to be returned by [% RECALL.checkout.date_due | $KohaDates as_due_date => 1 %]</span>
                                                    [% ELSIF ( RECALL.waiting and RECALL.expiration_date ) %]
                                                        <span>Pick up by [% RECALL.expiration_date | $KohaDates %]</span>
                                                    [% ELSE %]
                                                        -
                                                    [% END %]
                                                </td>
                                                        <span class="tdlabel">Due date</span>
                                                        [% IF ( RECALL.requested ) %]
                                                            <span>Due to be returned by [% RECALL.checkout.date_due | $KohaDates as_due_date => 1 %]</span>
                                                        [% ELSIF ( RECALL.waiting and RECALL.expiration_date ) %]
                                                            <span>Pick up by [% RECALL.expiration_date | $KohaDates %]</span>
                                                        [% ELSE %]
                                                            -
                                                        [% END %]
                                                    </td>

                                                <td class="cancelrecall">
                                                    [% IF ( RECALL.requested or RECALL.overdue ) %]
                                                        <form action="/cgi-bin/koha/opac-recall.pl" method="post">
                                                            [% INCLUDE 'csrf-token.inc' %]
                                                            <input type="hidden" name="op" value="cud-cancel">
                                                            <input type="hidden" name="recall_id" value="[% RECALL.id | html %]">
                                                            <input type="hidden" name="biblionumber" value="[% RECALL.biblio_id | html %]">
                                                            <input type="submit" name="submit" class="btn btn-danger cancel_recall" value="Cancel">
                                                        </form>
                                                    [% END %]
                                                </td>
                                                [% END %]
                                                <td></td>
                                            </tr>
                                        [% END %]
                                    </tbody>
                                </table>
                            </div>
                                <span>No recalls have been made.</span>
                            [% END # / # RECALLS.count %]
                        [% ELSE %]
                            <span>No recalls have been made.</span>
                        [% END # / # RECALLS.count %]
                    [% ELSE %]
                        <span>Recalls have not been enabled. Please contact your library.</span>
                    [% END %]
                    </div> <!-- /#recalls -->
                </div> <!-- /.col-md-12 -->
            </div> <!-- /.row -->
        </div> <!-- /.container-fluid -->
</div> <!-- /#main -->

[% INCLUDE 'opac-bottom.inc' %]
[% BLOCK jsinclude %]
    [% INCLUDE 'datatables.inc' %]
    <script>
        $(document).ready(function(){
            $(".cancel_recall").click(function(){
                return confirmDelete(_("Are you sure you want to remove this recall?"));
                    return confirmDelete(_("Are you sure you want to remove this recall?"));
                });
                $("#recalls-table").dataTable($.extend(true, {}, dataTablesDefaults, {
                    "responsive": {
                        "details": { "type": 'column', "target": -1 }
                    },
                    "aoColumnDefs": [
                        { "aTargets": [ "nosort" ],"bSortable": false,"bSearchable": false },
                        { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
                        { "sType": "title-string", "aTargets" : [ "title-string" ] },
                        { "className": "dtr-control", "orderable": false, "targets": -1 }
                    ]
                }));
            });
            $("#recalls-table").dataTable($.extend(true, {}, dataTablesDefaults, {
                "autoWidth": false,
                "responsive": {
                    "details": { "type": 'column', "target": -1 }
                },
                "aoColumnDefs": [
                    { "aTargets": [ "nosort" ],"bSortable": false,"bSearchable": false },
                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
                    { "className": "dtr-control", "orderable": false, "targets": -1 }
                ]
            }));
        });
    </script>
[% END %]
- 

Return to bug 37158

Lines 40-46 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt (-91 / +77 lines)
40	<th>Pickup location</th>	40	<th>Pickup location</th>
41	<th>Status</th>	41	<th>Status</th>
42	<th>Due date</th>	42	<th>Due date</th>
43	<th class="nosort"> </th>	43	<th class="nosort">Modify</th>
44	<th></th>	44	<th></th>
45	</tr>	45	</tr>
46	</thead>	46	</thead>
Lines 57-140 Link Here
57	[% RECALL.biblio.author \| html %]	57	[% RECALL.biblio.author \| html %]
58	</td>	58	</td>
59	<td class="recalldate" data-order="[% RECALL.created_date \| html %]">	59	<td class="recalldate" data-order="[% RECALL.created_date \| html %]">
60	<span title="[% RECALL.created_date \| html %]">	60	[% RECALL.created_date \| $KohaDates %]
61	<span class="tdlabel">Recall date:</span>
62	[% RECALL.created_date \| $KohaDates %]
63	</span>
64	</td>	61	</td>
65	<td class="expirationdate" data-order="[% RECALL.expiration_date \| html %]">	62	<td class="expirationdate" data-order="[% RECALL.expiration_date \| html %]">
66	[% IF ( RECALL.expiration_date ) %]	63	[% IF ( RECALL.expiration_date ) %]
67	<span title="[% RECALL.expiration_date \| html %]">	64	[% RECALL.expiration_date \| $KohaDates %]
68	<span class="tdlabel">Expiration:</span>	65	[% ELSIF ( !RECALL.completed ) %]
69	[% RECALL.expiration_date \| $KohaDates %]	66	<span>Never expires</span>
70	</span>	67	[% ELSE %]
71	[% ELSIF ( !RECALL.completed ) %]	68	-
72	<span title="0000-00-00">	69	[% END %]
73	<span class="tdlabel">Expiration:</span>	70	</td>
74	Never expires	71	<td class="branch">
75	</span>	72	[% RECALL.library.branchname \| html %]
76	[% ELSE %]	73	</td>
77	<span title="0000-00-00">-</span>	74	<td class="status">
78	[% END %]	75	[% IF ( RECALL.in_transit ) %]
79	</td>	76	<span>In transit to [% RECALL.library.branchname \| html %]</span>
80	<td class="branch">	77	[% ELSIF ( RECALL.waiting ) %]
81	<span class="tdlabel">Pick up location:</span>	78	<span>Ready for pickup</span>
82	[% RECALL.library.branchname \| html %]	79	[% ELSIF ( RECALL.overdue ) %]
83	</td>	80	<span>Overdue to be returned</span>
84	<td class="status">	81	[% ELSIF ( RECALL.expired ) %]
85	<span class="tdlabel">Status:</span>	82	<span>Expired on [% RECALL.expiration_date \| $KohaDates %]</span>
86	[% IF ( RECALL.in_transit ) %]	83	[% ELSIF ( RECALL.cancelled ) %]
87	<span>In transit to [% RECALL.library.branchname \| html %]</span>	84	<span>Cancelled on [% RECALL.completed_date \| $KohaDates %]</span>
88	[% ELSIF ( RECALL.waiting ) %]	85	[% ELSIF ( RECALL.fulfilled ) %]
89	<span>Ready for pickup</span>	86	<span>Fulfilled</span>
90	[% ELSIF ( RECALL.overdue ) %]	87	[% ELSE %]
91	<span>Overdue to be returned</span>	88	<span>Requested</span>
92	[% ELSIF ( RECALL.expired ) %]	89	[% END %]
93	<span>Expired on [% RECALL.expiration_date \| $KohaDates %]</span>	90	</td>
94	[% ELSIF ( RECALL.cancelled ) %]	91	<td class="due_date">
95	<span>Cancelled on [% RECALL.completed_date \| $KohaDates %]</span>	92	[% IF ( RECALL.requested ) %]
96	[% ELSIF ( RECALL.fulfilled ) %]	93	<span>Due to be returned by [% RECALL.checkout.date_due \| $KohaDates as_due_date => 1 %]</span>
97	<span>Fulfilled</span>	94	[% ELSIF ( RECALL.waiting and RECALL.expiration_date ) %]
98	[% ELSE %]	95	<span>Pick up by [% RECALL.expiration_date \| $KohaDates %]</span>
99	<span>Requested</span>	96	[% ELSE %]
100	[% END %]	97	-
101	</td>	98	[% END %]
102	<td class="due_date">	99	</td>
103	<span class="tdlabel">Due date</span>
104	[% IF ( RECALL.requested ) %]
105	<span>Due to be returned by [% RECALL.checkout.date_due \| $KohaDates as_due_date => 1 %]</span>
106	[% ELSIF ( RECALL.waiting and RECALL.expiration_date ) %]
107	<span>Pick up by [% RECALL.expiration_date \| $KohaDates %]</span>
108	[% ELSE %]
109	-
110	[% END %]
111	</td>
112		100
113	<td class="cancelrecall">	101	<td class="cancelrecall">
114	[% IF ( RECALL.requested or RECALL.overdue ) %]	102	[% IF ( RECALL.requested or RECALL.overdue ) %]
115	<form action="/cgi-bin/koha/opac-recall.pl" method="post">	103	<form action="/cgi-bin/koha/opac-recall.pl" method="post">
116	[% INCLUDE 'csrf-token.inc' %]	104	[% INCLUDE 'csrf-token.inc' %]
117	<input type="hidden" name="op" value="cud-cancel">	105	<input type="hidden" name="op" value="cud-cancel">
118	<input type="hidden" name="recall_id" value="[% RECALL.id \| html %]">	106	<input type="hidden" name="recall_id" value="[% RECALL.id \| html %]">
119	<input type="hidden" name="biblionumber" value="[% RECALL.biblio_id \| html %]">	107	<input type="hidden" name="biblionumber" value="[% RECALL.biblio_id \| html %]">
120	<input type="submit" name="submit" class="btn btn-danger cancel_recall" value="Cancel">	108	<input type="submit" name="submit" class="btn btn-danger cancel_recall" value="Cancel">
121	</form>	109	</form>
122	[% END %]	110	[% END %]
123	</td>	111	</td>
124	[% END %]
125	<td></td>	112	<td></td>
126	</tr>	113	</tr>
127	</tbody>	114	[% END %]
128	</table>	115	</tbody>
129	</div>	116	</table>
130	[% ELSE %]	117	</div>
131	<span>No recalls have been made.</span>
132	[% END # / # RECALLS.count %]
133	[% ELSE %]	118	[% ELSE %]
134	<span>Recalls have not been enabled. Please contact your library.</span>	119	<span>No recalls have been made.</span>
135	[% END %]	120	[% END # / # RECALLS.count %]
136	</div> <!-- /#recalls -->	121	[% ELSE %]
137	</div> <!-- /.col-md-12 -->	122	<span>Recalls have not been enabled. Please contact your library.</span>
		123	[% END %]
		124	</div> <!-- /#recalls -->
		125	</div> <!-- /.col-md-12 -->
138	</div> <!-- /.row -->	126	</div> <!-- /.row -->
139	</div> <!-- /.container-fluid -->	127	</div> <!-- /.container-fluid -->
140	</div> <!-- /#main -->	128	</div> <!-- /#main -->
Lines 142-164 Link Here
142	[% INCLUDE 'opac-bottom.inc' %]	130	[% INCLUDE 'opac-bottom.inc' %]
143	[% BLOCK jsinclude %]	131	[% BLOCK jsinclude %]
144	[% INCLUDE 'datatables.inc' %]	132	[% INCLUDE 'datatables.inc' %]
145	<script type="text/JavaScript">	133	<script>
146	//<![CDATA[	134	$(document).ready(function(){
147	$(document).ready(function(){	135	$(".cancel_recall").click(function(){
148	$(".cancel_recall").click(function(){	136	return confirmDelete(_("Are you sure you want to remove this recall?"));
149	return confirmDelete(_("Are you sure you want to remove this recall?"));
150	});
151	$("#recalls-table").dataTable($.extend(true, {}, dataTablesDefaults, {
152	"responsive": {
153	"details": { "type": 'column', "target": -1 }
154	},
155	"aoColumnDefs": [
156	{ "aTargets": [ "nosort" ],"bSortable": false,"bSearchable": false },
157	{ "sType": "anti-the", "aTargets" : [ "anti-the" ] },
158	{ "sType": "title-string", "aTargets" : [ "title-string" ] },
159	{ "className": "dtr-control", "orderable": false, "targets": -1 }
160	]
161	}));
162	});	137	});
		138	$("#recalls-table").dataTable($.extend(true, {}, dataTablesDefaults, {
		139	"autoWidth": false,
		140	"responsive": {
		141	"details": { "type": 'column', "target": -1 }
		142	},
		143	"aoColumnDefs": [
		144	{ "aTargets": [ "nosort" ],"bSortable": false,"bSearchable": false },
		145	{ "sType": "anti-the", "aTargets" : [ "anti-the" ] },
		146	{ "className": "dtr-control", "orderable": false, "targets": -1 }
		147	]
		148	}));
		149	});
163	</script>	150	</script>
164	[% END %]	151	[% END %]
165	-