gitadmin/sc-android-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rejected api integration completed

Browse Source
This commit is contained in:
Vaibhav 2024-08-05 15:24:10 +05:30
parent 49982dcf92
commit f0b3d7f2b9
11 changed files with 479 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/constants/only_uppercase.dart Normal file
View File

@ -0,0 +1,12 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/services.dart';
class UpperCaseTextFormatter extends TextInputFormatter {
@override
TextEditingValue formatEditUpdate(TextEditingValue oldValue, TextEditingValue newValue) {
return newValue.copyWith(
text: newValue.text.toUpperCase(),
selection: newValue.selection,
);
}
}

208
lib/models/rejected_applicaton_response.dart Normal file
View File

@ -0,0 +1,208 @@
class RejectedApplicationResponse {
String? sId;
String? name;
String? tradeName;
String? address;
String? state;
String? city;
String? district;
String? pincode;
String? mobileNumber;
PrincipalDistributer? principalDistributer;
String? panNumber;
PanImg? panImg;
String? aadharNumber;
PanImg? aadharImg;
String? gstNumber;
PanImg? gstImg;
PanImg? pesticideLicenseImg;
PanImg? fertilizerLicenseImg;
PanImg? selfieEntranceImg;
String? status;
String? addedBy;
List<Notes>? notes;
String? createdAt;
String? updatedAt;
int? iV;
RejectedApplicationResponse(
{this.sId,
this.name,
this.tradeName,
this.address,
this.state,
this.city,
this.district,
this.pincode,
this.mobileNumber,
this.principalDistributer,
this.panNumber,
this.panImg,
this.aadharNumber,
this.aadharImg,
this.gstNumber,
this.gstImg,
this.pesticideLicenseImg,
this.fertilizerLicenseImg,
this.selfieEntranceImg,
this.status,
this.addedBy,
this.notes,
this.createdAt,
this.updatedAt,
this.iV});
RejectedApplicationResponse.fromJson(Map<String, dynamic> json) {
sId = json['_id'];
name = json['name'];
tradeName = json['trade_name'];
address = json['address'];
state = json['state'];
city = json['city'];
district = json['district'];
pincode = json['pincode'];
mobileNumber = json['mobile_number'];
principalDistributer = json['principal_distributer'] != null
? PrincipalDistributer.fromJson(json['principal_distributer'])
: null;
panNumber = json['pan_number'];
panImg =
json['pan_img'] != null ? PanImg.fromJson(json['pan_img']) : null;
aadharNumber = json['aadhar_number'];
aadharImg = json['aadhar_img'] != null
? PanImg.fromJson(json['aadhar_img'])
: null;
gstNumber = json['gst_number'];
gstImg =
json['gst_img'] != null ? PanImg.fromJson(json['gst_img']) : null;
pesticideLicenseImg = json['pesticide_license_img'] != null
? PanImg.fromJson(json['pesticide_license_img'])
: null;
fertilizerLicenseImg = json['fertilizer_license_img'] != null
? PanImg.fromJson(json['fertilizer_license_img'])
: null;
selfieEntranceImg = json['selfie_entrance_img'] != null
? PanImg.fromJson(json['selfie_entrance_img'])
: null;
status = json['status'];
// addedBy = json['addedBy'];
if (json['notes'] != null) {
notes = <Notes>[];
json['notes'].forEach((v) {
notes!.add(Notes.fromJson(v));
});
}
createdAt = json['createdAt'];
updatedAt = json['updatedAt'];
iV = json['__v'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{};
data['_id'] = sId;
data['name'] = name;
data['trade_name'] = tradeName;
data['address'] = address;
data['state'] = state;
data['city'] = city;
data['district'] = district;
data['pincode'] = pincode;
data['mobile_number'] = mobileNumber;
if (principalDistributer != null) {
data['principal_distributer'] = principalDistributer!.toJson();
}
data['pan_number'] = panNumber;
if (panImg != null) {
data['pan_img'] = panImg!.toJson();
}
data['aadhar_number'] = aadharNumber;
if (aadharImg != null) {
data['aadhar_img'] = aadharImg!.toJson();
}
data['gst_number'] = gstNumber;
if (gstImg != null) {
data['gst_img'] = gstImg!.toJson();
}
if (pesticideLicenseImg != null) {
data['pesticide_license_img'] = pesticideLicenseImg!.toJson();
}
if (fertilizerLicenseImg != null) {
data['fertilizer_license_img'] = fertilizerLicenseImg!.toJson();
}
if (selfieEntranceImg != null) {
data['selfie_entrance_img'] = selfieEntranceImg!.toJson();
}
data['status'] = status;
data['addedBy'] = addedBy;
if (notes != null) {
data['notes'] = notes!.map((v) => v.toJson()).toList();
}
data['createdAt'] = createdAt;
data['updatedAt'] = updatedAt;
data['__v'] = iV;
return data;
}
}
class PrincipalDistributer {
String? sId;
String? name;
PrincipalDistributer({this.sId, this.name});
PrincipalDistributer.fromJson(Map<String, dynamic> json) {
sId = json['_id'];
name = json['name'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{};
data['_id'] = sId;
data['name'] = name;
return data;
}
}
class PanImg {
String? publicId;
String? url;
PanImg({this.publicId, this.url});
PanImg.fromJson(Map<String, dynamic> json) {
publicId = json['public_id'];
url = json['url'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{};
data['public_id'] = publicId;
data['url'] = url;
return data;
}
}
class Notes {
String? message;
String? user;
String? replyDate;
String? sId;
Notes({this.message, this.user, this.replyDate, this.sId});
Notes.fromJson(Map<String, dynamic> json) {
message = json['message'];
user = json['user'];
replyDate = json['replyDate'];
sId = json['_id'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{};
data['message'] = message;
data['user'] = user;
data['replyDate'] = replyDate;
data['_id'] = sId;
return data;
}
}

12
lib/provider/home_provider.dart
View File

@ -37,15 +37,11 @@ class HomeProvider extends ChangeNotifier {
Future<void> logOut(BuildContext context) async {
Response response = await _apiClient.get(ApiUrls.logOutUrl);
if (response.statusCode == 200) {
ScaffoldMessenger.of(context)
.showSnackBar(SnackBar(
content:
Text(response.data['message'].toString())));
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(response.data['message'].toString())));
SecureStorageService().clear();
Navigator.pushReplacement(context,
MaterialPageRoute(builder: (context) => const LoginPage()));
Navigator.pushReplacement(
context, MaterialPageRoute(builder: (context) => const LoginPage()));
}
}
}

40
lib/provider/rejected_provider.dart Normal file
View File

@ -0,0 +1,40 @@
import 'package:cheminova/models/rejected_applicaton_response.dart';
import 'package:dio/dio.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../services/api_client.dart';
import '../services/api_urls.dart';
class RejectedProvider extends ChangeNotifier {
RejectedProvider() {
getRejectedApplication();
}
final _apiClient = ApiClient();
RejectedApplicationResponse? rejectedApplicationResponse;
List<RejectedApplicationResponse> rejectedApplicationList = [];
bool _isLoading = false;
bool get isLoading => _isLoading;
void setLoading(bool loading) {
_isLoading = loading;
notifyListeners();
}
Future<void> getRejectedApplication() async {
setLoading(true);
try {
Response response = await _apiClient.get(ApiUrls.rejectedApplication);
setLoading(false);
if (response.statusCode == 200) {
rejectedApplicationList = (response.data as List)
.map((e) => RejectedApplicationResponse.fromJson(e))
.toList();
notifyListeners();
}
} catch (e) {
setLoading(false);
}
}
}

88
lib/screens/Rejected_application.dart
View File

@ -1,88 +0,0 @@
import 'package:flutter/material.dart';
import 'package:cheminova/widgets/common_background.dart';
import 'package:cheminova/widgets/common_drawer.dart';
import 'package:cheminova/widgets/common_app_bar.dart';
import 'package:cheminova/widgets/common_elevated_button.dart';
class RejectedApplication extends StatelessWidget {
const RejectedApplication({super.key});
@override
Widget build(BuildContext context) {
return CommonBackground(
child: Scaffold(
backgroundColor: Colors.transparent,
appBar: CommonAppBar(
actions: [
IconButton(
onPressed: () {
Navigator.pop(context);
},
icon: Image.asset('assets/Back_attendance.png'),
padding: const EdgeInsets.only(right: 20),
),
],
title: const Text('Rejected Application',
style: TextStyle(
fontSize: 20,
color: Colors.black,
fontWeight: FontWeight.w400,
fontFamily: 'Anek')),
backgroundColor: Colors.transparent,
elevation: 0,
),
drawer: const CommonDrawer(),
body: Padding(
padding: const EdgeInsets.all(16.0),
child: SingleChildScrollView(
physics: const BouncingScrollPhysics(),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
const SizedBox(height: 16),
Container(
padding: const EdgeInsets.all(20.0).copyWith(top: 30, bottom: 30),
decoration: BoxDecoration(
border: Border.all(color: Colors.white),
color: const Color(0xffB4D1E5).withOpacity(0.9),
borderRadius: BorderRadius.circular(26.0),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
_buildProductButton('Trade Name 1'),
_buildProductButton('Trade Name 2'),
_buildProductButton('Trade Name 3'),
// _buildProductButton('Product 4'),
// _buildProductButton('Product 5'),
// _buildProductButton('Product 6'),
// _buildProductButton('Product 7'),
],
),
),
],
),
),
),
),
);
}
Widget _buildProductButton(String productName) {
return Padding(
padding: const EdgeInsets.only(bottom: 15),
child: CommonElevatedButton(
borderRadius: 30,
width: double.infinity,
height: kToolbarHeight - 10,
text: productName,
backgroundColor: const Color(0xff004791),
onPressed: () {
// Handle product button press
debugPrint('$productName pressed');
},
),
);
}
}

