update inventory new screen and api intergrate

lib/models/Daily_Task_Response.dart

@@ -0,0 +1,103 @@
+import 'package:cheminova/models/rejected_applicaton_response.dart';
+import 'package:cheminova/provider/pd_rd_provider.dart';
+
+class DailyTasksResponse {
+  bool? success;
+  List<Tasks>? tasks;
+
+  DailyTasksResponse({this.success, this.tasks});
+
+  DailyTasksResponse.fromJson(Map<String, dynamic> json) {
+    success = json['success'];
+    if (json['tasks'] != null) {
+      tasks = <Tasks>[];
+      json['tasks'].forEach((v) {
+        tasks!.add(new Tasks.fromJson(v));
+      });
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['success'] = this.success;
+    if (this.tasks != null) {
+      data['tasks'] = this.tasks!.map((v) => v.toJson()).toList();
+    }
+    return data;
+  }
+}
+
+class Tasks {
+  String? tradeName;
+  String? sId;
+  String? taskId;
+  String? task;
+  String? taskStatus;
+  String? taskPriority;
+  String? taskDueDate;
+  String? taskAssignedTo;
+  String? taskAssignedBy;
+  String? addedFor;
+  String? addedForId;
+  String? createdAt;
+  String? updatedAt;
+  int? iV;
+  String? note;
+
+  Tasks(
+      {this.sId,
+        this.taskId,
+        this.tradeName,
+        this.task,
+        this.taskStatus,
+        this.taskPriority,
+        this.taskDueDate,
+        this.taskAssignedTo,
+        this.taskAssignedBy,
+        this.addedFor,
+        this.addedForId,
+        this.createdAt,
+        this.updatedAt,
+        this.iV,
+        this.note});
+
+  Tasks.fromJson(Map<String, dynamic> json) {
+    sId = json['_id'];
+    tradeName = json['tradename'];
+    taskId = json['taskId'];
+    task = json['task'];
+    taskStatus = json['taskStatus'];
+    taskPriority = json['taskPriority'];
+    taskDueDate = json['taskDueDate'];
+    taskAssignedTo = json['taskAssignedTo'];
+    taskAssignedBy = json['taskAssignedBy'];
+    addedFor = json['addedFor'];
+    addedForId = json['addedForId'];
+    createdAt = json['createdAt'];
+    updatedAt = json['updatedAt'];
+    iV = json['__v'];
+    note = json['note'];
+  }
+
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['_id'] = this.sId;
+    data['tradename'] = this.tradeName;
+    data['taskId'] = this.taskId;
+    data['task'] = this.task;
+    data['taskStatus'] = this.taskStatus;
+    data['taskPriority'] = this.taskPriority;
+    data['taskDueDate'] = this.taskDueDate;
+    data['taskAssignedTo'] = this.taskAssignedTo;
+    data['taskAssignedBy'] = this.taskAssignedBy;
+    data['addedFor'] = this.addedFor;
+    data['addedForId'] = this.addedForId;
+    data['createdAt'] = this.createdAt;
+    data['updatedAt'] = this.updatedAt;
+    data['__v'] = this.iV;
+    data['note'] = this.note;
+    data['Distributor'] = this.taskAssignedTo;
+    return data;
+  }
+}

lib/models/products_response.dart

@@ -36,13 +36,13 @@ class Products {
   String? sKU;
   String? name;
   Category? category;
+  Brand? brand;
   int? price;
-  GST? gST;
+  int? gST;
+  int? hSNCode;
   String? description;
-  String? specialInstructions;
   String? productStatus;
   AddedBy? addedBy;
-  List<Null>? image;
   String? createdAt;
   String? updatedAt;
   int? iV;
@@ -52,13 +52,13 @@ class Products {
         this.sKU,
         this.name,
         this.category,
+        this.brand,
         this.price,
         this.gST,
+        this.hSNCode,
         this.description,
-        this.specialInstructions,
         this.productStatus,
         this.addedBy,
-        this.image,
         this.createdAt,
         this.updatedAt,
         this.iV});
