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 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:dropdown_button2/dropdown_button2.dart'; import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
...@@ -13,6 +14,7 @@ import 'package:get/utils.dart'; ...@@ -13,6 +14,7 @@ import 'package:get/utils.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../Models/financeModels/addPaymentRequestionResponse.dart'; import '../../Models/financeModels/addPaymentRequestionResponse.dart';
import '../../Utils/commonServices.dart';
class Submitpaymentrequestionlistsbymode extends StatefulWidget { class Submitpaymentrequestionlistsbymode extends StatefulWidget {
final String mode; final String mode;
...@@ -33,14 +35,22 @@ class Submitpaymentrequestionlistsbymode extends StatefulWidget { ...@@ -33,14 +35,22 @@ class Submitpaymentrequestionlistsbymode extends StatefulWidget {
class _SubmitpaymentrequestionlistsbymodeState class _SubmitpaymentrequestionlistsbymodeState
extends State<Submitpaymentrequestionlistsbymode> { extends State<Submitpaymentrequestionlistsbymode> {
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
Dropdowntheme ddtheme = Dropdowntheme(); Dropdowntheme ddtheme = Dropdowntheme();
List<FocusNode> focusNodes = List.generate(11, (index) => FocusNode()); List<FocusNode> focusNodes = List.generate(11, (index) => FocusNode());
GlobalKey _globalKey = GlobalKey(); GlobalKey _globalKey = GlobalKey();
ScrollController scrollcontroller = ScrollController(); ScrollController scrollcontroller = ScrollController();
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
super.initState(); super.initState();
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
var provider = Provider.of<Requestionlistprovider>( var provider = Provider.of<Requestionlistprovider>(
context, context,
...@@ -77,6 +87,7 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -77,6 +87,7 @@ class _SubmitpaymentrequestionlistsbymodeState
void dispose() { void dispose() {
scrollcontroller.dispose(); scrollcontroller.dispose();
focusNodes.map((e) => e.dispose()); focusNodes.map((e) => e.dispose());
_connectivity.disposeStream();
super.dispose(); super.dispose();
} }
...@@ -101,7 +112,19 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -101,7 +112,19 @@ class _SubmitpaymentrequestionlistsbymodeState
@override @override
Widget build(BuildContext context) { 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) { builder: (context, provider, child) {
return WillPopScope( return WillPopScope(
child: SafeArea( child: SafeArea(
...@@ -143,14 +166,16 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -143,14 +166,16 @@ class _SubmitpaymentrequestionlistsbymodeState
items: items:
provider.accounts provider.accounts
.map( .map(
(accs) => DropdownMenuItem<Accounts>( (accs) =>
DropdownMenuItem<Accounts>(
value: accs, value: accs,
child: Text( child: Text(
"${accs.name}", "${accs.name}",
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
overflow: TextOverflow.ellipsis, overflow:
TextOverflow.ellipsis,
), ),
), ),
) )
...@@ -162,12 +187,16 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -162,12 +187,16 @@ class _SubmitpaymentrequestionlistsbymodeState
? null ? null
: (Accounts? value) { : (Accounts? value) {
if (value != null) { if (value != null) {
if (provider.accounts.isNotEmpty) { if (provider
provider.selectedAccount = value; .accounts
.isNotEmpty) {
provider.selectedAccount =
value;
print( print(
"Selected Complaint Type: ${value.name}, ID: ${value.id}", "Selected Complaint Type: ${value.name}, ID: ${value.id}",
); );
provider.accountId = value.id!; provider.accountId =
value.id!;
print( print(
"hfjkshfg" + "hfjkshfg" +
provider.accountId provider.accountId
...@@ -199,9 +228,8 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -199,9 +228,8 @@ class _SubmitpaymentrequestionlistsbymodeState
), ),
hintText: 'Search account...', hintText: 'Search account...',
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: BorderRadius.circular( borderRadius:
8, BorderRadius.circular(8),
),
), ),
), ),
), ),
...@@ -219,13 +247,16 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -219,13 +247,16 @@ class _SubmitpaymentrequestionlistsbymodeState
), ),
onMenuStateChange: (isOpen) { onMenuStateChange: (isOpen) {
if (!isOpen) { if (!isOpen) {
provider.accountSearchController.clear(); provider.accountSearchController
.clear();
} }
}, },
buttonStyleData: ddtheme.buttonStyleData, buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: ddtheme.menuItemStyleData, menuItemStyleData:
dropdownStyleData: ddtheme.dropdownStyleData, ddtheme.menuItemStyleData,
dropdownStyleData:
ddtheme.dropdownStyleData,
), ),
), ),
if (widget.mode == "other") ...[ if (widget.mode == "other") ...[
...@@ -266,7 +297,9 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -266,7 +297,9 @@ class _SubmitpaymentrequestionlistsbymodeState
padding: EdgeInsets.all(8), padding: EdgeInsets.all(8),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.app_blue, color: AppColors.app_blue,
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(
8,
),
), ),
child: SvgPicture.asset( child: SvgPicture.asset(
"assets/svg/add_account.svg", "assets/svg/add_account.svg",
...@@ -297,14 +330,17 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -297,14 +330,17 @@ class _SubmitpaymentrequestionlistsbymodeState
items: items:
provider.requestingPurposes provider.requestingPurposes
.map( .map(
(accs) => DropdownMenuItem<String>( (accs) =>
DropdownMenuItem<String>(
value: accs, value: accs,
child: Text( child: Text(
accs ?? '', accs ?? '',
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
overflow: TextOverflow.ellipsis, overflow:
TextOverflow
.ellipsis,
), ),
), ),
) )
...@@ -327,8 +363,10 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -327,8 +363,10 @@ class _SubmitpaymentrequestionlistsbymodeState
}, },
buttonStyleData: ddtheme.buttonStyleData, buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: ddtheme.menuItemStyleData, menuItemStyleData:
dropdownStyleData: ddtheme.dropdownStyleData, ddtheme.menuItemStyleData,
dropdownStyleData:
ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -396,8 +434,9 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -396,8 +434,9 @@ class _SubmitpaymentrequestionlistsbymodeState
items: items:
provider.paymentModes provider.paymentModes
.map( .map(
(paymenents) => (paymenents) => DropdownMenuItem<
DropdownMenuItem<PaymentModes>( PaymentModes
>(
value: paymenents, value: paymenents,
child: Text( child: Text(
paymenents.name ?? '', paymenents.name ?? '',
...@@ -419,17 +458,21 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -419,17 +458,21 @@ class _SubmitpaymentrequestionlistsbymodeState
"Selected Complaint Type: ${value.name}, ID: ${value.id}", "Selected Complaint Type: ${value.name}, ID: ${value.id}",
); );
provider.paymentModeId = value.id!; provider.paymentModeId = value.id!;
provider.paymentModeValue = value.name!; provider.paymentModeValue =
value.name!;
print( print(
"hfjkshfg" + "hfjkshfg" +
provider.paymentModeId.toString(), provider.paymentModeId
.toString(),
); );
if ([ if ([
"Cheque", "Cheque",
"RTGS", "RTGS",
"IMPS", "IMPS",
"NEFT", "NEFT",
].contains(provider.paymentModeValue)) { ].contains(
provider.paymentModeValue,
)) {
WidgetsBinding.instance WidgetsBinding.instance
.addPostFrameCallback((_) { .addPostFrameCallback((_) {
final context = final context =
...@@ -450,8 +493,10 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -450,8 +493,10 @@ class _SubmitpaymentrequestionlistsbymodeState
}, },
buttonStyleData: ddtheme.buttonStyleData, buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: ddtheme.menuItemStyleData, menuItemStyleData:
dropdownStyleData: ddtheme.dropdownStyleData, ddtheme.menuItemStyleData,
dropdownStyleData:
ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -484,7 +529,8 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -484,7 +529,8 @@ class _SubmitpaymentrequestionlistsbymodeState
fontSize: 14, fontSize: 14,
), ),
overflow: overflow:
TextOverflow.ellipsis, TextOverflow
.ellipsis,
), ),
), ),
) )
...@@ -506,15 +552,18 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -506,15 +552,18 @@ class _SubmitpaymentrequestionlistsbymodeState
value.name!; value.name!;
print( print(
"hfjkshfg" + "hfjkshfg" +
provider.paymentModeId.toString(), provider.paymentModeId
.toString(),
); );
} }
} }
}, },
buttonStyleData: ddtheme.buttonStyleData, buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: ddtheme.menuItemStyleData, menuItemStyleData:
dropdownStyleData: ddtheme.dropdownStyleData, ddtheme.menuItemStyleData,
dropdownStyleData:
ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -553,9 +602,12 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -553,9 +602,12 @@ class _SubmitpaymentrequestionlistsbymodeState
if (provider.imagePicked == 1 && if (provider.imagePicked == 1 &&
provider.imagePath != null) ...[ provider.imagePath != null) ...[
Padding( Padding(
padding: const EdgeInsets.symmetric(vertical: 4.0), padding: const EdgeInsets.symmetric(
vertical: 4.0,
),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [ children: [
Expanded( Expanded(
flex: 4, flex: 4,
...@@ -715,8 +767,14 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -715,8 +767,14 @@ class _SubmitpaymentrequestionlistsbymodeState
child: Container( child: Container(
height: 45, height: 45,
alignment: Alignment.center, alignment: Alignment.center,
margin: EdgeInsets.symmetric(horizontal: 10, vertical: 10), margin: EdgeInsets.symmetric(
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), horizontal: 10,
vertical: 10,
),
padding: EdgeInsets.symmetric(
horizontal: 10,
vertical: 5,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.app_blue, color: AppColors.app_blue,
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
...@@ -724,7 +782,9 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -724,7 +782,9 @@ class _SubmitpaymentrequestionlistsbymodeState
child: child:
provider.submitClicked provider.submitClicked
? CircularProgressIndicator.adaptive( ? CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation(AppColors.white), valueColor: AlwaysStoppedAnimation(
AppColors.white,
),
) )
: Text( : Text(
"Submit", "Submit",
...@@ -744,7 +804,8 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -744,7 +804,8 @@ class _SubmitpaymentrequestionlistsbymodeState
}, },
); );
}, },
); )
: NoNetwork(context);
} }
Future<void> _showAttachmentSheet(BuildContext context) { Future<void> _showAttachmentSheet(BuildContext context) {
......
lib/screens/genTracker/ComplaintHistory.dart
View file @ ee178d55
import 'dart:io'; import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:generp/Utils/commonServices.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../Notifiers/GeneratorDetailsProvider.dart'; import '../../Notifiers/GeneratorDetailsProvider.dart';
...@@ -18,10 +20,18 @@ class Complainthistory extends StatefulWidget { ...@@ -18,10 +20,18 @@ class Complainthistory extends StatefulWidget {
} }
class _ComplainthistoryState extends State<Complainthistory> { class _ComplainthistoryState extends State<Complainthistory> {
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
super.initState(); super.initState();
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
var details = Provider.of<Generatordetailsprovider>( var details = Provider.of<Generatordetailsprovider>(
context, context,
...@@ -38,10 +48,27 @@ class _ComplainthistoryState extends State<Complainthistory> { ...@@ -38,10 +48,27 @@ class _ComplainthistoryState extends State<Complainthistory> {
); );
}); });
} }
@override
void dispose() {
// TODO: implement dispose
super.dispose();
_connectivity.disposeStream();
}
@override @override
Widget build(BuildContext context) { 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) { builder: (context, provider, child) {
return WillPopScope( return WillPopScope(
onWillPop: () => onBackPressed(context), onWillPop: () => onBackPressed(context),
...@@ -153,6 +180,6 @@ class _ComplainthistoryState extends State<Complainthistory> { ...@@ -153,6 +180,6 @@ class _ComplainthistoryState extends State<Complainthistory> {
), ),
); );
}, },
); ):NoNetwork(context);
} }
} }
lib/screens/genTracker/GenTrackerDashboard.dart
View file @ ee178d55
import 'dart:io'; import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Utils/commonWidgets.dart'; import 'package:generp/Utils/commonWidgets.dart';
import 'package:generp/screens/genTracker/ScanEnterGeneratorIDScreen.dart'; import 'package:generp/screens/genTracker/ScanEnterGeneratorIDScreen.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
import '../../Utils/commonServices.dart';
class Gentrackerdashboard extends StatefulWidget { class Gentrackerdashboard extends StatefulWidget {
const Gentrackerdashboard({super.key}); const Gentrackerdashboard({super.key});
...@@ -15,14 +17,45 @@ class Gentrackerdashboard extends StatefulWidget { ...@@ -15,14 +17,45 @@ class Gentrackerdashboard extends StatefulWidget {
} }
class _GentrackerdashboardState extends State<Gentrackerdashboard> { 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 @override
Widget build(BuildContext context) { 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( ? WillPopScope(
onWillPop: () => onBackPressed(context), 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) { Widget _scaffold(BuildContext context) {
......
lib/screens/genTracker/GeneratorDetails.dart
View file @ ee178d55
import 'dart:io'; import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/GeneratorDetailsProvider.dart'; import 'package:generp/Notifiers/GeneratorDetailsProvider.dart';
...@@ -9,6 +10,7 @@ import 'package:url_launcher/url_launcher.dart'; ...@@ -9,6 +10,7 @@ import 'package:url_launcher/url_launcher.dart';
import '../../Notifiers/HomeScreenNotifier.dart'; import '../../Notifiers/HomeScreenNotifier.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
import '../../Utils/commonServices.dart';
import '../../Utils/commonWidgets.dart'; import '../../Utils/commonWidgets.dart';
import 'ScanEnterGeneratorIDScreen.dart'; import 'ScanEnterGeneratorIDScreen.dart';
...@@ -29,10 +31,19 @@ class Generatordetails extends StatefulWidget { ...@@ -29,10 +31,19 @@ class Generatordetails extends StatefulWidget {
} }
class _GeneratordetailsState extends State<Generatordetails> { class _GeneratordetailsState extends State<Generatordetails> {
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
super.initState(); super.initState();
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
var details = Provider.of<Generatordetailsprovider>( var details = Provider.of<Generatordetailsprovider>(
context, context,
...@@ -62,9 +73,27 @@ class _GeneratordetailsState extends State<Generatordetails> { ...@@ -62,9 +73,27 @@ class _GeneratordetailsState extends State<Generatordetails> {
}); });
} }
@override
void dispose() {
// TODO: implement dispose
super.dispose();
_connectivity.disposeStream();
}
@override @override
Widget build(BuildContext context) { 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) { builder: (context, provider, Homeprovider, child) {
var sendwidget = SizedBox(width: 0); var sendwidget = SizedBox(width: 0);
return WillPopScope( return WillPopScope(
...@@ -862,7 +891,7 @@ class _GeneratordetailsState extends State<Generatordetails> { ...@@ -862,7 +891,7 @@ class _GeneratordetailsState extends State<Generatordetails> {
), ),
); );
}, },
); ):NoNetwork(context);
} }
} }
......
lib/screens/genTracker/ScanEnterGeneratorIDScreen.dart
View file @ ee178d55
import 'dart:io'; import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:generp/Notifiers/GeneratorDetailsProvider.dart'; import 'package:generp/Notifiers/GeneratorDetailsProvider.dart';
import 'package:generp/Utils/commonServices.dart'; import 'package:generp/Utils/commonServices.dart';
...@@ -24,10 +25,17 @@ class _ScanentergeneratoridscreenState extends State<Scanentergeneratoridscreen> ...@@ -24,10 +25,17 @@ class _ScanentergeneratoridscreenState extends State<Scanentergeneratoridscreen>
TextEditingController genIDcontroller = TextEditingController(); TextEditingController genIDcontroller = TextEditingController();
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
super.initState(); super.initState();
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
var provider = Provider.of<Generatordetailsprovider>( var provider = Provider.of<Generatordetailsprovider>(
context, context,
...@@ -50,6 +58,7 @@ class _ScanentergeneratoridscreenState extends State<Scanentergeneratoridscreen> ...@@ -50,6 +58,7 @@ class _ScanentergeneratoridscreenState extends State<Scanentergeneratoridscreen>
super.dispose(); super.dispose();
genIDcontroller.clear(); genIDcontroller.clear();
genIDcontroller.dispose(); genIDcontroller.dispose();
_connectivity.disposeStream();
} }
...@@ -57,7 +66,18 @@ class _ScanentergeneratoridscreenState extends State<Scanentergeneratoridscreen> ...@@ -57,7 +66,18 @@ class _ScanentergeneratoridscreenState extends State<Scanentergeneratoridscreen>
@override @override
Widget build(BuildContext context) { 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) { builder: (context, provider, child) {
return WillPopScope( return WillPopScope(
onWillPop: () => onBackPressed(context), onWillPop: () => onBackPressed(context),
...@@ -134,7 +154,7 @@ class _ScanentergeneratoridscreenState extends State<Scanentergeneratoridscreen> ...@@ -134,7 +154,7 @@ class _ScanentergeneratoridscreenState extends State<Scanentergeneratoridscreen>
), ),
); );
}, },
); ):NoNetwork(context);
} }
Future<void> _showgenIdBottomSheet(BuildContext context) { Future<void> _showgenIdBottomSheet(BuildContext context) {
......
lib/screens/inventory/GeneratorPartDetailsScreen.dart
View file @ ee178d55
import 'dart:io'; import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:generp/screens/finance/FileViewer.dart'; import 'package:generp/screens/finance/FileViewer.dart';
import 'package:generp/screens/notifierExports.dart'; import 'package:generp/screens/notifierExports.dart';
...@@ -23,11 +24,17 @@ class _GeneratorPartDetailsScreenState ...@@ -23,11 +24,17 @@ class _GeneratorPartDetailsScreenState
TextEditingController descriptioncontroller = TextEditingController(); TextEditingController descriptioncontroller = TextEditingController();
TextEditingController quantitycontroller = TextEditingController(); TextEditingController quantitycontroller = TextEditingController();
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
super.initState(); super.initState();
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
var homeProvider = Provider.of<HomescreenNotifier>( var homeProvider = Provider.of<HomescreenNotifier>(
context, context,
...@@ -36,6 +43,12 @@ class _GeneratorPartDetailsScreenState ...@@ -36,6 +43,12 @@ class _GeneratorPartDetailsScreenState
initialiseFunction(context, homeProvider); initialiseFunction(context, homeProvider);
}); });
} }
@override
void dispose() {
// TODO: implement dispose
super.dispose();
_connectivity.disposeStream();
}
void initialiseFunction(BuildContext context, homeProvider) async { void initialiseFunction(BuildContext context, homeProvider) async {
var inventoryProvider = Provider.of<InventoryProvider>( var inventoryProvider = Provider.of<InventoryProvider>(
...@@ -52,7 +65,19 @@ class _GeneratorPartDetailsScreenState ...@@ -52,7 +65,19 @@ class _GeneratorPartDetailsScreenState
@override @override
Widget build(BuildContext context) { 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) { builder: (context, provider, homeProvider, child) {
return WillPopScope( return WillPopScope(
onWillPop: () => onBackPressed(context), onWillPop: () => onBackPressed(context),
...@@ -546,7 +571,8 @@ class _GeneratorPartDetailsScreenState ...@@ -546,7 +571,8 @@ class _GeneratorPartDetailsScreenState
), ),
); );
}, },
); ):
NoNetwork(context);
} }
Future<void> _showStockIssueBottomSheet(BuildContext context, type) { Future<void> _showStockIssueBottomSheet(BuildContext context, type) {
......
lib/screens/inventory/InventoryScreen.dart
View file @ ee178d55
import 'dart:io'; import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:generp/screens/notifierExports.dart'; import 'package:generp/screens/notifierExports.dart';
import 'package:generp/Utils/commonWidgets.dart'; import 'package:generp/Utils/commonWidgets.dart';
...@@ -7,6 +8,7 @@ import 'package:provider/provider.dart'; ...@@ -7,6 +8,7 @@ import 'package:provider/provider.dart';
import 'package:qr_code_scanner/qr_code_scanner.dart'; import 'package:qr_code_scanner/qr_code_scanner.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
import '../../Utils/commonServices.dart';
class InventoryScreen extends StatefulWidget { class InventoryScreen extends StatefulWidget {
const InventoryScreen({super.key}); const InventoryScreen({super.key});
...@@ -18,11 +20,17 @@ class InventoryScreen extends StatefulWidget { ...@@ -18,11 +20,17 @@ class InventoryScreen extends StatefulWidget {
class _InventoryScreenState extends State<InventoryScreen> { class _InventoryScreenState extends State<InventoryScreen> {
FocusNode partIDfocusNode = FocusNode(); FocusNode partIDfocusNode = FocusNode();
TextEditingController partIDcontroller = TextEditingController(); TextEditingController partIDcontroller = TextEditingController();
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
super.initState(); super.initState();
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
var inventoryProvider = Provider.of<InventoryProvider>( var inventoryProvider = Provider.of<InventoryProvider>(
context, context,
...@@ -33,14 +41,38 @@ class _InventoryScreenState extends State<InventoryScreen> { ...@@ -33,14 +41,38 @@ class _InventoryScreenState extends State<InventoryScreen> {
}); });
} }
@override
void dispose() {
// TODO: implement dispose
super.dispose();
_connectivity.disposeStream();
}
@override @override
Widget build(BuildContext context) { 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( ? WillPopScope(
onWillPop: () => onBackPressed(context), 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) { 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'; ...@@ -14,7 +14,8 @@ import '../../Models/ordersModels/AddOrderPaymentSelectOrderResponse.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
import '../../Utils/commonWidgets.dart'; import '../../Utils/commonWidgets.dart';
import '../../Utils/dropdownTheme.dart'; import '../../Utils/dropdownTheme.dart';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:generp/Utils/commonServices.dart';
class AddpaymentScreen extends StatefulWidget { class AddpaymentScreen extends StatefulWidget {
final pageTitleName; final pageTitleName;
final mode; final mode;
...@@ -33,11 +34,17 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> { ...@@ -33,11 +34,17 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
String? selectedValue; String? selectedValue;
final TextEditingController textEditingController = TextEditingController(); final TextEditingController textEditingController = TextEditingController();
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
super.initState(); super.initState();
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
var provider = Provider.of<Addpaymentprovider>(context, listen: false); var provider = Provider.of<Addpaymentprovider>(context, listen: false);
if (provider.dateNow == null) { if (provider.dateNow == null) {
...@@ -56,6 +63,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> { ...@@ -56,6 +63,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
@override @override
void dispose() { void dispose() {
focusNodes.map((e)=>e.dispose()); focusNodes.map((e)=>e.dispose());
_connectivity.disposeStream();
super.dispose(); super.dispose();
} }
...@@ -66,7 +74,18 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> { ...@@ -66,7 +74,18 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
@override @override
Widget build(BuildContext context) { 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) { builder: (context, provider, child) {
return WillPopScope( return WillPopScope(
child: SafeArea( child: SafeArea(
...@@ -722,7 +741,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> { ...@@ -722,7 +741,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
}, },
); );
}, },
); ):NoNetwork(context);
} }
Future<void> _showAttachmentSheet(BuildContext context) { Future<void> _showAttachmentSheet(BuildContext context) {
......
lib/screens/order/addTpcAgent.dart
View file @ ee178d55
...@@ -10,6 +10,9 @@ import '../../Utils/app_colors.dart'; ...@@ -10,6 +10,9 @@ import '../../Utils/app_colors.dart';
import '../../Utils/commonWidgets.dart'; import '../../Utils/commonWidgets.dart';
import '../../Utils/dropdownTheme.dart'; import '../../Utils/dropdownTheme.dart';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:generp/Utils/commonServices.dart';
class AddtpcagentScreen extends StatefulWidget { class AddtpcagentScreen extends StatefulWidget {
const AddtpcagentScreen({super.key}); const AddtpcagentScreen({super.key});
...@@ -20,19 +23,43 @@ class AddtpcagentScreen extends StatefulWidget { ...@@ -20,19 +23,43 @@ class AddtpcagentScreen extends StatefulWidget {
class _AddtpcagentScreenState extends State<AddtpcagentScreen> { class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
Dropdowntheme ddtheme = Dropdowntheme(); Dropdowntheme ddtheme = Dropdowntheme();
List<FocusNode> focusNodes = List.generate(10, (index) => FocusNode()); List<FocusNode> focusNodes = List.generate(10, (index) => FocusNode());
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
super.initState(); super.initState();
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
var provider = Provider.of<Tpcagentsprovider>(context, listen: false); var provider = Provider.of<Tpcagentsprovider>(context, listen: false);
}); });
} }
@override
void dispose() {
// TODO: implement dispose
super.dispose();
_connectivity.disposeStream();
}
@override @override
Widget build(BuildContext context) { 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) { builder: (context, provider, child) {
return WillPopScope( return WillPopScope(
child: SafeArea( child: SafeArea(
...@@ -290,7 +317,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> { ...@@ -290,7 +317,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
}, },
); );
}, },
); ):NoNetwork(context);
} }
Future<void> _showAttachmentSheet(BuildContext context) { Future<void> _showAttachmentSheet(BuildContext context) {
......
lib/screens/order/orderModuleDashboard.dart
View file @ ee178d55
import 'dart:io'; import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
...@@ -7,6 +8,7 @@ import 'package:generp/screens/screensExports.dart'; ...@@ -7,6 +8,7 @@ import 'package:generp/screens/screensExports.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../Notifiers/ordersProvider/pagesDashboardProvider.dart'; import '../../Notifiers/ordersProvider/pagesDashboardProvider.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
import '../../Utils/commonServices.dart';
import '../../Utils/commonWidgets.dart'; import '../../Utils/commonWidgets.dart';
import 'addTpcAgent.dart'; import 'addTpcAgent.dart';
...@@ -18,10 +20,20 @@ class Ordermoduledashboard extends StatefulWidget { ...@@ -18,10 +20,20 @@ class Ordermoduledashboard extends StatefulWidget {
} }
class _OrdermoduledashboardState extends State<Ordermoduledashboard> { class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
super.initState(); super.initState();
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
var provider = Provider.of<Pagesdashboardprovider>( var provider = Provider.of<Pagesdashboardprovider>(
context, context,
...@@ -31,15 +43,31 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> { ...@@ -31,15 +43,31 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
provider.ordersAccessiblePagesAPIFunction(context); provider.ordersAccessiblePagesAPIFunction(context);
}); });
} }
@override
void dispose() {
// TODO: implement dispose
super.dispose();
_connectivity.disposeStream();
}
@override @override
Widget build(BuildContext context) { 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( ? WillPopScope(
onWillPop: () => onBackPressed(context), 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) { 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'; ...@@ -13,6 +13,9 @@ import '../../Utils/commonWidgets.dart';
import '../../Utils/dropdownTheme.dart'; import '../../Utils/dropdownTheme.dart';
import '../commonDateRangeFilter.dart'; import '../commonDateRangeFilter.dart';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:generp/Utils/commonServices.dart';
class OrderslistbyModes extends StatefulWidget { class OrderslistbyModes extends StatefulWidget {
final mode; final mode;
final pageTitleName; final pageTitleName;
...@@ -29,11 +32,17 @@ class OrderslistbyModes extends StatefulWidget { ...@@ -29,11 +32,17 @@ class OrderslistbyModes extends StatefulWidget {
class _OrderslistbyModesState extends State<OrderslistbyModes> { class _OrderslistbyModesState extends State<OrderslistbyModes> {
Dropdowntheme ddtheme = Dropdowntheme(); Dropdowntheme ddtheme = Dropdowntheme();
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
super.initState(); super.initState();
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
var provider = Provider.of<Pagesdashboardprovider>( var provider = Provider.of<Pagesdashboardprovider>(
context, context,
...@@ -44,9 +53,28 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -44,9 +53,28 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
}); });
} }
@override
void dispose() {
// TODO: implement dispose
super.dispose();
_connectivity.disposeStream();
}
@override @override
Widget build(BuildContext context) { 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) { builder: (context, provider, child) {
final ordersList = provider.ordersList; final ordersList = provider.ordersList;
return WillPopScope( return WillPopScope(
...@@ -56,7 +84,7 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -56,7 +84,7 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
}, },
child: SafeArea( child: SafeArea(
top: false, top: false,
bottom: Platform.isIOS?false:true, bottom: Platform.isIOS ? false : true,
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
appBar: appbar2( appBar: appbar2(
...@@ -71,7 +99,6 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -71,7 +99,6 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
// }, // },
// child: SvgPicture.asset("assets/svg/ic_download.svg"), // child: SvgPicture.asset("assets/svg/ic_download.svg"),
// ), // ),
InkResponse( InkResponse(
onTap: () async { onTap: () async {
_showFilterSheet(context); _showFilterSheet(context);
...@@ -110,7 +137,8 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -110,7 +137,8 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
), ),
); );
} }
if(ordersList[index].orderNumber=="GP20252605448") if (ordersList[index].orderNumber ==
"GP20252605448")
return Container( return Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
...@@ -122,7 +150,9 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -122,7 +150,9 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(
16,
),
), ),
child: Column( child: Column(
children: [ children: [
...@@ -133,11 +163,15 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -133,11 +163,15 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
child: Container( child: Container(
height: 50, height: 50,
width: 35, width: 35,
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(
8.0,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFFFFF3CE), color: Color(0xFFFFF3CE),
borderRadius: borderRadius:
BorderRadius.circular(8), BorderRadius.circular(
8,
),
), ),
child: SvgPicture.asset( child: SvgPicture.asset(
"assets/svg/fin_ic.svg", "assets/svg/fin_ic.svg",
...@@ -150,24 +184,31 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -150,24 +184,31 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
child: SizedBox( child: SizedBox(
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment
.start,
children: [ children: [
Text( Text(
ordersList[index] ordersList[index]
.accountName!, .accountName!,
style: TextStyle( style: TextStyle(
fontFamily: "JakartaMedium", fontFamily:
"JakartaMedium",
fontSize: 14, fontSize: 14,
color: AppColors.semi_black, color:
AppColors
.semi_black,
), ),
), ),
Text( Text(
"₹" "₹"
"${ordersList[index].balanceAmount}", "${ordersList[index].balanceAmount}",
style: TextStyle( style: TextStyle(
fontFamily: "JakartaMedium", fontFamily:
"JakartaMedium",
fontSize: 14, fontSize: 14,
color: AppColors.app_blue, color:
AppColors
.app_blue,
), ),
), ),
], ],
...@@ -177,23 +218,31 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -177,23 +218,31 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
Expanded( Expanded(
flex: 2, flex: 2,
child: Container( child: Container(
padding: EdgeInsets.symmetric( padding:
EdgeInsets.symmetric(
horizontal: 5, horizontal: 5,
vertical: 10, vertical: 10,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: borderRadius:
BorderRadius.circular(8), BorderRadius.circular(
8,
),
color: Color(0xFFE3FFE0), color: Color(0xFFE3FFE0),
), ),
child: Center( child: Center(
child: Text( child: Text(
ordersList[index].status!, ordersList[index]
textAlign: TextAlign.center, .status!,
textAlign:
TextAlign.center,
style: TextStyle( style: TextStyle(
fontFamily: "JakartaMedium", fontFamily:
"JakartaMedium",
fontSize: 14, fontSize: 14,
color: Color(0xFF0D9C00), color: Color(
0xFF0D9C00,
),
), ),
), ),
), ),
...@@ -217,8 +266,10 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -217,8 +266,10 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
final subHeadings = [ final subHeadings = [
ordersList[index].orderNumber, ordersList[index].orderNumber,
ordersList[index].enteredEmpName, ordersList[index]
ordersList[index].salesPersonEmpName, .enteredEmpName,
ordersList[index]
.salesPersonEmpName,
// ordersList[index].createdDatetime, // ordersList[index].createdDatetime,
ordersList[index].paidAmount, ordersList[index].paidAmount,
ordersList[index].balanceAmount, ordersList[index].balanceAmount,
...@@ -235,9 +286,12 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -235,9 +286,12 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
child: Text( child: Text(
headings[j], headings[j],
style: TextStyle( style: TextStyle(
fontFamily: "JakartaMedium", fontFamily:
"JakartaMedium",
fontSize: 14, fontSize: 14,
color: AppColors.semi_black, color:
AppColors
.semi_black,
), ),
), ),
), ),
...@@ -247,9 +301,12 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -247,9 +301,12 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
subHeadings[j]!, subHeadings[j]!,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: Color(0xFF818181), color: Color(
0xFF818181,
),
decoration: decoration:
TextDecoration.none, TextDecoration
.none,
decorationColor: decorationColor:
AppColors.white, AppColors.white,
), ),
...@@ -266,10 +323,12 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -266,10 +323,12 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: builder:
(context) => (
Ordersdetailsbymodes( context,
) => Ordersdetailsbymodes(
pageTitleName: pageTitleName:
widget.pageTitleName, widget
.pageTitleName,
orderId: orderId:
ordersList[index] ordersList[index]
.orderId, .orderId,
...@@ -277,9 +336,19 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -277,9 +336,19 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
), ),
), ),
); );
if(res==true){ if (res == true) {
provider.ordersListByModeFilterAPIFunction(context, widget.mode); provider
provider.ordersListByModeAPIFunction(context, widget.mode, "", ""); .ordersListByModeFilterAPIFunction(
context,
widget.mode,
);
provider
.ordersListByModeAPIFunction(
context,
widget.mode,
"",
"",
);
} }
}, },
child: Container( child: Container(
...@@ -295,9 +364,11 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -295,9 +364,11 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
Text( Text(
"View Details", "View Details",
style: TextStyle( style: TextStyle(
fontFamily: "JakartaMedium", fontFamily:
"JakartaMedium",
fontSize: 14, fontSize: 14,
color: AppColors.app_blue, color:
AppColors.app_blue,
), ),
), ),
SizedBox(width: 5), SizedBox(width: 5),
...@@ -321,7 +392,8 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -321,7 +392,8 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
), ),
); );
}, },
); )
: NoNetwork(context);
} }
Future<void> _showOptionsSheet(BuildContext 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