2
lib/screens/Visit_Dealers_screen.dart
View File

@ -73,7 +73,7 @@ class VisitDealersScreenState extends State<VisitDealersScreen> {
Container(
padding:
const EdgeInsets.all(20.0).copyWith(top: 30, bottom: 30),
margin: const EdgeInsets.symmetric(horizontal: 30.0),
// margin: const EdgeInsets.symmetric(horizontal: 30.0),
decoration: BoxDecoration(
border: Border.all(color: Colors.white),
color: const Color(0xffB4D1E5).withOpacity(0.9),

4
lib/screens/home_screen.dart
View File

@ -1,5 +1,5 @@
import 'package:cheminova/provider/home_provider.dart';
import 'package:cheminova/screens/Rejected_application.dart';
import 'package:cheminova/screens/rejected_application_screen.dart';
import 'package:cheminova/screens/calendar_screen.dart';
import 'package:cheminova/screens/collect_kyc_screen.dart';
import 'package:cheminova/screens/daily_tasks_screen.dart';
@ -185,7 +185,7 @@ class _HomePageState extends State<HomePage> {
context,
MaterialPageRoute(
builder: (context) =>
const RejectedApplication(),
const RejectedApplicationScreen(),
));
}),
),

204
lib/screens/rejected_application_screen.dart Normal file
View File

