Develop

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")

frontend/mgramseva/lib/providers/consumer_details_provider.dart

@@ -479,11 +479,35 @@ class ConsumerProvider with ChangeNotifier {
         "tenantId": commonProvider.userDetails!.selectedtenant!.code
       });
       boundaryList = [];
-      boundaryList.addAll(
-          TenantBoundary.fromJson(result['TenantBoundary'][0]).boundary!);
+      result['TenantBoundary']!=null && result['TenantBoundary'].length>0?boundaryList.addAll(
+          TenantBoundary.fromJson(result['TenantBoundary'][0]).boundary!):{};
       if (boundaryList.length == 1) {
         property.address.localityCtrl = boundaryList.first;
         onChangeOfLocality(property.address.localityCtrl);
+      }else{
+        boundaryList.add(Boundary.fromJson({
+          "code": "WARD1",
+          "name": commonProvider.userDetails!.selectedtenant!.name,
+          "label": "Locality",
+          "latitude": null,
+          "longitude": null,
+          "area": null,
+          "pincode": null,
+          "boundaryNum": 1,
+          "children": []
+        }));
+        property.address.localityCtrl = Locality.fromJson({
+          "code": "WARD1",
+          "name": commonProvider.userDetails!.selectedtenant!.name,
+          "label": "Locality",
+          "latitude": null,
+          "longitude": null,
+          "area": null,
+          "pincode": null,
+          "boundaryNum": 1,
+          "children": []
+        });
+        onChangeOfLocality(property.address.localityCtrl);
       }
       // notifyListeners();
     } catch (e) {
@@ -625,6 +649,39 @@ class ConsumerProvider with ChangeNotifier {
     }
     return <Map<String,dynamic>>[];
   }
