From 35ce0a36507dd1fb0f6fe3c040c617d0968dd788 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Tue, 30 Jun 2026 10:56:14 +0530 Subject: [PATCH 1/3] Fixed issues billGenerationDate --- .../wns/generateBillResource/functions.js | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/generateBillResource/functions.js b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/generateBillResource/functions.js index 82ca5b6071..1d36598340 100644 --- a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/generateBillResource/functions.js +++ b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/generateBillResource/functions.js @@ -27,7 +27,7 @@ export const generateBillApiCall = async (state, dispatch) => { // dispatch(toggleSnackbar(true, { labelName: "Please select the details", label: "choose the Value" }, "warning")); // } else { - + let batchtypechk = get(state.screenConfiguration.preparedFinalObject.generateBillScreen, "batchtype", {}); if (batchtypechk == "Locality") { // var mohallaDataCode = generateBillScreenObject["mohallaData"].substring( @@ -132,7 +132,7 @@ export const generateBillApiCall = async (state, dispatch) => { billingcycleEnddate = convertEpochToDate(element.billingcycleEnddate); status = element.status; tenantId = element.tenantId; - billGenerationDate = element.auditDetails && element.auditDetails.createdTime ? convertEpochToDate(element.auditDetails.createdTime) : "NA"; + billGenerationDate = element.auditDetails && element.auditDetails.lastModifiedTime ? convertEpochToDate(element.auditDetails.lastModifiedTime) : "NA"; billRow = { "transactionType": transactionType, @@ -173,7 +173,7 @@ export const generateBillApiCall = async (state, dispatch) => { export const searchBillApiCall = async (state, dispatch) => { - + var transactionType; // showHideApplicationTable(false, dispatch); // showHideConnectionTable(false, dispatch); @@ -246,7 +246,7 @@ export const searchBillApiCall = async (state, dispatch) => { status = element.status; tenantId = element.tenantId; billformDate = element.billingcycleStartdate; - billGenerationDate = element.auditDetails && element.auditDetails.createdTime ? convertEpochToDate(element.auditDetails.createdTime) : "NA"; + billGenerationDate = element.auditDetails && element.auditDetails.lastModifiedTime ? convertEpochToDate(element.auditDetails.lastModifiedTime) : "NA"; billRow = { "transactionType": transactionType, "locality": locality, @@ -254,13 +254,13 @@ export const searchBillApiCall = async (state, dispatch) => { "billingcycleEnddate": billingcycleEnddate, "status": status, "tenantId": tenantId, - "billformDate" : billformDate, + "billformDate": billformDate, "billGenerationDate": billGenerationDate }; searchBillArray.push(billRow); }); //dispatch(prepareFinalObject("searchBillResponse", searchBillArray)); - const sortedSearchBillArray = searchBillArray.sort((a,b)=> b.billformDate - a.billformDate); + const sortedSearchBillArray = searchBillArray.sort((a, b) => b.billformDate - a.billformDate); dispatch(prepareFinalObject("createBillResponse", sortedSearchBillArray)); if (searchBillArray.length == 0) { @@ -297,7 +297,7 @@ export const searchBillApiCall = async (state, dispatch) => { try { let tenant_Id = getTenantIdCommon(); let response = null; - + let servicety; if (transactionType == "WS") { servicety = "Water"; @@ -323,7 +323,7 @@ export const searchBillApiCall = async (state, dispatch) => { let searchBillArray = []; let billRow = null; - let locality, billingcycleStartdate, billingcycleEnddate, status, tenantId, billformDate; + let locality, billingcycleStartdate, billingcycleEnddate, status, tenantId, billformDate, billGenerationDate; let recourdcount = response.billScheduler.length; response.billScheduler.map((element, index) => { transactionType = element.transactionType; @@ -333,6 +333,8 @@ export const searchBillApiCall = async (state, dispatch) => { billingcycleEnddate = convertEpochToDate(element.billingcycleEnddate); status = element.status; tenantId = element.tenantId; + billGenerationDate = element.auditDetails && element.auditDetails.lastModifiedTime ? convertEpochToDate(element.auditDetails.lastModifiedTime) : "NA"; + billRow = { "transactionType": transactionType, "locality": locality, @@ -342,12 +344,13 @@ export const searchBillApiCall = async (state, dispatch) => { "tenantId": tenantId, "recordcount": recourdcount, "service": servicety, - "billformDate" : billformDate + "billformDate": billformDate, + "billGenerationDate": billGenerationDate }; searchBillArray.push(billRow); }); //dispatch(prepareFinalObject("searchBillResponse", searchBillArray)); - const sortedSearchBillArray = searchBillArray.sort((a,b)=> b.billformDate - a.billformDate); + const sortedSearchBillArray = searchBillArray.sort((a, b) => b.billformDate - a.billformDate); dispatch(prepareFinalObject("createBillResponse", sortedSearchBillArray)); if (searchBillArray.length == 0) { @@ -724,5 +727,4 @@ const showApplicationResults = (connections, dispatch) => { connections.length )); showHideApplicationTable(true, dispatch); -} - +} \ No newline at end of file From 3115995e01b596062265009f75828f1c2699d7e9 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Tue, 30 Jun 2026 11:28:21 +0530 Subject: [PATCH 2/3] Fixed issues billGenerationDate --- .../screens/specs/wns/generateBillResource/functions.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/generateBillResource/functions.js b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/generateBillResource/functions.js index 1d36598340..1758fb0ff0 100644 --- a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/generateBillResource/functions.js +++ b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/generateBillResource/functions.js @@ -132,7 +132,7 @@ export const generateBillApiCall = async (state, dispatch) => { billingcycleEnddate = convertEpochToDate(element.billingcycleEnddate); status = element.status; tenantId = element.tenantId; - billGenerationDate = element.auditDetails && element.auditDetails.lastModifiedTime ? convertEpochToDate(element.auditDetails.lastModifiedTime) : "NA"; + billGenerationDate = element.auditDetails && element.auditDetails.createdTime ? convertEpochToDate(element.auditDetails.createdTime) : "NA"; billRow = { "transactionType": transactionType, @@ -246,7 +246,7 @@ export const searchBillApiCall = async (state, dispatch) => { status = element.status; tenantId = element.tenantId; billformDate = element.billingcycleStartdate; - billGenerationDate = element.auditDetails && element.auditDetails.lastModifiedTime ? convertEpochToDate(element.auditDetails.lastModifiedTime) : "NA"; + billGenerationDate = element.auditDetails && element.auditDetails.createdTime ? convertEpochToDate(element.auditDetails.createdTime) : "NA"; billRow = { "transactionType": transactionType, "locality": locality, @@ -334,7 +334,6 @@ export const searchBillApiCall = async (state, dispatch) => { status = element.status; tenantId = element.tenantId; billGenerationDate = element.auditDetails && element.auditDetails.lastModifiedTime ? convertEpochToDate(element.auditDetails.lastModifiedTime) : "NA"; - billRow = { "transactionType": transactionType, "locality": locality, From b9f914504d76b47a26b2eeaa1beb3d4e411d9128 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Tue, 7 Jul 2026 10:34:09 +0530 Subject: [PATCH 3/3] Update superBuiltUpArea WS and SW --- .../property-details.js | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/connectionDetailsResource/property-details.js b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/connectionDetailsResource/property-details.js index accc450093..12a8da5b43 100644 --- a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/connectionDetailsResource/property-details.js +++ b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/connectionDetailsResource/property-details.js @@ -31,13 +31,13 @@ const propertyLocationDetailsHeader = getHeader({ }); const propertyDetails = getCommonContainer({ - propertyStatus: getLabelWithValue( + propertyStatus: getLabelWithValue( { labelKey: "WS_PROPERTY_STATUS_LABEL" }, { jsonPath: - "WaterConnection[0].property.status", + "WaterConnection[0].property.status", localePrefix: { moduleName: "WS", masterName: "PROPTYPE" @@ -50,7 +50,7 @@ const propertyDetails = getCommonContainer({ }, { jsonPath: - "WaterConnection[0].property.propertyType", + "WaterConnection[0].property.propertyType", localePrefix: { moduleName: "WS", masterName: "PROPTYPE" @@ -61,12 +61,13 @@ const propertyDetails = getCommonContainer({ { labelKey: "WS_PROPERTY_USAGE_TYPE_LABEL" }, - { jsonPath: "WaterConnection[0].property.usageCategory", - localePrefix: { - moduleName: "WS", - masterName: "PROPUSGTYPE" + { + jsonPath: "WaterConnection[0].property.usageCategory", + localePrefix: { + moduleName: "WS", + masterName: "PROPUSGTYPE" + } } - } ), plotSize: getLabelWithValue( { @@ -75,6 +76,14 @@ const propertyDetails = getCommonContainer({ { jsonPath: "WaterConnection[0].property.landArea" } + ), + buildupplotSize: getLabelWithValue( + { + labelKey: "WS_SUPER_BUILDUP_AREA_LABEL" + }, + { + jsonPath: "WaterConnection[0].property.superBuiltUpArea" + } ) })