From 67ed0ce21cc444f844ab41d0298d328ec03b986f Mon Sep 17 00:00:00 2001 From: Vaibhav Date: Mon, 9 Sep 2024 16:58:17 +0530 Subject: [PATCH] change base Url --- lib/provider/collect_kyc_provider.dart | 6 ++++++ lib/provider/daily_task_provider.dart | 21 ++++++++++---------- lib/screens/Add_products_screen.dart | 2 +- lib/screens/Update_inventorytask_screen.dart | 9 ++++++++- lib/screens/daily_tasks_screen.dart | 1 + lib/screens/login_screen.dart | 1 + lib/screens/retailer_details_screen.dart | 16 +++++++++++++++ lib/screens/sales_task_screen.dart | 15 ++++++++++---- lib/screens/select_taskkyc_screen.dart | 2 +- lib/services/api_urls.dart | 2 +- lib/widgets/common_text_form_field.dart | 4 +++- lib/widgets/no_space_formatter.dart | 16 +++++++++++++++ 12 files changed, 76 insertions(+), 19 deletions(-) create mode 100644 lib/widgets/no_space_formatter.dart diff --git a/lib/provider/collect_kyc_provider.dart b/lib/provider/collect_kyc_provider.dart index fca5941..aae2c60 100644 --- a/lib/provider/collect_kyc_provider.dart +++ b/lib/provider/collect_kyc_provider.dart @@ -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(), diff --git a/lib/provider/daily_task_provider.dart b/lib/provider/daily_task_provider.dart index b0a0752..55cc93e 100644 --- a/lib/provider/daily_task_provider.dart +++ b/lib/provider/daily_task_provider.dart @@ -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 newTasksList = []; List pendingTasksList = []; @@ -25,18 +20,24 @@ class DailyTaskProvider extends ChangeNotifier { notifyListeners(); } - Future getTask({required String type}) async { + Future getTask( + {required String type, bool isAddPending = false}) async { setLoading(true); try { - Response response = await _apiClient.get(ApiUrls.dailyTaskUrl+type); + Response response = await _apiClient.get(ApiUrls.dailyTaskUrl + type); setLoading(false); if (response.statusCode == 200) { final data = DailyTasksResponse.fromJson(response.data); if (type == 'New') { - newTasksList = data.tasks ?? []; + newTasksList.clear(); + newTasksList.addAll(data.tasks ?? []); } else if (type == 'Pending') { - pendingTasksList = data.tasks ?? []; + if (isAddPending) { + newTasksList.addAll(data.tasks ?? []); + } else { + pendingTasksList = data.tasks ?? []; + } } else { completedTasksList = data.tasks ?? []; } diff --git a/lib/screens/Add_products_screen.dart b/lib/screens/Add_products_screen.dart index 983d3eb..162b092 100644 --- a/lib/screens/Add_products_screen.dart +++ b/lib/screens/Add_products_screen.dart @@ -211,7 +211,7 @@ class _AddProductsScreenState extends State { 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; }); diff --git a/lib/screens/Update_inventorytask_screen.dart b/lib/screens/Update_inventorytask_screen.dart index b460e14..2c8d940 100644 --- a/lib/screens/Update_inventorytask_screen.dart +++ b/lib/screens/Update_inventorytask_screen.dart @@ -23,9 +23,16 @@ class _UpdateInventoryTaskScreenState extends State { 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( diff --git a/lib/screens/daily_tasks_screen.dart b/lib/screens/daily_tasks_screen.dart index 6f90f35..1aa6627 100644 --- a/lib/screens/daily_tasks_screen.dart +++ b/lib/screens/daily_tasks_screen.dart @@ -27,6 +27,7 @@ class _DailyTasksScreenState extends State { @override void initState() { _dailyTaskProvider = DailyTaskProvider(); + _dailyTaskProvider.getTask(type: 'New'); super.initState(); } diff --git a/lib/screens/login_screen.dart b/lib/screens/login_screen.dart index 90619c3..696b498 100644 --- a/lib/screens/login_screen.dart +++ b/lib/screens/login_screen.dart @@ -101,6 +101,7 @@ class _LoginPageState extends State { Consumer( builder: (context, value, child) => CommonTextFormField( + obscureText: true, controller: value.passwordController, validator: (value) { if (value == null || value.isEmpty) { diff --git a/lib/screens/retailer_details_screen.dart b/lib/screens/retailer_details_screen.dart index 02c743e..73db517 100644 --- a/lib/screens/retailer_details_screen.dart +++ b/lib/screens/retailer_details_screen.dart @@ -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 { }, 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', diff --git a/lib/screens/sales_task_screen.dart b/lib/screens/sales_task_screen.dart index 92239c3..92d351e 100644 --- a/lib/screens/sales_task_screen.dart +++ b/lib/screens/sales_task_screen.dart @@ -23,7 +23,12 @@ class _SalesTaskScreenState extends State { 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 { } 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 { 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}'), ], ), @@ -138,4 +145,4 @@ class _SalesTaskScreenState extends State { ), ); } -} \ No newline at end of file +} diff --git a/lib/screens/select_taskkyc_screen.dart b/lib/screens/select_taskkyc_screen.dart index 31f7af6..1223af3 100644 --- a/lib/screens/select_taskkyc_screen.dart +++ b/lib/screens/select_taskkyc_screen.dart @@ -83,7 +83,7 @@ class SelectTaskkycScreenState extends State { onTap: () => Navigator.push( context, MaterialPageRoute( - builder: (context) => CollectKycScreen(id: task.taskId ?? ''), + builder: (context) => CollectKycScreen(id: task.sId ?? ''), ), ), child: Card( diff --git a/lib/services/api_urls.dart b/lib/services/api_urls.dart index ad27bd7..2005caa 100644 --- a/lib/services/api_urls.dart +++ b/lib/services/api_urls.dart @@ -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'; diff --git a/lib/widgets/common_text_form_field.dart b/lib/widgets/common_text_form_field.dart index 14d320d..83ec611 100644 --- a/lib/widgets/common_text_form_field.dart +++ b/lib/widgets/common_text_form_field.dart @@ -12,6 +12,7 @@ class CommonTextFormField extends StatelessWidget { final TextInputType? keyboardType; final List? 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(), diff --git a/lib/widgets/no_space_formatter.dart b/lib/widgets/no_space_formatter.dart new file mode 100644 index 0000000..964b23e --- /dev/null +++ b/lib/widgets/no_space_formatter.dart @@ -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, + ); + } +}