diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json index 390647e43b..206355c0b3 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -17,7 +17,7 @@ "@egovernments/digit-ui-module-dss": "1.5.52", "@egovernments/digit-ui-module-attendencemgmt": "0.4.11", "@egovernments/digit-ui-module-contracts": "0.4.11", - "@egovernments/digit-ui-module-measurement":"0.2.12", + "@egovernments/digit-ui-module-measurement":"0.2.13", "@egovernments/digit-ui-module-estimate": "0.4.17", "@egovernments/digit-ui-module-masters": "0.4.16", "@egovernments/digit-ui-module-project": "0.4.12", 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 index 68af6aaa22..6ff8f7a9d1 100644 --- 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.12", + "version": "0.2.13", "description": "Measurement Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/utils/transformData.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/utils/transformData.js index 9556fd6d8d..1de6fe6da7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/utils/transformData.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/utils/transformData.js @@ -151,7 +151,7 @@ const measurement= { } /* added as a temporary fix that sends entrydate */ - measurement.entryDate=new Date().getTime(); + measurement.entryDate = data?.entryDate ? data?.entryDate : new Date().getTime(); const transformedData = { measurements: [ measurement diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/utils/transformEstimateData.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/utils/transformEstimateData.js index bd654bdf4b..c4181b682e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/utils/transformEstimateData.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/utils/transformEstimateData.js @@ -116,6 +116,7 @@ export const getDefaultValues = (data, t, mbNumber) => { const Pward = projectWard ? t(`${headerLocale}_ADMIN_${projectWard}`) : ""; // const city = projectLoc ? t(`${Digit.Utils.locale.getTransformedLocale(projectLoc)}`) : ""; const city = projectLoc ? t(`${headerLocale}_ADMIN_${projectLoc}`) : ""; + const entryDate = data?.allMeasurements?.filter(ob => ob?.measurementNumber === mbNumber)?.[0]?.entryDate; const projectLocation = `${Pward ? Pward + ", " : ""}${city}`; let CurrentStartDate = period?.startDate; @@ -163,7 +164,8 @@ export const getDefaultValues = (data, t, mbNumber) => { measurementPeriod: measurementPeriod, CurrentStartDate, CurrentEndDate, - mbNumber + mbNumber, + entryDate }; return { SOR, NONSOR, contractDetails, uploadedDocs, documents:measurement?.documents || allMeasurements?.[0]?.documents }; diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 3d44dabf0f..090ec606c1 100644 --- 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.11", "@egovernments/digit-ui-module-contracts": "0.4.11", - "@egovernments/digit-ui-module-measurement":"0.2.12", + "@egovernments/digit-ui-module-measurement":"0.2.13", "@egovernments/digit-ui-module-estimate": "0.4.17", "@egovernments/digit-ui-module-masters": "0.4.16", "@egovernments/digit-ui-module-project": "0.4.12",