Skip to content

GitLab

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
Show whitespace changes
Inline Side-by-side
lib/screens/genTracker/ScanEnterGeneratorIDScreen.dart
View file @ cdad3e17
......@@ -4,7 +4,6 @@ import 'package:provider/provider.dart';
import 'package:qr_code_scanner/qr_code_scanner.dart';
import '../../Notifiers/HomeScreenNotifier.dart';
import '../../Notifiers/InventoryProvider.dart';
import '../../Utils/app_colors.dart';
import '../../Utils/commonWidgets.dart';
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_svg/svg.dart';
import 'package:provider/provider.dart';
import '../../Notifiers/VisitDetailsProvider.dart';
......
lib/screens/serviceEngineer/MonthlyCollection.dart
View file @ cdad3e17
......@@ -108,12 +108,16 @@ class _MonthlycollectionState extends State<Monthlycollection> {
children: [
Text(
"${provider.paymenCollectionList[index].accountName}",
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontFamily: "JakartaMedium"
),
),
Text(
"₹${provider.paymenCollectionList[index].amount}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(color: AppColors.app_blue),
),
// 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_svg/svg.dart';
import 'package:generp/Notifiers/NearByGeneratorsProvider.dart';
import 'package:generp/Utils/app_colors.dart';
import 'package:generp/Utils/commonWidgets.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:interactive_slider/interactive_slider.dart';
import 'package:provider/provider.dart';
class Nearbygenerators extends StatefulWidget {
......@@ -23,93 +26,278 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
},);
}
Future infoDialogue(BuildContext context) async {
// Future infoDialogue(BuildContext context) async {
//
// return await showDialog(
// context: context,
// builder:
// (context) => Consumer<Nearbygeneratorsprovider>(
// builder: (context,provider,child) {
// return StatefulBuilder(
// builder:
// (context, setState) =>
// AlertDialog(
// shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.circular(10.0),
// ),
// title: Column(
// children: [
// Row(
// children: [
// Expanded(
// child: Align(
// alignment: Alignment.topLeft,
// child: Text(
// 'Filter',
// style: TextStyle(
// color: Colors.black,
// fontWeight: FontWeight.w500,
// ),
// ),
// ),
// ),
// InkWell(
// child: SvgPicture.asset("assets/svg/ic_close.svg",height: 18,width: 18,),
// onTap: () {
// setState(() {
// provider.currentValue = 0.0;
// provider.selectedItem = "Active";
// });
// Navigator.pop(context);
// },
// ),
// ],
// ),
// Divider(
// color: Colors.grey,
// thickness: 1.0,
// height: 0.0,
// ),
// ],
// ),
//
// content: Container(
// height: 230,
// child: Column(
// children: [
// 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,
// ),
// ),
// ],
// ),
// 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: 500));
// },
// ),
// Align(
// alignment: Alignment.centerLeft,
// child: Text(
// 'Status',
//
// style: TextStyle(
// fontSize: 18.0,
// fontWeight: FontWeight.w500,
// ),
// ),
// ),
// Container(
// child: Row(
// children: [
// Expanded(
// child: DropdownButton<String>(
// value: provider.selectedItem,
// items:
// <String>[
// 'Active',
// 'Inactive',
// 'Suspense',
// ].map<DropdownMenuItem<String>>((String value,) {
// return DropdownMenuItem<String>(
// value: value,
// child: Text(value),
// );
// }).toList(),
// onChanged: (String? newValue) {
// setState(() {
// provider.selectedItem = newValue!;
// });
// },
// icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
// iconSize: 12,
// iconEnabledColor:
// Colors
// .black, // Remove the default dropdown icon
// ),
// ),
// ],
// ),
// ),
// 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(10.0),
// ),
// child: Text(
// "Search",
// textAlign: TextAlign.center,
// style: TextStyle(
// fontFamily: 'Nexa',
// fontWeight: FontWeight.w700,
// ),
// ),
// ),
// ),
// ),
// ],
// ),
// ),
// ),
// );
// }),
// barrierDismissible: true,
// ) ??
// false;
// }
return await showDialog(
context: context,
builder:
(context) => Consumer<Nearbygeneratorsprovider>(
builder: (context,provider,child) {
return StatefulBuilder(
builder:
(context, setState) =>
AlertDialog(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0),
),
title: Column(
children: [
Row(
@override
Widget build(BuildContext context) {
debugPrint("Nearbygenerators widget rebuilt");
return Consumer<Nearbygeneratorsprovider>(builder: (context, provider, child) {
var sendWidget = GestureDetector(
onTap: () {
_showFilterBottomSheet(context);
},
child: SvgPicture.asset("assets/svg/filter_ic.svg",height: 25,));
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(context, "Nearby Generators",sendWidget),
backgroundColor: AppColors.scaffold_bg_color,
body: Container(
child: SingleChildScrollView(
child:Column(
children: [
Expanded(
child: Align(
alignment: Alignment.topLeft,
child: Text(
'Filter',
style: TextStyle(
color: Colors.black,
fontWeight: FontWeight.w500,
),
),
ClipRRect(
// Apply border radius using ClipRRect
borderRadius: BorderRadius.only(
topLeft: Radius.circular(30.0),
topRight: Radius.circular(30.0),
),
// padding: EdgeInsets.fromLTRB(10, 20, 10, 20),
child: Container(
height: MediaQuery.of(context).size.height,
child: Stack(children: [
GoogleMap(
myLocationEnabled: true,
zoomGesturesEnabled: true,
initialCameraPosition: CameraPosition(
target: provider.startLocation,
zoom: 14.0,
),
InkWell(
child: Icon(Icons.close),
onTap: () {
markers:provider.markers.toSet(),
mapType: MapType.normal,
onMapCreated: (controller) {
setState(() {
provider.currentValue = 0.0;
provider.selectedItem = "Active";
provider.mapController = controller;
});
Navigator.pop(context);
},
onCameraMove: (position) {
provider.onCameraMove(context,position);
},
),
],
]),
),
Divider(
color: Colors.grey,
thickness: 1.0,
height: 0.0,
),
],
),
),
),
),
);
},);
}
content: Container(
height: 230,
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: [
Row(
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"Radius",
style: TextStyle(
fontSize: 18.0,
fontWeight: FontWeight.w500,
),
),
Spacer(),
Text(
'${provider.currentValue.toStringAsFixed(2)} KM',
"Filter",
style: TextStyle(
fontSize: 18.0,
fontWeight: FontWeight.w500,
),
color: AppColors.app_blue,
fontFamily: "JakartaSemiBold",
fontSize: 16,
),
],
),
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: 500));
},
),
SizedBox(height: 15),
Align(
alignment: Alignment.centerLeft,
child: Text(
......@@ -121,40 +309,137 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
),
),
),
Container(
DropdownButtonHideUnderline(
child: Row(
children: [
Expanded(
child: DropdownButton<String>(
value: provider.selectedItem,
items:
<String>[
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<DropdownMenuItem<String>>((String value,) {
return DropdownMenuItem<String>(
].map(
(value) =>
DropdownMenuItem<String>(
value: value,
child: Text(value),
);
}).toList(),
child: Text(
value ?? '',
style: const TextStyle(
fontSize: 14,
),
overflow: TextOverflow.ellipsis,
),
)).toList(),
value: provider.selectedItem,
onChanged: (String? newValue) {
setState(() {
provider.selectedItem = newValue!;
});
},
icon: Icon(
Icons.keyboard_arrow_down,
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,
),
iconSize: 12,
iconEnabledColor:
Colors
.black, // Remove the default dropdown icon
),
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(
......@@ -172,14 +457,15 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
right: 15.0,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.0),
borderRadius: BorderRadius.circular(14.0),
color: AppColors.app_blue
),
child: Text(
"Search",
textAlign: TextAlign.center,
style: TextStyle(
fontFamily: 'Nexa',
fontWeight: FontWeight.w700,
fontFamily: 'JakartaMedium',
color: Colors.white
),
),
),
......@@ -187,75 +473,16 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
),
],
),
],
),
),
);
}),
barrierDismissible: true,
) ??
false;
}
@override
Widget build(BuildContext context) {
debugPrint("Nearbygenerators widget rebuilt");
return Consumer<Nearbygeneratorsprovider>(builder: (context, provider, child) {
var sendWidget = GestureDetector(
onTap: () {
infoDialogue(context);
},
child: InkWell(
child: Icon(Icons.filter_alt_outlined),
));
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(context, "Nearby Generators",sendWidget),
backgroundColor: AppColors.scaffold_bg_color,
body: Container(
child: SingleChildScrollView(
child:Column(
children: [
ClipRRect(
// Apply border radius using ClipRRect
borderRadius: BorderRadius.only(
topLeft: Radius.circular(30.0),
topRight: Radius.circular(30.0),
),
// padding: EdgeInsets.fromLTRB(10, 20, 10, 20),
child: Container(
height: MediaQuery.of(context).size.height,
child: Stack(children: [
GoogleMap(
myLocationEnabled: true,
zoomGesturesEnabled: true,
initialCameraPosition: CameraPosition(
target: provider.startLocation,
zoom: 14.0,
),
markers:provider.markers.toSet(),
mapType: MapType.normal,
onMapCreated: (controller) {
setState(() {
provider.mapController = controller;
});
);
},
onCameraMove: (position) {
provider.onCameraMove(context,position);
);
},
),
]),
),
),
],
),
),
),
),
);
},);
}
}
lib/screens/serviceEngineer/PaymentDetails.dart
View file @ cdad3e17
import 'package:dropdown_button2/dropdown_button2.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/Utils/app_colors.dart';
import 'package:generp/Utils/commonWidgets.dart';
......@@ -195,10 +195,8 @@ class _PaymentdetailsState extends State<Paymentdetails> {
color: AppColors.text_field_color,
),
),
iconStyleData: const IconStyleData(
icon: Icon(
Icons.keyboard_arrow_down_sharp,
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
......@@ -292,10 +290,8 @@ class _PaymentdetailsState extends State<Paymentdetails> {
color: AppColors.text_field_color,
),
),
iconStyleData: const IconStyleData(
icon: Icon(
Icons.keyboard_arrow_down,
),
iconStyleData: IconStyleData(
icon: SvgPicture.asset("assets/svg/arrow_dropdown.svg",height: 25,width: 20,),
iconSize: 12,
iconEnabledColor: Color(0xFF2D2D2D),
iconDisabledColor: Colors.grey,
......@@ -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';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/PendingComplaintsProvider.dart';
import 'package:generp/Utils/commonWidgets.dart';
import 'package:generp/screens/serviceEngineer/PaymentDetails.dart';
import 'package:generp/screens/serviceEngineer/VisitDetails.dart';
import 'package:generp/screens/serviceEngineer/scanComplaintDetails.dart';
import 'package:generp/screens/screensExports.dart';
import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../Utils/app_colors.dart';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'UpdateComplaints.dart';
......@@ -93,18 +90,24 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> {
),
SizedBox(width: 5),
Column(
Expanded(
flex: 4,
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
"${provider.technician_complaint_list[index].contactName}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontFamily: "JakartaMedium",
),
),
Text(
"${provider.technician_complaint_list[index].companyName}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Color(0xFF818181),
fontSize: 14,
......@@ -112,6 +115,7 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> {
),
],
),
),
Spacer(),
Expanded(
flex: 1,
......
lib/screens/serviceEngineer/TodayMontlyVisists.dart
View file @ cdad3e17
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.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:url_launcher/url_launcher.dart';
import 'package:generp/screens/screensExports.dart';
import '../../Notifiers/TodayMontlyVisitsProvider.dart';
import '../../Utils/app_colors.dart';
......@@ -104,24 +102,33 @@ class _TodaymontlyvisistsState extends State<Todaymontlyvisists> {
),
SizedBox(width: 5),
Column(
Expanded(
flex: 4,
child: SizedBox(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
"${provider.visitsList[index].contactName ?? "-"}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontFamily: "JakartaMedium",
),
),
Text(
"${provider.visitsList[index].companyName}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Color(0xFF818181),
),
),
],
),
),
),
Spacer(),
Expanded(
flex: 1,
......@@ -281,58 +288,58 @@ class _TodaymontlyvisistsState extends State<Todaymontlyvisists> {
);
}
Future<void> _showOptionsSheet(BuildContext context) {
return showModalBottomSheet(
useSafeArea: true,
isDismissible: true,
isScrollControlled: true,
showDragHandle: true,
backgroundColor: Colors.white,
enableDrag: true,
context: context,
builder: (context) {
return StatefulBuilder(
builder: (context, setState) {
return SafeArea(
child: Consumer<Todaymontlyvisitsprovider>(
builder: (context, provider, child) {
return Container(
margin: EdgeInsets.only(
bottom: 15,
left: 15,
right: 15,
top: 10,
),
child: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(height: 15),
ListTile(
onTap: () async {
// _showUpdateComplaintSheet(context,provider.visitsList[index].complaintId);
},
leading: SvgPicture.asset(
"assets/svg/se_payment_details.svg",
),
title: Text("Payment Details"),
trailing: Icon(
Icons.arrow_forward_ios_sharp,
size: 16,
),
),
],
),
),
);
},
),
);
},
);
},
);
}
// Future<void> _showOptionsSheet(BuildContext context) {
// return showModalBottomSheet(
// useSafeArea: true,
// isDismissible: true,
// isScrollControlled: true,
// showDragHandle: true,
// backgroundColor: Colors.white,
// enableDrag: true,
// context: context,
// builder: (context) {
// return StatefulBuilder(
// builder: (context, setState) {
// return SafeArea(
// child: Consumer<Todaymontlyvisitsprovider>(
// builder: (context, provider, child) {
// return Container(
// margin: EdgeInsets.only(
// bottom: 15,
// left: 15,
// right: 15,
// top: 10,
// ),
//
// child: SingleChildScrollView(
// child: Column(
// mainAxisSize: MainAxisSize.min,
// children: [
// SizedBox(height: 15),
//
// ListTile(
// onTap: () async {
// // _showUpdateComplaintSheet(context,provider.visitsList[index].complaintId);
// },
// leading: SvgPicture.asset(
// "assets/svg/se_payment_details.svg",
// ),
// title: Text("Payment Details"),
// trailing: Icon(
// Icons.arrow_forward_ios_sharp,
// size: 16,
// ),
// ),
// ],
// ),
// ),
// );
// },
// ),
// );
// },
// );
// },
// );
// }
}
lib/screens/serviceEngineer/UpdateComplaints.dart
View file @ cdad3e17
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/PendingComplaintsProvider.dart';
import 'package:generp/Utils/app_colors.dart';
import 'package:generp/Utils/commonWidgets.dart';
......@@ -27,7 +28,10 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
return Consumer<Pendingcomplaintsprovider>(
builder: (context, provider, child) {
return WillPopScope(
onWillPop: () => onBackPressed(context),
onWillPop: () {
provider.submitLoading = false;
return onBackPressed(context);
},
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar(context, "Update Complaint"),
......@@ -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: const EdgeInsets.only(bottom: 5.0),
child: Text(
......@@ -376,8 +402,9 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
),
),
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
floatingActionButton: InkWell(
onTap: () {
floatingActionButton: InkResponse(
onTap:provider.submitLoading?null: () {
provider.submitLoading = true;
provider.UpdateComplaintAPIFunction(
context,
widget.ComplaintID,
......@@ -400,7 +427,10 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
borderRadius: BorderRadius.circular(15.0),
),
child: Center(
child: Text(
child:provider.submitLoading?CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>(
AppColors.white)
): Text(
"Submit",
textAlign: TextAlign.center,
style: TextStyle(
......
lib/screens/serviceEngineer/VisitDetails.dart
View file @ cdad3e17
......@@ -57,10 +57,6 @@ class _VisitdetailsState extends State<Visitdetails> {
borderRadius: BorderRadius.circular(20),
),
child: Column(
children: [
Row(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: List.generate(4, (j) {
final textheads = [
......@@ -70,21 +66,18 @@ class _VisitdetailsState extends State<Visitdetails> {
"Mail ID",
];
final textSubheads = [
"${customerDetails.aname}",
"${customerDetails.mob1}",
"${customerDetails.mob2}",
"${customerDetails.mail}",
customerDetails.aname??"-",
customerDetails.mob1??"-",
customerDetails.mob2??"-",
customerDetails.mail??"-",
];
return Container(
padding: EdgeInsets.symmetric(vertical: 3),
child: Container(
padding: EdgeInsets.symmetric(
vertical: 3,
vertical: 6,
horizontal: 0,
),
child: Column(
children: [
Row(
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
......@@ -94,11 +87,15 @@ class _VisitdetailsState extends State<Visitdetails> {
),
SizedBox(width: 5),
],
Column(
Expanded(
child: SizedBox(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(textheads[j].toString()),
Text(textheads[j].toString(),
maxLines: 2,
overflow: TextOverflow.ellipsis,),
SizedBox(
// height:45,
width:
......@@ -118,18 +115,13 @@ class _VisitdetailsState extends State<Visitdetails> {
),
],
),
],
),
],
),
],
),
);
}),
),
],
),
],
),
),
Text("Generator Details"),
......@@ -319,13 +311,14 @@ class _VisitdetailsState extends State<Visitdetails> {
margin: EdgeInsets.symmetric(horizontal: 10),
decoration: BoxDecoration(
color: AppColors.app_blue,
borderRadius: BorderRadius.circular(30.0),
borderRadius: BorderRadius.circular(14.0),
),
child: Center(
child: Text(
"Followup Details",
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';
import 'package:generp/Notifiers/ServiceEngineerDashboardProvider.dart';
import 'package:generp/Utils/app_colors.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:generp/screens/screensExports.dart';
class Serviceengineerdashboard extends StatefulWidget {
const Serviceengineerdashboard({super.key});
......@@ -259,10 +254,12 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> {
Row(
children: [
if([0,1].contains(index))...[
Text("₹",style: TextStyle(
fontSize: 14,
color: Color(textColorCodes[index]),
),),
],
Padding(
padding: EdgeInsets.only(top: 5),
child: Text(
......
lib/screens/splash.dart
View file @ cdad3e17
import 'dart:convert';
import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:generp/services/api_calling.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
import '../Notifiers/splashVersionNotifier.dart';
......
lib/screens/test.dart
View file @ cdad3e17
import 'dart:io';
import 'dart:async';
import 'dart:ui' as ui;
import 'package:intl/intl.dart';
import 'package:flutter_svg/svg.dart';
import 'package:flutter/material.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 {
const Affiliatedashboard({super.key});
......
lib/services/api_calling.dart
View file @ cdad3e17
......@@ -199,7 +199,8 @@ class ApiCalling {
};
final res = await post(data, updatePasswordUrl, {});
if (res != null) {
// debugPrint("update password ${res.body}");
debugPrint("update password ${res.body}");
debugPrint("update password ${data}");
return UpdatePasswordResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
......@@ -673,7 +674,7 @@ class ApiCalling {
};
final res = await post(data, technicianGeneratorDetailsUrl, {});
if (res != null) {
// debugPrint(res.body);
debugPrint(res.body);
return loadGeneratorDetailsResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
......
pubspec.lock
View file @ cdad3e17
......@@ -37,10 +37,10 @@ packages:
dependency: transitive
description:
name: async
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
url: "https://pub.dev"
source: hosted
version: "2.13.0"
version: "2.12.0"
barcode:
dependency: transitive
description:
......@@ -285,10 +285,10 @@ packages:
dependency: transitive
description:
name: fake_async
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
url: "https://pub.dev"
source: hosted
version: "1.3.3"
version: "1.3.2"
ffi:
dependency: transitive
description:
......@@ -904,6 +904,14 @@ packages:
url: "https://pub.dev"
source: hosted
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:
dependency: "direct main"
description:
......@@ -924,26 +932,26 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
url: "https://pub.dev"
source: hosted
version: "11.0.1"
version: "10.0.8"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
url: "https://pub.dev"
source: hosted
version: "3.0.10"
version: "3.0.9"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev"
source: hosted
version: "3.0.2"
version: "3.0.1"
lints:
dependency: transitive
description:
......@@ -1641,10 +1649,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
url: "https://pub.dev"
source: hosted
version: "15.0.0"
version: "14.3.1"
web:
dependency: transitive
description:
......
pubspec.yaml
View file @ cdad3e17
......@@ -77,6 +77,7 @@ dependencies:
excel: ^4.0.6
pdf: ^3.11.3
printing: ^5.14.2
interactive_slider: ^0.5.1
dev_dependencies:
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