@@ -70,10 +70,11 @@ class Products {
     category = json['category'] != null
         ? new Category.fromJson(json['category'])
         : null;
+    brand = json['brand'] != null ? new Brand.fromJson(json['brand']) : null;
     price = json['price'];
-    gST = json['GST'] != null ? new GST.fromJson(json['GST']) : null;
+    gST = json['GST'];
+    hSNCode = json['HSN_Code'];
     description = json['description'];
-    specialInstructions = json['special_instructions'];
     productStatus = json['product_Status'];
     addedBy =
     json['addedBy'] != null ? new AddedBy.fromJson(json['addedBy']) : null;
@@ -90,12 +91,13 @@ class Products {
     if (this.category != null) {
       data['category'] = this.category!.toJson();
     }
-    data['price'] = this.price;
+    if (this.brand != null) {
-    if (this.gST != null) {
+      data['brand'] = this.brand!.toJson();
-      data['GST'] = this.gST!.toJson();
     }
+    data['price'] = this.price;
+    data['GST'] = this.gST;
+    data['HSN_Code'] = this.hSNCode;
     data['description'] = this.description;
-    data['special_instructions'] = this.specialInstructions;
     data['product_Status'] = this.productStatus;
     if (this.addedBy != null) {
       data['addedBy'] = this.addedBy!.toJson();
@@ -126,24 +128,21 @@ class Category {
   }
 }
 
-class GST {
+class Brand {
   String? sId;
-  String? name;
+  String? brandName;
-  int? tax;
 
-  GST({this.sId, this.name, this.tax});
+  Brand({this.sId, this.brandName});
 
-  GST.fromJson(Map<String, dynamic> json) {
+  Brand.fromJson(Map<String, dynamic> json) {
     sId = json['_id'];
-    name = json['name'];
+    brandName = json['brandName'];
-    tax = json['tax'];
   }
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     data['_id'] = this.sId;
-    data['name'] = this.name;
+    data['brandName'] = this.brandName;
-    data['tax'] = this.tax;
     return data;
   }
 }

lib/provider/daily_task_provider.dart

@@ -0,0 +1,52 @@
+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 = [];
+  List<Tasks> completedTasksList = [];
+
+  bool _isLoading = false;
+
+  bool get isLoading => _isLoading;
+
+  void setLoading(bool loading) {
+    _isLoading = loading;
+    notifyListeners();
+  }
+
+  Future<void> getTask({required String type}) async {
+    setLoading(true);
+    try {
+      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 ?? [];
+        } else if (type == 'Pending') {
+          pendingTasksList = data.tasks ?? [];
+        } else {
+          completedTasksList = data.tasks ?? [];
+        }
+        notifyListeners();
+      }
+    } catch (e) {
+      setLoading(false);
+      if (kDebugMode) {
+        print("Error occurred while fetching notifications: $e");
+      }
+    }
+  }
+}

lib/provider/products_provider.dart

@@ -1,12 +1,10 @@
 import 'dart:convert';
-
 import 'package:cheminova/constants/constant.dart';
 import 'package:cheminova/screens/data_submit_successfull.dart';
 import 'package:cheminova/services/api_client.dart';
 import 'package:cheminova/services/api_urls.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
-
 import '../models/products_response.dart';
 
 class ProductProvider extends ChangeNotifier {

lib/provider/select_task_provider.dart

@@ -26,7 +26,7 @@ class SelectTaskProvider extends ChangeNotifier {
   Future<void> getTask() async {
     setLoading(true);
     try {
-      Response response = await _apiClient.get(ApiUrls.selectTaskUrl);
+      Response response = await _apiClient.get(ApiUrls.kycSelectTaskUrl);
       setLoading(false);
       if (response.statusCode == 200) {
           final data = SelectTaskKycResponse.fromJson(response.data);

lib/screens/Update_inventorytask_screen.dart

@@ -0,0 +1,127 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:cheminova/models/Daily_Task_Response.dart';
+import 'package:cheminova/screens/update_inventory_screen.dart';
+import 'package:cheminova/widgets/common_app_bar.dart';
+import 'package:cheminova/widgets/common_background.dart';
+import 'package:cheminova/widgets/common_drawer.dart';
+import '../constants/constant.dart';
+import '../provider/daily_task_provider.dart';
+import 'Add_products_screen.dart';
+
+class UpdateInventoryTaskScreen extends StatefulWidget {
+  const UpdateInventoryTaskScreen({super.key});
+
+  @override
+  _UpdateInventoryTaskScreenState createState() => _UpdateInventoryTaskScreenState();
+}
+
+class _UpdateInventoryTaskScreenState extends State<UpdateInventoryTaskScreen> {
+  late DailyTaskProvider _dailyTaskProvider;
+
+  @override
+  void initState() {
+    super.initState();
+    _dailyTaskProvider = DailyTaskProvider();
+    _dailyTaskProvider.getTask(type: 'New');
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ChangeNotifierProvider(
+      create: (context) => _dailyTaskProvider,
+      child: Scaffold(
+        extendBodyBehindAppBar: true,
+        appBar: _buildAppBar(),
+        drawer: const CommonDrawer(),
+        body: CommonBackground(
+          child: SafeArea(
+            child: _buildTaskList(),
+          ),
+        ),
+      ),
+    );
+  }
+
+  CommonAppBar _buildAppBar() {
+    return CommonAppBar(
+      backgroundColor: Colors.transparent,
+      elevation: 0,
+      actions: [
+        IconButton(
+          onPressed: () => Navigator.pop(context),
+          icon: Image.asset('assets/Back_attendance.png'),
+          padding: const EdgeInsets.only(right: 20),
+        ),
+      ],
+      title: const Text(
+        'Inventory Update Tasks',
+        style: TextStyle(color: Colors.black87, fontSize: 20),
+      ),
+    );
+  }
+
+  Widget _buildTaskList() {
+    return Consumer<DailyTaskProvider>(
+      builder: (context, value, child) =>
+      value.isLoading
+          ? const Center(child: CircularProgressIndicator())
+          : ListView.separated(
+        padding: const EdgeInsets.all(16),
+        itemCount: value.newTasksList.length,
+        separatorBuilder: (context, index) => const SizedBox(height: 8),
+        itemBuilder: (context, index) {
+          final task = value.newTasksList[index];
+          if (task.task?.toLowerCase() == 'update inventory data') {
+            return _buildTaskCard(task);
+          } else {
+            return const SizedBox.shrink();
+          }
+        },
+      ),
+    );
+  }
+
+  Widget _buildTaskCard(Tasks tasksList) {
+    return InkWell(
+      onTap: () {
+        if (tasksList.sId != null && tasksList.addedFor != null) {
+          Navigator.push(
+              navigatorKey.currentContext!,
+              MaterialPageRoute(
+                  builder: (context) => AddProductsScreen(
+                      distributorType: tasksList.addedFor!,
+                      tradeName: tasksList.tradeName??'',
+                      pdRdId: tasksList.sId!)));
+        }
+      },
+      child: Card(
+        color: Colors.white,
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
+        child: ListTile(
+          leading: const Icon(Icons.inventory, color: Colors.blueAccent),
+          title: Text(
+            tasksList.task ?? '',
+            style: const TextStyle(
+              color: Colors.black87,
+              fontWeight: FontWeight.w700,
+              fontSize: 16,
+              fontFamily: 'Anek',
+            ),
+          ),
+          subtitle: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text('Distributor: ${tasksList.addedFor ?? ""}'),
+              Text('Trader Name: ${tasksList.tradeName??''}'),
+              Text('Due Date: ${tasksList.taskDueDate}'),
+              Text('Priority: ${tasksList.taskPriority}'),
+            ],
+          ),
+          trailing: const Icon(Icons.arrow_forward_ios, color: Colors.black87),
+
+        ),
+      ),
+    );
+  }
+}

lib/screens/daily_tasks_screen.dart

@@ -1,3 +1,5 @@
+import 'package:cheminova/models/Daily_Task_Response.dart';
+import 'package:cheminova/screens/Add_products_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:cheminova/screens/visit_dealers_screen.dart';
 import 'package:cheminova/screens/display_sales_screen.dart';
@@ -7,6 +9,9 @@ import 'package:cheminova/widgets/common_app_bar.dart';
 import 'package:cheminova/widgets/common_drawer.dart';
 import 'package:cheminova/widgets/common_background.dart';
 import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+
+import '../provider/daily_task_provider.dart';
 
 class DailyTasksScreen extends StatefulWidget {
   const DailyTasksScreen({super.key});
@@ -18,10 +23,19 @@ class DailyTasksScreen extends StatefulWidget {
 class _DailyTasksScreenState extends State<DailyTasksScreen> {
   final List<String> _tabTitles = ['NEW', 'PENDING', 'COMPLETED'];
   int _selectedTabIndex = 0;
+  late DailyTaskProvider _dailyTaskProvider;
+
+  @override
+  void initState() {
+    _dailyTaskProvider = DailyTaskProvider();
+    super.initState();
+  }
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return ChangeNotifierProvider(
+        create: (context) => _dailyTaskProvider,
+        child: Scaffold(
           extendBodyBehindAppBar: true,
           appBar: _buildAppBar(),
           drawer: const CommonDrawer(),
@@ -38,7 +52,7 @@ class _DailyTasksScreenState extends State<DailyTasksScreen> {
               ),
             ),
           ),
-    );
+        ));
   }
 
   CommonAppBar _buildAppBar() {
@@ -67,7 +81,16 @@ class _DailyTasksScreenState extends State<DailyTasksScreen> {
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
         children: List.generate(_tabTitles.length, (index) {
           return GestureDetector(
-            onTap: () => setState(() => _selectedTabIndex = index),
+            onTap: () {
+              setState(() => _selectedTabIndex = index);
+              if (index == 0) {
+                _dailyTaskProvider.getTask(type: 'New');
+              } else if (index == 1) {
+                _dailyTaskProvider.getTask(type: 'Pending');
+              } else {
+                _dailyTaskProvider.getTask(type: 'Completed');
+              }
+            },
             child: Container(
               padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
               decoration: BoxDecoration(
@@ -150,81 +173,127 @@ class _DailyTasksScreenState extends State<DailyTasksScreen> {
         tasks = [];
     }
 
-    return ListView.separated(
+    return Consumer<DailyTaskProvider>(
+      builder: (context, value, child) => value.isLoading
+          ? const Center(child: CircularProgressIndicator())
+          : ListView.separated(
               padding: const EdgeInsets.all(16),
-      itemCount: tasks.length,
+              itemCount: _selectedTabIndex == 0
+                  ? value.newTasksList.length
+                  : _selectedTabIndex == 1
+                      ? value.pendingTasksList.length
+                      : value.completedTasksList.length,
               separatorBuilder: (context, index) => const SizedBox(height: 8),
-      itemBuilder: (context, index) => _buildTaskCard(tasks[index]),
+              itemBuilder: (context, index) {
+                final tasksList = tabIndex == 0
+                    ? value.newTasksList
+                    : tabIndex == 1
+                        ? value.pendingTasksList
+                        : value.completedTasksList;
+                return _buildTaskCard(tasksList[index]);
+              },
+            ),
     );
   }
 
-  Widget _buildTaskCard(TaskItem task) {
+  Widget _buildTaskCard(Tasks tasksList) {
-    if (task is KycTaskItem) {
+    return InkWell(
-      return Card(
+      onTap: () {
+        if (tasksList.task == 'Collect KYC') {
+          Navigator.push(
+              context,
+              MaterialPageRoute(
+                  builder: (context) =>
+                      CollectKycScreen(id: tasksList.taskId ?? '')));
+        } else if (tasksList.task == 'REUPLOAD') {
+          Navigator.push(
+              context,
+              MaterialPageRoute(
+                  builder: (context) =>
+                      CollectKycScreen(id: tasksList.taskId ?? '')));
+        } else if (tasksList.task == 'Update Inventory Data') {
+          Navigator.push(
+              context,
+              MaterialPageRoute(
+                  builder: (context) => AddProductsScreen(
+                      distributorType: tasksList.addedFor!,
+                      tradeName: tasksList.tradeName ?? '',
+                      pdRdId: tasksList.sId!)));
+        } else if (tasksList.task == 'Update Sales Data') {
+          Navigator.push(
+              context,
+              MaterialPageRoute(
+                  builder: (context) => const DisplaySalesScreen()));
+        } else if (tasksList.task == 'Visit Dealers/Retailers') {
+          Navigator.push(
+              context,
+              MaterialPageRoute(
+                  builder: (context) => const VisitDealersScreen()));
+        }
+      },
+      child: Card(
         color: Colors.white,
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
         child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             ListTile(
                 leading: const Icon(Icons.task, color: Colors.blueAccent),
-              title: Text(
+                title: Text(tasksList.task ?? '',
-                task.title,
                     style: const TextStyle(
                         color: Colors.black87,
                         fontWeight: FontWeight.w700,
                         fontSize: 16,
-                  fontFamily: 'Anek',
+                        fontFamily: 'Anek')),
-                ),
-              ),
                 trailing:
-                  const Icon(Icons.arrow_forward_ios, color: Colors.black87),
+                    const Icon(Icons.arrow_forward_ios, color: Colors.black87)),
-              onTap: () => Navigator.push(context,
-                  MaterialPageRoute(builder: (context) => task.screen)),
-            ),
             Padding(
               padding: const EdgeInsets.all(8.0),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  Text('Note: ${task.note}'),
+                  if (tasksList.task?.toLowerCase() == 'collect kyc')
-                  Text('Date: ${task.date.toString().split(' ')[0]}'),
+                    Text('Note: ${tasksList.note}')
-                  Text('Priority: ${task.Low}'),
+                  else if (tasksList.task?.toLowerCase() ==
+                      'update inventory data')
+                    Text('Distributor: ${tasksList.addedFor ?? ""}'),
+                 if(tasksList.tradeName != null) Text('Trade Name: ${tasksList.tradeName ?? ""}'),
+                 if(tasksList.taskDueDate != null) Text('Due Date: ${DateFormat('dd/MM/yyyy').format(DateTime.parse(tasksList.taskDueDate!))}'),
+                  Text('Priority: ${tasksList.taskPriority}'),
                 ],
               ),
             ),
           ],
         ),
-      );
-    } else {
-      return Card(
-        color: Colors.white,
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
-        child: ListTile(
-          leading: const Icon(Icons.task, color: Colors.blueAccent),
-          title: Text(
-            task.title,
-            style: const TextStyle(
-              color: Colors.black87,
-              fontWeight: FontWeight.w700,
-              fontSize: 16,
-              fontFamily: 'Anek',
-            ),
-          ),
-          trailing: const Icon(Icons.arrow_forward_ios, color: Colors.black87),
-          onTap: () => Navigator.push(
-              context, MaterialPageRoute(builder: (context) => task.screen)),
       ),
     );
   }
-  }
 
   final List<TaskItem> _newTasks = [
-    KycTaskItem('Collect KYC Documents', const CollectKycScreen(id: '',),
+    KycTaskItem(
-        'Collect KYC documents from ABC Trader', DateFormat('dd/MM/yyyy').format(DateTime.now()).toString(), 'Priority'),
+        'Collect KYC Documents',
-    KycTaskItem('REUPLOAD', const CollectKycScreen(id: '',),
+        const CollectKycScreen(
-    'Reupload Pan Car From Shiv Traders', DateFormat('dd/MM/yyyy').format(DateTime.now()).toString(), 'Priority'),
+          id: '',
-    KycTaskItem('REUPLOAD', const CollectKycScreen(id: '',),
+        ),
-    'Reupload Pan Car From Shiv Traders', DateFormat('dd/MM/yyyy').format(DateTime.now()).toString(), 'Priority'),
+        'Collect KYC documents from ABC Trader',
+        DateFormat('dd/MM/yyyy').format(DateTime.now()).toString(),
+        'Priority'),
+    KycTaskItem(
+        'REUPLOAD',
+        const CollectKycScreen(
+          id: '',
+        ),
+        'Reupload Pan Car From Shiv Traders',
+        DateFormat('dd/MM/yyyy').format(DateTime.now()).toString(),
+        'Priority'),
+    KycTaskItem(
+        'REUPLOAD',
+        const CollectKycScreen(
+          id: '',
+        ),
+        'Reupload Pan Car From Shiv Traders',
+        DateFormat('dd/MM/yyyy').format(DateTime.now()).toString(),
+        'Priority'),
     // TaskItem('Update Inventory Data', const UpdateInventoryScreen()),
   ];
 

lib/screens/home_screen.dart

@@ -1,5 +1,6 @@
 import 'package:cheminova/notification_services.dart';
 import 'package:cheminova/provider/home_provider.dart';
+import 'package:cheminova/screens/Update_inventorytask_screen.dart';
 import 'package:cheminova/screens/rejected_application_screen.dart';
 import 'package:cheminova/screens/calendar_screen.dart';
 import 'package:cheminova/screens/collect_kyc_screen.dart';
@@ -134,7 +135,7 @@ class _HomePageState extends State<HomePage> {
                                   context,
                                   MaterialPageRoute(
                                     builder: (context) =>
-                                        const UpdateInventoryScreen(),
+                                        const UpdateInventoryTaskScreen(),
                                   ));
                             }),
                           ),

lib/screens/select_taskkyc_screen.dart

@@ -5,6 +5,7 @@ import 'package:cheminova/screens/collect_kyc_screen.dart';
 import 'package:cheminova/widgets/common_app_bar.dart';
 import 'package:cheminova/widgets/common_drawer.dart';
 import 'package:cheminova/widgets/common_background.dart';
+import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 
 class SelectTaskkycScreen extends StatefulWidget {
@@ -15,8 +16,9 @@ class SelectTaskkycScreen extends StatefulWidget {
 }
 
 class SelectTaskkycScreenState extends State<SelectTaskkycScreen> {
-late SelectTaskProvider _selectTaskProvider;
+  late SelectTaskProvider _selectTaskProvider;
-@override
+
+  @override
   void initState() {
     _selectTaskProvider = SelectTaskProvider();
     super.initState();
@@ -24,16 +26,17 @@ late SelectTaskProvider _selectTaskProvider;
 
   @override
   Widget build(BuildContext context) {
-
     return ChangeNotifierProvider(
         create: (context) => _selectTaskProvider,
         child: CommonBackground(
           child: Scaffold(
             backgroundColor: Colors.transparent,
-        appBar: CommonAppBar(title:const Text('Select Task'),
+            appBar: CommonAppBar(
+                title: const Text('Select Task'),
                 backgroundColor: Colors.transparent,
                 elevation: 0,
-            actions: [IconButton(
+                actions: [
+                  IconButton(
                     onPressed: () => Navigator.pop(context),
                     icon: Image.asset('assets/Back_attendance.png'),
                     padding: const EdgeInsets.only(right: 20),
@@ -41,7 +44,8 @@ late SelectTaskProvider _selectTaskProvider;
                 ]),
             drawer: const CommonDrawer(),
             body: Consumer<SelectTaskProvider>(
-          builder: (context, value, child) => value.isLoading
+              builder: (context, value, child) =>
+              value.isLoading
                   ? const Center(child: CircularProgressIndicator())
                   : _buildTaskList(),
             ),
@@ -50,22 +54,25 @@ late SelectTaskProvider _selectTaskProvider;
   }
 
   Widget _buildTaskList() {
-    return Consumer<SelectTaskProvider>(
+    return Consumer<SelectTaskProvider>(builder: (context, value, child) {
-      builder: (context, value, child) {
       if (value.tasksList.isEmpty) {
         return const Center(child: Text('No tasks available'));
       }
       return ListView.builder(
         itemCount: value.tasksList.length,
-          itemBuilder: (context, index) =>
+        itemBuilder: (context, index) => _buildTaskCard(value.tasksList[index]),
-              _buildTaskCard(value.tasksList[index]),
       );
     });
   }
 
-
+  Widget _buildTaskCard(Tasks task) {
-Widget _buildTaskCard(Tasks task) {
+    return InkWell(
-    return Card(
+      onTap: () =>    Navigator.push(
+          context,
+          MaterialPageRoute(
+              builder: (context) =>
+                  CollectKycScreen(id: task.taskId ?? ''))),
+      child: Card(
         margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
         color: Colors.white,
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
@@ -75,7 +82,7 @@ Widget _buildTaskCard(Tasks task) {
             ListTile(
               leading: const Icon(Icons.task, color: Colors.blueAccent),
               title: Text(
-              task.task??'',
+                task.task ?? '',
                 style: const TextStyle(
                   color: Colors.black87,
                   fontWeight: FontWeight.w700,
@@ -85,8 +92,8 @@ Widget _buildTaskCard(Tasks task) {
               ),
               trailing:
               const Icon(Icons.arrow_forward_ios, color: Colors.black87),
-            onTap: () => Navigator.push(context,
+
-                MaterialPageRoute(builder: (context) => CollectKycScreen(id:task.taskId??''))),
+
             ),
             Padding(
               padding: const EdgeInsets.all(8.0),
@@ -94,15 +101,20 @@ Widget _buildTaskCard(Tasks task) {
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Text('Note: ${task.note}'),
-                Text('Date: ${task.taskDueDate}'),
+                  if (task.taskDueDate != null)
-                Text('Priority: ${task.taskPriority}'),
+                    Text(
+                        'Date: ${task.taskDueDate == null ? '' : DateFormat(
+                            'dd/MM/yyyy').format(
+                            DateTime.parse(task.taskDueDate ?? ''))}'),
+                  Text('Priority: ${task.taskPriority}')
                 ],
               ),
             ),
           ],
         ),
+      ),
     );
-}
+  }
 }
 
 class TaskItem {

lib/services/api_urls.dart

@@ -17,4 +17,6 @@ class ApiUrls {
   static const String  getPdRdUrl = '${baseUrl}inventory/distributors-SC/';
   static const String  submitProductUrl = '${baseUrl}inventory/add-SC';
   static const String  selectTaskUrl = '${baseUrl}task/tasks';
+  static const String  dailyTaskUrl = '${baseUrl}task/tasks/';
+  static const String  kycSelectTaskUrl = '${baseUrl}task/task/type/Collect KYC';
 }