Merge remote-tracking branch 'origin/master'

lib/common/dashboard.dart

@@ -726,7 +726,7 @@ class _DashboardState extends State<Dashboard> {
                 title: Row(
                   children: [
                     Image(
-                        image: const AssetImage('images/myconnections.png'),
+                        image: const AssetImage('images/reportmyself.png'),
                         height: 25,
                         width: 25,
                         fit: BoxFit.fill),

lib/common/settings.dart

@@ -35,7 +35,8 @@ TextStyle labelTextStyle() {
 }
 
 TextStyle haveMotorTextStyle() {
-  return TextStyle(color: Colors.red, fontSize: 12,fontWeight: FontWeight.bold);
+  return TextStyle(
+      color: Colors.red, fontSize: 12, fontWeight: FontWeight.bold);
 }
 
 TextStyle textButtonStyle() {
@@ -60,9 +61,11 @@ TextStyle startAndStopHeading() {
     color: primaryColor,
   );
 }
+
 Text capacitySuffixText() {
   return Text('in Ltrs.');
 }
+
 Text dimensionSuffixText() {
   return Text('in fts');
 }
@@ -86,39 +89,60 @@ TextStyle serverIssueTextStyle() {
 }
 
 TextStyle bottomSheetValuesTextStyle() {
-  return TextStyle(fontSize: 12,fontWeight: FontWeight.bold,overflow: TextOverflow.ellipsis,);
+  return TextStyle(
+    fontSize: 12,
+    fontWeight: FontWeight.bold,
+    overflow: TextOverflow.ellipsis,
+  );
 }
 
 TextStyle wrapTextStyle() {
-  return TextStyle(color:primaryColor,fontSize: 12,fontWeight: FontWeight.bold,overflow: TextOverflow.ellipsis,);
+  return TextStyle(
+    color: primaryColor,
+    fontSize: 12,
+    fontWeight: FontWeight.bold,
+    overflow: TextOverflow.ellipsis,
+  );
 }
 
 TextStyle wrapTextStyleBlack() {
-  return TextStyle(color:Colors.black,fontSize: 12,fontWeight: FontWeight.bold,overflow: TextOverflow.ellipsis,);
+  return TextStyle(
+    color: Colors.black,
+    fontSize: 12,
+    fontWeight: FontWeight.bold,
+    overflow: TextOverflow.ellipsis,
+  );
 }
 
 TextStyle withoutWrapTextStyle() {
-  return TextStyle(color:primaryColor,fontSize: 12,fontWeight: FontWeight.bold,);
+  return TextStyle(
+    color: primaryColor,
+    fontSize: 12,
+    fontWeight: FontWeight.bold,
+  );
 }
 
 TextStyle bmiTextStyle() {
-  return TextStyle(color:primaryColor,fontSize: 16,fontWeight: FontWeight.bold,);
+  return TextStyle(
+    color: primaryColor,
+    fontSize: 16,
+    fontWeight: FontWeight.bold,
+  );
 }
 
-TextStyle drawerListItemsTextStyle(){
+TextStyle drawerListItemsTextStyle() {
   return TextStyle(color: Colors.white);
 }
-TextStyle drawerHeaderTextStyle(){
+
+TextStyle drawerHeaderTextStyle() {
   return TextStyle(color: Colors.white, fontSize: 15);
 }
 
-TextStyle drawerHeaderTextStyleNew(){
+TextStyle drawerHeaderTextStyleNew() {
   return TextStyle(color: Colors.black, fontSize: 15);
 }
 
-
+InputDecoration textFormFieldDecoration(IconData icon, var text) {
-
-InputDecoration textFormFieldDecoration(IconData icon,var text){
   return InputDecoration(
     filled: true,
     fillColor: Colors.white,
@@ -134,8 +158,8 @@ InputDecoration textFormFieldDecoration(IconData icon,var text){
       borderSide: BorderSide(color: primaryColor),
     ),
     labelText: text,
-    labelStyle:
+    labelStyle: TextStyle(
-    TextStyle(color: Colors.black, //<-- SEE HERE
+      color: Colors.black, //<-- SEE HERE
     ),
   );
 }
@@ -172,9 +196,9 @@ class AppSettings {
   static late Position position;
   static String long = "", lat = "";
   late StreamSubscription<Position> positionStream;
-  static String fcmId='';
+  static String fcmId = '';
-  static String serverToken='AAAAA66BLaA:APA91bHcmbyiNN8hCL-t-M9oH-u7ZMOl74fcImMM2DQZLgdyY98Wu9XxME-CTPcjpjU6Yy48ouxISrOMb9lpa3PJofh8qciUKMNxV2al-bDvGvPP_VVaH0mrTHzR56hdkGy1Zl-0frDO';
+  static String serverToken =
-
+      'AAAAA66BLaA:APA91bHcmbyiNN8hCL-t-M9oH-u7ZMOl74fcImMM2DQZLgdyY98Wu9XxME-CTPcjpjU6Yy48ouxISrOMb9lpa3PJofh8qciUKMNxV2al-bDvGvPP_VVaH0mrTHzR56hdkGy1Zl-0frDO';
 
   //api urls
   static String host = 'http://35.200.129.165:4000/api/';
@@ -197,21 +221,12 @@ class AppSettings {
   static String getMedicineTimingsUrl = host + 'getmedicineztiming';
   static String prescriptionUploadPicUrl = host + 'uploads-precription';
   static String getAllpharmaciesDataUrl = host + 'getAllPharmacylist';
+  static String getAllQuotationRequestsUrl = host + 'userprecription';
   static String getQuotationUrl = host + 'submitPicture';
   static String addPrescriptionUrl = host + 'add-prescription-details';
   static String reportMySelfVideoUploadUrl = host + 'reportProblemVideo';
   static String getAllPrescriptionsDataUrl = host + 'usersinglerprecription';
 
-
-
-
-
-
-
-
-
-
-
   static File? updatedImage;
   static String image = '';
   static String profilePictureUrl = '';
@@ -234,8 +249,6 @@ class AppSettings {
     );
   }
 
-
-
   /* Preloader */
   static GlobalKey<State> preLoaderKey = new GlobalKey<State>();
   static Future<void> preLoaderDialog(BuildContext context) async {
@@ -260,7 +273,8 @@ class AppSettings {
     return _headers;
   }
 
-  static Future<Map<String, String>> buildPutRequestHeadersForResetToken() async {
+  static Future<Map<String, String>>
+      buildPutRequestHeadersForResetToken() async {
     Map<String, String> _headers = new Map<String, String>();
     return _headers;
   }
@@ -369,28 +383,30 @@ class AppSettings {
     }
   }
 
-  static Future<bool> sendSms(payload) async{
+  static Future<bool> sendSms(payload) async {
-    var response=await http.post(Uri.parse(sendSmsUrl),body: json.encode(payload), headers: {'Content-type': 'application/json'});
+    var response = await http.post(Uri.parse(sendSmsUrl),
-    if(response.statusCode==200){
+        body: json.encode(payload),
+        headers: {'Content-type': 'application/json'});
+    if (response.statusCode == 200) {
       return true;
-    }
+    } else {
-    else{
       return false;
     }
   }
 
-  static Future<bool> phoneVerification(payload) async{
+  static Future<bool> phoneVerification(payload) async {
-    var response=await http.post(Uri.parse(phoneVerificationUrl),body: json.encode(payload), headers: {'Content-type': 'application/json'});
+    var response = await http.post(Uri.parse(phoneVerificationUrl),
-    if(response.statusCode==200){
+        body: json.encode(payload),
+        headers: {'Content-type': 'application/json'});
+    if (response.statusCode == 200) {
       return true;
-    }
+    } else {
-    else{
       return false;
     }
   }
 
   static Future<String> calculateBmi(payload) async {
-    var uri = Uri.parse(bmiCaluculateUrl+ '/'+customerId);
+    var uri = Uri.parse(bmiCaluculateUrl + '/' + customerId);
 
     var response = await http.post(uri,
         body: json.encode(payload), headers: await buildRequestHeaders());
@@ -415,7 +431,7 @@ class AppSettings {
   }
 
   static Future<String> calculateBP(payload) async {
-    var uri = Uri.parse(bpCaluculateUrl+ '/'+customerId);
+    var uri = Uri.parse(bpCaluculateUrl + '/' + customerId);
 
     var response = await http.post(uri,
         body: json.encode(payload), headers: await buildRequestHeaders());
@@ -440,7 +456,7 @@ class AppSettings {
   }
 
   static Future<String> calculateSugar(payload) async {
-    var uri = Uri.parse(sugarCaluculateUrl+ '/'+customerId);
+    var uri = Uri.parse(sugarCaluculateUrl + '/' + customerId);
 
     var response = await http.post(uri,
         body: json.encode(payload), headers: await buildRequestHeaders());
@@ -524,9 +540,7 @@ class AppSettings {
         // display error toast
         return false;
       }
-    }
+    } else if (response.statusCode == 401) {
-
-    else if (response.statusCode == 401) {
       bool status = await AppSettings.resetToken();
       if (status) {
         response = await http.post(uri,
@@ -539,9 +553,7 @@ class AppSettings {
       } else {
         return false;
       }
-    }
+    } else {
-
-    else {
       return false;
     }
   }
@@ -549,10 +561,8 @@ class AppSettings {
   static Future<bool> updateProfile(payload) async {
     var uri = Uri.parse(updateProfileUrl + '/' + customerId);
     try {
-      var response = await http.put(
+      var response = await http.put(uri,
-          uri,
+          body: json.encode(payload), headers: await buildRequestHeaders());
-          body: json.encode(payload),
-          headers: await buildRequestHeaders());
 
       if (response.statusCode == 200) {
         var _response = json.decode(response.body);
@@ -577,7 +587,7 @@ class AppSettings {
   }
 
   static Future<String> getBmiHistory() async {
-    var uri = Uri.parse(getBmiHistoryUrl+'/'+customerId);
+    var uri = Uri.parse(getBmiHistoryUrl + '/' + customerId);
 
     var response = await http.get(uri, headers: await buildRequestHeaders());
     if (response.statusCode == 200) {
@@ -600,7 +610,7 @@ class AppSettings {
   }
 
   static Future<String> getBPHistory() async {
-    var uri = Uri.parse(getBpHistoryUrl+'/'+customerId);
+    var uri = Uri.parse(getBpHistoryUrl + '/' + customerId);
 
     var response = await http.get(uri, headers: await buildRequestHeaders());
     if (response.statusCode == 200) {
@@ -623,7 +633,7 @@ class AppSettings {
   }
 
   static Future<String> getSugarHistory() async {
-    var uri = Uri.parse(getSugarHistoryUrl+'/'+customerId);
+    var uri = Uri.parse(getSugarHistoryUrl + '/' + customerId);
 
     var response = await http.get(uri, headers: await buildRequestHeaders());
     if (response.statusCode == 200) {
@@ -655,41 +665,38 @@ class AppSettings {
   }*/
 
   static Future<http.StreamedResponse> uploadImageHTTP(file) async {
-
+    var request = http.MultipartRequest(
-    var request = http.MultipartRequest('POST', Uri.parse(uploadPicUrl + '/' + customerId));
+        'POST', Uri.parse(uploadPicUrl + '/' + customerId));
     request.files.add(await http.MultipartFile.fromPath('picture', file.path));
     var res = await request.send();
     return res;
-
   }
-  static Future<String> uploadImageHTTPNew(file) async {
 
-    var request = http.MultipartRequest('POST', Uri.parse(uploadPicUrl + '/' + customerId));
+  static Future<String> uploadImageHTTPNew(file) async {
+    var request = http.MultipartRequest(
+        'POST', Uri.parse(uploadPicUrl + '/' + customerId));
     request.files.add(await http.MultipartFile.fromPath('picture', file.path));
     var res = await request.send();
     var response = await http.Response.fromStream(res);
     return response.body;
-
   }
 
   static Future<String> uploadImageHTTPForPrescriptions(file) async {
-
+    var request = http.MultipartRequest(
-    var request = http.MultipartRequest('POST', Uri.parse(prescriptionUploadPicUrl + '/' + customerId));
+        'POST', Uri.parse(prescriptionUploadPicUrl + '/' + customerId));
     request.files.add(await http.MultipartFile.fromPath('picture', file.path));
     var res = await request.send();
     var response = await http.Response.fromStream(res);
     return response.body;
-
   }
 
   static Future<String> uploadVideoInReportMySelf(file) async {
-
+    var request = http.MultipartRequest(
-    var request = http.MultipartRequest('POST', Uri.parse(reportMySelfVideoUploadUrl + '/' + customerId));
+        'POST', Uri.parse(reportMySelfVideoUploadUrl + '/' + customerId));
     request.files.add(await http.MultipartFile.fromPath('video', file.path));
     var res = await request.send();
     var response = await http.Response.fromStream(res);
     return response.body;
-
   }
 
   static Future<String> getAllpharmacies() async {
@@ -716,8 +723,32 @@ class AppSettings {
     }
   }
 
+  static Future<String> getAllQuotationRequests() async {
+    var uri = Uri.parse(getAllQuotationRequestsUrl+'/'+customerId);
+    //uri = uri.replace(query: 'customerId=$customerId');
+
+    var response = await http.get(uri, headers: await buildRequestHeaders());
+    if (response.statusCode == 200) {
+      return response.body;
+    } else if (response.statusCode == 401) {
+      bool status = await AppSettings.resetToken();
+      if (status) {
+        response = await http.get(uri, headers: await buildRequestHeaders());
+        if (response.statusCode == 200) {
+          return response.body;
+        } else {
+          return '';
+        }
+      } else {
+        return '';
+      }
+    } else {
+      return '';
+    }
+  }
+
   static Future<String> addMedicineTimings(payload) async {
-    var uri = Uri.parse(addMedicineTimingsUrl+ '/'+customerId);
+    var uri = Uri.parse(addMedicineTimingsUrl + '/' + customerId);
 
     var response = await http.post(uri,
         body: json.encode(payload), headers: await buildRequestHeaders());
@@ -742,7 +773,7 @@ class AppSettings {
   }
 
   static Future<String> getMedicineTimings() async {
-    var uri = Uri.parse(getMedicineTimingsUrl+'/'+customerId);
+    var uri = Uri.parse(getMedicineTimingsUrl + '/' + customerId);
 
     var response = await http.get(uri, headers: await buildRequestHeaders());
     if (response.statusCode == 200) {
@@ -766,10 +797,8 @@ class AppSettings {
 
   static Future<bool> getQuotation(payload) async {
     var uri = Uri.parse(getQuotationUrl + '/' + customerId);
-    var response = await http.post(
+    var response = await http.post(uri,
-        uri,
+        body: json.encode(payload), headers: await buildRequestHeaders());
-        body: json.encode(payload),
-        headers: await buildRequestHeaders());
 
     if (response.statusCode == 200) {
       try {
@@ -783,10 +812,8 @@ class AppSettings {
     } else if (response.statusCode == 401) {
       bool status = await AppSettings.resetToken();
       if (status) {
-        response = await http.post(
+        response = await http.post(uri,
-            uri,
+            body: json.encode(payload), headers: await buildRequestHeaders());
-            body: json.encode(payload),
-            headers: await buildRequestHeaders());
         if (response.statusCode == 200) {
           return true;
         } else {
@@ -802,10 +829,8 @@ class AppSettings {
 
   static Future<bool> addPrescription(payload) async {
     var uri = Uri.parse(addPrescriptionUrl + '/' + customerId);
-    var response = await http.post(
+    var response = await http.post(uri,
-        uri,
+        body: json.encode(payload), headers: await buildRequestHeaders());
-        body: json.encode(payload),
-        headers: await buildRequestHeaders());
 
     if (response.statusCode == 200) {
       try {
@@ -819,10 +844,8 @@ class AppSettings {
     } else if (response.statusCode == 401) {
       bool status = await AppSettings.resetToken();
       if (status) {
-        response = await http.post(
+        response = await http.post(uri,
-            uri,
+            body: json.encode(payload), headers: await buildRequestHeaders());
-            body: json.encode(payload),
-            headers: await buildRequestHeaders());
         if (response.statusCode == 200) {
           return true;
         } else {
@@ -837,7 +860,7 @@ class AppSettings {
   }
 
   static Future<String> getAllPrescriptions() async {
-    var uri = Uri.parse(getAllPrescriptionsDataUrl+'/'+customerId);
+    var uri = Uri.parse(getAllPrescriptionsDataUrl + '/' + customerId);
     //uri = uri.replace(query: 'customerId=$customerId');
 
     var response = await http.get(uri, headers: await buildRequestHeaders());
@@ -860,8 +883,6 @@ class AppSettings {
     }
   }
 
-
-
   /*Apis ends here*/
 
   //save data local
@@ -904,11 +925,11 @@ class AppSettings {
     phoneNumber = await getData('phone', 'STRING');
     customerId = await getData('customerId', 'STRING');
     userLatitude = await getData('latitude', 'DOUBLE');
-    userLongitude =await getData('longitude', 'DOUBLE');
+    userLongitude = await getData('longitude', 'DOUBLE');
-    profilePictureUrl=await getData('profile', 'STRING');
+    profilePictureUrl = await getData('profile', 'STRING');
-    fcmId =await getData('fcmId', 'STRING');
+    fcmId = await getData('fcmId', 'STRING');
-    age=await getData('age', 'STRING');
+    age = await getData('age', 'STRING');
-    gender=await getData('gender', 'STRING');
+    gender = await getData('gender', 'STRING');
   }
 
   static void longFailedStyledToast(String message, context) {
@@ -936,6 +957,7 @@ class AppSettings {
         textColor: Colors.white,
         fontSize: 16.0);
   }
+
   static void longSuccessToast1(String message) {
     Fluttertoast.showToast(
         msg: message,
@@ -944,8 +966,7 @@ class AppSettings {
         timeInSecForIosWeb: 1,
         backgroundColor: Colors.green,
         textColor: Colors.white,
-        fontSize: 16.0
+        fontSize: 16.0);
-    );
   }
 
   static void longFailedToast(String message) {

lib/models/get_quotation_requests_list_model.dart

@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+import 'package:healthcare_user/common/settings.dart';
+
+class GetQuotationsRequsetListModel {
+  String pharmacy_name = '';
+  String customer_id = '';
+  String patient_name = '';
+  double patient_age =0;
+  String patient_gender = '';
+  String patient_address = '';
+  String status='';
+  String picture='';
+  String contact_number='';
+  String pharmacy_address='';
+  String pharmacy_id='';
+  String registration_number='';
+  String description='';
+  String starting_price='';
+  Color text_color=Colors.black;
+  double lat=0;
+  double lng=0;
+  bool isChecked=false;
+  bool isPharmacyInDialogChecked=false;
+
+  GetQuotationsRequsetListModel();
+
+  factory GetQuotationsRequsetListModel.fromJson(Map<String, dynamic> json){
+    GetQuotationsRequsetListModel rtvm = new GetQuotationsRequsetListModel();
+
+    rtvm.customer_id = json['customerId'] ?? '';
+    rtvm.patient_name= json['user']['familyDetails']['patient_name']??'';
+    rtvm.patient_age= json['user']['familyDetails']['patient_age']??0;
+    rtvm.patient_gender= json['user']['familyDetails']['patient_gender']??'';
+    rtvm.patient_address= json['user']['familyDetails']['patient_address']??'';
+
+    return rtvm;
+  }
+
+}

lib/models/pharmacies_model.dart

@@ -15,6 +15,7 @@ class PharmaciesModel {
   double lat=0;
   double lng=0;
   bool isChecked=false;
+  bool isPharmacyInDialogChecked=false;
 
   PharmaciesModel();
 
@@ -30,8 +31,8 @@ class PharmaciesModel {
     rtvm.starting_price = json['startingPrice'] ?? '';
     rtvm.picture = json['picture'] ?? '';
     rtvm.status = json['status'] ?? '';
-    rtvm.lat = json['latitude'] ?? 0;
+    rtvm.lat = json['latitude'] ?? 0.0;
-    rtvm.lng = json['longitude'] ??0;
+    rtvm.lng = json['longitude'] ??0.0;
 
     return rtvm;
   }

lib/my_medicine_timings.dart

@@ -366,6 +366,9 @@ class _MyMedicineTimingsState extends State<MyMedicineTimings> {
                   onPressed: () async {
 
                     editTimingsDialog();
+                    /*Navigator.push(context, MaterialPageRoute(builder: (context) => EditMedicineTimings())).then((value) {
+                      getMedicineTimingsList();
+                    });*/
                   },
                   child: const Text('Edit'),
                 ),

lib/prescriptions/get_quotations_request_list.dart

@@ -0,0 +1,60 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:healthcare_user/common/settings.dart';
+import 'package:healthcare_user/models/get_quotation_requests_list_model.dart';
+
+class GetQuotationRequestsList extends StatefulWidget {
+  const GetQuotationRequestsList({Key? key}) : super(key: key);
+
+  @override
+  State<GetQuotationRequestsList> createState() => _GetQuotationRequestsListState();
+}
+
+class _GetQuotationRequestsListState extends State<GetQuotationRequestsList> {
+
+  bool isLoading = false;
+  bool isSereverIssue = false;
+  List<GetQuotationsRequsetListModel> quotationRequestsList = [];
+
+  Future<void> getAllQuotationRequestsList() async {
+    isLoading = true;
+    try {
+      var resopnse = await AppSettings.getAllQuotationRequests();
+
+      setState(() {
+        quotationRequestsList = ((jsonDecode(resopnse)) as List)
+            .map((dynamic model) {
+          return GetQuotationsRequsetListModel.fromJson(model);
+        }).toList();
+
+        isLoading = false;
+      });
+    } catch (e) {
+      setState(() {
+        isLoading = false;
+        isSereverIssue = true;
+      });
+    }
+  }
+
+
+  @override
+  void initState() {
+    getAllQuotationRequestsList();
+    super.initState();
+  }
+
+  Widget renderUi(){
+    return Container();
+  }
+
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppSettings.appBar('Quotation Requests'),
+      body: renderUi(),
+    );
+  }
+}

lib/prescriptions/oreder_medicines.dart

@@ -10,6 +10,7 @@ import 'package:healthcare_user/keys.dart';
 import 'package:healthcare_user/models/pharmacies_model.dart';
 import 'package:google_maps_flutter_android/google_maps_flutter_android.dart';
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
+import 'package:healthcare_user/prescriptions/get_quotations_request_list.dart';
 import 'package:location/location.dart' as locationmap;
 
 
@@ -29,6 +30,7 @@ class _OrderMedicinesState extends State<OrderMedicines> {
   //String dropdownType = 'Tank';
   var AreaItems = ['2', '5', '10', '25', '50', '100'];
   List pharmaciesCheckboxes = [];
+  List pharmaciesCheckboxesInDialog = [];
   List selectedPharmacies = [];
   bool isLoading = false;
   bool isSereverIssue = false;
@@ -68,6 +70,7 @@ class _OrderMedicinesState extends State<OrderMedicines> {
 
   Future<void> getAllPharmaciesData(var distance) async {
     isLoading = true;
+    selectedPharmacies=[];
     try {
       var pharmacyResponse = await AppSettings.getAllpharmacies();
 
@@ -110,74 +113,447 @@ class _OrderMedicinesState extends State<OrderMedicines> {
   }
 
 
-  showListOfSelectedPharmacies() async {
+
+  showSelectedPharmaciesDialog(){
     return showDialog(
-      context: context,
         barrierDismissible: false,
+        context: context,
         builder: (BuildContext context) {
-        return StatefulBuilder(
+          return StatefulBuilder(builder: (context,  setState) {
-            builder: (BuildContext context, StateSetter setState) {
+            return AlertDialog(
-
+              title: Text('Selected Pharmacies'),
-              return Container(
+              content: Container(
-                height: 300.0, // Change as per your requirement
+                height:  MediaQuery.of(context).size.height * .50,
-                width: 300.0, // Change as per your requirement
+                width: MediaQuery.of(context).size.width * .70,
-                child: ListView.builder(
+                child:ListView.separated(
-                  shrinkWrap: true,
+                  separatorBuilder: (context, index) => const Divider(height: 4.0,color: Colors.black,),
-                  itemCount: 5,
+                  itemCount: selectedPharmacies.length,
                   itemBuilder: (BuildContext context, int index) {
                     return ListTile(
-                      title: Text('Gujarat, India'),
+                      title: CheckboxListTile(
+                        title: Padding(
+                            padding: EdgeInsets.fromLTRB(0, 10, 0, 0),
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.start,
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                /*Container(
+                                  width: MediaQuery.of(context).size.width * .18,
+                                  height: MediaQuery.of(context).size.height * .10,
+                                  decoration: BoxDecoration(
+                                      shape: BoxShape.rectangle,
+                                      image: DecorationImage(
+                                          image: selectedPharmacies[index].picture == ''
+                                              ? AssetImage("images/logo.png")
+                                              : NetworkImage(
+                                              selectedPharmacies[index].picture)
+                                          as ImageProvider, // picked file
+                                          fit: BoxFit.contain)),
+                                ),
+                                SizedBox(
+                                  width: 5,
+                                ),*/
+                                Expanded(
+                                  child: Container(
+                                      width: MediaQuery.of(context).size.width * .70,
+                                      child: Column(
+                                        mainAxisAlignment:
+                                        MainAxisAlignment.spaceBetween,
+                                        crossAxisAlignment: CrossAxisAlignment.start,
+                                        children: [
+                                          Text(
+                                              selectedPharmacies[index]
+                                                  .pharmacy_name
+                                                  .toUpperCase(),
+                                              style: wrapTextStyleBlack()),
+                                          SizedBox(
+                                            height: 10,
+                                          ),
+                                          Text(
+                                              selectedPharmacies[index]
+                                                  .contact_number
+                                                  .toUpperCase(),
+                                              style: wrapTextStyleBlack()),
+                                          SizedBox(
+                                            height: 10,
+                                          ),
+                                          Text(
+                                              selectedPharmacies[index]
+                                                  .pharmacy_address
+                                                  .toUpperCase(),
+                                              style: wrapTextStyleBlack()),
+                                          Visibility(
+                                            visible:
+                                            selectedPharmacies[index].description != '',
+                                            child: SizedBox(
+                                              height: 10,
+                                            ),
+                                          ),
+                                          Visibility(
+                                            visible:
+                                            selectedPharmacies[index].description != '',
+                                            child: Text(
+                                                selectedPharmacies[index]
+                                                    .description
+                                                    .toUpperCase(),
+                                                style: wrapTextStyleBlack()),
+                                          ),
+                                          SizedBox(
+                                            height: 10,
+                                          ),
+                                        ],
+                                      )),
+                                ),
+                              ],
+                            )),
+                        checkColor: Colors.white,
+                        activeColor: primaryColor,
+                        value: selectedPharmacies[index].isPharmacyInDialogChecked,
+                        onChanged: (val) {
+                          setState(
+                                () {
+                                  selectedPharmacies[index].isPharmacyInDialogChecked = val!;
+                            },
                           );
+                          if (selectedPharmacies[index].isPharmacyInDialogChecked) {
+                            pharmaciesCheckboxesInDialog.add({
+                              'pharmacyId': selectedPharmacies[index].pharmacy_id,
+                            });
+                          } else {
+                            pharmaciesCheckboxesInDialog.removeWhere((e) =>
+                            e['pharmacyId'].toString().toUpperCase() ==
+                                selectedPharmacies[index]
+                                    .pharmacy_id
+                                    .toString()
+                                    .toUpperCase());
+                          }
                         },
                       ),
-              );
+                      /*Padding(
-             /* return AlertDialog(
+                          padding: EdgeInsets.fromLTRB(0, 0, 0, 0),
-                title: const Text('Selected pharmacies'),
-                content: SingleChildScrollView(
-                  child: Expanded(
-                    child: ListView.builder(
-                      itemCount: selectedPharmacies.length,
-                      itemBuilder: (context, index) {
-                        return Card(
                           child: Column(
                             children: [
-                              Text(selectedPharmacies[index].pharmacy_name)
+                              Row(
+                                mainAxisAlignment: MainAxisAlignment.start,
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Container(
+                                    width: MediaQuery.of(context).size.width * .18,
+                                    height: MediaQuery.of(context).size.height * .10,
+                                    decoration: BoxDecoration(
+                                        shape: BoxShape.rectangle,
+                                        image: DecorationImage(
+                                            image: selectedPharmacies[index].picture == ''
+                                                ? AssetImage("images/logo.png")
+                                                : NetworkImage(
+                                                selectedPharmacies[index].picture)
+                                            as ImageProvider, // picked file
+                                            fit: BoxFit.contain)),
+                                  ),
+                                  SizedBox(
+                                    width: 5,
+                                  ),
+                                  Expanded(
+                                    child: Container(
+                                        width: MediaQuery.of(context).size.width * .70,
+                                        child: Column(
+                                          mainAxisAlignment:
+                                          MainAxisAlignment.spaceBetween,
+                                          crossAxisAlignment: CrossAxisAlignment.start,
+                                          children: [
+                                            Text(
+                                                selectedPharmacies[index]
+                                                    .pharmacy_name
+                                                    .toUpperCase(),
+                                                style: wrapTextStyleBlack()),
+                                            SizedBox(
+                                              height: 10,
+                                            ),
+                                            Text(
+                                                selectedPharmacies[index]
+                                                    .contact_number
+                                                    .toUpperCase(),
+                                                style: wrapTextStyleBlack()),
+                                            SizedBox(
+                                              height: 10,
+                                            ),
+                                            Text(
+                                                selectedPharmacies[index]
+                                                    .pharmacy_address
+                                                    .toUpperCase(),
+                                                style: wrapTextStyleBlack()),
+                                            Visibility(
+                                              visible:
+                                              selectedPharmacies[index].description != '',
+                                              child: SizedBox(
+                                                height: 10,
+                                              ),
+                                            ),
+                                            Visibility(
+                                              visible:
+                                              selectedPharmacies[index].description != '',
+                                              child: Text(
+                                                  selectedPharmacies[index]
+                                                      .description
+                                                      .toUpperCase(),
+                                                  style: wrapTextStyleBlack()),
+                                            ),
+                                            SizedBox(
+                                              height: 10,
+                                            ),
                                           ],
+                                        )),
                                   ),
-                        );},
+                                ],
                               ),
-                  )
+                              Container(
+                                  width: double.infinity,
+                                  height: MediaQuery.of(context).size.height * .06,
+                                  padding: const EdgeInsets.all(10),
+                                  child: Row(
+                                    crossAxisAlignment: CrossAxisAlignment.end,
+                                    mainAxisAlignment: MainAxisAlignment.end,
+                                    children: [
+                                      Visibility(
+                                        visible:selectedPharmacies[index].isPharmacyInDialogChecked==false,
+                                        child:  ElevatedButton(
+                                          style: ElevatedButton.styleFrom(
+                                            primary: primaryColor, // background
+                                            onPrimary: Colors.white, // foreground
                                           ),
-                actions: <Widget>[
+                                          onPressed: () async{
-                  TextButton(
+                                            selectedPharmacies[index].isPharmacyInDialogChecked=true;
-                    child: Text('Cancel', style: textButtonStyle()),
-                    onPressed: () {
-                      Navigator.of(context).pop();
                                           },
+                                          child: const Text('Select'),
+                                        ),),
+                                      SizedBox(width: 10,),
+                                      Visibility(
+                                          visible: selectedPharmacies[index].isPharmacyInDialogChecked==true,
+                                          child: ElevatedButton(
+                                            style: ElevatedButton.styleFrom(
+                                              primary: primaryColor, // background
+                                              onPrimary: Colors.white, // foreground
                                             ),
-                  TextButton(
+                                            onPressed: () async{
-                    child: Text('Get quote', style: textButtonStyle()),
+
-                    onPressed: () async {
+
-                      Navigator.of(context).pop();
                                             },
-                  ),
+                                            child: const Text('Deselect'),
+                                          ))
                                     ],
-              );*/
+                                  )),
-            });
+
+                            ],
+                          )),*/
+                    );
                   },
+                ),
+              ),
+              actions: <Widget>[
+
+                Container(
+                    width: double.infinity,
+                    height: MediaQuery.of(context).size.height * .06,
+                    padding: const EdgeInsets.all(10),
+                    child: Row(
+                      crossAxisAlignment: CrossAxisAlignment.end,
+                      mainAxisAlignment: MainAxisAlignment.end,
+                      children: [
+                        ElevatedButton(
+                          style: ElevatedButton.styleFrom(
+                            primary: buttonColors, // background
+                            onPrimary: Colors.black, // foreground
+                          ),
+                          onPressed: () async{
+                            Navigator.pop(context);
+                          },
+                          child: const Text('Cancel'),
+                        ),
+                        SizedBox(width: 10,),
+                        ElevatedButton(
+                          style: ElevatedButton.styleFrom(
+                            primary: buttonColors, // background
+                            onPrimary: Colors.black, // foreground
+                          ),
+                          onPressed: () async{
+                            if(pharmaciesCheckboxesInDialog.length==3){
+                              AppSettings.preLoaderDialog(context);
+                              var payload = new Map<String, dynamic>();
+
+                              payload["picture"] = widget.prescriptionDetails.prescription_url.toString();
+                              payload["pharmacies"] = pharmaciesCheckboxesInDialog;
+                              payload["familyDetails"] = {
+                                "patient_name": widget.prescriptionDetails.patient_name.toString(),
+                                "patient_age": int.parse(widget.prescriptionDetails.age.toString()),
+                                "patient_gender": widget.prescriptionDetails.gender,
+                                "patient_address": userAddress
+                              };
+                              bool status = await AppSettings.getQuotation(payload);
+
+                              if(status){
+                                Navigator.of(context, rootNavigator: true).pop();
+                                AppSettings.longSuccessToast('Quotation request sent successfully');
+                                pharmaciesCheckboxesInDialog.clear();
+                                Navigator.push(
+                                  context,
+                                  MaterialPageRoute(
+                                      builder: (context) => const GetQuotationRequestsList()),
+                                );
+                              }
+                              else{
+                                Navigator.of(context, rootNavigator: true).pop();
+                                AppSettings.longFailedToast('Get quotation failed try after some time');
+                              }
+
+
+                            }
+                            else if(pharmaciesCheckboxesInDialog.length>3){
+                              AppSettings.longFailedToast('Please select only three pharmacies to get quotation');
+                            }
+                            else{
+                              AppSettings.longFailedToast('Please select at least three pharmacies to get quotation');
+                            }
+
+
+                          },
+                          child: const Text('Get quote'),
+                        )
+                      ],
+                    )),
+
+
+              ],
             );
+          });
+
+        });
   }
 
   Widget setupAlertDialoadContainer() {
     return Container(
-      height: 300.0, // Change as per your requirement
+      height:  MediaQuery.of(context).size.height * .50,
-      width: 300.0, // Change as per your requirement
+      width: MediaQuery.of(context).size.width * .70,
-      child: ListView.builder(
+      child:ListView.separated(
-        shrinkWrap: true,
+        separatorBuilder: (context, index) => const Divider(height: 4.0,color: Colors.black,),
-        itemCount: 5,
+        itemCount: selectedPharmacies.length,
         itemBuilder: (BuildContext context, int index) {
           return ListTile(
-            title: Text('Gujarat, India'),
+            title: Padding(
+                padding: EdgeInsets.fromLTRB(0, 0, 0, 0),
+                child: Column(
+                  children: [
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Container(
+                          width: MediaQuery.of(context).size.width * .18,
+                          height: MediaQuery.of(context).size.height * .10,
+                          decoration: BoxDecoration(
+                              shape: BoxShape.rectangle,
+                              image: DecorationImage(
+                                  image: selectedPharmacies[index].picture == ''
+                                      ? AssetImage("images/logo.png")
+                                      : NetworkImage(
+                                      selectedPharmacies[index].picture)
+                                  as ImageProvider, // picked file
+                                  fit: BoxFit.contain)),
+                        ),
+                        SizedBox(
+                          width: 5,
+                        ),
+                        Expanded(
+                          child: Container(
+                              width: MediaQuery.of(context).size.width * .70,
+                              child: Column(
+                                mainAxisAlignment:
+                                MainAxisAlignment.spaceBetween,
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Text(
+                                      selectedPharmacies[index]
+                                          .pharmacy_name
+                                          .toUpperCase(),
+                                      style: wrapTextStyleBlack()),
+                                  SizedBox(
+                                    height: 10,
+                                  ),
+                                  Text(
+                                      selectedPharmacies[index]
+                                          .contact_number
+                                          .toUpperCase(),
+                                      style: wrapTextStyleBlack()),
+                                  SizedBox(
+                                    height: 10,
+                                  ),
+                                  Text(
+                                      selectedPharmacies[index]
+                                          .pharmacy_address
+                                          .toUpperCase(),
+                                      style: wrapTextStyleBlack()),
+                                  Visibility(
+                                    visible:
+                                    selectedPharmacies[index].description != '',
+                                    child: SizedBox(
+                                      height: 10,
+                                    ),
+                                  ),
+                                  Visibility(
+                                    visible:
+                                    selectedPharmacies[index].description != '',
+                                    child: Text(
+                                        selectedPharmacies[index]
+                                            .description
+                                            .toUpperCase(),
+                                        style: wrapTextStyleBlack()),
+                                  ),
+                                  SizedBox(
+                                    height: 10,
+                                  ),
+                                ],
+                              )),
+                        ),
+                      ],
+                    ),
+                    Container(
+                        width: double.infinity,
+                        height: MediaQuery.of(context).size.height * .06,
+                        padding: const EdgeInsets.all(10),
+                        child: Row(
+                          crossAxisAlignment: CrossAxisAlignment.end,
+                          mainAxisAlignment: MainAxisAlignment.end,
+                          children: [
+                           Visibility(
+                             visible:selectedPharmacies[index].isPharmacyInDialogChecked==false,
+                             child:  ElevatedButton(
+                             style: ElevatedButton.styleFrom(
+                               primary: primaryColor, // background
+                               onPrimary: Colors.white, // foreground
+                             ),
+                             onPressed: () async{
+                               selectedPharmacies[index].isPharmacyInDialogChecked=true;
+                             },
+                             child: const Text('Select'),
+                           ),),
+                            SizedBox(width: 10,),
+                            Visibility(
+                              visible: selectedPharmacies[index].isPharmacyInDialogChecked==true,
+                                child: ElevatedButton(
+                              style: ElevatedButton.styleFrom(
+                                primary: primaryColor, // background
+                                onPrimary: Colors.white, // foreground
+                              ),
+                              onPressed: () async{
+
+
+                              },
+                              child: const Text('Deselect'),
+                            ))
+                          ],
+                        )),
+
+                  ],
+                )),
           );
         },
       ),
@@ -319,7 +695,7 @@ class _OrderMedicinesState extends State<OrderMedicines> {
 
 
                       if(pharmaciesCheckboxes.length==3){
-
+                        AppSettings.preLoaderDialog(context);
                         var payload = new Map<String, dynamic>();
 
                         payload["picture"] = widget.prescriptionDetails.prescription_url.toString();
@@ -327,22 +703,30 @@ class _OrderMedicinesState extends State<OrderMedicines> {
                         payload["familyDetails"] = {
                           "patient_name": widget.prescriptionDetails.patient_name.toString(),
                           "patient_age": int.parse(widget.prescriptionDetails.age.toString()),
-                          "patient_gender": widget.prescriptionDetails.gender,
+                          "patient_gender": widget.prescriptionDetails.gender.toString().toLowerCase(),
                           "patient_address": userAddress
                         };
                         bool status = await AppSettings.getQuotation(payload);
 
                         if(status){
+                          Navigator.of(context, rootNavigator: true).pop();
                           AppSettings.longSuccessToast('Quotation request sent successfully');
+                          pharmaciesCheckboxes.clear();
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(
+                                builder: (context) => const GetQuotationRequestsList()),
+                          );
                         }
                         else{
+                          Navigator.of(context, rootNavigator: true).pop();
                           AppSettings.longFailedToast('Get quotation failed try after some time');
                         }
 
                       }
                       else if(pharmaciesCheckboxes.length>3){
 
-                        showListOfSelectedPharmacies();
+                        showSelectedPharmaciesDialog();
 
                       }
                       else{
@@ -488,7 +872,9 @@ class _OrderMedicinesState extends State<OrderMedicines> {
                 )),
             Padding(
               padding: EdgeInsets.all(10),
-              child: TextButton(
+              child: Row(
+                children: [
+                  TextButton(
                       onPressed: () {},
                       child: const Text(
                         'Want to order non prescribed items?',
@@ -497,6 +883,24 @@ class _OrderMedicinesState extends State<OrderMedicines> {
                             decoration: TextDecoration.underline,
                             color: primaryColor),
                       )),
+                  SizedBox(width: 5,),
+                  TextButton(
+                      onPressed: () {
+                        Navigator.push(
+                          context,
+                          MaterialPageRoute(
+                              builder: (context) => const GetQuotationRequestsList()),
+                        );
+                      },
+                      child: const Text(
+                        'Requests',
+                        style: TextStyle(
+                            fontSize: 15,
+                            decoration: TextDecoration.underline,
+                            color: primaryColor),
+                      )),
+                ],
+              )
             ),
             Padding(
               padding: EdgeInsets.all(10),
@@ -659,7 +1063,7 @@ class _OrderMedicinesState extends State<OrderMedicines> {
                         isExpanded: true,
                         decoration: const InputDecoration(
                           prefixIcon: Icon(
-                            Icons.area_chart,
+                            Icons.location_on_outlined,
                             color: primaryColor,
                           ),
                           border: OutlineInputBorder(

lib/reports.dart

@@ -9,11 +9,48 @@ class Reports extends StatefulWidget {
 }
 
 class _ReportsState extends State<Reports> {
+
+  TextEditingController doctorNameController = TextEditingController();
+  TextEditingController hospitalNameController = TextEditingController();
+  TextEditingController problemController = TextEditingController();
+
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppSettings.appBar('Reports'),
-      body: Container(),
+      body: Container(
+        child: Padding(
+          padding: EdgeInsets.all(10),
+          child: Column(
+            children: [
+              Container(
+                child: TextFormField(
+                  cursorColor: greyColor,
+                  controller: doctorNameController,
+                  decoration: textFormFieldDecoration(Icons.person,'Enter Doctor name'),
+                ),
+              ),
+              SizedBox(height:MediaQuery.of(context).size.height * .02,),
+              Container(
+                child: TextFormField(
+                  cursorColor: greyColor,
+                  controller: hospitalNameController,
+                  decoration: textFormFieldDecoration(Icons.location_city_outlined,'Enter Hospital name'),
+                ),
+              ),
+              SizedBox(height:MediaQuery.of(context).size.height * .02,),
+              Container(
+                child: TextFormField(
+                  cursorColor: greyColor,
+                  controller: problemController,
+                  decoration: textFormFieldDecoration(Icons.edit,'Enter Problem'),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
     );
   }
 }