From 54b999ae2ada5f252f2558cf0b48af08b4c830ca Mon Sep 17 00:00:00 2001
From: Stephen Early <steve@assorted.org.uk>
Date: Tue, 16 Jan 2024 15:45:22 +0000
Subject: [PATCH] Use datatable for deliveries on supplier detail page

---
 .../templates/tillweb/deliverylist.html       | 33 -------------
 .../tillweb/templates/tillweb/supplier.html   | 48 ++++++++++++++++---
 quicktill/tillweb/views.py                    |  3 --
 3 files changed, 41 insertions(+), 43 deletions(-)
 delete mode 100644 quicktill/tillweb/templates/tillweb/deliverylist.html

diff --git a/quicktill/tillweb/templates/tillweb/deliverylist.html b/quicktill/tillweb/templates/tillweb/deliverylist.html
deleted file mode 100644
index 46b99e0a..00000000
--- a/quicktill/tillweb/templates/tillweb/deliverylist.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% if pager.items %}
-<div class="table-responsive">
-<table class="table table-striped table-hover table-sm" id="deliveries">
-  <thead class="thead-light">
-    <tr>
-      <th scope="col">ID</th>
-      <th scope="col">Date</th>
-{% if exclude_column != "supplier" %}<th scope="col">Supplier</th>{% endif %}
-      <th scope="col">Document</th>
-      <th scope="col">Confirmed?</th>
-    </tr>
-  </thead>
-  <tbody>
-{% for d in pager.items %}
-<tr{% if not d.checked %} class="table-warning"{% endif %}>
-<td><a href="{{d.get_absolute_url}}">{{d.id}}</a></td>
-<td><a href="{{d.get_absolute_url}}">{{d.date}}</a></td>
-{% if exclude_column != "supplier" %}
-<td><a href="{{d.supplier.get_absolute_url}}">{{d.supplier.name}}</a></td>
-{% endif %}
-<td>{{d.docnumber}}</td>
-<td>{{d.checked|yesno:"Yes,No"}}</td></tr>
-{% endfor %}
-  </tbody>
-</table>
-<script type="text/javascript">
-$(document).ready(function(){
-  $("#deliveries").tablesorter();
-});
-</script>
-</div>
-{{pager.as_html}}
-{% endif %}
diff --git a/quicktill/tillweb/templates/tillweb/supplier.html b/quicktill/tillweb/templates/tillweb/supplier.html
index dafdb364..f859ffbb 100644
--- a/quicktill/tillweb/templates/tillweb/supplier.html
+++ b/quicktill/tillweb/templates/tillweb/supplier.html
@@ -28,13 +28,47 @@
 
 <h2>Deliveries</h2>
 
-{% with exclude_column="supplier" %}
-{% if pager.items %}
-{% include "tillweb/deliverylist.html" %}
-{% else %}
-<p>There have not been any deliveries from this supplier.</p>
-{% endif %}
-{% endwith %}
+<table class="table table-striped table-sm" id="deliveries">
+  <thead class="thead-light">
+    <tr>
+      <th scope="col">ID</th>
+      <th scope="col">Date</th>
+      <th scope="col">Document</th>
+      <th scope="col">Confirmed?</th>
+    </tr>
+  </thead>
+  <tbody></tbody>
+</table>
+
+<script type="text/javascript">
+  $(document).ready(function(){
+    $("#deliveries").DataTable({
+	ajax: {
+	    url: '{% url "tillweb-datatable-deliveries" pubname=pubname %}',
+	    dataSrc: 'data',
+	    data: function (d) {
+		d.supplierid = {{supplier.id}};
+	    },
+	},
+	columns: [
+	    { data: 'id',
+	      render: render_link('url', DataTable.render.text()) },
+	    { data: 'date',
+	      render: render_link('url', DataTable.render.date()),
+	      searchable: false },
+	    { data: 'docnumber',
+	      render: DataTable.render.text() },
+	    { data: 'checked',
+	      render: render_yesno(),
+	      searchable: false },
+	],
+	order: [ [0, 'desc'] ],
+	searching: true,
+	paging: true,
+	serverSide: true
+    });
+  });
+</script>
 
 {% if supplier.logs %}
 <h2>Log entries</h2>
diff --git a/quicktill/tillweb/views.py b/quicktill/tillweb/views.py
index ba6ba1f3..f2ac69ff 100644
--- a/quicktill/tillweb/views.py
+++ b/quicktill/tillweb/views.py
@@ -1018,7 +1018,6 @@ def supplier(request, info, supplierid):
         raise Http404
 
     deliveries = td.s.query(Delivery)\
-                     .order_by(desc(Delivery.id))\
                      .filter(Delivery.supplier == s)
 
     form = None
@@ -1060,12 +1059,10 @@ def supplier(request, info, supplierid):
         else:
             form = SupplierForm(initial=initial)
 
-    pager = Pager(request, deliveries)
     return ('supplier.html', {
         'tillobject': s,
         'supplier': s,
         'form': form,
-        'pager': pager,
         'can_delete': can_delete,
     })