Skip to content

GitLab

Commit ee178d55 authored by Sai Srinivas's avatar Sai Srinivas
Browse files

09-07-2025 By Sai Srinivas 

Network and Finance Module issue and Back
parent 2ade5aad
Expand all Show whitespace changes
Inline Side-by-side
lib/screens/finance/submitPaymentRequestionListsByMode.dart
View file @ ee178d55
import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
......@@ -13,6 +14,7 @@ import 'package:get/utils.dart';
import 'package:provider/provider.dart';
import '../../Models/financeModels/addPaymentRequestionResponse.dart';
import '../../Utils/commonServices.dart';
class Submitpaymentrequestionlistsbymode extends StatefulWidget {
final String mode;
......@@ -33,14 +35,22 @@ class Submitpaymentrequestionlistsbymode extends StatefulWidget {
class _SubmitpaymentrequestionlistsbymodeState
extends State<Submitpaymentrequestionlistsbymode> {
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
Dropdowntheme ddtheme = Dropdowntheme();
List<FocusNode> focusNodes = List.generate(11, (index) => FocusNode());
GlobalKey _globalKey = GlobalKey();
ScrollController scrollcontroller = ScrollController();
@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<Requestionlistprovider>(
context,
......@@ -77,6 +87,7 @@ class _SubmitpaymentrequestionlistsbymodeState
void dispose() {
scrollcontroller.dispose();
focusNodes.map((e) => e.dispose());
_connectivity.disposeStream();
super.dispose();
}
......@@ -101,7 +112,19 @@ class _SubmitpaymentrequestionlistsbymodeState
@override
Widget build(BuildContext context) {
return Consumer<Requestionlistprovider>(
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<Requestionlistprovider>(
builder: (context, provider, child) {
return WillPopScope(
child: SafeArea(
......@@ -143,14 +166,16 @@ class _SubmitpaymentrequestionlistsbymodeState
items:
provider.accounts
.map(
(accs) => DropdownMenuItem<Accounts>(
(accs) =>
DropdownMenuItem<Accounts>(
value: accs,
child: Text(
"${accs.name}",
style: const TextStyle(
fontSize: 14,
),
overflow: TextOverflow.ellipsis,
overflow:
TextOverflow.ellipsis,
),
),
)
......@@ -162,12 +187,16 @@ class _SubmitpaymentrequestionlistsbymodeState
? null
: (Accounts? value) {
if (value != null) {
if (provider.accounts.isNotEmpty) {
provider.selectedAccount = value;
if (provider
.accounts
.isNotEmpty) {
provider.selectedAccount =
value;
print(
"Selected Complaint Type: ${value.name}, ID: ${value.id}",
);
provider.accountId = value.id!;
provider.accountId =
value.id!;
print(
"hfjkshfg" +
provider.accountId
......@@ -199,9 +228,8 @@ class _SubmitpaymentrequestionlistsbymodeState
),
hintText: 'Search account...',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(
8,
),
borderRadius:
BorderRadius.circular(8),
),
),
),
......@@ -219,13 +247,16 @@ class _SubmitpaymentrequestionlistsbymodeState
),
onMenuStateChange: (isOpen) {
if (!isOpen) {
provider.accountSearchController.clear();
provider.accountSearchController
.clear();
}
},
buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: ddtheme.menuItemStyleData,
dropdownStyleData: ddtheme.dropdownStyleData,
menuItemStyleData:
ddtheme.menuItemStyleData,
dropdownStyleData:
ddtheme.dropdownStyleData,
),
),
if (widget.mode == "other") ...[
......@@ -266,7 +297,9 @@ class _SubmitpaymentrequestionlistsbymodeState
padding: EdgeInsets.all(8),
decoration: BoxDecoration(
color: AppColors.app_blue,
borderRadius: BorderRadius.circular(8),
borderRadius: BorderRadius.circular(
8,
),
),
child: SvgPicture.asset(
"assets/svg/add_account.svg",
......@@ -297,14 +330,17 @@ class _SubmitpaymentrequestionlistsbymodeState
items:
provider.requestingPurposes
.map(
(accs) => DropdownMenuItem<String>(
(accs) =>
DropdownMenuItem<String>(
value: accs,
child: Text(
accs ?? '',
style: const TextStyle(
fontSize: 14,
),
overflow: TextOverflow.ellipsis,
overflow:
TextOverflow
.ellipsis,
),
),
)
......@@ -327,8 +363,10 @@ class _SubmitpaymentrequestionlistsbymodeState
},
buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: ddtheme.menuItemStyleData,
dropdownStyleData: ddtheme.dropdownStyleData,
menuItemStyleData:
ddtheme.menuItemStyleData,
dropdownStyleData:
ddtheme.dropdownStyleData,
),
),
],
......@@ -396,8 +434,9 @@ class _SubmitpaymentrequestionlistsbymodeState
items:
provider.paymentModes
.map(
(paymenents) =>
DropdownMenuItem<PaymentModes>(
(paymenents) => DropdownMenuItem<
PaymentModes
>(
value: paymenents,
child: Text(
paymenents.name ?? '',
......@@ -419,17 +458,21 @@ class _SubmitpaymentrequestionlistsbymodeState
"Selected Complaint Type: ${value.name}, ID: ${value.id}",
);
provider.paymentModeId = value.id!;
provider.paymentModeValue = value.name!;
provider.paymentModeValue =
value.name!;
print(
"hfjkshfg" +
provider.paymentModeId.toString(),
provider.paymentModeId
.toString(),
);
if ([
"Cheque",
"RTGS",
"IMPS",
"NEFT",
].contains(provider.paymentModeValue)) {
].contains(
provider.paymentModeValue,
)) {
WidgetsBinding.instance
.addPostFrameCallback((_) {
final context =
......@@ -450,8 +493,10 @@ class _SubmitpaymentrequestionlistsbymodeState
},
buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: ddtheme.menuItemStyleData,
dropdownStyleData: ddtheme.dropdownStyleData,
menuItemStyleData:
ddtheme.menuItemStyleData,
dropdownStyleData:
ddtheme.dropdownStyleData,
),
),
],
......@@ -484,7 +529,8 @@ class _SubmitpaymentrequestionlistsbymodeState
fontSize: 14,
),
overflow:
TextOverflow.ellipsis,
TextOverflow
.ellipsis,
),
),
)
......@@ -506,15 +552,18 @@ class _SubmitpaymentrequestionlistsbymodeState
value.name!;
print(
"hfjkshfg" +
provider.paymentModeId.toString(),
provider.paymentModeId
.toString(),
);
}
}
},
buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: ddtheme.menuItemStyleData,
dropdownStyleData: ddtheme.dropdownStyleData,
menuItemStyleData:
ddtheme.menuItemStyleData,
dropdownStyleData:
ddtheme.dropdownStyleData,
),
),
],
......@@ -553,9 +602,12 @@ class _SubmitpaymentrequestionlistsbymodeState
if (provider.imagePicked == 1 &&
provider.imagePath != null) ...[
Padding(
padding: const EdgeInsets.symmetric(vertical: 4.0),
padding: const EdgeInsets.symmetric(
vertical: 4.0,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Expanded(
flex: 4,
......@@ -715,8 +767,14 @@ class _SubmitpaymentrequestionlistsbymodeState
child: Container(
height: 45,
alignment: Alignment.center,
margin: EdgeInsets.symmetric(horizontal: 10, vertical: 10),
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5),
margin: EdgeInsets.symmetric(
horizontal: 10,
vertical: 10,
),
padding: EdgeInsets.symmetric(
horizontal: 10,
vertical: 5,
),
decoration: BoxDecoration(
color: AppColors.app_blue,
borderRadius: BorderRadius.circular(15),
......@@ -724,7 +782,9 @@ class _SubmitpaymentrequestionlistsbymodeState
child:
provider.submitClicked
? CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation(AppColors.white),
valueColor: AlwaysStoppedAnimation(
AppColors.white,
),
)
: Text(
"Submit",
......@@ -744,7 +804,8 @@ class _SubmitpaymentrequestionlistsbymodeState
},
);
},
);
)
: NoNetwork(context);
}
Future<void> _showAttachmentSheet(BuildContext context) {
......
lib/screens/genTracker/ComplaintHistory.dart
View file @ ee178d55
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
View file @ ee178d55
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
View file @ ee178d55
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
View file @ ee178d55
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
View file @ ee178d55
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
View file @ ee178d55
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
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)),
child: SafeArea(
top: false,
bottom: true,
child: _scaffold(context),
),
)
: _scaffold(context);
: _scaffold(context)
: NoNetwork(context);
}
Widget _scaffold(BuildContext context) {
......
lib/screens/order/addOrder.dart
View file @ ee178d55
This diff is collapsed.
lib/screens/order/addPayment.dart
View file @ ee178d55
......@@ -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
View file @ ee178d55
......@@ -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
View file @ ee178d55
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/ordersDetailsByModes.dart
View file @ ee178d55
This diff is collapsed.
lib/screens/order/ordersListByModes.dart
View file @ ee178d55
......@@ -13,6 +13,9 @@ import '../../Utils/commonWidgets.dart';
import '../../Utils/dropdownTheme.dart';
import '../commonDateRangeFilter.dart';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:generp/Utils/commonServices.dart';
class OrderslistbyModes extends StatefulWidget {
final mode;
final pageTitleName;
......@@ -29,11 +32,17 @@ class OrderslistbyModes extends StatefulWidget {
class _OrderslistbyModesState extends State<OrderslistbyModes> {
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<Pagesdashboardprovider>(
context,
......@@ -44,9 +53,28 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
});
}
@override
void dispose() {
// TODO: implement dispose
super.dispose();
_connectivity.disposeStream();
}
@override
Widget build(BuildContext context) {
return Consumer<Pagesdashboardprovider>(
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<Pagesdashboardprovider>(
builder: (context, provider, child) {
final ordersList = provider.ordersList;
return WillPopScope(
......@@ -56,7 +84,7 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
bottom: Platform.isIOS ? false : true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -71,7 +99,6 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
// },
// child: SvgPicture.asset("assets/svg/ic_download.svg"),
// ),
InkResponse(
onTap: () async {
_showFilterSheet(context);
......@@ -110,7 +137,8 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
),
);
}
if(ordersList[index].orderNumber=="GP20252605448")
if (ordersList[index].orderNumber ==
"GP20252605448")
return Container(
padding: EdgeInsets.symmetric(
horizontal: 10,
......@@ -122,7 +150,9 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(16),
borderRadius: BorderRadius.circular(
16,
),
),
child: Column(
children: [
......@@ -133,11 +163,15 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
child: Container(
height: 50,
width: 35,
padding: EdgeInsets.all(8.0),
padding: EdgeInsets.all(
8.0,
),
decoration: BoxDecoration(
color: Color(0xFFFFF3CE),
borderRadius:
BorderRadius.circular(8),
BorderRadius.circular(
8,
),
),
child: SvgPicture.asset(
"assets/svg/fin_ic.svg",
......@@ -150,24 +184,31 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
child: SizedBox(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
CrossAxisAlignment
.start,
children: [
Text(
ordersList[index]
.accountName!,
style: TextStyle(
fontFamily: "JakartaMedium",
fontFamily:
"JakartaMedium",
fontSize: 14,
color: AppColors.semi_black,
color:
AppColors
.semi_black,
),
),
Text(
"₹"
"${ordersList[index].balanceAmount}",
style: TextStyle(
fontFamily: "JakartaMedium",
fontFamily:
"JakartaMedium",
fontSize: 14,
color: AppColors.app_blue,
color:
AppColors
.app_blue,
),
),
],
......@@ -177,23 +218,31 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
Expanded(
flex: 2,
child: Container(
padding: EdgeInsets.symmetric(
padding:
EdgeInsets.symmetric(
horizontal: 5,
vertical: 10,
),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(8),
BorderRadius.circular(
8,
),
color: Color(0xFFE3FFE0),
),
child: Center(
child: Text(
ordersList[index].status!,
textAlign: TextAlign.center,
ordersList[index]
.status!,
textAlign:
TextAlign.center,
style: TextStyle(
fontFamily: "JakartaMedium",
fontFamily:
"JakartaMedium",
fontSize: 14,
color: Color(0xFF0D9C00),
color: Color(
0xFF0D9C00,
),
),
),
),
......@@ -217,8 +266,10 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
final subHeadings = [
ordersList[index].orderNumber,
ordersList[index].enteredEmpName,
ordersList[index].salesPersonEmpName,
ordersList[index]
.enteredEmpName,
ordersList[index]
.salesPersonEmpName,
// ordersList[index].createdDatetime,
ordersList[index].paidAmount,
ordersList[index].balanceAmount,
......@@ -235,9 +286,12 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
child: Text(
headings[j],
style: TextStyle(
fontFamily: "JakartaMedium",
fontFamily:
"JakartaMedium",
fontSize: 14,
color: AppColors.semi_black,
color:
AppColors
.semi_black,
),
),
),
......@@ -247,9 +301,12 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
subHeadings[j]!,
style: TextStyle(
fontSize: 14,
color: Color(0xFF818181),
color: Color(
0xFF818181,
),
decoration:
TextDecoration.none,
TextDecoration
.none,
decorationColor:
AppColors.white,
),
......@@ -266,10 +323,12 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
context,
MaterialPageRoute(
builder:
(context) =>
Ordersdetailsbymodes(
(
context,
) => Ordersdetailsbymodes(
pageTitleName:
widget.pageTitleName,
widget
.pageTitleName,
orderId:
ordersList[index]
.orderId,
......@@ -277,9 +336,19 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
),
),
);
if(res==true){
provider.ordersListByModeFilterAPIFunction(context, widget.mode);
provider.ordersListByModeAPIFunction(context, widget.mode, "", "");
if (res == true) {
provider
.ordersListByModeFilterAPIFunction(
context,
widget.mode,
);
provider
.ordersListByModeAPIFunction(
context,
widget.mode,
"",
"",
);
}
},
child: Container(
......@@ -295,9 +364,11 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
Text(
"View Details",
style: TextStyle(
fontFamily: "JakartaMedium",
fontFamily:
"JakartaMedium",
fontSize: 14,
color: AppColors.app_blue,
color:
AppColors.app_blue,
),
),
SizedBox(width: 5),
......@@ -321,7 +392,8 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
),
);
},
);
)
: NoNetwork(context);
}
Future<void> _showOptionsSheet(BuildContext context) {
......
lib/screens/order/paymentDetailsByMode.dart
View file @ ee178d55
This diff is collapsed.
lib/screens/order/paymentListsByMode.dart
View file @ ee178d55
This diff is collapsed.
lib/screens/order/tpcAgentListByMode.dart
View file @ ee178d55
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment