Get sample count for analysis

Author: omfj

src/staff/tables.py

@@ -241,8 +241,10 @@ class CustomSampleTable(tables.Table):
 
         class Meta:
             model = Sample
-            fields = ["checked", "genlab_id", "internal_note"] + list(base_fields)
-            sequence = ["checked", "genlab_id"] + list(base_fields) + ["internal_note"]
+            fields = ["checked", "genlab_id",
+                      "internal_note"] + list(base_fields)
+            sequence = ["checked", "genlab_id"] + \
+                list(base_fields) + ["internal_note"]
 
     return CustomSampleTable
 
@@ -413,7 +415,8 @@ def render_samples(self, value: int) -> str:
 
     class Meta:
         model = Order
-        fields = ["id", "description", "delivery_date", "samples", "markers", "seen"]
+        fields = ["id", "description", "delivery_date",
+                  "samples", "markers", "seen"]
         empty_text = "No new unseen orders"
         template_name = "django_tables2/tailwind_inner.html"
 
@@ -482,7 +485,7 @@ class AssignedOrderTable(StatusMixinTable, StaffIDMixinTable):
 
     samples_completed = tables.Column(
         accessor="sample_count",
-        verbose_name="Samples completed",
+        verbose_name="Samples isolated",
         orderable=False,
     )
 

src/staff/templatetags/order_tags.py

@@ -52,10 +52,22 @@ def new_seen_orders_table(context: dict, area: Area | None = None) -> dict:
         .exclude(is_urgent=True)
         .select_related("genrequest")
         .annotate(
-            sample_count=models.Count("extractionorder__samples"),
+            sample_count=models.Case(
+                models.When(
+                    extractionorder__isnull=False,
+                    then=models.Count(
+                        "extractionorder__samples", distinct=True),
+                ),
+                models.When(
+                    analysisorder__isnull=False,
+                    then=models.Count("analysisorder__samples", distinct=True),
+                ),
+                default=0,
+            ),
             priority=models.Case(
                 models.When(is_urgent=True, then=Order.OrderPriority.URGENT),
-                models.When(is_prioritized=True, then=Order.OrderPriority.PRIORITIZED),
+                models.When(is_prioritized=True,
+                            then=Order.OrderPriority.PRIORITIZED),
                 default=1,
             ),
         )
@@ -84,7 +96,18 @@ def new_unseen_orders_table(context: dict, area: Area | None = None) -> dict:
         .exclude(is_urgent=True)
         .select_related("genrequest")
         .annotate(
-            sample_count=models.Count("extractionorder__samples"),
+            sample_count=models.Case(
+                models.When(
+                    extractionorder__isnull=False,
+                    then=models.Count(
+                        "extractionorder__samples", distinct=True),
+                ),
+                models.When(
+                    analysisorder__isnull=False,
+                    then=models.Count("analysisorder__samples", distinct=True),
+                ),
+                default=0,
+            )
         )
         .prefetch_related(
             "analysisorder__markers",
@@ -96,6 +119,8 @@ def new_unseen_orders_table(context: dict, area: Area | None = None) -> dict:
 
     new_orders = new_orders.order_by("-created_at")
 
+    print(new_orders.values())
+
     return {
         "title": "New unseen orders",
         "table": NewUnseenOrderTable(new_orders),
@@ -116,12 +141,12 @@ def assigned_orders_table(context: dict) -> dict:
         )
         .select_related("genrequest")
         .annotate(
-            sample_count=models.Count("extractionorder__samples"),
-        )
-        .annotate(
+            sample_count=models.Count(
+                "extractionorder__samples", distinct=True),
             priority=models.Case(
                 models.When(is_urgent=True, then=Order.OrderPriority.URGENT),
-                models.When(is_prioritized=True, then=Order.OrderPriority.PRIORITIZED),
+                models.When(is_prioritized=True,
+                            then=Order.OrderPriority.PRIORITIZED),
                 default=1,
             )
         )