Wire and UI changes

yash-learner · Dec 23, 2024 · 3affc0f · 3affc0f
1 parent 0c1ecef
commit 3affc0f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/components/LabTest/CollectSpecimen.tsx b/src/components/LabTest/CollectSpecimen.tsx
@@ -242,11 +242,10 @@ export const CollectSpecimen: React.FC<{
                               {[
                                 data?.request.requester?.first_name,
                                 data?.request.requester?.last_name,
-                              ].join(" ")}
-                              {"District Admin"}
+                              ].join(" ") ?? "NA"}
                             </p>
                             <p className="text-lg font-normal text-gray-900 mb-4">
-                              {data?.request.requester?.user_type}
+                              {data?.request.requester?.user_type ?? "NA"}
                             </p>
                           </div>
 

diff --git a/src/components/LabTest/ListEncounterServiceRequests.tsx b/src/components/LabTest/ListEncounterServiceRequests.tsx
@@ -28,8 +28,6 @@ export default function ListEncounterServiceRequests({
     },
   });
 
-  // TODO: Add Loader while fetching data
-
   const priorityVariantMap: Record<string, BadgeProps["variant"]> = {
     routine: "info",
     asap: "warning",

diff --git a/src/components/LabTest/ReviewResult.tsx b/src/components/LabTest/ReviewResult.tsx
@@ -309,11 +309,18 @@ export const ReviewResult: React.FC<{
                       <span className="text-lg font-semibold text-gray-900">
                         {diagnosticReport?.based_on.id}
                       </span>
-                      <span className="px-2 py-1 text-xs font-medium bg-orange-100 text-orange-900 rounded">
+                      <Badge
+                        variant="outline"
+                        className={`${
+                          diagnosticReport?.conclusion
+                            ? "text-green-900 bg-green-100"
+                            : "text-orange-900 bg-orange-100 "
+                        }`}
+                      >
                         {diagnosticReport?.conclusion
-                          ? "Under Review"
-                          : "Completed"}
-                      </span>
+                          ? "Completed"
+                          : "Under Review"}
+                      </Badge>
                     </div>
                   </div>
                   <div className="flex items-center">
@@ -368,10 +375,11 @@ export const ReviewResult: React.FC<{
                             <div className="flex gap-2">
                               <p className="text-lg font-semibold text-gray-900 mb-4">
                                 {diagnosticReport?.based_on?.requester
-                                  ?.first_name ?? "Dummy Name"}
+                                  ?.first_name ?? "NA"}
                               </p>
                               <p className="text-lg font-normal text-gray-900 mb-4">
-                                Dummy Designation
+                                {diagnosticReport?.based_on?.requester
+                                  ?.user_type ?? "NA"}
                               </p>
                             </div>