From d01749a60e9cdef2ccbc4683ce158c0636a4136c Mon Sep 17 00:00:00 2001
From: ojwanganto <ojwangantony.g7kenya@gmail.com>
Date: Wed, 31 Jan 2024 18:02:15 +0300
Subject: [PATCH] post-review fixes

---
 src/completed-list/completed-list.scss        |  2 +-
 .../laboratory-order.component.tsx            |  2 +-
 .../print-results-summary.component.tsx       |  2 +-
 src/results/result-form-field.component.tsx   | 11 +++-----
 src/results/result-form.resource.ts           | 25 ++++++++++---------
 src/work-list/work-list.component.tsx         |  7 +-----
 6 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/src/completed-list/completed-list.scss b/src/completed-list/completed-list.scss
index aa64b26..fa3c939 100644
--- a/src/completed-list/completed-list.scss
+++ b/src/completed-list/completed-list.scss
@@ -125,7 +125,7 @@ title {
 
 .headerBtnContainer {
   background-color: $ui-background;
- // padding: spacing.$spacing-05;
+  padding: spacing.$spacing-05;
   text-align: right;
 }
 
diff --git a/src/patient-chart/laboratory-order.component.tsx b/src/patient-chart/laboratory-order.component.tsx
index 4d45046..5b8516a 100644
--- a/src/patient-chart/laboratory-order.component.tsx
+++ b/src/patient-chart/laboratory-order.component.tsx
@@ -260,7 +260,7 @@ const LaboratoryOrder: React.FC<LaboratoryOrderOverviewProps> = ({
         ),
       },
       location: {
-        content: <span>{entry.location.display}</span>,
+        content: <span>{entry?.location?.display}</span>,
       },
       status: {
         content: <span>--</span>,
diff --git a/src/patient-chart/results-summary/print-results-summary.component.tsx b/src/patient-chart/results-summary/print-results-summary.component.tsx
index afebc65..55586ee 100644
--- a/src/patient-chart/results-summary/print-results-summary.component.tsx
+++ b/src/patient-chart/results-summary/print-results-summary.component.tsx
@@ -61,7 +61,7 @@ const PrintResultsSummary: React.FC<PrintResultsSummaryProps> = ({
               <span
                 style={{ fontSize: "10px", fontWeight: "bold", margin: "5px" }}
               >
-                {encounterResponse.visit.location.display}
+                {encounterResponse?.visit?.location?.display}
               </span>
             </div>
             <div
diff --git a/src/results/result-form-field.component.tsx b/src/results/result-form-field.component.tsx
index 9aa20e3..b908912 100644
--- a/src/results/result-form-field.component.tsx
+++ b/src/results/result-form-field.component.tsx
@@ -25,25 +25,22 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({
   const isPanel = (concept) => concept.setMembers?.length > 0;
 
   const printValueRange = (concept: ConceptReference) => {
-    let maxVal;
-    let minVal;
-    let rangeString = "";
     if (concept?.datatype?.display === "Numeric") {
-      maxVal = Math.max(
+      const maxVal = Math.max(
         concept?.hiAbsolute,
         concept?.hiCritical,
         concept?.hiNormal
       );
-      minVal = Math.min(
+      const minVal = Math.min(
         concept?.lowAbsolute,
         concept?.lowCritical,
         concept?.lowNormal
       );
-      rangeString = ` (${minVal ?? 0} - ${maxVal ?? 0} ${
+      return ` (${minVal ?? 0} - ${maxVal > 0 ? maxVal : "--"} ${
         concept?.units ?? ""
       })`;
     }
-    return rangeString;
+    return "";
   };
 
   return (
diff --git a/src/results/result-form.resource.ts b/src/results/result-form.resource.ts
index e306198..f2dbf55 100644
--- a/src/results/result-form.resource.ts
+++ b/src/results/result-form.resource.ts
@@ -19,12 +19,13 @@ export interface ConceptResponse {
   attributes: any[];
   links: Link18[];
   resourceVersion: string;
-  hiNormal: number;
-  hiAbsolute: number;
-  hiCritical: number;
-  lowNormal: number;
-  lowAbsolute: number;
-  lowCritical: number;
+  hiNormal?: number;
+  hiAbsolute?: number;
+  hiCritical?: number;
+  lowNormal?: number;
+  lowAbsolute?: number;
+  lowCritical?: number;
+  units?: string;
 }
 
 export interface Name {
@@ -165,12 +166,12 @@ export interface ConceptReference {
   attributes: any[];
   links: Link15[];
   resourceVersion: string;
-  hiNormal: number;
-  hiAbsolute: number;
-  hiCritical: number;
-  lowNormal: number;
-  lowAbsolute: number;
-  lowCritical: number;
+  hiNormal?: number;
+  hiAbsolute?: number;
+  hiCritical?: number;
+  lowNormal?: number;
+  lowAbsolute?: number;
+  lowCritical?: number;
   units?: string;
 }
 
diff --git a/src/work-list/work-list.component.tsx b/src/work-list/work-list.component.tsx
index 073ea22..70a169d 100644
--- a/src/work-list/work-list.component.tsx
+++ b/src/work-list/work-list.component.tsx
@@ -39,6 +39,7 @@ import {
 import { Result, useGetOrdersWorklist } from "./work-list.resource";
 import styles from "./work-list.scss";
 import {
+  ConfigurableLink,
   formatDate,
   parseDate,
   showModal,
@@ -149,17 +150,11 @@ const WorkList: React.FC<WorklistProps> = ({ fulfillerStatus }) => {
         },
         patient: {
           content: (
-<<<<<<< HEAD
-            <>
-              <span>{entry.patient.display.split("-")[1]}</span>
-            </>
-=======
             <ConfigurableLink
               to={`\${openmrsSpaBase}/patient/${entry.patient.uuid}/chart/laboratory-orders`}
             >
               {entry.patient.display.split("-")[1]}
             </ConfigurableLink>
->>>>>>> ccb70bf (add numeric value ranges for numeric tests)
           ),
         },
         orderNumber: { content: <span>{entry.orderNumber}</span> },