Develop

build/build-config.yml

@@ -134,3 +134,8 @@ config:
         dockerfile: "build/maven/Dockerfile"
       - work-dir: "business-services/egov-apportion-service/src/main/resources/db"
         image-name: "egov-apportion-service-db"
+  - name: "builds/mGramSeva/utilities/egov-penalty-schedular"
+    build:
+      - work-dir: "utilities/egov-penalty-schedular"
+        image-name: "egov-penalty-schedular"
+        dockerfile: "build/maven/Dockerfile"

frontend/mgramseva/lib/components/house_connection_and_bill/consumer_bill_payment.dart

@@ -230,9 +230,9 @@ class ConsumerBillPaymentsState extends State<ConsumerBillPayments> {
                                   .toString()) +
                               ' only')),
                       getPrinterLabel(
-                          i18.consumerReciepts.CONSUMER_PENDING_AMOUNT,
+                          (item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)>0?i18.consumerReciepts.CONSUMER_PENDING_AMOUNT:i18.common.CORE_ADVANCE,
                           ('₹' +
-                              ((item.totalDue ?? 0) - (item.totalAmountPaid ?? 0))
+                              ((item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)).abs()
                                   .toString())),
                       SizedBox(
                         height: 8,

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/collect_payment_provider.dart

@@ -398,9 +398,9 @@ class CollectPaymentProvider with ChangeNotifier {
                                   .toString()) +
                               ' only')),
                       getPrinterLabel(
-                          i18.consumerReciepts.CONSUMER_PENDING_AMOUNT,
+                          (item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)>0?i18.consumerReciepts.CONSUMER_PENDING_AMOUNT:i18.common.CORE_ADVANCE,
                           ('₹' +
-                              ((item.totalDue ?? 0) - (item.totalAmountPaid ?? 0))
+                              ((item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)).abs()
                                   .toString())),
                       SizedBox(
                         height: 8,

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.getPastMonthUntilFinancialYTD(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) {
@@ -667,7 +724,18 @@ class ConsumerProvider with ChangeNotifier {
     }
     return <TaxPeriod>[];
   }
-
+  List<TaxPeriod> getLastFinancialYearList(int count) {
+    return getFinancialYearList().length>count?getFinancialYearList().sublist(0,count):getFinancialYearList();
+  }
+  List<Map<String,dynamic>> newBillingCycleFunction({int pastMonthCount = 2}){
+    List<TaxPeriod> financialYears = getFinancialYearList();
+    var dates = <Map<String,dynamic>>[];
+    financialYears.forEach((year) {
+      dates.addAll(getBillingCycleMonthCountCurrent(year));
+    });
+    dates.sort((a, b) => b['code'].compareTo(a['code']));
+    return dates.toList().length>2?dates.toList().sublist(0,2):dates.toList();
+  }
   void onChangeOfAmountType(value) {
     waterconnection.paymentType = value;
 

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

@@ -438,7 +438,7 @@ class _ConsumerDetailsState extends State<ConsumerDetails> {
                                                             .waterconnection
                                                             .previousReadingDateCtrl,
                                                         firstDate:
-                                                            DateTime.fromMillisecondsSinceEpoch(consumerProvider.languageList?.mdmsRes?.billingService?.taxPeriodList!.first.fromDate??0),
+                                                            DateTime.fromMillisecondsSinceEpoch(consumerProvider.getLastFinancialYearList(2).reversed.first.fromDate??0),
                                                         lastDate:
                                                             DateTime.now(),
                                                         onChangeOfDate:
@@ -503,25 +503,25 @@ class _ConsumerDetailsState extends State<ConsumerDetails> {
                                                             false
                                                     ? Wrap(
                                                         children: [
-                                                          SelectFieldBuilder(
-                                                            i18.demandGenerate
-                                                                .BILLING_YEAR_LABEL,
-                                                            consumerProvider
-                                                                .billYear,
-                                                            '',
-                                                            '',
-                                                            consumerProvider
-                                                                .onChangeOfBillYear,
-                                                            consumerProvider
-                                                                .getFinancialYearList(),
-                                                            true,
-                                                            itemAsString: (i) =>'${ApplicationLocalizations.of(context).translate(i.financialYear)}',
-                                                            controller: consumerProvider
-                                                                .waterconnection
-                                                                .billingCycleYearCtrl,
-                                                            key: Keys.bulkDemand
-                                                                .BULK_DEMAND_BILLING_YEAR,
-                                                          ),
+                                                          // SelectFieldBuilder(
+                                                          //   i18.demandGenerate
+                                                          //       .BILLING_YEAR_LABEL,
+                                                          //   consumerProvider
+                                                          //       .billYear,
+                                                          //   '',
+                                                          //   '',
+                                                          //   consumerProvider
+                                                          //       .onChangeOfBillYear,
+                                                          //   consumerProvider
+                                                          //       .getFinancialYearList(),
+                                                          //   true,
+                                                          //   itemAsString: (i) =>'${ApplicationLocalizations.of(context).translate(i.financialYear)}',
+                                                          //   controller: consumerProvider
+                                                          //       .waterconnection
+                                                          //       .billingCycleYearCtrl,
+                                                          //   key: Keys.bulkDemand
+                                                          //       .BULK_DEMAND_BILLING_YEAR,
+                                                          // ),
                                                           SelectFieldBuilder(
                                                             i18.consumer
                                                                 .CONSUMER_BILLING_CYCLE,
@@ -532,7 +532,7 @@ class _ConsumerDetailsState extends State<ConsumerDetails> {
                                                             consumerProvider
                                                                 .onChangeBillingCycle,
                                                             consumerProvider
-                                                                .getBillingCycle(),
+                                                                .newBillingCycleFunction(),
                                                             true,
                                                             itemAsString: (i) =>"${ApplicationLocalizations.of(context).translate(i['name'])}",
                                                             controller: consumerProvider

frontend/mgramseva/lib/services/urls.dart

@@ -6,7 +6,7 @@ class Url {
   static const String MDMS = 'egov-mdms-service/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';
+  static const String URL_SHORTNER = 'eus/shortener';
   static const String FETCH_FILESTORE_ID_PDF_SERVICE = 'pdf-service/v1/_create';
 
   /// Expenses

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,6 @@ class CommonMethods {
         .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);