From 5c34f4e0418921c0d1431cd083c30f12a75d0208 Mon Sep 17 00:00:00 2001
From: himeshr <himeshl@samanvayfoundation.org>
Date: Tue, 14 May 2024 13:15:54 +0530
Subject: [PATCH] #1226 | Use program.operationalProgramName instead of name

---
 src/adminApp/WorkFlow/ShowSubjectType.js | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/adminApp/WorkFlow/ShowSubjectType.js b/src/adminApp/WorkFlow/ShowSubjectType.js
index f657223a6..38d47a1b1 100644
--- a/src/adminApp/WorkFlow/ShowSubjectType.js
+++ b/src/adminApp/WorkFlow/ShowSubjectType.js
@@ -4,17 +4,12 @@ import RemoveIcon from "@material-ui/icons/Remove";
 export const ShowSubjectType = props => {
   const existMapping = props.formMapping.filter(l => l[props.entityUUID] === props.rowDetails.uuid);
 
-  const subjectType =
-    existMapping.length !== 0
-      ? props.subjectType.filter(l => l.uuid === existMapping[0].subjectTypeUUID)
-      : [];
+  const subjectType = existMapping.length !== 0 ? props.subjectType.filter(l => l.uuid === existMapping[0].subjectTypeUUID) : [];
 
   return (
     <>
       {existMapping.length !== 0 && subjectType.length !== 0 && (
-        <span>
-          {props.subjectType.filter(l => l.uuid === existMapping[0].subjectTypeUUID)[0].name}
-        </span>
+        <span>{props.subjectType.filter(l => l.uuid === existMapping[0].subjectTypeUUID)[0].name}</span>
       )}
     </>
   );
@@ -22,16 +17,11 @@ export const ShowSubjectType = props => {
 
 export const ShowPrograms = props => {
   const existMapping = props.formMapping.filter(l => l.encounterTypeUUID === props.rowDetails.uuid);
-  const program =
-    existMapping.length !== 0
-      ? props.program.filter(l => l.uuid === existMapping[0].programUUID)
-      : [];
+  const program = existMapping.length !== 0 ? props.program.filter(l => l.uuid === existMapping[0].programUUID) : [];
 
   return (
     <>
-      {existMapping.length !== 0 && program.length !== 0 && (
-        <span>{props.program.filter(l => l.uuid === existMapping[0].programUUID)[0].name}</span>
-      )}
+      {existMapping.length !== 0 && program.length !== 0 && <span>{program[0].operationalProgramName || program[0].name}</span>}
       {(existMapping.length === 0 || program.length === 0) && <RemoveIcon />}
     </>
   );