Merge pull request #828 from odisha-muktasoft/FIXES-2

UCEM-1063 : updated privacy fixes
odisha-muktasoft · Dec 10, 2024 · efdd711 · efdd711
2 parents afd68ee + e2b4270
commit efdd711
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -21,7 +21,7 @@
     "@egovernments/digit-ui-module-dss": "1.5.52",
     "@egovernments/digit-ui-module-attendencemgmt": "0.4.16",
     "@egovernments/digit-ui-module-contracts": "0.4.15",
-    "@egovernments/digit-ui-module-measurement":"0.2.25",
+    "@egovernments/digit-ui-module-measurement":"0.2.26",
     "@egovernments/digit-ui-module-estimate": "0.4.22",
     "@egovernments/digit-ui-module-masters": "0.4.27",
     "@egovernments/digit-ui-module-project": "0.4.17",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-measurement",
-  "version": "0.2.25",
+  "version": "0.2.26",
   "description": "Measurement Module UI",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

diff --git a/...ui/web/micro-ui-internals/packages/modules/Measurement/src/utils/transformEstimateData.js b/...ui/web/micro-ui-internals/packages/modules/Measurement/src/utils/transformEstimateData.js
@@ -132,7 +132,7 @@ export const getDefaultValues = (data, t, mbNumber) => {
      CurrentEndDate = data?.allMeasurements?.filter(ob => ob?.measurementNumber === mbNumber)?.[0]?.additionalDetails?.endDate;
   }
   //const musterRoll = typeof musterRollNumber == "string" ? musterRollNumber : (allMeasurements?.filter((ob) => ob?.measurementNumber === mbNumber)?.[0]?.additionalDetails?.musterRollNumber?.[0] || "NA")
-  const musterRoll = findMusterRollNumber(data?.musterRolls,'',data?.allMeasurements?.filter(ob => ob?.measurementNumber === mbNumber)?.[0]?.additionalDetails?.startDate,data?.allMeasurements?.filter(ob => ob?.measurementNumber === mbNumber)?.[0]?.additionalDetails?.endDate)
+  const musterRoll = findMusterRollNumber(data?.musterRolls,'',data?.allMeasurements?.length > 0  ? data?.allMeasurements?.filter(ob => ob?.measurementNumber === mbNumber)?.[0]?.additionalDetails?.startDate : period?.startDate,data?.allMeasurements?.length > 0  ? data?.allMeasurements?.filter(ob => ob?.measurementNumber === mbNumber)?.[0]?.additionalDetails?.endDate :  period?.endDate)
 
   let uploadedDocs = {}
   allMeasurements?.[0]?.documents.forEach((doc,index)=>{
@@ -164,7 +164,7 @@ export const getDefaultValues = (data, t, mbNumber) => {
     projectDesc,
     projectLocation,
     sanctionDate:issueDate ?  Digit.DateUtils.ConvertEpochToDate(issueDate) : Digit.DateUtils.ConvertEpochToDate(estimate?.proposalDate),
-    musterRollNo: window.location.href.includes("measurement/update") ? <Link style={{ color: "#C84C0E" }} to={`/works-ui/employee/attendencemgmt/view-attendance?tenantId=${data?.allMeasurements?.[0]?.tenantId}&musterRollNumber=${musterRoll}`}>{musterRoll}</Link> : musterRoll,
+    musterRollNo: musterRoll ? <Link style={{ color: "#C84C0E" }} to={`/works-ui/employee/attendencemgmt/view-attendance?tenantId=${data?.allMeasurements?.[0]?.tenantId}&musterRollNumber=${musterRoll}`}>{musterRoll}</Link> : "NA",
     measurementPeriod: measurementPeriod,
     CurrentStartDate,
     CurrentEndDate,

diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
@@ -24,7 +24,7 @@
     "@egovernments/digit-ui-module-dss": "1.5.52",
     "@egovernments/digit-ui-module-attendencemgmt": "0.4.16",
     "@egovernments/digit-ui-module-contracts": "0.4.15",
-    "@egovernments/digit-ui-module-measurement":"0.2.25",
+    "@egovernments/digit-ui-module-measurement":"0.2.26",
     "@egovernments/digit-ui-module-estimate": "0.4.22",
     "@egovernments/digit-ui-module-masters": "0.4.27",
     "@egovernments/digit-ui-module-project": "0.4.17",