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
Expand all Hide 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/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,24 +90,31 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> {
),
SizedBox(width: 5),
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
"${provider.technician_complaint_list[index].contactName}",
style: TextStyle(
fontFamily: "JakartaMedium",
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}",
style: TextStyle(
color: Color(0xFF818181),
fontSize: 14,
Text(
"${provider.technician_complaint_list[index].companyName}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Color(0xFF818181),
fontSize: 14,
),
),
),
],
],
),
),
Spacer(),
Expanded(
......
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,23 +102,32 @@ class _TodaymontlyvisistsState extends State<Todaymontlyvisists> {
),
SizedBox(width: 5),
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
"${provider.visitsList[index].contactName ?? "-"}",
style: TextStyle(
fontFamily: "JakartaMedium",
),
),
Text(
"${provider.visitsList[index].companyName}",
style: TextStyle(
color: Color(0xFF818181),
),
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(
......@@ -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,78 +57,70 @@ 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 = [
"${customerDetails.cname}",
"Mobile Number",
"Contact Person Number",
"Mail ID",
];
final textSubheads = [
"${customerDetails.aname}",
"${customerDetails.mob1}",
"${customerDetails.mob2}",
"${customerDetails.mail}",
];
return Container(
padding: EdgeInsets.symmetric(vertical: 3),
child: Container(
padding: EdgeInsets.symmetric(
vertical: 3,
horizontal: 0,
),
child: Column(
children: [
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
if (j == 0) ...[
SvgPicture.asset(
"assets/svg/se_block_head.svg",
),
SizedBox(width: 5),
],
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(textheads[j].toString()),
SizedBox(
// height:45,
width:
MediaQuery.of(
context,
).size.width *
0.75,
child: Text(
textSubheads[j],
maxLines: 2,
overflow:
TextOverflow.ellipsis,
style: TextStyle(
color: Color(0xFF818181),
),
),
),
],
),
],
crossAxisAlignment: CrossAxisAlignment.start,
children: List.generate(4, (j) {
final textheads = [
"${customerDetails.cname}",
"Mobile Number",
"Contact Person Number",
"Mail ID",
];
final textSubheads = [
customerDetails.aname??"-",
customerDetails.mob1??"-",
customerDetails.mob2??"-",
customerDetails.mail??"-",
];
return Container(
padding: EdgeInsets.symmetric(
vertical: 6,
horizontal: 0,
),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
if (j == 0) ...[
SvgPicture.asset(
"assets/svg/se_block_head.svg",
),
SizedBox(width: 5),
],
Expanded(
child: SizedBox(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(textheads[j].toString(),
maxLines: 2,
overflow: TextOverflow.ellipsis,),
SizedBox(
// height:45,
width:
MediaQuery.of(
context,
).size.width *
0.75,
child: Text(
textSubheads[j],
maxLines: 2,
overflow:
TextOverflow.ellipsis,
style: TextStyle(
color: Color(0xFF818181),
),
),
],
),
),
],
),
);
}),
),
],
),
],
),
),
],
),
);
}),
),
),
......@@ -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
This diff is collapsed.
pubspec.lock
View file @ cdad3e17
This diff is collapsed.
pubspec.yaml
View file @ cdad3e17
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment