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

change base Url

Browse Source
This commit is contained in:
Vaibhav 2024-09-09 16:58:17 +05:30
parent 59b758a7b5
commit 67ed0ce21c
12 changed files with 76 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/provider/collect_kyc_provider.dart
View File

@ -30,6 +30,7 @@ class CollectKycProvider extends ChangeNotifier {
final districtController = TextEditingController();
final pinCodeController = TextEditingController();
final mobileNumberController = TextEditingController();
final emailController = TextEditingController();
final aadharNumberController = TextEditingController();
final panNumberController = TextEditingController();
final gstNumberController = TextEditingController();
@ -179,6 +180,10 @@ class CollectKycProvider extends ChangeNotifier {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Mobile Number is required')),
);
}else if (emailController.text.trim().isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Email id is required')),
);
} else if (aadharNumberController.text.trim().isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Aadhar Number is required')),
@ -236,6 +241,7 @@ class CollectKycProvider extends ChangeNotifier {
'district': districtController.text.trim(),
'pincode': pinCodeController.text.trim(),
'mobile_number': mobileNumberController.text.trim(),
'email': emailController.text.trim(),
'principal_distributer': selectedDistributor,
'pan_number': panNumberController.text.trim(),
'aadhar_number': aadharNumberController.text.trim(),

17
lib/provider/daily_task_provider.dart
View File

@ -1,16 +1,11 @@
import 'package:cheminova/models/Daily_Task_Response.dart';
import 'package:dio/dio.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import '../services/api_client.dart';
import '../services/api_urls.dart';
class DailyTaskProvider extends ChangeNotifier {
DailyTaskProvider() {
getTask(type: 'New');
}
final _apiClient = ApiClient();
List<Tasks> newTasksList = [];
List<Tasks> pendingTasksList = [];
@ -25,7 +20,8 @@ class DailyTaskProvider extends ChangeNotifier {
notifyListeners();
}
Future<void> getTask({required String type}) async {
Future<void> getTask(
{required String type, bool isAddPending = false}) async {
setLoading(true);
try {
Response response = await _apiClient.get(ApiUrls.dailyTaskUrl + type);
@ -34,9 +30,14 @@ class DailyTaskProvider extends ChangeNotifier {
final data = DailyTasksResponse.fromJson(response.data);
if (type == 'New') {
newTasksList = data.tasks ?? [];
newTasksList.clear();
newTasksList.addAll(data.tasks ?? []);
} else if (type == 'Pending') {
if (isAddPending) {
newTasksList.addAll(data.tasks ?? []);
} else {
pendingTasksList = data.tasks ?? [];
}
} else {
completedTasksList = data.tasks ?? [];
}

2
lib/screens/Add_products_screen.dart
View File

@ -211,7 +211,7 @@ class _AddProductsScreenState extends State<AddProductsScreen> {
itemBuilder: (context, index) {
return ProductBlock(
onUpdate: (updatedProduct) {
debugPrint('selected productt le ${value.selectedProducts.length}');
debugPrint('selected product le ${value.selectedProducts.length}');
setState(() {
value.selectedProducts[index] = updatedProduct;
});

9
lib/screens/Update_inventorytask_screen.dart
View File

@ -23,9 +23,16 @@ class _UpdateInventoryTaskScreenState extends State<UpdateInventoryTaskScreen> {
void initState() {
super.initState();
_dailyTaskProvider = DailyTaskProvider();
_dailyTaskProvider.getTask(type: 'New');
apiCall();
}
void apiCall() async {
await _dailyTaskProvider.getTask(type: 'New',isAddPending: true);
await _dailyTaskProvider.getTask(type: 'Pending',isAddPending: true);
}
@override
Widget build(BuildContext context) {
return ChangeNotifierProvider(

1
lib/screens/daily_tasks_screen.dart
View File

@ -27,6 +27,7 @@ class _DailyTasksScreenState extends State<DailyTasksScreen> {
@override
void initState() {
_dailyTaskProvider = DailyTaskProvider();
_dailyTaskProvider.getTask(type: 'New');
super.initState();
}

1
lib/screens/login_screen.dart
View File

@ -101,6 +101,7 @@ class _LoginPageState extends State<LoginPage> {
Consumer<LoginProvider>(
builder: (context, value, child) =>
CommonTextFormField(
obscureText: true,
controller: value.passwordController,
validator: (value) {
if (value == null || value.isEmpty) {

16
lib/screens/retailer_details_screen.dart
View File

@ -8,6 +8,7 @@ import 'package:provider/provider.dart';
import '../constants/only_uppercase.dart';
import '../widgets/common_elevated_button.dart';
import '../widgets/common_text_form_field.dart';
import '../widgets/no_space_formatter.dart';
class RetailerDetailsScreen extends StatefulWidget {
const RetailerDetailsScreen({super.key});
@ -140,6 +141,21 @@ class RetailerDetailsScreenState extends State<RetailerDetailsScreen> {
},
controller: value.mobileNumberController),
const SizedBox(height: 15),
CommonTextFormField(
// maxLength: 20,
title: 'Email',
fillColor: Colors.white,
inputFormatters: [
NoSpaceFormatter(),
],
validator: (String? value) {
if (value!.isEmpty) {
return 'Email cannot be empty';
}
return null;
},
controller: value.emailController),
const SizedBox(height: 15),
CommonTextFormField(
maxLength: 12,
title: 'Aadhar Number',

13
lib/screens/sales_task_screen.dart
View File

@ -23,7 +23,12 @@ class _SalesTaskScreenState extends State<SalesTaskScreen> {
void initState() {
super.initState();
_dailyTaskProvider = DailyTaskProvider();
_dailyTaskProvider.getTask(type: 'New');
apiCall();
}
void apiCall() async {
await _dailyTaskProvider.getTask(type: 'New', isAddPending: true);
await _dailyTaskProvider.getTask(type: 'Pending', isAddPending: true);
}
@override
@ -69,7 +74,8 @@ class _SalesTaskScreenState extends State<SalesTaskScreen> {
}
final salesTasks = value.newTasksList
.where((task) => task.task?.toLowerCase() == 'Update Sales Data'.toLowerCase())
.where((task) =>
task.task?.toLowerCase() == 'Update Sales Data'.toLowerCase())
.toList();
if (salesTasks.isEmpty) {
@ -129,7 +135,8 @@ class _SalesTaskScreenState extends State<SalesTaskScreen> {
Text('Distributor: ${tasksList.addedFor ?? ""}'),
Text('Trader Name: ${tasksList.tradeName ?? ''}'),
if (tasksList.taskDueDate != null)
Text('Due Date: ${DateFormat('dd/MM/yyyy').format(DateTime.parse(tasksList.taskDueDate!))}'),
Text(
'Due Date: ${DateFormat('dd/MM/yyyy').format(DateTime.parse(tasksList.taskDueDate!))}'),
Text('Priority: ${tasksList.taskPriority}'),
],
),

2
lib/screens/select_taskkyc_screen.dart
View File

@ -83,7 +83,7 @@ class SelectTaskkycScreenState extends State<SelectTaskkycScreen> {
onTap: () => Navigator.push(
context,
MaterialPageRoute(
builder: (context) => CollectKycScreen(id: task.taskId ?? ''),
builder: (context) => CollectKycScreen(id: task.sId ?? ''),
),
),
child: Card(

2
lib/services/api_urls.dart
View File

@ -1,5 +1,5 @@
class ApiUrls {
static const String baseUrl = 'https://cheminova-api-2.onrender.com/api/';
static const String baseUrl = 'https://api.cnapp.co.in/api/';
static const String loginUrl = 'salescoordinator/login';
static const String profileUrl = 'my-profile';
static const String markAttendanceUrl = 'v1/markattendance/salescoordinator';

4
lib/widgets/common_text_form_field.dart
View File

@ -12,6 +12,7 @@ class CommonTextFormField extends StatelessWidget {
final TextInputType? keyboardType;
final List<TextInputFormatter>? inputFormatters;
final int? maxLength;
final bool obscureText;
const CommonTextFormField(
{super.key,
@ -23,7 +24,7 @@ const CommonTextFormField(
this.maxLines,
this.height,
this.keyboardType,
this.inputFormatters, this.maxLength});
this.inputFormatters, this.maxLength, required, this.obscureText = false});
@override
Widget build(BuildContext context) {
@ -39,6 +40,7 @@ const CommonTextFormField(
TextFormField(
controller: controller,
readOnly: readOnly ?? false,
obscureText: obscureText,
maxLines: maxLines??1,
maxLength: maxLength,
onTapOutside: (event) => FocusScope.of(context).unfocus(),

16
lib/widgets/no_space_formatter.dart Normal file
View File

@ -0,0 +1,16 @@
import 'package:flutter/services.dart';
class NoSpaceFormatter extends TextInputFormatter {
@override
TextEditingValue formatEditUpdate(
TextEditingValue oldValue, TextEditingValue newValue) {
// Filter out spaces from the input
String newText = newValue.text.replaceAll(' ', '');
// Return the new formatted value without spaces
return TextEditingValue(
text: newText,
selection: newValue.selection,
);
}
}