Merge pull request #812 from egovernments/ISTE-173-BUILD

ISTE 173 - BUILD even with Develop
egovernments · Jun 13, 2024 · 0749c5d · 0749c5d
2 parents ec48fd2 + 230f137
commit 0749c5d
Show file tree

Hide file tree

Showing 57 changed files with 2,564 additions and 1,794 deletions.
diff --git a/frontend/mgramseva/.gitignore b/frontend/mgramseva/.gitignore
@@ -33,7 +33,6 @@ lib/env/
 /build/
 
 # Web related
-lib/generated_plugin_registrant.dart
 
 # Symbolication related
 app.*.symbols

diff --git a/frontend/mgramseva/android/app/build.gradle b/frontend/mgramseva/android/app/build.gradle
@@ -42,8 +42,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.dwss.mgramseva"
-        minSdkVersion 19
-        targetSdkVersion 33
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true

diff --git a/frontend/mgramseva/devtools_options.yaml b/frontend/mgramseva/devtools_options.yaml
@@ -0,0 +1 @@
+extensions:
diff --git a/frontend/mgramseva/lib/components/dashboard/bills_table.dart b/frontend/mgramseva/lib/components/dashboard/bills_table.dart
@@ -1,3 +1,6 @@
+import 'dart:convert';
+import 'dart:developer';
+
 import 'package:flutter/material.dart';
 import 'package:horizontal_data_table/horizontal_data_table.dart';
 import 'package:mgramseva/utils/localization/application_localizations.dart';
@@ -14,17 +17,22 @@ class BillsTable extends StatefulWidget {
   ScrollController scrollController = ScrollController();
   BillsTable(
       {Key? key,
-        required this.headerList,
-        required this.tableData,
-        required this.leftColumnWidth,
-        required this.rightColumnWidth, this.height, this.scrollPhysics})
+      required this.headerList,
+      required this.tableData,
+      required this.leftColumnWidth,
+      required this.rightColumnWidth,
+      this.height,
+      this.scrollPhysics})
       : super(key: key);
   BillsTable.withScrollController(
       {Key? key,
-        required this.headerList,
-        required this.tableData,
-        required this.leftColumnWidth,
-        required this.rightColumnWidth, this.height, this.scrollPhysics, required this.scrollController})
+      required this.headerList,
+      required this.tableData,
+      required this.leftColumnWidth,
+      required this.rightColumnWidth,
+      this.height,
+      this.scrollPhysics,
+      required this.scrollController})
       : super(key: key);
 
   @override
@@ -106,32 +114,36 @@ class _BillsTable extends State<BillsTable> {
     return Container(
       decoration: isBorderRequired
           ? BoxDecoration(
-          border: Border(
-              left: tableCellBorder,
-              bottom: tableCellBorder,
-              right: tableCellBorder))
+              border: Border(
+                  left: tableCellBorder,
+                  bottom: tableCellBorder,
+                  right: tableCellBorder))
           : null,
       child: isAscending != null
           ? Wrap(
-        crossAxisAlignment: WrapCrossAlignment.center,
-        spacing: 5,
-        children: [
-          textWidget,
-          Icon(isAscending
-              ? Icons.arrow_upward
-              : Icons.arrow_downward_sharp)
-        ],
-      )
+              crossAxisAlignment: WrapCrossAlignment.center,
+              spacing: 5,
+              children: [
+                textWidget,
+                Icon(isAscending
+                    ? Icons.arrow_upward
+                    : Icons.arrow_downward_sharp)
+              ],
+            )
           : textWidget,
       width: widget.leftColumnWidth,
       height: 56,
       padding: EdgeInsets.only(left: 17, right: 5, top: 6, bottom: 6),
       alignment: Alignment.centerLeft,
     );
   }
+
   double columnRowIncreasedHeight(int index) {
-    return
-      (50 + widget.tableData[index].tableRow.first.label.substring(28).length.toDouble());
+    return (50 +
+        widget.tableData[index].tableRow.first.label
+            .substring(28)
+            .length
+            .toDouble());
     //if greater than 28 characters
   }
 
@@ -149,17 +161,20 @@ class _BillsTable extends State<BillsTable> {
             child: Container(
               decoration: BoxDecoration(
                   border: Border(
-                    left: tableCellBorder,
-                    bottom: tableCellBorder,
-                    right: tableCellBorder,
-                  )),
+                left: tableCellBorder,
+                bottom: tableCellBorder,
+                right: tableCellBorder,
+              )),
               child: Text(
                 ApplicationLocalizations.of(context)
                     .translate(widget.tableData[index].tableRow.first.label),
-                style: widget.tableData[index].tableRow.first.style ?? TextStyle(color: Theme.of(context).primaryColor),
+                style: widget.tableData[index].tableRow.first.style ??
+                    TextStyle(color: Theme.of(context).primaryColor),
               ),
               width: widget.leftColumnWidth,
-              height: widget.tableData[index].tableRow.first.label.length > 28 ? columnRowIncreasedHeight(index) : columnRowFixedHeight,
+              height: widget.tableData[index].tableRow.first.label.length > 28
+                  ? columnRowIncreasedHeight(index)
+                  : columnRowFixedHeight,
               padding: EdgeInsets.only(left: 17, right: 5, top: 6, bottom: 6),
               alignment: Alignment.centerLeft,
             ),
@@ -174,7 +189,8 @@ class _BillsTable extends State<BillsTable> {
       child: Row(
         children: <Widget>[
           Expanded(
-            child: Text(ApplicationLocalizations.of(context).translate(input),
+            child: Text(
+              ApplicationLocalizations.of(context).translate(input),
               style: style,
               maxLines: 2,
               overflow: TextOverflow.ellipsis,
@@ -183,14 +199,17 @@ class _BillsTable extends State<BillsTable> {
         ],
       ),
       width: widget.leftColumnWidth,
-      height: widget.tableData[index].tableRow.first.label.length > 28 ? columnRowIncreasedHeight(index) : columnRowFixedHeight,
+      height: widget.tableData[index].tableRow.first.label.length > 28
+          ? columnRowIncreasedHeight(index)
+          : columnRowFixedHeight,
       padding: EdgeInsets.only(left: 17, right: 5, top: 6, bottom: 6),
       alignment: Alignment.centerLeft,
     );
   }
 
   Widget _generateRightHandSideColumnRow(BuildContext context, int index) {
     var data = widget.tableData[index];
+
     return LayoutBuilder(builder: (context, constraints) {
       var list = <Widget>[];
       for (int i = 1; i < data.tableRow.length; i++) {

diff --git a/frontend/mgramseva/lib/components/house_connection_and_bill/consumer_bill_payment.dart b/frontend/mgramseva/lib/components/house_connection_and_bill/consumer_bill_payment.dart
@@ -230,7 +230,7 @@ class ConsumerBillPaymentsState extends State<ConsumerBillPayments> {
                                   .toString()) +
                               ' only')),
                       getPrinterLabel(
-                          (item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)>0?i18.consumerReciepts.CONSUMER_PENDING_AMOUNT:i18.common.CORE_ADVANCE,
+                          (item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)>=0?i18.consumerReciepts.CONSUMER_PENDING_AMOUNT:i18.common.CORE_ADVANCE,
                           ('₹' +
                               ((item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)).abs()
                                   .toString())),