updated the code

assets/images/watertanker.svg

@@ -1,4 +1,4 @@
-<svg width="108" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="100" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M98.827 74.2947H93.7364C94.4231 67.1966 88.8379 61.0536 81.7252 61.0536C74.6125 61.0536 69.0267 67.1978 69.714 74.2947H63.8904C63.2435 74.2947 62.7185 73.7691 62.7185 73.1228V29.8494C62.7185 29.2025 63.2441 28.6775 63.8904 28.6775H91.9241C96.1634 28.6775 96.5952 34.2205 97.1987 37.6535L78.7141 37.6541C78.0373 37.6541 77.4971 38.233 77.5445 38.908L78.1815 47.884C78.2254 48.5157 81.0338 52.4625 81.5699 53.2747C81.7867 53.6034 82.1547 53.8002 82.5467 53.8002H99.9995L99.9983 73.1222C99.9989 73.7697 99.4745 74.2952 98.827 74.2952V74.2947ZM97.61 39.9973L99.6245 51.4571H83.176L80.4971 47.4123L79.9715 39.9967H97.6106L97.61 39.9973Z" fill="#0D4E84"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M4.98754 74.2947C3.74417 74.2947 1.95823 74.6005 1.95354 73.1263C1.94885 71.7306 1.9342 62.6339 1.9342 58.578C1.9342 57.9311 2.45921 57.4061 3.10608 57.4061H63.8897C65.3962 57.4061 65.4307 59.6409 63.9952 59.7458V71.9556C65.4307 72.0605 65.3962 74.2953 63.8897 74.2953H53.6053C54.292 67.1978 48.7068 61.0542 41.5947 61.0542C34.482 61.0542 28.8974 67.1989 29.5841 74.2953H29.0093C29.696 67.1989 24.1126 61.0542 16.9987 61.0542C9.88599 61.0542 4.30023 67.1978 4.98754 74.2953V74.2947Z" fill="#0D4E84"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M81.7252 83.2373C76.147 83.2373 71.6095 78.6998 71.6095 73.1216C71.6095 67.5441 76.147 63.006 81.7252 63.006C87.3027 63.006 91.8408 67.5435 91.8408 73.1216C91.8408 78.6998 87.3033 83.2373 81.7252 83.2373ZM81.7252 78.8521C78.5658 78.8521 75.9953 76.2816 75.9953 73.1222C75.9953 69.9623 78.5658 67.3917 81.7252 67.3917C84.8851 67.3917 87.4557 69.9623 87.4557 73.1222C87.4557 76.281 84.8851 78.8521 81.7252 78.8521ZM81.7252 69.7361C77.2691 69.7361 77.2691 76.5078 81.7252 76.5078C86.1818 76.5078 86.1824 69.7361 81.7252 69.7361Z" fill="#0D4E84"/>

lib/adddeliveryboy.dart

