Skip to content

GitLab

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

sai srinivas 

finance module updated
parent a92809e3
Expand all Hide whitespace changes
Inline Side-by-side
lib/Models/TechniciansPendingComplaintsResponse.dart
View file @ b9d7c024
...@@ -3,8 +3,11 @@ class TechnicianPendingComplaintsResponse { ...@@ -3,8 +3,11 @@ class TechnicianPendingComplaintsResponse {
int? error; int? error;
int? sessionExists; int? sessionExists;
TechnicianPendingComplaintsResponse( TechnicianPendingComplaintsResponse({
{this.list, this.error, this.sessionExists}); this.list,
this.error,
this.sessionExists,
});
TechnicianPendingComplaintsResponse.fromJson(Map<String, dynamic> json) { TechnicianPendingComplaintsResponse.fromJson(Map<String, dynamic> json) {
if (json['list'] != null) { if (json['list'] != null) {
...@@ -39,19 +42,21 @@ class TP_List { ...@@ -39,19 +42,21 @@ class TP_List {
String? compRegDatetime; String? compRegDatetime;
String? mobileNo; String? mobileNo;
String? contactName; String? contactName;
String? engineNo;
TP_List( TP_List({
{this.genId, this.genId,
this.address, this.address,
this.loc, this.loc,
this.complaintId, this.complaintId,
this.companyName, this.companyName,
this.productName, this.productName,
this.complaintCategory, this.complaintCategory,
this.compRegDatetime, this.compRegDatetime,
this.mobileNo, this.mobileNo,
this.contactName, this.contactName,
}); this.engineNo,
});
TP_List.fromJson(Map<String, dynamic> json) { TP_List.fromJson(Map<String, dynamic> json) {
genId = json['gen_id']; genId = json['gen_id'];
...@@ -64,6 +69,7 @@ class TP_List { ...@@ -64,6 +69,7 @@ class TP_List {
compRegDatetime = json['comp_reg_datetime']; compRegDatetime = json['comp_reg_datetime'];
mobileNo = json['mobile_no']; mobileNo = json['mobile_no'];
contactName = json['contact_name']; contactName = json['contact_name'];
engineNo = json['engine_number'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
...@@ -78,6 +84,7 @@ class TP_List { ...@@ -78,6 +84,7 @@ class TP_List {
data['comp_reg_datetime'] = this.compRegDatetime; data['comp_reg_datetime'] = this.compRegDatetime;
data['mobile_no'] = this.mobileNo; data['mobile_no'] = this.mobileNo;
data['contact_name'] = this.contactName; data['contact_name'] = this.contactName;
data['engine_number'] = this.engineNo;
return data; return data;
} }
} }
lib/Utils/commonWidgets.dart
View file @ b9d7c024
...@@ -18,7 +18,7 @@ PreferredSizeWidget appbar(BuildContext context, title) { ...@@ -18,7 +18,7 @@ PreferredSizeWidget appbar(BuildContext context, title) {
child: SvgPicture.asset("assets/svg/app_bar_back.svg", height: 25), child: SvgPicture.asset("assets/svg/app_bar_back.svg", height: 25),
), ),
InkResponse( InkResponse(
onTap: () => Navigator.pop(context,true), onTap: () => Navigator.pop(context, true),
child: Text( child: Text(
title, title,
style: TextStyle( style: TextStyle(
...@@ -40,7 +40,7 @@ PreferredSizeWidget appbar(BuildContext context, title) { ...@@ -40,7 +40,7 @@ PreferredSizeWidget appbar(BuildContext context, title) {
); );
} }
PreferredSizeWidget appbar2(BuildContext context, title,reset,widget) { PreferredSizeWidget appbar2(BuildContext context, title, reset, widget) {
return AppBar( return AppBar(
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
elevation: 2.0, elevation: 2.0,
...@@ -50,14 +50,14 @@ PreferredSizeWidget appbar2(BuildContext context, title,reset,widget) { ...@@ -50,14 +50,14 @@ PreferredSizeWidget appbar2(BuildContext context, title,reset,widget) {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
InkResponse( InkResponse(
onTap: (){ onTap: () {
reset(); reset();
Navigator.pop(context, true); Navigator.pop(context, true);
}, },
child: SvgPicture.asset("assets/svg/app_bar_back.svg", height: 25), child: SvgPicture.asset("assets/svg/app_bar_back.svg", height: 25),
), ),
Expanded( Expanded(
flex:4, flex: 4,
child: InkResponse( child: InkResponse(
onTap: () { onTap: () {
reset(); reset();
...@@ -77,7 +77,7 @@ PreferredSizeWidget appbar2(BuildContext context, title,reset,widget) { ...@@ -77,7 +77,7 @@ PreferredSizeWidget appbar2(BuildContext context, title,reset,widget) {
), ),
), ),
Spacer(), Spacer(),
widget widget,
], ],
), ),
), ),
...@@ -94,11 +94,10 @@ Future<bool> onBackPressed(BuildContext context) async { ...@@ -94,11 +94,10 @@ Future<bool> onBackPressed(BuildContext context) async {
return true; return true;
} }
Widget Emptywidget(BuildContext context){ Widget Emptywidget(BuildContext context) {
return SizedBox( return SizedBox(
height: MediaQuery.of(context).size.height*0.8, height: MediaQuery.of(context).size.height * 0.8,
child: Center( child: Center(child: Text("No Data Available")),
child: Text("No Data Available")),
); );
} }
...@@ -117,14 +116,14 @@ Widget errorWidget(context, text) { ...@@ -117,14 +116,14 @@ Widget errorWidget(context, text) {
} }
Widget textControllerWidget( Widget textControllerWidget(
context, context,
controller, controller,
hintText, hintText,
Function(String)? onChanged, Function(String)? onChanged,
inputtype, inputtype,
readonly, readonly,
inputFormatters, inputFormatters,
) { ) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
...@@ -149,9 +148,9 @@ Widget textControllerWidget( ...@@ -149,9 +148,9 @@ Widget textControllerWidget(
onChanged: onChanged, onChanged: onChanged,
inputFormatters: inputFormatters:
inputFormatters != null inputFormatters != null
? [FilteringTextInputFormatter.digitsOnly] ? [FilteringTextInputFormatter.digitsOnly]
: [], : [],
decoration: InputDecoration( decoration: InputDecoration(
hintText: hintText, hintText: hintText,
hintStyle: TextStyle( hintStyle: TextStyle(
...@@ -169,12 +168,13 @@ Widget textControllerWidget( ...@@ -169,12 +168,13 @@ Widget textControllerWidget(
], ],
); );
} }
Widget textControllerReadonlyWidget( Widget textControllerReadonlyWidget(
context, context,
controller, controller,
hintText, hintText,
Function(String)? onChanged, Function(String)? onChanged,
) { ) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
...@@ -215,14 +215,15 @@ Widget textControllerReadonlyWidget( ...@@ -215,14 +215,15 @@ Widget textControllerReadonlyWidget(
], ],
); );
} }
class MyNavigatorObserver extends NavigatorObserver { class MyNavigatorObserver extends NavigatorObserver {
@override @override
void didPush(Route route, Route? previousRoute) { void didPush(Route route, Route? previousRoute) {
super.didPush(route, previousRoute); super.didPush(route, previousRoute);
// Called when a route has been pushed onto the navigator. // Called when a route has been pushed onto the navigator.
didPushed = "true"; didPushed = "true";
// print('Route pushed: ${route.settings.name}'); print('Route pushed: ${route.settings.name}');
// print('didPushed$didPushed'); print('didPushed$didPushed');
} }
@override @override
...@@ -230,7 +231,7 @@ class MyNavigatorObserver extends NavigatorObserver { ...@@ -230,7 +231,7 @@ class MyNavigatorObserver extends NavigatorObserver {
super.didPop(route, previousRoute); super.didPop(route, previousRoute);
didPopped = "true"; didPopped = "true";
// Called when a route has been popped off the navigator. // Called when a route has been popped off the navigator.
// print('Route popped: ${route.settings.name}'); print('Route popped: ${route.settings.name}');
// print('didPopped${didPopped}'); print('didPopped${didPopped}');
} }
} }
\ No newline at end of file
lib/main.dart
View file @ b9d7c024
...@@ -57,7 +57,6 @@ Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async { ...@@ -57,7 +57,6 @@ Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
if (Platform.isAndroid) { if (Platform.isAndroid) {
await Firebase.initializeApp( await Firebase.initializeApp(
options: FirebaseOptions( options: FirebaseOptions(
...@@ -186,25 +185,28 @@ class MyApp extends StatelessWidget { ...@@ -186,25 +185,28 @@ class MyApp extends StatelessWidget {
ChangeNotifierProvider(create: (_) => Paymentdetailsprovider()), ChangeNotifierProvider(create: (_) => Paymentdetailsprovider()),
ChangeNotifierProvider(create: (_) => Generatordetailsprovider()), ChangeNotifierProvider(create: (_) => Generatordetailsprovider()),
ChangeNotifierProvider(create: (_) => Nearbygeneratorsprovider()), ChangeNotifierProvider(create: (_) => Nearbygeneratorsprovider()),
///finance ///finance
ChangeNotifierProvider(create: (_) => Dashboardprovider(),), ChangeNotifierProvider(create: (_) => Dashboardprovider()),
ChangeNotifierProvider(create: (_) => Requestionlistprovider(),), ChangeNotifierProvider(create: (_) => Requestionlistprovider()),
ChangeNotifierProvider(create: (_) => Requesitionlidtdetailsprovider(),), ChangeNotifierProvider(create: (_) => Requesitionlidtdetailsprovider()),
ChangeNotifierProvider(create: (_) => Paymentrequisitionpaymentslistprovider(),), ChangeNotifierProvider(
ChangeNotifierProvider(create: (_) => Paymentreceiptsprovider(),), create: (_) => Paymentrequisitionpaymentslistprovider(),
ChangeNotifierProvider(create: (_) => Commonpagesprovider(),), ),
ChangeNotifierProvider(create: (_) => Accountslistprovider(),), ChangeNotifierProvider(create: (_) => Paymentreceiptsprovider()),
ChangeNotifierProvider(create: (_) => Accountdetailsprovider(),), ChangeNotifierProvider(create: (_) => Commonpagesprovider()),
ChangeNotifierProvider(create: (_) => Accountledgerprovider(),), ChangeNotifierProvider(create: (_) => Accountslistprovider()),
ChangeNotifierProvider(create: (_) => Pagesdashboardprovider(),), ChangeNotifierProvider(create: (_) => Accountdetailsprovider()),
ChangeNotifierProvider(create: (_) => Paymentsprovider(),), ChangeNotifierProvider(create: (_) => Accountledgerprovider()),
ChangeNotifierProvider(create: (_) => Tpcagentsprovider(),), ChangeNotifierProvider(create: (_) => Pagesdashboardprovider()),
ChangeNotifierProvider(create: (_) => Addpaymentprovider(),), ChangeNotifierProvider(create: (_) => Paymentsprovider()),
ChangeNotifierProvider(create: (_) => Addorderprovider(),), ChangeNotifierProvider(create: (_) => Tpcagentsprovider()),
ChangeNotifierProvider(create: (_) => Editpaymentprovider(),), ChangeNotifierProvider(create: (_) => Addpaymentprovider()),
ChangeNotifierProvider(create: (_) => Crmdashboardprovider(),), ChangeNotifierProvider(create: (_) => Addorderprovider()),
ChangeNotifierProvider(create: (_) => Leadlistprovider(),), ChangeNotifierProvider(create: (_) => Editpaymentprovider()),
ChangeNotifierProvider(create: (_) => crmLeadDetailsProvider(),), ChangeNotifierProvider(create: (_) => Crmdashboardprovider()),
ChangeNotifierProvider(create: (_) => Leadlistprovider()),
ChangeNotifierProvider(create: (_) => crmLeadDetailsProvider()),
], ],
child: Builder( child: Builder(
builder: (BuildContext context) { builder: (BuildContext context) {
...@@ -213,7 +215,7 @@ class MyApp extends StatelessWidget { ...@@ -213,7 +215,7 @@ class MyApp extends StatelessWidget {
builder: (BuildContext context, Widget? child) { builder: (BuildContext context, Widget? child) {
final MediaQueryData data = MediaQuery.of(context); final MediaQueryData data = MediaQuery.of(context);
return MediaQuery( return MediaQuery(
data: data.copyWith(textScaleFactor: 1.0), data: data.copyWith(textScaler: TextScaler.linear(1.0)),
child: child ?? Container(), child: child ?? Container(),
); );
}, },
...@@ -271,7 +273,9 @@ class MyApp extends StatelessWidget { ...@@ -271,7 +273,9 @@ class MyApp extends StatelessWidget {
interactive: true, interactive: true,
radius: Radius.circular(6), radius: Radius.circular(6),
thickness: WidgetStatePropertyAll(10), thickness: WidgetStatePropertyAll(10),
thumbColor: WidgetStateProperty.all(AppColors.grey_semi.withOpacity(0.6)) thumbColor: WidgetStateProperty.all(
AppColors.grey_semi.withOpacity(0.6),
),
), ),
), ),
home: const Splash(), home: const Splash(),
......
lib/screens/HomeScreen.dart
View file @ b9d7c024
...@@ -118,8 +118,8 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -118,8 +118,8 @@ class _MyHomePageState extends State<MyHomePage> {
"Whizzdom", "Whizzdom",
"Common", "Common",
"Finance", "Finance",
"Orders", // "Orders",
"CRM", // "CRM",
]; ];
final icons = [ final icons = [
"assets/svg/home_icons_1.svg", "assets/svg/home_icons_1.svg",
...@@ -131,8 +131,8 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -131,8 +131,8 @@ class _MyHomePageState extends State<MyHomePage> {
"assets/svg/home_icons_81.svg", "assets/svg/home_icons_81.svg",
"assets/svg/home_icons_9.svg", "assets/svg/home_icons_9.svg",
"assets/svg/home_icons_10.svg", "assets/svg/home_icons_10.svg",
"assets/svg/home_icons_11.svg", // "assets/svg/home_icons_11.svg",
"assets/svg/home_icons_12.svg", // "assets/svg/home_icons_12.svg",
]; ];
final requiredRoles = [ final requiredRoles = [
"430", "430",
...@@ -144,8 +144,8 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -144,8 +144,8 @@ class _MyHomePageState extends State<MyHomePage> {
"431", "431",
"430", "430",
"430", "430",
"430", // "430",
"430", // "430",
]; ];
final filteredItems = <Map<String, String>>[]; final filteredItems = <Map<String, String>>[];
...@@ -204,8 +204,9 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -204,8 +204,9 @@ class _MyHomePageState extends State<MyHomePage> {
flex: 2, flex: 2,
child: SizedBox( child: SizedBox(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment:
MainAxisAlignment.center,
children: [ children: [
SizedBox( SizedBox(
width: 66, width: 66,
...@@ -217,7 +218,8 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -217,7 +218,8 @@ class _MyHomePageState extends State<MyHomePage> {
child: CachedNetworkImage( child: CachedNetworkImage(
cacheKey: profile.profileImage, cacheKey: profile.profileImage,
fit: BoxFit.cover, fit: BoxFit.cover,
imageUrl: "${profile.profileImage}", imageUrl:
"${profile.profileImage}",
useOldImageOnUrlChange: false, useOldImageOnUrlChange: false,
placeholder: placeholder:
(context, url) => (context, url) =>
...@@ -228,7 +230,7 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -228,7 +230,7 @@ class _MyHomePageState extends State<MyHomePage> {
), ),
), ),
), ),
Row( Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.center, MainAxisAlignment.center,
...@@ -266,7 +268,8 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -266,7 +268,8 @@ class _MyHomePageState extends State<MyHomePage> {
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment:
MainAxisAlignment.center,
children: [ children: [
Text( Text(
"${profile.employeeName}", "${profile.employeeName}",
...@@ -341,7 +344,7 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -341,7 +344,7 @@ class _MyHomePageState extends State<MyHomePage> {
top: 0, top: 0,
bottom: 10, bottom: 10,
), ),
margin:EdgeInsets.only(top: 10), margin: EdgeInsets.only(top: 10),
child: GridView.builder( child: GridView.builder(
itemCount: filteredItems.length, itemCount: filteredItems.length,
gridDelegate: gridDelegate:
...@@ -394,14 +397,15 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -394,14 +397,15 @@ class _MyHomePageState extends State<MyHomePage> {
} else { } else {
requestGpsPermission(); requestGpsPermission();
} }
break; break;
case "Gen Tracker": case "Gen Tracker":
res = await Navigator.push( res = await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: builder:
(context) => Gentrackerdashboard(), (context) =>
Gentrackerdashboard(),
), ),
); );
break; break;
...@@ -423,13 +427,14 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -423,13 +427,14 @@ class _MyHomePageState extends State<MyHomePage> {
(context) => Nearbygenerators(), (context) => Nearbygenerators(),
), ),
); );
break; break;
case "Inventory": case "Inventory":
res = await Navigator.push( res = await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => InventoryScreen(), builder:
(context) => InventoryScreen(),
), ),
); );
break; break;
...@@ -443,7 +448,8 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -443,7 +448,8 @@ class _MyHomePageState extends State<MyHomePage> {
builder: builder:
(context) => WebWhizzdomScreen( (context) => WebWhizzdomScreen(
whizzdom_url: whizzdom_url:
homescreen.whizzdomPageUrl, homescreen
.whizzdomPageUrl,
), ),
), ),
); );
...@@ -455,7 +461,8 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -455,7 +461,8 @@ class _MyHomePageState extends State<MyHomePage> {
res = await Navigator.push( res = await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => Commondashboard(), builder:
(context) => Commondashboard(),
), ),
); );
break; break;
...@@ -473,10 +480,11 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -473,10 +480,11 @@ class _MyHomePageState extends State<MyHomePage> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: builder:
(context) => Ordermoduledashboard(), (context) =>
Ordermoduledashboard(),
), ),
); );
case "CRM": case "CRM":
res = await Navigator.push( res = await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
...@@ -498,10 +506,14 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -498,10 +506,14 @@ class _MyHomePageState extends State<MyHomePage> {
borderRadius: BorderRadius.circular(30), borderRadius: BorderRadius.circular(30),
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment:
CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
SvgPicture.asset(item['icon']!, height: 45), SvgPicture.asset(
item['icon']!,
height: 45,
),
SizedBox(height: 10), SizedBox(height: 10),
Text(item['name']!), Text(item['name']!),
], ],
......
lib/screens/serviceEngineer/VisitDetails.dart
View file @ b9d7c024
...@@ -51,8 +51,14 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -51,8 +51,14 @@ class _VisitdetailsState extends State<Visitdetails> {
children: [ children: [
Text("Customer Details"), Text("Customer Details"),
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 10, vertical: 5), margin: EdgeInsets.symmetric(
padding: EdgeInsets.symmetric(horizontal: 15, vertical: 10), horizontal: 10,
vertical: 5,
),
padding: EdgeInsets.symmetric(
horizontal: 15,
vertical: 10,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
...@@ -67,13 +73,12 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -67,13 +73,12 @@ 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( padding: EdgeInsets.symmetric(
vertical: 6, vertical: 6,
horizontal: 0, horizontal: 0,
...@@ -94,9 +99,11 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -94,9 +99,11 @@ class _VisitdetailsState extends State<Visitdetails> {
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Text(textheads[j].toString(), Text(
maxLines: 2, textheads[j].toString(),
overflow: TextOverflow.ellipsis,), maxLines: 2,
overflow: TextOverflow.ellipsis,
),
SizedBox( SizedBox(
// height:45, // height:45,
width: width:
...@@ -105,11 +112,11 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -105,11 +112,11 @@ class _VisitdetailsState extends State<Visitdetails> {
).size.width * ).size.width *
0.75, 0.75,
child: Text( child: Text(
textSubheads[j]==""?"-": textSubheads[j] == ""
textSubheads[j], ? "-"
: textSubheads[j],
maxLines: 2, maxLines: 2,
overflow: overflow: TextOverflow.ellipsis,
TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
color: Color(0xFF818181), color: Color(0xFF818181),
), ),
...@@ -125,11 +132,17 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -125,11 +132,17 @@ class _VisitdetailsState extends State<Visitdetails> {
}), }),
), ),
), ),
Text("Generator Details"), Text("Generator Details"),
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 10, vertical: 5), margin: EdgeInsets.symmetric(
padding: EdgeInsets.symmetric(horizontal: 15, vertical: 10), horizontal: 10,
vertical: 5,
),
padding: EdgeInsets.symmetric(
horizontal: 15,
vertical: 10,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
...@@ -159,7 +172,9 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -159,7 +172,9 @@ class _VisitdetailsState extends State<Visitdetails> {
"${complaintDetails.dateOfSupply}", "${complaintDetails.dateOfSupply}",
]; ];
return Container( return Container(
padding: EdgeInsets.symmetric(vertical: 3), padding: EdgeInsets.symmetric(
vertical: 3,
),
child: Column( child: Column(
children: [ children: [
Row( Row(
...@@ -175,7 +190,9 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -175,7 +190,9 @@ class _VisitdetailsState extends State<Visitdetails> {
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Text(textheads[j].toString()), Text(
textheads[j].toString(),
),
SizedBox( SizedBox(
// height:45, // height:45,
width: width:
...@@ -184,12 +201,17 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -184,12 +201,17 @@ class _VisitdetailsState extends State<Visitdetails> {
).size.width * ).size.width *
0.8, 0.8,
child: Text( child: Text(
textSubheads[j]==""?"-": textSubheads[j], textSubheads[j] == ""
? "-"
: textSubheads[j],
maxLines: 2, maxLines: 2,
overflow: overflow:
TextOverflow.ellipsis, TextOverflow
.ellipsis,
style: TextStyle( style: TextStyle(
color: Color(0xFF818181), color: Color(
0xFF818181,
),
), ),
), ),
), ),
...@@ -208,11 +230,17 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -208,11 +230,17 @@ class _VisitdetailsState extends State<Visitdetails> {
], ],
), ),
), ),
Text("Complaint Details"), Text("Complaint Details"),
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 10, vertical: 5), margin: EdgeInsets.symmetric(
padding: EdgeInsets.symmetric(horizontal: 15, vertical: 10), horizontal: 10,
vertical: 5,
),
padding: EdgeInsets.symmetric(
horizontal: 15,
vertical: 10,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
...@@ -221,7 +249,6 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -221,7 +249,6 @@ class _VisitdetailsState extends State<Visitdetails> {
children: [ children: [
Row( Row(
children: [ children: [
SvgPicture.asset("assetName"),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: List.generate(4, (j) { children: List.generate(4, (j) {
...@@ -238,7 +265,9 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -238,7 +265,9 @@ class _VisitdetailsState extends State<Visitdetails> {
"${complaintDetails.complaintType}", "${complaintDetails.complaintType}",
]; ];
return Container( return Container(
padding: EdgeInsets.symmetric(vertical: 3), padding: EdgeInsets.symmetric(
vertical: 3,
),
child: Column( child: Column(
children: [ children: [
Row( Row(
...@@ -254,7 +283,9 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -254,7 +283,9 @@ class _VisitdetailsState extends State<Visitdetails> {
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Text(textheads[j].toString()), Text(
textheads[j].toString(),
),
SizedBox( SizedBox(
// height:45, // height:45,
width: width:
...@@ -263,12 +294,17 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -263,12 +294,17 @@ class _VisitdetailsState extends State<Visitdetails> {
).size.width * ).size.width *
0.8, 0.8,
child: Text( child: Text(
textSubheads[j]==""?"-": textSubheads[j], textSubheads[j] == ""
? "-"
: textSubheads[j],
maxLines: 2, maxLines: 2,
overflow: overflow:
TextOverflow.ellipsis, TextOverflow
.ellipsis,
style: TextStyle( style: TextStyle(
color: Color(0xFF818181), color: Color(
0xFF818181,
),
), ),
), ),
), ),
...@@ -287,7 +323,7 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -287,7 +323,7 @@ class _VisitdetailsState extends State<Visitdetails> {
], ],
), ),
), ),
SizedBox(height: 75), SizedBox(height: 75),
], ],
), ),
...@@ -320,8 +356,10 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -320,8 +356,10 @@ class _VisitdetailsState extends State<Visitdetails> {
child: Text( child: Text(
"Followup Details", "Followup Details",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle(color: Colors.white, style: TextStyle(
fontFamily: "JakartaMedium"), color: Colors.white,
fontFamily: "JakartaMedium",
),
), ),
), ),
), ),
......
lib/services/api_calling.dart
View file @ b9d7c024
This diff is collapsed.
pubspec.lock
View file @ b9d7c024
...@@ -37,10 +37,10 @@ packages: ...@@ -37,10 +37,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: async name: async
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.12.0" version: "2.13.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: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.2" version: "1.3.3"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
...@@ -932,26 +932,26 @@ packages: ...@@ -932,26 +932,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "10.0.8" version: "11.0.1"
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: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.9" version: "3.0.10"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_testing name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.1" version: "3.0.2"
lints: lints:
dependency: transitive dependency: transitive
description: description:
...@@ -1657,10 +1657,10 @@ packages: ...@@ -1657,10 +1657,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "14.3.1" version: "15.0.0"
web: web:
dependency: transitive dependency: transitive
description: description:
......
pubspec.yaml
View file @ b9d7c024
...@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev ...@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.87+91 version: 1.0.88+92
environment: environment:
sdk: ^3.7.2 sdk: ^3.7.2
......
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