Merge pull request #817 from odisha-muktasoft/revert-815-revert-813-U…

…CEM-1054 Revert "Revert "masked ward in org details""
odisha-muktasoft · Dec 5, 2024 · 0b82af9 · 0b82af9
2 parents fea16d7 + 670069b
commit 0b82af9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...ro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js b/...ro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js
@@ -55,9 +55,9 @@ const getAttendanceTableData = async(data, skills, t, expenseCalculations, indRe
       tableRow.actualWorkingDays = item?.actualTotalAttendance || 0
       tableRow.nameOfIndividual = individualdata?.name?.givenName || t("NA")
       tableRow.guardianName = individualdata?.fatherName  || t("NA")
-      const skill = skills[individualdata?.skills?.[0]?.type]
+      const skill = skills[item?.additionalDetails?.skillCode]
       tableRow.skill = skill ? `${t(skill.sorSubType)} - ${skill.description}` : t("NA");
-      tableRow.amount = skills[individualdata?.skills?.[0]?.type]?.amount * item?.actualTotalAttendance || 0
+      tableRow.amount = skills[item?.additionalDetails?.skillCode]?.amount * item?.actualTotalAttendance || 0
       tableRow.modifiedAmount = expenseCalculations?.filter(data=>data?.payee?.identifier === item?.individualId)?.[0]?.lineItems?.[0]?.amount || 0;
       tableRow.modifiedWorkingDays = item?.modifiedTotalAttendance ? item?.modifiedTotalAttendance : item?.actualTotalAttendance
       // tableRow.bankAccountDetails = {
@@ -66,7 +66,7 @@ const getAttendanceTableData = async(data, skills, t, expenseCalculations, indRe
       // }
       // tableRow.aadharNumber = item?.additionalDetails?.aadharNumber || t("NA")
       tableRow.attendence = getWeekAttendance(item?.attendanceEntries)
-      tableRow.perDayWage = skills[individualdata?.skills?.[0]?.type]?.rates?.rate || 0
+      tableRow.perDayWage = skills[item?.additionalDetails?.skillCode]?.rates?.rate || 0
       tableData[item.id] = tableRow
     });
 

diff --git a/...-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js b/...-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
@@ -14,7 +14,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
   const GSTIN = organisation?.identifiers?.find(item => item?.isActive && item?.type === 'GSTIN')
 
   const getAddressMasked = (value) => {
-    return value.replace(/.(?=.{1,}$)/g, '*');
+    return value.replace(/(?<=.{1}).(?=.{1})/g, '*');
   }
   const orgDetails = [
     {
@@ -46,7 +46,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
     asSectionHeader: true,
     values: [
         { title: "CORE_COMMON_PROFILE_CITY", value: organisation?.orgAddress?.[0]?.tenantId ? Digit.Utils.locale.getCityLocale(organisation?.orgAddress?.[0]?.tenantId) : t("NA")},
-        { title: "COMMON_WARD", value: organisation?.orgAddress?.[0]?.boundaryCode ? Digit.Utils.locale.getMohallaLocale(organisation?.orgAddress?.[0]?.boundaryCode, tenantId) : t("NA")},
+        { title: "COMMON_WARD", value: organisation?.orgAddress?.[0]?.boundaryCode ? ( organisation?.orgAddress?.[0]?.geoLocation?.additionalDetails?.isWardMasked ? getAddressMasked(t(Digit.Utils.locale.getMohallaLocale(organisation?.orgAddress?.[0]?.boundaryCode, tenantId))) : Digit.Utils.locale.getMohallaLocale(organisation?.orgAddress?.[0]?.boundaryCode, tenantId)) : t("NA")},
         { title: "COMMON_LOCALITY", value: organisation?.additionalDetails?.locality ? ( organisation?.additionalDetails?.isLocalityMasked ? getAddressMasked(t(Digit.Utils.locale.getMohallaLocale(organisation?.additionalDetails?.locality, tenantId))) : Digit.Utils.locale.getMohallaLocale(organisation?.additionalDetails?.locality, tenantId)) : t("NA")},
         { title: "ES_COMMON_STREET", value: organisation?.orgAddress?.[0]?.street || t("NA")},
         { title: "ES_COMMON_DOOR_NO", value: organisation?.orgAddress?.[0]?.doorNo || t("NA")},