@ -0,0 +1,204 @@
import 'package:cheminova/models/rejected_applicaton_response.dart';
import 'package:flutter/material.dart';
import 'package:cheminova/widgets/common_background.dart';
import 'package:cheminova/widgets/common_drawer.dart';
import 'package:cheminova/widgets/common_app_bar.dart';
import 'package:cheminova/widgets/common_elevated_button.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import '../provider/rejected_provider.dart';
class RejectedApplicationScreen extends StatefulWidget {
const RejectedApplicationScreen({super.key});
@override
State<RejectedApplicationScreen> createState() => _RejectedApplicationScreenState();
}
class _RejectedApplicationScreenState extends State<RejectedApplicationScreen> {
late RejectedProvider _rejectedProvider;
@override
void initState() {
_rejectedProvider = RejectedProvider();
super.initState();
}
@override
Widget build(BuildContext context) {
return ChangeNotifierProvider(
create: (context) => _rejectedProvider,
child: CommonBackground(
child: Scaffold(
backgroundColor: Colors.transparent,
appBar: CommonAppBar(
actions: [
IconButton(
onPressed: () {
Navigator.pop(context);
},
icon: Image.asset('assets/Back_attendance.png'),
padding: const EdgeInsets.only(right: 20),
),
],
title: const Text('Rejected Application',
style: TextStyle(
fontSize: 20,
color: Colors.black,
fontWeight: FontWeight.w400,
fontFamily: 'Anek')),
backgroundColor: Colors.transparent,
elevation: 0,
),
drawer: const CommonDrawer(),
body: Consumer<RejectedProvider>(
builder: (context, value, child) => value.isLoading
? const Center(child: CircularProgressIndicator())
: MyListView(value: value),
// child: Padding(
// padding: const EdgeInsets.all(16.0),
// child: SingleChildScrollView(
// physics: const BouncingScrollPhysics(),
// child: Column(
// mainAxisAlignment: MainAxisAlignment.center,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: <Widget>[
// const SizedBox(height: 16),
// Container(
// padding: const EdgeInsets.all(20.0).copyWith(
// top: 30, bottom: 30),
// decoration: BoxDecoration(
// border: Border.all(color: Colors.white),
// color: const Color(0xffB4D1E5).withOpacity(0.9),
// borderRadius: BorderRadius.circular(26.0),
// ),
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: <Widget>[
// _buildProductButton('Trade Name 1'),
// _buildProductButton('Trade Name 2'),
// _buildProductButton('Trade Name 3'),
// // _buildProductButton('Product 4'),
// // _buildProductButton('Product 5'),
// // _buildProductButton('Product 6'),
// // _buildProductButton('Product 7'),
// ],
// ),
// ),
// ],
// ),
// ),
// ),
),
),
)
);
}
}
Widget _buildProductButton(String productName) {
return Padding(
padding: const EdgeInsets.only(bottom: 15),
child: CommonElevatedButton(
borderRadius: 30,
width: double.infinity,
height: kToolbarHeight - 10,
text: productName,
backgroundColor: const Color(0xff004791),
onPressed: () {
// Handle product button press
debugPrint('$productName pressed');
},
),
);
}
class MyListView extends StatelessWidget {
final RejectedProvider value;
const MyListView( {super.key, required this.value});
@override
Widget build(BuildContext context) {
return ListView.builder(
padding: const EdgeInsets.only(top: 15),
itemCount: value.rejectedApplicationList.length,
itemBuilder: (context, index) {
RejectedApplicationResponse item = value.rejectedApplicationList[index];
return Padding(
padding: const EdgeInsets.only(bottom: 10,left: 10,right: 10),
child: ExpansionTile(
collapsedBackgroundColor: Colors.white,
backgroundColor: Colors.white,
title: Text(item.tradeName ?? '',style: const TextStyle(fontSize: 17,fontWeight:FontWeight.w500),),
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text((DateFormat("dd/MM/yyyy")
.format(DateTime.parse(item.createdAt ?? '')))),
Text(item.sId ?? ''),
],
),
children: <Widget>[
ListTile(
title: Text('Address: ${item.address ?? ''}'),
),
ListTile(
title: Text('City: ${item.city ?? ''}'),
),
ListTile(
title: Text('State: ${item.state ?? ''}'),
),
ListTile(
title: Text('Pincode: ${item.pincode ?? ''}'),
),
ListTile(
title: Text('Mobile: ${item.mobileNumber ?? ''}'),
),
ListTile(
title: Text('Status: ${item.status ?? ''}'),
),
ListTile(
title: Text('Principal Distributor: ${item.principalDistributer!.name ?? ''}'),
),
ListTile(
title: Text('PAN Number: ${item.panNumber ?? ''}'),
),
Image.network(item.panImg!.url ?? '',height: 250,width: 250),
ListTile(
title: Text('Aadhar Number: ${item.aadharNumber?? ''}'),
),
Image.network(item.aadharImg?.url ?? '',height: 250,width: 250),
ListTile(
title: Text('GST Number: ${item.gstNumber ?? ''}'),
),
Image.network(item.gstImg!.url ?? '',height: 250,width: 250),const ListTile(
title: Text('Pesticide License: '),
),
if (item.pesticideLicenseImg != null)
Image.network(item.pesticideLicenseImg!.url ?? '',height: 250,width: 250),
// if (item['fertilizer_license_img'] != null)
// Image.network(item['fertilizer_license_img']['url'] ?? ''),
const ListTile(
title: Text('selfieEntranceImg: '),
),
Image.network(item.selfieEntranceImg!.url ?? '',height: 250,width: 250),
const ListTile(
title: Text('Notes:'),
),
if (item.notes != null)
for (var note in item.notes!)
ListTile(
contentPadding: const EdgeInsets.only(left: 20),
title: Text(note.message ?? ''),
),
],
),
);
},
);
}
}

