Calendar API

lib/provider/add_sales_provider.dart

@@ -65,7 +65,6 @@ class AddSalesProvider with ChangeNotifier {
             "addedForId": pdRdId,
             "tradename": tradeName,
             "date": date,
-
             "products": selectedProducts.map((product) {
               return {
                 "SKU": product.SKU,
@@ -75,7 +74,6 @@ class AddSalesProvider with ChangeNotifier {
                 "SalesAmount": product.SalesAmount
               };
             }).toList()
-           // "products": selectedProducts.map((e) => e.toJson()).toList()
           }));
       setLoading(false);
       if (response.statusCode == 201) {
@@ -84,33 +82,14 @@ class AddSalesProvider with ChangeNotifier {
         ).showSnackBar(
           SnackBar(content: Text(response.data['message'])),
         );
-        if (inventoryId != null) {
+
-          _apiClient
+        resetProducts();
-              .put(ApiUrls.updateTaskInventoryUrl + inventoryId, data: null)
+        Navigator.push(
-              .then((value) {
+          navigatorKey.currentContext!,
-            debugPrint('Task Updated');
+          MaterialPageRoute(
-            if (value.statusCode == 200) {
+            builder: (context) => const DataSubmitSuccessfull(),
-              resetProducts();
+          ),
-              Navigator.push(
+        );
-                  navigatorKey.currentContext!,
-                  MaterialPageRoute(
-                      builder: (context) =>
-                          const DataSubmitSuccessfull()));
-            } else {
-              ScaffoldMessenger.of(
-                navigatorKey.currentContext!,
-              ).showSnackBar(
-                const SnackBar(content: Text('Task not updated')),
-              );
-            }
-          });
-        } else {
-          resetProducts();
-          Navigator.push(
-              navigatorKey.currentContext!,
-              MaterialPageRoute(
-                  builder: (context) => const DataSubmitSuccessfull()));
-        }
       }
     } catch (e) {
       setLoading(false);

lib/provider/product_provider.dart

@@ -52,6 +52,7 @@ class ProductProvider extends ChangeNotifier {
             "ProductName": product.name,
             "Sale": product.sale,
             "Inventory": product.inventory,
+            "productid": product.id,
           };
         }).toList(),
         "addedFor": addedFor,

lib/provider/task_provider.dart

@@ -245,4 +245,24 @@ class TaskProvider extends ChangeNotifier {
       setLoading(false);
     }
   }
+
+  Future<void> getAllTaskByDate(DateTime date) async {
+    clear();
+    setLoading(true);
+    try {
+      final String formatedDate = DateFormat('dd/MM/yyyy').format(date);
+      Response response =
+          await _apiClient.get("${ApiUrls.allTaskByDate}?Date=$formatedDate");
+      if (response.statusCode == 200) {
+        List<TaskModel> data = (response.data['tasks'] as List)
+            .map((json) => TaskModel.fromJson(json))
+            .toList();
+        _taskModelList = data;
+      }
+    } catch (e) {
+      print("Error occurred: $e");
+    } finally {
+      setLoading(false);
+    }
+  }
 }

lib/provider/visit_pdrd_provider.dart

