-
- {% for order in delivered_orders %}
- {% if order.polymorphic_ctype.model == 'analysisorder' %}
-
- {% elif order.polymorphic_ctype.model == 'equipmentorder' %}
-
- {% elif order.polymorphic_ctype.model == 'extractionorder' %}
-
+
+ {% urgent_orders_table area=area %}
+ {% new_orders_table area=area %}
- {% endif %}
-
- {% if urgent_orders|length > 0 %}
-
- {% else %}
-
-
Urgent orders
-
No urgent orders found.
-
- {% endif %}
-
- {% if assigned_orders|length > 0 %}
-
-
My orders ({{ assigned_orders|length }})
-
- {% for order in assigned_orders %}
- {% if order.polymorphic_ctype.model == 'analysisorder' %}
-
{{ order }} - {{ order.name }}
- {% elif order.polymorphic_ctype.model == 'equipmentorder' %}
-
{{ order }} - {{ order.name }}
- {% elif order.polymorphic_ctype.model == 'extractionorder' %}
-
{{ order }} - {{ order.name }}
- {% else %}
-
{{ order }} - {{ order.name }}
- {% endif %}
- {% endfor %}
+
+ {% assigned_orders_table %}
- {% else %}
-
-
Assigned orders
-
No assigned orders found.
-
- {% endif %}
+
{% endblock %}
diff --git a/src/staff/templatetags/__init__.py b/src/staff/templatetags/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/staff/templatetags/order_tags.py b/src/staff/templatetags/order_tags.py
new file mode 100644
index 00000000..766c190d
--- /dev/null
+++ b/src/staff/templatetags/order_tags.py
@@ -0,0 +1,107 @@
+from django import template
+from django.db import models
+
+from genlab_bestilling.models import Area, Order
+
+from ..tables import AssignedOrderTable, NewOrderTable, UrgentOrderTable
+
+register = template.Library()
+
+
+@register.inclusion_tag("staff/components/order_table.html", takes_context=True)
+def urgent_orders_table(context: dict, area: Area | None = None) -> dict:
+ urgent_orders = Order.objects.filter(
+ is_urgent=True,
+ status__in=[Order.OrderStatus.PROCESSING, Order.OrderStatus.DELIVERED],
+ ).select_related("genrequest")
+
+ if area:
+ urgent_orders = urgent_orders.filter(genrequest__area=area)
+
+ urgent_orders = urgent_orders.only(
+ "id", "genrequest__name", "genrequest__expected_samples_delivery_date", "status"
+ ).order_by(
+ models.Case(
+ models.When(status=Order.OrderStatus.PROCESSING, then=0),
+ models.When(status=Order.OrderStatus.DELIVERED, then=1),
+ models.When(status=Order.OrderStatus.COMPLETED, then=2),
+ default=3,
+ output_field=models.IntegerField(),
+ ),
+ "-created_at",
+ )
+
+ return {
+ "title": "Urgent orders",
+ "table": UrgentOrderTable(urgent_orders),
+ "count": urgent_orders.count(),
+ "request": context.get("request"),
+ }
+
+
+@register.inclusion_tag("staff/components/order_table.html", takes_context=True)
+def new_orders_table(context: dict, area: Area | None = None) -> dict:
+ new_orders = (
+ Order.objects.filter(status=Order.OrderStatus.DELIVERED)
+ .select_related("genrequest")
+ .annotate(sample_count=models.Count("extractionorder__samples"))
+ .only(
+ "id",
+ "genrequest__name",
+ "genrequest__expected_samples_delivery_date",
+ "status",
+ )
+ .order_by("status")
+ )
+
+ if area:
+ new_orders = new_orders.filter(genrequest__area=area)
+
+ new_orders = new_orders.order_by("-created_at")
+
+ return {
+ "title": "New orders",
+ "table": NewOrderTable(new_orders),
+ "count": new_orders.count(),
+ "request": context.get("request"),
+ }
+
+
+@register.inclusion_tag("staff/components/order_table.html", takes_context=True)
+def assigned_orders_table(context: dict) -> dict:
+ assigned_orders = (
+ Order.objects.filter(
+ status__in=[
+ Order.OrderStatus.PROCESSING,
+ Order.OrderStatus.DELIVERED,
+ Order.OrderStatus.COMPLETED,
+ ]
+ )
+ .select_related("genrequest")
+ .annotate(
+ sample_count=models.Count("extractionorder__samples"),
+ )
+ .only(
+ "id",
+ "genrequest__name",
+ "genrequest__expected_samples_delivery_date",
+ "status",
+ )
+ .order_by(
+ models.Case(
+ models.When(status=Order.OrderStatus.PROCESSING, then=0),
+ models.When(status=Order.OrderStatus.DELIVERED, then=1),
+ models.When(status=Order.OrderStatus.COMPLETED, then=2),
+ default=3,
+ output_field=models.IntegerField(),
+ ),
+ "-created_at",
+ )
+ )
+
+ return {
+ "title": "My orders",
+ "table": AssignedOrderTable(assigned_orders),
+ "count": assigned_orders.count(),
+ "request": context.get("request"),
+ }
diff --git a/src/staff/views.py b/src/staff/views.py
index 23573f0e..956c576f 100644
--- a/src/staff/views.py
+++ b/src/staff/views.py
@@ -18,6 +18,7 @@
from genlab_bestilling.models import (
AnalysisOrder,
+ Area,
EquipmentOrder,
ExtractionOrder,
ExtractionPlate,
@@ -67,22 +68,25 @@ def test_func(self) -> bool:
class DashboardView(StaffMixin, TemplateView):
template_name = "staff/dashboard.html"
- def get_context_data(self, **kwargs) -> dict[str, Any]:
- context = super().get_context_data(**kwargs)
+ def get_area_from_query(self) -> Area | None:
+ area_id = self.request.GET.get("area")
+ if area_id:
+ try:
+ return Area.objects.get(pk=area_id)
+ except Area.DoesNotExist:
+ return None
+ return None
- urgent_orders = Order.objects.filter(
- is_urgent=True,
- status__in=[Order.OrderStatus.PROCESSING, Order.OrderStatus.DELIVERED],
- ).order_by("-created_at")
- context["urgent_orders"] = urgent_orders
+ def get_areas(self) -> models.QuerySet[Area]:
+ return Area.objects.all().order_by("name")
- delivered_orders = Order.objects.filter(status=Order.OrderStatus.DELIVERED)
+ def get_context_data(self, **kwargs) -> dict[str, Any]:
+ context = super().get_context_data(**kwargs)
- context["delivered_orders"] = delivered_orders
- context["assigned_orders"] = self.request.user.responsible_orders.filter(
- status__in=[Order.OrderStatus.DELIVERED, Order.OrderStatus.PROCESSING]
- ).order_by("-created_at")
context["now"] = now()
+ context["areas"] = self.get_areas()
+ context["area"] = self.get_area_from_query()
+
return context
diff --git a/src/templates/django_tables2/tailwind.html b/src/templates/django_tables2/tailwind.html
index 57650799..a322ecb5 100644
--- a/src/templates/django_tables2/tailwind.html
+++ b/src/templates/django_tables2/tailwind.html
@@ -1,126 +1,7 @@
-{% load django_tables2 %}
-{% load i18n %}
{% block table-wrapper %}
-
-
- {% block table %}
-
- {% block table.thead %}
- {% if table.show_header %}
-
-
- {% for column in table.columns %}
-
- {% if column.orderable %}
- {% comment%}
- If the column is orderable, two small arrows will show next to the column name to signal that it can be sorted.
- {% endcomment%}
-
- {{ column.header }}
-
-
- {% else %}
- {{ column.header }}
- {% endif %}
-
- {% endfor %}
-
-
- {% endif %}
- {% endblock table.thead %}
-
-
- {% block table.tbody %}
-
- {% for row in table.paginated_rows %}
- {% block table.tbody.row %}
-
-
- {% for column, cell in row.items %}
-
- {% if column.localize == None %}
- {{ cell }}
- {% else %}
- {% if column.localize %}
- {{ cell|localize }}
- {% else %}
- {{ cell|unlocalize }}
- {% endif %}
- {% endif %}
- {% endfor %}
-
- {% endblock table.tbody.row %}
- {% empty %}
- {% if table.empty_text %}
- {% block table.tbody.empty_text %}
- {{ table.empty_text }}
- {% endblock table.tbody %}
-
-
- {% block table.tfoot %}
- {% if table.has_footer %}
-
-
- {% for column in table.columns %}
- {{ column.footer }}
- {% endfor %}
-
-
- {% endif %}
- {% endblock table.tfoot %}
-
- {% endblock table %}
-
- {% block pagination %}
- {% if table.page and table.paginator.num_pages > 1 %}
-
-
-
- {% endif %}
- {% endblock pagination %}
-
+
+
+ {% include 'django_tables2/tailwind_inner.html' %}
+
{% endblock table-wrapper %}
diff --git a/src/templates/django_tables2/tailwind_inner.html b/src/templates/django_tables2/tailwind_inner.html
new file mode 100644
index 00000000..24485f46
--- /dev/null
+++ b/src/templates/django_tables2/tailwind_inner.html
@@ -0,0 +1,120 @@
+{% load django_tables2 %}
+{% load i18n %}
+
+{% block table %}
+
+ {% block table.thead %}
+ {% if table.show_header %}
+
+
+ {% for column in table.columns %}
+
+ {% if column.orderable %}
+ {% comment%}
+ If the column is orderable, two small arrows will show next to the column name to signal that it can be sorted.
+ {% endcomment%}
+
+ {{ column.header }}
+
+
+ {% else %}
+ {{ column.header }}
+ {% endif %}
+
+ {% endfor %}
+
+
+ {% endif %}
+ {% endblock table.thead %}
+
+
+ {% block table.tbody %}
+
+ {% for row in table.paginated_rows %}
+ {% block table.tbody.row %}
+
+
+ {% for column, cell in row.items %}
+
+ {% if column.localize == None %}
+ {{ cell }}
+ {% else %}
+ {% if column.localize %}
+ {{ cell|localize }}
+ {% else %}
+ {{ cell|unlocalize }}
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+ {% endblock table.tbody.row %}
+ {% empty %}
+ {% if table.empty_text %}
+ {% block table.tbody.empty_text %}
+ {{ table.empty_text }}
+ {% endblock table.tbody %}
+
+
+ {% block table.tfoot %}
+ {% if table.has_footer %}
+
+
+ {% for column in table.columns %}
+ {{ column.footer }}
+ {% endfor %}
+
+
+ {% endif %}
+ {% endblock table.tfoot %}
+
+{% endblock table %}
+
+{% block pagination %}
+ {% if table.page and table.paginator.num_pages > 1 %}
+
+
+
+ {% endif %}
+{% endblock pagination %}