@@ -40,6 +40,8 @@ class _deliverboyState extends State<Deliverboy> {
   String state = '';
   String zip = '';
   String status = '';
+  double lat=0;
+  double lng=0;
 
   PickResult? selectedPlace;
 
@@ -222,6 +224,8 @@ class _deliverboyState extends State<Deliverboy> {
                                     onPlacePicked: (PickResult result) {
                                       setState(() {
                                         selectedPlace = result;
+                                        lat=selectedPlace!.geometry!.location.lat;
+                                        lng=selectedPlace!.geometry!.location.lng;
                                         if(selectedPlace!.types!.length==1){
                                           deliveryAddressCapturingController.text =
                                           selectedPlace!.formattedAddress!;
@@ -306,7 +310,7 @@ class _deliverboyState extends State<Deliverboy> {
                         enabledBorder: OutlineInputBorder(
                           borderSide: BorderSide(color: greyColor),
                         ),
-                        labelText: 'Pic Your office Address',
+                        labelText: 'select address from MAP',
                         labelStyle: TextStyle(
                           color: greyColor, //<-- SEE HERE
                         ),
@@ -348,8 +352,9 @@ class _deliverboyState extends State<Deliverboy> {
                           payload["city"] = city;
                           payload["state"] = state;
                           payload["zip"] = zip;
+                          payload["latitude"] = lat;
+                          payload["longitude"] = lng;
                           payload["status"] = status;
-
                           bool deliveryboyStatus = await AppSettings.addDeliverboy(payload);
 
                               try {

lib/booking_requests.dart

@@ -2,7 +2,8 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:watermanagement/settings.dart';
-
+import 'package:intl/intl.dart';
+import 'package:flutter_cupertino_datetime_picker/flutter_cupertino_datetime_picker.dart';
 import 'models/booking_requests_model.dart';
 import 'models/getdeliveryboy_model.dart';
 
@@ -19,7 +20,8 @@ class _BookingRequetsState extends State<BookingRequets> {
   bool isSereverIssuePending = false;
   bool isDataLoading = false;
   var dropdownAllDeliveryBoys;
-
+  var selIOS;
+  TextEditingController dateController = TextEditingController();
   Future<void> getBookingRequestsData() async {
     isDataLoading = true;
 
@@ -137,6 +139,9 @@ class _BookingRequetsState extends State<BookingRequets> {
                                       crossAxisAlignment:
                                           CrossAxisAlignment.start,
                                       children: [
+                                        SizedBox(
+                                          height: 12,
+                                        ),
                                         Text(
                                             BookingRequestsList[index]
                                                 .tanker_name
@@ -295,6 +300,42 @@ class _BookingRequetsState extends State<BookingRequets> {
                                                         },
                                                       ),
                                                     ),
+
+                                                    SizedBox(
+                                                      height: 05,
+                                                    ),
+                                                    Container(
+                                                      padding: const EdgeInsets.all(10),
+                                                      child: TextFormField(
+                                                        cursorColor: greyColor,
+                                                        enabled: false,
+                                                        controller: dateController,
+                                                        textCapitalization: TextCapitalization.characters,
+                                                        decoration: const InputDecoration(
+                                                          prefixIcon: Icon(
+                                                            Icons.date_range,
+                                                            color: greyColor,
+                                                          ),
+                                                          border: OutlineInputBorder(
+                                                              borderSide: BorderSide(color: greyColor)),
+                                                          focusedBorder: OutlineInputBorder(
+                                                            borderSide: BorderSide(color: greyColor),
+                                                          ),
+                                                          enabledBorder: OutlineInputBorder(
+                                                            borderSide: BorderSide(color: greyColor),
+                                                          ),
+                                                          labelText: 'Select date & time',
+                                                          labelStyle: TextStyle(
+                                                            color: greyColor, //<-- SEE HERE
+                                                          ),
+                                                        ),
+                                                      ),
+                                                    ),
+
+                                                    SizedBox(
+                                                      height: 05,
+                                                    ),
+
                                                   ],
                                                 ),
                                               ),
@@ -322,6 +363,7 @@ class _BookingRequetsState extends State<BookingRequets> {
                                                             .customer_address;
                                                     payload["dateOfOrder"] =
                                                         BookingRequestsList[index].date_of_order;
+                                                    payload["expectedDateOfDelivery"] =dateController.text.toString();
                                                     payload["action"] = "accept";
                                                     payload["price"] =
                                                         BookingRequestsList[index].price;
@@ -346,6 +388,50 @@ class _BookingRequetsState extends State<BookingRequets> {
                                                     } else {}
                                                   },
                                                 ),
+
+
+                                                IconButton(
+                                                    onPressed: () async {
+                                                        DatePicker.showDatePicker(
+                                                          context,
+                                                          dateFormat: 'dd MMMM yyyy HH:mm',
+                                                          initialDateTime: DateTime.now(),
+                                                          minDateTime:DateTime.now(),
+                                                          maxDateTime: DateTime.now().add(Duration(days: 15)),
+                                                          onMonthChangeStartWithFirstDate: true,
+                                                          pickerMode: DateTimePickerMode.datetime,
+                                                          pickerTheme: DateTimePickerTheme(
+                                                            // backgroundColor: Colors.white,
+                                                            cancelTextStyle: labelTextStyle(),
+                                                            confirmTextStyle: labelTextStyle(),
+                                                            // showTitle: true,
+                                                            //title: Text('Pick date and time'),
+                                                            itemTextStyle: valuesTextStyle(),
+                                                          ),
+                                                          onConfirm: (dateTime, List<int> index)async {
+                                                            DateTime selectdate = dateTime;
+                                                            setState(() {
+                                                              selIOS = DateFormat('dd-MMM-yyyy - HH:mm').format(selectdate);
+                                                            });
+
+                                                            if(selIOS!=''){
+                                                              setState(() {
+                                                                dateController.text=selIOS.toString();
+                                                              });
+                                                            }
+                                                            else {
+                                                              AppSettings.longFailedToast('please select date');
+                                                            }
+                                                          },
+                                                        );
+                                                    },
+                                                    icon: Icon(
+                                                      Icons.calendar_month,
+                                                      color: primaryColor,
+                                                    ))
+
+
+
                                               ],
                                             );
                                           });

lib/login.dart

@@ -76,7 +76,7 @@ class _LoginState extends State<Login> {
             children: <Widget>[
             /*  Container(
                 decoration:  const BoxDecoration(
-                  image:  DecorationImage(image:  AssetImage("images/backgroundimage.png"), fit: BoxFit.cover,),
+                  image:  DecorationImage(image:AssetImage("images/backgroundimage.png"), fit: BoxFit.cover,),
                 ),
               ),*/
               GestureDetector(
@@ -95,7 +95,7 @@ class _LoginState extends State<Login> {
                               Container(
                                 //width: double.infinity,
                                   child: Image(
-                                    image: const AssetImage('images/loginpng.png'),
+                                    image: const AssetImage('images/logo.png'),
                                     height: MediaQuery.of(context).size.height * .18,
                                   )),
                               const SizedBox(

lib/models/booking_requests_model.dart

@@ -26,7 +26,7 @@ class BookingRequestsModel {
     rtvm.customer_address = json['address'] ?? '';
     rtvm.customer_id = json['customerId'] ?? '';
     rtvm.booking_id = json['bookingid'] ?? '';
-    rtvm.type_of_water = json['dateOfOrder'] ?? '';
+    rtvm.type_of_water = json['typeofwater'] ?? '';
     rtvm.capacity = json['capacity'] ?? '';
     rtvm.price = json['price'] ?? '';
     rtvm.payment_status = json['payment_status'] ?? '';

lib/signup.dart

@@ -90,12 +90,6 @@ class _SignInState extends State<SignIn> {
     super.initState();
   }
 
-
-
-
-
-
-
   Future<bool> onWillPop() async {
     final shouldPop = await showDialog<bool>(context: context, builder: (context) {
       return AlertDialog(
@@ -165,7 +159,7 @@ class _SignInState extends State<SignIn> {
                         Container(
                           //width: double.infinity,
                             child: Image(
-                              image: const AssetImage('images/loginpng.png'),
+                              image: const AssetImage('images/logo.png'),
                               height: MediaQuery.of(context).size.height * .18,
                             )),
 
@@ -262,36 +256,7 @@ class _SignInState extends State<SignIn> {
                         const SizedBox(
                           height: 5,
                         ),
-                        Container(
-                          padding: const EdgeInsets.all(10),
-                          child: TextFormField(
-                            cursorColor: greyColor,
-                            controller: userAddressDescriptionController,
-                            keyboardType: TextInputType.emailAddress,
-                            decoration: const InputDecoration(
-                              prefixIcon: Icon(
-                                Icons.plagiarism_outlined,
-                                color: greyColor,
-                              ),
-                              border: OutlineInputBorder(
-                                  borderSide: BorderSide(color: greyColor)),
-                              focusedBorder: OutlineInputBorder(
-                                borderSide: BorderSide(color: greyColor),
-                              ),
-                              enabledBorder: OutlineInputBorder(
-                                borderSide: BorderSide(color: greyColor),
-                              ),
-                              labelText: 'Address Description (Ex: Flat No)',
-                              labelStyle: TextStyle(
-                                color: greyColor, //<-- SEE HERE
-                              ),
-                            ),
-                          ),
-                        ),//address description
 
-                        const SizedBox(
-                          height: 5,
-                        ),
                         GestureDetector(
                           child:Container(
                             padding: const EdgeInsets.all(10),
@@ -300,7 +265,6 @@ class _SignInState extends State<SignIn> {
                               controller: userAddressCapturingController,
                               onTap:()
                               {
-
                     //=============================================================================================
                                 location.serviceEnabled().then((value) {
                                   if (value) {
@@ -392,16 +356,6 @@ class _SignInState extends State<SignIn> {
                                     );
                                   }
                                 });
-
-
-
-
-
-
-
-
-
-
                                 //=====================================================================================
 
                                // _getCurrentPosition();
@@ -421,7 +375,7 @@ class _SignInState extends State<SignIn> {
                                 enabledBorder: OutlineInputBorder(
                                   borderSide: BorderSide(color: greyColor),
                                 ),
-                                labelText: 'Pic Your office Address',
+                                labelText: 'select adress from MAP',
                                 labelStyle: TextStyle(
                                   color: greyColor, //<-- SEE HERE
                                 ),
@@ -437,7 +391,36 @@ class _SignInState extends State<SignIn> {
                         const SizedBox(
                           height: 5,
                         ),
+                        Container(
+                          padding: const EdgeInsets.all(10),
+                          child: TextFormField(
+                            cursorColor: greyColor,
+                            controller: userAddressDescriptionController,
+                            keyboardType: TextInputType.emailAddress,
+                            decoration: const InputDecoration(
+                              prefixIcon: Icon(
+                                Icons.plagiarism_outlined,
+                                color: greyColor,
+                              ),
+                              border: OutlineInputBorder(
+                                  borderSide: BorderSide(color: greyColor)),
+                              focusedBorder: OutlineInputBorder(
+                                borderSide: BorderSide(color: greyColor),
+                              ),
+                              enabledBorder: OutlineInputBorder(
+                                borderSide: BorderSide(color: greyColor),
+                              ),
+                              labelText: 'Address Description (Ex: Flat No)',
+                              labelStyle: TextStyle(
+                                color: greyColor, //<-- SEE HERE
+                              ),
+                            ),
+                          ),
+                        ),//address description
 
+                        const SizedBox(
+                          height: 5,
+                        ),
                         Container(
                           padding: const EdgeInsets.all(10),
                           child: TextFormField(

lib/updateprofile.dart

@@ -23,6 +23,8 @@ class _UpdateprofileState extends State<UpdateProfile> {
   TextEditingController nameController = TextEditingController();
   TextEditingController mobileNumberController = TextEditingController();
   TextEditingController emailController = TextEditingController();
+  TextEditingController descriptionController = TextEditingController();
+
 
 
 
@@ -33,6 +35,8 @@ class _UpdateprofileState extends State<UpdateProfile> {
     nameController.text=AppSettings.suppliername;
     mobileNumberController.text=AppSettings.phoneNumber;
     emailController.text=AppSettings.email;
+   // descriptionController.text=AppSettings.suppliername;
+
 
     super.initState();
 
@@ -245,7 +249,34 @@ class _UpdateprofileState extends State<UpdateProfile> {
                       SizedBox(
                         height: 10,
                       ),
-
+                      Container(
+                        padding: const EdgeInsets.all(10),
+                        child: TextFormField(
+                          cursorColor: greyColor,
+                          controller: descriptionController,
+                          keyboardType: TextInputType.multiline,
+                          maxLines: null,
+                          decoration: const InputDecoration(
+                            prefixIcon: Icon(
+                              Icons.description,
+                              color: greyColor,
+                            ),
+                            contentPadding: const EdgeInsets.symmetric(vertical: 60.0, horizontal: 30.0),
+                            border: OutlineInputBorder(
+                                borderSide: BorderSide(color: greyColor)),
+                            focusedBorder: OutlineInputBorder(
+                              borderSide: BorderSide(color: greyColor),
+                            ),
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(color: greyColor),
+                            ),
+                            labelText: 'Enter Description',
+                            labelStyle: TextStyle(
+                              color: greyColor, //<-- SEE HERE
+                            ),
+                          ),
+                        ),
+                      ),
                       SizedBox(
                         height: 10,
                       ),