From 3d63324cc9b0d31a34cd1aadd715fb8b8612d389 Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:30:30 +0530 Subject: [PATCH 1/2] made lat and long dynamic in tenants.dart --- frontend/mgramseva/lib/model/mdms/tenants.dart | 4 ++-- frontend/mgramseva/lib/model/mdms/tenants.g.dart | 4 ++-- frontend/mgramseva/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/mgramseva/lib/model/mdms/tenants.dart b/frontend/mgramseva/lib/model/mdms/tenants.dart index d9ecce78c..78a742414 100644 --- a/frontend/mgramseva/lib/model/mdms/tenants.dart +++ b/frontend/mgramseva/lib/model/mdms/tenants.dart @@ -94,9 +94,9 @@ class City { @JsonKey(name: "ulbGrade") String? ulbGrade; @JsonKey(name: "longitude") - double? longitude; + dynamic? longitude; @JsonKey(name: "latitude") - double? latitude; + dynamic? latitude; @JsonKey(name: "code") String? code; @JsonKey(name: "ddrName") diff --git a/frontend/mgramseva/lib/model/mdms/tenants.g.dart b/frontend/mgramseva/lib/model/mdms/tenants.g.dart index f4be0014b..1c98a50ab 100644 --- a/frontend/mgramseva/lib/model/mdms/tenants.g.dart +++ b/frontend/mgramseva/lib/model/mdms/tenants.g.dart @@ -85,8 +85,8 @@ City _$CityFromJson(Map json) { ..districtName = json['districtName'] as String? ..regionName = json['regionName'] as String? ..ulbGrade = json['ulbGrade'] as String? - ..longitude = (json['longitude'] as num?)?.toDouble() - ..latitude = (json['latitude'] as num?)?.toDouble() + ..longitude = json['longitude'] + ..latitude = json['latitude'] ..code = json['code'] as String? ..ddrName = json['ddrName'] as String? ..regionCode = json['cateregionCodegory'] as String? diff --git a/frontend/mgramseva/package.json b/frontend/mgramseva/package.json index 96a15c476..757974e71 100644 --- a/frontend/mgramseva/package.json +++ b/frontend/mgramseva/package.json @@ -1,5 +1,5 @@ { "name": "mgramseva", - "version": "1.2.20", + "version": "1.2.21", "license": "egov" } From 6365201b2d9e109a684cd71130e8f3095e090070 Mon Sep 17 00:00:00 2001 From: debasishchakraborty-egovt Date: Thu, 22 Feb 2024 17:56:48 +0530 Subject: [PATCH 2/2] PFM-5655: Chnaged the logic to check buildingType with propertyType rather than UsageCategory --- .../org/egov/wscalculation/service/EstimationService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java index 3f9b08b2f..d8244a524 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java @@ -274,8 +274,9 @@ private List getSlabsFiltered(WaterConnection waterConnection, List WaterConnectionRequest.builder().waterConnection(waterConnection).requestInfo(requestInfo).build()); // get billing Slab log.debug(" the slabs count : " + billingSlabs.size()); - final String buildingType = (property.getUsageCategory() != null) ? property.getUsageCategory().split("\\.")[0] - : ""; + //final String buildingType = (property.getUsageCategory() != null) ? property.getUsageCategory().split("\\.")[0]: ""; + //TODO:FIX ME : here before we passing buildingtype as UsageCategory from proerty response . but while creating property usagecategoty is residentialeven when we are creating commercial connection. Hennce we have change this to proertytype + final String buildingType = (property.getPropertyType() != null) ? property.getPropertyType().split("\\.")[0]: ""; // final String buildingType = "Domestic"; final String connectionType = waterConnection.getConnectionType();