Added links to genlab ids and action text

Author: aastabk

src/staff/tables.py

@@ -3,6 +3,7 @@
 import django_tables2 as tables
 from django.db.models import QuerySet
 from django.templatetags.static import static
+from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
@@ -270,6 +271,12 @@ class SampleBaseTable(tables.Table):
         empty_values=(),
     )
 
+    genlab_id = tables.Column(
+        orderable=False,
+        empty_values=(None,),
+        verbose_name="Genlab ID",
+    )
+
     name = tables.Column()
 
     class Meta:
@@ -317,6 +324,13 @@ def order_name(
         queryset = queryset.order_by(f"{prefix}name_as_int", "name")
         return (queryset, True)
 
+    def render_genlab_id(self, value: Any, record: Any) -> Any:
+        from_url = reverse(
+            "staff:order-extraction-samples", kwargs={"pk": record.order.pk}
+        )
+        url = reverse("staff:samples-detail", kwargs={"pk": record.id})
+        return format_html('<a href="{}?from={}">{}</a>', url, from_url, value)
+
 
 class SampleStatusTable(tables.Table):
     """
@@ -339,6 +353,12 @@ class SampleStatusTable(tables.Table):
         verbose_name="Mark",
     )
 
+    genlab_id = tables.Column(
+        orderable=False,
+        empty_values=(None,),
+        verbose_name="Genlab ID",
+    )
+
     internal_note = tables.TemplateColumn(
         template_name="staff/note_input_column.html",
         orderable=False,
@@ -402,6 +422,13 @@ def render_checked(self, record: Any) -> str:
             record.id,
         )
 
+    def render_genlab_id(self, value: Any, record: Any) -> Any:
+        from_url = reverse(
+            "staff:order-extraction-samples-lab", kwargs={"pk": record.order.pk}
+        )
+        url = reverse("staff:samples-detail", kwargs={"pk": record.id})
+        return format_html('<a href="{}?from={}">{}</a>', url, from_url, value)
+
 
 class OrderExtractionSampleTable(SampleBaseTable):
     class Meta(SampleBaseTable.Meta):

src/staff/templates/staff/sample_detail.html

@@ -6,7 +6,7 @@
 
     <div class="flex gap-5 my-5">
 
-        <a class="btn btn-tertiary" href="{% url 'staff:samples-list' %}"><i class="fas fa-arrow-left"></i> Back</a>
+        <a class="btn btn-tertiary" href="{{ url }}"><i class="fas fa-arrow-left"></i> Back</a>
 
         {% if user.is_staff %}
             <a class="btn custom_order_button ml-auto" href="{{ object.get_admin_change_url }}">

src/staff/templates/staff/sample_filter.html

@@ -30,6 +30,8 @@
       {% csrf_token %}
       <input type="hidden" name="sort" value="{{ request.GET.sort|default:'' }}">
       {% next_url_input %}
+      <h1 class="ml-2 mb-1 font-medium">Actions</h1>
+      <h3 class="ml-2 mb-2 font-light text-gray-600">Select samples to generate genlabID</h3>
       <div class="flex gap-5 mb-5">
         <button class="btn btn-success" type="submit" name="generate_genlab_ids">
             <i class="fa-solid fa-id-badge"></i> Generate genlab IDs

src/staff/templates/staff/sample_lab.html

@@ -18,6 +18,8 @@ <h3 class="text-4xl mb-5">{% block page-title %}{% if order %}Samples {{ order }
     <form method="post" action="{% url 'staff:order-extraction-samples-lab' order.pk %}">
         {% csrf_token %}
         {% next_url_input %}
+        <h1 class="ml-2 mb-1 font-medium">Actions</h1>
+        <h3 class="ml-2 mb-2 font-light text-gray-600">Select samples to toggle status or set isolation method</h3>
         <div class="flex items-center">
         {% for status in statuses %}
             <button class="btn btn-sm btn-success" type="submit" name="status" value="{{ status }}">

src/staff/templates/staff/samplemarkeranalysis_filter.html

@@ -17,6 +17,8 @@ <h3 class="text-4xl mb-5">{% block page-title %}{% if order %}Samples {{ order }
 <form method="post" action="{% url 'staff:order-analysis-samples' order.pk %}">
     {% csrf_token %}
     {% next_url_input %}
+    <h1 class="ml-2 mb-1 font-medium">Actions</h1>
+    <h3 class="ml-2 mb-2 font-light text-gray-600">Select samples to toggle status</h3>
     {% for status in statuses %}
         <button class="btn btn-sm btn-success" type="submit" name="status" value="{{ status }}">
             {% if status == "pcr" %}

src/staff/views.py

@@ -535,6 +535,16 @@ def get_queryset(self) -> QuerySet[Sample]:
 class SampleDetailView(StaffMixin, DetailView):
     model = Sample
 
+    def get_context_data(self, **kwargs) -> dict[str, Any]:
+        context = super().get_context_data(**kwargs)
+        referer = self.request.GET.get("from")
+        if referer:
+            context["url"] = referer
+        else:
+            # Fallback to a default page
+            context["url"] = reverse("staff:samples-list")
+        return context
+
 
 class SampleLabView(StaffMixin, SingleTableMixin, SafeRedirectMixin, FilterView):
     MARKED = "marked"