09-07-2025 By Sai Srinivas

Network and Finance Module issue and Back

lib/screens/genTracker/ComplaintHistory.dart

 import 'dart:io';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
+import 'package:generp/Utils/commonServices.dart';
 import 'package:provider/provider.dart';
 
 import '../../Notifiers/GeneratorDetailsProvider.dart';
@@ -18,10 +20,18 @@ class Complainthistory extends StatefulWidget {
 }
 
 class _ComplainthistoryState extends State<Complainthistory> {
+
+  Map _source = {ConnectivityResult.mobile: true};
+  final MyConnectivity _connectivity = MyConnectivity.instance;
+
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
+    _connectivity.initialise();
+    _connectivity.myStream.listen((source) {
+      setState(() => _source = source);
+    });
     WidgetsBinding.instance.addPostFrameCallback((_) {
       var details = Provider.of<Generatordetailsprovider>(
         context,
@@ -38,10 +48,27 @@ class _ComplainthistoryState extends State<Complainthistory> {
       );
     });
   }
+  @override
+  void dispose() {
+    // TODO: implement dispose
+    super.dispose();
+    _connectivity.disposeStream();
+  }
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<Generatordetailsprovider>(
+    switch (_source.keys.toList()[0]) {
+      case ConnectivityResult.mobile:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.wifi:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.none:
+      default:
+        connection = 'Offline';
+    }
+    return connection=="Online"?Consumer<Generatordetailsprovider>(
       builder: (context, provider, child) {
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
@@ -153,6 +180,6 @@ class _ComplainthistoryState extends State<Complainthistory> {
           ),
         );
       },
-    );
+    ):NoNetwork(context);
   }
 }

lib/screens/genTracker/GenTrackerDashboard.dart

 import 'dart:io';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:generp/Utils/commonWidgets.dart';
 import 'package:generp/screens/genTracker/ScanEnterGeneratorIDScreen.dart';
 
 import '../../Utils/app_colors.dart';