+  //Displaying Billing Cycle Vaule (EX- JAN-2021,,)
+  List<Map<String,dynamic>> getBillingCycleMonthCountCurrent(TaxPeriod? billYear) {
+    var dates = <Map<String,dynamic>>[];
+    if (billYear!=null) {
+      DatePeriod ytd;
+      var fromDate = DateFormats.getFormattedDateToDateTime(
+          DateFormats.timeStampToDate(billYear?.fromDate)) as DateTime;
+
+      var toDate = DateFormats.getFormattedDateToDateTime(
+          DateFormats.timeStampToDate(billYear?.toDate)) as DateTime;
+
+      ytd = DatePeriod(fromDate,toDate,DateType.YTD);
+
+      /// Get months based on selected billing year
+      var months = CommonMethods.getPastMonthUntilFinancialYTDMonthCount(ytd);
+
+      /// if selected year is future year means all the months will be removed
+      if(fromDate.year > ytd.endDate.year) months.clear();
+
+      for (var i = 0; i < months.length; i++) {
+        var prevMonth = months[i].startDate;
+        var r = {"code": prevMonth, "name": '${ApplicationLocalizations.of(navigatorKey.currentContext!)
+            .translate((Constants.MONTHS[prevMonth.month - 1])) +
+            " - " +
+            prevMonth.year.toString()}'};
+        dates.add(r);
+      }
+    }
+    if (dates.length > 0 && waterconnection.connectionType == 'Non_Metered') {
+      return dates;
+    }
+    return <Map<String,dynamic>>[];
+  }
 
   incrementIndex(index, consumerGenderKey) async {
     if (boundaryList.length > 1) {

frontend/mgramseva/lib/providers/expenses_details_provider.dart

@@ -285,7 +285,7 @@ class ExpensesDetailsProvider with ChangeNotifier {
       if (boundaryList.length > 0) {
         code = boundaryList.first.code;
       } else {
-        code = commonProvider.userDetails?.selectedtenant?.city?.code;
+        code = "WARD1";
       }
 
       var body = {

frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart

@@ -512,8 +512,8 @@ class _ConsumerDetailsState extends State<ConsumerDetails> {
                                                             '',
                                                             consumerProvider
                                                                 .onChangeOfBillYear,
-                                                            consumerProvider
-                                                                .getFinancialYearList(),
+                                                            [consumerProvider
+                                                                .getFinancialYearList().first],
                                                             true,
                                                             itemAsString: (i) =>'${ApplicationLocalizations.of(context).translate(i.financialYear)}',
                                                             controller: consumerProvider
@@ -532,7 +532,8 @@ class _ConsumerDetailsState extends State<ConsumerDetails> {
                                                             consumerProvider
                                                                 .onChangeBillingCycle,
                                                             consumerProvider
-                                                                .getBillingCycle(),
+                                                                .getBillingCycleMonthCountCurrent(consumerProvider
+                                                                .billYear),
                                                             true,
                                                             itemAsString: (i) =>"${ApplicationLocalizations.of(context).translate(i['name'])}",
                                                             controller: consumerProvider

frontend/mgramseva/lib/services/urls.dart

@@ -3,7 +3,7 @@ class Url {
 
   static const String LOCALIZATION = 'localization/messages/v1/_search';
 
-  static const String MDMS = 'egov-mdms-service/v1/_search';
+  static const String MDMS = 'mdms-v2/v1/_search';
   static const String FILE_UPLOAD = 'filestore/v1/files';
   static const String FILE_FETCH = 'filestore/v1/files/url';
   static const String URL_SHORTNER = 'egov-url-shortening/shortener';

frontend/mgramseva/lib/utils/common_methods.dart

@@ -57,7 +57,64 @@ class CommonMethods {
   * [email protected]
   *
   * */
-
+  static var daysInMonthLeap = [
+    31,
+    29,
+    31,
+    30,
+    31,
+    30,
+    31,
+    31,
+    30,
+    31,
+    30,
+    31
+  ];
+  static var daysInMonth = [
+    31,
+    28,
+    31,
+    30,
+    31,
+    30,
+    31,
+    31,
+    30,
+    31,
+    30,
+    31
+  ];
+  static bool isLeapYear(int year) {
+    if (year % 4 == 0) {
+      if (year % 100 == 0) {
+        if (year % 400 == 0) {
+          return true;
+        } else {
+          return false;
+        }
+      } else {
+        return true;
+      }
+    } else {
+      return false;
+    }
+  }
+  static int daysToSubtract(int monthCount, int year,int currentMonth) {
+    int days = 0;
+    for (int i = 0; i < monthCount; i++) {
+      if (currentMonth - i < 0) {
+        days += isLeapYear(year - 1)
+            ? daysInMonthLeap[12 - (currentMonth - i).abs()]
+            : daysInMonth[12 - (currentMonth - i).abs()];
+      } else {
+        days += isLeapYear(year)
+            ? daysInMonthLeap[currentMonth - i]
+            : daysInMonth[currentMonth - i];
+      }
+    }
+    return days;
+  }
   static List<DatePeriod> getPastMonthUntilFinancialYTD(DatePeriod ytd,
       {bool showCurrentMonth = false}) {
     var monthList = <DateTime>[];
@@ -109,7 +166,58 @@ class CommonMethods {
         .toList();
     return list;
   }
-
+  static List<DatePeriod> getPastMonthUntilFinancialYTDMonthCount(DatePeriod ytd,
+      {int monthCount=2,bool showCurrentMonth = false}) {
+    var monthList = <DateTime>[];
+    final currentTime = DateTime.now();
+    DatePeriod newDT = DatePeriod(ytd.endDate.subtract(Duration(days: daysToSubtract(monthCount,currentTime.year,currentTime.month))), ytd.endDate, DateType.MONTH);
+    if (currentTime.year < newDT.startDate.year) {
+      return <DatePeriod>[];
+    }
+    if (currentTime.year == newDT.startDate.year) {
+      //when current year is same as start year of financial year
+      for (int i = newDT.startDate.month;
+      i <= (showCurrentMonth ? currentTime.month : currentTime.month - 1);
+      i++) {
+        monthList.add(DateTime(currentTime.year, i));
+      }
+    } else if (currentTime.year == newDT.endDate.year) {
+      //when current year is same as end year of financial year
+      for (int i = newDT.startDate.month; i <= 12; i++) {
+        monthList.add(DateTime(newDT.startDate.year, i));
+      }
+      for (int i = 1;
+      i <=
+          (currentTime.month <= newDT.endDate.month
+              ? showCurrentMonth
+              ? currentTime.month
+              : currentTime.month - 1
+              : newDT.endDate.month);
+      /*
+          * if current month is less than or equal to end month of financial year
+          * we are using months less than current month and if it is more than
+          * end month of financial year we are using till end month of financial
+          * year
+          */
+      i++) {
+        monthList.add(DateTime(newDT.endDate.year, i));
+      }
+    } else {
+      for (int i = newDT.startDate.month; i <= 12; i++) {
+        monthList.add(DateTime(newDT.startDate.year, i));
+      }
+      for (int i = 1; i <= newDT.endDate.month; i++) {
+        monthList.add(DateTime(newDT.endDate.year, i));
+      }
+    }
+    var list = monthList
+        .map((e) => DatePeriod(DateTime(e.year, e.month, 1),
+        DateTime(e.year, e.month + 1, 0, 23, 59, 59, 999), DateType.MONTH))
+        .toList()
+        .reversed
+        .toList();
+    return list;
+  }
   static List<DatePeriod> getPastMonthIncludingCurrentMonthUntilFinancialYTD(
       DatePeriod ytd) {
     var monthList = <DateTime>[];

frontend/mgramseva/package.json

@@ -1,5 +1,5 @@
 {
   "name": "mgramseva",
-  "version": "1.2.20",
+  "version": "1.2.21",
   "license": "egov"
 }

frontend/mgramseva/pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 1.2.20+36
+version: 1.2.21+37
 
 environment:
   sdk: ">=2.12.0 <4.0.0"

municipal-services/property-services/src/main/java/org/egov/pt/service/BoundaryService.java

@@ -50,6 +50,7 @@ public class BoundaryService {
 	 */
 	public void getAreaType(Property property, RequestInfo requestInfo, String hierarchyTypeCode) {
 
+		//EnrichmentService 202 line was calling this method previously
 		if (ObjectUtils.isEmpty(property))
 			return;
 		String tenantId = property.getTenantId();

municipal-services/property-services/src/main/java/org/egov/pt/service/EnrichmentService.java

@@ -199,7 +199,7 @@ public PropertyCriteria getPropertyCriteriaFromPropertyIds(List<Property> proper
      */
     public void enrichBoundary(Property property, RequestInfo requestInfo){
 
-        boundaryService.getAreaType(property, requestInfo, PTConstants.BOUNDARY_HEIRARCHY_CODE);
+//        boundaryService.getAreaType(property, requestInfo, PTConstants.BOUNDARY_HEIRARCHY_CODE);
     }
 
     /**

municipal-services/vendor/src/main/java/org/egov/vendor/service/BoundaryService.java

@@ -40,6 +40,7 @@ public BoundaryService(ServiceRequestRepository serviceRequestRepository, Object
 	}
 
 	public void getAreaType(VendorRequest request, String hierarchyTypeCode) {
+		//EnrichmentService 102 , VendorValidator 113 line was calling this method
 		if (request.getVendor() == null) {
 			return;
 		}

municipal-services/vendor/src/main/java/org/egov/vendor/service/EnrichmentService.java

@@ -99,7 +99,7 @@ public void enrichVendorSearch(List<Vendor> vendorList, RequestInfo requestInfo,
 
 			addDrivers(requestInfo, vendor, tenantId);
 			addVehicles(requestInfo, vendor, tenantId);
-			boundaryService.getAreaType(VendorRequest.builder().vendor(vendor).build(), config.getHierarchyTypeCode());
+//			boundaryService.getAreaType(VendorRequest.builder().vendor(vendor).build(), config.getHierarchyTypeCode());
 		});
 	}
 

municipal-services/vendor/src/main/java/org/egov/vendor/validator/VendorValidator.java

@@ -110,7 +110,7 @@ public void validateCreate(VendorRequest vendorRequest) {
 		RequestInfo requestInfo = vendorRequest.getRequestInfo();
 		Vendor vendor = vendorRequest.getVendor();
 
-		boundaryService.getAreaType(vendorRequest, config.getHierarchyTypeCode());
+//		boundaryService.getAreaType(vendorRequest, config.getHierarchyTypeCode());
 		vehicleService.manageVehicle(vendorRequest);
 		ownerService.manageOwner(vendorRequest);
 		ownerService.manageDrivers(vendorRequest);

municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandService.java

@@ -302,7 +302,10 @@ private List<Demand> createDemand(RequestInfo requestInfo, List<Calculation> cal
 						//sendPaymentAndBillSMSNotification(requestInfo,tenantId,owner,waterConnectionRequest,property,demandDetails,consumerCode,demands,isForConnectionNO,businessService,billCycle,billNumbers,paymentDueDate);
 					}
 				}
-				sendDownloadBillSMSNotification(requestInfo,tenantId,owner,waterConnectionRequest,property,demandDetails,consumerCode,demands,isForConnectionNO,businessService,billCycle,billNumbers,paymentDueDate);
+				BigDecimal totalAmount=fetchTotalBillAmount(demands,requestInfo);
+				//log.info("Total Amount from fetch Bill"+String.valueOf(totalAmount));
+				if(totalAmount!=null && totalAmount.signum()> 0)
+					sendDownloadBillSMSNotification(requestInfo,tenantId,owner,waterConnectionRequest,property,demandDetails,consumerCode,demands,isForConnectionNO,businessService,billCycle,billNumbers,paymentDueDate,totalAmount);
 			}
 		}
 		log.info("Demand Object" + demands.toString());
@@ -348,7 +351,7 @@ private void sendPaymentSMSNotification(RequestInfo requestInfo, String tenantId
 			}
 		}
 	}
-	private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String tenantId, User owner, WaterConnectionRequest waterConnectionRequest, Property property, List<DemandDetail> demandDetails, String consumerCode, List<Demand> demands, Boolean isForConnectionNO, String businessService, String billCycle,List<String> billNumbers, String paymentDueDate) {
+	private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String tenantId, User owner, WaterConnectionRequest waterConnectionRequest, Property property, List<DemandDetail> demandDetails, String consumerCode, List<Demand> demands, Boolean isForConnectionNO, String businessService, String billCycle,List<String> billNumbers, String paymentDueDate,BigDecimal totalamount) {
 		HashMap<String, String> localizationMessage = util.getLocalizationMessage(requestInfo,
 				WSCalculationConstant.mGram_Consumer_NewBill, tenantId);
 		String actionLink = config.getNotificationUrl()
@@ -364,22 +367,21 @@ private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String ten
 		}
 		String messageString = localizationMessage.get(WSCalculationConstant.MSG_KEY);
 
-		System.out.println("Localization message get bill::" + messageString);
-		System.out.println("isForConnectionNO:" + isForConnectionNO);
+		//System.out.println("Localization message get bill::" + messageString);
+		//System.out.println("isForConnectionNO:" + isForConnectionNO);
 		if (!StringUtils.isEmpty(messageString) && isForConnectionNO) {
 			log.info("Demand Object get bill" + demands.toString());
 			log.info("requestInfo get Bill" + requestInfo);
 			log.info("bill number get bill size :" + billNumbers.size());
-			if (billNumbers.size() > 0) {
+			if (totalamount!=null && billNumbers.size() > 0 && totalamount.signum()>0) {
 				actionLink = actionLink.replace("$billNumber", billNumbers.get(0));
 				messageString = messageString.replace("{ownername}", owner.getName());
 				messageString = messageString.replace("{Period}", billCycle);
 				messageString = messageString.replace("{consumerno}", consumerCode);
-				messageString = messageString.replace("{billamount}", demandDetails.stream()
-						.map(DemandDetail::getTaxAmount).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
+				messageString = messageString.replace("{billamount}", totalamount.toString());
 				messageString = messageString.replace("{BILL_LINK}", getShortenedUrl(actionLink));
 
-				System.out.println("Demand genaration Message get bill::" + messageString);
+			//	System.out.println("Demand genaration Message get bill::" + messageString);
 
 				SMSRequest sms = SMSRequest.builder().mobileNumber(owner.getMobileNumber()).message(messageString).tenantid(tenantId)
 						.category(Category.TRANSACTION).build();

municipal-services/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();
 

municipal-services/ws-calculator/src/main/resources/application.properties

@@ -22,6 +22,7 @@ spring.kafka.consumer.group-id=egov-ws-calc-services
 spring.kafka.consumer.properties.spring.json.use.type.headers=false
 spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer
+spring.kafka.consumer.properties.max.poll.interval.ms=600000
 
 $KAFKA TOPIC DETAILS
 egov.watercalculatorservice.createdemand.topic=ws-generate-demand