Merge remote-tracking branch 'origin/develop' into develop

egovernments · Mar 5, 2024 · a893b59 · a893b59
2 parents afd1d20 + 18bdefc
commit a893b59
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git 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
diff --git 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"
 }
diff --git a/...ervices/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java b/...ervices/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java
@@ -274,8 +274,9 @@ private List<BillingSlab> 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();