7
lib/screens/retailer_details_screen.dart
View File

@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import '../constants/only_uppercase.dart';
import '../widgets/common_elevated_button.dart';
import '../widgets/common_text_form_field.dart';
@ -153,6 +154,9 @@ class RetailerDetailsScreenState extends State<RetailerDetailsScreen> {
controller: value.aadharNumberController),
const SizedBox(height: 15),
CommonTextFormField(
inputFormatters: [
UpperCaseTextFormatter(),
],
maxLength: 10,
title: 'PAN Number',
fillColor: Colors.white,
@ -165,6 +169,9 @@ class RetailerDetailsScreenState extends State<RetailerDetailsScreen> {
controller: value.panNumberController),
const SizedBox(height: 15),
CommonTextFormField(
inputFormatters: [
UpperCaseTextFormatter(),
],
maxLength: 15,
title: 'GST Number',
fillColor: Colors.white,

0
lib/screens/reupload_document.dart
View File

1
lib/services/api_urls.dart
View File

@ -10,4 +10,5 @@ class ApiUrls {
static const String forgotPasswordUrl = '${baseUrl}salescoordinator/forgot-password';
static const String leaveAttendance = '${baseUrl}v1/markleave/salescoordinator';
static const String logOutUrl = '${baseUrl}salescoordinator/logout';
static const String rejectedApplication = '${baseUrl}kyc/getAllrejected';
}