Skip to content

Fixed issues billGenerationDate #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erramesh000 wants to merge 4 commits into
base: mono_ui_uat
Choose a base branch
from
Open

Fixed issues billGenerationDate #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35ce0a3
Fixed issues billGenerationDate
erramesh000 Jun 30, 2026
3115995
Fixed issues billGenerationDate
erramesh000 Jun 30, 2026
b9f9145
Update superBuiltUpArea WS and SW
erramesh000 Jul 7, 2026
142cadc
Merge branch 'mono_ui_uat' into bulkmeteruat
erramesh000 Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions ...gov-wns-dev/src/ui-config/screens/specs/wns/connectionDetailsResource/property-details.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -50,7 +50,7 @@ const propertyDetails = getCommonContainer({
},
{
jsonPath:
"WaterConnection[0].property.propertyType",
"WaterConnection[0].property.propertyType",
localePrefix: {
moduleName: "WS",
masterName: "PROPTYPE"
Expand All @@ -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(
{
Expand All @@ -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"
}
)
})

Expand Down
21 changes: 11 additions & 10 deletions ...v-packages/egov-wns-dev/src/ui-config/screens/specs/wns/generateBillResource/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -173,7 +173,7 @@ export const generateBillApiCall = async (state, dispatch) => {

export const searchBillApiCall = async (state, dispatch) => {


var transactionType;
// showHideApplicationTable(false, dispatch);
// showHideConnectionTable(false, dispatch);
Expand Down Expand Up @@ -255,13 +255,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) {

Expand Down Expand Up @@ -298,7 +298,7 @@ export const searchBillApiCall = async (state, dispatch) => {
try {
let tenant_Id = getTenantIdCommon();
let response = null;

let servicety;
if (transactionType == "WS") {
servicety = "Water";
Expand All @@ -324,7 +324,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;
Expand All @@ -334,6 +334,7 @@ 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,
Expand All @@ -343,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) {

Expand Down Expand Up @@ -725,5 +727,4 @@ const showApplicationResults = (connections, dispatch) => {
connections.length
));
showHideApplicationTable(true, dispatch);
}

}