@@ -1,32 +1,52 @@
-import 'package:cheminova/screens/data_submit_successfull.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
+import '../constants/constant.dart';
+import '../screens/data_submit_successfull.dart';
 import '../services/api_client.dart';
 import '../services/api_urls.dart';
 
 class VisitPdRdProvider with ChangeNotifier {
   final _apiClient = ApiClient();
   bool _isLoading = false;
-
-  bool get isLoading => _isLoading;
-
   void setLoading(bool loading) {
     _isLoading = loading;
     notifyListeners();
   }
 
-  Future<void> submitVisitPdRd(BuildContext context, String id) async {
+  bool get isLoading => _isLoading;
+
+  Future<void> submitVisitPdRd({
+    required String pdRdId,
+    required String distributorType,
+    required String tradeName,
+    required String visitDate,
+    required String visitTime,
+    required String visitPurpose,
+    required String meetingSummary,
+    String? followUp,
+    String? nextVisitDate,
+  }) async {
     setLoading(true);
     try {
-      Response response =
+      Response response = await _apiClient.post(ApiUrls.visitRdPd, data: {
-          await _apiClient.put(ApiUrls.updateTaskInventoryUrl + id);
+        "addedFor": distributorType,
-      debugPrint('Response: $response');
+        "addedForId": pdRdId,
+        "tradename": tradeName,
+        "visitDate": visitDate,
+        "visitTime": visitTime,
+        "visitpurpose": visitPurpose,
+        "meetingsummary": meetingSummary,
+        if (followUp != null) "followup": followUp,
+        if (nextVisitDate != null) "nextvisitdate": nextVisitDate
+      });
       setLoading(false);
-      if (response.statusCode == 200) {
+      if (response.statusCode == 201) {
         Navigator.push(
-            context,
+          navigatorKey.currentContext!,
-            MaterialPageRoute(
+          MaterialPageRoute(
-                builder: (context) => const DataSubmitSuccessfull()));
+            builder: (context) => const DataSubmitSuccessfull(),
+          ),
+        );
       }
     } catch (e) {
       setLoading(false);

lib/screens/Visit_Dealers_screen.dart

@@ -1,204 +0,0 @@
-import 'package:cheminova/provider/visit_pdrd_provider.dart';
-import 'package:cheminova/widgets/common_drawer.dart';
-import 'package:flutter/material.dart';
-import 'package:cheminova/widgets/common_background.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import '../widgets/common_app_bar.dart';
-import '../widgets/common_elevated_button.dart';
-import '../widgets/common_text_form_field.dart';
-import 'package:image_picker/image_picker.dart';
-
-class VisitDealersScreen extends StatefulWidget {
-  final String? tradeName;
-  final String? id;
-  const VisitDealersScreen({super.key, this.tradeName, this.id});
-
-  @override
-  State<VisitDealersScreen> createState() => VisitDealersScreenState();
-}
-
-class VisitDealersScreenState extends State<VisitDealersScreen> {
-  late VisitPdRdProvider _visitPdRdProvider;
-  final dateController = TextEditingController(
-      text: DateFormat('dd/MM/yyyy').format(DateTime.now()));
-
-  final timeController =
-      TextEditingController(text: DateFormat('hh:mm a').format(DateTime.now()));
-
-  final notesController = TextEditingController();
-  final dealerController = TextEditingController();
-  final meetingSummaryController = TextEditingController();
-  final followUpActionsController = TextEditingController();
-  final nextVisitDateController = TextEditingController();
-  late TextEditingController retailerController = TextEditingController();
-
-  String selectedPurpose = 'Sales';
-  List<String> purposeOptions = ['Sales', 'Dues collection', 'Others'];
-
-  Future<void> _pickImage() async {
-    final ImagePicker picker = ImagePicker();
-    await picker.pickImage(source: ImageSource.camera);
-    // Handle the picked image
-  }
-
-  @override
-  void initState() {
-    _visitPdRdProvider = VisitPdRdProvider();
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    retailerController = TextEditingController(text: widget.tradeName);
-
-    return ChangeNotifierProvider(
-      create: (context) => _visitPdRdProvider,
-      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: Column(
-              children: [
-                const Text('Visit Retailers',
-                    style: TextStyle(
-                        fontSize: 20,
-                        color: Colors.black,
-                        fontWeight: FontWeight.w400,
-                        fontFamily: 'Anek')),
-                Text(widget.tradeName ?? '',
-                    style: const TextStyle(
-                        fontSize: 20,
-                        color: Colors.black,
-                        fontWeight: FontWeight.w400,
-                        fontFamily: 'Anek')),
-              ],
-            ),
-            backgroundColor: Colors.transparent,
-            elevation: 0,
-          ),
-          drawer: const CommonDrawer(),
-          body: 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),
-                  margin: const EdgeInsets.symmetric(horizontal: 16.0),
-                  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>[
-                      CommonTextFormField(
-                          readOnly: true,
-                          title: 'Select Retailer',
-                          fillColor: Colors.white,
-                          controller: retailerController),
-                      const SizedBox(height: 15),
-                      CommonTextFormField(
-                          title: 'Visit date',
-                          readOnly: true,
-                          fillColor: Colors.white,
-                          controller: dateController),
-                      const SizedBox(height: 15),
-                      CommonTextFormField(
-                          title: 'Time',
-                          readOnly: true,
-                          fillColor: Colors.white,
-                          controller: timeController),
-                      const SizedBox(height: 15),
-                      DropdownButtonFormField<String>(
-                        decoration: const InputDecoration(
-                          labelText: 'Purpose of visit',
-                          fillColor: Colors.white,
-                          filled: true,
-                        ),
-                        value: selectedPurpose,
-                        items: purposeOptions.map((String value) {
-                          return DropdownMenuItem<String>(
-                            value: value,
-                            child: Text(value),
-                          );
-                        }).toList(),
-                        onChanged: (String? newValue) {
-                          setState(() {
-                            selectedPurpose = newValue!;
-                          });
-                        },
-                      ),
-                      const SizedBox(height: 15),
-                      CommonTextFormField(
-                          title: 'Meeting Summary:',
-                          fillColor: Colors.white,
-                          maxLines: 4,
-                          controller: meetingSummaryController),
-                      const SizedBox(height: 15),
-                      CommonTextFormField(
-                          title: 'Follow-up Actions:',
-                          fillColor: Colors.white,
-                          maxLines: 4,
-                          controller: followUpActionsController),
-                      const SizedBox(height: 15),
-                      CommonTextFormField(
-                          title: 'Next visit date:',
-                          readOnly: true,
-                          fillColor: Colors.white,
-                          controller: nextVisitDateController),
-                      const SizedBox(height: 15),
-                      Row(
-                        children: [
-                          Expanded(
-                            child: CommonTextFormField(
-                                title: 'Attach Documents/Photos',
-                                fillColor: Colors.white,
-                                controller: notesController),
-                          ),
-                          IconButton(
-                            icon: const Icon(Icons.camera_alt),
-                            onPressed: _pickImage,
-                          ),
-                        ],
-                      ),
-                      const SizedBox(height: 15),
-                      Consumer<VisitPdRdProvider>(
-                        builder: (context, value, child) => Align(
-                          alignment: Alignment.center,
-                          child: CommonElevatedButton(
-                            borderRadius: 30,
-                            width: double.infinity,
-                            height: kToolbarHeight - 10,
-                            text: 'SUBMIT',
-                            backgroundColor: const Color(0xff004791),
-                            onPressed: () {
-                              value.submitVisitPdRd(context, widget.id ?? '');
-                            },
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/screens/add_products_screen.dart

@@ -161,7 +161,8 @@ class _AddProductsScreenState extends State<AddProductsScreen> {
                                                   child: ListTile(
                                                     title: Text(
                                                       filteredProducts[index]
-                                                          .name.capitalize(),
+                                                          .name
+                                                          .capitalize(),
                                                       style: TextStyle(
                                                         color: isAlreadySelected
                                                             ? Colors.grey
@@ -222,7 +223,10 @@ class _AddProductsScreenState extends State<AddProductsScreen> {
                             onPressed: () {
                               provider
                                   .submitSelectedProducts(
-                                      "PrincipalDistributor",
+                                      (widget.distributorType ==
+                                              'Principal Distributor')
+                                          ? 'PrincipalDistributor'
+                                          : 'RetailDistributor',
                                       widget.distributor.id!)
                                   .then((value) {
                                 if (value) {
@@ -233,6 +237,12 @@ class _AddProductsScreenState extends State<AddProductsScreen> {
                                           const DataSubmitSuccessfull(),
                                     ),
                                   );
+                                } else {
+                                  ScaffoldMessenger.of(context).showSnackBar(
+                                    const SnackBar(
+                                      content: Text("Insufficient stock"),
+                                    ),
+                                  );
                                 }
                               });
                             },
@@ -278,15 +288,8 @@ class _ProductBlockState extends State<ProductBlock> {
           inventoryController.text.isNotEmpty) {
         // Check if both inputs are valid integers
         try {
-          int sale = int.parse(saleController.text);
+          int.parse(saleController.text);
-          int inventory = int.parse(inventoryController.text);
+          int.parse(inventoryController.text);
-
-          // Validation: inventory should be less than or equal to sales
-          if (inventory > sale) {
-            errorMessage = 'Inventory should be less than or equal to sales';
-          } else {
-            errorMessage = null;
-          }
         } catch (e) {
           // Handle the case where input is not a valid integer
           errorMessage = 'Please enter valid integer values for both fields';
@@ -309,7 +312,8 @@ class _ProductBlockState extends State<ProductBlock> {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text('Product: ${provider.selectedProducts[widget.index].name.capitalize()}',
+            Text(
+                'Product: ${provider.selectedProducts[widget.index].name.capitalize()}',
                 style: const TextStyle(fontSize: 16)),
             Text('SKU: ${provider.selectedProducts[widget.index].SKU}',
                 style: const TextStyle(fontSize: 15)),

lib/screens/assign_tasks_screen.dart

@@ -394,7 +394,15 @@ class _AssignTasksScreenState extends State<AssignTasksScreen> {
                                     .map((PdRdResponseModel distributor) {
                                   return DropdownMenuItem<PdRdResponseModel>(
                                     value: distributor,
-                                    child: Text(distributor.name!.capitalize()),
+                                    child: Text(
+                                      (selectedDistributorType ==
+                                              'PrincipalDistributor'
+                                          ? distributor
+                                              .shippingAddress!.tradeName
+                                              .capitalize()
+                                          : distributor.kyc!.tradeName
+                                              .capitalize()),
+                                    ),
                                   );
                                 }).toList(),
                                 onChanged: (value) {

lib/screens/calendar_screen.dart

@@ -1,44 +1,61 @@
+import 'package:cheminova/models/task_model.dart';
+import 'package:cheminova/provider/task_provider.dart';
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
 import 'package:table_calendar/table_calendar.dart';
 import '../widgets/common_app_bar.dart';
 import '../widgets/common_background.dart';
 import '../widgets/common_drawer.dart';
 
-
+DateTime _focusedDay = DateTime.now();
-DateTime _focusedDay=DateTime.now();
+DateTime _selectedDay = DateTime.now();
-DateTime? _selectedDay=DateTime.now();
 
 class CalendarScreen extends StatelessWidget {
   const CalendarScreen({super.key});
 
-
   @override
   Widget build(BuildContext context) {
-    return  CommonBackground(
+    final taskProvider = context.watch<TaskProvider>();
+
+    return CommonBackground(
       child: Scaffold(
         appBar: CommonAppBar(
           actions: [
-          IconButton(
+            IconButton(
-            onPressed: () {
+              onPressed: () {
-              Navigator.pop(context);
+                Navigator.pop(context);
-            },
+              },
-            icon: Image.asset('assets/Back_attendance.png'),
+              icon: Image.asset('assets/Back_attendance.png'),
-            padding: const EdgeInsets.only(right: 20),
+              padding: const EdgeInsets.only(right: 20),
-          ),
+            ),
-        ],
+          ],
           title: const Text('Calendar'),
           backgroundColor: Colors.transparent,
           elevation: 0,
         ),
         backgroundColor: Colors.transparent,
         drawer: const CommonDrawer(),
-        body: const SingleChildScrollView(
+        body: Stack(
-          child: Column(
+          children: [
-            children: [
+            const Column(
-              CalendarWidget(),
+              children: [
-              EventsList(),
+                CalendarWidget(),
-            ],
+                TaskList(),
-          ),
+              ],
+            ),
+            if (taskProvider.isLoading)
+              Container(
+                height: MediaQuery.of(context).size.height,
+                width: MediaQuery.of(context).size.width,
+                decoration: BoxDecoration(
+                  color: Colors.black.withOpacity(0.2),
+                ),
+                child: const Center(
+                  child: CircularProgressIndicator(),
+                ),
+              ),
+          ],
         ),
       ),
     );
@@ -59,110 +76,137 @@ class _CalendarWidgetState extends State<CalendarWidget> {
       margin: const EdgeInsets.all(16),
       child: Padding(
         padding: const EdgeInsets.all(16),
-        child: Column(
+        child: TableCalendar(
-          crossAxisAlignment: CrossAxisAlignment.start,
+          firstDay: DateTime.utc(1900, 5, 1),
-          children: [
+          lastDay: DateTime.utc(2900, 5, 1),
-            const Text(
+          focusedDay: _focusedDay,
-              'Calendar',
+          selectedDayPredicate: (day) {
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+            return isSameDay(_selectedDay, day);
-            ),
+          },
-            const Text(
+          onDaySelected: (selectedDay, focusedDay) {
-              'Month/Year',
+            setState(() {
-              style: TextStyle(fontSize: 14, color: Colors.grey),
+              _selectedDay = selectedDay;
-            ),
+              _focusedDay = focusedDay;
-            const SizedBox(height: 10),
+              context.read<TaskProvider>().getAllTaskByDate(_selectedDay);
-            TableCalendar(
+            });
-              firstDay: DateTime.utc(1900, 5, 1),
+          },
-              lastDay: DateTime.utc(2900, 5, 1),
+          onPageChanged: (focusedDay) {
-              focusedDay: _focusedDay,
+            _focusedDay = focusedDay;
-              selectedDayPredicate: (day) {
+          },
-                return isSameDay(_selectedDay, day);
-              },
-              onDaySelected: (selectedDay, focusedDay) {
-                setState(() {
-                  _selectedDay = selectedDay;
-                  _focusedDay = focusedDay;
-                });
-              },
-              onPageChanged: (focusedDay) {
-                _focusedDay = focusedDay;
-              },
-            ),
-          ],
         ),
       ),
     );
   }
 }
 
-class EventsList extends StatelessWidget {
+class TaskList extends StatefulWidget {
-  const EventsList({super.key});
+  const TaskList({super.key});
+
+  @override
+  State<TaskList> createState() => _TaskListState();
+}
+
+class _TaskListState extends State<TaskList> {
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      context.read<TaskProvider>().getAllTaskByDate(_selectedDay);
+    });
+  }
 
   @override
   Widget build(BuildContext context) {
-    return const Card(
+    final taskProvider = context.watch<TaskProvider>();
-      margin: EdgeInsets.all(16),
+
-      child: Padding(
+    return (taskProvider.taskModelList.isEmpty)
-        padding: EdgeInsets.all(16),
+        ? Container(
-        child: Column(
+            alignment: Alignment.center,
-          crossAxisAlignment: CrossAxisAlignment.start,
+            child: const Text('No task found',
-          children: [
+                style: TextStyle(fontSize: 20, color: Colors.white)),
-            Text(
+          )
-              'Events List',
+        : Expanded(
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+            child: ListView.builder(
+              itemCount: taskProvider.taskModelList.length,
+              itemBuilder: (context, index) {
+                return _taskView(task: taskProvider.taskModelList[index]);
+              },
             ),
-            SizedBox(height: 10),
+          );
-            EventItem(
+  }
-              date: '10-06-2024',
+
-              event: 'Meeting with Territory Manager',
+  Widget _customContainer({required Widget child}) {
-            ),
+    return Padding(
-            SizedBox(height: 10),
+      padding: const EdgeInsets.symmetric(horizontal: 16),
-            EventItem(
+      child: Container(
-              date: '10-06-2024',
+        width: double.infinity,
-              event: 'Sales Data Review',
+        padding: const EdgeInsets.all(12.0),
-            ),
+        decoration: BoxDecoration(
-          ],
+          border: Border.all(color: Colors.white),
+          color: const Color(0xffB4D1E5).withOpacity(0.8),
+          borderRadius: BorderRadius.circular(16.0),
         ),
+        child: child,
       ),
     );
   }
-}
 
-class EventItem extends StatelessWidget {
+  Widget _taskView({required TaskModel task}) {
-  final String date;
+    final formattedDate = DateFormat('dd/MM/yyyy').format(task.taskDueDate);
-  final String event;
+    return Column(
-
+      children: [
-  const EventItem({super.key, required this.date, required this.event});
+        _customContainer(
-
+          child: Column(
-  @override
+            crossAxisAlignment: CrossAxisAlignment.start,
-  Widget build(BuildContext context) {
+            children: [
-    return Container(
+              Text(
-      padding: const EdgeInsets.all(12),
+                "Assigned to: ${task.taskAssignedTo.name}",
-      decoration: BoxDecoration(
+                style: const TextStyle(
-        color: Colors.blue[50],
+                  fontFamily: 'Anek',
-        borderRadius: BorderRadius.circular(8),
+                  fontWeight: FontWeight.bold,
-      ),
+                ),
-      child: Column(
+              ),
-        crossAxisAlignment: CrossAxisAlignment.start,
+              const SizedBox(height: 5),
-        children: [
+              Text(
-          Text('Date: $date'),
+                "Task: ${task.task}",
-          Text(
+                style: const TextStyle(
-            'Event: $event',
+                  fontFamily: 'Anek',
-            style: const TextStyle(fontWeight: FontWeight.bold),
+                ),
+              ),
+              const SizedBox(height: 5),
+              if (task.addedFor != null) ...{
+                task.addedFor == 'PrincipalDistributor'
+                    ? Text("PD: ${task.tradename}")
+                    : Text("RD: ${task.tradename}"),
+                const SizedBox(height: 5),
+              },
+              Text(
+                'Status: ${task.taskStatus}',
+                style: const TextStyle(
+                  fontFamily: 'Anek',
+                ),
+              ),
+              const SizedBox(height: 5),
+              if (task.note != null) ...{
+                Text(
+                  'Note: ${task.note}',
+                  style: const TextStyle(
+                    fontFamily: 'Anek',
+                  ),
+                ),
+                const SizedBox(height: 5),
+              },
+              Text(
+                'Deadline: $formattedDate',
+                style: const TextStyle(
+                  fontFamily: 'Anek',
+                ),
+              ),
+            ],
           ),
-          const SizedBox(height: 8),
+        ),
-          ElevatedButton(
+        const SizedBox(height: 10),
-            onPressed: () {
+      ],
-              // Add view details functionality here
-            },
-            style: ElevatedButton.styleFrom(
-              foregroundColor: Colors.white,
-              backgroundColor: Colors.blue[800],
-            ),
-            child: const Text('VIEW DETAILS'),
-          ),
-        ],
-      ),
     );
   }
 }

lib/screens/daily_tasks_screen.dart

@@ -1,8 +1,8 @@
 import 'package:cheminova/screens/collect_kyc_screen.dart';
 import 'package:cheminova/screens/select_distributer_screen.dart';
 import 'package:cheminova/screens/display_sales_screen.dart';
+import 'package:cheminova/screens/visit_rd_pd_screen.dart';
 import 'package:flutter/material.dart';
-import 'package:cheminova/screens/visit_Dealers_screen.dart';
 import 'package:cheminova/widgets/common_app_bar.dart';
 import 'package:cheminova/widgets/common_drawer.dart';
 import 'package:cheminova/widgets/common_background.dart';
@@ -48,12 +48,14 @@ class DailyTasksScreen extends StatelessWidget {
                         'Visit Dealers/Retailers',
                         '',
                         onTap: () {
-                          Navigator.push(
+                          // Navigator.push(
-                            context,
+                          //   context,
-                            MaterialPageRoute(
+                          //   MaterialPageRoute(
-                              builder: (context) => const VisitDealersScreen(),
+                          //     builder: (context) => const VisitRdPdScreen(
-                            ),
+                          //       tradeName: 't',
-                          );
+                          //     ),
+                          //   ),
+                          // );
                         },
                       ),
                       const SizedBox(height: 5),

lib/screens/home_screen.dart

@@ -1,6 +1,6 @@
 import 'package:cheminova/notification_service.dart';
 import 'package:cheminova/provider/user_provider.dart';
-import 'package:cheminova/screens/Visit_Dealers_screen.dart';
+import 'package:cheminova/screens/visit_rd_pd_screen.dart';
 import 'package:cheminova/screens/assign_task_dash_board_screen.dart';
 import 'package:cheminova/screens/calendar_screen.dart';
 import 'package:cheminova/screens/collect_kyc_screen.dart';
@@ -160,7 +160,9 @@ class _HomePageState extends State<HomePage> {
                                   context,
                                   MaterialPageRoute(
                                     builder: (context) =>
-                                        const VisitDealersScreen(),
+                                        const SelectDistributerScreen(
+                                      task: "Visit RD/PD",
+                                    ),
                                   ),
                                 );
                               },

lib/screens/retailer_details_screen.dart

@@ -1,11 +1,12 @@
 import 'package:cheminova/models/get_pd_response.dart';
 import 'package:cheminova/provider/collect_kyc_provider.dart';
+import 'package:cheminova/utils/no_space_formatter.dart';
 import 'package:csc_picker/csc_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
-import '../constants/only_uppercase.dart';
+import '../utils/only_uppercase.dart';
 import '../widgets/common_elevated_button.dart';
 import '../widgets/common_text_form_field.dart';
 
@@ -68,10 +69,12 @@ class RetailerDetailsScreenState extends State<RetailerDetailsScreen> {
                                 controller: value.nameController),
                             const SizedBox(height: 15),
                             CommonTextFormField(
+                                // maxLength: 20,
                                 title: 'Email',
-                                textCapitalization: TextCapitalization.none,
-                                keyboardType: TextInputType.emailAddress,
                                 fillColor: Colors.white,
+                                inputFormatters: [
+                                  NoSpaceFormatter(),
+                                ],
                                 validator: (String? value) {
                                   if (value!.isEmpty) {
                                     return 'Email cannot be empty';

lib/screens/select_distributer_screen.dart

@@ -2,6 +2,7 @@ import 'package:cheminova/models/pd_rd_response_model.dart';
 import 'package:cheminova/provider/pd_rd_provider.dart';
 import 'package:cheminova/screens/add_products_screen.dart';
 import 'package:cheminova/screens/add_sales_products_screen.dart';
+import 'package:cheminova/screens/visit_rd_pd_screen.dart';
 import 'package:cheminova/utils/string_extension.dart';
 import 'package:cheminova/widgets/common_background.dart';
 import 'package:cheminova/widgets/common_app_bar.dart';
@@ -98,6 +99,18 @@ class _SelectDistributerScreenState extends State<SelectDistributerScreen> {
                             : selectedDistributor!.kyc!.tradeName,
                         pdRdId: selectedDistributor!.id!,
                       );
+                    } else if (widget.task == 'Visit RD/PD') {
+                      return VisitRdPdScreen(
+                        distributorType:
+                            selectedDistributorType == 'Principal Distributor'
+                                ? 'PrincipalDistributor'
+                                : 'RetailDistributor',
+                        tradeName: selectedDistributorType ==
+                                'Principal Distributor'
+                            ? selectedDistributor!.shippingAddress!.tradeName
+                            : selectedDistributor!.kyc!.tradeName,
+                        pdRdId: selectedDistributor!.id!,
+                      );
                     } else {
                       return Container();
                     }
@@ -164,7 +177,13 @@ class _SelectDistributerScreenState extends State<SelectDistributerScreen> {
                               .map((PdRdResponseModel distributor) {
                             return DropdownMenuItem<PdRdResponseModel>(
                               value: distributor,
-                              child: Text(distributor.name!.capitalize()),
+                              child: Text(
+                                selectedDistributorType ==
+                                        'PrincipalDistributor'
+                                    ? distributor.shippingAddress!.tradeName
+                                        .capitalize()
+                                    : distributor.kyc!.tradeName.capitalize(),
+                              ),
                             );
                           }).toList(),
                           onChanged: (value) {

lib/screens/visit_rd_pd_screen.dart

@@ -0,0 +1,294 @@
+import 'package:cheminova/provider/visit_pdrd_provider.dart';
+import 'package:cheminova/widgets/common_drawer.dart';
+import 'package:flutter/material.dart';
+import 'package:cheminova/widgets/common_background.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+import '../widgets/common_app_bar.dart';
+import '../widgets/common_elevated_button.dart';
+import '../widgets/common_text_form_field.dart';
+import 'package:image_picker/image_picker.dart';
+
+class VisitRdPdScreen extends StatefulWidget {
+  final String? tradeName;
+  final String? pdRdId;
+  final String? distributorType;
+  const VisitRdPdScreen({
+    super.key,
+    required this.tradeName,
+    required this.pdRdId,
+    required this.distributorType,
+  });
+
+  @override
+  State<VisitRdPdScreen> createState() => VisitRdPdScreenState();
+}
+
+class VisitRdPdScreenState extends State<VisitRdPdScreen> {
+  late VisitPdRdProvider _visitPdRdProvider;
+  final dateController = TextEditingController(
+      text: DateFormat('dd/MM/yyyy').format(DateTime.now()));
+
+  final timeController =
+      TextEditingController(text: DateFormat('hh:mm a').format(DateTime.now()));
+
+  final notesController = TextEditingController();
+  final dealerController = TextEditingController();
+  final meetingSummaryController = TextEditingController();
+  final followUpActionsController = TextEditingController();
+  final nextVisitDateController = TextEditingController();
+  late TextEditingController retailerController = TextEditingController();
+
+  String selectedPurpose = 'Sales';
+  List<String> purposeOptions = ['Sales', 'Dues collection', 'Others'];
+
+  Future<void> _pickImage(ImageSource source) async {
+    final ImagePicker picker = ImagePicker();
+    final XFile? image = await picker.pickImage(source: source);
+    if (image != null) {
+      // Handle the picked image
+      // For example, you could update a state variable or send it to your provider
+      print('Image picked: ${image.path}');
+      // You might want to update your UI to show the selected image
+      setState(() {
+        notesController.text = image.path; // Just for demonstration
+      });
+    }
+  }
+
+  void _showImageSourceActionSheet() {
+    showModalBottomSheet(
+      context: context,
+      builder: (BuildContext context) {
+        return SafeArea(
+          child: Wrap(
+            children: <Widget>[
+              ListTile(
+                leading: const Icon(Icons.camera_alt),
+                title: const Text('Take a photo'),
+                onTap: () {
+                  Navigator.pop(context);
+                  _pickImage(ImageSource.camera);
+                },
+              ),
+              ListTile(
+                leading: const Icon(Icons.photo_library),
+                title: const Text('Choose from gallery'),
+                onTap: () {
+                  Navigator.pop(context);
+                  _pickImage(ImageSource.gallery);
+                },
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  Future<void> _selectNextVisitDate() async {
+    final DateTime? picked = await showDatePicker(
+      context: context,
+      initialDate: DateTime.now(),
+      firstDate: DateTime.now(),
+      lastDate: DateTime.now().add(const Duration(days: 365)),
+    );
+    if (picked != null) {
+      setState(() {
+        nextVisitDateController.text = DateFormat('dd/MM/yyyy').format(picked);
+      });
+    }
+  }
+
+  @override
+  void initState() {
+    _visitPdRdProvider = VisitPdRdProvider();
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    retailerController = TextEditingController(text: widget.tradeName);
+
+    return ChangeNotifierProvider(
+      create: (context) => _visitPdRdProvider,
+      child: CommonBackground(
+        child: Stack(
+          children: [
+            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: Column(
+                  children: [
+                    const Text('Visit Retailers',
+                        style: TextStyle(
+                            fontSize: 20,
+                            color: Colors.black,
+                            fontWeight: FontWeight.w400,
+                            fontFamily: 'Anek')),
+                    Text(widget.tradeName ?? '',
+                        style: const TextStyle(
+                            fontSize: 20,
+                            color: Colors.black,
+                            fontWeight: FontWeight.w400,
+                            fontFamily: 'Anek')),
+                  ],
+                ),
+                backgroundColor: Colors.transparent,
+                elevation: 0,
+              ),
+              drawer: const CommonDrawer(),
+              body: 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),
+                      margin: const EdgeInsets.symmetric(horizontal: 16.0),
+                      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>[
+                          CommonTextFormField(
+                              readOnly: true,
+                              title: 'Select Retailer',
+                              fillColor: Colors.grey[300],
+                              controller: retailerController),
+                          const SizedBox(height: 15),
+                          CommonTextFormField(
+                              title: 'Visit date',
+                              readOnly: true,
+                              fillColor: Colors.grey[300],
+                              controller: dateController),
+                          const SizedBox(height: 15),
+                          CommonTextFormField(
+                              title: 'Time',
+                              readOnly: true,
+                              fillColor: Colors.grey[300],
+                              controller: timeController),
+                          const SizedBox(height: 15),
+                          DropdownButtonFormField<String>(
+                            decoration: const InputDecoration(
+                              labelText: 'Purpose of visit',
+                              fillColor: Colors.white,
+                              filled: true,
+                            ),
+                            value: selectedPurpose,
+                            items: purposeOptions.map((String value) {
+                              return DropdownMenuItem<String>(
+                                value: value,
+                                child: Text(value),
+                              );
+                            }).toList(),
+                            onChanged: (String? newValue) {
+                              setState(() {
+                                selectedPurpose = newValue!;
+                              });
+                            },
+                          ),
+                          const SizedBox(height: 15),
+                          CommonTextFormField(
+                              title: 'Meeting summary:',
+                              fillColor: Colors.white,
+                              maxLines: 3,
+                              controller: meetingSummaryController),
+                          const SizedBox(height: 15),
+                          CommonTextFormField(
+                              title: 'Follow-up Actions:',
+                              fillColor: Colors.white,
+                              maxLines: 3,
+                              controller: followUpActionsController),
+                          const SizedBox(height: 15),
+                          GestureDetector(
+                            onTap: _selectNextVisitDate,
+                            child: AbsorbPointer(
+                              child: CommonTextFormField(
+                                title: 'Next visit date:',
+                                readOnly: true,
+                                fillColor: Colors.white,
+                                controller: nextVisitDateController,
+                              ),
+                            ),
+                          ),
+                          const SizedBox(height: 15),
+                          Row(
+                            children: [
+                              Expanded(
+                                child: CommonTextFormField(
+                                    title: 'Attach Documents/Photos',
+                                    fillColor: Colors.white,
+                                    controller: notesController),
+                              ),
+                              IconButton(
+                                icon: const Icon(Icons.add_a_photo),
+                                onPressed: _showImageSourceActionSheet,
+                              ),
+                            ],
+                          ),
+                          const SizedBox(height: 15),
+                          Consumer<VisitPdRdProvider>(
+                            builder: (context, value, child) => Align(
+                              alignment: Alignment.center,
+                              child: CommonElevatedButton(
+                                borderRadius: 30,
+                                width: double.infinity,
+                                height: kToolbarHeight - 10,
+                                text: 'SUBMIT',
+                                backgroundColor: const Color(0xff004791),
+                                onPressed: () {
+                                  value.submitVisitPdRd(
+                                    pdRdId: widget.pdRdId!,
+                                    distributorType: widget.distributorType!,
+                                    tradeName: widget.tradeName!,
+                                    visitDate: dateController.text,
+                                    visitTime: timeController.text,
+                                    meetingSummary:
+                                        meetingSummaryController.text,
+                                    visitPurpose: selectedPurpose,
+                                    followUp: followUpActionsController.text,
+                                    nextVisitDate: nextVisitDateController.text,
+                                  );
+                                },
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+            Consumer<VisitPdRdProvider>(builder: (context, value, child) {
+              if (value.isLoading) {
+                return Container(
+                  color: Colors.black.withOpacity(0.5),
+                  child: const Center(
+                    child: CircularProgressIndicator(),
+                  ),
+                );
+              }
+              return const SizedBox.shrink();
+            }),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/services/api_urls.dart

@@ -15,12 +15,13 @@ class ApiUrls {
   static const String getProducts = '${baseUrl}product/getAll/user/';
   static const String getRd = 'inventory/distributors-TM/RetailDistributor';
   static const String getPd = 'inventory/distributors-TM/PrincipalDistributor';
-  static const String submitProducts = 'inventory/add-TM';
+  static const String submitProducts = 'inventory/add';
   static const String getSalesCoordinators = 'salescoordinator/getAll-TM';
   static const String assignTask = 'task/assign-task';
   static const String getProductsManual = 'productmanual/getall';
   static const String getAllTasks = 'task/alltasks/';
   static const String salesTaskUrl = '${baseUrl}product/getAll/user/';
   static const String postSalesTaskUrl = '${baseUrl}sales/add-TM';
-  static const String updateTaskInventoryUrl = '';
+  static const String visitRdPd = '$baseUrl/visit';
+  static const String allTaskByDate = '${baseUrl}task/alltask';
 }

lib/utils/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,
+    );
+  }
+}