Use datatable for deliveries on supplier detail page

sde1000 · Jan 16, 2024 · 54b999a · 54b999a
1 parent f40c336
commit 54b999a
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 43 deletions.
diff --git a/quicktill/tillweb/templates/tillweb/deliverylist.html b/quicktill/tillweb/templates/tillweb/deliverylist.html
diff --git 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
@@ -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,
     })