Minor visual changes for analysis order

src/staff/tables.py

@@ -425,7 +425,7 @@ class OrderAnalysisSampleTable(tables.Table):
     )
 
     has_pcr = tables.BooleanColumn(
-        verbose_name="Has PCR",
+        verbose_name="PCR",
         orderable=True,
         yesno="✔,-",
         default=False,
@@ -440,13 +440,23 @@ class OrderAnalysisSampleTable(tables.Table):
         accessor="is_analysed",
     )
     is_outputted = tables.BooleanColumn(
-        verbose_name="Is Outputted",
+        verbose_name="Output",
         orderable=True,
         yesno="✔,-",
         default=False,
         accessor="is_outputted",
     )
 
+    sample__internal_note = tables.TemplateColumn(
+        template_name="staff/note_input_column.html",
+        orderable=False,
+        attrs={
+            "td": {
+                "class": "relative",
+            },
+        },
+    )
+
     class Meta:
         model = SampleMarkerAnalysis
         fields = (

src/staff/templates/staff/note_input_column.html

@@ -1,19 +1,20 @@
+<div class="relative w-52">
 <textarea
     id="internal_note-input-{{ record.pk }}"
     class="internal_note-input w-52 pr-8 px-2.5 py-1.5 text-sm border border-gray-300 rounded-lg resize-none placeholder:text-gray-400 placeholder:italic"
     data-sample-id="{{ record.pk }}"
     placeholder="Write a note..."
-  >{{ record.internal_note|default:'' }}
-</textarea>
-
+>{{ record.internal_note|default:'' }}</textarea>
+<!-- Spinner Icon -->
 <i
-    class="fa-solid fa-spinner absolute left-60 top-10 transform -translate-y-1/2 text-blue-600 pointer-events-none animate-spin duration-2000"
-    style="visibility: hidden;"
     id="internal_note-spinner-{{ record.pk }}"
+    class="fa-solid fa-spinner animate-spin text-blue-600 absolute right-2 top-1/3 -translate-y-1/2 text-sm pointer-events-none"
+    style="visibility: hidden;"
 ></i>
-
+<!-- Check Icon -->
 <i
-    class="fa-solid fa-check absolute left-60 top-1/2 transform -translate-y-1/2 text-green-600 pointer-events-none"
-    style="visibility: hidden;"
     id="internal_note-check-{{ record.pk }}"
+    class="fa-solid fa-check text-green-600 absolute right-2 top-1/2 -translate-y-1/2 text-sm pointer-events-none"
+    style="visibility: hidden;"
 ></i>
+</div>

src/staff/templates/staff/samplemarkeranalysis_filter.html

@@ -61,13 +61,23 @@
                 formData.append("field_value", value);
                 formData.append("csrfmiddlewaretoken", "{{ csrf_token }}");
 
+                const spinner = document.getElementById(`internal_note-spinner-${sampleId}`);
+                const checkIcon = document.getElementById(`internal_note-check-${sampleId}`);
+                checkIcon.style.visibility = "hidden";
+                spinner.style.visibility = "visible";
+
                 clearTimeout(debounceTimeout);
                 debounceTimeout = setTimeout(function () {
                     fetch("{% url 'staff:update-internal-note' %}", {
                         method: "POST",
                         body: formData
                     });
-                }, 500);
+                    spinner.style.visibility = "hidden";
+                    checkIcon.style.visibility = "visible";
+                    setTimeout(function () {
+                        checkIcon.style.visibility = "hidden";
+                    }, 5000);
+                }, 1500);
             });
         });
     });

src/staff/templatetags/order_tags.py

@@ -313,7 +313,7 @@ def analysis_order_detail_table(order: Order) -> dict:
         "Confirmed at": order.confirmed_at.strftime("%d.%m.%Y")
         if order.confirmed_at
         else "Not confirmed",
-        "Expected delivery date": order.expected_delivery_date.strftime("%d.%m.%Y")
+        "Deadline": order.expected_delivery_date.strftime("%d.%m.%Y")
         if order.expected_delivery_date
         else "Not specified",
     }