add order filters

NINAnor · Jan 15, 2025 · e8f11d9 · e8f11d9
1 parent 92b9293
commit e8f11d9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/src/genlab_bestilling/templates/genlab_bestilling/order_filter.html b/src/genlab_bestilling/templates/genlab_bestilling/order_filter.html
@@ -0,0 +1,13 @@
+{% extends "genlab_bestilling/base_filter.html" %}
+{% load neapolitan %}
+{% load render_table from django_tables2 %}
+
+{% block page-title %}Orders relative to {{ genrequest }}{% endblock page-title %}
+{% block page-inner %}
+<div class="flex gap-5 mb-5">
+    <a class="btn bg-primary" href="{% url 'genrequest-detail' pk=genrequest.id %}"><i class="fas fa-arrow-left"></i> back</a>
+    <a class="btn bg-primary" href="{% url 'genrequest-equipment-create' genrequest_id=genrequest.id %}"><i class="fas fa-plus"></i> Equipment order</a>
+    <a class="btn bg-primary" href="{% url 'genrequest-extraction-create' genrequest_id=genrequest.id %}"><i class="fas fa-plus"></i> Extraction order</a>
+    <a class="btn bg-primary" href="{% url 'genrequest-analysis-create' genrequest_id=genrequest.id %}"><i class="fas fa-plus"></i> Analysis order</a>
+</div>
+{% endblock page-inner %}
diff --git a/src/genlab_bestilling/templates/genlab_bestilling/order_list.html b/src/genlab_bestilling/templates/genlab_bestilling/order_list.html
diff --git a/src/genlab_bestilling/views.py b/src/genlab_bestilling/views.py
@@ -29,7 +29,12 @@
 from view_breadcrumbs import BaseBreadcrumbMixin
 
 from .api.serializers import AnalysisSerializer, ExtractionSerializer
-from .filters import OrderAnalysisFilter, OrderEquipmentFilter
+from .filters import (
+    OrderAnalysisFilter,
+    OrderEquipmentFilter,
+    OrderExtractionFilter,
+    OrderFilter,
+)
 from .forms import (
     ActionForm,
     AnalysisOrderForm,
@@ -252,9 +257,10 @@ def get_form_kwargs(self) -> dict[str, Any]:
         return kwargs
 
 
-class GenrequestOrderListView(GenrequestNestedMixin, SingleTableView):
+class GenrequestOrderListView(GenrequestNestedMixin, SingleTableMixin, FilterView):
     model = Order
     table_class = OrderTable
+    filterset_class = OrderFilter
     gen_crumbs = [("Orders", "")]
 
     def get_queryset(self):
@@ -293,7 +299,7 @@ class GenrequestExtractionOrderListView(
 ):
     model = ExtractionOrder
     table_class = ExtractionOrderTable
-    filterset_class = OrderEquipmentFilter
+    filterset_class = OrderExtractionFilter
 
     @cached_property
     def gen_crumbs(self):