+import '../../Utils/commonServices.dart';
 
 class Gentrackerdashboard extends StatefulWidget {
   const Gentrackerdashboard({super.key});
@@ -15,14 +17,45 @@ class Gentrackerdashboard extends StatefulWidget {
 }
 
 class _GentrackerdashboardState extends State<Gentrackerdashboard> {
+  Map _source = {ConnectivityResult.mobile: true};
+  final MyConnectivity _connectivity = MyConnectivity.instance;
+
+@override
+  void initState() {
+    // TODO: implement initState
+    super.initState();
+    _connectivity.initialise();
+    _connectivity.myStream.listen((source) {
+      setState(() => _source = source);
+    });
+  }
+
+  @override
+  void dispose() {
+    // TODO: implement dispose
+    super.dispose();
+    _connectivity.disposeStream();
+  }
+
   @override
   Widget build(BuildContext context) {
-    return Platform.isAndroid
+    switch (_source.keys.toList()[0]) {
+      case ConnectivityResult.mobile:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.wifi:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.none:
+      default:
+        connection = 'Offline';
+    }
+    return (connection=="Online")?Platform.isAndroid
         ? WillPopScope(
           onWillPop: () => onBackPressed(context),
           child: SafeArea(top: false, bottom: true, child: _scaffold(context)),
         )
-        : _scaffold(context);
+        : _scaffold(context):NoNetwork(context);
   }
 
   Widget _scaffold(BuildContext context) {

lib/screens/genTracker/GeneratorDetails.dart

 import 'dart:io';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:generp/Notifiers/GeneratorDetailsProvider.dart';
@@ -9,6 +10,7 @@ import 'package:url_launcher/url_launcher.dart';
 
 import '../../Notifiers/HomeScreenNotifier.dart';
 import '../../Utils/app_colors.dart';
+import '../../Utils/commonServices.dart';
 import '../../Utils/commonWidgets.dart';
 import 'ScanEnterGeneratorIDScreen.dart';
 
@@ -29,10 +31,19 @@ class Generatordetails extends StatefulWidget {
 }
 
 class _GeneratordetailsState extends State<Generatordetails> {
+
+  Map _source = {ConnectivityResult.mobile: true};
+  final MyConnectivity _connectivity = MyConnectivity.instance;
+
+
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
+    _connectivity.initialise();
+    _connectivity.myStream.listen((source) {
+      setState(() => _source = source);
+    });
     WidgetsBinding.instance.addPostFrameCallback((_) {
       var details = Provider.of<Generatordetailsprovider>(
         context,
@@ -62,9 +73,27 @@ class _GeneratordetailsState extends State<Generatordetails> {
     });
   }
 
+  @override
+  void dispose() {
+    // TODO: implement dispose
+    super.dispose();
+    _connectivity.disposeStream();
+  }
+
   @override
   Widget build(BuildContext context) {
-    return Consumer2<Generatordetailsprovider, HomescreenNotifier>(
+    switch (_source.keys.toList()[0]) {
+      case ConnectivityResult.mobile:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.wifi:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.none:
+      default:
+        connection = 'Offline';
+    }
+    return connection=="Online"?Consumer2<Generatordetailsprovider, HomescreenNotifier>(
       builder: (context, provider, Homeprovider, child) {
         var sendwidget = SizedBox(width: 0);
         return WillPopScope(
@@ -862,7 +891,7 @@ class _GeneratordetailsState extends State<Generatordetails> {
           ),
         );
       },
-    );
+    ):NoNetwork(context);
   }
 }
 

lib/screens/genTracker/ScanEnterGeneratorIDScreen.dart

 import 'dart:io';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:generp/Notifiers/GeneratorDetailsProvider.dart';
 import 'package:generp/Utils/commonServices.dart';
@@ -24,10 +25,17 @@ class _ScanentergeneratoridscreenState extends State<Scanentergeneratoridscreen>
   TextEditingController genIDcontroller = TextEditingController();
 
 
+  Map _source = {ConnectivityResult.mobile: true};
+  final MyConnectivity _connectivity = MyConnectivity.instance;
+
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
+    _connectivity.initialise();
+    _connectivity.myStream.listen((source) {
+      setState(() => _source = source);
+    });
     WidgetsBinding.instance.addPostFrameCallback((_) {
       var provider = Provider.of<Generatordetailsprovider>(
         context,
@@ -50,6 +58,7 @@ class _ScanentergeneratoridscreenState extends State<Scanentergeneratoridscreen>
     super.dispose();
     genIDcontroller.clear();
     genIDcontroller.dispose();
+    _connectivity.disposeStream();
 
   }
 
@@ -57,7 +66,18 @@ class _ScanentergeneratoridscreenState extends State<Scanentergeneratoridscreen>
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<Generatordetailsprovider>(
+    switch (_source.keys.toList()[0]) {
+      case ConnectivityResult.mobile:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.wifi:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.none:
+      default:
+        connection = 'Offline';
+    }
+    return connection=="Online"?Consumer<Generatordetailsprovider>(
       builder: (context, provider, child) {
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
@@ -134,7 +154,7 @@ class _ScanentergeneratoridscreenState extends State<Scanentergeneratoridscreen>
           ),
         );
       },
-    );
+    ):NoNetwork(context);
   }
 
   Future<void> _showgenIdBottomSheet(BuildContext context) {

lib/screens/inventory/GeneratorPartDetailsScreen.dart

 import 'dart:io';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:generp/screens/finance/FileViewer.dart';
 import 'package:generp/screens/notifierExports.dart';
@@ -23,11 +24,17 @@ class _GeneratorPartDetailsScreenState
 
   TextEditingController descriptioncontroller = TextEditingController();
   TextEditingController quantitycontroller = TextEditingController();
+  Map _source = {ConnectivityResult.mobile: true};
+  final MyConnectivity _connectivity = MyConnectivity.instance;
 
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
+    _connectivity.initialise();
+    _connectivity.myStream.listen((source) {
+      setState(() => _source = source);
+    });
     WidgetsBinding.instance.addPostFrameCallback((_) {
       var homeProvider = Provider.of<HomescreenNotifier>(
         context,
@@ -36,6 +43,12 @@ class _GeneratorPartDetailsScreenState
       initialiseFunction(context, homeProvider);
     });
   }
+  @override
+  void dispose() {
+    // TODO: implement dispose
+    super.dispose();
+    _connectivity.disposeStream();
+  }
 
   void initialiseFunction(BuildContext context, homeProvider) async {
     var inventoryProvider = Provider.of<InventoryProvider>(
@@ -52,7 +65,19 @@ class _GeneratorPartDetailsScreenState
 
   @override
   Widget build(BuildContext context) {
-    return Consumer2<InventoryProvider, HomescreenNotifier>(
+    switch (_source.keys.toList()[0]) {
+      case ConnectivityResult.mobile:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.wifi:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.none:
+      default:
+        connection = 'Offline';
+    }
+    return connection=="Online"?
+      Consumer2<InventoryProvider, HomescreenNotifier>(
       builder: (context, provider, homeProvider, child) {
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
@@ -546,7 +571,8 @@ class _GeneratorPartDetailsScreenState
           ),
         );
       },
-    );
+    ):
+    NoNetwork(context);
   }
 
   Future<void> _showStockIssueBottomSheet(BuildContext context, type) {

lib/screens/inventory/InventoryScreen.dart

 import 'dart:io';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:generp/screens/notifierExports.dart';
 import 'package:generp/Utils/commonWidgets.dart';
@@ -7,6 +8,7 @@ import 'package:provider/provider.dart';
 import 'package:qr_code_scanner/qr_code_scanner.dart';
 
 import '../../Utils/app_colors.dart';
+import '../../Utils/commonServices.dart';
 
 class InventoryScreen extends StatefulWidget {
   const InventoryScreen({super.key});
@@ -18,11 +20,17 @@ class InventoryScreen extends StatefulWidget {
 class _InventoryScreenState extends State<InventoryScreen> {
   FocusNode partIDfocusNode = FocusNode();
   TextEditingController partIDcontroller = TextEditingController();
+  Map _source = {ConnectivityResult.mobile: true};
+  final MyConnectivity _connectivity = MyConnectivity.instance;
 
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
+    _connectivity.initialise();
+    _connectivity.myStream.listen((source) {
+      setState(() => _source = source);
+    });
     WidgetsBinding.instance.addPostFrameCallback((_) {
       var inventoryProvider = Provider.of<InventoryProvider>(
         context,
@@ -33,14 +41,38 @@ class _InventoryScreenState extends State<InventoryScreen> {
     });
   }
 
+  @override
+  void dispose() {
+    // TODO: implement dispose
+    super.dispose();
+    _connectivity.disposeStream();
+  }
+
   @override
   Widget build(BuildContext context) {
-    return Platform.isAndroid
-        ? WillPopScope(
-          onWillPop: () => onBackPressed(context),
-          child: SafeArea(top: false, bottom: true, child: _scaffold(context)),
-        )
-        : _scaffold(context);
+    switch (_source.keys.toList()[0]) {
+      case ConnectivityResult.mobile:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.wifi:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.none:
+      default:
+        connection = 'Offline';
+    }
+    return (connection == 'Online')
+        ? Platform.isAndroid
+            ? WillPopScope(
+              onWillPop: () => onBackPressed(context),
+              child: SafeArea(
+                top: false,
+                bottom: true,
+                child: _scaffold(context),
+              ),
+            )
+            : _scaffold(context)
+        : NoNetwork(context);
   }
 
   Widget _scaffold(BuildContext context) {

lib/screens/order/addPayment.dart

@@ -14,7 +14,8 @@ import '../../Models/ordersModels/AddOrderPaymentSelectOrderResponse.dart';
 import '../../Utils/app_colors.dart';
 import '../../Utils/commonWidgets.dart';
 import '../../Utils/dropdownTheme.dart';
-
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:generp/Utils/commonServices.dart';
 class AddpaymentScreen extends StatefulWidget {
   final pageTitleName;
   final mode;
@@ -33,11 +34,17 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
 
   String? selectedValue;
   final TextEditingController textEditingController = TextEditingController();
+  Map _source = {ConnectivityResult.mobile: true};
+  final MyConnectivity _connectivity = MyConnectivity.instance;
 
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
+    _connectivity.initialise();
+    _connectivity.myStream.listen((source) {
+      setState(() => _source = source);
+    });
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
       var provider = Provider.of<Addpaymentprovider>(context, listen: false);
       if (provider.dateNow == null) {
@@ -56,6 +63,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
   @override
   void dispose() {
     focusNodes.map((e)=>e.dispose());
+    _connectivity.disposeStream();
     super.dispose();
   }
 
@@ -66,7 +74,18 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<Addpaymentprovider>(
+    switch (_source.keys.toList()[0]) {
+      case ConnectivityResult.mobile:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.wifi:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.none:
+      default:
+        connection = 'Offline';
+    }
+    return connection=="Online"?  Consumer<Addpaymentprovider>(
       builder: (context, provider, child) {
         return WillPopScope(
           child: SafeArea(
@@ -722,7 +741,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
           },
         );
       },
-    );
+    ):NoNetwork(context);
   }
 
   Future<void> _showAttachmentSheet(BuildContext context) {

lib/screens/order/addTpcAgent.dart

@@ -10,6 +10,9 @@ import '../../Utils/app_colors.dart';
 import '../../Utils/commonWidgets.dart';
 import '../../Utils/dropdownTheme.dart';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:generp/Utils/commonServices.dart';
+
 class AddtpcagentScreen extends StatefulWidget {
   const AddtpcagentScreen({super.key});
 
@@ -20,19 +23,43 @@ class AddtpcagentScreen extends StatefulWidget {
 class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
   Dropdowntheme ddtheme = Dropdowntheme();
   List<FocusNode> focusNodes = List.generate(10, (index) => FocusNode());
+  Map _source = {ConnectivityResult.mobile: true};
+  final MyConnectivity _connectivity = MyConnectivity.instance;
 
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
+    _connectivity.initialise();
+    _connectivity.myStream.listen((source) {
+      setState(() => _source = source);
+    });
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
       var provider = Provider.of<Tpcagentsprovider>(context, listen: false);
     });
   }
 
+  @override
+  void dispose() {
+    // TODO: implement dispose
+    super.dispose();
+    _connectivity.disposeStream();
+  }
+
   @override
   Widget build(BuildContext context) {
-    return Consumer<Tpcagentsprovider>(
+    switch (_source.keys.toList()[0]) {
+      case ConnectivityResult.mobile:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.wifi:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.none:
+      default:
+        connection = 'Offline';
+    }
+    return connection=="Online"?  Consumer<Tpcagentsprovider>(
       builder: (context, provider, child) {
         return WillPopScope(
           child: SafeArea(
@@ -290,7 +317,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
           },
         );
       },
-    );
+    ):NoNetwork(context);
   }
 
   Future<void> _showAttachmentSheet(BuildContext context) {

lib/screens/order/orderModuleDashboard.dart

 import 'dart:io';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
@@ -7,6 +8,7 @@ import 'package:generp/screens/screensExports.dart';
 import 'package:provider/provider.dart';
 import '../../Notifiers/ordersProvider/pagesDashboardProvider.dart';
 import '../../Utils/app_colors.dart';
+import '../../Utils/commonServices.dart';
 import '../../Utils/commonWidgets.dart';
 import 'addTpcAgent.dart';
 
@@ -18,10 +20,20 @@ class Ordermoduledashboard extends StatefulWidget {
 }
 
 class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
+
+  Map _source = {ConnectivityResult.mobile: true};
+  final MyConnectivity _connectivity = MyConnectivity.instance;
+
+
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
+    _connectivity.initialise();
+    _connectivity.myStream.listen((source) {
+
+      setState(() => _source = source);
+    });
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
       var provider = Provider.of<Pagesdashboardprovider>(
         context,
@@ -31,15 +43,31 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
       provider.ordersAccessiblePagesAPIFunction(context);
     });
   }
-
+@override
+  void dispose() {
+    // TODO: implement dispose
+    super.dispose();
+    _connectivity.disposeStream();
+  }
   @override
   Widget build(BuildContext context) {
-    return Platform.isAndroid
+    switch (_source.keys.toList()[0]) {
+      case ConnectivityResult.mobile:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.wifi:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.none:
+      default:
+        connection = 'Offline';
+    }
+    return (connection == 'Online')? Platform.isAndroid
         ? WillPopScope(
           onWillPop: () => onBackPressed(context),
           child: SafeArea(top: false, bottom: true, child: _scaffold(context)),
         )
-        : _scaffold(context);
+        : _scaffold(context):NoNetwork(context);
   }
 
   Widget _scaffold(BuildContext context) {

lib/screens/order/paymentDetailsByMode.dart

@@ -12,6 +12,8 @@ import '../finance/FileViewer.dart';
 import 'editPaymentDetailsByMode.dart';
 import 'ordersDetailsByModes.dart';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:generp/Utils/commonServices.dart';
 class Paymentdetailsbymode extends StatefulWidget {
   final pageTitleName;
   final paymentId;
@@ -29,10 +31,17 @@ class Paymentdetailsbymode extends StatefulWidget {
 }
 
 class _PaymentdetailsbymodeState extends State<Paymentdetailsbymode> {
+  Map _source = {ConnectivityResult.mobile: true};
+  final MyConnectivity _connectivity = MyConnectivity.instance;
+
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
+    _connectivity.initialise();
+    _connectivity.myStream.listen((source) {
+      setState(() => _source = source);
+    });
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
       var provider = Provider.of<Paymentsprovider>(context, listen: false);
       provider.paymentsDetailsByModeAPIFunction(
@@ -43,9 +52,28 @@ class _PaymentdetailsbymodeState extends State<Paymentdetailsbymode> {
     });
   }
 
+  @override
+  void dispose() {
+    // TODO: implement dispose
+    super.dispose();
+    _connectivity.disposeStream();
+  }
+
   @override
   Widget build(BuildContext context) {
-    return Consumer<Paymentsprovider>(
+    switch (_source.keys.toList()[0]) {
+      case ConnectivityResult.mobile:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.wifi:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.none:
+      default:
+        connection = 'Offline';
+    }
+    return connection=="Online"?
+    Consumer<Paymentsprovider>(
       builder: (context, provider, child) {
         var paymentDetails = provider.paymentDetails;
         var adjustList = provider.paidLists;
@@ -485,7 +513,7 @@ class _PaymentdetailsbymodeState extends State<Paymentdetailsbymode> {
           },
         );
       },
-    );
+    ):NoNetwork(context);
   }
 
 

lib/screens/order/paymentListsByMode.dart

@@ -12,6 +12,8 @@ import '../../Utils/app_colors.dart';
 import '../../Utils/commonWidgets.dart';
 import '../../Utils/dropdownTheme.dart';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:generp/Utils/commonServices.dart';
 class Paymentlistsbymode extends StatefulWidget {
   final mode;
   final pageTitleName;
@@ -25,10 +27,17 @@ class Paymentlistsbymode extends StatefulWidget {
 
 class _PaymentlistsbymodeState extends State<Paymentlistsbymode> {
   Dropdowntheme ddtheme = Dropdowntheme();
+  Map _source = {ConnectivityResult.mobile: true};
+  final MyConnectivity _connectivity = MyConnectivity.instance;
+
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
+    _connectivity.initialise();
+    _connectivity.myStream.listen((source) {
+      setState(() => _source = source);
+    });
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
       var provider = Provider.of<Paymentsprovider>(
         context,
@@ -39,10 +48,27 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> {
     });
   }
 
-
+@override
+  void dispose() {
+    // TODO: implement dispose
+    super.dispose();
+    _connectivity.disposeStream();
+  }
   @override
   Widget build(BuildContext context) {
-    return Consumer<Paymentsprovider>(
+    switch (_source.keys.toList()[0]) {
+      case ConnectivityResult.mobile:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.wifi:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.none:
+      default:
+        connection = 'Offline';
+    }
+    return connection=="Online"?
+    Consumer<Paymentsprovider>(
       builder: (context, provider, child) {
         final paymentLists = provider.paymentsList;
         return WillPopScope(
@@ -296,7 +322,7 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> {
           ),
         );
       },
-    );
+    ):NoNetwork(context);
   }
 
   Future<void> _showOptionsSheet(BuildContext context) {

lib/screens/order/tpcAgentDetailsByMode.dart

@@ -10,6 +10,8 @@ import '../../Utils/commonWidgets.dart';
 import '../finance/FileViewer.dart';
 import 'ordersDetailsByModes.dart';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:generp/Utils/commonServices.dart';
 class Tpcagentdetailsbymode extends StatefulWidget {
   final tpcAgentId;
   final pageTitleName;
@@ -21,10 +23,18 @@ class Tpcagentdetailsbymode extends StatefulWidget {
 }
 
 class _TpcagentdetailsbymodeState extends State<Tpcagentdetailsbymode> {
+  Map _source = {ConnectivityResult.mobile: true};
+  final MyConnectivity _connectivity = MyConnectivity.instance;
+
+
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
+    _connectivity.initialise();
+    _connectivity.myStream.listen((source) {
+      setState(() => _source = source);
+    });
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
       var provider = Provider.of<Tpcagentsprovider>(
         context,
@@ -35,10 +45,28 @@ class _TpcagentdetailsbymodeState extends State<Tpcagentdetailsbymode> {
     });
   }
 
+  @override
+  void dispose() {
+    // TODO: implement dispose
+    super.dispose();
+    _connectivity.disposeStream();
+  }
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<Tpcagentsprovider>(
+    switch (_source.keys.toList()[0]) {
+      case ConnectivityResult.mobile:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.wifi:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.none:
+      default:
+        connection = 'Offline';
+    }
+    return connection=="Online"?
+    Consumer<Tpcagentsprovider>(
       builder: (context, provider, child) {
         var tpcAgentDetails = provider.TPCAgentsDetails;
         var tpcReqAmt = provider.TPCRequestedAmounts;
@@ -303,7 +331,8 @@ class _TpcagentdetailsbymodeState extends State<Tpcagentdetailsbymode> {
           },
         );
       },
-    );
+    ):
+    NoNetwork(context);
   }
 
 

lib/screens/order/tpcAgentListByMode.dart

@@ -10,6 +10,8 @@ import 'package:provider/provider.dart';
 import '../../Utils/app_colors.dart';
 import '../../Utils/commonWidgets.dart';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:generp/Utils/commonServices.dart';
 class Tpcagentlistbymode extends StatefulWidget {
   final pageTitleName;
   final mode;
@@ -22,10 +24,17 @@ class Tpcagentlistbymode extends StatefulWidget {
 }
 
 class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> {
+  Map _source = {ConnectivityResult.mobile: true};
+  final MyConnectivity _connectivity = MyConnectivity.instance;
+
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
+    _connectivity.initialise();
+    _connectivity.myStream.listen((source) {
+      setState(() => _source = source);
+    });
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
       var provider = Provider.of<Tpcagentsprovider>(
         context,
@@ -36,10 +45,30 @@ class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> {
     });
   }
 
+  @override
+  void dispose() {
+    // TODO: implement dispose
+    super.dispose();
+    _connectivity.disposeStream();
+  }
+
+
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<Tpcagentsprovider>(
+    switch (_source.keys.toList()[0]) {
+      case ConnectivityResult.mobile:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.wifi:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.none:
+      default:
+        connection = 'Offline';
+    }
+    return connection=="Online"?
+    Consumer<Tpcagentsprovider>(
       builder: (context, provider, child) {
         final tpcAgentsLists = provider.tpcAgentsList;
         return WillPopScope(
@@ -297,6 +326,6 @@ class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> {
           ),
         );
       },
-    );
+    ):NoNetwork(context);
   }
 }

lib/screens/serviceEngineer/PaymentDetails.dart

@@ -171,6 +171,7 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                                         // To disable selecting this item
                                         child: InkWell(
                                           onTap: () {
+                                            Navigator.pop(context);
                                             _addContactSheet(context);
                                           },
                                           child: Container(
@@ -242,6 +243,7 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                               ],
                             ),
                           ),
+                          errorWidget(context, provider.selectContactError),
                           SizedBox(height: 10),
                           Padding(
                             padding: const EdgeInsets.only(bottom: 5.0),
@@ -313,6 +315,7 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                               ],
                             ),
                           ),
+                          errorWidget(context, provider.selectPaymentError),
                           SizedBox(height: 10),
                           Padding(
                             padding: const EdgeInsets.only(bottom: 5.0),
@@ -335,7 +338,11 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                               ),
                               child: TextFormField(
                                 controller: provider.Amountcontroller,
-                                keyboardType: TextInputType.text,
+                                onChanged: (value) {
+                                  provider.selectAmountError = null;
+                                },
+                                keyboardType: TextInputType.numberWithOptions(),
+                                textInputAction: TextInputAction.next,
                                 decoration: InputDecoration(
                                   hintText: "Enter Amount",
                                   hintStyle: TextStyle(
@@ -350,6 +357,7 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                               ),
                             ),
                           ),
+                          errorWidget(context, provider.selectAmountError),
                           SizedBox(height: 10),
                           Padding(
                             padding: const EdgeInsets.only(bottom: 5.0),
@@ -373,6 +381,9 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                               child: TextFormField(
                                 controller: provider.Referencecontroller,
                                 keyboardType: TextInputType.text,
+                                onChanged: (value) {
+                                  provider.ReferenceError = null;
+                                },
                                 decoration: InputDecoration(
                                   hintText: "Enter Reference Number",
                                   hintStyle: TextStyle(
@@ -387,6 +398,7 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                               ),
                             ),
                           ),
+                          errorWidget(context, provider.ReferenceError),
                           SizedBox(height: 10),
                           InkResponse(
                             onTap: () {
@@ -425,30 +437,38 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                                 mainAxisAlignment:
                                     MainAxisAlignment.spaceBetween,
                                 children: [
-                                  Text(
-                                    "${provider.imagePath}",
-                                    style: TextStyle(
-                                      color: AppColors.semi_black,
-                                      fontSize: 11,
-                                      fontWeight: FontWeight.w600,
+                                  Expanded(
+                                    flex: 5 ,
+                                    child: Text(
+                                      "${provider.imagePath}",
+                                      style: TextStyle(
+                                        color: AppColors.semi_black,
+                                        fontSize: 11,
+                                        fontWeight: FontWeight.w600,
+                                      ),
                                     ),
                                   ),
-                                  InkResponse(
-                                    onTap: () {
-                                      provider.imagePicked = 0;
-                                      provider.imagePath = null;
-                                      provider.imageFilePath = null;
-                                    },
-                                    child: SvgPicture.asset(
-                                      "assets/svg/ic_close.svg",
-                                      width: 15,
-                                      height: 15,
+                                  Expanded(
+                                    flex: 1,
+                                    child: InkResponse(
+                                      onTap: () {
+                                        provider.imagePicked = 0;
+                                        provider.imagePath = null;
+                                        provider.imageFilePath = null;
+                                      },
+                                      child: SvgPicture.asset(
+                                        "assets/svg/ic_close.svg",
+                                        width: 15,
+                                        height: 15,
+                                      ),
                                     ),
                                   ),
                                 ],
                               ),
                             ),
                           ],
+                          errorWidget(context, provider.imageError),
+
                         ],
                       ),
                     ),
@@ -458,29 +478,13 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                     FloatingActionButtonLocation.centerFloat,
                 floatingActionButton: InkWell(
                   onTap: () {
-                    print("clickedw");
-                    if (provider.contactID == null) {
-                      toast(context, "Please Select Contact");
-                      return;
-                    }
-                    if (provider.paymentModeID == null) {
-                      toast(context, "Please Select Payment Type");
-                      return;
-                    }
-                    if (provider.image_picked == 0) {
-                      toast(context, "Please add attachment");
-                      return;
-                    }
+
                     provider.PaymentUpdateAPI(
                       context,
                       provider.Referencecontroller.text,
                       provider.Amountcontroller.text,
                     );
-                    Future.delayed(Duration(microseconds: 200), () {
-                      if (provider.CollectionId != 0) {
-                        showOTPSheetSheet(context);
-                      }
-                    });
+
                   },
                   child: Container(
                     alignment: Alignment.center,
@@ -849,6 +853,14 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                     provider.telController,
                     provider.emailController,
                   ];
+                  final Errors = [
+                    provider.nameError,
+                    provider.designationError,
+                    provider.mobError,
+                    provider.altMobError,
+                    provider.telError,
+                    provider.emailError,
+                  ];
                   return Padding(
                     padding: EdgeInsets.only(
                       bottom:
@@ -904,7 +916,9 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                                       child: TextFormField(
                                         controller: controllers[index],
                                         focusNode: focusNodes[index],
-
+                                        onChanged: (value) {
+                                          Errors[index] = null;
+                                        },
                                         maxLength:
                                             [
                                                   "Mobile Number",
@@ -915,6 +929,7 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                                                 ? 10
                                                 : 998895646546561356,
                                         maxLines: 1,
+
                                         keyboardType:
                                             [
                                                   "Mobile Number",
@@ -944,6 +959,7 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                                       ),
                                     ),
                                   ),
+                                  errorWidget(context, Errors[index])
                                 ],
                               );
                             }),
@@ -956,12 +972,9 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                                   widget.genId == ""
                                       ? widget.referenceID
                                       : widget.genId,
-                                  provider.nameController.text,
-                                  provider.designationController.text,
-                                  provider.mobController.text,
-                                  provider.altMobController.text,
-                                  provider.telController.text,
-                                  provider.emailController.text,
+                                  widget.accountName,
+                                  widget.referenceID,
+                                  widget.genId,
                                 );
                               },
                               child: Container(

lib/screens/serviceEngineer/serviceEngineerDashboard.dart

 import 'dart:io';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:generp/Notifiers/ServiceEngineerDashboardProvider.dart';
 import 'package:generp/Utils/app_colors.dart';
+import 'package:generp/Utils/commonServices.dart';
 import 'package:generp/Utils/commonWidgets.dart';
 import 'package:provider/provider.dart';
 import 'package:generp/screens/screensExports.dart';
@@ -17,9 +19,17 @@ class Serviceengineerdashboard extends StatefulWidget {
 }
 
 class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> {
+  Map _source = {ConnectivityResult.mobile: true};
+  final MyConnectivity _connectivity = MyConnectivity.instance;
+
+
   @override
   void initState() {
     super.initState();
+    _connectivity.initialise();
+    _connectivity.myStream.listen((source) {
+      setState(() => _source = source);
+    });
     WidgetsBinding.instance.addPostFrameCallback((_) {
       var serviceProvider = Provider.of<Serviceengineerdashboardprovider>(
         context,
@@ -28,15 +38,32 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> {
       serviceProvider.LoadTechnicianDashboard(context);
     });
   }
+  @override
+  void dispose() {
+    // TODO: implement dispose
+    super.dispose();
+    _connectivity.disposeStream();
+  }
 
   @override
   Widget build(BuildContext context) {
-    return Platform.isAndroid
+    switch (_source.keys.toList()[0]) {
+      case ConnectivityResult.mobile:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.wifi:
+        connection = 'Online';
+        break;
+      case ConnectivityResult.none:
+      default:
+        connection = 'Offline';
+    }
+    return (connection=="Online")? Platform.isAndroid
         ? WillPopScope(
           onWillPop: () => onBackPressed(context),
           child: SafeArea(top: false, bottom: true, child: _scaffold(context)),
         )
-        : _scaffold(context);
+        : _scaffold(context):NoNetwork(context);
   }
 
   Widget _scaffold(BuildContext context) {