Skip to content

GitLab

"lib/screens/git@183.82.99.133:saisrinivas/gen_erp_2025.git" did not exist on "233faa105374495a0b093f8b6ec22ba6d15bc6c7"
Commit cdad3e17 authored by Sai Srinivas's avatar Sai Srinivas
Browse files

09-06-2025 By Sai Srinivas 

issues and Alignments and modifications
parent 60c0bef0
Hide whitespace changes
Inline Side-by-side
lib/screens/genTracker/ScanEnterGeneratorIDScreen.dart
View file @ cdad3e17
...@@ -4,7 +4,6 @@ import 'package:provider/provider.dart'; ...@@ -4,7 +4,6 @@ import 'package:provider/provider.dart';
import 'package:qr_code_scanner/qr_code_scanner.dart'; import 'package:qr_code_scanner/qr_code_scanner.dart';
import '../../Notifiers/HomeScreenNotifier.dart'; import '../../Notifiers/HomeScreenNotifier.dart';
import '../../Notifiers/InventoryProvider.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
import '../../Utils/commonWidgets.dart'; import '../../Utils/commonWidgets.dart';
class Scanentergeneratoridscreen extends StatefulWidget { class Scanentergeneratoridscreen extends StatefulWidget {
......
lib/screens/notifierExports.dart 0 → 100644
View file @ cdad3e17
export 'package:generp/Notifiers/splashVersionNotifier.dart';
export 'package:generp/Notifiers/loginNotifier.dart';
export 'package:generp/Notifiers/scanLoginProvider.dart';
export 'package:generp/Notifiers/AttendanceNotifier.dart';
export 'package:generp/Notifiers/CheckInProvider.dart';
export 'package:generp/Notifiers/Counter.dart';
export 'package:generp/Notifiers/GeneratorDetailsProvider.dart';
export 'package:generp/Notifiers/HomeScreenNotifier.dart';
export 'package:generp/Notifiers/InventoryProvider.dart';
export 'package:generp/Notifiers/LogoutNotifier.dart';
export 'package:generp/Notifiers/NearByGeneratorsProvider.dart';
export 'package:generp/Notifiers/PCWalletProvider.dart';
export 'package:generp/Notifiers/PaymentCollectionProvider.dart';
export 'package:generp/Notifiers/PaymentDetailsProvider.dart';
export 'package:generp/Notifiers/PendingComplaintsProvider.dart';
export 'package:generp/Notifiers/ProfileNotifier.dart';
export 'package:generp/Notifiers/ServiceEngineerDashboardProvider.dart';
export 'package:generp/Notifiers/TodayMontlyVisitsProvider.dart';
export 'package:generp/Notifiers/UpdatePasswordProvider.dart';
export 'package:generp/Notifiers/VisitDetailsProvider.dart';
export 'package:generp/Notifiers/commonProvider/accountDetailsProvider.dart';
export 'package:generp/Notifiers/commonProvider/accountsListProvider.dart';
export 'package:generp/Notifiers/commonProvider/commonPagesProvider.dart';
export 'package:generp/Notifiers/commonProvider/accountLedgerProvider.dart';
export 'package:generp/Notifiers/financeProvider/DashboardProvider.dart';
export 'package:generp/Notifiers/financeProvider/RequestionListProvider.dart';
export 'package:generp/Notifiers/financeProvider/paymentReceiptsProvider.dart';
export 'package:generp/Notifiers/financeProvider/paymentRequisitionPaymentsListProvider.dart';
export 'package:generp/Notifiers/financeProvider/RequesitionLidtDetailsProvider.dart';
\ No newline at end of file
lib/screens/screensExports.dart 0 → 100644
View file @ cdad3e17
export 'package:generp/screens/ScannerLogin.dart';
export 'package:generp/screens/WebERPIOS.dart';
export "package:generp/screens/WebERPScreen.dart";
export "package:generp/screens/WebWhizzdomScreen.dart";
export 'package:generp/screens/commom/commonDashboard.dart';
export 'package:generp/screens/finance/financeDashboard.dart';
export 'package:generp/screens/genTracker/GenTrackerDashboard.dart';
export 'package:generp/screens/serviceEngineer/NearbyGenerators.dart';
export 'package:generp/screens/serviceEngineer/serviceEngineerDashboard.dart';
export 'package:generp/screens/serviceEngineer/PaymentDetails.dart';
export 'package:generp/screens/serviceEngineer/VisitDetails.dart';
export 'package:generp/screens/serviceEngineer/scanComplaintDetails.dart';
export 'package:generp/screens/commom/accountLedger.dart';
export 'package:generp/screens/commom/accountsList.dart';
export 'package:generp/screens/commom/addCommonPayment.dart';
export 'package:generp/screens/finance/AllPaymentRequesitionListsByModes.dart';
export 'package:generp/screens/finance/addPaymentReceiptList.dart';
export 'package:generp/screens/finance/directPaymentRequesitionList.dart';
export 'package:generp/screens/finance/paymentListPaymentRequisition.dart';
export 'package:generp/screens/finance/paymentreceiptList.dart';
export 'package:generp/screens/finance/submitPaymentRequestionListsByMode.dart';
export 'package:generp/screens/serviceEngineer/MonthlyCollection.dart';
export 'package:generp/screens/serviceEngineer/PCWallet.dart';
export 'package:generp/screens/serviceEngineer/PendingComplaints.dart';
export 'package:generp/screens/serviceEngineer/TodayMontlyVisists.dart';
\ No newline at end of file
lib/screens/serviceEngineer/AddContact.dart deleted 100644 → 0
View file @ 60c0bef0
import 'package:flutter/material.dart';
class Addcontact extends StatefulWidget {
const Addcontact({super.key});
@override
State<Addcontact> createState() => _AddcontactState();
}
class _AddcontactState extends State<Addcontact> {
@override
Widget build(BuildContext context) {
return const Placeholder();
}
}
lib/screens/serviceEngineer/ComplaintDetailsScreen.dart deleted 100644 → 0
View file @ 60c0bef0
import 'package:flutter/material.dart';
class Complaintdetailsscreen extends StatefulWidget {
const Complaintdetailsscreen({super.key});
@override
State<Complaintdetailsscreen> createState() => _ComplaintdetailsscreenState();
}
class _ComplaintdetailsscreenState extends State<Complaintdetailsscreen> {
@override
Widget build(BuildContext context) {
return const Placeholder();
}
}
lib/screens/serviceEngineer/Followupdetails.dart
View file @ cdad3e17
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../Notifiers/VisitDetailsProvider.dart'; import '../../Notifiers/VisitDetailsProvider.dart';
......
lib/screens/serviceEngineer/MonthlyCollection.dart
View file @ cdad3e17
...@@ -108,12 +108,16 @@ class _MonthlycollectionState extends State<Monthlycollection> { ...@@ -108,12 +108,16 @@ class _MonthlycollectionState extends State<Monthlycollection> {
children: [ children: [
Text( Text(
"${provider.paymenCollectionList[index].accountName}", "${provider.paymenCollectionList[index].accountName}",
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontFamily: "JakartaMedium" fontFamily: "JakartaMedium"
), ),
), ),
Text( Text(
"₹${provider.paymenCollectionList[index].amount}", "₹${provider.paymenCollectionList[index].amount}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(color: AppColors.app_blue), style: TextStyle(color: AppColors.app_blue),
), ),
// Text("Gen Pvt. Ltd"), // Text("Gen Pvt. Ltd"),
......
lib/screens/serviceEngineer/NearbyGenerators.dart
View file @ cdad3e17
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:generp/Notifiers/NearByGeneratorsProvider.dart'; import 'package:generp/Notifiers/NearByGeneratorsProvider.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:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:interactive_slider/interactive_slider.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class Nearbygenerators extends StatefulWidget { class Nearbygenerators extends StatefulWidget {
...@@ -23,178 +26,176 @@ class _NearbygeneratorsState extends State<Nearbygenerators> { ...@@ -23,178 +26,176 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
},); },);
} }
Future infoDialogue(BuildContext context) async { // Future infoDialogue(BuildContext context) async {
//
return await showDialog( // return await showDialog(
context: context, // context: context,
builder: // builder:
(context) => Consumer<Nearbygeneratorsprovider>( // (context) => Consumer<Nearbygeneratorsprovider>(
builder: (context,provider,child) { // builder: (context,provider,child) {
return StatefulBuilder( // return StatefulBuilder(
builder: // builder:
(context, setState) => // (context, setState) =>
AlertDialog( // AlertDialog(
shape: RoundedRectangleBorder( // shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0), // borderRadius: BorderRadius.circular(10.0),
), // ),
title: Column( // title: Column(
children: [ // children: [
Row( // Row(
children: [ // children: [
Expanded( // Expanded(
child: Align( // child: Align(
alignment: Alignment.topLeft, // alignment: Alignment.topLeft,
child: Text( // child: Text(
'Filter', // 'Filter',
style: TextStyle( // style: TextStyle(
color: Colors.black, // color: Colors.black,
fontWeight: FontWeight.w500, // fontWeight: FontWeight.w500,
), // ),
), // ),
), // ),
), // ),
InkWell( // InkWell(
child: Icon(Icons.close), // child: SvgPicture.asset("assets/svg/ic_close.svg",height: 18,width: 18,),
onTap: () { // onTap: () {
setState(() { // setState(() {
provider.currentValue = 0.0; // provider.currentValue = 0.0;
provider.selectedItem = "Active"; // provider.selectedItem = "Active";
}); // });
Navigator.pop(context); // Navigator.pop(context);
}, // },
), // ),
], // ],
), // ),
Divider( // Divider(
color: Colors.grey, // color: Colors.grey,
thickness: 1.0, // thickness: 1.0,
height: 0.0, // height: 0.0,
), // ),
], // ],
), // ),
//
content: Container( // content: Container(
height: 230, // height: 230,
child: Column( // child: Column(
children: [ // children: [
Row( // Row(
children: [ // children: [
Text( // Text(
"Radius", // "Radius",
style: TextStyle( // style: TextStyle(
fontSize: 18.0, // fontSize: 18.0,
fontWeight: FontWeight.w500, // fontWeight: FontWeight.w500,
), // ),
), // ),
Spacer(), // Spacer(),
Text( // Text(
'${provider.currentValue.toStringAsFixed(2)} KM', // '${provider.currentValue.toStringAsFixed(2)} KM',
style: TextStyle( // style: TextStyle(
fontSize: 18.0, // fontSize: 18.0,
fontWeight: FontWeight.w500, // fontWeight: FontWeight.w500,
), // ),
), // ),
], // ],
), // ),
Slider( // Slider(
value: provider.currentValue, // value: provider.currentValue,
max: 100, // max: 100,
divisions: 100, // divisions: 100,
label: provider.currentValue.toStringAsFixed(2), // label: provider.currentValue.toStringAsFixed(2),
inactiveColor: Color(0xFFD7D7D7), // inactiveColor: Color(0xFFD7D7D7),
activeColor: AppColors.cyan_blue, // activeColor: AppColors.cyan_blue,
onChanged: (value) { // onChanged: (value) {
provider.currentValue = value; // provider.currentValue = value;
provider.debounce(() { // provider.debounce(() {
provider.LoadNearbyGeneratorsAPI(context); // provider.LoadNearbyGeneratorsAPI(context);
}, Duration(milliseconds: 500)); // }, Duration(milliseconds: 500));
}, // },
), // ),
Align( // Align(
alignment: Alignment.centerLeft, // alignment: Alignment.centerLeft,
child: Text( // child: Text(
'Status', // 'Status',
//
style: TextStyle( // style: TextStyle(
fontSize: 18.0, // fontSize: 18.0,
fontWeight: FontWeight.w500, // fontWeight: FontWeight.w500,
), // ),
), // ),
), // ),
Container( // Container(
child: Row( // child: Row(
children: [ // children: [
Expanded( // Expanded(
child: DropdownButton<String>( // child: DropdownButton<String>(
value: provider.selectedItem, // value: provider.selectedItem,
items: // items:
<String>[ // <String>[
'Active', // 'Active',
'Inactive', // 'Inactive',
'Suspense', // 'Suspense',
].map<DropdownMenuItem<String>>((String value,) { // ].map<DropdownMenuItem<String>>((String value,) {
return DropdownMenuItem<String>( // return DropdownMenuItem<String>(
value: value, // value: value,
child: Text(value), // child: Text(value),
); // );
}).toList(), // }).toList(),
onChanged: (String? newValue) { // onChanged: (String? newValue) {
setState(() { // setState(() {
provider.selectedItem = newValue!; // provider.selectedItem = newValue!;
}); // });
}, // },
icon: Icon( // icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
Icons.keyboard_arrow_down, // iconSize: 12,
), // iconEnabledColor:
iconSize: 12, // Colors
iconEnabledColor: // .black, // Remove the default dropdown icon
Colors // ),
.black, // Remove the default dropdown icon // ),
), // ],
), // ),
], // ),
), // SizedBox(height: 30.0),
), // Container(
SizedBox(height: 30.0), // child: InkWell(
Container( // onTap: () {
child: InkWell( // provider.debounce(() {
onTap: () { // provider.LoadNearbyGeneratorsAPI(context);
provider.debounce(() { // Navigator.pop(context);
provider.LoadNearbyGeneratorsAPI(context); // }, Duration(milliseconds: 500));
Navigator.pop(context); // },
}, Duration(milliseconds: 500)); // child: Container(
}, // alignment: Alignment.center,
child: Container( // height: 45,
alignment: Alignment.center, // margin: EdgeInsets.only(
height: 45, // left: 15.0,
margin: EdgeInsets.only( // right: 15.0,
left: 15.0, // ),
right: 15.0, // decoration: BoxDecoration(
), // borderRadius: BorderRadius.circular(10.0),
decoration: BoxDecoration( // ),
borderRadius: BorderRadius.circular(10.0), // child: Text(
), // "Search",
child: Text( // textAlign: TextAlign.center,
"Search", // style: TextStyle(
textAlign: TextAlign.center, // fontFamily: 'Nexa',
style: TextStyle( // fontWeight: FontWeight.w700,
fontFamily: 'Nexa', // ),
fontWeight: FontWeight.w700, // ),
), // ),
), // ),
), // ),
), // ],
), // ),
], // ),
), // ),
), // );
), // }),
); // barrierDismissible: true,
}), // ) ??
barrierDismissible: true, // false;
) ?? // }
false;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
...@@ -202,11 +203,9 @@ class _NearbygeneratorsState extends State<Nearbygenerators> { ...@@ -202,11 +203,9 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
return Consumer<Nearbygeneratorsprovider>(builder: (context, provider, child) { return Consumer<Nearbygeneratorsprovider>(builder: (context, provider, child) {
var sendWidget = GestureDetector( var sendWidget = GestureDetector(
onTap: () { onTap: () {
infoDialogue(context); _showFilterBottomSheet(context);
}, },
child: InkWell( child: SvgPicture.asset("assets/svg/filter_ic.svg",height: 25,));
child: Icon(Icons.filter_alt_outlined),
));
return WillPopScope( return WillPopScope(
onWillPop: () => onBackPressed(context), onWillPop: () => onBackPressed(context),
...@@ -258,4 +257,232 @@ class _NearbygeneratorsState extends State<Nearbygenerators> { ...@@ -258,4 +257,232 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
); );
},); },);
} }
Future<void> _showFilterBottomSheet(BuildContext context) {
return showModalBottomSheet(
useSafeArea: true,
isDismissible: true,
isScrollControlled: true,
showDragHandle: true,
enableDrag: true,
context: context,
builder: (context) {
return StatefulBuilder(
builder: (context, setState) {
return SafeArea(
child: Consumer<Nearbygeneratorsprovider>(
builder: (context,provider,child) {
return Container(
margin: EdgeInsets.only(
bottom: 15,
left: 15,
right: 15,
top: 15,
),
child: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"Filter",
style: TextStyle(
color: AppColors.app_blue,
fontFamily: "JakartaSemiBold",
fontSize: 16,
),
),
SizedBox(height: 15),
Align(
alignment: Alignment.centerLeft,
child: Text(
'Status',
style: TextStyle(
fontSize: 18.0,
fontWeight: FontWeight.w500,
),
),
),
DropdownButtonHideUnderline(
child: Row(
children: [
Expanded(
child: DropdownButton2<String>(
isExpanded: true,
hint: const Row(
children: [
Expanded(
child: Text(
'Select Complaint Status',
style: TextStyle(
fontSize: 14,
),
overflow: TextOverflow.ellipsis,
),
),
],
),
items: <String>[
'Active',
'Inactive',
'Suspense',
].map(
(value) =>
DropdownMenuItem<String>(
value: value,
child: Text(
value ?? '',
style: const TextStyle(
fontSize: 14,
),
overflow: TextOverflow.ellipsis,
),
)).toList(),
value: provider.selectedItem,
onChanged: (String? newValue) {
setState(() {
provider.selectedItem = newValue!;
});
},
buttonStyleData: ButtonStyleData(
height: 50,
width: 160,
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: 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),
),
),
),
],
),
),
Row(
children: [
Text(
"Radius",
style: TextStyle(
fontSize: 18.0,
fontWeight: FontWeight.w500,
),
),
Spacer(),
Text(
'${provider.currentValue.toStringAsFixed(2)} KM',
style: TextStyle(
fontSize: 18.0,
fontWeight: FontWeight.w500,
),
),
],
),
InteractiveSlider(
min: 1.0,
max: 100.0,
enabled: true,
// backgroundColor: AppColors.app_blue,
foregroundColor: AppColors.app_blue,
segmentDividerColor:Color(0xFFF6F6F8),
onChanged: (value) {
provider.currentValue = value;
provider.debounce(() {
provider.LoadNearbyGeneratorsAPI(context);
}, Duration(milliseconds: 200));
},
),
// Slider(
// value: provider.currentValue,
// max: 100,
// divisions: 100,
//
// label: provider.currentValue.toStringAsFixed(2),
// inactiveColor: Color(0xFFD7D7D7),
// activeColor: AppColors.cyan_blue,
// onChanged: (value) {
// provider.currentValue = value;
// provider.debounce(() {
// provider.LoadNearbyGeneratorsAPI(context);
// }, Duration(milliseconds: 200));
// },
// ),
SizedBox(height: 30.0),
Container(
child: InkWell(
onTap: () {
provider.debounce(() {
provider.LoadNearbyGeneratorsAPI(context);
Navigator.pop(context);
}, Duration(milliseconds: 500));
},
child: Container(
alignment: Alignment.center,
height: 45,
margin: EdgeInsets.only(
left: 15.0,
right: 15.0,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14.0),
color: AppColors.app_blue
),
child: Text(
"Search",
textAlign: TextAlign.center,
style: TextStyle(
fontFamily: 'JakartaMedium',
color: Colors.white
),
),
),
),
),
],
),
],
),
),
);
}
),
);
},
);
},
);
}
} }
lib/screens/serviceEngineer/PaymentDetails.dart
View file @ cdad3e17
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:generp/Notifiers/PaymentCollectionProvider.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/PaymentDetailsProvider.dart'; import 'package:generp/Notifiers/PaymentDetailsProvider.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';
...@@ -195,10 +195,8 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -195,10 +195,8 @@ class _PaymentdetailsState extends State<Paymentdetails> {
color: AppColors.text_field_color, color: AppColors.text_field_color,
), ),
), ),
iconStyleData: const IconStyleData( iconStyleData: IconStyleData(
icon: Icon( icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
Icons.keyboard_arrow_down_sharp,
),
iconSize: 12, iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D), iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey, iconDisabledColor: Colors.grey,
...@@ -292,10 +290,8 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -292,10 +290,8 @@ class _PaymentdetailsState extends State<Paymentdetails> {
color: AppColors.text_field_color, color: AppColors.text_field_color,
), ),
), ),
iconStyleData: const IconStyleData( iconStyleData: IconStyleData(
icon: Icon( icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
Icons.keyboard_arrow_down,
),
iconSize: 12, iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D), iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey, iconDisabledColor: Colors.grey,
...@@ -435,6 +431,28 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -435,6 +431,28 @@ class _PaymentdetailsState extends State<Paymentdetails> {
), ),
), ),
), ),
if(provider.imagePicked==1 && provider.imagePath!=null)...[
Padding(
padding: const EdgeInsets.symmetric(vertical: 4.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("${provider.imagePath}",style: TextStyle(
color: AppColors.semi_black,
fontSize: 11,
fontWeight: FontWeight.w600
),),
InkResponse(
onTap: () {
provider.imagePicked = 0;
provider.imagePath = null;
provider.imageFilePath = null;
},
child: SvgPicture.asset("assets/svg/ic_close.svg",width: 15,height: 15,))
],
),
)
],
], ],
), ),
), ),
......
lib/screens/serviceEngineer/PendingComplaints.dart
View file @ cdad3e17
...@@ -2,13 +2,10 @@ import 'package:flutter/material.dart'; ...@@ -2,13 +2,10 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/PendingComplaintsProvider.dart'; import 'package:generp/Notifiers/PendingComplaintsProvider.dart';
import 'package:generp/Utils/commonWidgets.dart'; import 'package:generp/Utils/commonWidgets.dart';
import 'package:generp/screens/serviceEngineer/PaymentDetails.dart'; import 'package:generp/screens/screensExports.dart';
import 'package:generp/screens/serviceEngineer/VisitDetails.dart';
import 'package:generp/screens/serviceEngineer/scanComplaintDetails.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'UpdateComplaints.dart'; import 'UpdateComplaints.dart';
...@@ -93,24 +90,31 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> { ...@@ -93,24 +90,31 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> {
), ),
SizedBox(width: 5), SizedBox(width: 5),
Column( Expanded(
crossAxisAlignment: flex: 4,
CrossAxisAlignment.start, child: Column(
children: [ crossAxisAlignment:
Text( CrossAxisAlignment.start,
"${provider.technician_complaint_list[index].contactName}", children: [
style: TextStyle( Text(
fontFamily: "JakartaMedium", "${provider.technician_complaint_list[index].contactName}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontFamily: "JakartaMedium",
),
), ),
), Text(
Text( "${provider.technician_complaint_list[index].companyName}",
"${provider.technician_complaint_list[index].companyName}", maxLines: 1,
style: TextStyle( overflow: TextOverflow.ellipsis,
color: Color(0xFF818181), style: TextStyle(
fontSize: 14, color: Color(0xFF818181),
fontSize: 14,
),
), ),
), ],
], ),
), ),
Spacer(), Spacer(),
Expanded( Expanded(
......
lib/screens/serviceEngineer/TodayMontlyVisists.dart
View file @ cdad3e17
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/serviceEngineer/PaymentDetails.dart';
import 'package:generp/screens/serviceEngineer/VisitDetails.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import 'package:generp/screens/screensExports.dart';
import '../../Notifiers/TodayMontlyVisitsProvider.dart'; import '../../Notifiers/TodayMontlyVisitsProvider.dart';
import '../../Utils/app_colors.dart'; import '../../Utils/app_colors.dart';
...@@ -104,23 +102,32 @@ class _TodaymontlyvisistsState extends State<Todaymontlyvisists> { ...@@ -104,23 +102,32 @@ class _TodaymontlyvisistsState extends State<Todaymontlyvisists> {
), ),
SizedBox(width: 5), SizedBox(width: 5),
Column( Expanded(
crossAxisAlignment: flex: 4,
CrossAxisAlignment.start, child: SizedBox(
children: [ child: Column(
Text( crossAxisAlignment:
"${provider.visitsList[index].contactName ?? "-"}", CrossAxisAlignment.start,
style: TextStyle( children: [
fontFamily: "JakartaMedium", Text(
), "${provider.visitsList[index].contactName ?? "-"}",
), maxLines: 1,
Text( overflow: TextOverflow.ellipsis,
"${provider.visitsList[index].companyName}", style: TextStyle(
style: TextStyle( fontFamily: "JakartaMedium",
color: Color(0xFF818181), ),
), ),
Text(
"${provider.visitsList[index].companyName}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Color(0xFF818181),
),
),
],
), ),
], ),
), ),
Spacer(), Spacer(),
Expanded( Expanded(
...@@ -281,58 +288,58 @@ class _TodaymontlyvisistsState extends State<Todaymontlyvisists> { ...@@ -281,58 +288,58 @@ class _TodaymontlyvisistsState extends State<Todaymontlyvisists> {
); );
} }
Future<void> _showOptionsSheet(BuildContext context) { // Future<void> _showOptionsSheet(BuildContext context) {
return showModalBottomSheet( // return showModalBottomSheet(
useSafeArea: true, // useSafeArea: true,
isDismissible: true, // isDismissible: true,
isScrollControlled: true, // isScrollControlled: true,
showDragHandle: true, // showDragHandle: true,
backgroundColor: Colors.white, // backgroundColor: Colors.white,
enableDrag: true, // enableDrag: true,
context: context, // context: context,
builder: (context) { // builder: (context) {
return StatefulBuilder( // return StatefulBuilder(
builder: (context, setState) { // builder: (context, setState) {
return SafeArea( // return SafeArea(
child: Consumer<Todaymontlyvisitsprovider>( // child: Consumer<Todaymontlyvisitsprovider>(
builder: (context, provider, child) { // builder: (context, provider, child) {
return Container( // return Container(
margin: EdgeInsets.only( // margin: EdgeInsets.only(
bottom: 15, // bottom: 15,
left: 15, // left: 15,
right: 15, // right: 15,
top: 10, // top: 10,
), // ),
//
child: SingleChildScrollView( // child: SingleChildScrollView(
child: Column( // child: Column(
mainAxisSize: MainAxisSize.min, // mainAxisSize: MainAxisSize.min,
children: [ // children: [
SizedBox(height: 15), // SizedBox(height: 15),
//
ListTile( // ListTile(
onTap: () async { // onTap: () async {
// _showUpdateComplaintSheet(context,provider.visitsList[index].complaintId); // // _showUpdateComplaintSheet(context,provider.visitsList[index].complaintId);
}, // },
leading: SvgPicture.asset( // leading: SvgPicture.asset(
"assets/svg/se_payment_details.svg", // "assets/svg/se_payment_details.svg",
), // ),
title: Text("Payment Details"), // title: Text("Payment Details"),
trailing: Icon( // trailing: Icon(
Icons.arrow_forward_ios_sharp, // Icons.arrow_forward_ios_sharp,
size: 16, // size: 16,
), // ),
), // ),
], // ],
), // ),
), // ),
); // );
}, // },
), // ),
); // );
}, // },
); // );
}, // },
); // );
} // }
} }
lib/screens/serviceEngineer/UpdateComplaints.dart
View file @ cdad3e17
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:generp/Notifiers/PendingComplaintsProvider.dart'; import 'package:generp/Notifiers/PendingComplaintsProvider.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';
...@@ -27,7 +28,10 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> { ...@@ -27,7 +28,10 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
return Consumer<Pendingcomplaintsprovider>( return Consumer<Pendingcomplaintsprovider>(
builder: (context, provider, child) { builder: (context, provider, child) {
return WillPopScope( return WillPopScope(
onWillPop: () => onBackPressed(context), onWillPop: () {
provider.submitLoading = false;
return onBackPressed(context);
},
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
appBar: appbar(context, "Update Complaint"), appBar: appbar(context, "Update Complaint"),
...@@ -322,6 +326,28 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> { ...@@ -322,6 +326,28 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
), ),
), ),
), ),
if(provider.imagePicked==1 && provider.imagePath!=null)...[
Padding(
padding: const EdgeInsets.symmetric(vertical: 4.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("${provider.imagePath}",style: TextStyle(
color: AppColors.semi_black,
fontSize: 11,
fontWeight: FontWeight.w600
),),
InkResponse(
onTap: () {
provider.imagePicked = 0;
provider.imagePath = null;
provider.imageFilePath = null;
},
child: SvgPicture.asset("assets/svg/ic_close.svg",width: 15,height: 15,))
],
),
)
],
Padding( Padding(
padding: const EdgeInsets.only(bottom: 5.0), padding: const EdgeInsets.only(bottom: 5.0),
child: Text( child: Text(
...@@ -376,8 +402,9 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> { ...@@ -376,8 +402,9 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
), ),
), ),
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat, floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
floatingActionButton: InkWell( floatingActionButton: InkResponse(
onTap: () { onTap:provider.submitLoading?null: () {
provider.submitLoading = true;
provider.UpdateComplaintAPIFunction( provider.UpdateComplaintAPIFunction(
context, context,
widget.ComplaintID, widget.ComplaintID,
...@@ -400,7 +427,10 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> { ...@@ -400,7 +427,10 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
borderRadius: BorderRadius.circular(15.0), borderRadius: BorderRadius.circular(15.0),
), ),
child: Center( child: Center(
child: Text( child:provider.submitLoading?CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>(
AppColors.white)
): Text(
"Submit", "Submit",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
......
lib/screens/serviceEngineer/VisitDetails.dart
View file @ cdad3e17
...@@ -57,78 +57,70 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -57,78 +57,70 @@ class _VisitdetailsState extends State<Visitdetails> {
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
), ),
child: Column( child: Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Row( children: List.generate(4, (j) {
children: [ final textheads = [
Column( "${customerDetails.cname}",
crossAxisAlignment: CrossAxisAlignment.start, "Mobile Number",
children: List.generate(4, (j) { "Contact Person Number",
final textheads = [ "Mail ID",
"${customerDetails.cname}", ];
"Mobile Number", final textSubheads = [
"Contact Person Number", customerDetails.aname??"-",
"Mail ID", customerDetails.mob1??"-",
]; customerDetails.mob2??"-",
final textSubheads = [ customerDetails.mail??"-",
"${customerDetails.aname}", ];
"${customerDetails.mob1}", return Container(
"${customerDetails.mob2}",
"${customerDetails.mail}", padding: EdgeInsets.symmetric(
]; vertical: 6,
return Container( horizontal: 0,
padding: EdgeInsets.symmetric(vertical: 3), ),
child: Container( child: Row(
padding: EdgeInsets.symmetric( mainAxisAlignment:
vertical: 3, MainAxisAlignment.spaceBetween,
horizontal: 0, children: [
), if (j == 0) ...[
child: Column( SvgPicture.asset(
children: [ "assets/svg/se_block_head.svg",
Row( ),
mainAxisAlignment: SizedBox(width: 5),
MainAxisAlignment.spaceBetween, ],
children: [ Expanded(
if (j == 0) ...[ child: SizedBox(
SvgPicture.asset( child: Column(
"assets/svg/se_block_head.svg", crossAxisAlignment:
), CrossAxisAlignment.start,
SizedBox(width: 5), children: [
], Text(textheads[j].toString(),
Column( maxLines: 2,
crossAxisAlignment: overflow: TextOverflow.ellipsis,),
CrossAxisAlignment.start, SizedBox(
children: [ // height:45,
Text(textheads[j].toString()), width:
SizedBox( MediaQuery.of(
// height:45, context,
width: ).size.width *
MediaQuery.of( 0.75,
context, child: Text(
).size.width * textSubheads[j],
0.75, maxLines: 2,
child: Text( overflow:
textSubheads[j], TextOverflow.ellipsis,
maxLines: 2, style: TextStyle(
overflow: color: Color(0xFF818181),
TextOverflow.ellipsis, ),
style: TextStyle(
color: Color(0xFF818181),
),
),
),
],
),
],
), ),
], ),
), ],
), ),
); ),
}), ),
), ],
], ),
), );
], }),
), ),
), ),
...@@ -319,13 +311,14 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -319,13 +311,14 @@ class _VisitdetailsState extends State<Visitdetails> {
margin: EdgeInsets.symmetric(horizontal: 10), margin: EdgeInsets.symmetric(horizontal: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.app_blue, color: AppColors.app_blue,
borderRadius: BorderRadius.circular(30.0), borderRadius: BorderRadius.circular(14.0),
), ),
child: Center( child: Center(
child: Text( child: Text(
"Followup Details", "Followup Details",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle(color: Colors.white), style: TextStyle(color: Colors.white,
fontFamily: "JakartaMedium"),
), ),
), ),
), ),
......
lib/screens/serviceEngineer/serviceEngineerDashboard.dart
View file @ cdad3e17
...@@ -3,13 +3,8 @@ import 'package:flutter_svg/svg.dart'; ...@@ -3,13 +3,8 @@ import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/ServiceEngineerDashboardProvider.dart'; import 'package:generp/Notifiers/ServiceEngineerDashboardProvider.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/screens/serviceEngineer/MonthlyCollection.dart';
import 'package:generp/screens/serviceEngineer/NearbyGenerators.dart';
import 'package:generp/screens/serviceEngineer/PCWallet.dart';
import 'package:generp/screens/serviceEngineer/PendingComplaints.dart';
import 'package:generp/screens/serviceEngineer/TodayMontlyVisists.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:generp/screens/screensExports.dart';
class Serviceengineerdashboard extends StatefulWidget { class Serviceengineerdashboard extends StatefulWidget {
const Serviceengineerdashboard({super.key}); const Serviceengineerdashboard({super.key});
...@@ -259,10 +254,12 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> { ...@@ -259,10 +254,12 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> {
Row( Row(
children: [ children: [
if([0,1].contains(index))...[
Text("₹",style: TextStyle( Text("₹",style: TextStyle(
fontSize: 14, fontSize: 14,
color: Color(textColorCodes[index]), color: Color(textColorCodes[index]),
),), ),),
],
Padding( Padding(
padding: EdgeInsets.only(top: 5), padding: EdgeInsets.only(top: 5),
child: Text( child: Text(
......
lib/screens/splash.dart
View file @ cdad3e17
import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:generp/services/api_calling.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
import '../Notifiers/splashVersionNotifier.dart'; import '../Notifiers/splashVersionNotifier.dart';
......
lib/screens/test.dart
View file @ cdad3e17
import 'dart:io';
import 'dart:async'; import 'dart:async';
import 'dart:ui' as ui;
import 'package:intl/intl.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:dropdown_button2/dropdown_button2.dart'; import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:cached_network_image/cached_network_image.dart';
class Affiliatedashboard extends StatefulWidget { class Affiliatedashboard extends StatefulWidget {
const Affiliatedashboard({super.key}); const Affiliatedashboard({super.key});
......
lib/services/api_calling.dart
View file @ cdad3e17
...@@ -199,7 +199,8 @@ class ApiCalling { ...@@ -199,7 +199,8 @@ class ApiCalling {
}; };
final res = await post(data, updatePasswordUrl, {}); final res = await post(data, updatePasswordUrl, {});
if (res != null) { if (res != null) {
// debugPrint("update password ${res.body}"); debugPrint("update password ${res.body}");
debugPrint("update password ${data}");
return UpdatePasswordResponse.fromJson(jsonDecode(res.body)); return UpdatePasswordResponse.fromJson(jsonDecode(res.body));
} else { } else {
debugPrint("Null Response"); debugPrint("Null Response");
...@@ -673,7 +674,7 @@ class ApiCalling { ...@@ -673,7 +674,7 @@ class ApiCalling {
}; };
final res = await post(data, technicianGeneratorDetailsUrl, {}); final res = await post(data, technicianGeneratorDetailsUrl, {});
if (res != null) { if (res != null) {
// debugPrint(res.body); debugPrint(res.body);
return loadGeneratorDetailsResponse.fromJson(jsonDecode(res.body)); return loadGeneratorDetailsResponse.fromJson(jsonDecode(res.body));
} else { } else {
debugPrint("Null Response"); debugPrint("Null Response");
......
pubspec.lock
View file @ cdad3e17
...@@ -37,10 +37,10 @@ packages: ...@@ -37,10 +37,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: async name: async
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.13.0" version: "2.12.0"
barcode: barcode:
dependency: transitive dependency: transitive
description: description:
...@@ -285,10 +285,10 @@ packages: ...@@ -285,10 +285,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: fake_async name: fake_async
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.3" version: "1.3.2"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
...@@ -904,6 +904,14 @@ packages: ...@@ -904,6 +904,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.2.1+1" version: "0.2.1+1"
interactive_slider:
dependency: "direct main"
description:
name: interactive_slider
sha256: "0b67d6161335059250141c3bfff82b15fb4f852a797a93d9e4b1234ad27b6655"
url: "https://pub.dev"
source: hosted
version: "0.5.1"
intl: intl:
dependency: "direct main" dependency: "direct main"
description: description:
...@@ -924,26 +932,26 @@ packages: ...@@ -924,26 +932,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0" sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "11.0.1" version: "10.0.8"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.10" version: "3.0.9"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_testing name: leak_tracker_testing
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.2" version: "3.0.1"
lints: lints:
dependency: transitive dependency: transitive
description: description:
...@@ -1641,10 +1649,10 @@ packages: ...@@ -1641,10 +1649,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "15.0.0" version: "14.3.1"
web: web:
dependency: transitive dependency: transitive
description: description:
......
pubspec.yaml
View file @ cdad3e17
...@@ -77,6 +77,7 @@ dependencies: ...@@ -77,6 +77,7 @@ dependencies:
excel: ^4.0.6 excel: ^4.0.6
pdf: ^3.11.3 pdf: ^3.11.3
printing: ^5.14.2 printing: ^5.14.2
interactive_slider: ^0.5.1
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
......
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