Skip to content

GitLab

"assets/svg/git@183.82.99.133:saisrinivas/gen_erp_2025.git" did not exist on "dddda326afb1d9438475c15d443effd25fe10ac8"
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
Expand all Show 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/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,18 +90,24 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> { ...@@ -93,18 +90,24 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> {
), ),
SizedBox(width: 5), SizedBox(width: 5),
Column( Expanded(
flex: 4,
child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"${provider.technician_complaint_list[index].contactName}", "${provider.technician_complaint_list[index].contactName}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontFamily: "JakartaMedium", fontFamily: "JakartaMedium",
), ),
), ),
Text( Text(
"${provider.technician_complaint_list[index].companyName}", "${provider.technician_complaint_list[index].companyName}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
color: Color(0xFF818181), color: Color(0xFF818181),
fontSize: 14, fontSize: 14,
...@@ -112,6 +115,7 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> { ...@@ -112,6 +115,7 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> {
), ),
], ],
), ),
),
Spacer(), Spacer(),
Expanded( Expanded(
flex: 1, flex: 1,
......
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,24 +102,33 @@ class _TodaymontlyvisistsState extends State<Todaymontlyvisists> { ...@@ -104,24 +102,33 @@ class _TodaymontlyvisistsState extends State<Todaymontlyvisists> {
), ),
SizedBox(width: 5), SizedBox(width: 5),
Column( Expanded(
flex: 4,
child: SizedBox(
child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"${provider.visitsList[index].contactName ?? "-"}", "${provider.visitsList[index].contactName ?? "-"}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontFamily: "JakartaMedium", fontFamily: "JakartaMedium",
), ),
), ),
Text( Text(
"${provider.visitsList[index].companyName}", "${provider.visitsList[index].companyName}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
color: Color(0xFF818181), color: Color(0xFF818181),
), ),
), ),
], ],
), ),
),
),
Spacer(), Spacer(),
Expanded( Expanded(
flex: 1, flex: 1,
...@@ -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,10 +57,6 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -57,10 +57,6 @@ class _VisitdetailsState extends State<Visitdetails> {
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
), ),
child: Column( child: Column(
children: [
Row(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: List.generate(4, (j) { children: List.generate(4, (j) {
final textheads = [ final textheads = [
...@@ -70,21 +66,18 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -70,21 +66,18 @@ class _VisitdetailsState extends State<Visitdetails> {
"Mail ID", "Mail ID",
]; ];
final textSubheads = [ final textSubheads = [
"${customerDetails.aname}", customerDetails.aname??"-",
"${customerDetails.mob1}", customerDetails.mob1??"-",
"${customerDetails.mob2}", customerDetails.mob2??"-",
"${customerDetails.mail}", customerDetails.mail??"-",
]; ];
return Container( return Container(
padding: EdgeInsets.symmetric(vertical: 3),
child: Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
vertical: 3, vertical: 6,
horizontal: 0, horizontal: 0,
), ),
child: Column( child: Row(
children: [
Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceBetween, MainAxisAlignment.spaceBetween,
children: [ children: [
...@@ -94,11 +87,15 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -94,11 +87,15 @@ class _VisitdetailsState extends State<Visitdetails> {
), ),
SizedBox(width: 5), SizedBox(width: 5),
], ],
Column( Expanded(
child: SizedBox(
child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Text(textheads[j].toString()), Text(textheads[j].toString(),
maxLines: 2,
overflow: TextOverflow.ellipsis,),
SizedBox( SizedBox(
// height:45, // height:45,
width: width:
...@@ -118,18 +115,13 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -118,18 +115,13 @@ class _VisitdetailsState extends State<Visitdetails> {
), ),
], ],
), ),
],
), ),
],
), ),
],
), ),
); );
}), }),
), ),
],
),
],
),
), ),
Text("Generator Details"), Text("Generator Details"),
...@@ -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