Skip to content

GitLab

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

23-06-2025 By Sai Srinivas 

Finance module test cases
parent a7dc0d35
Expand all Hide whitespace changes
Inline Side-by-side
lib/screens/finance/PaymentRequestionListDetails.dart
View file @ c7ff2cec
...@@ -4,6 +4,7 @@ import 'package:dropdown_button2/dropdown_button2.dart'; ...@@ -4,6 +4,7 @@ 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';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Utils/dropdownTheme.dart';
import 'package:generp/screens/notifierExports.dart'; import 'package:generp/screens/notifierExports.dart';
import 'package:generp/Utils/app_colors.dart'; import 'package:generp/Utils/app_colors.dart';
import 'package:generp/Utils/commonWidgets.dart'; import 'package:generp/Utils/commonWidgets.dart';
...@@ -31,6 +32,8 @@ class Paymentrequestionlistdetails extends StatefulWidget { ...@@ -31,6 +32,8 @@ class Paymentrequestionlistdetails extends StatefulWidget {
class _PaymentrequestionlistdetailsState class _PaymentrequestionlistdetailsState
extends State<Paymentrequestionlistdetails> { extends State<Paymentrequestionlistdetails> {
Dropdowntheme ddtheme = Dropdowntheme();
TextEditingController approvedAmount = TextEditingController(); TextEditingController approvedAmount = TextEditingController();
TextEditingController remarks = TextEditingController(); TextEditingController remarks = TextEditingController();
...@@ -82,19 +85,26 @@ class _PaymentrequestionlistdetailsState ...@@ -82,19 +85,26 @@ class _PaymentrequestionlistdetailsState
"Level 1 approved", "Level 1 approved",
"Level 1 rejected", "Level 1 rejected",
].contains(req_det.status); ].contains(req_det.status);
isLevel2Finalized = [ isLevel2Finalized = [
"Level 2 Approved", "Level 2 Approved",
"Level 2 Rejected", "Level 2 Rejected",
"Level 2 approved", "Level 2 approved",
"Level 2 rejected", "Level 2 rejected",
].contains(req_det.status); ].contains(req_det.status);
if (["apr_lvl1"].contains(widget.mode)) { if (widget.mode == "apr_lvl1") {
shouldShowButtons = !isLevel1Finalized; shouldShowButtons = !isLevel1Finalized;
} else if (["apr_lvl2"].contains(widget.mode)) { } else if (widget.mode == "apr_lvl2") {
shouldShowButtons = !isLevel2Finalized && [ shouldShowButtons = !isLevel2Finalized && [
"Requested",
"Level 1 Approved", "Level 1 Approved",
"Level 1 approved", "Level 1 approved",
].contains(req_det.status); // Level 1 must be approved ].contains(req_det.status);
} else if (widget.mode == "process") {
shouldShowButtons = [
"Level 2 Approved",
"Level 2 approved",
].contains(req_det.status); // Show buttons if Level 2 is approved
} }
return WillPopScope( return WillPopScope(
child: Scaffold( child: Scaffold(
...@@ -189,6 +199,10 @@ class _PaymentrequestionlistdetailsState ...@@ -189,6 +199,10 @@ class _PaymentrequestionlistdetailsState
), ),
Divider(thickness: 0.5, color: Color(0xFFD7D7D7)), Divider(thickness: 0.5, color: Color(0xFFD7D7D7)),
...List.generate(provider.subHeadings.length, (j) { ...List.generate(provider.subHeadings.length, (j) {
if(provider.Headings[j] ==
"Attachment"&&req_det.attachmentViewFileName==""){
return SizedBox.shrink();
}
return Container( return Container(
padding: EdgeInsets.symmetric(vertical: 7), padding: EdgeInsets.symmetric(vertical: 7),
child: Row( child: Row(
...@@ -356,7 +370,8 @@ class _PaymentrequestionlistdetailsState ...@@ -356,7 +370,8 @@ class _PaymentrequestionlistdetailsState
), ),
), ),
), ),
] else if (widget.mode == "process") ...[ ]
else if (widget.mode == "process") ...[
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap: () { onTap: () {
...@@ -364,6 +379,7 @@ class _PaymentrequestionlistdetailsState ...@@ -364,6 +379,7 @@ class _PaymentrequestionlistdetailsState
context, context,
provider.requestsDetails.id, provider.requestsDetails.id,
); );
provider.preValues();
_showAddPaymentSheet(context); _showAddPaymentSheet(context);
}, },
child: Container( child: Container(
...@@ -684,53 +700,10 @@ class _PaymentrequestionlistdetailsState ...@@ -684,53 +700,10 @@ class _PaymentrequestionlistdetailsState
provider.paymentAccountSearchController.clear(); provider.paymentAccountSearchController.clear();
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset(
"assets/svg/arrow_dropdown.svg",
height: 25,
width: 20,
),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness:
MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(
true,
),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(
left: 14,
right: 14,
),
),
), ),
), ),
], ],
...@@ -992,53 +965,10 @@ class _PaymentrequestionlistdetailsState ...@@ -992,53 +965,10 @@ class _PaymentrequestionlistdetailsState
} }
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset(
"assets/svg/arrow_dropdown.svg",
height: 25,
width: 20,
),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness:
MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(
true,
),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(
left: 14,
right: 14,
),
),
), ),
), ),
], ],
......
lib/screens/finance/addPaymentReceiptList.dart
View file @ c7ff2cec
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';
import 'package:flutter/cupertino.dart';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Models/financeModels/addReceiptPaymentResponse.dart'; import 'package:generp/Models/financeModels/addReceiptPaymentResponse.dart';
import 'package:generp/Utils/dropdownTheme.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../Notifiers/financeProvider/paymentReceiptsProvider.dart'; import '../../Notifiers/financeProvider/paymentReceiptsProvider.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
import '../../Utils/commonWidgets.dart'; import '../../Utils/commonWidgets.dart';
...@@ -17,7 +18,7 @@ class Addpaymentreceiptlist extends StatefulWidget { ...@@ -17,7 +18,7 @@ class Addpaymentreceiptlist extends StatefulWidget {
} }
class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
Dropdowntheme ddtheme = Dropdowntheme();
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
...@@ -31,30 +32,26 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -31,30 +32,26 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
}); });
} }
@override @override
void dispose() { void dispose() {
super.dispose(); super.dispose();
} }
Future<bool> _onBackPressed(BuildContext context) async {
Navigator.pop(context, true);
return true;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Consumer<Paymentreceiptsprovider>( return Consumer<Paymentreceiptsprovider>(
builder: (context, provider, child) { builder: (context, provider, child) {
return PopScope( return WillPopScope(
canPop: true,
onPopInvoked: (didPop) async {
if (!didPop) {
provider.resetForm();
await onBackPressed(context);
}
},
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
backgroundColor: AppColors.white, backgroundColor: AppColors.white,
appBar: appbar(context, "${widget.pageTitleName}"), appBar: appbar2(context, "${widget.pageTitleName}",provider.resetForm,SizedBox(width: 0,)),
body: SafeArea( body: SafeArea(
child: Container( child: Container(
padding: EdgeInsets.symmetric(horizontal: 10), padding: EdgeInsets.symmetric(horizontal: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
...@@ -144,43 +141,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -144,43 +141,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
provider.accountSearchController.clear(); provider.accountSearchController.clear();
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
...@@ -203,7 +167,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -203,7 +167,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
provider.receiptPaymentAccounts provider.receiptPaymentAccounts
.map( .map(
(accs) => DropdownMenuItem< (accs) => DropdownMenuItem<
ReceiptAccounts ReceiptAccounts
>( >(
value: accs, value: accs,
child: Text( child: Text(
...@@ -273,43 +237,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -273,43 +237,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
provider.paymentAccountSearchController.clear(); provider.paymentAccountSearchController.clear();
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
...@@ -318,10 +249,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -318,10 +249,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
errorWidget(context, provider.selectPaymentAccountError), errorWidget(context, provider.selectPaymentAccountError),
textControllerWidget( textControllerWidget(
context, context,
provider.amountController, provider.amountController,
"Enter Amount", "Enter Amount",
provider.updateAmount,TextInputType.number,false,FilteringTextInputFormatter.digitsOnly provider.updateAmount,TextInputType.number,false,FilteringTextInputFormatter.digitsOnly
), ),
errorWidget(context, provider.amountError), errorWidget(context, provider.amountError),
///payment date toBE ///payment date toBE
...@@ -423,43 +354,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -423,43 +354,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
} }
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
...@@ -474,62 +372,62 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -474,62 +372,62 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
].contains(provider.paymentModeValue)) ... ].contains(provider.paymentModeValue)) ...
[ [
textControllerWidget( textControllerWidget(
context, context,
provider.bankNameController, provider.bankNameController,
"Enter Bank Name", "Enter Bank Name",
provider.updateBankName,TextInputType.text,false,null provider.updateBankName,TextInputType.text,false,null
), ),
errorWidget(context, provider.bankNameError), errorWidget(context, provider.bankNameError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankBranchController, provider.bankBranchController,
"Enter Bank Branch", "Enter Bank Branch",
provider.updateBankBranch,TextInputType.text,false,null provider.updateBankBranch,TextInputType.text,false,null
), ),
errorWidget(context, provider.bankBranchError), errorWidget(context, provider.bankBranchError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankAccNumberController, provider.bankAccNumberController,
"Enter Account Number", "Enter Account Number",
provider.updateNumber,TextInputType.number,false,FilteringTextInputFormatter.digitsOnly provider.updateNumber,TextInputType.number,false,FilteringTextInputFormatter.digitsOnly
), ),
errorWidget(context, provider.bankNumberError), errorWidget(context, provider.bankNumberError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankIfscController, provider.bankIfscController,
"Enter Bank IFSC", "Enter Bank IFSC",
provider.updateIFSC,TextInputType.text,false,null provider.updateIFSC,TextInputType.text,false,null
), ),
errorWidget(context, provider.bankIFSCError), errorWidget(context, provider.bankIFSCError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankAcHolderController, provider.bankAcHolderController,
"Enter Bank Account Holder Name", "Enter Bank Account Holder Name",
provider.updateHolder,TextInputType.text,false,null provider.updateHolder,TextInputType.text,false,null
), ),
errorWidget(context, provider.bankHolderError), errorWidget(context, provider.bankHolderError),
] else if (provider.paymentModeValue == "UPI") ... ] else if (provider.paymentModeValue == "UPI") ...
[ [
textControllerWidget( textControllerWidget(
context, context,
provider.amountController, provider.amountController,
"Enter UPI ID", "Enter UPI ID",
provider.updateUPI,TextInputType.text,false,null provider.updateUPI,TextInputType.text,false,null
), ),
errorWidget(context, provider.UPIError), errorWidget(context, provider.UPIError),
], ],
textControllerWidget( textControllerWidget(
context, context,
provider.paymentReferenceController, provider.paymentReferenceController,
"Enter Payment Reference Number", "Enter Payment Reference Number",
provider.updatereference,TextInputType.text,false,null provider.updatereference,TextInputType.text,false,null
), ),
errorWidget(context, provider.paymentreferenceError), errorWidget(context, provider.paymentreferenceError),
textControllerWidget( textControllerWidget(
context, context,
provider.descController, provider.descController,
"Enter Description", "Enter Description",
provider.updateDescription,TextInputType.text,false,null provider.updateDescription,TextInputType.text,false,null
), ),
errorWidget(context, provider.descriptionError), errorWidget(context, provider.descriptionError),
InkResponse( InkResponse(
...@@ -581,6 +479,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -581,6 +479,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
), ),
) )
], ],
SizedBox(height: 75,)
], ],
), ),
), ),
...@@ -588,7 +487,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -588,7 +487,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
), ),
floatingActionButtonLocation: floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat, FloatingActionButtonLocation.centerFloat,
bottomNavigationBar: InkResponse( floatingActionButton: InkResponse(
onTap: provider.submitClicked?null: () { onTap: provider.submitClicked?null: () {
provider.submitClicked = true; provider.submitClicked = true;
provider.addReceiptPaymentRequestionSubmitAPI(context, provider.formattedDate); provider.addReceiptPaymentRequestionSubmitAPI(context, provider.formattedDate);
...@@ -596,7 +495,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -596,7 +495,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
child: Container( child: Container(
height: 45, height: 45,
alignment: Alignment.center, alignment: Alignment.center,
margin: EdgeInsets.symmetric(horizontal: 10,vertical: 15), margin: EdgeInsets.symmetric(horizontal: 10,vertical: 0),
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.app_blue, color: AppColors.app_blue,
...@@ -615,6 +514,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -615,6 +514,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
), ),
), ),
), ),
onWillPop: () {
provider.resetForm();
return onBackPressed(context);
},
); );
}, },
); );
...@@ -623,7 +526,8 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -623,7 +526,8 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
// void _showDialog(Widget child) { // void _showDialog(Widget child) {
// showCupertinoModalPopup<void>( // showCupertinoModalPopup<void>(
// context: context, // context: context,
// builder: (BuildContext context) => Container( // builder:
// (BuildContext context) => Container(
// height: 216, // height: 216,
// padding: const EdgeInsets.only(top: 6.0), // padding: const EdgeInsets.only(top: 6.0),
// // The Bottom margin is provided to align the popup above the system // // The Bottom margin is provided to align the popup above the system
...@@ -657,8 +561,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -657,8 +561,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
// ), // ),
// // Add a Done button // // Add a Done button
// CupertinoButton( // CupertinoButton(
// child: Text('Done', // child: Text(
// style: TextStyle(fontFamily: "JakartaMedium")), // 'Done',
// style: TextStyle(fontFamily: "JakartaMedium"),
// ),
// onPressed: () { // onPressed: () {
// Navigator.pop(context); // Dismiss the dialog // Navigator.pop(context); // Dismiss the dialog
// }, // },
...@@ -674,7 +580,8 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -674,7 +580,8 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
// ), // ),
// ); // );
// } // }
Future<void> _showAttachmentSheet(BuildContext context) { Future<void> _showAttachmentSheet(BuildContext context) {
return showModalBottomSheet( return showModalBottomSheet(
......
lib/screens/finance/directPaymentRequesitionList.dart
View file @ c7ff2cec
...@@ -6,6 +6,7 @@ import 'package:flutter_svg/svg.dart'; ...@@ -6,6 +6,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/financeProvider/RequestionListProvider.dart'; import 'package:generp/Notifiers/financeProvider/RequestionListProvider.dart';
import 'package:generp/Utils/app_colors.dart'; import 'package:generp/Utils/app_colors.dart';
import 'package:generp/Utils/commonWidgets.dart'; import 'package:generp/Utils/commonWidgets.dart';
import 'package:generp/Utils/dropdownTheme.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
...@@ -23,6 +24,7 @@ class Directpaymentrequesitionlist extends StatefulWidget { ...@@ -23,6 +24,7 @@ class Directpaymentrequesitionlist extends StatefulWidget {
class _DirectpaymentrequesitionlistState class _DirectpaymentrequesitionlistState
extends State<Directpaymentrequesitionlist> { extends State<Directpaymentrequesitionlist> {
Dropdowntheme ddtheme = Dropdowntheme();
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
...@@ -145,47 +147,10 @@ class _DirectpaymentrequesitionlistState ...@@ -145,47 +147,10 @@ class _DirectpaymentrequesitionlistState
provider.accountSearchController.clear(); provider.accountSearchController.clear();
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset(
"assets/svg/arrow_dropdown.svg",
height: 25,
width: 20,
),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
...@@ -281,47 +246,10 @@ class _DirectpaymentrequesitionlistState ...@@ -281,47 +246,10 @@ class _DirectpaymentrequesitionlistState
provider.paymentAccountSearchController.clear(); provider.paymentAccountSearchController.clear();
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset(
"assets/svg/arrow_dropdown.svg",
height: 25,
width: 20,
),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
...@@ -438,47 +366,10 @@ class _DirectpaymentrequesitionlistState ...@@ -438,47 +366,10 @@ class _DirectpaymentrequesitionlistState
} }
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset(
"assets/svg/arrow_dropdown.svg",
height: 25,
width: 20,
),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
......
lib/screens/finance/financeDashboard.dart
View file @ c7ff2cec
...@@ -216,7 +216,7 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -216,7 +216,7 @@ class _FinancedashboardState extends State<Financedashboard> {
]; ];
return ListTile( return ListTile(
onTap: () async { onTap: () async {
Navigator.pop(context);
var res; var res;
if (provider if (provider
.accessiblePagesList2[index] .accessiblePagesList2[index]
...@@ -270,6 +270,7 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -270,6 +270,7 @@ class _FinancedashboardState extends State<Financedashboard> {
), ),
); );
} }
Navigator.pop(context);
}, },
leading: SvgPicture.asset( leading: SvgPicture.asset(
"assets/svg/fin_ic.svg", "assets/svg/fin_ic.svg",
......
lib/screens/finance/paymentDetailsPaymentRequisition.dart
View file @ c7ff2cec
...@@ -132,6 +132,9 @@ class _PaymentdetailspaymentrequisitionState ...@@ -132,6 +132,9 @@ class _PaymentdetailspaymentrequisitionState
), ),
Divider(thickness: 0.5, color: Color(0xFFD7D7D7)), Divider(thickness: 0.5, color: Color(0xFFD7D7D7)),
...List.generate(provider.subHeadings.length, (j) { ...List.generate(provider.subHeadings.length, (j) {
if(provider.Headings[j] == "Attachment" && payment_det.attachmentViewFileName==""){
return SizedBox.shrink();
}
return Container( return Container(
padding: EdgeInsets.symmetric(vertical: 7), padding: EdgeInsets.symmetric(vertical: 7),
child: Row( child: Row(
......
lib/screens/finance/paymentListPaymentRequisition.dart
View file @ c7ff2cec
...@@ -198,20 +198,26 @@ late Commondaterangefilter cf; ...@@ -198,20 +198,26 @@ late Commondaterangefilter cf;
...List.generate(5, (j) { ...List.generate(5, (j) {
final headings = [ final headings = [
"To Account", "To Account",
"Request Mode",
"Attachment", "Attachment",
"Request Mode",
"Payment Date", "Payment Date",
"Note", "Note",
]; ];
final subHeadings = [ final subHeadings = [
requestLists[index].payAccount, requestLists[index].payAccount,
requestLists[index].requestMode,
"View", "View",
requestLists[index].requestMode,
// requestLists[index].attachmentDirFilePath // requestLists[index].attachmentDirFilePath
requestLists[index].paymentDate, requestLists[index].paymentDate,
requestLists[index].description, requestLists[index].description,
]; ];
if(headings[j]=="Attachment"&&requestLists[index]
.attachmentViewFileName==""){
return SizedBox.shrink();
}
return Container( return Container(
padding: EdgeInsets.symmetric(vertical: 5), padding: EdgeInsets.symmetric(vertical: 5),
child: Row( child: Row(
......
lib/screens/finance/paymentReceiptDetails.dart
View file @ c7ff2cec
...@@ -108,6 +108,10 @@ class _PaymentreceiptdetailsState ...@@ -108,6 +108,10 @@ class _PaymentreceiptdetailsState
), ),
Divider(thickness: 0.5, color: Color(0xFFD7D7D7)), Divider(thickness: 0.5, color: Color(0xFFD7D7D7)),
...List.generate(provider.subHeadings.length, (j) { ...List.generate(provider.subHeadings.length, (j) {
if(provider.Headings[j] ==
"Attachment"&&payment_det.attachmentViewFileName==""){
return SizedBox.shrink();
}
return Container( return Container(
padding: EdgeInsets.symmetric(vertical: 7), padding: EdgeInsets.symmetric(vertical: 7),
child: Row( child: Row(
......
lib/screens/finance/paymentreceiptList.dart
View file @ c7ff2cec
...@@ -164,23 +164,29 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> { ...@@ -164,23 +164,29 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> {
], ],
), ),
Divider(thickness: 0.5, color: Color(0xFFD7D7D7)), Divider(thickness: 0.5, color: Color(0xFFD7D7D7)),
...List.generate(4, (j) { ...List.generate(5, (j) {
final headings = [ final headings = [
"Receipt Account", "Receipt Account",
"Request Mode",
"Attachment", "Attachment",
"Request Mode",
"Receipt Date", "Receipt Date",
"Note", "Note",
]; ];
final subHeadings = [ final subHeadings = [
requestLists[index].receipientAccount, requestLists[index].receipientAccount,
requestLists[index].requestMode,
"View", "View",
requestLists[index].requestMode,
// requestLists[index].attachmentDirFilePath // requestLists[index].attachmentDirFilePath
requestLists[index].receiptDate, requestLists[index].receiptDate,
requestLists[index].description, requestLists[index].description,
]; ];
if(headings[j]=="Attachment"&&requestLists[index]
.attachmentViewFileName==""){
return SizedBox.shrink();
}
return Container( return Container(
padding: EdgeInsets.symmetric(vertical: 5), padding: EdgeInsets.symmetric(vertical: 5),
child: Row( child: Row(
......
lib/screens/finance/submitPaymentRequestionListsByMode.dart
View file @ c7ff2cec
...@@ -5,6 +5,7 @@ import 'package:flutter_svg/svg.dart'; ...@@ -5,6 +5,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/financeProvider/RequestionListProvider.dart'; import 'package:generp/Notifiers/financeProvider/RequestionListProvider.dart';
import 'package:generp/Utils/app_colors.dart'; import 'package:generp/Utils/app_colors.dart';
import 'package:generp/Utils/commonWidgets.dart'; import 'package:generp/Utils/commonWidgets.dart';
import 'package:generp/Utils/dropdownTheme.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../Models/financeModels/addPaymentRequestionResponse.dart'; import '../../Models/financeModels/addPaymentRequestionResponse.dart';
...@@ -22,6 +23,7 @@ class Submitpaymentrequestionlistsbymode extends StatefulWidget { ...@@ -22,6 +23,7 @@ class Submitpaymentrequestionlistsbymode extends StatefulWidget {
class _SubmitpaymentrequestionlistsbymodeState class _SubmitpaymentrequestionlistsbymodeState
extends State<Submitpaymentrequestionlistsbymode> { extends State<Submitpaymentrequestionlistsbymode> {
Dropdowntheme ddtheme = Dropdowntheme();
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
...@@ -149,43 +151,10 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -149,43 +151,10 @@ class _SubmitpaymentrequestionlistsbymodeState
provider.accountSearchController.clear(); provider.accountSearchController.clear();
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
...@@ -234,42 +203,10 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -234,42 +203,10 @@ class _SubmitpaymentrequestionlistsbymodeState
); );
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness:
MaterialStateProperty.all<double>(6),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
...@@ -346,43 +283,10 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -346,43 +283,10 @@ class _SubmitpaymentrequestionlistsbymodeState
} }
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
......
lib/screens/genTracker/RegisterComplaint.dart
View file @ c7ff2cec
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_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Utils/dropdownTheme.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';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
...@@ -18,7 +19,7 @@ class Registercomplaint extends StatefulWidget { ...@@ -18,7 +19,7 @@ class Registercomplaint extends StatefulWidget {
class _RegistercomplaintState extends State<Registercomplaint> { class _RegistercomplaintState extends State<Registercomplaint> {
TextEditingController running_hrs = TextEditingController(); TextEditingController running_hrs = TextEditingController();
TextEditingController Complaint_Note = TextEditingController(); TextEditingController Complaint_Note = TextEditingController();
Dropdowntheme ddtheme = Dropdowntheme();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Consumer2<Generatordetailsprovider, HomescreenNotifier>( return Consumer2<Generatordetailsprovider, HomescreenNotifier>(
...@@ -244,47 +245,10 @@ class _RegistercomplaintState extends State<Registercomplaint> { ...@@ -244,47 +245,10 @@ class _RegistercomplaintState extends State<Registercomplaint> {
} }
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(
14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
width: 350,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(
14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty
.all<double>(6),
thumbVisibility:
MaterialStateProperty.all<bool>(
true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(
left: 14, right: 14),
),
), ),
), ),
], ],
...@@ -350,48 +314,10 @@ class _RegistercomplaintState extends State<Registercomplaint> { ...@@ -350,48 +314,10 @@ class _RegistercomplaintState extends State<Registercomplaint> {
value?.id; value?.id;
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(
14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
width: 350,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(
14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness:
MaterialStateProperty.all<double>(
6),
thumbVisibility:
MaterialStateProperty.all<bool>(
true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(
left: 14, right: 14),
),
), ),
), ),
], ],
...@@ -458,49 +384,10 @@ class _RegistercomplaintState extends State<Registercomplaint> { ...@@ -458,49 +384,10 @@ class _RegistercomplaintState extends State<Registercomplaint> {
value?.id; value?.id;
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(
14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
width: 350,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(
14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty
.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(
true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(
left: 14, right: 14),
),
), ),
), ),
], ],
......
lib/screens/order/addOrder.dart
View file @ c7ff2cec
This diff is collapsed.
lib/screens/order/addPayment.dart
View file @ c7ff2cec
...@@ -12,6 +12,7 @@ import '../../Models/ordersModels/AddOrderPaymentSelectAccountResponse.dart'; ...@@ -12,6 +12,7 @@ import '../../Models/ordersModels/AddOrderPaymentSelectAccountResponse.dart';
import '../../Models/ordersModels/AddOrderPaymentSelectOrderResponse.dart'; 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';
class AddpaymentScreen extends StatefulWidget { class AddpaymentScreen extends StatefulWidget {
final pageTitleName; final pageTitleName;
...@@ -25,7 +26,7 @@ class AddpaymentScreen extends StatefulWidget { ...@@ -25,7 +26,7 @@ class AddpaymentScreen extends StatefulWidget {
class _AddpaymentScreenState extends State<AddpaymentScreen> { class _AddpaymentScreenState extends State<AddpaymentScreen> {
Timer? _debounce; Timer? _debounce;
FocusNode focusNode = FocusNode(); FocusNode focusNode = FocusNode();
Dropdowntheme ddtheme = Dropdowntheme();
String? selectedValue; String? selectedValue;
final TextEditingController textEditingController = TextEditingController(); final TextEditingController textEditingController = TextEditingController();
...@@ -596,43 +597,10 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> { ...@@ -596,43 +597,10 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
} }
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
), ),
...@@ -719,44 +687,10 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> { ...@@ -719,44 +687,10 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
); );
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 14,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
width: 350,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
...@@ -857,44 +791,10 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> { ...@@ -857,44 +791,10 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
); );
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 14,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
width: 350,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
......
lib/screens/order/addTpcAgent.dart
View file @ c7ff2cec
...@@ -6,6 +6,7 @@ import 'package:provider/provider.dart'; ...@@ -6,6 +6,7 @@ import 'package:provider/provider.dart';
import '../../Notifiers/ordersProvider/tpcAgentsProvider.dart'; import '../../Notifiers/ordersProvider/tpcAgentsProvider.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
import '../../Utils/commonWidgets.dart'; import '../../Utils/commonWidgets.dart';
import '../../Utils/dropdownTheme.dart';
class AddtpcagentScreen extends StatefulWidget { class AddtpcagentScreen extends StatefulWidget {
const AddtpcagentScreen({super.key}); const AddtpcagentScreen({super.key});
...@@ -15,6 +16,7 @@ class AddtpcagentScreen extends StatefulWidget { ...@@ -15,6 +16,7 @@ class AddtpcagentScreen extends StatefulWidget {
} }
class _AddtpcagentScreenState extends State<AddtpcagentScreen> { class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
Dropdowntheme ddtheme = Dropdowntheme();
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
......
lib/screens/order/editAdjustedOrderList.dart
View file @ c7ff2cec
...@@ -10,6 +10,7 @@ import '../../Notifiers/ordersProvider/addPaymentProvider.dart'; ...@@ -10,6 +10,7 @@ import '../../Notifiers/ordersProvider/addPaymentProvider.dart';
import '../../Notifiers/ordersProvider/editPaymentProvider.dart'; import '../../Notifiers/ordersProvider/editPaymentProvider.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
import '../../Utils/commonWidgets.dart'; import '../../Utils/commonWidgets.dart';
import '../../Utils/dropdownTheme.dart';
class Editadjustedorderlist extends StatefulWidget { class Editadjustedorderlist extends StatefulWidget {
final mode; final mode;
...@@ -28,6 +29,7 @@ class Editadjustedorderlist extends StatefulWidget { ...@@ -28,6 +29,7 @@ class Editadjustedorderlist extends StatefulWidget {
} }
class _EditadjustedorderlistState extends State<Editadjustedorderlist> { class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
Dropdowntheme ddtheme = Dropdowntheme();
@override @override
void initState() { void initState() {
super.initState(); super.initState();
...@@ -254,75 +256,10 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> { ...@@ -254,75 +256,10 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
} }
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: dropdownStyleData: ddtheme.dropdownStyleData,
const EdgeInsets.only(
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(
14,
),
color:
AppColors
.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset(
"assets/svg/arrow_dropdown.svg",
height: 25,
width: 20,
),
iconSize: 12,
iconEnabledColor:
Color(
0xFF2D2D2D,
),
iconDisabledColor:
Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(
14,
),
color:
AppColors
.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius:
const Radius.circular(
15,
),
thickness:
MaterialStateProperty.all<
double
>(6),
thumbVisibility:
MaterialStateProperty.all<
bool
>(true),
),
),
menuItemStyleData:
const MenuItemStyleData(
height: 40,
padding:
EdgeInsets.only(
left:
14,
right:
14,
),
),
), ),
), ),
), ),
...@@ -492,79 +429,10 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> { ...@@ -492,79 +429,10 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
} }
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: dropdownStyleData: ddtheme.dropdownStyleData,
const EdgeInsets.only(
left:
14,
right:
14,
),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(
14,
),
color:
AppColors
.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset(
"assets/svg/arrow_dropdown.svg",
height: 25,
width: 20,
),
iconSize: 12,
iconEnabledColor:
Color(
0xFF2D2D2D,
),
iconDisabledColor:
Colors
.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight:
200,
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(
14,
),
color:
AppColors
.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius:
const Radius.circular(
15,
),
thickness:
MaterialStateProperty.all<
double
>(6),
thumbVisibility:
MaterialStateProperty.all<
bool
>(true),
),
),
menuItemStyleData:
const MenuItemStyleData(
height:
40,
padding: EdgeInsets.only(
left:
14,
right:
14,
),
),
), ),
), ),
), ),
......
lib/screens/order/editPaymentDetailsByMode.dart
View file @ c7ff2cec
...@@ -11,6 +11,7 @@ import '../../Notifiers/ordersProvider/addPaymentProvider.dart'; ...@@ -11,6 +11,7 @@ import '../../Notifiers/ordersProvider/addPaymentProvider.dart';
import '../../Notifiers/ordersProvider/editPaymentProvider.dart'; import '../../Notifiers/ordersProvider/editPaymentProvider.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
import '../../Utils/commonWidgets.dart'; import '../../Utils/commonWidgets.dart';
import '../../Utils/dropdownTheme.dart';
class Editpaymentdetailsbymode extends StatefulWidget { class Editpaymentdetailsbymode extends StatefulWidget {
final mode; final mode;
...@@ -30,7 +31,7 @@ class _EditpaymentdetailsbymodeState extends State<Editpaymentdetailsbymode> { ...@@ -30,7 +31,7 @@ class _EditpaymentdetailsbymodeState extends State<Editpaymentdetailsbymode> {
String? selectedValue; String? selectedValue;
final TextEditingController textEditingController = TextEditingController(); final TextEditingController textEditingController = TextEditingController();
Dropdowntheme ddtheme = Dropdowntheme();
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
...@@ -136,44 +137,10 @@ class _EditpaymentdetailsbymodeState extends State<Editpaymentdetailsbymode> { ...@@ -136,44 +137,10 @@ class _EditpaymentdetailsbymodeState extends State<Editpaymentdetailsbymode> {
); );
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 14,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
width: 350,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
...@@ -231,44 +198,10 @@ class _EditpaymentdetailsbymodeState extends State<Editpaymentdetailsbymode> { ...@@ -231,44 +198,10 @@ class _EditpaymentdetailsbymodeState extends State<Editpaymentdetailsbymode> {
); );
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 14,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
width: 350,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
......
lib/screens/order/ordersListByModes.dart
View file @ c7ff2cec
...@@ -8,6 +8,7 @@ import '../../Models/ordersModels/ordersListByModeFilterResponse.dart'; ...@@ -8,6 +8,7 @@ import '../../Models/ordersModels/ordersListByModeFilterResponse.dart';
import '../../Notifiers/ordersProvider/pagesDashboardProvider.dart'; import '../../Notifiers/ordersProvider/pagesDashboardProvider.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
import '../../Utils/commonWidgets.dart'; import '../../Utils/commonWidgets.dart';
import '../../Utils/dropdownTheme.dart';
import '../commonDateRangeFilter.dart'; import '../commonDateRangeFilter.dart';
class OrderslistbyModes extends StatefulWidget { class OrderslistbyModes extends StatefulWidget {
...@@ -20,7 +21,7 @@ class OrderslistbyModes extends StatefulWidget { ...@@ -20,7 +21,7 @@ class OrderslistbyModes extends StatefulWidget {
} }
class _OrderslistbyModesState extends State<OrderslistbyModes> { class _OrderslistbyModesState extends State<OrderslistbyModes> {
Dropdowntheme ddtheme = Dropdowntheme();
@override @override
void initState() { void initState() {
...@@ -476,44 +477,10 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -476,44 +477,10 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
); );
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 14,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
width: 350,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
...@@ -571,49 +538,10 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -571,49 +538,10 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
} }
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness:
MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(
true,
),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(
left: 14,
right: 14,
),
),
), ),
), ),
], ],
......
lib/screens/order/paymentListsByMode.dart
View file @ c7ff2cec
...@@ -8,6 +8,7 @@ import 'package:provider/provider.dart'; ...@@ -8,6 +8,7 @@ import 'package:provider/provider.dart';
import '../../Models/ordersModels/paymentListByModeFilterResponse.dart'; import '../../Models/ordersModels/paymentListByModeFilterResponse.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
import '../../Utils/commonWidgets.dart'; import '../../Utils/commonWidgets.dart';
import '../../Utils/dropdownTheme.dart';
class Paymentlistsbymode extends StatefulWidget { class Paymentlistsbymode extends StatefulWidget {
final mode; final mode;
...@@ -21,6 +22,7 @@ class Paymentlistsbymode extends StatefulWidget { ...@@ -21,6 +22,7 @@ class Paymentlistsbymode extends StatefulWidget {
} }
class _PaymentlistsbymodeState extends State<Paymentlistsbymode> { class _PaymentlistsbymodeState extends State<Paymentlistsbymode> {
Dropdowntheme ddtheme = Dropdowntheme();
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
...@@ -478,51 +480,10 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> { ...@@ -478,51 +480,10 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> {
} }
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14,
right: 14,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset(
"assets/svg/arrow_dropdown.svg",
height: 25, width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness:
MaterialStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(
true,
),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding: EdgeInsets.only(
left: 14,
right: 14,
),
),
), ),
), ),
], ],
......
lib/screens/serviceEngineer/NearbyGenerators.dart
View file @ c7ff2cec
import 'package:dropdown_button2/dropdown_button2.dart'; import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.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/NearByGeneratorsProvider.dart'; import 'package:generp/Notifiers/NearByGeneratorsProvider.dart';
...@@ -8,6 +10,8 @@ import 'package:google_maps_flutter/google_maps_flutter.dart'; ...@@ -8,6 +10,8 @@ import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:interactive_slider/interactive_slider.dart'; import 'package:interactive_slider/interactive_slider.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../Utils/dropdownTheme.dart';
class Nearbygenerators extends StatefulWidget { class Nearbygenerators extends StatefulWidget {
const Nearbygenerators({super.key}); const Nearbygenerators({super.key});
...@@ -16,6 +20,7 @@ class Nearbygenerators extends StatefulWidget { ...@@ -16,6 +20,7 @@ class Nearbygenerators extends StatefulWidget {
} }
class _NearbygeneratorsState extends State<Nearbygenerators> { class _NearbygeneratorsState extends State<Nearbygenerators> {
Dropdowntheme ddtheme = Dropdowntheme();
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
...@@ -231,10 +236,15 @@ class _NearbygeneratorsState extends State<Nearbygenerators> { ...@@ -231,10 +236,15 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
GoogleMap( GoogleMap(
myLocationEnabled: true, myLocationEnabled: true,
zoomGesturesEnabled: true, zoomGesturesEnabled: true,
zoomControlsEnabled: true,
gestureRecognizers: {
Factory<OneSequenceGestureRecognizer>(() => EagerGestureRecognizer()),
Factory<PanGestureRecognizer>(() => PanGestureRecognizer()),
Factory<ScaleGestureRecognizer>(() => ScaleGestureRecognizer()), // Prioritize pinch-to-zoom
},
initialCameraPosition: CameraPosition( initialCameraPosition: CameraPosition(
target: provider.startLocation, target: provider.startLocation,
zoom: 14.0, zoom:14.0
), ),
markers:provider.markers.toSet(), markers:provider.markers.toSet(),
mapType: MapType.normal, mapType: MapType.normal,
...@@ -352,42 +362,10 @@ class _NearbygeneratorsState extends State<Nearbygenerators> { ...@@ -352,42 +362,10 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
provider.selectedItem = newValue!; provider.selectedItem = newValue!;
}); });
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14, right: 14),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 14,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
width: 350,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness:
MaterialStateProperty.all<double>(6),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding:
EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
......
lib/screens/serviceEngineer/PaymentDetails.dart
View file @ c7ff2cec
...@@ -8,6 +8,7 @@ import 'package:pin_code_fields/pin_code_fields.dart'; ...@@ -8,6 +8,7 @@ import 'package:pin_code_fields/pin_code_fields.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../Models/TechnicianLoadNumbersResponse.dart'; import '../../Models/TechnicianLoadNumbersResponse.dart';
import '../../Utils/dropdownTheme.dart';
class Paymentdetails extends StatefulWidget { class Paymentdetails extends StatefulWidget {
final accountName, referenceID, name, genId; final accountName, referenceID, name, genId;
...@@ -25,7 +26,7 @@ class Paymentdetails extends StatefulWidget { ...@@ -25,7 +26,7 @@ class Paymentdetails extends StatefulWidget {
} }
class _PaymentdetailsState extends State<Paymentdetails> { class _PaymentdetailsState extends State<Paymentdetails> {
Dropdowntheme ddtheme = Dropdowntheme();
TextEditingController Amountcontroller = TextEditingController(); TextEditingController Amountcontroller = TextEditingController();
TextEditingController Referencecontroller = TextEditingController(); TextEditingController Referencecontroller = TextEditingController();
TextEditingController nameController = TextEditingController(); TextEditingController nameController = TextEditingController();
...@@ -186,41 +187,10 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -186,41 +187,10 @@ class _PaymentdetailsState extends State<Paymentdetails> {
} }
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14, right: 14),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
width: 280,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness: MaterialStateProperty.all<double>(
6),
thumbVisibility: MaterialStateProperty.all<
bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 60,
padding: EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
...@@ -278,45 +248,10 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -278,45 +248,10 @@ class _PaymentdetailsState extends State<Paymentdetails> {
} }
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: MediaQuery menuItemStyleData: ddtheme.menuItemStyleData,
.of(context) dropdownStyleData: ddtheme.dropdownStyleData,
.size
.width,
padding: const EdgeInsets.only(
left: 14, right: 14),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
width: 340,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness:
MaterialStateProperty.all<double>(6),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding:
EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
......
lib/screens/serviceEngineer/UpdateComplaints.dart
View file @ c7ff2cec
...@@ -6,6 +6,8 @@ import 'package:generp/Utils/app_colors.dart'; ...@@ -6,6 +6,8 @@ import 'package:generp/Utils/app_colors.dart';
import 'package:generp/Utils/commonWidgets.dart'; import 'package:generp/Utils/commonWidgets.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../Utils/dropdownTheme.dart';
class Updatecomplaints extends StatefulWidget { class Updatecomplaints extends StatefulWidget {
final ComplaintID; final ComplaintID;
const Updatecomplaints({super.key,required this.ComplaintID}); const Updatecomplaints({super.key,required this.ComplaintID});
...@@ -15,7 +17,7 @@ class Updatecomplaints extends StatefulWidget { ...@@ -15,7 +17,7 @@ class Updatecomplaints extends StatefulWidget {
} }
class _UpdatecomplaintsState extends State<Updatecomplaints> { class _UpdatecomplaintsState extends State<Updatecomplaints> {
Dropdowntheme ddtheme = Dropdowntheme();
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
...@@ -103,44 +105,10 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> { ...@@ -103,44 +105,10 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
print("statusId:${provider.statusID}"); print("statusId:${provider.statusID}");
} }
}, },
buttonStyleData: ButtonStyleData( buttonStyleData: ddtheme.buttonStyleData,
height: 50, iconStyleData: ddtheme.iconStyleData,
width: 160, menuItemStyleData: ddtheme.menuItemStyleData,
padding: const EdgeInsets.only( dropdownStyleData: ddtheme.dropdownStyleData,
left: 14, right: 14),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
),
iconStyleData: const IconStyleData(
icon: Icon(
Icons.keyboard_arrow_down_sharp,
),
iconSize: 14,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
),
dropdownStyleData: DropdownStyleData(
maxHeight: 200,
width: 350,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color,
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness:
MaterialStateProperty.all<double>(6),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
padding:
EdgeInsets.only(left: 14, right: 14),
),
), ),
), ),
], ],
...@@ -321,7 +289,14 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> { ...@@ -321,7 +289,14 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
), ),
], ],
), ),
ErrorWidget(context, provider.runningHoursError), Row(
children: [
Expanded(child: SizedBox()),
SizedBox(width: 10,),
Expanded(child: ErrorWidget(context, provider.runningHoursError)),
],
),
InkResponse( InkResponse(
onTap: () { onTap: () {
_showAttachmentSheet(context); _showAttachmentSheet(context);
......
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