Skip to content

GitLab

Commit 7210793a authored by Sai Srinivas's avatar Sai Srinivas
Browse files

17-09

parent 185e0896
Show whitespace changes
Inline Side-by-side
lib/screens/hrm/OrganizationStructureScreen.dart
View file @ 7210793a
......@@ -5,8 +5,8 @@ class OrganizationStructureScreen extends StatelessWidget {
Department(
name: "Engineering",
teams: [
Team(name: "Mobile Team", members: ["Mohit", "Srinivas", ]),
Team(name: "Backend Team", members: ["Dheeraj", "Satya","Sneha"]),
Team(name: "Mobile Team", members: ["Mohit", "Srinivas"]),
Team(name: "Backend Team", members: ["Dheeraj", "Satya", "Sneha"]),
],
),
Department(
......@@ -25,6 +25,8 @@ class OrganizationStructureScreen extends StatelessWidget {
),
];
const OrganizationStructureScreen({super.key});
@override
Widget build(BuildContext context) {
return Scaffold(
......@@ -40,22 +42,33 @@ class OrganizationStructureScreen extends StatelessWidget {
child: ExpansionTile(
title: Text(
"${dept.name} not ready",
style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
children: dept.teams.map((team) {
children:
dept.teams.map((team) {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
padding: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 8,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
team.name,
style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w600),
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
const SizedBox(height: 4),
Wrap(
spacing: 8,
children: team.members.map((member) {
children:
team.members.map((member) {
return Chip(
label: Text(member),
backgroundColor: Colors.blue.shade50,
......
lib/screens/hrm/RewardListScreen.dart
View file @ 7210793a
......@@ -8,7 +8,7 @@ import '../../Notifiers/hrmProvider/rewardListProvider.dart';
import '../../Utils/app_colors.dart';
class RewardListScreen extends StatefulWidget {
const RewardListScreen({Key? key}) : super(key: key);
const RewardListScreen({super.key});
@override
State<RewardListScreen> createState() => _RewardListScreenState();
......@@ -20,8 +20,7 @@ class _RewardListScreenState extends State<RewardListScreen> {
return SafeArea(
top: false,
child: ChangeNotifierProvider(
create: (_) =>
RewardListProvider()..fetchRewardList(context),
create: (_) => RewardListProvider()..fetchRewardList(context),
child: Consumer<RewardListProvider>(
builder: (context, provider, child) {
return Scaffold(
......@@ -76,8 +75,9 @@ class _RewardListScreenState extends State<RewardListScreen> {
body: Builder(
builder: (context) {
if (provider.isLoading) {
return const Center(child: CircularProgressIndicator(
color: Colors.blue,));
return const Center(
child: CircularProgressIndicator(color: Colors.blue),
);
}
if (provider.errorMessage != null) {
return Center(child: Text(provider.errorMessage!));
......@@ -87,7 +87,8 @@ class _RewardListScreenState extends State<RewardListScreen> {
}
final rewardDetail = provider.response!;
final rewardResponse = provider.response!;
final rewards = rewardResponse.rewardsList; // main list object
final rewards =
rewardResponse.rewardsList; // main list object
final achieved = rewardResponse.achievedAmount ?? "0";
final disbursed = rewardResponse.disbursedAmount ?? "0";
final balance = rewardResponse.balanceAmount ?? "0";
......@@ -95,7 +96,6 @@ class _RewardListScreenState extends State<RewardListScreen> {
padding: const EdgeInsets.all(16),
child: Column(
children: [
/// --- Top Summary Cards ---
Stack(
children: [
......@@ -112,7 +112,7 @@ class _RewardListScreenState extends State<RewardListScreen> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"₹${achieved}", // Achieved Amount from response
"₹$achieved", // Achieved Amount from response
style: const TextStyle(
fontSize: 20,
color: Color(0xff0D9C00),
......@@ -172,10 +172,11 @@ class _RewardListScreenState extends State<RewardListScreen> {
child: Stack(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
"₹${disbursed}", // Disbursed Amount
"₹$disbursed", // Disbursed Amount
style: const TextStyle(
fontSize: 20,
color: Color(0xff493272),
......@@ -201,7 +202,9 @@ class _RewardListScreenState extends State<RewardListScreen> {
width: 42,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: const Color(0xA0FFFFFF), // icon bg
color: const Color(
0xA0FFFFFF,
), // icon bg
),
child: Center(
child: SvgPicture.asset(
......@@ -229,10 +232,11 @@ class _RewardListScreenState extends State<RewardListScreen> {
child: Stack(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
"₹${balance}", // Balance Amount
"₹$balance", // Balance Amount
style: const TextStyle(
fontSize: 18,
color: Color(0xff605C00),
......@@ -257,7 +261,9 @@ class _RewardListScreenState extends State<RewardListScreen> {
width: 42,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: const Color(0xA0FFFFFF), // icon bg
color: const Color(
0xA0FFFFFF,
), // icon bg
),
child: Center(
child: SvgPicture.asset(
......@@ -281,7 +287,9 @@ class _RewardListScreenState extends State<RewardListScreen> {
/// --- Reward List Card ---
if (rewards != null)
_rewardListCard(
title: rewards.description ?? "-", // rewardsList fields
title:
rewards.description ??
"-", // rewardsList fields
dateTime: rewards.dateTime ?? "-",
achieved: achieved,
disbursed: disbursed,
......@@ -293,14 +301,13 @@ class _RewardListScreenState extends State<RewardListScreen> {
],
),
);
}
},
),
);
}
)
},
),
),
);
}
/// Reusable Reward Card Function
......@@ -354,7 +361,8 @@ class _RewardListScreenState extends State<RewardListScreen> {
color: Color(0xff2D2D2D),
fontFamily: "Plus Jakarta Sans",
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400),
fontWeight: FontWeight.w400,
),
),
Text(
dateTime,
......@@ -363,18 +371,17 @@ class _RewardListScreenState extends State<RewardListScreen> {
color: Color(0xff818181),
fontFamily: "Plus Jakarta Sans",
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400),
fontWeight: FontWeight.w400,
),
),
],
),
),
],
),
const SizedBox(height: 12),
/// Amount Details
Padding(
padding: const EdgeInsets.all(2.0),
......@@ -382,10 +389,7 @@ class _RewardListScreenState extends State<RewardListScreen> {
children: [
const Text(
"Amount Details",
style: TextStyle(
fontSize: 14,
fontFamily: "JakartaSemiBold",
),
style: TextStyle(fontSize: 14, fontFamily: "JakartaSemiBold"),
),
const SizedBox(width: 10),
Expanded(
......@@ -415,10 +419,7 @@ class _RewardListScreenState extends State<RewardListScreen> {
children: [
const Text(
"Employee Details",
style: TextStyle(
fontSize: 14,
fontFamily: "JakartaSemiBold",
),
style: TextStyle(fontSize: 14, fontFamily: "JakartaSemiBold"),
),
const SizedBox(width: 10),
Expanded(
......@@ -447,7 +448,9 @@ class _RewardListScreenState extends State<RewardListScreen> {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(key, style: TextStyle(
Text(
key,
style: TextStyle(
fontFamily: "JakartaRegular",
fontSize: 14,
color: AppColors.semi_black,
......@@ -456,10 +459,7 @@ class _RewardListScreenState extends State<RewardListScreen> {
Text(
value,
style: const TextStyle(
fontSize: 14,
color: Color(0xFF818181),
),
style: const TextStyle(fontSize: 14, color: Color(0xFF818181)),
),
],
),
......
lib/screens/hrm/RewardSearchScreen.dart
View file @ 7210793a
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import '../../Utils/app_colors.dart';
class RewardSearchScreen extends StatefulWidget {
const RewardSearchScreen({super.key});
......@@ -42,11 +40,17 @@ class _RewardSearchScreenState extends State<RewardSearchScreen> {
@override
Widget build(BuildContext context) {
final filteredAccounts =
accounts.where((e) => e.toLowerCase().contains(query.toLowerCase())).toList();
accounts
.where((e) => e.toLowerCase().contains(query.toLowerCase()))
.toList();
final filteredInquiries =
inquiries.where((e) => e.toLowerCase().contains(query.toLowerCase())).toList();
inquiries
.where((e) => e.toLowerCase().contains(query.toLowerCase()))
.toList();
final filteredLeads =
leads.where((e) => e.toLowerCase().contains(query.toLowerCase())).toList();
leads
.where((e) => e.toLowerCase().contains(query.toLowerCase()))
.toList();
return Scaffold(
appBar: AppBar(
......@@ -94,8 +98,10 @@ class _RewardSearchScreenState extends State<RewardSearchScreen> {
prefixIcon: const Icon(Icons.search, color: Colors.black54),
filled: true,
fillColor: const Color(0xffFFFFFF),
contentPadding:
const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
contentPadding: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 12,
),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide.none,
......@@ -159,11 +165,15 @@ class _RewardSearchScreenState extends State<RewardSearchScreen> {
),
const SizedBox(height: 10),
Column(
children: items
.map((e) => Container(
children:
items
.map(
(e) => Container(
margin: const EdgeInsets.only(bottom: 12),
padding: const EdgeInsets.symmetric(
horizontal: 12, vertical: 12),
horizontal: 12,
vertical: 12,
),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(12),
......@@ -172,7 +182,7 @@ class _RewardSearchScreenState extends State<RewardSearchScreen> {
color: Colors.grey.withOpacity(0.1),
blurRadius: 5,
offset: const Offset(0, 3),
)
),
],
),
child: Row(
......@@ -184,8 +194,11 @@ class _RewardSearchScreenState extends State<RewardSearchScreen> {
color: const Color(0xffE8F3FF),
borderRadius: BorderRadius.circular(8),
),
child: const Icon(Icons.search,
color: Color(0xff0066FF), size: 20),
child: const Icon(
Icons.search,
color: Color(0xff0066FF),
size: 20,
),
),
const SizedBox(width: 10),
Expanded(
......@@ -202,9 +215,10 @@ class _RewardSearchScreenState extends State<RewardSearchScreen> {
),
],
),
))
.toList(),
),
)
.toList(),
),
],
);
}
......
lib/screens/hrm/TourExpensesDetailsScreen.dart
View file @ 7210793a
......@@ -7,22 +7,24 @@ import '../../Notifiers/hrmProvider/tourExpensesDetailsProvider.dart';
import '../../Utils/app_colors.dart';
import '../finance/FileViewer.dart';
class TourExpensesDetailsScreen extends StatefulWidget {
final String tourBillId;
const TourExpensesDetailsScreen({Key? key, required this.tourBillId})
: super(key: key);
const TourExpensesDetailsScreen({super.key, required this.tourBillId});
@override
State<TourExpensesDetailsScreen> createState() => _TourExpensesDetailsScreenState();
State<TourExpensesDetailsScreen> createState() =>
_TourExpensesDetailsScreenState();
}
class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen> {
@override
Widget build(BuildContext context) {
return SafeArea(
top: false,
child: ChangeNotifierProvider(
create: (_) => TourExpensesDetailsProvider()
create:
(_) =>
TourExpensesDetailsProvider()
..fetchTourExpensesDetails(context, widget.tourBillId),
child: Scaffold(
appBar: AppBar(
......@@ -71,8 +73,9 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
if (response == null) {
return const Center(child: Text("No data available"));
}
debugPrint("==================requestDetails: ${widget.tourBillId}");
debugPrint(
"==================requestDetails: ${widget.tourBillId}",
);
return SingleChildScrollView(
child: Column(
......@@ -82,29 +85,68 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
_expenseHeaderCard(
title: response.requestDetails?.placeOfVisit ?? "Tour",
date: response.requestDetails?.appliedDate ?? "-",
status: (response.requestDetails?.approvalStatus?.isNotEmpty ?? false)
status:
(response
.requestDetails
?.approvalStatus
?.isNotEmpty ??
false)
? response.requestDetails!.approvalStatus!
: "No Status",
details: [
{"key": "Employee", "value": response.requestDetails!.employeeName!},
{"key": "Approved By TL", "value": response.requestDetails!.tlApprovedBy!},
{"key": "TL Approval Amount", "value": response.requestDetails!.tlApprovedAmount!},
{"key": "TL Remarks", "value": response.requestDetails!.tlRemarks!},
{"key": "Approved By HR", "value": response.requestDetails!.hrApprovedBy!},
{"key": "HR Approval Amount", "value": response.requestDetails!.hrApprovedAmount!},
{"key": "TL Remarks", "value": response.requestDetails!.tlRemarks!},
{"key": "Total Approved Amount", "value": response.requestDetails?.approvedAmount ?? "-"},
{"key": "Total Balance Amount", "value": response.requestDetails!.appliedAmount!},
{"key": "Type", "value": response.requestDetails!.type!},
{
"key": "Employee",
"value": response.requestDetails!.employeeName!,
},
{
"key": "Approved By TL",
"value": response.requestDetails!.tlApprovedBy!,
},
{
"key": "TL Approval Amount",
"value": response.requestDetails!.tlApprovedAmount!,
},
{
"key": "TL Remarks",
"value": response.requestDetails!.tlRemarks!,
},
{
"key": "Approved By HR",
"value": response.requestDetails!.hrApprovedBy!,
},
{
"key": "HR Approval Amount",
"value": response.requestDetails!.hrApprovedAmount!,
},
{
"key": "TL Remarks",
"value": response.requestDetails!.tlRemarks!,
},
{
"key": "Total Approved Amount",
"value":
response.requestDetails?.approvedAmount ?? "-",
},
{
"key": "Total Balance Amount",
"value": response.requestDetails!.appliedAmount!,
},
{
"key": "Type",
"value": response.requestDetails!.type!,
},
],
),
const SizedBox(height: 16),
/// Tour Expense Card (Main Summary)
if (response.requestDetails != null && response.tourExpenses != null) ...[
if (response.requestDetails != null &&
response.tourExpenses != null) ...[
const SizedBox(height: 10),
Padding(
padding: const EdgeInsets.only(left: 30.0),
child: Text("Tour Summary",
child: Text(
"Tour Summary",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
......@@ -119,28 +161,36 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
child: ListView(
scrollDirection: Axis.horizontal,
padding: EdgeInsets.symmetric(
horizontal: MediaQuery.of(context).size.width * 0.05,
horizontal:
MediaQuery.of(context).size.width * 0.05,
),
children: [
SizedBox(
width: MediaQuery.of(context).size.width * 0.90,
child: _tourExpenseCard(
employeeName: response.requestDetails?.employeeName ?? "-",
placeOfVisit: response.requestDetails?.placeOfVisit ?? "-",
employeeName:
response.requestDetails?.employeeName ??
"-",
placeOfVisit:
response.requestDetails?.placeOfVisit ??
"-",
daAmount: response.tourExpenses?.da ?? "0",
totalAmount: response.tourExpenses?.appliedAmount ?? "0",
fromDate: response.tourExpenses?.fromDate ?? "-",
totalAmount:
response.tourExpenses?.appliedAmount ?? "0",
fromDate:
response.tourExpenses?.fromDate ?? "-",
toDate: response.tourExpenses?.toDate ?? "-",
remarks: response.tourExpenses?.extraNote ?? "-",
remarks:
response.tourExpenses?.extraNote ?? "-",
),
),
],
),
),
],
const SizedBox(height: 10),
/// Travel Expenses Cards
if (response.travelExpenses != null &&
response.travelExpenses!.isNotEmpty) ...[
......@@ -163,14 +213,18 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
child: ListView.separated(
scrollDirection: Axis.horizontal,
padding: EdgeInsets.symmetric(
horizontal: MediaQuery.of(context).size.width * 0.04,
horizontal:
MediaQuery.of(context).size.width * 0.04,
),
itemCount: response.travelExpenses!.length,
separatorBuilder: (_, __) => const SizedBox(width: 12),
separatorBuilder:
(_, __) => const SizedBox(width: 12),
itemBuilder: (context, index) {
final t = response.travelExpenses![index];
return SizedBox(
width: MediaQuery.of(context).size.width * 0.90, // card width
width:
MediaQuery.of(context).size.width *
0.90, // card width
child: _travelExpenseCard(
travelType: t.travelType ?? "-",
amount: t.fare ?? "0",
......@@ -185,15 +239,9 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
context,
MaterialPageRoute(
builder:
(
context,
) => Fileviewer(
fileName:
t.imageDirFilePath ??
"",
fileUrl:
t.imageDirFilePath ??
"",
(context) => Fileviewer(
fileName: t.imageDirFilePath ?? "",
fileUrl: t.imageDirFilePath ?? "",
),
),
);
......@@ -202,7 +250,7 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
);
},
),
)
),
],
const SizedBox(height: 10),
......@@ -212,7 +260,8 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
const SizedBox(height: 10),
Padding(
padding: const EdgeInsets.only(left: 30.0),
child: Text("Hotel Expenses",
child: Text(
"Hotel Expenses",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
......@@ -227,10 +276,12 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
child: ListView.separated(
scrollDirection: Axis.horizontal,
padding: EdgeInsets.symmetric(
horizontal: MediaQuery.of(context).size.width * 0.04,
horizontal:
MediaQuery.of(context).size.width * 0.04,
),
itemCount: response.hotelExpenses!.length,
separatorBuilder: (_, __) => const SizedBox(width: 12),
separatorBuilder:
(_, __) => const SizedBox(width: 12),
itemBuilder: (context, index) {
final h = response.hotelExpenses![index];
return SizedBox(
......@@ -247,15 +298,9 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
context,
MaterialPageRoute(
builder:
(
context,
) => Fileviewer(
fileName:
h.imageDirFilePath ??
"",
fileUrl:
h.imageDirFilePath ??
"",
(context) => Fileviewer(
fileName: h.imageDirFilePath ?? "",
fileUrl: h.imageDirFilePath ?? "",
),
),
);
......@@ -274,7 +319,8 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
const SizedBox(height: 10),
Padding(
padding: const EdgeInsets.only(left: 30.0),
child: Text("Other Expenses",
child: Text(
"Other Expenses",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
......@@ -289,10 +335,12 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
child: ListView.separated(
scrollDirection: Axis.horizontal,
padding: EdgeInsets.symmetric(
horizontal: MediaQuery.of(context).size.width * 0.04,
horizontal:
MediaQuery.of(context).size.width * 0.04,
),
itemCount: response.otherExpenses!.length,
separatorBuilder: (_, __) => const SizedBox(width: 12),
separatorBuilder:
(_, __) => const SizedBox(width: 12),
itemBuilder: (context, index) {
final o = response.otherExpenses![index];
return SizedBox(
......@@ -308,15 +356,9 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
context,
MaterialPageRoute(
builder:
(
context,
) => Fileviewer(
fileName:
o.imageDirFilePath ??
"",
fileUrl:
o.imageDirFilePath ??
"",
(context) => Fileviewer(
fileName: o.imageDirFilePath ?? "",
fileUrl: o.imageDirFilePath ?? "",
),
),
);
......@@ -328,7 +370,6 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
),
],
const SizedBox(height: 25),
],
),
......@@ -381,15 +422,17 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(employeeName,
Text(
employeeName,
style: TextStyle(
fontSize: 14.5,
fontFamily: "JakartaMedium",
fontWeight: FontWeight.w600,
color: AppColors.semi_black,
)
),
Text(placeOfVisit,
),
Text(
placeOfVisit,
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
......@@ -457,17 +500,19 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
),
),
const SizedBox(width: 8),
Text(travelType,
Text(
travelType,
style: TextStyle(
fontSize: 14.5,
fontFamily: "JakartaMedium",
fontWeight: FontWeight.w600,
color: AppColors.semi_black,
)
),
),
],
),
Text("₹$amount",
Text(
"₹$amount",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
......@@ -483,7 +528,7 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
const SizedBox(height: 2),
_buildKeyValue("To", to),
const SizedBox(height: 2),
if ( imageUrl != null && imageUrl!.isNotEmpty)
if (imageUrl != null && imageUrl!.isNotEmpty)
_buildKeyValue("Image", "View", isLink: true, onTap: onViewTap),
],
),
......@@ -524,24 +569,22 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
CircleAvatar(
radius: 20,
backgroundColor: const Color(0xffFCE4EC),
child:
SvgPicture.asset(
"assets/svg/hrm/hotel_ic.svg",
),
child: SvgPicture.asset("assets/svg/hrm/hotel_ic.svg"),
),
const SizedBox(width: 8),
Text(hotelName,
Text(
hotelName,
style: TextStyle(
fontSize: 14.5,
fontFamily: "JakartaMedium",
fontWeight: FontWeight.w600,
color: AppColors.semi_black,
)
),
),
],
),
Text("₹$amount",
Text(
"₹$amount",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
......@@ -557,7 +600,7 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
const SizedBox(height: 2),
_buildKeyValue("To", toDate),
const SizedBox(height: 2),
if ( imageUrl != null && imageUrl!.isNotEmpty)
if (imageUrl != null && imageUrl!.isNotEmpty)
_buildKeyValue("Image", "View", isLink: true, onTap: onViewTap),
],
),
......@@ -597,9 +640,7 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
CircleAvatar(
radius: 20,
backgroundColor: const Color(0xffEDE7F6),
child: SvgPicture.asset(
"assets/svg/hrm/books_ic.svg",
),
child: SvgPicture.asset("assets/svg/hrm/books_ic.svg"),
),
const SizedBox(width: 8),
Text(
......@@ -609,11 +650,12 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
fontFamily: "JakartaMedium",
fontWeight: FontWeight.w600,
color: AppColors.semi_black,
)
),
),
],
),
Text("₹$amount",
Text(
"₹$amount",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
......@@ -629,7 +671,7 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
const SizedBox(height: 2),
_buildKeyValue("Description", description),
const SizedBox(height: 2),
if ( imageUrl != null && imageUrl!.isNotEmpty)
if (imageUrl != null && imageUrl!.isNotEmpty)
_buildKeyValue("Image", "View", isLink: true, onTap: onViewTap),
],
),
......@@ -639,35 +681,37 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
Widget _buildSectionHeader(String title) {
return Row(
children: [
Text(title,
style: const TextStyle(
fontSize: 14,
fontFamily: "JakartaSemiBold",
)
Text(
title,
style: const TextStyle(fontSize: 14, fontFamily: "JakartaSemiBold"),
),
const SizedBox(width: 16),
Expanded(
child: DottedLine(
dashGapLength: 3,
dashGapColor:
Colors.white,
dashGapColor: Colors.white,
dashColor: AppColors.grey_semi,
dashLength: 2,
lineThickness: 0.5,
),
)
),
],
);
}
Widget _buildKeyValue(String key, String value,
{bool isLink = false, VoidCallback? onTap}) {
Widget _buildKeyValue(
String key,
String value, {
bool isLink = false,
VoidCallback? onTap,
}) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 3.5, horizontal: 2),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(key,
Text(
key,
style: TextStyle(
fontFamily: "JakartaRegular",
fontSize: 14,
......@@ -677,17 +721,18 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
isLink
? GestureDetector(
onTap: onTap,
child: const Text("View",
child: const Text(
"View",
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w500,
color: Colors.blue)),
)
: Text(value,
style: const TextStyle(
fontSize: 14,
color: Color(0xFF818181),
color: Colors.blue,
),
),
)
: Text(
value,
style: const TextStyle(fontSize: 14, color: Color(0xFF818181)),
),
],
),
......@@ -735,7 +780,9 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
color: Color(0xFFE6F6FF),
shape: BoxShape.circle,
),
child: SvgPicture.asset("assets/svg/hrm/tour_main_ic.svg"),
child: SvgPicture.asset(
"assets/svg/hrm/tour_main_ic.svg",
),
),
const SizedBox(width: 10),
Expanded(
......@@ -743,36 +790,43 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(title,
Text(
title,
style: const TextStyle(
fontSize: 14,
fontFamily: "JakartaRegular",
color: Color(0xff2D2D2D)
)
color: Color(0xff2D2D2D),
),
),
const SizedBox(height: 3),
Text(date,
Text(
date,
style: const TextStyle(
fontSize: 12,
color: Color(0xff818181)
)
color: Color(0xff818181),
),
),
],
),
),
Container(
padding:
const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
padding: const EdgeInsets.symmetric(
horizontal: 10,
vertical: 6,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
color: _getStatusBgColor(status),
),
child: Text(status,
child: Text(
status,
style: TextStyle(
fontSize: 14,
fontFamily: "JakartaRegular",
color: _getStatusTxtColor(status))),
)
color: _getStatusTxtColor(status),
),
),
),
],
),
......@@ -784,11 +838,12 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
padding: const EdgeInsets.symmetric(vertical: 8),
child: Row(
children: [
const Text("Amount Details",
const Text(
"Amount Details",
style: TextStyle(
fontSize: 14,
fontFamily: "JakartaSemiBold",
)
),
),
const SizedBox(width: 10),
Expanded(
......@@ -806,7 +861,8 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
const SizedBox(height: 6),
Column(
children: details.map((d) {
children:
details.map((d) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 8),
child: Row(
......@@ -814,24 +870,26 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
children: [
Expanded(
flex: 4,
child: Text(d["key"] ?? "-",
child: Text(
d["key"] ?? "-",
style: TextStyle(
fontSize: 14,
color: AppColors.semi_black,
fontFamily: "JakartaRegular",
)
)
),
),
),
Expanded(
flex: 3,
child: Text(d["value"] ?? "-",
child: Text(
d["value"] ?? "-",
textAlign: TextAlign.right,
style: const TextStyle(
fontSize: 14,
fontFamily: "JakartaRegular",
color: Color(0xff818181)
)
)
color: Color(0xff818181),
),
),
),
],
),
......@@ -848,13 +906,14 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(showMore ? "Hide Details" : "View Details",
Text(
showMore ? "Hide Details" : "View Details",
style: TextStyle(
fontSize: 14,
fontFamily: "JakartaMedium",
fontWeight: FontWeight.w500,
color: AppColors.app_blue,
)
),
),
const SizedBox(width: 6),
Transform.flip(
......@@ -865,11 +924,11 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
width: 20,
color: AppColors.app_blue,
),
)
),
],
),
),
)
),
],
),
),
......@@ -877,6 +936,7 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
},
);
}
///travel icons
String _getTravelIcon(String? travelType) {
switch (travelType?.toLowerCase()) {
......@@ -897,7 +957,6 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
}
}
/// Avatar color generator
Color _getStatusBgColor(value) {
var color = AppColors.approved_bg_color;
......@@ -921,10 +980,10 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
return AppColors.rejected_text_color;
case 'Expired at TL':
return AppColors.rejected_text_color;
}
return color;
}
getText(value) {
switch (value) {
case 'HR Approved':
......@@ -939,5 +998,4 @@ class _TourExpensesDetailsScreenState extends State<TourExpensesDetailsScreen>{
return "Requested";
}
}
}
lib/screens/hrm/oggchart.dart
View file @ 7210793a
......@@ -4,7 +4,6 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:generp/Utils/app_colors.dart';
import 'package:generp/screens/commom/accountsListDetails.dart';
import 'package:graphview/GraphView.dart';
import 'package:provider/provider.dart';
import '../../Models/hrmmodels/ogresponse.dart';
......
lib/screens/inventory/GeneratorPartDetailsScreen.dart
View file @ 7210793a
......@@ -126,7 +126,10 @@ class _GeneratorPartDetailsScreenState
child: Column(
children: [
Card(
margin: EdgeInsets.symmetric(horizontal: 0,vertical: 2),
margin: EdgeInsets.symmetric(
horizontal: 0,
vertical: 2,
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(30),
......@@ -344,13 +347,13 @@ class _GeneratorPartDetailsScreenState
Container(
alignment: Alignment.topLeft,
padding: EdgeInsets.only(left: 10,top: 10),
padding: EdgeInsets.only(left: 10, top: 10),
child: Text(
"Product Details",
style: TextStyle(
color: AppColors.grey_thick,
fontFamily: "JakartaMedium",
fontSize: 14
fontSize: 14,
),
),
),
......@@ -425,7 +428,7 @@ class _GeneratorPartDetailsScreenState
Expanded(
child: Text(
values[j] == "" ? "-" : values[j],
textAlign:TextAlign.right,
textAlign: TextAlign.right,
style: TextStyle(
fontSize: 14,
color: AppColors.grey_semi,
......@@ -495,7 +498,7 @@ class _GeneratorPartDetailsScreenState
Expanded(
child: Text(
values[j] == "" ? "-" : values[j],
textAlign:TextAlign.right,
textAlign: TextAlign.right,
style: TextStyle(
fontSize: 14,
fontFamily: "JakartaRegular",
......@@ -560,7 +563,6 @@ class _GeneratorPartDetailsScreenState
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Text(
provider.partData.prodDesc == ""
......@@ -569,7 +571,7 @@ class _GeneratorPartDetailsScreenState
style: TextStyle(
fontSize: 14,
color: AppColors.grey_semi,
fontFamily: "JakartaRegular"
fontFamily: "JakartaRegular",
),
),
),
......@@ -815,7 +817,7 @@ class _GeneratorPartDetailsScreenState
Expanded(
flex: 1,
child: Text(
"${headings[index]}",
headings[index],
style: TextStyle(
fontFamily: "JakartaMedium",
),
......@@ -881,7 +883,7 @@ class _GeneratorPartDetailsScreenState
Expanded(
flex: 1,
child: Text(
"${headings[index]}",
headings[index],
style: TextStyle(
fontFamily: "JakartaMedium",
),
......@@ -960,7 +962,7 @@ class _GeneratorPartDetailsScreenState
Expanded(
flex: 1,
child: Text(
"${headings[index]}",
headings[index],
style: TextStyle(
fontFamily: "JakartaMedium",
),
......@@ -1122,7 +1124,7 @@ class _GeneratorPartDetailsScreenState
mainAxisSize: MainAxisSize.min,
children: [
Text(
"Inventory ${type}",
"Inventory $type",
style: TextStyle(
color: AppColors.app_blue,
fontWeight: FontWeight.w600,
......@@ -1253,7 +1255,12 @@ class _GeneratorPartDetailsScreenState
color: AppColors.grey_semi,
fontSize: 14,
),
contentPadding: EdgeInsets.fromLTRB(5.0, 10.0, 5.0, 10.0),
contentPadding: EdgeInsets.fromLTRB(
5.0,
10.0,
5.0,
10.0,
),
enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
hintText: 'Enter Description',
......
lib/screens/inventory/InventoryScreen.dart
View file @ 7210793a
......@@ -81,13 +81,13 @@ class _InventoryScreenState extends State<InventoryScreen> {
return Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
appBar: appbarNew(context, "Gen Inventory",0xFFFFFFFF),
appBar: appbarNew(context, "Gen Inventory", 0xFFFFFFFF),
body: Container(
decoration: BoxDecoration(color: Colors.black),
child: Column(
children: [
Spacer(),
Container(
SizedBox(
height: 250,
child: QRView(
......
lib/screens/old/AllrequesitionListsOld.dart
View file @ 7210793a
import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/financeProvider/RequestionListProvider.dart';
import 'package:generp/Utils/GlobalConstants.dart';
......
lib/screens/old/HomescreenOld.dart
View file @ 7210793a
......@@ -34,17 +34,16 @@ class _MyHomePageOldState extends State<MyHomePageOld> {
// TODO: implement initState
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
var prov = Provider.of<HomescreenNotifier>(context, listen: false);
var prof_prov = Provider.of<ProfileNotifer>(context, listen: false);
var profProv = Provider.of<ProfileNotifer>(context, listen: false);
Future.microtask(() {
prov.DashboardApiFunction(context);
});
Future.delayed(Duration(milliseconds: 600), () {
prof_prov.ProfileApiFunction(prov, context);
prof_prov.VersionApiFunction();
profProv.ProfileApiFunction(prov, context);
profProv.VersionApiFunction();
});
super.initState();
}
......@@ -59,8 +58,8 @@ class _MyHomePageOldState extends State<MyHomePageOld> {
actions: [
TextButton(
style: ButtonStyle(
backgroundColor: MaterialStateProperty.all(Colors.white),
overlayColor: MaterialStateProperty.all(Colors.white),
backgroundColor: WidgetStateProperty.all(Colors.white),
overlayColor: WidgetStateProperty.all(Colors.white),
),
onPressed: () => Navigator.of(context).pop(false),
child: Text(
......@@ -71,8 +70,8 @@ class _MyHomePageOldState extends State<MyHomePageOld> {
const SizedBox(height: 16),
TextButton(
style: ButtonStyle(
backgroundColor: MaterialStateProperty.all(Colors.white),
overlayColor: MaterialStateProperty.all(Colors.white70),
backgroundColor: WidgetStateProperty.all(Colors.white),
overlayColor: WidgetStateProperty.all(Colors.white70),
),
onPressed:
() => SystemChannels.platform.invokeMethod(
......@@ -774,7 +773,7 @@ class _MyHomePageOldState extends State<MyHomePageOld> {
child: Align(
alignment: Alignment.centerLeft,
child: Text(
"${textHeadings[index]}",
textHeadings[index],
textAlign: TextAlign.left,
style: TextStyle(
......@@ -808,7 +807,8 @@ class _MyHomePageOldState extends State<MyHomePageOld> {
child: Align(
alignment: Alignment.centerLeft,
child: Text(
"${textHeadings[index].toString()}",
textHeadings[index]
.toString(),
textAlign: TextAlign.left,
style: TextStyle(
fontSize: 14,
......
lib/screens/old/crmDashboardold.dart
View file @ 7210793a
......@@ -191,7 +191,7 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> {
physics: AlwaysScrollableScrollPhysics(),
child: Column(
children: [
if (provider.allLeads.length > 0) ...[
if (provider.allLeads.isNotEmpty) ...[
Container(
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5),
margin: EdgeInsets.symmetric(horizontal: 10, vertical: 10),
......@@ -414,7 +414,7 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> {
},
),
if (provider.pendingTasksLists.length > 0) ...[
if (provider.pendingTasksLists.isNotEmpty) ...[
Align(
alignment: Alignment.centerLeft,
child: Padding(
......@@ -428,7 +428,7 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> {
),
),
),
Container(
SizedBox(
width: double.infinity,
height: MediaQuery.of(context).size.height * 0.34,
child: ListView.builder(
......@@ -487,13 +487,13 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> {
children: [
Expanded(
child: Text(
"${headings[j]}",
headings[j],
style: TextStyle(fontSize: 14),
),
),
Expanded(
child: Text(
"${subHeadings[j]}",
subHeadings[j],
style: TextStyle(
color: AppColors.grey_semi,
fontSize: 14,
......
lib/screens/old/leadDetailsOld.dart
View file @ 7210793a
......@@ -101,11 +101,11 @@ class _LeadDetailsByModeOldState extends State<LeadDetailsByModeOld> {
"Last Followup Date",
];
var subHeadings1 = [
provider.accountDetails!.accManager ?? "-",
provider.accountDetails!.owner ?? "-",
provider.leadDetails!.address ?? "-",
provider.leadDetails!.status ?? "-",
provider.followupDetails.first!.fdate ?? "-",
provider.accountDetails.accManager ?? "-",
provider.accountDetails.owner ?? "-",
provider.leadDetails.address ?? "-",
provider.leadDetails.status ?? "-",
provider.followupDetails.first.fdate ?? "-",
];
var headings2 = [
......@@ -120,14 +120,14 @@ class _LeadDetailsByModeOldState extends State<LeadDetailsByModeOld> {
];
var subHeadings2 = [
provider.accountDetails!.state ?? "-",
provider.accountDetails!.district ?? "-",
provider.accountDetails!.subLocality ?? "-",
provider.accountDetails!.source ?? "-",
provider.accountDetails!.reference ?? "-",
provider.accountDetails!.team ?? "-",
provider.accountDetails!.segment ?? "-",
"${provider.leadDetails!.lage ?? "-"} days",
provider.accountDetails.state ?? "-",
provider.accountDetails.district ?? "-",
provider.accountDetails.subLocality ?? "-",
provider.accountDetails.source ?? "-",
provider.accountDetails.reference ?? "-",
provider.accountDetails.team ?? "-",
provider.accountDetails.segment ?? "-",
"${provider.leadDetails.lage ?? "-"} days",
];
var totalHeadings = [...headings1];
......
lib/screens/old/leadListOld.dart
View file @ 7210793a
......@@ -441,9 +441,9 @@ class _LeadlistbymodeOldState extends State<LeadlistbymodeOld> {
.isNotEmpty) {
provider.selectedEmployee = value;
provider.selectedEmployeeId =
value!.id!;
value.id!;
provider.selectedEmployeeValue =
value!.name!;
value.name!;
provider
.crmLeadListSourceOnReferenceAPIFunction(
context,
......@@ -604,10 +604,9 @@ class _LeadlistbymodeOldState extends State<LeadlistbymodeOld> {
if (value != null) {
if (provider.sourcesList.isNotEmpty) {
provider.selectedSource = value;
provider.selectedSourceId =
value!.id!;
provider.selectedSourceId = value.id!;
provider.selectedSourceValue =
value!.name!;
value.name!;
provider
.crmLeadListSourceOnReferenceAPIFunction(
context,
......@@ -663,9 +662,9 @@ class _LeadlistbymodeOldState extends State<LeadlistbymodeOld> {
.isNotEmpty) {
provider.selectedReference = value;
provider.selectedReferenceId =
value!.id!;
value.id!;
provider.selectedReferenceValue =
value!.name!;
value.name!;
}
}
},
......@@ -712,9 +711,9 @@ class _LeadlistbymodeOldState extends State<LeadlistbymodeOld> {
if (value != null) {
if (provider.teamsList.isNotEmpty) {
provider.selectedTeam = value;
provider.selectedTeamId = value!.id!;
provider.selectedTeamId = value.id!;
provider.selectedTeamValue =
value!.name!;
value.name!;
provider
.crmLeadListSegmentOnTeamAPIFunction(
context,
......@@ -768,9 +767,9 @@ class _LeadlistbymodeOldState extends State<LeadlistbymodeOld> {
if (provider.segmentsList.isNotEmpty) {
provider.selectedSegment = value;
provider.selectedSegmentId =
value!.id!;
value.id!;
provider.selectedSegmentValue =
value!.name!;
value.name!;
}
}
},
......@@ -817,9 +816,9 @@ class _LeadlistbymodeOldState extends State<LeadlistbymodeOld> {
if (value != null) {
if (provider.statesList.isNotEmpty) {
provider.selectedStates = value;
provider.selectedStateId = value!.id!;
provider.selectedStateId = value.id!;
provider.selectedStateValue =
value!.name!;
value.name!;
if (provider
.districtsList
.isNotEmpty) {
......@@ -881,9 +880,9 @@ class _LeadlistbymodeOldState extends State<LeadlistbymodeOld> {
if (provider.districtsList.isNotEmpty) {
provider.selectedDistricts = value;
provider.selectedDistrictId =
value!.id!;
value.id!;
provider.selectedDistrictValue =
value!.district!;
value.district!;
if (provider
.subLocationsList
.isNotEmpty) {
......@@ -951,9 +950,9 @@ class _LeadlistbymodeOldState extends State<LeadlistbymodeOld> {
.isNotEmpty) {
provider.selectedSubLocations = value;
provider.selectedSubLocationId =
value!.id!;
value.id!;
provider.selectedSubLocationValue =
value!.subLocality!;
value.subLocality!;
}
}
},
......@@ -981,7 +980,7 @@ class _LeadlistbymodeOldState extends State<LeadlistbymodeOld> {
provider.selectedReferenceId,
provider.selectedTeamId,
provider.selectedSegmentId,
""
"",
);
Navigator.pop(context);
},
......
lib/screens/old/paymentListPayReqOld.dart
View file @ 7210793a
import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Utils/GlobalConstants.dart';
......@@ -17,7 +16,10 @@ import '../commonDateRangeFilter.dart';
class PaymentlistpaymentrequisitionOld extends StatefulWidget {
final String pageTitleName;
const PaymentlistpaymentrequisitionOld({super.key, required this.pageTitleName});
const PaymentlistpaymentrequisitionOld({
super.key,
required this.pageTitleName,
});
@override
State<PaymentlistpaymentrequisitionOld> createState() =>
......
lib/screens/old/paymentreceiptListOld.dart
View file @ 7210793a
import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Utils/GlobalConstants.dart';
......
lib/screens/old/prospectDetailsOld.dart
View file @ 7210793a
......@@ -36,7 +36,8 @@ class ProspectDetailsByModeOld extends StatefulWidget {
});
@override
State<ProspectDetailsByModeOld> createState() => ProspectDetailsByModeOldState();
State<ProspectDetailsByModeOld> createState() =>
ProspectDetailsByModeOldState();
}
class ProspectDetailsByModeOldState extends State<ProspectDetailsByModeOld> {
......@@ -114,7 +115,6 @@ class ProspectDetailsByModeOldState extends State<ProspectDetailsByModeOld> {
element.id!.trim() == editProvider.accountDetails.state!.trim(),
);
if (selectedState != null) {
editProvider.selectedStates = selectedState;
editProvider.selectedStateId = selectedState.id;
editProvider.selectedStateValue = selectedState.name;
......@@ -125,7 +125,6 @@ class ProspectDetailsByModeOldState extends State<ProspectDetailsByModeOld> {
editProvider.selectedStateId,
);
}
}
// Prefill district
if (editProvider.districtsList.isNotEmpty &&
......@@ -134,7 +133,6 @@ class ProspectDetailsByModeOldState extends State<ProspectDetailsByModeOld> {
(element) =>
element.id!.trim() == editProvider.accountDetails.district!.trim(),
);
if (selectedDistrict != null) {
editProvider.selectedDistricts = selectedDistrict;
editProvider.selectedDistrictId = selectedDistrict.id;
editProvider.selectedDistrictValue = selectedDistrict.district;
......@@ -145,19 +143,16 @@ class ProspectDetailsByModeOldState extends State<ProspectDetailsByModeOld> {
editProvider.selectedDistrictId,
);
}
}
if (editProvider.subLocationsList.isNotEmpty &&
editProvider.accountDetails.subLocality != null) {
final selectedSubLocation = editProvider.subLocationsList.firstWhere(
(element) => element.id == editProvider.accountDetails.subLocality,
);
if (selectedSubLocation != null) {
editProvider.selectedSubLocations = selectedSubLocation;
editProvider.selectedSubLocationId = selectedSubLocation.id;
editProvider.selectedSubLocationValue = selectedSubLocation.subLocality;
}
}
print("Company Name: ${editProvider.editCompanyNameController.text}");
print("Pincode: ${editProvider.pincodeController.text}");
......@@ -464,10 +459,10 @@ class ProspectDetailsByModeOldState extends State<ProspectDetailsByModeOld> {
editProsProvider.selectedEmployees =
value;
editProsProvider.selectedEmployeeId =
value!.id!;
value.id!;
editProsProvider
.selectedEmployeeValue =
value!.name!;
value.name!;
}
}
},
......@@ -721,9 +716,9 @@ class ProspectDetailsByModeOldState extends State<ProspectDetailsByModeOld> {
if (value != null) {
if (provider.statesList.isNotEmpty) {
provider.selectedStates = value;
provider.selectedStateId = value!.id!;
provider.selectedStateId = value.id!;
provider.selectedStateValue =
value!.name!;
value.name!;
if (provider
.districtsList
.isNotEmpty) {
......@@ -791,9 +786,9 @@ class ProspectDetailsByModeOldState extends State<ProspectDetailsByModeOld> {
if (provider.districtsList.isNotEmpty) {
provider.selectedDistricts = value;
provider.selectedDistrictId =
value!.id!;
value.id!;
provider.selectedDistrictValue =
value!.district!;
value.district!;
if (provider
.subLocationsList
.isNotEmpty) {
......@@ -872,9 +867,9 @@ class ProspectDetailsByModeOldState extends State<ProspectDetailsByModeOld> {
.isNotEmpty) {
provider.selectedSubLocations = value;
provider.selectedSubLocationId =
value!.id!;
value.id!;
provider.selectedSubLocationValue =
value!.subLocality!;
value.subLocality!;
}
}
},
......
lib/screens/old/prospectListold.dart
View file @ 7210793a
......@@ -381,9 +381,9 @@ class _ProspectListByModeoldState extends State<ProspectListByModeold> {
.isNotEmpty) {
provider.selectedEmployees = value;
provider.selectedEmployeeId =
value!.id!;
value.id!;
provider.selectedEmployeeValue =
value!.name!;
value.name!;
}
}
},
......
lib/screens/order/addOrder.dart
View file @ 7210793a
......@@ -152,7 +152,6 @@ class _AddorderScreenState extends State<AddorderScreen> {
Widget _scaffold(BuildContext context) {
return Consumer<Addorderprovider>(
builder: (context, provider, child) {
return WillPopScope(
child: SafeArea(
top: false,
......@@ -296,14 +295,13 @@ class _AddorderScreenState extends State<AddorderScreen> {
if (value != null) {
print('Selected account: ${value.text}');
provider.selectedAccountList = (value);
provider.selectedAccountID = value!.id!;
provider.selectedAccountName = value!.text!;
provider.selectedAccountID = value.id!;
provider.selectedAccountName = value.text!;
provider
.ordersAddOrderAccountDetailsAPIFunction(
context,
value.id,
);
}
},
selectedItem: provider.selectedAccountList,
......@@ -353,7 +351,6 @@ class _AddorderScreenState extends State<AddorderScreen> {
// },
),
if (provider.selectAccountError != null) ...[
errorWidget(
context,
......@@ -1153,8 +1150,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
.isNotEmpty
? provider.selectedDispatchDistricts !=
null
? provider.dispatchDistricts
.firstWhere(
? provider.dispatchDistricts.firstWhere(
(ord) =>
ord.id ==
provider
......@@ -1311,9 +1307,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
.isNotEmpty
? provider.selectedDispatchSubLocations !=
null
? provider
.dispatchSubLocations
.firstWhere(
? provider.dispatchSubLocations.firstWhere(
(ord) =>
ord.id ==
provider
......@@ -1681,11 +1675,11 @@ class _AddorderScreenState extends State<AddorderScreen> {
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness:
MaterialStateProperty.all<
double
>(6),
WidgetStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(
WidgetStateProperty.all<bool>(
true,
),
),
......@@ -1902,9 +1896,9 @@ class _AddorderScreenState extends State<AddorderScreen> {
if (value != null) {
print('Selected account: ${value.text}');
provider.selectedTpcAgent = (value);
provider.selectedTpcAgentID = value!.id!;
provider.selectedTpcAgentID = value.id!;
provider.selectedTpcAgentValue =
value!.text!;
value.text!;
}
},
selectedItem: provider.selectedTpcAgent,
......@@ -2156,7 +2150,8 @@ class _AddorderScreenState extends State<AddorderScreen> {
widget.mode,
provider.selectedEmployeeID,
provider.selectedAccountID,
provider.selectedDispatchStateID,
provider
.selectedDispatchStateID,
provider
.selectedDispatchDistrictId,
provider
......@@ -2501,9 +2496,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
provider.selectedAccountName =
provider.accountList[index].text!;
print(
"hfjkshfg" +
provider.selectedAccountID
.toString(),
"hfjkshfg${provider.selectedAccountID}",
);
provider.dropDownSearchController.text =
provider.accountList[index].text!;
......@@ -2644,7 +2637,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
null,
TextInputAction.done,
),
if(provider.billingNameError!=null)
if (provider.billingNameError != null)
errorWidget(context, provider.billingNameError),
TextWidget(context, "Billing State"),
//dd
......@@ -2759,8 +2752,11 @@ class _AddorderScreenState extends State<AddorderScreen> {
],
),
),
if(provider.selectedBillingStateError!=null)
errorWidget(context, provider.selectedBillingStateError),
if (provider.selectedBillingStateError != null)
errorWidget(
context,
provider.selectedBillingStateError,
),
TextWidget(context, "Billing District"),
//dd
DropdownButtonHideUnderline(
......@@ -2875,7 +2871,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
],
),
),
if(provider.selectedBillingDistrictError!=null)
if (provider.selectedBillingDistrictError != null)
errorWidget(
context,
provider.selectedBillingDistrictError,
......@@ -2982,8 +2978,11 @@ class _AddorderScreenState extends State<AddorderScreen> {
],
),
),
if(provider.selectedBillingSubLocError!=null)
errorWidget(context, provider.selectedBillingSubLocError),
if (provider.selectedBillingSubLocError != null)
errorWidget(
context,
provider.selectedBillingSubLocError,
),
textControllerWidget(
context,
provider.billingAddressController,
......@@ -2997,7 +2996,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
focusNodes[2],
TextInputAction.next,
),
if(provider.billingAddressError!=null)
if (provider.billingAddressError != null)
errorWidget(context, provider.billingAddressError),
textControllerWidget(
......@@ -3014,7 +3013,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
TextInputAction.done,
6,
),
if(provider.billingPincodeError!=null)
if (provider.billingPincodeError != null)
errorWidget(context, provider.billingPincodeError),
TextWidget(context, "Dispatch State"),
......@@ -3571,10 +3570,11 @@ class _AddorderScreenState extends State<AddorderScreen> {
),
scrollbarTheme: ScrollbarThemeData(
radius: const Radius.circular(15),
thickness:
MaterialStateProperty.all<double>(6),
thickness: WidgetStateProperty.all<double>(
6,
),
thumbVisibility:
MaterialStateProperty.all<bool>(true),
WidgetStateProperty.all<bool>(true),
),
),
menuItemStyleData: const MenuItemStyleData(
......@@ -3764,9 +3764,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
provider.selectedTpcAgentValue =
provider.tpcAgent[index].text!;
print(
"hfjkshfg" +
provider.selectedTpcAgentID
.toString(),
"hfjkshfg${provider.selectedTpcAgentID}",
);
provider
.dropDownTpcSearchController
......@@ -3937,7 +3935,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
Navigator.of(context).pop(false);
provider.imgFromGallery(context);
},
child: Container(
child: SizedBox(
height: 35,
child: Text("Select photo from gallery"),
),
......@@ -3948,7 +3946,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
Navigator.of(context).pop(false);
provider.imgFromCamera(context);
},
child: Container(
child: SizedBox(
height: 35,
child: Text("Capture photo from camera"),
),
......@@ -3999,7 +3997,7 @@ class OrderForm extends StatelessWidget {
),
);
if (res != null) {
print("result ${res}");
print("result $res");
}
},
child: Container(
......@@ -4063,7 +4061,7 @@ class OrderForm extends StatelessWidget {
),
);
if (res != null) {
print("result ${res}");
print("result $res");
}
},
child: Container(
......
lib/screens/order/addPayment.dart
View file @ 7210793a
......@@ -16,6 +16,7 @@ import '../../Utils/commonWidgets.dart';
import '../../Utils/dropdownTheme.dart';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:generp/Utils/commonServices.dart';
class AddpaymentScreen extends StatefulWidget {
final pageTitleName;
final mode;
......@@ -62,7 +63,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
@override
void dispose() {
focusNodes.map((e)=>e.dispose());
focusNodes.map((e) => e.dispose());
_connectivity.disposeStream();
super.dispose();
}
......@@ -85,12 +86,13 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
default:
connection = 'Offline';
}
return connection=="Online"? Consumer<Addpaymentprovider>(
return connection == "Online"
? Consumer<Addpaymentprovider>(
builder: (context, provider, child) {
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
bottom: Platform.isIOS ? false : true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.white,
......@@ -99,7 +101,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
"${widget.pageTitleName}",
provider.resetForm,
SizedBox(width: 0),
0xFFFFFFFF
0xFFFFFFFF,
),
body: Container(
padding: EdgeInsets.symmetric(horizontal: 10),
......@@ -160,7 +162,9 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
if (focusNode.hasFocus) {
focusNode.unfocus();
} else {
FocusScope.of(context).requestFocus(focusNode);
FocusScope.of(
context,
).requestFocus(focusNode);
}
},
child: SvgPicture.asset(
......@@ -178,7 +182,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
margin: EdgeInsets.symmetric(horizontal: 0),
child: Container(
padding: EdgeInsets.symmetric(horizontal: 10),
height: widget.mode=="self"?50:150,
height: widget.mode == "self" ? 50 : 150,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16),
),
......@@ -203,14 +207,17 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
provider.selectedAccountID =
provider.accountList[index].id!;
provider.selectedAccountName =
provider.accountList[index].text!;
provider
.accountList[index]
.text!;
print(
"hfjkshfg" +
provider.selectedAccountID
.toString(),
"hfjkshfg${provider.selectedAccountID}",
);
provider.dropDownSearchController.text =
provider.accountList[index].text!;
provider
.dropDownSearchController
.text = provider
.accountList[index]
.text!;
}
provider
.ordersAddPaymentSelectOrderAPIFunction(
......@@ -235,6 +242,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
),
),
],
///enwewe
errorWidget(context, provider.selectAccountError),
......@@ -249,12 +257,12 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
FilteringTextInputFormatter.digitsOnly,
focusNodes[0],
null,
TextInputAction.next
TextInputAction.next,
),
errorWidget(context, provider.amountError),
///Addorderbutton
if (provider.selectedAccountID!=null) ...[
if (provider.selectedAccountID != null) ...[
InkResponse(
onTap: () {
// if (provider.selectedOrderIds.length < provider.orderList.length) {
......@@ -290,13 +298,15 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
),
),
),
if (provider.orderAmountControllers.length > 0) ...[
if (provider.orderAmountControllers.isNotEmpty) ...[
Row(
children: [
Expanded(
child: ListView.builder(
itemCount:
provider.orderAmountControllers.length,
provider
.orderAmountControllers
.length,
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (context, index) {
......@@ -309,7 +319,10 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
TextWidget(context, "Order"),
TextWidget(
context,
"Order",
),
Row(
children: [
Expanded(
......@@ -320,22 +333,26 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
isExpanded: true,
hint: Text(
'Select Account Type',
style: TextStyle(
fontSize: 14,
style:
TextStyle(
fontSize:
14,
),
overflow:
TextOverflow
.ellipsis,
),
items:
provider.orderList
provider
.orderList
.map(
(
ord,
) => DropdownMenuItem<
OrderList
>(
value: ord,
value:
ord,
child: Text(
"(Order Number: ${ord.orderNumber}) + (Order Amount: ${ord.totalAmount}) + (Balance Amount: ${ord.balanceAmount}) + (Date Time: ${ord.createdDatetime})" ??
'',
......@@ -344,27 +361,29 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
14,
),
overflow:
TextOverflow
.ellipsis,
TextOverflow.ellipsis,
),
),
)
.toList(),
// value: provider.selectedOrderLists,
value:provider.selectedOrderIds[index] != null?
provider
.orderList
.firstWhere(
(product) =>
product
.orderId ==
provider
.selectedOrderIds[index],
):null,
value:
provider.selectedOrderIds[index] !=
null
? provider.orderList.firstWhere(
(
product,
) =>
product.orderId ==
provider.selectedOrderIds[index],
)
: null,
onChanged: (
OrderList? value,
OrderList?
value,
) {
if (value != null) {
if (value !=
null) {
if (provider
.orderList
.isNotEmpty) {
......@@ -381,10 +400,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
// provider.selectedOrderIds = value!.orderId!;
// provider.selectedOrderNumbers = value!.orderNumber!;
print(
"hfjkshfg" +
provider
.selectedOrderIds
.toString(),
"hfjkshfg${provider.selectedOrderIds}",
);
}
}
......@@ -421,13 +437,16 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
"Order Amount",
"Enter Order Amount",
(p0) {
provider.updateAdjustedAmount();
provider
.updateAdjustedAmount();
},
TextInputType.number,
false,
FilteringTextInputFormatter
.digitsOnly,
null,null,TextInputAction.next
null,
null,
TextInputAction.next,
),
),
// SizedBox(width: 10),
......@@ -446,7 +465,6 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
],
),
],
],
textControllerWidget(
......@@ -460,9 +478,12 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
FilteringTextInputFormatter.digitsOnly,
focusNodes[1],
null,
TextInputAction.done
TextInputAction.done,
),
errorWidget(
context,
provider.orderAdjustedAmountError,
),
errorWidget(context, provider.orderAdjustedAmountError),
TextWidget(context, "Description"),
DropdownButtonHideUnderline(
child: Row(
......@@ -491,7 +512,8 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
style: const TextStyle(
fontSize: 14,
),
overflow: TextOverflow.ellipsis,
overflow:
TextOverflow.ellipsis,
),
),
)
......@@ -507,8 +529,10 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
},
buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: ddtheme.menuItemStyleData,
dropdownStyleData: ddtheme.dropdownStyleData,
menuItemStyleData:
ddtheme.menuItemStyleData,
dropdownStyleData:
ddtheme.dropdownStyleData,
),
),
],
......@@ -541,7 +565,8 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
),
child: TextFormField(
controller:
provider.paymentReceivedDateController,
provider
.paymentReceivedDateController,
keyboardType: TextInputType.text,
enabled: false,
maxLines: 1,
......@@ -596,7 +621,8 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
style: const TextStyle(
fontSize: 14,
),
overflow: TextOverflow.ellipsis,
overflow:
TextOverflow.ellipsis,
),
),
)
......@@ -612,8 +638,10 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
},
buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: ddtheme.menuItemStyleData,
dropdownStyleData: ddtheme.dropdownStyleData,
menuItemStyleData:
ddtheme.menuItemStyleData,
dropdownStyleData:
ddtheme.dropdownStyleData,
),
),
],
......@@ -632,7 +660,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
null,
focusNodes[2],
null,
TextInputAction.done
TextInputAction.done,
),
errorWidget(context, provider.paymentRefError),
......@@ -666,9 +694,12 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
if (provider.imagePicked == 1 &&
provider.imagePath != null) ...[
Padding(
padding: const EdgeInsets.symmetric(vertical: 4.0),
padding: const EdgeInsets.symmetric(
vertical: 4.0,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
"${provider.imagePath}",
......@@ -700,9 +731,11 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
),
floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat,
bottomNavigationBar:
InkResponse(
onTap: provider.submitClicked?null:() {
bottomNavigationBar: InkResponse(
onTap:
provider.submitClicked
? null
: () {
provider.submitClicked = true;
provider.selectedOrders = provider.getFormData();
provider.ordersAddPaymentAPISubmitFunction(
......@@ -716,15 +749,26 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
child: Container(
height: 45,
alignment: Alignment.center,
margin: EdgeInsets.symmetric(horizontal: 10, vertical: 15),
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5),
margin: EdgeInsets.symmetric(
horizontal: 10,
vertical: 15,
),
padding: EdgeInsets.symmetric(
horizontal: 10,
vertical: 5,
),
decoration: BoxDecoration(
color: AppColors.app_blue,
borderRadius: BorderRadius.circular(15),
),
child:provider.submitClicked?CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation(Colors.white),
): Text(
child:
provider.submitClicked
? CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation(
Colors.white,
),
)
: Text(
"Submit",
style: TextStyle(
fontSize: 15,
......@@ -742,7 +786,8 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
},
);
},
):NoNetwork(context);
)
: NoNetwork(context);
}
Future<void> _showAttachmentSheet(BuildContext context) {
......@@ -797,7 +842,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
Navigator.of(context).pop(false);
provider.imgFromGallery(context);
},
child: Container(
child: SizedBox(
height: 35,
child: Text("Select photo from gallery"),
),
......@@ -808,7 +853,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
Navigator.of(context).pop(false);
provider.imgFromCamera(context);
},
child: Container(
child: SizedBox(
height: 35,
child: Text("Capture photo from camera"),
),
......
lib/screens/order/addTpcAgent.dart
View file @ 7210793a
......@@ -59,12 +59,13 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
default:
connection = 'Offline';
}
return connection=="Online"? Consumer<Tpcagentsprovider>(
return connection == "Online"
? Consumer<Tpcagentsprovider>(
builder: (context, provider, child) {
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
bottom: Platform.isIOS ? false : true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2New(
......@@ -72,7 +73,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
"Add TPC Agent",
provider.resetAll,
SizedBox(width: 0),
0xFFFFFFFF
0xFFFFFFFF,
),
backgroundColor: AppColors.scaffold_bg_color,
body: Container(
......@@ -107,7 +108,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
null,
focusNodes[0],
focusNodes[1],
TextInputAction.next
TextInputAction.next,
),
if (provider.tpcNameError != null) ...[
errorWidget(context, provider.tpcNameError),
......@@ -125,10 +126,13 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
focusNodes[1],
focusNodes[2],
TextInputAction.next,
10
10,
),
if (provider.tpcMobileNumberError != null) ...[
errorWidget(context, provider.tpcMobileNumberError),
errorWidget(
context,
provider.tpcMobileNumberError,
),
],
InkResponse(
......@@ -203,10 +207,15 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
TextInputType.text,
false,
null,
focusNodes[2],focusNodes[3],TextInputAction.next
focusNodes[2],
focusNodes[3],
TextInputAction.next,
),
if (provider.tpcBankNameError != null) ...[
errorWidget(context, provider.tpcBankNameError),
errorWidget(
context,
provider.tpcBankNameError,
),
],
textControllerWidget(
......@@ -218,9 +227,12 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
TextInputType.text,
false,
null,
focusNodes[3],focusNodes[4],TextInputAction.next
focusNodes[3],
focusNodes[4],
TextInputAction.next,
),
if (provider.tpcBankBeneficiaryNameError != null) ...[
if (provider.tpcBankBeneficiaryNameError !=
null) ...[
errorWidget(
context,
provider.tpcBankBeneficiaryNameError,
......@@ -236,9 +248,12 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
TextInputType.number,
false,
FilteringTextInputFormatter.digitsOnly,
focusNodes[4],focusNodes[5],TextInputAction.next
focusNodes[4],
focusNodes[5],
TextInputAction.next,
),
if (provider.tpcBankAccountNumberError != null) ...[
if (provider.tpcBankAccountNumberError !=
null) ...[
errorWidget(
context,
provider.tpcBankAccountNumberError,
......@@ -254,11 +269,15 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
TextInputType.text,
false,
null,
focusNodes[5],focusNodes[6],
TextInputAction.next
focusNodes[5],
focusNodes[6],
TextInputAction.next,
),
if (provider.tpcBankIFSCError != null) ...[
errorWidget(context, provider.tpcBankIFSCError),
errorWidget(
context,
provider.tpcBankIFSCError,
),
],
textControllerWidget(
......@@ -270,15 +289,22 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
TextInputType.text,
false,
null,
focusNodes[6],focusNodes[7],TextInputAction.next
focusNodes[6],
focusNodes[7],
TextInputAction.next,
),
if (provider.tpcNoteError != null) ...[
errorWidget(context, provider.tpcNoteError),
],
InkWell(
onTap:provider.submitClicked?null: () {
onTap:
provider.submitClicked
? null
: () {
provider.submitClicked = true;
provider.addTPCAgentAPIFunction(context);
provider.addTPCAgentAPIFunction(
context,
);
},
child: Container(
......@@ -295,12 +321,20 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
borderRadius: BorderRadius.circular(14.0),
),
child: Center(
child:provider.submitClicked?CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation(Colors.white),
): Text(
child:
provider.submitClicked
? CircularProgressIndicator.adaptive(
valueColor:
AlwaysStoppedAnimation(
Colors.white,
),
)
: Text(
"Submit",
textAlign: TextAlign.center,
style: TextStyle(color: Colors.white),
style: TextStyle(
color: Colors.white,
),
),
),
),
......@@ -320,7 +354,8 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
},
);
},
):NoNetwork(context);
)
: NoNetwork(context);
}
Future<void> _showAttachmentSheet(BuildContext context) {
......@@ -374,7 +409,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
Navigator.of(context).pop(false);
tcpProvider.imgFromGallery(context);
},
child: Container(
child: SizedBox(
height: 35,
child: Text("Select photo from gallery"),
),
......@@ -385,7 +420,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
Navigator.of(context).pop(false);
tcpProvider.imgFromCamera(context);
},
child: Container(
child: SizedBox(
height: 35,
child: Text("Capture photo from camera"),
),
......
lib/screens/order/editAdjustedOrderList.dart
View file @ 7210793a
......@@ -73,7 +73,7 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
@override
void dispose() {
focusNodes.map((e)=>e.dispose());
focusNodes.map((e) => e.dispose());
super.dispose();
}
......@@ -89,7 +89,7 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
bottom: Platform.isIOS ? false : true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
......@@ -109,7 +109,7 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (editProvider.editOrderList!.isNotEmpty) ...[
if (editProvider.editOrderList.isNotEmpty) ...[
InkResponse(
onTap: () {
// if (provider.selectedOrderIds.length < provider.orderList.length) {
......@@ -145,7 +145,7 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
),
),
),
if (editProvider.paidList.length > 0) ...[
if (editProvider.paidList.isNotEmpty) ...[
Row(
children: [
Expanded(
......@@ -158,7 +158,9 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
padding: EdgeInsets.symmetric(
horizontal: 10,
),
margin: EdgeInsets.symmetric(vertical: 10),
margin: EdgeInsets.symmetric(
vertical: 10,
),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(20),
......@@ -172,7 +174,8 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
child: SizedBox(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
CrossAxisAlignment
.start,
children: [
TextWidget(
context,
......@@ -185,7 +188,8 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
child: DropdownButton2<
EditPaidList
>(
isExpanded: true,
isExpanded:
true,
hint: Text(
'Select Account Type',
style:
......@@ -227,7 +231,9 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
value: editProvider
.paidList
.firstWhere(
(product) =>
(
product,
) =>
product
.orderId ==
editProvider
......@@ -244,7 +250,8 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
// editProvider.paidList[0],
// ),
onChanged: (
EditPaidList? value,
EditPaidList?
value,
) {
if (value !=
null) {
......@@ -312,7 +319,7 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
.digitsOnly,
focusNodes[0],
focusNodes[1],
TextInputAction.next
TextInputAction.next,
),
),
],
......@@ -335,13 +342,16 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
],
),
],
if (editProvider.editOrderList.length > 0) ...[
if (editProvider.editOrderAmountControllers2.length > 0)
if (editProvider.editOrderList.isNotEmpty) ...[
if (editProvider
.editOrderAmountControllers2
.isNotEmpty)
Row(
children: [
Expanded(
child: ListView.builder(
itemCount: editProvider.editOrderList.length,
itemCount:
editProvider.editOrderList.length,
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (context, j) {
......@@ -354,7 +364,9 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(20),
borderRadius: BorderRadius.circular(
20,
),
),
child: Column(
children: [
......@@ -383,8 +395,7 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
true,
hint: Text(
'Select Account Type',
style:
TextStyle(
style: TextStyle(
fontSize:
14,
),
......@@ -440,8 +451,7 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
if (editProvider
.editOrderList
.isNotEmpty) {
editProvider
.selectedOrderList =
editProvider.selectedOrderList =
value;
print(
"Selected Complaint Type: ${value.orderId}, ID: ${value.orderNumber}",
......@@ -501,7 +511,7 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
.digitsOnly,
null,
null,
TextInputAction.done
TextInputAction.done,
),
),
],
......
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