From 65e749ee04cb11ee52fb66d63893ff808f6d8929 Mon Sep 17 00:00:00 2001
From: Ojwang' Antony <ojwangantony.g7kenya@gmail.com>
Date: Wed, 24 Jan 2024 12:03:46 +0300
Subject: [PATCH] clean up order colours (#4)

---
 .../laboratory-order.component.tsx            |  6 ++---
 .../laboratory-order.resource.ts              |  3 ++-
 src/results/result-form.resource.ts           | 27 ++++++++++---------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/patient-chart/laboratory-order.component.tsx b/src/patient-chart/laboratory-order.component.tsx
index 47885cd..3234829 100644
--- a/src/patient-chart/laboratory-order.component.tsx
+++ b/src/patient-chart/laboratory-order.component.tsx
@@ -239,7 +239,7 @@ const LaboratoryOrder: React.FC<LaboratoryOrderOverviewProps> = ({
         content: (
           <>
             {entry.orders.map((order) => {
-              if (order?.type === "testorder") {
+              if (order?.type === "testorder" && order?.action === "NEW") {
                 return (
                   <Tag
                     style={{
@@ -286,8 +286,6 @@ const LaboratoryOrder: React.FC<LaboratoryOrderOverviewProps> = ({
             ) : (
               <PrintButtonAction encounter={entry} />
             )}
-
-            {/* <EmailButtonAction /> */}
           </div>
         ),
       },
@@ -408,7 +406,7 @@ const LaboratoryOrder: React.FC<LaboratoryOrderOverviewProps> = ({
                               </TableCell>
                             ))}
                           </TableExpandRow>
-                          {row.isExpanded ? (
+                          {!row.isExpanded ? (
                             <TableExpandedRow
                               className={styles.expandedActiveVisitRow}
                               colSpan={headers.length + 2}
diff --git a/src/patient-chart/laboratory-order.resource.ts b/src/patient-chart/laboratory-order.resource.ts
index ab86ae5..3450e03 100644
--- a/src/patient-chart/laboratory-order.resource.ts
+++ b/src/patient-chart/laboratory-order.resource.ts
@@ -399,11 +399,12 @@ export interface OrderType {
 export const getOrderColor = (activated: string, stopped: string) => {
   const numAct = formatWaitTime(activated);
   let testStopped: Number;
+
   if (stopped === null) {
     testStopped = 0;
   }
 
-  if (numAct >= 0 && testStopped == 0) {
+  if (numAct >= 0 && testStopped === 0) {
     return "#6F6F6F"; // #6F6F6F
   } else {
     return "green"; // green
diff --git a/src/results/result-form.resource.ts b/src/results/result-form.resource.ts
index 0f9c957..7bf2f3a 100644
--- a/src/results/result-form.resource.ts
+++ b/src/results/result-form.resource.ts
@@ -334,25 +334,26 @@ export async function UpdateOrderResult(
   orderPayload: any
 ) {
   const abortController = new AbortController();
-  const updateOrderCall = await openmrsFetch(`/ws/rest/v1/order`, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    signal: abortController.signal,
-    body: orderPayload,
-  });
-
-  if (updateOrderCall.status === 201) {
-    return await openmrsFetch(`/ws/rest/v1/encounter/${encounterUuid}`, {
+  const updateResults = await openmrsFetch(
+    `/ws/rest/v1/encounter/${encounterUuid}`,
+    {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
       },
       signal: abortController.signal,
       body: obsPayload,
+    }
+  );
+
+  if (updateResults.status === 201) {
+    return await openmrsFetch(`/ws/rest/v1/order`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      signal: abortController.signal,
+      body: orderPayload,
     });
-  } else {
-    // handle errors
   }
 }