User Role being displayed in Pop, Plan and Fac

health/micro-ui/web/micro-ui-internals/example/public/index.html

@@ -12,7 +12,7 @@
   <title>DIGIT</title>
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].36/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].37/dist/index.css" />
 
   <!-- added below css for hcm-workbench module inclusion-->
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" /> -->

health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js

@@ -794,6 +794,7 @@ export const UICustomizations = {
       return data;
     },
     additionalCustomizations: (row, key, column, value, t, searchResult) => {
+
       switch (key) {
         case "ACTIONS":
           // TODO : Replace dummy file id with real file id when API is ready
@@ -802,9 +803,9 @@ export const UICustomizations = {
           let options = [];
 
           if (row?.status == "DRAFT") {
-            options = [{ code: "1", name: "Edit Setup" }];
+            options = [{ code: "1", name: "MP_ACTIONS_EDIT_SETUP" }];
           } else {
-            options = [{ code: "1", name: "View Summary" }];
+            options = [{ code: "1", name: "MP_ACTIONS_VIEW_SUMMARY" }];
           }
 
           const handleDownload = () => {
@@ -829,7 +830,7 @@ export const UICustomizations = {
                     }
                   }}
                   optionKey={"name"}
-                  selected={{ code: "1", name: "Actions" }}
+                  selected={{ code: "1", name: "MP_ACTIONS_FOR_MICROPLAN_SEARCH" }}
                 />
               )}
             </div>
@@ -859,7 +860,7 @@ export const UICustomizations = {
 
         case "MICROPLAN_STATUS":
           if (value && value != "NA") {
-            return t(value);
+            return <p>{t(Digit.Utils.locale.getTransformedLocale("MICROPLAN_STATUS_" + value))}</p>;
           } else {
             return (
               <div>
@@ -870,7 +871,7 @@ export const UICustomizations = {
 
         case "CAMPAIGN_DISEASE":
           if (value && value != "NA") {
-            return t(value);
+            return <p>{t(Digit.Utils.locale.getTransformedLocale("MICROPLAN_DISEASE_" + value))}</p>;
           } else {
             return (
               <div>
@@ -881,7 +882,7 @@ export const UICustomizations = {
 
         case "CAMPAIGN_TYPE":
           if (value && value != "NA") {
-            return t(value);
+            return <p>{t(Digit.Utils.locale.getTransformedLocale("MICROPLAN_TYPE_" + value))}</p>;
           } else {
             return (
               <div>
@@ -892,7 +893,7 @@ export const UICustomizations = {
 
         case "DISTIRBUTION_STRATEGY":
           if (value && value != "NA") {
-            return t(value);
+            return <p>{t(Digit.Utils.locale.getTransformedLocale("MICROPLAN_DISTRIBUTION_" + value))}</p>;
           } else {
             return (
               <div>

health/micro-ui/web/micro-ui-internals/packages/css/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-health-css",
-  "version": "0.1.36",
+  "version": "0.1.37",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <[email protected]>",

health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplan.scss

@@ -347,4 +347,17 @@
   text-align: -webkit-center;
   gap: 24px;
   margin-right: 3rem;
+}
+
+.role-summary-sub-heading {
+
+  color: theme(digitv2.lightTheme.primary-2) !important;
+  margin-bottom: 0rem;
+  font-size: 1rem;
+  display:flex;
+  justify-content: space-between;
+
+
+
+
 }

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigWrapper.js

@@ -499,7 +499,7 @@ const FormulaConfigWrapper = ({ onSelect, props: customProps }) => {
 
           <div className="card-container" style={{ width: "77vw", marginBottom: "2.5rem" }}>
             <FormulaConfiguration
-              category={ruleConfigurationCategories[formulaInternalKey - 1]?.category}
+              category={`FORMULA_${ruleConfigurationCategories[formulaInternalKey - 1]?.category}`}
               formulas={[...filteredFormulas?.filter((item) => !deletedFormulas?.includes(item.output)), ...customFormula]}
               onSelect={onSelect}
               customProps={customProps}

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js

@@ -271,8 +271,10 @@ const FormulaConfiguration = ({ onSelect, category, customProps, formulas: initi
   return (
     <>
       <Card className="middle-child">
-        <Header className="uploader-sub-heading">{t(`SUB_HEADING_${category}`)}</Header>
+        <Header className="uploader-sub-heading">{t(category)}</Header>
+        {(category==="FORMULA_CAMPAIGN_VEHICLES")?  <p className="mp-description">{t(`FORMULA_VEHICLE_DESCRIPTION`)}</p>:
         <p className="mp-description">{t(`FORMULA_CONFIGURATION_DESCRIPTION`)}</p>
+        }
       </Card>
       <Card>
         {filteredFormulas.map((formula, index) => {

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js

@@ -86,9 +86,9 @@ export const UICustomizations = {
           let options = [];
 
           if (row?.status == "DRAFT") {
-            options = [{ code: "1", name: "Edit Setup" }];
+            options = [{ code: "1", name: "MP_ACTIONS_EDIT_SETUP" }];
           } else {
-            options = [{ code: "1", name: "View Summary" }];
+            options = [{ code: "1", name: "MP_ACTIONS_VIEW_SUMMARY" }];
           }
 
           const handleDownload = () => {
@@ -113,7 +113,7 @@ export const UICustomizations = {
                     }
                   }}
                   optionKey={"name"}
-                  selected={{ code: "1", name: "Actions" }}
+                  selected={{ code: "1", name: "MP_ACTIONS_FOR_MICROPLAN_SEARCH" }}
                 />
               )}
             </div>

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js

@@ -152,12 +152,34 @@ const FacilityCatchmentMapping = () => {
   if (isPlanEmpSearchLoading || isLoading || isLoadingPlanObject || isLoadingCampaignObject || isProcessLoading)
     return <Loader />
 
+  //role and name of User extracted
+
+  const roles=Digit.UserService.getUser().info.roles;
+  const userName=Digit.UserService.getUser().info.userName;
+  let userRole = "";
+
+  roles.forEach(role => {
+    if (role.code === "ROOT_FACILITY_CATCHMENT_MAPPER") {
+      userRole = "ROOT_FACILITY_CATCHMENT_MAPPER";
+    } else if (userRole!== "ROOT_FACILITY_CATCHMENT_MAPPER" && role.code === "FACILITY_CATCHMENT_MAPPER") {
+      userRole = "FACILITY_CATCHMENT_MAPPER";
+
+  }});
+
+
+
   return (
     <div style={{ marginBottom: isRootApprover && data?.TotalCount === 0 && planObject?.status === "CENSUS_DATA_APPROVED" ?"2.5rem" :"0rem"}}>
       <Header styles={{ marginBottom: "1rem" }}>{t("MICROPLAN_ASSIGN_CATCHMENT_VILLAGES")}</Header>
-      <div className="summary-sub-heading" style={{marginBottom:"1.5rem"}}>
-      {`${t("HCM_MICROPLAN_MICROPLAN_NAME_LABEL")}: ${planObject?.name || t("NO_NAME_AVAILABLE")}`}
-    </div>
+      <div className="role-summary-sub-heading">
+          <div>
+          {`${t("HCM_MICROPLAN_MICROPLAN_NAME_LABEL")}: ${planObject?.name || t("NO_NAME_AVAILABLE")}`}
+          </div>
+          <div>
+          {`Logged in as ${t(userName)} - ${t(userRole)}`}
+          </div>
+
+        </div>
       <div className="inbox-search-wrapper">
         <InboxSearchComposer
           configs={config}

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MicroplanSearch.js

@@ -33,7 +33,7 @@ const MicroplanSearch = () => {
   return (
     <React.Fragment>
 
-      <Header styles={{ fontSize: "32px" }}>{t(config?.label)}</Header>
+      <Header styles={{ fontSize: "32px" }}>{ `SEARCH_${t(config?.label)}` }</Header>
       <div className="inbox-search-wrapper">
         {/* Pass defaultValues as props to InboxSearchComposer */}
         <InboxSearchComposer

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js

@@ -557,14 +557,33 @@ const PlanInbox = () => {
   if (isPlanEmpSearchLoading || isLoadingCampaignObject || isWorkflowLoading || isProcessLoading) {
     return <Loader />;
   }
-
+  // campaignObject?.campaignName 
+   //role and name of User extracted
+
+   const roles=Digit.UserService.getUser().info.roles;
+   const userName=Digit.UserService.getUser().info.userName;
+   let userRole = "";
+
+   roles.forEach(role => {
+     if (role.code === "ROOT_PLAN_ESTIMATION_APPROVER") {
+       userRole = "ROOT_PLAN_ESTIMATION_APPROVER";
+     } else if (userRole!== "ROOT_PLAN_ESTIMATION_APPROVER" && role.code === "PLAN_ESTIMATION_APPROVER") {
+       userRole = "PLAN_ESTIMATION_APPROVER";
+
+   }});
   return (
     <div className="pop-inbox-wrapper">
        <div>
       <Header styles={{marginBottom:"1rem"}} className="pop-inbox-header">{t(`HCM_MICROPLAN_VALIDATE_AND_APPROVE_MICROPLAN_ESTIMATIONS`)}</Header>
-      <div className="summary-sub-heading">
-      {`${t("HCM_MICROPLAN_MICROPLAN_NAME_LABEL")}: ${campaignObject?.campaignName || t("NO_NAME_AVAILABLE")}`}
-    </div>
+      <div className="role-summary-sub-heading">
+          <div>
+          {`${t("HCM_MICROPLAN_MICROPLAN_NAME_LABEL")}: ${campaignObject?.campaignName  || t("NO_NAME_AVAILABLE")}`}
+          </div>
+          <div>
+          {`Logged in as ${t(userName)} - ${t(userRole)}`}
+          </div>
+
+        </div>
     </div>
       <SearchJurisdiction
         boundaries={boundaries}