From f25d18353f4c08c98d11b04ee91602412126ad1f Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 27 Sep 2020 10:22:32 +0300 Subject: [PATCH 01/14] icons updated --- lib/pages/ContactUs/findus/hospitrals_page.dart | 2 +- lib/pages/ContactUs/findus/pharmacies_page.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pages/ContactUs/findus/hospitrals_page.dart b/lib/pages/ContactUs/findus/hospitrals_page.dart index 9b1e2f5f..12e7baac 100644 --- a/lib/pages/ContactUs/findus/hospitrals_page.dart +++ b/lib/pages/ContactUs/findus/hospitrals_page.dart @@ -57,7 +57,7 @@ class _HospitalsPageState extends State { child: Image.network(model.FindusHospitalModelList[index].projectImageURL.toString())), Container(child: Texts('${model.FindusHospitalModelList[index].locationName}')),//model.cOCItemList[index].cOCTitl IconButton( - icon: Icon(Icons.person_pin_circle_outlined), + icon: Icon(Icons.location_on, color: Colors.red[900]), tooltip: 'Increase volume by 10', onPressed: () { setState(() { diff --git a/lib/pages/ContactUs/findus/pharmacies_page.dart b/lib/pages/ContactUs/findus/pharmacies_page.dart index 68e3c8bc..cf3f5972 100644 --- a/lib/pages/ContactUs/findus/pharmacies_page.dart +++ b/lib/pages/ContactUs/findus/pharmacies_page.dart @@ -80,7 +80,7 @@ class _PharmaciesPageState extends State { ), Container(child: Texts('${model.FindusPharmaciesModelList[index].locationName}')),//model.cOCItemList[index].cOCTitl IconButton( - icon: Icon(Icons.person_pin_circle_outlined), + icon: Icon(Icons.location_on, color: Colors.red[900]), tooltip: 'Increase volume by 10', onPressed: () { setState(() { From c9256a654ade4cffc63dac3c8079eb4c2e70cbe9 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 29 Sep 2020 18:01:42 +0300 Subject: [PATCH 02/14] LiveCare Scheduling updates --- lib/config/localized_values.dart | 1 + lib/config/shared_pref_kay.dart | 1 + .../Appointments/PatientShareResposne.dart | 16 +- .../LiveCareScheduleClinicsListResponse.dart | 64 +++ lib/pages/BookAppointment/BookConfirm.dart | 79 +++- lib/pages/BookAppointment/BookSuccess.dart | 73 ++-- lib/pages/BookAppointment/DoctorProfile.dart | 13 +- lib/pages/BookAppointment/SearchResults.dart | 4 +- .../components/DocAvailableAppointments.dart | 49 ++- .../components/SearchByDoctor.dart | 1 + .../BookAppointment/widgets/BranchView.dart | 4 +- .../BookAppointment/widgets/DoctorView.dart | 4 +- .../LiveChat/hospitalsLivechat_page.dart | 2 +- .../widgets/AppointmentActions.dart | 5 +- lib/pages/ToDoList/ToDo.dart | 30 +- lib/pages/livecare/livecare_home.dart | 2 + .../livecare_scheduling_clinic_list.dart | 0 .../schedule_clinic_card.dart | 51 +++ lib/pages/livecare/livecare_type_select.dart | 224 +++++++++++ lib/pages/livecare/widgets/clinic_list.dart | 378 ++++++++++++++---- .../appointment_services/GetDoctorsList.dart | 135 +++++++ .../livecare_services/livecare_provider.dart | 75 ++++ lib/uitl/translations_delegate_base.dart | 2 + 23 files changed, 1075 insertions(+), 138 deletions(-) create mode 100644 lib/models/LiveCare/LiveCareScheduleClinicsListResponse.dart create mode 100644 lib/pages/livecare/livecare_scheduling/livecare_scheduling_clinic_list.dart create mode 100644 lib/pages/livecare/livecare_scheduling/schedule_clinic_card.dart create mode 100644 lib/pages/livecare/livecare_type_select.dart diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index ac7ee547..6053dd4a 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -47,6 +47,7 @@ const Map> localizedValues = { }, 'confirmAppo': {'en': 'Confirm Appointment', 'ar': 'تأكيد الموعد'}, 'confirm': {'en': 'Confirm', 'ar': 'تأكيد'}, + 'confirmLiveCare': {'en': 'Confirm LiveCare', 'ar': 'تأكيد لايف كير'}, 'appointment': {'en': 'Appointment', 'ar': 'الموعد'}, 'confirmLater': {'en': 'Confirm Later', 'ar': 'تأكيد لاحقا'}, 'todoList': {'en': 'Todo List', 'ar': 'مهامي'}, diff --git a/lib/config/shared_pref_kay.dart b/lib/config/shared_pref_kay.dart index 61e36022..8087a7f1 100644 --- a/lib/config/shared_pref_kay.dart +++ b/lib/config/shared_pref_kay.dart @@ -14,3 +14,4 @@ const FAMILY_FILE = 'family-file'; const USER_LAT = 'user-lat'; const USER_LONG = 'user-long'; const IS_GO_TO_PARKING = 'IS_GO_TO_PARKING'; +const IS_LIVECARE_APPOINTMENT = 'is_livecare_appointment'; diff --git a/lib/models/Appointments/PatientShareResposne.dart b/lib/models/Appointments/PatientShareResposne.dart index e4a05e04..e3a596d6 100644 --- a/lib/models/Appointments/PatientShareResposne.dart +++ b/lib/models/Appointments/PatientShareResposne.dart @@ -13,17 +13,17 @@ class PatientShareResponse { String doctorImageURL; String doctorNameObj; List doctorSpeciality; - Null errCode; + dynamic errCode; int groupID; bool iSAllowOnlineCheckedIN; - Null insurancePolicyNo; + dynamic insurancePolicyNo; bool isExcludedForOnlineCheckin; int isFollowup; bool isLiveCareAppointment; bool isOnlineCheckedIN; String message; int nextAction; - Null patientCardID; + dynamic patientCardID; int patientID; dynamic patientShare; dynamic patientShareWithTax; @@ -32,20 +32,20 @@ class PatientShareResponse { String patientType; int paymentAmount; String paymentDate; - Null paymentMethodName; - Null paymentReferenceNumber; + dynamic paymentMethodName; + dynamic paymentReferenceNumber; int policyId; String policyName; String procedureName; int projectID; String projectName; - Null setupID; + dynamic setupID; int sourceType; String startTime; int status; int statusCode; - Null statusDesc; - Null subPolicyNo; + dynamic statusDesc; + dynamic subPolicyNo; int userID; PatientShareResponse( diff --git a/lib/models/LiveCare/LiveCareScheduleClinicsListResponse.dart b/lib/models/LiveCare/LiveCareScheduleClinicsListResponse.dart new file mode 100644 index 00000000..8951370c --- /dev/null +++ b/lib/models/LiveCare/LiveCareScheduleClinicsListResponse.dart @@ -0,0 +1,64 @@ +class LiveCareScheduleClinicsListResponse { + List clinicsHaveScheduleList; + + LiveCareScheduleClinicsListResponse({this.clinicsHaveScheduleList}); + + LiveCareScheduleClinicsListResponse.fromJson(Map json) { + if (json['ClinicsHaveScheduleList'] != null) { + clinicsHaveScheduleList = new List(); + json['ClinicsHaveScheduleList'].forEach((v) { + clinicsHaveScheduleList.add(new ClinicsHaveScheduleList.fromJson(v)); + }); + } + } + + Map toJson() { + final Map data = new Map(); + if (this.clinicsHaveScheduleList != null) { + data['ClinicsHaveScheduleList'] = + this.clinicsHaveScheduleList.map((v) => v.toJson()).toList(); + } + return data; + } +} + +class ClinicsHaveScheduleList { + int clinicID; + int serviceID; + int projectID; + String clinicDesc; + String clinicDescN; + String projectDesc; + String projectDescN; + + ClinicsHaveScheduleList( + {this.clinicID, + this.serviceID, + this.projectID, + this.clinicDesc, + this.clinicDescN, + this.projectDesc, + this.projectDescN}); + + ClinicsHaveScheduleList.fromJson(Map json) { + clinicID = json['ClinicID']; + serviceID = json['ServiceID']; + projectID = json['ProjectID']; + clinicDesc = json['ClinicDesc']; + clinicDescN = json['ClinicDescN']; + projectDesc = json['ProjectDesc']; + projectDescN = json['ProjectDescN']; + } + + Map toJson() { + final Map data = new Map(); + data['ClinicID'] = this.clinicID; + data['ServiceID'] = this.serviceID; + data['ProjectID'] = this.projectID; + data['ClinicDesc'] = this.clinicDesc; + data['ClinicDescN'] = this.clinicDescN; + data['ProjectDesc'] = this.projectDesc; + data['ProjectDescN'] = this.projectDescN; + return data; + } +} diff --git a/lib/pages/BookAppointment/BookConfirm.dart b/lib/pages/BookAppointment/BookConfirm.dart index 88ecdb6b..8647b2f0 100644 --- a/lib/pages/BookAppointment/BookConfirm.dart +++ b/lib/pages/BookAppointment/BookConfirm.dart @@ -24,10 +24,12 @@ class BookConfirm extends StatefulWidget { String appoDateFormatted = ""; String appoTimeFormatted = ""; + bool isLiveCareAppointment; BookConfirm( {@required this.doctor, @required this.selectedDate, + @required this.isLiveCareAppointment, @required this.selectedTime}); DoctorsListService service; @@ -358,7 +360,11 @@ class _BookConfirmState extends State { disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { - insertAppointment(context, widget.doctor); + if (!widget.isLiveCareAppointment) { + insertAppointment(context, widget.doctor); + } else { + insertLiveCareScheduledAppointment(context, widget.doctor); + } }, child: Text(TranslationBase.of(context).bookNow, style: TextStyle(fontSize: 18.0)), @@ -375,7 +381,11 @@ class _BookConfirmState extends State { service.cancelAppointment(appo, context).then((res) { if (res['MessageStatus'] == 1) { Future.delayed(new Duration(milliseconds: 1500), () { - insertAppointment(context, docObject); + if (!widget.isLiveCareAppointment) { + insertAppointment(context, widget.doctor); + } else { + insertLiveCareScheduledAppointment(context, widget.doctor); + } }); } else { AppToast.showErrorToast(message: res['ErrorEndUserMessage']); @@ -434,6 +444,55 @@ class _BookConfirmState extends State { text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } + insertLiveCareScheduledAppointment(context, DoctorList docObject) { + AppoitmentAllHistoryResultList appo; + widget.service + .insertLiveCareScheduleAppointment( + docObject.doctorID, + docObject.clinicID, + docObject.projectID, + docObject.serviceID, + widget.selectedTime, + widget.selectedDate, + context) + .then((res) { + if (res['MessageStatus'] == 1) { + AppToast.showSuccessToast(message: "Appointment Booked Successfully"); + print(res['AppointmentNo']); + + Future.delayed(new Duration(milliseconds: 1800), () { + getLiveCareAppointmentPatientShare(context, res['AppointmentNo'], + docObject.clinicID, docObject.projectID, docObject); + }); + } else { + appo = new AppoitmentAllHistoryResultList(); + appo.appointmentNo = res['SameClinicApptList'][0]['AppointmentNo']; + appo.clinicID = res['SameClinicApptList'][0]['DoctorID']; + appo.projectID = res['SameClinicApptList'][0]['ProjectID']; + appo.endTime = res['SameClinicApptList'][0]['EndTime']; + appo.startTime = res['SameClinicApptList'][0]['StartTime']; + appo.doctorID = res['SameClinicApptList'][0]['DoctorID']; + appo.isLiveCareAppointment = true; + appo.originalClinicID = 0; + appo.originalProjectID = 0; + appo.appointmentDate = res['SameClinicApptList'][0]['AppointmentDate']; + + ConfirmDialog dialog = new ConfirmDialog( + context: context, + confirmMessage: res['ErrorEndUserMessage'], + okText: TranslationBase.of(context).confirm, + cancelText: TranslationBase.of(context).cancel_nocaps, + okFunction: () => {cancelAppointment(docObject, appo, context)}, + cancelFunction: () => {}); + dialog.showAlertDialog(context); + } + }).catchError((err) { + AppToast.showErrorToast(message: err); + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + } + getPatientShare(context, String appointmentNo, int clinicID, int projectID, DoctorList docObject) { widget.service @@ -448,6 +507,21 @@ class _BookConfirmState extends State { text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } + getLiveCareAppointmentPatientShare(context, String appointmentNo, + int clinicID, int projectID, DoctorList docObject) { + widget.service + .getLiveCareAppointmentPatientShare( + appointmentNo, clinicID, projectID, context) + .then((res) { + print(res); + widget.patientShareResponse = new PatientShareResponse.fromJson(res); + navigateToBookSuccess(context, docObject, widget.patientShareResponse); + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + } + String getTime(DateTime dateTime) { final DateFormat formatter = DateFormat('HH:mm'); setState(() { @@ -502,7 +576,6 @@ class _BookConfirmState extends State { Future navigateToBookSuccess(context, DoctorList docObject, PatientShareResponse patientShareResponse) async { - Navigator.push( context, MaterialPageRoute( diff --git a/lib/pages/BookAppointment/BookSuccess.dart b/lib/pages/BookAppointment/BookSuccess.dart index 7a19ea28..2f7bde88 100644 --- a/lib/pages/BookAppointment/BookSuccess.dart +++ b/lib/pages/BookAppointment/BookSuccess.dart @@ -39,12 +39,6 @@ class _BookSuccessState extends State { AppSharedPreferences sharedPref = AppSharedPreferences(); AuthenticatedUser authUser; - @override - void initState() { - // TODO: implement initState - super.initState(); - } - @override Widget build(BuildContext context) { return Scaffold( @@ -184,6 +178,9 @@ class _BookSuccessState extends State { case 30: return _getQRAppo(); break; + case 50: + return _getConfirmAppo(); + break; } } @@ -204,6 +201,9 @@ class _BookSuccessState extends State { case 30: return 'QR Code'; break; + case 50: + return 'Confirm LiveCare'; + break; } } @@ -286,8 +286,19 @@ class _BookSuccessState extends State { textColor: Colors.white, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), - onPressed: () {}, - child: Text(TranslationBase.of(context).confirm.toUpperCase(), + onPressed: () { + AppoitmentAllHistoryResultList appo = new AppoitmentAllHistoryResultList(); + appo.clinicID = widget.docObject.clinicID; + appo.projectID = widget.docObject.projectID; + appo.appointmentNo = widget.patientShareResponse.appointmentNo; + confirmAppointment(appo); + }, + child: Text( + widget.patientShareResponse.isLiveCareAppointment + ? TranslationBase.of(context) + .confirmLiveCare + .toUpperCase() + : TranslationBase.of(context).confirm.toUpperCase(), style: TextStyle(fontSize: 18.0)), ), ), @@ -321,6 +332,23 @@ class _BookSuccessState extends State { return Container(); } + confirmAppointment(AppoitmentAllHistoryResultList appo) { + DoctorsListService service = new DoctorsListService(); + service + .confirmAppointment( + appo.appointmentNo, appo.clinicID, appo.projectID, context) + .then((res) { + if (res['MessageStatus'] == 1) { + AppToast.showSuccessToast(message: res['ErrorEndUserMessage']); + navigateToHome(context); + } else { + AppToast.showErrorToast(message: res['ErrorEndUserMessage']); + } + }).catchError((err) { + print(err); + }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + } + Widget _getPayNowAppo() { return Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -543,7 +571,8 @@ class _BookSuccessState extends State { } }).catchError((err) { print(err); - }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } createAdvancePayment(res, AppoitmentAllHistoryResultList appo) { @@ -560,22 +589,12 @@ class _BookSuccessState extends State { appo.appointmentNo.toString()); }).catchError((err) { print(err); - }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } -// -// Future navigateToQR( -// context, String appoQR, PatientShareResponse patientShareResponse) async { -// Navigator.push( -// context, -// MaterialPageRoute( -// builder: (context) => QRCode( -// patientShareResponse: patientShareResponse, -// appoQR: appoQR, -// ))).then((value) {}); -// } - - addAdvancedNumberRequest(String advanceNumber, String paymentReference, - String appointmentID) { + + addAdvancedNumberRequest( + String advanceNumber, String paymentReference, String appointmentID) { DoctorsListService service = new DoctorsListService(); service .addAdvancedNumberRequest( @@ -585,7 +604,8 @@ class _BookSuccessState extends State { getAppoQR(context); }).catchError((err) { print(err); - }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } Widget _getQRAppo() { @@ -742,7 +762,8 @@ class _BookSuccessState extends State { navigateToQR(context, res['AppointmentQR']); }).catchError((err) { print(err); - }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } Future navigateToQR(context, String appoQR) async { diff --git a/lib/pages/BookAppointment/DoctorProfile.dart b/lib/pages/BookAppointment/DoctorProfile.dart index d3b6fc7c..2c7e723a 100644 --- a/lib/pages/BookAppointment/DoctorProfile.dart +++ b/lib/pages/BookAppointment/DoctorProfile.dart @@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart import 'package:diplomaticquarterapp/models/Appointments/DoctorProfile.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/routes.dart'; +import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; @@ -10,7 +11,7 @@ import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'package:rating_bar/rating_bar.dart'; -import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; + import 'BookConfirm.dart'; import 'components/DocAvailableAppointments.dart'; import 'components/DocInfo.dart'; @@ -19,9 +20,12 @@ class DoctorProfile extends StatefulWidget { DoctorList doctor; DoctorProfileList docProfileList; final bool isOpenAppt; + bool isLiveCareAppointment; + DoctorProfile( {@required this.doctor, @required this.docProfileList, + @required this.isLiveCareAppointment, this.isOpenAppt = false}); AuthenticatedUser authUser; @@ -35,6 +39,7 @@ class _DoctorProfileState extends State TabController _tabController; bool showFooterButton = false; var event = RobotProvider(); + @override void initState() { _tabController = new TabController( @@ -54,6 +59,7 @@ class _DoctorProfileState extends State }); _tabController = new TabController(length: 2, vsync: this); widget.authUser = new AuthenticatedUser(); + widget.doctor.speciality = widget.docProfileList.specialty; getPatientData(); super.initState(); } @@ -190,7 +196,9 @@ class _DoctorProfileState extends State physics: NeverScrollableScrollPhysics(), children: [ DoctorInformation(docProfileList: widget.docProfileList), - DocAvailableAppointments(doctor: widget.doctor) + DocAvailableAppointments( + doctor: widget.doctor, + isLiveCareAppointment: widget.isLiveCareAppointment) ], controller: _tabController, ), @@ -245,6 +253,7 @@ class _DoctorProfileState extends State MaterialPageRoute( builder: (context) => BookConfirm( doctor: widget.doctor, + isLiveCareAppointment: widget.isLiveCareAppointment, selectedDate: DocAvailableAppointments.selectedDate, selectedTime: DocAvailableAppointments.selectedTime))); } diff --git a/lib/pages/BookAppointment/SearchResults.dart b/lib/pages/BookAppointment/SearchResults.dart index 2b5fac17..1ed1b6a0 100644 --- a/lib/pages/BookAppointment/SearchResults.dart +++ b/lib/pages/BookAppointment/SearchResults.dart @@ -9,9 +9,10 @@ import 'package:flutter/material.dart'; class SearchResults extends StatefulWidget { List doctorsList = []; List patientDoctorAppointmentListHospital; + bool isLiveCareAppointment; SearchResults( - {@required this.doctorsList, this.patientDoctorAppointmentListHospital}); + {@required this.doctorsList, this.patientDoctorAppointmentListHospital, @required this.isLiveCareAppointment}); @override _SearchResultsState createState() => _SearchResultsState(); @@ -53,6 +54,7 @@ class _SearchResultsState extends State { .map((doctor) { return DoctorView( doctor: doctor, + isLiveCareAppointment: widget.isLiveCareAppointment, ); }).toList(), )), diff --git a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart index 3c5e49ff..aca0884f 100644 --- a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart +++ b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart @@ -2,12 +2,13 @@ import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart import 'package:diplomaticquarterapp/models/Appointments/FreeSlot.dart'; import 'package:diplomaticquarterapp/models/Appointments/timeSlot.dart'; import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; +import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; -import 'package:table_calendar/table_calendar.dart'; import 'package:smart_progress_bar/smart_progress_bar.dart'; +import 'package:table_calendar/table_calendar.dart'; import '../../../uitl/date_uitl.dart'; @@ -17,8 +18,10 @@ class DocAvailableAppointments extends StatefulWidget { static DateTime selectedAppoDateTime; static String selectedDate; static String selectedTime; + bool isLiveCareAppointment; - DocAvailableAppointments({@required this.doctor}); + DocAvailableAppointments( + {@required this.doctor, @required this.isLiveCareAppointment}); @override _DocAvailableAppointmentsState createState() => @@ -31,6 +34,8 @@ class _DocAvailableAppointmentsState extends State AnimationController _animationController; CalendarController _calendarController; + AppSharedPreferences sharedPref = new AppSharedPreferences(); + var selectedDate = ""; dynamic selectedDateJSON; dynamic jsonFreeSlots; @@ -56,8 +61,13 @@ class _DocAvailableAppointmentsState extends State _selectedDay: ['Event A0'] }; - WidgetsBinding.instance - .addPostFrameCallback((_) => getDoctorFreeSlots(context, widget.doctor)); + WidgetsBinding.instance.addPostFrameCallback((_) async { + if (widget.isLiveCareAppointment) + getDoctorScheduledFreeSlots(context, widget.doctor); + else { + getDoctorFreeSlots(context, widget.doctor); + } + }); _calendarController = CalendarController(); _animationController = AnimationController( @@ -323,8 +333,8 @@ class _DocAvailableAppointmentsState extends State getDoctorFreeSlots(context, DoctorList docObject) { DoctorsListService service = new DoctorsListService(); service - .getDoctorFreeSlots( - docObject.doctorID, docObject.clinicID, docObject.projectID, context) + .getDoctorFreeSlots(docObject.doctorID, docObject.clinicID, + docObject.projectID, context) .then((res) { if (res['MessageStatus'] == 1) { if (res['FreeTimeSlots'].length != 0) { @@ -340,7 +350,32 @@ class _DocAvailableAppointmentsState extends State } }).catchError((err) { print(err); - }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + } + + getDoctorScheduledFreeSlots(context, DoctorList docObject) { + DoctorsListService service = new DoctorsListService(); + service + .getDoctorScheduledFreeSlots(docObject.doctorID, docObject.clinicID, + docObject.projectID, docObject.serviceID, context) + .then((res) { + if (res['MessageStatus'] == 1) { + if (res['PatientER_DoctorFreeSlots'].length != 0) { + freeSlotsResponse = res['PatientER_DoctorFreeSlots']; + print("res['PatientER_DoctorFreeSlots']"); + print(res['PatientER_DoctorFreeSlots'].length); + _getJSONSlots().then((value) => { + setState(() => {_events.clear(), _events = value}) + }); + } else {} + } else { + AppToast.showErrorToast(message: res['ErrorEndUserMessage']); + } + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } Widget _buildEventsMarker(DateTime date, List events) { diff --git a/lib/pages/BookAppointment/components/SearchByDoctor.dart b/lib/pages/BookAppointment/components/SearchByDoctor.dart index 1e7deb38..80288085 100644 --- a/lib/pages/BookAppointment/components/SearchByDoctor.dart +++ b/lib/pages/BookAppointment/components/SearchByDoctor.dart @@ -162,6 +162,7 @@ class _SearchByDoctorState extends State { context, MaterialPageRoute( builder: (context) => SearchResults( + isLiveCareAppointment: false, doctorsList: docList, patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital))); diff --git a/lib/pages/BookAppointment/widgets/BranchView.dart b/lib/pages/BookAppointment/widgets/BranchView.dart index 88912a3f..76741874 100644 --- a/lib/pages/BookAppointment/widgets/BranchView.dart +++ b/lib/pages/BookAppointment/widgets/BranchView.dart @@ -128,8 +128,8 @@ class _ExpandableListViewState extends State { widget.doctorsList2[index].projectName.toString() ? DoctorView( //AJ note - doctor: widget.doctorsList2[index] - + doctor: widget.doctorsList2[index], + isLiveCareAppointment: false, // widget.doctorsList2[index] ) : Container(); diff --git a/lib/pages/BookAppointment/widgets/DoctorView.dart b/lib/pages/BookAppointment/widgets/DoctorView.dart index d3150459..441b7e10 100644 --- a/lib/pages/BookAppointment/widgets/DoctorView.dart +++ b/lib/pages/BookAppointment/widgets/DoctorView.dart @@ -11,9 +11,10 @@ import '../DoctorProfile.dart'; class DoctorView extends StatelessWidget { final DoctorList doctor; + bool isLiveCareAppointment; - DoctorView({@required this.doctor}); + DoctorView({@required this.doctor, @required this.isLiveCareAppointment}); @override Widget build(BuildContext context) { @@ -185,6 +186,7 @@ class DoctorView extends StatelessWidget { MaterialPageRoute( builder: (context) => DoctorProfile( doctor: docObject, + isLiveCareAppointment: isLiveCareAppointment, docProfileList: docProfile, isOpenAppt: isAppo, ))); diff --git a/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart b/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart index 66ad31ee..dec4cb7d 100644 --- a/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart +++ b/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart @@ -113,7 +113,7 @@ class _HospitalsLiveChatPageState extends State { IconButton( icon: Icon( Icons - .arrow_forward_rounded, + .arrow_forward_ios, color: tappedIndex == index ? Colors.white diff --git a/lib/pages/MyAppointments/widgets/AppointmentActions.dart b/lib/pages/MyAppointments/widgets/AppointmentActions.dart index 19e82086..b0330282 100644 --- a/lib/pages/MyAppointments/widgets/AppointmentActions.dart +++ b/lib/pages/MyAppointments/widgets/AppointmentActions.dart @@ -356,14 +356,15 @@ class _AppointmentActionsState extends State { print(res); if (res['MessageStatus'] == 1) { AppToast.showSuccessToast(message: res['ErrorEndUserMessage']); - Navigator.of(context).pop(); } else { AppToast.showErrorToast(message: res['ErrorEndUserMessage']); } }).catchError((err) { print(err); }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)).then((value) { + Navigator.of(context).pop(); + }); } openAppointmentRadiology() { diff --git a/lib/pages/ToDoList/ToDo.dart b/lib/pages/ToDoList/ToDo.dart index dc96864a..f83a62d5 100644 --- a/lib/pages/ToDoList/ToDo.dart +++ b/lib/pages/ToDoList/ToDo.dart @@ -284,7 +284,7 @@ class _ToDoState extends State { break; case 50: - return "assets/images/new-design/liveCare_logo_icon.png"; + return "assets/images/new-design/confirm_button.png"; break; default: @@ -297,14 +297,15 @@ class _ToDoState extends State { case 10: confirmAppointment(appo); break; - case 20: getPatientShare(context, appo); break; - case 30: getAppoQR(context, appo); break; + case 50: + confirmAppointment(appo); + break; } } @@ -334,7 +335,7 @@ class _ToDoState extends State { break; case 50: - return TranslationBase.of(context).livecare; + return TranslationBase.of(context).confirmLiveCare; break; default: @@ -444,7 +445,8 @@ class _ToDoState extends State { }).catchError((err) { print(err); AppToast.showErrorToast(message: err); - }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } getPatientShare(context, AppoitmentAllHistoryResultList appo) { @@ -457,7 +459,8 @@ class _ToDoState extends State { openPaymentDialog(appo, widget.patientShareResponse); }).catchError((err) { print(err); - }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } getAppoQR(context, AppoitmentAllHistoryResultList appo) { @@ -478,7 +481,8 @@ class _ToDoState extends State { navigateToQR(context, res['AppointmentQR'], patientShareResponse); }).catchError((err) { print(err); - }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } Future navigateToQR( @@ -592,7 +596,8 @@ class _ToDoState extends State { } }).catchError((err) { print(err); - }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } createAdvancePayment(res, AppoitmentAllHistoryResultList appo) { @@ -610,7 +615,8 @@ class _ToDoState extends State { appo); }).catchError((err) { print(err); - }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } addAdvancedNumberRequest(String advanceNumber, String paymentReference, @@ -624,7 +630,8 @@ class _ToDoState extends State { getAppoQR(context, appo); }).catchError((err) { print(err); - }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } Future navigateToPaymentMethod( @@ -670,6 +677,7 @@ class _ToDoState extends State { } }).catchError((err) { print(err); - }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } } diff --git a/lib/pages/livecare/livecare_home.dart b/lib/pages/livecare/livecare_home.dart index f3129823..fc5c4eab 100644 --- a/lib/pages/livecare/livecare_home.dart +++ b/lib/pages/livecare/livecare_home.dart @@ -8,6 +8,8 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'package:smart_progress_bar/smart_progress_bar.dart'; +import 'livecare_type_select.dart'; + class LiveCareHome extends StatefulWidget { static bool showFooterButton = true; diff --git a/lib/pages/livecare/livecare_scheduling/livecare_scheduling_clinic_list.dart b/lib/pages/livecare/livecare_scheduling/livecare_scheduling_clinic_list.dart new file mode 100644 index 00000000..e69de29b diff --git a/lib/pages/livecare/livecare_scheduling/schedule_clinic_card.dart b/lib/pages/livecare/livecare_scheduling/schedule_clinic_card.dart new file mode 100644 index 00000000..4309cc62 --- /dev/null +++ b/lib/pages/livecare/livecare_scheduling/schedule_clinic_card.dart @@ -0,0 +1,51 @@ +import 'package:diplomaticquarterapp/models/LiveCare/LiveCareScheduleClinicsListResponse.dart'; +import 'package:flutter/material.dart'; + +class ScheduleClinicCard extends StatefulWidget { + bool isSelected; + final ClinicsHaveScheduleList clinicsHaveScheduleList; + var languageID; + + ScheduleClinicCard( + {this.isSelected, + this.languageID, + @required this.clinicsHaveScheduleList}); + + @override + _ScheduleClinicCardState createState() => _ScheduleClinicCardState(); +} + +class _ScheduleClinicCardState extends State { + @override + Widget build(BuildContext context) { + return Container( + child: Card( + margin: EdgeInsets.fromLTRB(15.0, 10.0, 15.0, 8.0), + color: widget.isSelected ? Colors.blue : Colors.white, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + ), + child: Container( + width: MediaQuery.of(context).size.width * 0.8, + padding: EdgeInsets.all(12.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.max, + children: [ + Container( + child: Text( + widget.languageID == 'ar' + ? widget.clinicsHaveScheduleList.clinicDescN + : widget.clinicsHaveScheduleList.clinicDesc, + style: TextStyle( + fontSize: 16.0, + color: + widget.isSelected ? Colors.white : Colors.black)), + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/pages/livecare/livecare_type_select.dart b/lib/pages/livecare/livecare_type_select.dart new file mode 100644 index 00000000..d8978d8e --- /dev/null +++ b/lib/pages/livecare/livecare_type_select.dart @@ -0,0 +1,224 @@ +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; + +class LiveCareTypeSelect extends StatefulWidget { + @override + _LiveCareTypeSelectState createState() => _LiveCareTypeSelectState(); +} + +class _LiveCareTypeSelectState extends State { + var languageID; + AppSharedPreferences sharedPref = AppSharedPreferences(); + + @override + void initState() { + getLanguageID(); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + leading: InkWell( + onTap: () { + Navigator.pop(context, null); + }, + child: Icon( + Icons.close, + color: Colors.white, + ), + ), + title: Text(TranslationBase.of(context).bookAppo, + style: TextStyle(color: Colors.white)), + ), + body: SingleChildScrollView( + child: Container( + margin: EdgeInsets.only(left: 20.0, right: 20.0), + child: Column( + children: [ + Container( + alignment: Alignment.center, + margin: EdgeInsets.only(top: 15.0, bottom: 10.0), + child: Image.asset( + languageID == 'ar' + ? "assets/images/new-design/liveCare_ar_bg.png" + : "assets/images/new-design/liveCare_en_bg.png", + width: 120), + ), + Container( + alignment: Alignment.center, + child: Text("LiveCare Service", + style: TextStyle( + fontWeight: FontWeight.bold, fontSize: 20.0))), + Container( + margin: EdgeInsets.only(top: 10.0), + alignment: Alignment.center, + child: Text( + "is to obtain medical advice with a specialist doctor Via a video call", + textAlign: TextAlign.center, + style: TextStyle(fontSize: 18.0))), + Container( + margin: EdgeInsets.only(top: 15.0), + alignment: Alignment.centerLeft, + child: Text("WHY LIVECARE?", + style: TextStyle( + fontWeight: FontWeight.bold, fontSize: 20.0))), + Container( + margin: EdgeInsets.only(top: 20.0, left: 20.0), + child: Row( + children: [ + SvgPicture.asset("assets/images/new-design/check_icon.svg", + width: 25), + Container( + width: MediaQuery.of(context).size.width * 0.75, + margin: EdgeInsets.all(10.0), + child: Text( + "No need to wait, you will get Medical consultation immediately via Video call.", + overflow: TextOverflow.clip, + style: TextStyle(fontSize: 14.0)), + ) + ], + ), + ), + Container( + margin: EdgeInsets.only(top: 5.0, left: 20.0), + child: Row( + children: [ + SvgPicture.asset("assets/images/new-design/check_icon.svg", + width: 25), + Container( + width: MediaQuery.of(context).size.width * 0.75, + margin: EdgeInsets.all(10.0), + child: Text("The doctor will see your medical file.", + overflow: TextOverflow.clip, + style: TextStyle(fontSize: 14.0)), + ) + ], + ), + ), + Container( + margin: EdgeInsets.only(top: 5.0, left: 20.0), + child: Row( + children: [ + SvgPicture.asset("assets/images/new-design/check_icon.svg", + width: 25), + Container( + width: MediaQuery.of(context).size.width * 0.75, + margin: EdgeInsets.all(10.0), + child: Text("Free Prescription delivery service.", + overflow: TextOverflow.clip, + style: TextStyle(fontSize: 14.0)), + ) + ], + ), + ), + Container( + margin: EdgeInsets.only(top: 20.0), + child: Text( + "** The service is included with some insurance companies according to the terms and conditions With our best wishes for health and wellness", + style: TextStyle(fontSize: 16.0))), + InkWell( + onTap: (){ + Navigator.pop(context, "immediate"); + }, + child: Container( + decoration: BoxDecoration( + color: Colors.red[900], + borderRadius: BorderRadius.all(Radius.circular(10.0))), + height: 120.0, + margin: EdgeInsets.only(top: 20.0), + child: Row( + children: [ + Container( + margin: EdgeInsets.only(left: 20.0), + child: SvgPicture.asset( + "assets/images/new-design/liveCare_logo_icon_white.svg", + width: 80), + ), + Container( + width: MediaQuery.of(context).size.width * 0.6, + margin: EdgeInsets.fromLTRB(30.0, 20.0, 0.0, 0.0), + child: Column( + children: [ + Text("Get Medical consultation immediately", + overflow: TextOverflow.clip, + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 18.0, + color: Colors.white)), + Container( + margin: EdgeInsets.only(top: 10.0), + alignment: Alignment.centerLeft, + child: Text("Instant video call", + style: TextStyle( + fontSize: 18.0, color: Colors.white)), + ) + ], + ), + ), + ], + )), + ), + InkWell( + onTap: (){ + Navigator.pop(context, "schedule"); + }, + child: Container( + decoration: BoxDecoration( + color: Colors.grey[700], + borderRadius: BorderRadius.all(Radius.circular(10.0))), + height: 120.0, + margin: EdgeInsets.only(top: 20.0), + child: Row( + children: [ + Container( + margin: EdgeInsets.only(left: 20.0), + child: Image.asset( + "assets/images/new-design/calendar.png", + width: 70), + ), + Container( + width: MediaQuery.of(context).size.width * 0.6, + margin: EdgeInsets.fromLTRB(30.0, 30.0, 0.0, 0.0), + child: Column( + children: [ + Container( + alignment: Alignment.centerLeft, + child: Text("Book Appointment", + overflow: TextOverflow.clip, + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 18.0, + color: Colors.white)), + ), + Container( + margin: EdgeInsets.only(top: 10.0), + alignment: Alignment.centerLeft, + child: Text("Schedule Video Call", + style: TextStyle( + fontSize: 18.0, color: Colors.white)), + ) + ], + ), + ), + ], + )), + ), + ], + ), + ), + ), + ); + } + + getLanguageID() async { + var languageID = await sharedPref.getString(APP_LANGUAGE); + setState(() { + this.languageID = languageID; + }); + } +} diff --git a/lib/pages/livecare/widgets/clinic_list.dart b/lib/pages/livecare/widgets/clinic_list.dart index 9100a64e..c1f5eb75 100644 --- a/lib/pages/livecare/widgets/clinic_list.dart +++ b/lib/pages/livecare/widgets/clinic_list.dart @@ -1,9 +1,14 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; +import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/models/LiveCare/ERAppointmentFeesResponse.dart'; import 'package:diplomaticquarterapp/models/LiveCare/LiveCareClinicsListResponse.dart'; +import 'package:diplomaticquarterapp/models/LiveCare/LiveCareScheduleClinicsListResponse.dart'; +import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart'; import 'package:diplomaticquarterapp/pages/ToDoList/payment_method_select.dart'; +import 'package:diplomaticquarterapp/pages/livecare/livecare_scheduling/schedule_clinic_card.dart'; +import 'package:diplomaticquarterapp/pages/livecare/livecare_type_select.dart'; import 'package:diplomaticquarterapp/pages/livecare/widgets/LiveCareInfoDialog.dart'; import 'package:diplomaticquarterapp/pages/livecare/widgets/LiveCarePaymentDialog.dart'; import 'package:diplomaticquarterapp/pages/livecare/widgets/clinic_card.dart'; @@ -30,8 +35,11 @@ class _clinic_listState extends State { int currentSelectedIndex = 0; LiveCareClinicsListResponse liveCareClinicsListResponse; + LiveCareScheduleClinicsListResponse liveCareScheduleClinicsListResponse; + bool isDataLoaded = false; var languageID; + var currentSelectedLiveCareType; int selectedClinicID = 1; String selectedClinicName = "-"; @@ -46,11 +54,13 @@ class _clinic_listState extends State { @override void initState() { liveCareClinicsListResponse = new LiveCareClinicsListResponse(); + liveCareScheduleClinicsListResponse = + new LiveCareScheduleClinicsListResponse(); + WidgetsBinding.instance.addPostFrameCallback((_) { -// Future.delayed(new Duration(milliseconds: 1200), () { - getLiveCareClinicsList(); -// }); + openLiveCareSelectionDialog(); }); + getLanguageID(); super.initState(); } @@ -58,77 +68,9 @@ class _clinic_listState extends State { @override Widget build(BuildContext context) { return SingleChildScrollView( - child: Column( - children: [ - isDataLoaded - ? Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - margin: EdgeInsets.all(15.0), - child: Text("Online Clinics: ", - style: TextStyle( - fontSize: 20.0, fontWeight: FontWeight.bold)), - ), - ListView.builder( - scrollDirection: Axis.vertical, - shrinkWrap: true, - physics: ScrollPhysics(), - padding: EdgeInsets.all(0.0), - itemCount: liveCareClinicsListResponse - .patientERGetClinicsList.length, - itemBuilder: (context, index) { - return InkWell( - onTap: () { - updateSelectedIndex(liveCareClinicsListResponse - .patientERGetClinicsList[index]); - }, - child: ClinicCard( - isSelected: selectedClinicID == - liveCareClinicsListResponse - .patientERGetClinicsList[index] - .serviceID - ? true - : false, - patientERGetClinicsList: - liveCareClinicsListResponse - .patientERGetClinicsList[index], - languageID: languageID, - ), - ); - }, - ), - Container( - height: 10.0, - ), - ], - ), - ) - : Container(), - isDataLoaded ? Container( - width: MediaQuery.of(context).size.width, - height: 50.0, - margin: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0), - child: ButtonTheme( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(10.0), - ), - minWidth: MediaQuery.of(context).size.width * 0.7, - height: 45.0, - child: RaisedButton( - color: new Color(0xFF60686b), - textColor: Colors.white, - disabledTextColor: Colors.white, - disabledColor: new Color(0xFFbcc2c4), - onPressed: startLiveCare, - child: Text("Start", style: TextStyle(fontSize: 18.0)), - ), - ), - ) : Container(), - ], - ), - ); + child: currentSelectedLiveCareType == "immediate" + ? getLiveCareImmediateClinicList() + : getLiveCareScheduleClinicList()); } void startLiveCare() { @@ -388,10 +330,298 @@ class _clinic_listState extends State { text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } + getLiveCareScheduleClinicsList() { + isDataLoaded = false; + LiveCareService service = new LiveCareService(); + service.getLiveCareScheduledClinics(context).then((res) { + print(res['ClinicsHaveScheduleList'].length); + if (res['MessageStatus'] == 1) { + setState(() { + liveCareScheduleClinicsListResponse = + LiveCareScheduleClinicsListResponse.fromJson(res); + print(liveCareScheduleClinicsListResponse + .clinicsHaveScheduleList.length); + selectedClinicID = liveCareScheduleClinicsListResponse + .clinicsHaveScheduleList[0].serviceID; + selectedClinicName = liveCareScheduleClinicsListResponse + .clinicsHaveScheduleList[0].clinicDesc; + isDataLoaded = true; + }); + } else { + isDataLoaded = true; + AppToast.showErrorToast(message: res['ErrorEndUserMessage']); + } + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + } + + openLiveCareSelectionDialog() { + Navigator.of(context) + .push(new MaterialPageRoute( + builder: (BuildContext context) { + return LiveCareTypeSelect(); + }, + fullscreenDialog: true)) + .then((value) { + if (value == null) { + Navigator.pop(context); + } else { + print(value); + if (value == "immediate") { + setState(() { + currentSelectedLiveCareType = "immediate"; + }); + getLiveCareClinicsList(); + } + if (value == "schedule") { + setState(() { + currentSelectedLiveCareType = "schedule"; + }); + getLiveCareScheduleClinicsList(); + } + } + }); + } + + Widget getLiveCareScheduleClinicList() { + return Column( + children: [ + isDataLoaded + ? Container( + height: MediaQuery.of(context).size.height * 0.7, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ +// Container( +// margin: EdgeInsets.all(15.0), +// child: Text("Online Clinics: ", +// style: TextStyle( +// fontSize: 20.0, fontWeight: FontWeight.bold)), +// ), + ListView.builder( + scrollDirection: Axis.vertical, + shrinkWrap: true, + physics: ScrollPhysics(), + padding: EdgeInsets.all(0.0), + itemCount: liveCareScheduleClinicsListResponse + .clinicsHaveScheduleList.length, + itemBuilder: (context, index) { + return InkWell( + onTap: () { + updateSelectedScheduleIndex( + liveCareScheduleClinicsListResponse + .clinicsHaveScheduleList[index]); + }, + child: ScheduleClinicCard( + isSelected: selectedClinicID == + liveCareScheduleClinicsListResponse + .clinicsHaveScheduleList[index] + .serviceID + ? true + : false, + clinicsHaveScheduleList: + liveCareScheduleClinicsListResponse + .clinicsHaveScheduleList[index], + languageID: languageID, + ), + ); + }, + ), + Container( + height: 10.0, + ), + ], + ), + ) + : Container(), + isDataLoaded + ? Align( + alignment: FractionalOffset.bottomCenter, + child: Container( + width: MediaQuery.of(context).size.width, + height: 50.0, + margin: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + minWidth: MediaQuery.of(context).size.width * 0.7, + height: 45.0, + child: RaisedButton( + color: new Color(0xFF60686b), + textColor: Colors.white, + disabledTextColor: Colors.white, + disabledColor: new Color(0xFFbcc2c4), + onPressed: startScheduleLiveCare, + child: Text("Start", style: TextStyle(fontSize: 18.0)), + ), + ), + ), + ) + : Container(), + ], + ); + } + + Widget getLiveCareImmediateClinicList() { + return Column( + children: [ + isDataLoaded + ? Container( + height: MediaQuery.of(context).size.height * 0.7, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.all(15.0), + child: Text("Online Clinics: ", + style: TextStyle( + fontSize: 20.0, fontWeight: FontWeight.bold)), + ), + ListView.builder( + scrollDirection: Axis.vertical, + shrinkWrap: true, + physics: ScrollPhysics(), + padding: EdgeInsets.all(0.0), + itemCount: liveCareClinicsListResponse + .patientERGetClinicsList.length, + itemBuilder: (context, index) { + return InkWell( + onTap: () { + updateSelectedIndex(liveCareClinicsListResponse + .patientERGetClinicsList[index]); + }, + child: ClinicCard( + isSelected: selectedClinicID == + liveCareClinicsListResponse + .patientERGetClinicsList[index] + .serviceID + ? true + : false, + patientERGetClinicsList: liveCareClinicsListResponse + .patientERGetClinicsList[index], + languageID: languageID, + ), + ); + }, + ), + Container( + height: 10.0, + ), + ], + ), + ) + : Container(), + isDataLoaded + ? Align( + alignment: FractionalOffset.bottomCenter, + child: Container( + width: MediaQuery.of(context).size.width, + height: 50.0, + margin: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + minWidth: MediaQuery.of(context).size.width * 0.7, + height: 45.0, + child: RaisedButton( + color: new Color(0xFF60686b), + textColor: Colors.white, + disabledTextColor: Colors.white, + disabledColor: new Color(0xFFbcc2c4), + onPressed: startLiveCare, + child: Text("Start", style: TextStyle(fontSize: 18.0)), + ), + ), + ), + ) + : Container(), + ], + ); + } + + void startScheduleLiveCare() { + List doctorsList = []; + LiveCareService service = new LiveCareService(); + List _patientDoctorAppointmentListHospital = + List(); + service + .getLiveCareScheduledDoctorList(context, selectedClinicID) + .then((res) { + print(res['DoctorByClinicIDList']); + print(res['DoctorByClinicIDList'].length); + if (res['MessageStatus'] == 1) { + setState(() { + if (res['DoctorByClinicIDList'].length != 0) { + res['DoctorByClinicIDList'].forEach((v) { + doctorsList.add(new DoctorList.fromJson(v)); + }); + + doctorsList.forEach((element) { + List doctorByHospital = + _patientDoctorAppointmentListHospital + .where( + (elementClinic) => + elementClinic.filterName == element.projectName, + ) + .toList(); + + if (doctorByHospital.length != 0) { + _patientDoctorAppointmentListHospital[ + _patientDoctorAppointmentListHospital + .indexOf(doctorByHospital[0])] + .patientDoctorAppointmentList + .add(element); + } else { + _patientDoctorAppointmentListHospital.add( + PatientDoctorAppointmentList( + filterName: element.projectName, + distanceInKMs: + element.projectDistanceInKiloMeters.toString(), + patientDoctorAppointment: element)); + } + }); + } else {} + }); + this.sharedPref.setBool(IS_LIVECARE_APPOINTMENT, true); + navigateToSearchResults( + context, doctorsList, _patientDoctorAppointmentListHospital); + } else {} + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + } + + Future navigateToSearchResults( + context, + List docList, + List + patientDoctorAppointmentListHospital) async { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => SearchResults( + doctorsList: docList, + isLiveCareAppointment: true, + patientDoctorAppointmentListHospital: + patientDoctorAppointmentListHospital))); + } + updateSelectedIndex(PatientERGetClinicsList patientERGetClinicsList) { setState(() { selectedClinicID = patientERGetClinicsList.serviceID; selectedClinicName = patientERGetClinicsList.serviceName; }); } + + updateSelectedScheduleIndex(ClinicsHaveScheduleList patientERGetClinicsList) { + setState(() { + selectedClinicID = patientERGetClinicsList.serviceID; + selectedClinicName = patientERGetClinicsList.clinicDesc; + }); + } } diff --git a/lib/services/appointment_services/GetDoctorsList.dart b/lib/services/appointment_services/GetDoctorsList.dart index c992e8e9..8d5b62f6 100644 --- a/lib/services/appointment_services/GetDoctorsList.dart +++ b/lib/services/appointment_services/GetDoctorsList.dart @@ -205,6 +205,42 @@ class DoctorsListService extends BaseService { return Future.value(localRes); } + Future getDoctorScheduledFreeSlots( + int docID, int clinicID, int projectID, int serviceID, BuildContext context) async { + Map request; + var languageID = await sharedPref.getString(APP_LANGUAGE); + Request req = appGlobal.getPublicRequest(); + request = { + "DoctorID": docID, + "IsBookingForLiveCare": 1, + "ClinicID": clinicID, + "ProjectID": projectID, + "OriginalClinicID": clinicID, + "ServiceID": serviceID, + "days": 50, + "isReschadual": false, + "VersionID": req.VersionID, + "Channel": 3, + "LanguageID": languageID == 'ar' ? 1 : 2, + "IPAdress": "10.20.10.20", + "generalid": "Cs2020@2016\$2958", + "PatientOutSA": 0, + "SessionID": null, + "isDentalAllowedBackend": false, + "DeviceTypeID": 1 + }; + + dynamic localRes; + + await baseAppClient.post(GET_LIVECARE_SCHEDULE_DOCTOR_TIME_SLOTS, + onSuccess: (response, statusCode) async { + localRes = response; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: request); + return Future.value(localRes); + } + Future insertAppointment(int docID, int clinicID, int projectID, String selectedTime, String selectedDate, BuildContext context) async { Map request; @@ -258,6 +294,60 @@ class DoctorsListService extends BaseService { return Future.value(localRes); } + Future insertLiveCareScheduleAppointment(int docID, int clinicID, int projectID, int serviceID, + String selectedTime, String selectedDate, BuildContext context) async { + Map request; + + if (await this.sharedPref.getObject(USER_PROFILE) != null) { + var data = AuthenticatedUser.fromJson( + await this.sharedPref.getObject(USER_PROFILE)); + authUser = data; + } + + var languageID = await sharedPref.getString(APP_LANGUAGE); + Request req = appGlobal.getPublicRequest(); + request = { + "IsForLiveCare": true, + "ProjectID": projectID, + "ClinicID": clinicID, + "DoctorID": docID, + "ServiceID": serviceID, + "StartTime": selectedTime, + "SelectedTime": selectedTime, + "EndTime": selectedTime, + "InitialSlotDuration": 0, + "StrAppointmentDate": selectedDate, + "IsVirtual": false, + "DeviceType": Platform.isIOS ? 'iOS' : 'Android', + "BookedBy": 102, + "VisitType": 1, + "VisitFor": 1, + "VersionID": req.VersionID, + "Channel": req.Channel, + "LanguageID": languageID == 'ar' ? 1 : 2, + "IPAdress": req.IPAdress, + "generalid": req.generalid, + "PatientOutSA": authUser.outSA, + "SessionID": "YckwoXhUmWBsnHKEKig", + "isDentalAllowedBackend": false, + "DeviceTypeID": req.DeviceTypeID, + "PatientID": authUser.patientID, + "TokenID": "@dm!n", + "PatientTypeID": authUser.patientType, + "PatientType": authUser.patientType + }; + + dynamic localRes; + + await baseAppClient.post(INSERT_LIVECARE_SCHEDULE_APPOINTMENT, + onSuccess: (response, statusCode) async { + localRes = response; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: request); + return Future.value(localRes); + } + Future getPatientShare( String appoID, int clinicID, int projectID, BuildContext context) async { Map request; @@ -302,6 +392,51 @@ class DoctorsListService extends BaseService { return Future.value(localRes); } + Future getLiveCareAppointmentPatientShare( + String appoID, int clinicID, int projectID, BuildContext context) async { + Map request; + + if (await this.sharedPref.getObject(USER_PROFILE) != null) { + var data = AuthenticatedUser.fromJson( + await this.sharedPref.getObject(USER_PROFILE)); + authUser = data; + } + + var languageID = await sharedPref.getString(APP_LANGUAGE); + Request req = appGlobal.getPublicRequest(); + + request = { + "ProjectID": projectID, + "ClinicID": clinicID, + "AppointmentNo": appoID, + "IsActiveAppointment": true, + "IsForLiveCare": true, + "VersionID": req.VersionID, + "Channel": req.Channel, + "LanguageID": languageID == 'ar' ? 1 : 2, + "IPAdress": req.IPAdress, + "generalid": req.generalid, + "PatientOutSA": authUser.outSA, + "SessionID": "YckwoXhUmWBsnHKEKig", + "isDentalAllowedBackend": false, + "DeviceTypeID": req.DeviceTypeID, + "PatientID": authUser.patientID, + "TokenID": "@dm!n", + "PatientTypeID": authUser.patientType, + "PatientType": authUser.patientType + }; + + dynamic localRes; + + await baseAppClient.post(GET_PATIENT_SHARE_LIVECARE, + onSuccess: (response, statusCode) async { + localRes = response['OnlineCheckInAppointments'][0]; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: request); + return Future.value(localRes); + } + Future getPatientAppointmentHistory( bool isActiveAppointment, BuildContext context) async { Map request; diff --git a/lib/services/livecare_services/livecare_provider.dart b/lib/services/livecare_services/livecare_provider.dart index f76e0336..65cf6daf 100644 --- a/lib/services/livecare_services/livecare_provider.dart +++ b/lib/services/livecare_services/livecare_provider.dart @@ -53,6 +53,81 @@ class LiveCareService extends BaseService { return Future.value(localRes); } + Future getLiveCareScheduledClinics(BuildContext context) async { + Map request; + + if (await this.sharedPref.getObject(USER_PROFILE) != null) { + var data = AuthenticatedUser.fromJson( + await this.sharedPref.getObject(USER_PROFILE)); + authUser = data; + } + + var languageID = await sharedPref.getString(APP_LANGUAGE); + Request req = appGlobal.getPublicRequest(); + request = { + "LanguageID": languageID == 'ar' ? 1 : 2, + "IPAdress": "10.20.10.20", + "VersionID": req.VersionID, + "Channel": req.Channel, + "generalid": 'Cs2020@2016\$2958', + "PatientOutSA": 0, + "TokenID": "", + "DeviceTypeID": req.DeviceTypeID, + "SessionID": "YckwoXhUmWBsnHKEKig", + "Age": authUser.age != null ? authUser.age : 0, + "PatientID": authUser.patientID != null ? authUser.patientID : 0, + "Gender": authUser.gender != null ? authUser.gender : 0 + }; + + dynamic localRes; + + await baseAppClient.post(GET_LIVECARE_SCHEDULE_CLINICS, + onSuccess: (response, statusCode) async { + localRes = response; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: request); + return Future.value(localRes); + } + + Future getLiveCareScheduledDoctorList(BuildContext context, int serviceID) async { + Map request; + + if (await this.sharedPref.getObject(USER_PROFILE) != null) { + var data = AuthenticatedUser.fromJson( + await this.sharedPref.getObject(USER_PROFILE)); + authUser = data; + } + + var languageID = await sharedPref.getString(APP_LANGUAGE); + Request req = appGlobal.getPublicRequest(); + request = { + "LanguageID": languageID == 'ar' ? 1 : 2, + "IPAdress": "10.20.10.20", + "VersionID": req.VersionID, + "Channel": req.Channel, + "generalid": 'Cs2020@2016\$2958', + "PatientOutSA": 0, + "TokenID": "", + "DeviceTypeID": req.DeviceTypeID, + "ServiceID": serviceID, + "SessionID": "YckwoXhUmWBsnHKEKig", + "Age": authUser.age != null ? authUser.age : 0, + "PatientID": authUser.patientID != null ? authUser.patientID : 0, + "Gender": authUser.gender != null ? authUser.gender : 0 + }; + + dynamic localRes; + + await baseAppClient.post(GET_LIVECARE_SCHEDULE_CLINIC_DOCTOR_LIST, + onSuccess: (response, statusCode) async { + localRes = response; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: request); + return Future.value(localRes); + } + Future getLivecareHistory(BuildContext context) async { Map request; diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index ba89fc2c..272d983f 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -95,6 +95,8 @@ class TranslationBase { String get confirm => localizedValues['confirm'][locale.languageCode]; + String get confirmLiveCare => localizedValues['confirmLiveCare'][locale.languageCode]; + String get confirmLater => localizedValues['confirmLater'][locale.languageCode]; From 7fdc0da9dc08997edd45e1fb12f6c8524f5f0dc2 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 30 Sep 2020 15:33:14 +0300 Subject: [PATCH 03/14] livecare scheduling implemented --- lib/config/config.dart | 22 +- lib/config/localized_values.dart | 2 + .../AppoimentAllHistoryResultList.dart | 141 +++--- .../InsertAppointmentRequest.dart | 1 - .../Appointments/PatientShareResposne.dart | 102 ++-- lib/models/LiveCare/insertVIDARequest.dart | 92 ++++ lib/models/Request.dart | 1 + lib/pages/BookAppointment/BookConfirm.dart | 5 + lib/pages/BookAppointment/BookSuccess.dart | 40 +- .../widgets/AppointmentActions.dart | 36 +- .../widgets/AppointmentCardView.dart | 2 +- lib/pages/ToDoList/ToDo.dart | 464 ++++++++++-------- lib/pages/ToDoList/widgets/upcomingCard.dart | 30 +- lib/pages/landing/home_page.dart | 122 ++++- lib/pages/livecare/livecare_type_select.dart | 13 +- .../appointment_services/GetDoctorsList.dart | 72 ++- lib/uitl/translations_delegate_base.dart | 5 + 17 files changed, 775 insertions(+), 375 deletions(-) create mode 100644 lib/models/LiveCare/insertVIDARequest.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index 90c37129..5cad4efd 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -5,7 +5,7 @@ import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; const MAX_SMALL_SCREEN = 660; -const BASE_URL = 'https://hmgwebservices.com/'; +const BASE_URL = 'https://uat.hmgwebservices.com/'; const GET_PROJECT = 'Services/Lists.svc/REST/GetProject'; @@ -121,6 +121,9 @@ const GET_PATIENT_APPOINTMENT_CURFEW_HISTORY = const CONFIRM_APPOINTMENT = "Services/MobileNotifications.svc/REST/ConfirmAppointment"; +const INSERT_VIDA_REQUEST = + "Services/ER_VirtualCall.svc/REST/PatientER_VidaRequestInseart"; + //URL to cancel appointment const CANCEL_APPOINTMENT = "Services/Doctors.svc/REST/CancelAppointment"; @@ -150,6 +153,22 @@ const SEND_CALL_REQUEST = 'Services/Doctors.svc/REST/InsertCallInfo'; const GET_LIVECARE_CLINICS = 'Services/ER_VirtualCall.svc/REST/PatientER_GetClinics'; + +const GET_LIVECARE_SCHEDULE_CLINICS = + 'Services/Doctors.svc/REST/PatientER_GetClinicsHaveSchedule'; + +const GET_LIVECARE_SCHEDULE_CLINIC_DOCTOR_LIST = + 'Services/Doctors.svc/REST/PatientER_GetDoctorByClinicID'; + +const GET_LIVECARE_SCHEDULE_DOCTOR_TIME_SLOTS = + 'Services/Doctors.svc/REST/PatientER_GetDoctorFreeSlots'; + +const INSERT_LIVECARE_SCHEDULE_APPOINTMENT = + 'Services/Doctors.svc/REST/InsertSpecificAppoitmentForSchedule'; + +const GET_PATIENT_SHARE_LIVECARE = + "Services/Doctors.svc/REST/GetCheckinScreenAppointmentDetailsByAppointmentNOForLiveCare"; + const GET_LIVECARE_CLINIC_TIMING = 'Services/ER_VirtualCall.svc/REST/PatientER_GetClinicsServiceTimingsSchedule'; @@ -232,6 +251,7 @@ class AppGlobal { request.TokenID = "@dm!n"; request.isDentalAllowedBackend = false; request.DeviceTypeID = Platform.isIOS ? 1 : 2; + request.DeviceType = Platform.isIOS ? "iOS" : "Android"; return request; } diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 6053dd4a..1472ffe2 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -48,6 +48,7 @@ const Map> localizedValues = { 'confirmAppo': {'en': 'Confirm Appointment', 'ar': 'تأكيد الموعد'}, 'confirm': {'en': 'Confirm', 'ar': 'تأكيد'}, 'confirmLiveCare': {'en': 'Confirm LiveCare', 'ar': 'تأكيد لايف كير'}, + 'waitingForDoctor': {'en': 'Waiting for doctor', 'ar': 'في انتظار الطبيب'}, 'appointment': {'en': 'Appointment', 'ar': 'الموعد'}, 'confirmLater': {'en': 'Confirm Later', 'ar': 'تأكيد لاحقا'}, 'todoList': {'en': 'Todo List', 'ar': 'مهامي'}, @@ -59,6 +60,7 @@ const Map> localizedValues = { 'viewQR': {'en': 'View QR Code', 'ar': 'عرض رمز الاستجابة السريعة'}, 'instruction': {'en': 'Instructions', 'ar': 'تعليمات'}, 'livecare': {'en': 'LiveCare', 'ar': 'لايف كير'}, + 'livecareAppo': {'en': 'LiveCare Appointment', 'ar': 'الموعد لايف كير'}, 'cancelAppoMsg': { 'en': 'Are you sure you want to cancel this appointment?', 'ar': 'هل أنت متأكد أنك تريد إلغاء هذا الموعد؟' diff --git a/lib/models/Appointments/AppoimentAllHistoryResultList.dart b/lib/models/Appointments/AppoimentAllHistoryResultList.dart index 9ba1fb8e..20eace25 100644 --- a/lib/models/Appointments/AppoimentAllHistoryResultList.dart +++ b/lib/models/Appointments/AppoimentAllHistoryResultList.dart @@ -64,73 +64,75 @@ class AppoitmentAllHistoryResultList { String qR; int remaniningHoursTocanPay; bool sMSButtonVisable; + int serviceID; AppoitmentAllHistoryResultList( {this.setupID, - this.projectID, - this.appointmentNo, - this.appointmentDate, - this.appointmentDateN, - this.appointmentType, - this.bookDate, - this.patientType, - this.patientID, - this.clinicID, - this.doctorID, - this.endDate, - this.startTime, - this.endTime, - this.status, - this.visitType, - this.visitFor, - this.patientStatusType, - this.companyID, - this.bookedBy, - this.bookedOn, - this.confirmedBy, - this.confirmedOn, - this.arrivalChangedBy, - this.arrivedOn, - this.editedBy, - this.editedOn, - this.doctorName, - this.doctorNameN, - this.statusDesc, - this.statusDescN, - this.vitalStatus, - this.vitalSignAppointmentNo, - this.episodeID, - this.actualDoctorRate, - this.clinicName, - this.complainExists, - this.doctorImageURL, - this.doctorNameObj, - this.doctorRate, - this.doctorSpeciality, - this.doctorTitle, - this.gender, - this.genderDescription, - this.iSAllowOnlineCheckedIN, - this.isActiveDoctor, - this.isActiveDoctorProfile, - this.isDoctorAllowVedioCall, - this.isExecludeDoctor, - this.isFollowup, - this.isLiveCareAppointment, - this.isMedicalReportRequested, - this.isOnlineCheckedIN, - this.latitude, - this.listHISGetContactLensPerscription, - this.listHISGetGlassPerscription, - this.longitude, - this.nextAction, - this.noOfPatientsRate, - this.originalClinicID, - this.originalProjectID, - this.projectName, - this.qR, - this.remaniningHoursTocanPay, - this.sMSButtonVisable}); + this.projectID, + this.appointmentNo, + this.appointmentDate, + this.appointmentDateN, + this.appointmentType, + this.bookDate, + this.patientType, + this.patientID, + this.clinicID, + this.doctorID, + this.endDate, + this.startTime, + this.endTime, + this.status, + this.visitType, + this.visitFor, + this.patientStatusType, + this.companyID, + this.bookedBy, + this.bookedOn, + this.confirmedBy, + this.confirmedOn, + this.arrivalChangedBy, + this.arrivedOn, + this.editedBy, + this.editedOn, + this.doctorName, + this.doctorNameN, + this.statusDesc, + this.statusDescN, + this.vitalStatus, + this.vitalSignAppointmentNo, + this.episodeID, + this.actualDoctorRate, + this.clinicName, + this.complainExists, + this.doctorImageURL, + this.doctorNameObj, + this.doctorRate, + this.doctorSpeciality, + this.doctorTitle, + this.gender, + this.genderDescription, + this.iSAllowOnlineCheckedIN, + this.isActiveDoctor, + this.isActiveDoctorProfile, + this.isDoctorAllowVedioCall, + this.isExecludeDoctor, + this.isFollowup, + this.isLiveCareAppointment, + this.isMedicalReportRequested, + this.isOnlineCheckedIN, + this.latitude, + this.listHISGetContactLensPerscription, + this.listHISGetGlassPerscription, + this.longitude, + this.nextAction, + this.noOfPatientsRate, + this.originalClinicID, + this.originalProjectID, + this.projectName, + this.qR, + this.remaniningHoursTocanPay, + this.sMSButtonVisable, + this.serviceID}); AppoitmentAllHistoryResultList.fromJson(Map json) { setupID = json['SetupID']; @@ -173,7 +175,9 @@ class AppoitmentAllHistoryResultList { doctorImageURL = json['DoctorImageURL']; doctorNameObj = json['DoctorNameObj']; doctorRate = json['DoctorRate']; - doctorSpeciality = json['DoctorSpeciality'] != null ?json['DoctorSpeciality'].cast() : ["null"]; + doctorSpeciality = json['DoctorSpeciality'] != null + ? json['DoctorSpeciality'].cast() + : ["null"]; doctorTitle = json['DoctorTitle']; gender = json['Gender']; genderDescription = json['GenderDescription']; @@ -188,7 +192,7 @@ class AppoitmentAllHistoryResultList { isOnlineCheckedIN = json['IsOnlineCheckedIN']; latitude = json['Latitude']; listHISGetContactLensPerscription = - json['List_HIS_GetContactLensPerscription']; + json['List_HIS_GetContactLensPerscription']; listHISGetGlassPerscription = json['List_HIS_GetGlassPerscription']; longitude = json['Longitude']; nextAction = json['NextAction']; @@ -199,6 +203,7 @@ class AppoitmentAllHistoryResultList { qR = json['QR']; remaniningHoursTocanPay = json['RemaniningHoursTocanPay']; sMSButtonVisable = json['SMSButtonVisable']; + serviceID = json['ServiceID']; } Map toJson() { @@ -269,6 +274,7 @@ class AppoitmentAllHistoryResultList { data['QR'] = this.qR; data['RemaniningHoursTocanPay'] = this.remaniningHoursTocanPay; data['SMSButtonVisable'] = this.sMSButtonVisable; + data['ServiceID'] = this.serviceID; return data; } } @@ -278,7 +284,8 @@ class PatientAppointmentList { List patientDoctorAppointmentList = List(); PatientAppointmentList( - {this.filterName, AppoitmentAllHistoryResultList patientDoctorAppointment}) { + {this.filterName, + AppoitmentAllHistoryResultList patientDoctorAppointment}) { patientDoctorAppointmentList.add(patientDoctorAppointment); } } diff --git a/lib/models/Appointments/InsertAppointmentRequest.dart b/lib/models/Appointments/InsertAppointmentRequest.dart index badbb6a7..383e2eb5 100644 --- a/lib/models/Appointments/InsertAppointmentRequest.dart +++ b/lib/models/Appointments/InsertAppointmentRequest.dart @@ -13,7 +13,6 @@ class InsertAppointmentRequest extends Request { bool IsVirtual; List GeneralProcedureList; String DeviceToken; - String DeviceType; bool IsForLiveCare; String OriginalClinicID; String OriginalProjectID; diff --git a/lib/models/Appointments/PatientShareResposne.dart b/lib/models/Appointments/PatientShareResposne.dart index e3a596d6..2e22ed60 100644 --- a/lib/models/Appointments/PatientShareResposne.dart +++ b/lib/models/Appointments/PatientShareResposne.dart @@ -12,6 +12,7 @@ class PatientShareResponse { int companyShareWithTax; String doctorImageURL; String doctorNameObj; + int doctorID; List doctorSpeciality; dynamic errCode; int groupID; @@ -47,56 +48,59 @@ class PatientShareResponse { dynamic statusDesc; dynamic subPolicyNo; int userID; + int serviceID; PatientShareResponse( {this.advanceNumber, - this.appointmentDate, - this.appointmentNo, - this.cashPrice, - this.cashPriceTax, - this.cashPriceWithTax, - this.clinicID, - this.clinicName, - this.companyId, - this.companyName, - this.companyShareWithTax, - this.doctorImageURL, - this.doctorNameObj, - this.doctorSpeciality, - this.errCode, - this.groupID, - this.iSAllowOnlineCheckedIN, - this.insurancePolicyNo, - this.isExcludedForOnlineCheckin, - this.isFollowup, - this.isLiveCareAppointment, - this.isOnlineCheckedIN, - this.message, - this.nextAction, - this.patientCardID, - this.patientID, - this.patientShare, - this.patientShareWithTax, - this.patientStatusType, - this.patientTaxAmount, - this.patientType, - this.paymentAmount, - this.paymentDate, - this.paymentMethodName, - this.paymentReferenceNumber, - this.policyId, - this.policyName, - this.procedureName, - this.projectID, - this.projectName, - this.setupID, - this.sourceType, - this.startTime, - this.status, - this.statusCode, - this.statusDesc, - this.subPolicyNo, - this.userID}); + this.appointmentDate, + this.appointmentNo, + this.cashPrice, + this.cashPriceTax, + this.cashPriceWithTax, + this.clinicID, + this.clinicName, + this.companyId, + this.companyName, + this.companyShareWithTax, + this.doctorID, + this.doctorImageURL, + this.doctorNameObj, + this.doctorSpeciality, + this.errCode, + this.groupID, + this.iSAllowOnlineCheckedIN, + this.insurancePolicyNo, + this.isExcludedForOnlineCheckin, + this.isFollowup, + this.isLiveCareAppointment, + this.isOnlineCheckedIN, + this.message, + this.nextAction, + this.patientCardID, + this.patientID, + this.patientShare, + this.patientShareWithTax, + this.patientStatusType, + this.patientTaxAmount, + this.patientType, + this.paymentAmount, + this.paymentDate, + this.paymentMethodName, + this.paymentReferenceNumber, + this.policyId, + this.policyName, + this.procedureName, + this.projectID, + this.projectName, + this.setupID, + this.sourceType, + this.startTime, + this.status, + this.statusCode, + this.statusDesc, + this.subPolicyNo, + this.userID, + this.serviceID}); PatientShareResponse.fromJson(Map json) { advanceNumber = json['AdvanceNumber']; @@ -110,6 +114,7 @@ class PatientShareResponse { companyId = json['CompanyId']; companyName = json['CompanyName']; companyShareWithTax = json['CompanyShareWithTax']; + doctorID = json['DoctorID']; doctorImageURL = json['DoctorImageURL']; doctorNameObj = json['DoctorNameObj']; doctorSpeciality = json['DoctorSpeciality'].cast(); @@ -147,6 +152,7 @@ class PatientShareResponse { statusDesc = json['StatusDesc']; subPolicyNo = json['SubPolicyNo']; userID = json['UserID']; + serviceID = json['ServiceID']; } Map toJson() { @@ -162,6 +168,7 @@ class PatientShareResponse { data['CompanyId'] = this.companyId; data['CompanyName'] = this.companyName; data['CompanyShareWithTax'] = this.companyShareWithTax; + data['DoctorID'] = this.doctorID; data['DoctorImageURL'] = this.doctorImageURL; data['DoctorNameObj'] = this.doctorNameObj; data['DoctorSpeciality'] = this.doctorSpeciality; @@ -199,6 +206,7 @@ class PatientShareResponse { data['StatusDesc'] = this.statusDesc; data['SubPolicyNo'] = this.subPolicyNo; data['UserID'] = this.userID; + data['ServiceID'] = this.serviceID; return data; } } diff --git a/lib/models/LiveCare/insertVIDARequest.dart b/lib/models/LiveCare/insertVIDARequest.dart new file mode 100644 index 00000000..938ca102 --- /dev/null +++ b/lib/models/LiveCare/insertVIDARequest.dart @@ -0,0 +1,92 @@ +class insertVIDARequest { + int patientID; + int acceptedBy; + int appointmentNo; + String deviceToken; + double latitude; + double longitude; + int serviceID; + int projectID; + int clinicID; + String deviceType; + String voipToken; + double versionID; + int channel; + int languageID; + String iPAdress; + String generalid; + int patientOutSA; + String sessionID; + bool isDentalAllowedBackend; + int deviceTypeID; + + insertVIDARequest( + {this.patientID, + this.acceptedBy, + this.appointmentNo, + this.deviceToken, + this.latitude, + this.longitude, + this.serviceID, + this.projectID, + this.clinicID, + this.deviceType, + this.voipToken, + this.versionID, + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID}); + + insertVIDARequest.fromJson(Map json) { + patientID = json['PatientID']; + acceptedBy = json['AcceptedBy']; + appointmentNo = json['AppointmentNo']; + deviceToken = json['DeviceToken']; + latitude = json['Latitude']; + longitude = json['Longitude']; + serviceID = json['ServiceID']; + projectID = json['ProjectID']; + clinicID = json['ClinicID']; + deviceType = json['DeviceType']; + voipToken = json['VoipToken']; + versionID = json['VersionID']; + channel = json['Channel']; + languageID = json['LanguageID']; + iPAdress = json['IPAdress']; + generalid = json['generalid']; + patientOutSA = json['PatientOutSA']; + sessionID = json['SessionID']; + isDentalAllowedBackend = json['isDentalAllowedBackend']; + deviceTypeID = json['DeviceTypeID']; + } + + Map toJson() { + final Map data = new Map(); + data['PatientID'] = this.patientID; + data['AcceptedBy'] = this.acceptedBy; + data['AppointmentNo'] = this.appointmentNo; + data['DeviceToken'] = this.deviceToken; + data['Latitude'] = this.latitude; + data['Longitude'] = this.longitude; + data['ServiceID'] = this.serviceID; + data['ProjectID'] = this.projectID; + data['ClinicID'] = this.clinicID; + data['DeviceType'] = this.deviceType; + data['VoipToken'] = this.voipToken; + data['VersionID'] = this.versionID; + data['Channel'] = this.channel; + data['LanguageID'] = this.languageID; + data['IPAdress'] = this.iPAdress; + data['generalid'] = this.generalid; + data['PatientOutSA'] = this.patientOutSA; + data['SessionID'] = this.sessionID; + data['isDentalAllowedBackend'] = this.isDentalAllowedBackend; + data['DeviceTypeID'] = this.deviceTypeID; + return data; + } +} diff --git a/lib/models/Request.dart b/lib/models/Request.dart index 03aa7760..a4cef77b 100644 --- a/lib/models/Request.dart +++ b/lib/models/Request.dart @@ -5,6 +5,7 @@ class Request { var ProjectID; var LanguageID; var DeviceTypeID; + var DeviceType; var AppointmentNo; var IPAdress; var VersionID; diff --git a/lib/pages/BookAppointment/BookConfirm.dart b/lib/pages/BookAppointment/BookConfirm.dart index 8647b2f0..b0110d2b 100644 --- a/lib/pages/BookAppointment/BookConfirm.dart +++ b/lib/pages/BookAppointment/BookConfirm.dart @@ -210,11 +210,13 @@ class _BookConfirmState extends State { "assets/images/new-design/icon_hospital.png"), ), Container( + width: MediaQuery.of(context).size.width * 0.7, margin: EdgeInsets.fromLTRB(20.0, 5.0, 10.0, 5.0), child: Text( TranslationBase.of(context).clinic + ": " + widget.doctor.clinicName, + overflow: TextOverflow.clip, style: TextStyle( fontSize: 14.0, color: Colors.grey[700], @@ -340,6 +342,9 @@ class _BookConfirmState extends State { ), ), ), + SizedBox( + height: 120.0, + ), ], ), ), diff --git a/lib/pages/BookAppointment/BookSuccess.dart b/lib/pages/BookAppointment/BookSuccess.dart index 2f7bde88..704618ac 100644 --- a/lib/pages/BookAppointment/BookSuccess.dart +++ b/lib/pages/BookAppointment/BookSuccess.dart @@ -287,10 +287,15 @@ class _BookSuccessState extends State { disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { - AppoitmentAllHistoryResultList appo = new AppoitmentAllHistoryResultList(); + AppoitmentAllHistoryResultList appo = + new AppoitmentAllHistoryResultList(); appo.clinicID = widget.docObject.clinicID; appo.projectID = widget.docObject.projectID; - appo.appointmentNo = widget.patientShareResponse.appointmentNo; + appo.appointmentNo = + widget.patientShareResponse.appointmentNo; + appo.serviceID = widget.patientShareResponse.serviceID; + appo.isLiveCareAppointment = widget.patientShareResponse.isLiveCareAppointment; + appo.doctorID = widget.patientShareResponse.doctorID; confirmAppointment(appo); }, child: Text( @@ -336,7 +341,33 @@ class _BookSuccessState extends State { DoctorsListService service = new DoctorsListService(); service .confirmAppointment( - appo.appointmentNo, appo.clinicID, appo.projectID, context) + appo.appointmentNo, appo.clinicID, appo.projectID, appo.isLiveCareAppointment, context) + .then((res) { + if (res['MessageStatus'] == 1) { + AppToast.showSuccessToast(message: res['ErrorEndUserMessage']); + } else { + AppToast.showErrorToast(message: res['ErrorEndUserMessage']); + } + }) + .catchError((err) { + print(err); + }) + .showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)) + .then((value) { + if (appo.isLiveCareAppointment) { + insertLiveCareVIDARequest(appo); + } else { + navigateToHome(context); + } + }); + } + + insertLiveCareVIDARequest(AppoitmentAllHistoryResultList appo) { + DoctorsListService service = new DoctorsListService(); + service + .insertVIDARequest(appo.appointmentNo, appo.clinicID, appo.projectID, + appo.serviceID, appo.doctorID, context) .then((res) { if (res['MessageStatus'] == 1) { AppToast.showSuccessToast(message: res['ErrorEndUserMessage']); @@ -346,7 +377,8 @@ class _BookSuccessState extends State { } }).catchError((err) { print(err); - }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } Widget _getPayNowAppo() { diff --git a/lib/pages/MyAppointments/widgets/AppointmentActions.dart b/lib/pages/MyAppointments/widgets/AppointmentActions.dart index b0330282..18740ce7 100644 --- a/lib/pages/MyAppointments/widgets/AppointmentActions.dart +++ b/lib/pages/MyAppointments/widgets/AppointmentActions.dart @@ -352,19 +352,24 @@ class _AppointmentActionsState extends State { cancelAppointment() { ConfirmDialog.closeAlertDialog(context); DoctorsListService service = new DoctorsListService(); - service.cancelAppointment(widget.appo, context).then((res) { - print(res); - if (res['MessageStatus'] == 1) { - AppToast.showSuccessToast(message: res['ErrorEndUserMessage']); - } else { - AppToast.showErrorToast(message: res['ErrorEndUserMessage']); - } - }).catchError((err) { - print(err); - }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)).then((value) { - Navigator.of(context).pop(); - }); + service + .cancelAppointment(widget.appo, context) + .then((res) { + print(res); + if (res['MessageStatus'] == 1) { + AppToast.showSuccessToast(message: res['ErrorEndUserMessage']); + } else { + AppToast.showErrorToast(message: res['ErrorEndUserMessage']); + } + }) + .catchError((err) { + print(err); + }) + .showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)) + .then((value) { + Navigator.of(context).pop(); + }); } openAppointmentRadiology() { @@ -469,8 +474,7 @@ class _AppointmentActionsState extends State { } }).catchError((err) { print(err); - AppToast.showErrorToast( - message: err); + AppToast.showErrorToast(message: err); }).showProgressBar( text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } @@ -541,7 +545,7 @@ class _AppointmentActionsState extends State { DoctorsListService service = new DoctorsListService(); service .confirmAppointment(widget.appo.appointmentNo, widget.appo.clinicID, - widget.appo.projectID, context) + widget.appo.projectID, widget.appo.isLiveCareAppointment, context) .then((res) { if (res['MessageStatus'] == 1) { AppToast.showSuccessToast(message: res['ErrorEndUserMessage']); diff --git a/lib/pages/MyAppointments/widgets/AppointmentCardView.dart b/lib/pages/MyAppointments/widgets/AppointmentCardView.dart index b64bd232..2e5c88b0 100644 --- a/lib/pages/MyAppointments/widgets/AppointmentCardView.dart +++ b/lib/pages/MyAppointments/widgets/AppointmentCardView.dart @@ -24,7 +24,7 @@ class _ApointmentCardState extends State { navigateToAppointmentDetails(context, widget.appo); }, child: Card( - margin: EdgeInsets.fromLTRB(20.0, 16.0, 20.0, 8.0), + margin: EdgeInsets.fromLTRB(10.0, 16.0, 10.0, 8.0), color: Colors.white, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), diff --git a/lib/pages/ToDoList/ToDo.dart b/lib/pages/ToDoList/ToDo.dart index f83a62d5..796794b2 100644 --- a/lib/pages/ToDoList/ToDo.dart +++ b/lib/pages/ToDoList/ToDo.dart @@ -16,6 +16,7 @@ import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:rating_bar/rating_bar.dart'; import 'package:smart_progress_bar/smart_progress_bar.dart'; @@ -37,8 +38,6 @@ class _ToDoState extends State { @override void initState() { -// authUser = authProvider.getAuthenticatedUser(); - print("initState!!!!!"); widget.patientShareResponse = new PatientShareResponse(); WidgetsBinding.instance .addPostFrameCallback((_) => getPatientAppointmentHistory()); @@ -50,205 +49,230 @@ class _ToDoState extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).todoList, body: SingleChildScrollView( - child: Container( - child: ListView.builder( - scrollDirection: Axis.vertical, - shrinkWrap: true, - physics: ScrollPhysics(), - padding: EdgeInsets.all(0.0), - itemCount: widget.appoList.length, - itemBuilder: (context, index) { - return Container( - margin: EdgeInsets.all(10.0), - child: Card( - margin: EdgeInsets.fromLTRB(8.0, 0.0, 8.0, 8.0), - color: Colors.white, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(10), - ), - child: Container( - width: MediaQuery.of(context).size.width, - padding: EdgeInsets.all(10.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.max, - children: [ - Row( + child: Column( + children: [ + Container( + child: ListView.builder( + scrollDirection: Axis.vertical, + shrinkWrap: true, + physics: ScrollPhysics(), + padding: EdgeInsets.all(0.0), + itemCount: widget.appoList.length, + itemBuilder: (context, index) { + return Container( + margin: EdgeInsets.all(10.0), + child: Card( + margin: EdgeInsets.fromLTRB(8.0, 0.0, 8.0, 8.0), + color: Colors.white, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + ), + child: Container( + width: MediaQuery.of(context).size.width, + padding: EdgeInsets.all(10.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.max, children: [ - Image.asset( - "assets/images/new-design/time_icon.png", - width: 20.0, - height: 20.0), - Container( - margin: EdgeInsets.only(left: 10.0, right: 30.0), - child: Text( - getDate( - widget.appoList[index].appointmentDate), - style: TextStyle(fontSize: 12.0)), + Row( + children: [ + Image.asset( + "assets/images/new-design/time_icon.png", + width: 20.0, + height: 20.0), + Container( + margin: + EdgeInsets.only(left: 5.0, right: 25.0), + child: Text( + getDate(widget + .appoList[index].appointmentDate), + style: TextStyle(fontSize: 11.0)), + ), + widget.appoList[index].isLiveCareAppointment + ? SvgPicture.asset( + "assets/images/new-design/liveCare_logo_icon.svg", + width: 20.0, + height: 20.0) + : Image.asset( + "assets/images/new-design/hospital_address_icon.png", + width: 20.0, + height: 20.0), + Container( + margin: + EdgeInsets.only(left: 5.0, right: 5.0), + child: widget + .appoList[index].isLiveCareAppointment + ? Text( + TranslationBase.of(context) + .liveCareAppo, + style: TextStyle(fontSize: 12.0)) + : Text(widget.appoList[index].projectName != null ? widget.appoList[index].projectName : "-", + style: TextStyle(fontSize: 12.0)), + ), + ], ), - Image.asset( - "assets/images/new-design/hospital_address_icon.png", - width: 20.0, - height: 20.0), Container( - margin: EdgeInsets.only(left: 10.0, right: 10.0), - child: Text(widget.appoList[index].projectName, - style: TextStyle(fontSize: 12.0)), - ), - ], - ), - Container( - margin: EdgeInsets.only(top: 5.0), - child: Divider( - color: Colors.grey[500], - ), - ), - Flex( - direction: Axis.horizontal, - children: [ - Expanded( - flex: 1, - child: Container( - height: - MediaQuery.of(context).size.height * 0.1, - margin: EdgeInsets.only(top: 5.0), - child: ClipRRect( - borderRadius: BorderRadius.circular(100.0), - child: Image.network( - widget.appoList[index].doctorImageURL, - fit: BoxFit.fill), - ), + margin: EdgeInsets.only(top: 5.0), + child: Divider( + color: Colors.grey[500], ), ), - Expanded( - flex: 3, - child: Container( - margin: EdgeInsets.only( - top: 20.0, left: 20.0, right: 20.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - widget.appoList[index].doctorTitle + - " " + - widget - .appoList[index].doctorNameObj, - style: TextStyle( - fontSize: 14.0, - color: Colors.black, - fontWeight: FontWeight.bold, - letterSpacing: 1.0)), - Container( - margin: EdgeInsets.only( - top: 3.0, bottom: 3.0), - child: Text( - getDoctorSpeciality(widget - .appoList[index] - .doctorSpeciality) - .trim(), - style: TextStyle( - fontSize: 12.0, - color: Colors.grey[600], - letterSpacing: 1.0)), + Flex( + direction: Axis.horizontal, + children: [ + Expanded( + flex: 1, + child: Container( + height: MediaQuery.of(context).size.height * + 0.1, + margin: EdgeInsets.only(top: 5.0), + child: ClipRRect( + borderRadius: + BorderRadius.circular(100.0), + child: Image.network( + widget.appoList[index].doctorImageURL, + fit: BoxFit.fill), ), - Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - mainAxisSize: MainAxisSize.max, + ), + ), + Expanded( + flex: 3, + child: Container( + margin: EdgeInsets.only( + top: 20.0, left: 20.0, right: 20.0), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, children: [ - RatingBar.readOnly( - initialRating: widget - .appoList[index].actualDoctorRate - .toDouble(), - size: 20.0, - filledColor: Colors.yellow[700], - emptyColor: Colors.grey[500], - isHalfAllowed: true, - halfFilledIcon: Icons.star_half, - filledIcon: Icons.star, - emptyIcon: Icons.star, + Text( + widget.appoList[index].doctorTitle + + " " + + widget.appoList[index] + .doctorNameObj, + style: TextStyle( + fontSize: 14.0, + color: Colors.black, + fontWeight: FontWeight.bold, + letterSpacing: 1.0)), + Container( + margin: EdgeInsets.only( + top: 3.0, bottom: 3.0), + child: Text( + getDoctorSpeciality(widget + .appoList[index] + .doctorSpeciality) + .trim(), + style: TextStyle( + fontSize: 12.0, + color: Colors.grey[600], + letterSpacing: 1.0)), + ), + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + mainAxisSize: MainAxisSize.max, + children: [ + RatingBar.readOnly( + initialRating: widget + .appoList[index] + .actualDoctorRate + .toDouble(), + size: 20.0, + filledColor: Colors.yellow[700], + emptyColor: Colors.grey[500], + isHalfAllowed: true, + halfFilledIcon: Icons.star_half, + filledIcon: Icons.star, + emptyIcon: Icons.star, + ), + ], ), ], ), - ], + ), ), - ), + Expanded( + flex: 1, + child: InkWell( + onTap: () => performNextAction( + widget.appoList[index]), + child: Container( + margin: EdgeInsets.only(top: 20.0), + child: Column( + children: [ + Image.asset( + getNextActionImage(widget + .appoList[index].nextAction), + width: 50.0, + height: 50.0), + Container( + margin: EdgeInsets.only(top: 5.0), + child: Text( + getNextActionText(widget + .appoList[index] + .nextAction), + textAlign: TextAlign.center, + style: + TextStyle(fontSize: 12.0)), + ) + ], + ), + ), + ), + ) + ], + ), + Divider( + color: Colors.grey[500], ), - Expanded( - flex: 1, - child: InkWell( - onTap: () => - performNextAction(widget.appoList[index]), - child: Container( - margin: EdgeInsets.only(top: 20.0), - child: Column( - children: [ - Image.asset( - getNextActionImage(widget - .appoList[index].nextAction), - width: 50.0, - height: 50.0), - Container( - margin: EdgeInsets.only(top: 5.0), - child: Text( - getNextActionText(widget - .appoList[index].nextAction), - textAlign: TextAlign.center, - style: TextStyle(fontSize: 12.0)), - ) - ], + Flex( + direction: Axis.horizontal, + children: [ + Expanded( + flex: 2, + child: Container( + child: Text( + getNextActionDescription( + widget.appoList[index].nextAction), + style: TextStyle( + fontSize: 12.0, + color: Colors.grey[700])), ), ), - ), - ) - ], - ), - Divider( - color: Colors.grey[500], - ), - Flex( - direction: Axis.horizontal, - children: [ - Expanded( - flex: 2, - child: Container( - child: Text( - getNextActionDescription( - widget.appoList[index].nextAction), - style: TextStyle( - fontSize: 12.0, - color: Colors.grey[700])), - ), + Expanded( + flex: 1, + child: GestureDetector( + onTap: () { + navigateToAppointmentDetails( + context, widget.appoList[index]); + }, + child: Container( + child: Text( + TranslationBase.of(context) + .upcomingDetails, + textAlign: TextAlign.end, + style: TextStyle( + fontSize: 12.0, + color: Colors.red[600], + decoration: + TextDecoration.underline)), + ), + ), + ) + ], ), - Expanded( - flex: 1, - child: GestureDetector( - onTap: () { - navigateToAppointmentDetails( - context, widget.appoList[index]); - }, - child: Container( - child: Text( - TranslationBase.of(context) - .upcomingDetails, - textAlign: TextAlign.end, - style: TextStyle( - fontSize: 12.0, - color: Colors.red[600], - decoration: - TextDecoration.underline)), - ), - ), - ) ], ), - ], + ), ), - ), - ), - ); - }, - ), + ); + }, + ), + ), + SizedBox( + height: 120.0, + ), + ], ), ), ); @@ -287,6 +311,10 @@ class _ToDoState extends State { return "assets/images/new-design/confirm_button.png"; break; + case 60: + return "assets/images/new-design/waiting_for_doctor.png"; + break; + default: return ""; } @@ -306,6 +334,8 @@ class _ToDoState extends State { case 50: confirmAppointment(appo); break; + case 60: + break; } } @@ -338,6 +368,10 @@ class _ToDoState extends State { return TranslationBase.of(context).confirmLiveCare; break; + case 60: + return TranslationBase.of(context).waitingForDoctor; + break; + default: return ""; } @@ -372,6 +406,10 @@ class _ToDoState extends State { return TranslationBase.of(context).upcomingLivecare; break; + case 60: + return TranslationBase.of(context).waitingForDoctor; + break; + default: return ""; } @@ -428,7 +466,6 @@ class _ToDoState extends State { getPatientAppointmentHistory() { DoctorsListService service = new DoctorsListService(); service.getPatientAppointmentHistory(true, context).then((res) { - print(res['AppoimentAllHistoryResultList']); if (res['MessageStatus'] == 1) { setState(() { if (res['AppoimentAllHistoryResultList'].length != 0) { @@ -439,6 +476,10 @@ class _ToDoState extends State { }); } else {} }); + widget.appoList.forEach((element) { + print(element.isLiveCareAppointment); + print(element.nextAction); + }); } else { AppToast.showErrorToast(message: res['ErrorEndUserMessage']); } @@ -666,18 +707,49 @@ class _ToDoState extends State { confirmAppointment(AppoitmentAllHistoryResultList appo) { DoctorsListService service = new DoctorsListService(); service - .confirmAppointment( - appo.appointmentNo, appo.clinicID, appo.projectID, context) + .confirmAppointment(appo.appointmentNo, appo.clinicID, appo.projectID, + appo.isLiveCareAppointment, context) .then((res) { - if (res['MessageStatus'] == 1) { - AppToast.showSuccessToast(message: res['ErrorEndUserMessage']); - getPatientAppointmentHistory(); - } else { - AppToast.showErrorToast(message: res['ErrorEndUserMessage']); - } - }).catchError((err) { - print(err); - }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + if (res['MessageStatus'] == 1) { + AppToast.showSuccessToast(message: res['ErrorEndUserMessage']); + getPatientAppointmentHistory(); + } else { + AppToast.showErrorToast(message: res['ErrorEndUserMessage']); + } + }) + .catchError((err) { + print(err); + }) + .showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)) + .then((value) { + if (appo.isLiveCareAppointment) { + insertLiveCareVIDARequest(appo); + } else { + getPatientAppointmentHistory(); + } + }); + } + + insertLiveCareVIDARequest(AppoitmentAllHistoryResultList appo) { + DoctorsListService service = new DoctorsListService(); + service + .insertVIDARequest(appo.appointmentNo, appo.clinicID, appo.projectID, + appo.serviceID, appo.doctorID, context) + .then((res) { + if (res['MessageStatus'] == 1) { + AppToast.showSuccessToast(message: res['ErrorEndUserMessage']); + } else { + AppToast.showErrorToast(message: res['ErrorEndUserMessage']); + } + }) + .catchError((err) { + print(err); + }) + .showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)) + .then((value) { + getPatientAppointmentHistory(); + }); } } diff --git a/lib/pages/ToDoList/widgets/upcomingCard.dart b/lib/pages/ToDoList/widgets/upcomingCard.dart index 1b4a4cc3..c1d1b546 100644 --- a/lib/pages/ToDoList/widgets/upcomingCard.dart +++ b/lib/pages/ToDoList/widgets/upcomingCard.dart @@ -5,6 +5,7 @@ import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:rating_bar/rating_bar.dart'; class TodoListCard extends StatefulWidget { @@ -12,7 +13,6 @@ class TodoListCard extends StatefulWidget { var languageID; final VoidCallback onListUpdated; - TodoListCard({@required this.appo, this.onListUpdated}); @override @@ -54,14 +54,22 @@ class _TodoListCardState extends State { child: Text(getDate(widget.appo.appointmentDate), style: TextStyle(fontSize: 12.0)), ), - Image.asset( - "assets/images/new-design/hospital_address_icon.png", - width: 20.0, - height: 20.0), + widget.appo.isLiveCareAppointment + ? SvgPicture.asset( + "assets/images/new-design/liveCare_logo_icon.svg", + width: 20.0, + height: 20.0) + : Image.asset( + "assets/images/new-design/hospital_address_icon.png", + width: 20.0, + height: 20.0), Container( margin: EdgeInsets.only(left: 10.0, right: 10.0), - child: Text(widget.appo.projectName, - style: TextStyle(fontSize: 12.0)), + child: widget.appo.isLiveCareAppointment + ? Text(TranslationBase.of(context).upcomingLivecare, + style: TextStyle(fontSize: 12.0)) + : Text(widget.appo.projectName, + style: TextStyle(fontSize: 12.0)), ), ], ), @@ -105,7 +113,10 @@ class _TodoListCardState extends State { letterSpacing: 1.0)), Container( margin: EdgeInsets.only(top: 3.0, bottom: 3.0), - child: Text(getDoctorSpeciality(widget.appo.doctorSpeciality).trim(), + child: Text( + getDoctorSpeciality( + widget.appo.doctorSpeciality) + .trim(), style: TextStyle( fontSize: 12.0, color: Colors.grey[600], @@ -323,14 +334,13 @@ class _TodoListCardState extends State { } String getMinute(DateTime dateObj) { - if(dateObj.minute == 0) { + if (dateObj.minute == 0) { return dateObj.minute.toString() + "0"; } else { return dateObj.minute.toString(); } } - String getDoctorSpeciality(List docSpecial) { String docSpeciality = ""; docSpecial.forEach((v) { diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 59c0a167..55a095ed 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -5,16 +5,16 @@ import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/all_habib_medic import 'package:diplomaticquarterapp/pages/ContactUs/hmg_service.dart'; import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; -import 'package:diplomaticquarterapp/pages/feedback/feedback_home_page.dart'; +import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; -import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; @@ -56,20 +56,112 @@ class _HomePageState extends State { child: Stack( children: [ Positioned( - top: 30, - left: 15, - right: 15, + top: 15, + left: 5, + right: 5, child: Container( width: MediaQuery.of(context).size.width * 0.8, child: Row( children: [ + Expanded( + child: Container( + height: 120, + padding: EdgeInsets.all(5), + margin: EdgeInsets.all(5), + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/new-design/covid_bg_transparent.png"), + fit: BoxFit.fill, + ), + color: + Colors.white.withOpacity(0.3), + borderRadius: BorderRadius.all( + Radius.circular(5))), + child: Container( + margin: EdgeInsets.only(top: 10.0), + child: Column( + children: [ + Text("COVID-19 TEST", + style: TextStyle( + color: Colors.white, + fontWeight: + FontWeight.bold, + fontSize: 18.0)), + Row( + children: [ + Container( + margin: EdgeInsets.only( + top: 15.0), + child: SvgPicture.asset( + 'assets/images/new-design/covid-19-car.svg', + width: 50.0, + height: 50.0), + ), + Container( + margin: EdgeInsets.only( + left: 10.0, top: 10.0), + child: Column( + children: [ + Text("Drive-Thru", + style: TextStyle( + color: Colors + .white, + fontWeight: + FontWeight + .bold, + fontSize: + 16.0)), + ButtonTheme( + shape: + RoundedRectangleBorder( + borderRadius: + BorderRadius + .circular( + 5.0), + ), + minWidth: MediaQuery.of( + context) + .size + .width * + 0.15, + height: 25.0, + child: RaisedButton( + color: Colors.red[800], + textColor: + Colors.white, + disabledTextColor: + Colors.white, + disabledColor: + new Color( + 0xFFbcc2c4), + onPressed: () { +// if (_isButtonDisabled == false) { +// _searchDoctor(context); +// } + }, + child: Text("BOOK NOW", + style: TextStyle( + fontSize: + 12.0)), + ), + ), + ], + ), + ), + ], + ), + ], + ), + ), + ), + ), Expanded( child: InkWell( onTap: () => Navigator.push(context, FadePage(page: LiveCareHome())), child: Container( - height: 110, + height: 120, padding: EdgeInsets.all(15), margin: EdgeInsets.all(5), decoration: BoxDecoration( @@ -77,25 +169,13 @@ class _HomePageState extends State { .withOpacity(0.3), borderRadius: BorderRadius.all( Radius.circular(5))), - child: Image.asset( - 'assets/images/livecare_white_logo.png', + child: SvgPicture.asset( + projectViewModel.isArabic ? 'assets/images/new-design/livecare_arabic_logo.svg' : + 'assets/images/new-design/liveCare_white_logo.svg', ), ), ), ), - Expanded( - child: Container( - height: 110, - padding: EdgeInsets.all(15), - margin: EdgeInsets.all(5), - decoration: BoxDecoration( - color: - Colors.white.withOpacity(0.3), - borderRadius: BorderRadius.all( - Radius.circular(5))), - // child: Image.asset('assets/images/livecare_white_logo.png',), - ), - ), ], ), ), diff --git a/lib/pages/livecare/livecare_type_select.dart b/lib/pages/livecare/livecare_type_select.dart index d8978d8e..64114304 100644 --- a/lib/pages/livecare/livecare_type_select.dart +++ b/lib/pages/livecare/livecare_type_select.dart @@ -74,7 +74,7 @@ class _LiveCareTypeSelectState extends State { SvgPicture.asset("assets/images/new-design/check_icon.svg", width: 25), Container( - width: MediaQuery.of(context).size.width * 0.75, + width: MediaQuery.of(context).size.width * 0.72, margin: EdgeInsets.all(10.0), child: Text( "No need to wait, you will get Medical consultation immediately via Video call.", @@ -91,7 +91,7 @@ class _LiveCareTypeSelectState extends State { SvgPicture.asset("assets/images/new-design/check_icon.svg", width: 25), Container( - width: MediaQuery.of(context).size.width * 0.75, + width: MediaQuery.of(context).size.width * 0.72, margin: EdgeInsets.all(10.0), child: Text("The doctor will see your medical file.", overflow: TextOverflow.clip, @@ -107,7 +107,7 @@ class _LiveCareTypeSelectState extends State { SvgPicture.asset("assets/images/new-design/check_icon.svg", width: 25), Container( - width: MediaQuery.of(context).size.width * 0.75, + width: MediaQuery.of(context).size.width * 0.72, margin: EdgeInsets.all(10.0), child: Text("Free Prescription delivery service.", overflow: TextOverflow.clip, @@ -140,7 +140,7 @@ class _LiveCareTypeSelectState extends State { width: 80), ), Container( - width: MediaQuery.of(context).size.width * 0.6, + width: MediaQuery.of(context).size.width * 0.56, margin: EdgeInsets.fromLTRB(30.0, 20.0, 0.0, 0.0), child: Column( children: [ @@ -182,7 +182,7 @@ class _LiveCareTypeSelectState extends State { width: 70), ), Container( - width: MediaQuery.of(context).size.width * 0.6, + width: MediaQuery.of(context).size.width * 0.58, margin: EdgeInsets.fromLTRB(30.0, 30.0, 0.0, 0.0), child: Column( children: [ @@ -208,6 +208,9 @@ class _LiveCareTypeSelectState extends State { ], )), ), + SizedBox( + height: 40.0, + ), ], ), ), diff --git a/lib/services/appointment_services/GetDoctorsList.dart b/lib/services/appointment_services/GetDoctorsList.dart index 8d5b62f6..542ea3e2 100644 --- a/lib/services/appointment_services/GetDoctorsList.dart +++ b/lib/services/appointment_services/GetDoctorsList.dart @@ -6,6 +6,7 @@ import 'package:diplomaticquarterapp/core/service/base_service.dart'; import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; import 'package:diplomaticquarterapp/models/Appointments/PatientShareResposne.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; +import 'package:diplomaticquarterapp/models/LiveCare/insertVIDARequest.dart'; import 'package:diplomaticquarterapp/models/Request.dart'; import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; @@ -21,6 +22,8 @@ class DoctorsListService extends BaseService { double lat; double long; + String deviceToken; + String tokenID; Future getDoctorsList( int clinicID, int projectID, bool isNearest, BuildContext context, @@ -48,7 +51,7 @@ class DoctorsListService extends BaseService { "VersionID": req.VersionID, "Channel": req.Channel, "generalid": 'Cs2020@2016\$2958', - "PatientOutSA": 0, + "PatientOutSA": authUser.outSA, "TokenID": "", "DeviceTypeID": req.DeviceTypeID, "SessionID": "YckwoXhUmWBsnHKEKig", @@ -106,7 +109,7 @@ class DoctorsListService extends BaseService { "VersionID": req.VersionID, "Channel": req.Channel, "generalid": 'Cs2020@2016\$2958', - "PatientOutSA": 0, + "PatientOutSA": authUser.outSA, "TokenID": "", "DeviceTypeID": req.DeviceTypeID, "SessionID": null, @@ -146,7 +149,7 @@ class DoctorsListService extends BaseService { "VersionID": req.VersionID, "Channel": req.Channel, "generalid": 'Cs2020@2016\$2958', - "PatientOutSA": 0, + "PatientOutSA": authUser.outSA, "TokenID": "", "DeviceTypeID": req.DeviceTypeID, "SessionID": null, @@ -188,7 +191,7 @@ class DoctorsListService extends BaseService { "LanguageID": languageID == 'ar' ? 1 : 2, "IPAdress": "10.20.10.20", "generalid": "Cs2020@2016\$2958", - "PatientOutSA": 0, + "PatientOutSA": authUser.outSA, "SessionID": null, "isDentalAllowedBackend": false, "DeviceTypeID": 1 @@ -224,7 +227,7 @@ class DoctorsListService extends BaseService { "LanguageID": languageID == 'ar' ? 1 : 2, "IPAdress": "10.20.10.20", "generalid": "Cs2020@2016\$2958", - "PatientOutSA": 0, + "PatientOutSA": authUser.outSA, "SessionID": null, "isDentalAllowedBackend": false, "DeviceTypeID": 1 @@ -513,7 +516,7 @@ class DoctorsListService extends BaseService { } Future confirmAppointment( - int appoNo, int clinicID, int projectID, BuildContext context) async { + int appoNo, int clinicID, int projectID, bool isLiveCare, BuildContext context) async { Map request; if (await this.sharedPref.getObject(USER_PROFILE) != null) { @@ -527,6 +530,7 @@ class DoctorsListService extends BaseService { request = { "AppointmentNumber": appoNo, + "IsLiveCareAppointment": isLiveCare, "ClinicID": clinicID, "ProjectID": projectID, "ConfirmationBy": 102, @@ -556,6 +560,62 @@ class DoctorsListService extends BaseService { return Future.value(localRes); } + + Future insertVIDARequest( + int appoNo, int clinicID, int projectID, int serviceID, int docID, BuildContext context) async { + Map request; + + if (await this.sharedPref.getObject(USER_PROFILE) != null) { + var data = AuthenticatedUser.fromJson( + await this.sharedPref.getObject(USER_PROFILE)); + authUser = data; + } + + deviceToken = await sharedPref.getString(PUSH_TOKEN); + + if (await this.sharedPref.getDouble(USER_LAT) != null && + await this.sharedPref.getDouble(USER_LONG) != null) { + lat = await this.sharedPref.getDouble(USER_LAT); + long = await this.sharedPref.getDouble(USER_LONG); + } + + var languageID = await sharedPref.getString(APP_LANGUAGE); + Request req = appGlobal.getPublicRequest(); + + request = { + "AppointmentNo": appoNo, + "ClinicID": clinicID, + "ProjectID": projectID, + "ServiceID": serviceID, + "AcceptedBy": docID, + "DeviceToken": deviceToken, + "Latitude": lat, + "Longitude": long, + "DeviceType": req.DeviceType, + "VersionID": req.VersionID, + "Channel": req.Channel, + "LanguageID": languageID == 'ar' ? 1 : 2, + "IPAdress": req.IPAdress, + "generalid": req.generalid, + "PatientOutSA": authUser.outSA, + "isDentalAllowedBackend": false, + "DeviceTypeID": req.DeviceTypeID, + "PatientID": authUser.patientID, + "PatientTypeID": authUser.patientType, + "PatientType": authUser.patientType + }; + + dynamic localRes; + + await baseAppClient.post(INSERT_VIDA_REQUEST, + onSuccess: (response, statusCode) async { + localRes = response; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: request); + return Future.value(localRes); + } + Future cancelAppointment( AppoitmentAllHistoryResultList appo, BuildContext context) async { Map request; diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 272d983f..71927d28 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -97,6 +97,8 @@ class TranslationBase { String get confirmLiveCare => localizedValues['confirmLiveCare'][locale.languageCode]; + String get waitingForDoctor => localizedValues['waitingForDoctor'][locale.languageCode]; + String get confirmLater => localizedValues['confirmLater'][locale.languageCode]; @@ -222,6 +224,9 @@ class TranslationBase { String get upcomingLivecare => localizedValues['upcoming-livecare'][locale.languageCode]; + String get liveCareAppo => + localizedValues['livecareAppo'][locale.languageCode]; + String get upcomingDetails => localizedValues['upcoming-details'][locale.languageCode]; From 929e289a6f1a3cdb6cb6612d6ed2a96abfc8c470 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 30 Sep 2020 18:08:53 +0300 Subject: [PATCH 04/14] started implementing Covid-19 DriveThru Test Module --- assets/images/new-design/calendar.png | Bin 0 -> 5627 bytes .../new-design/covid_bg_transparent.png | Bin 0 -> 11952 bytes .../new-design/hmg_full_logo_hd_white.png | Bin 0 -> 19553 bytes .../images/new-design/waiting_for_doctor.png | Bin 0 -> 2554 bytes lib/config/config.dart | 2 + .../DriveThroughTestingCenterModel.dart | 68 +++++ lib/pages/BookAppointment/BookSuccess.dart | 2 +- .../covid-drivethru-location.dart | 258 ++++++++++++++++++ lib/pages/landing/home_page.dart | 27 +- .../appointment_services/GetDoctorsList.dart | 1 - .../covid-drivethru/covid-drivethru.dart | 52 ++++ lib/widgets/others/arrow_back.dart | 6 +- 12 files changed, 402 insertions(+), 14 deletions(-) create mode 100644 assets/images/new-design/calendar.png create mode 100644 assets/images/new-design/covid_bg_transparent.png create mode 100644 assets/images/new-design/hmg_full_logo_hd_white.png create mode 100644 assets/images/new-design/waiting_for_doctor.png create mode 100644 lib/models/CovidDriveThru/DriveThroughTestingCenterModel.dart create mode 100644 lib/pages/Covid-DriveThru/covid-drivethru-location.dart create mode 100644 lib/services/covid-drivethru/covid-drivethru.dart diff --git a/assets/images/new-design/calendar.png b/assets/images/new-design/calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..ac72b030ab799a61619080779577a75455d0dafe GIT binary patch literal 5627 zcmd^Dc{o)4+dnfVjU*!39vWi{G4^aD#=bV1EDwpSjcpj)WTGM2g^+Azo-9Mil08%+ zk)`Zg@<_HpB_p)FM?Jsi*Y&)=_x=05u6M3$&biNhf9~b`J)iG6_xHqMEezQX@E-sG zfX&!Q?+kce2LE(8Gk6T`RmXuRn1_zJ4ggdovwpd-54=XW7@aW(t>OSci2{HfP(@h; zfFL>0*9idBZvg<0Uv877CTO_mW^3$jZVpI+G8}+Gm;okGf&ftP!1Y%)*Mj;VDAc0|AX6}<)_<^as5oExfe_wdyx=G04IZpcQN)2bR+r^!HL-`QcFSe zN4oz7@$b@q#yU;JyMcrM;Vu7{_piEt;&ll=V7h>Sy=?!&|El{Z{)}4y!8>R#yp=CL z@b3cuq5j2dZ`|rwJju=bcRjq1o9~ZI3W_S4sQ+mBr>8E#n?S_*U2t*REANNPFRFi{ zf8??KHILG-d493{<*A9<G2Q*QCGZ-|vw1R7m6KSlcbCv{I&AU`4 zYQ-J1@VxRM(&&i-vyN*DZ)z_BF^Q0)AR*>}|B!HWtO>{A&->w;5M}>acJ2Mb@u~We z9EbO{YjMT&0+EN9R2Ac@;qDYjw7%1uZH@Mo%<$>;AggJu`lhvJM=^07uiUAN9~>G8mEf$I6{UAHzKGTE&=gQ9XH%yp})+pO*E-L3iVZt|3K zV}iF1-+Rx1Ja5+Z-(oWX2zR*e^Q3~7afM#*yhrc(^Zwu!5+~OPddF=^54n#TuqVE~ z%tCupW9rSDru=&a_sX_=`e~)ANq>b(v72rADme?f(sQY$11sI%aL#uZhh4)v;k*1z z`C6}7z2kzeEK5Uj2NC&fv!6KybhE@6gXUA1WGa z(<}10T=(~w<(qL(DC`m32Lkfw7?xmT%Py8{QV|oyGySd`@z6>kD92&~MKJHSbk(7) z_*Y_Q;{v(VPNewE^rQxXj?xicVk5@)#S^(o^*m?#&?j^YDwGktFq6X#=bZE2D_Ac) z|Ezx?#>iB@@GxwO<+8p;56gY7)IA0F2r2japF4HAWesu6Ur;5ZxHI zZ(SIOh~TJPkG;M|Z*-tB=J4WhZKwCJ>x*X8uLGm9uN6URU6rUj7t=afSNyWo(8sZl z3?lqsO}_Pdw5!t0Xk8}-s6!LoPA*HL2aGlW56p{34o!>=9)>+(K@9l?lQ8)zPY#6}-(sO9C+EY|4T8OPJ4-5fII9(bn=?krDrHdrKzI!|FpIlfo2xkSdpotH;- z7)~`jJ8>`H?b;;yZ`ECT%|IX+b$Kna8>HNRoO7F7@)~oU$=rk0o;gV9Jtc!(KY<)g zt=Z1Vq}HsLjrqbG_8RYIs~)Qr4SvQ>9&fM8!`vCS$VAW~`;)TM)6kD(qHm8RD%!m< zuoUHki&_9w@$=fR`mX|*-n)H?3jW{_KR|DU3&A)%g@WAE^sq+;s+6$(+dW#h>jzn?OyT_mLA`7#cx7`XOa;m9bE>r z3ES6L|FvML0T~N_;(?k0d}X~xhq08I3P!NJyW`MsRZIKkA%7z42i6$Kr0}}cA^#h! zsTtT>n-&~*Q)9nWUa9KbH=cri((erkoG1m0E8|!5Fa)UXHbmxJ zBqS=^dALhW1HAdoHx%C-0hxc~o&Dah%@+l>jhsBtMvlc$_cMvQ zGv}NXEZ{>10Cglf`#ORHWNma!I~TMTEU=bZBm$2DX*x@PAEoUBR^&rlf!BkJMI;;0+N+7X&saNlQ^_#LPz2t|KA}IOF}xasXP&>sfQVRy7^QT`xHU_3ZYB{ZbNWAh_r;z~`v;5}2$Hv{#ew5c59K%0ceFS*seOa%+8A8Bp)<5;f- zywY$Lc;bB$f?ut-v$HBF*WQ?KGxdrdl>=#dfbNs&Y7>c3x#&L7$PKySnH=OI% zZxlVxn6eFVf@NrLUwn}E(ufirNx?R!R6c?m+43yTlMML{)jGRnkL)dp4yKz%{WkZw z66~!#t8@!Tl!U;wb-n#@qTWuJrK%blI*ZQ=BDc$I_)xC{)d&cme*IOSdh8WPY2mt32 z3+DY?7w>E9FVZ4g@`ddpLy``!Utdi#TK(9g-(ufbhBmA}T;Ug&j^~KV#?Okqa#8-I zzV^7q28ouyz3^=}p!psjWD!jjy6cU)Cp>qBmdxa}=+PY#fi1oq_lzBjM4vIO;BQmv zo)U>ywb|vSNkolcL?JY&; z_@J`|A=34m&<*Jo_k{woQNd;Zvo~#>G@|$c3(VL#-&1UUJ|Xf|P2cVGBZb>hY;4G+PJ z?7qeQ&!F2`wk{UI7EQ^F0*CJjoHbx)VG2;KXE@KN^(-&@7HalYAgybsjV!+-rJJJd zOE-j)>=p`8n-|+lV?ibaHJpAv-!?pLLcV3o+W-4-r?2Hh8^+65sqOp|Y9-UnJ!*K~ zQ#`0ByTf-?Y$tPMOBbzc8}n)=Tr?zdANWRFpGfIAieJf1cYJJS8@F>5IV3l-(LN=0 zDNj}>*ui7CdMTcmF!E2#q*NYhJ9znlx9x}}@?kclB*~3`tY9}+~_q|mwIXSE~ zCp@H0nV8g+u-P4-V2uziZTPB}bSzU4+aa01>by;_s2ctNIg)a|RTf^GJmGb_~*QTa=O_wSN1?#k5xXDZTE?uk2$BZg!}FR+S^c)V@Qp;Ig2OdqP-9d^-@3k6J% z9b0ixcDJoA^t@zyedy|{;iUN;aOTfN;zJA5k70sjZ#><}#`N7(-k#~9=MGh*ee6gL z`08>^mv*?z1i0rGEID5UpWS5}Zwjfu-edChUHtdskSKnCT#7Bb)#n*~`X8PbHKx9% zfBZA|fm9=;-jJ5cim?2xP&S;aF-Ku`m6=SoLo5`yT~sb(!<17IoX<3a0*u)l%tx-} zrA-8#5z${;QtJw>Xo&c7A#wWd6{4T&*O`|EXFD&r3+B4vmR|`Y?9?LaSia z%1F?eK4TF~g`yIsJT2JXk#pr*_Seu!D&^?w$w;%X`nl zpjsiW9Y{;xjdB^XRh{0-`Ipi-18^0!C&*Y%h@5|MOF{e*mC)JYvA6^_4@*PwW{Tnz ztfH)z?&%n?lPb1$&6WpyH2)8Lq3WQUdM$D=5$w?t6Z!`Rg(=v<67DQ_u>Ej9cRBj@ zArNR$-lgOMzTD>iRQwbOKFtC>^^5qx7KxAN4z*YpZ02y%3ca_$X0GA$L9`$U%(F|y zcY=}s&y~QTOB3PSa9!NyBuT#;aDi{G-eTbrfU=2Inq1PKG&WC`TNE@jF!-j*A95UX z8H35k!(Llr6kP?Lns}QTaoRjMebx3k7Y`Jd{-~5nrLs*vJ32Q|kJbXWj*$IO_%H-1 zjNr%tFiGaOK6CgXC|E%RClp!*PVQJ#9Q%KV&@A#zGaXnV@v;wU~>Z-A!6HuU6wyt2_whh{e2t#(gSyj!YKZspF@8@Eq64{;uQ2cb|iz ztpt@mvORVlS$n&gL0er~lq2o$Jtm=XR^?up;NB+M3Cg%!C|14V%41p}ZVhgt|M5je cn-lhpeU}bQS)VFx-1`PWNySpYd(6|IAL4q|B zTyAD|c6Rsd+}Hb1Rp->H`XByN4^?0NvD%tS1bEbV&z?OaP*IlG{Wo6xYY8}5|9Umc zh<_7|&s5}P^!>7rEKGdKlroY`^&R+d8{-v586zA~&*-lf2N0S2R$F-+R#QFwHNp2g zpCv<1XD-x#x~vRu^fekMBw*n1e8|vsEa%yMac&XRCNHmOXRBhM5VE^hrvF2D>-cIo zF@4vcQ?p37+_=V98DyxMqp$jR`x3Kw)~0w?m4%+|SkwW7TC}DL^;iY-dAr9^Jj)Rj zlAmsh=l>XZ7!+HoS{``%=FbxgbkBIbM~=h5Ky^+wccC~v%TSeoqgX(-oUVA56yZOn zoc)eeLM}UBg$W^DVMur4f#^p_vVPJ%P%WP;@!!Uv-32R=7tj7%jXyHAucK-~evc%$ zJ*{dCZT!Jr`elP^D}qdWKSlPyPkrPy3;!#da6SZ^N8P&*kPLVe@;k`9Hbc6D|Dsvf zDgNQXoTG_h>s~V2CV)l42sS*>(%q4j%?7tQ&;qLEWQ|B()XreU?YPZ7x*^`D--v~J5kyOs?#6JM@^15owev`#$r^5+;|#*g_mJ`0 z?;|AytcI^Hw(pbaYiC@&ioBZ_l%Jkdg{KC5=k9H z!)*$L<$aRJxNi;+$B^Na@rS>#X@CYxLIqsU)xb+y`{twtmR?+~{bC5QM~@?zbtOCk zP?{+$VD+U_KPvD#AsIt6gbG+iN_Bi7>9IjIl|@|%4sn2U)4)*rU4oH^I8j;~8J#DS(8-;3-*R5-$Dk~Kv;gFk zH(qgeDKy~xitxRGDOMfdL`qEG1^wXLN}Flk%?>b36fmav+}UQPOX? zAgVw#X!!06k0QUL_$vnmr_QH6K%U7g@38K z+e-L0OnYwyS9>5$`0LXe$>j_fOZIhDKrAPaR0*3}83(^0 zOw;}^Y1hew@v26VdfXcZ^1R;i+YDLY=jRt3jrtS__SCSFx|?DSvJTXFbZv;w(j_oz zr9vJvK?U%o|BjED#}jS+O|QLVUbx=~F;4v)94

yfg5XnJb*p@D*Z@fHI*0Y5N;P^-nM5? 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 json) { + rowID = json['RowID']; + iD = json['ID']; + projectID = json['ProjectID']; + setupID = json['SetupID']; + longitude = json['Longitude']; + latitude = json['Latitude']; + numberOfTracks = json['NumberOfTracks']; + isActive = json['IsActive']; + createdBy = json['CreatedBy']; + createdOn = json['CreatedOn']; + editedBy = json['EditedBy']; + editedON = json['EditedON']; + projectName = json['ProjectName']; + projectNameN = json['ProjectNameN']; + } + + Map toJson() { + final Map data = new Map(); + data['RowID'] = this.rowID; + data['ID'] = this.iD; + data['ProjectID'] = this.projectID; + data['SetupID'] = this.setupID; + data['Longitude'] = this.longitude; + data['Latitude'] = this.latitude; + data['NumberOfTracks'] = this.numberOfTracks; + data['IsActive'] = this.isActive; + data['CreatedBy'] = this.createdBy; + data['CreatedOn'] = this.createdOn; + data['EditedBy'] = this.editedBy; + data['EditedON'] = this.editedON; + data['ProjectName'] = this.projectName; + data['ProjectNameN'] = this.projectNameN; + return data; + } +} diff --git a/lib/pages/BookAppointment/BookSuccess.dart b/lib/pages/BookAppointment/BookSuccess.dart index 704618ac..34dbdc2f 100644 --- a/lib/pages/BookAppointment/BookSuccess.dart +++ b/lib/pages/BookAppointment/BookSuccess.dart @@ -782,7 +782,7 @@ class _BookSuccessState extends State { } Future navigateToHome(context) async { - Navigator.of(context).pushNamed(HOME); + Navigator.of(context).popAndPushNamed(HOME); } getAppoQR(context) { diff --git a/lib/pages/Covid-DriveThru/covid-drivethru-location.dart b/lib/pages/Covid-DriveThru/covid-drivethru-location.dart new file mode 100644 index 00000000..6b1c5f2b --- /dev/null +++ b/lib/pages/Covid-DriveThru/covid-drivethru-location.dart @@ -0,0 +1,258 @@ +import 'package:diplomaticquarterapp/models/CovidDriveThru/DriveThroughTestingCenterModel.dart'; +import 'package:diplomaticquarterapp/routes.dart'; +import 'package:diplomaticquarterapp/services/covid-drivethru/covid-drivethru.dart'; +import 'package:diplomaticquarterapp/uitl/utils.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:smart_progress_bar/smart_progress_bar.dart'; +import 'package:maps_launcher/maps_launcher.dart'; + +class CovidDrivethruLocation extends StatefulWidget { + @override + _CovidDrivethruLocationState createState() => _CovidDrivethruLocationState(); +} + +class _CovidDrivethruLocationState extends State { + String projectDropdownValue; + List projectsList = []; + bool isLocationSelected = false; + String projectLat = ""; + String projectLong = ""; + String projectName = ""; + + @override + void initState() { + WidgetsBinding.instance + .addPostFrameCallback((_) => getProjectsList(context)); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + appBarTitle: "COVID-19 TEST", + isShowAppBar: true, + body: SingleChildScrollView( + child: Container( + margin: EdgeInsets.fromLTRB(15.0, 15.0, 15.0, 0.0), + child: Column( + children: [ + Container( + alignment: Alignment.centerLeft, + child: Text("Get The Result During 8 Hours", + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 22.0, + color: Colors.black)), + ), + Container( + margin: EdgeInsets.only(top: 10.0), + child: Text( + "We are using the advance technology to test COVID-19, The sample for examination is taking between the nose and mouth (nasopharyngeal swab), the examination is done by ELITE In Genius of the company ELITECH GROUP MOLECULAR DIAGNOSTICS, Note that the device belongs to an Italian company and is manufactured in Japan with RC- PCR​", + style: TextStyle(fontSize: 16.0, color: Colors.black)), + ), + Container( + margin: EdgeInsets.only(top: 20.0), + alignment: Alignment.centerLeft, + child: Text("Select Location", + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 18.0, + letterSpacing: 0.8, + color: Colors.grey[700])), + ), + Container( + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + border: Border.all( + color: Colors.grey[400], + width: 1.0, + ), + borderRadius: BorderRadius.circular(10), + ), + padding: EdgeInsets.all(8.0), + width: MediaQuery.of(context).size.width, + margin: EdgeInsets.only(top: 15.0), + child: DropdownButtonHideUnderline( + child: DropdownButton( + hint: new Text("Select Address"), + value: projectDropdownValue, + items: projectsList.map((item) { + return new DropdownMenuItem( + value: item.iD.toString(), + child: new Text(item.projectName), + ); + }).toList(), + onChanged: (newValue) { + setState(() { + projectDropdownValue = newValue; + setProjectLocation(newValue); + }); + }, + ), + )), + isLocationSelected + ? Container( + margin: EdgeInsets.only(top: 15.0), + alignment: Alignment.centerLeft, + child: Text("Selected Location", + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 18.0, + letterSpacing: 0.8, + color: Colors.black)), + ) : Container(), + isLocationSelected + ? Container( + margin: EdgeInsets.only(top: 5.0), + decoration: BoxDecoration( + border: Border.all(color: Colors.grey[400], width: 1.0), + ), + child: Image.network( + "https://maps.googleapis.com/maps/api/staticmap?center=" + + this.projectLat + + "," + + this.projectLong + + "&zoom=15&size=800x400&maptype=roadmap&markers=color:red%7C" + + this.projectLat + + "," + + this.projectLong + + "&key=AIzaSyCyDbWUM9d_sBUGIE8PcuShzPaqO08NSC8"), + ) + : Container(), + ], + ), + ), + ), + bottomSheet: Container( + height: MediaQuery.of(context).size.height * 0.15, + width: double.infinity, + child: Column( + children: [ + Container( + margin: EdgeInsets.only(top: 10.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + minWidth: MediaQuery.of(context).size.width * 0.91, + height: 45.0, + child: RaisedButton( + color: new Color(0xFFc5272d), + textColor: Colors.white, + disabledTextColor: Colors.white, + disabledColor: Colors.red[300], + onPressed: () { + getDirections(); + }, + child: + Text("GET DIRECTIONS", style: TextStyle(fontSize: 18.0)), + ), + ), + ), + Container( + margin: EdgeInsets.fromLTRB(10.0, 5.0, 10.0, 5.0), + child: Flex( + direction: Axis.horizontal, + children: [ + Expanded( + flex: 1, + child: Container( + margin: EdgeInsets.fromLTRB(10.0, 0.0, 5.0, 0.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + minWidth: MediaQuery.of(context).size.width * 0.7, + height: 45.0, + child: RaisedButton( + color: new Color(0xFF60686b), + textColor: Colors.white, + disabledTextColor: Colors.white, + disabledColor: Colors.grey[500], + onPressed: () { + back(); + }, + child: Text("BACK", style: TextStyle(fontSize: 18.0)), + ), + ), + ), + ), + Expanded( + flex: 1, + child: Container( + margin: EdgeInsets.fromLTRB(10.0, 0.0, 5.0, 0.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + minWidth: MediaQuery.of(context).size.width * 0.7, + height: 45.0, + child: RaisedButton( + color: new Color(0xFF60686b), + textColor: Colors.white, + disabledTextColor: Colors.white, + disabledColor: Colors.grey[500], + onPressed: () { + next(); + }, + child: Text("NEXT", style: TextStyle(fontSize: 18.0)), + ), + ), + ), + ), + ], + ), + ), + ], + ), + ), + ); + } + + getDirections() { + if(isLocationSelected) { + MapsLauncher.launchCoordinates(double.parse(projectLat),double.parse(projectLong), this.projectName); + } else { + Utils.showErrorToast("Please select address from the dropdown menu to get directions"); + } + } + + next() { + + } + + back() { + Navigator.of(context).popAndPushNamed(HOME); + } + + setProjectLocation(newValue) { + print(newValue); + print(projectsList[(int.parse(newValue) - 1)].projectName); + setState(() { + this.projectLat = + projectsList[(int.parse(newValue) - 1)].latitude.toString(); + this.projectLong = + projectsList[(int.parse(newValue) - 1)].longitude.toString(); + this.projectName = projectsList[(int.parse(newValue) - 1)].projectName; + isLocationSelected = true; + }); + } + + getProjectsList(BuildContext context) { + CovidDriveThruService service = new CovidDriveThruService(); + service.getCovidProjectsList(context).then((res) { + if (res['MessageStatus'] == 1) { + setState(() { + res['List_COVID19_ProjectDriveThroughTestingCenter'].forEach((v) { + projectsList.add(new DriveThroughTestingCenterModel.fromJson(v)); + }); + }); + } else {} + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + } +} diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 55a095ed..d427c2f1 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/core/viewModels/dashboard_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/all_habib_medical_service_page.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/hmg_service.dart'; +import 'package:diplomaticquarterapp/pages/Covid-DriveThru/covid-drivethru-location.dart'; import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; @@ -71,7 +72,8 @@ class _HomePageState extends State { margin: EdgeInsets.all(5), decoration: BoxDecoration( image: DecorationImage( - image: AssetImage("assets/images/new-design/covid_bg_transparent.png"), + image: AssetImage( + "assets/images/new-design/covid_bg_transparent.png"), fit: BoxFit.fill, ), color: @@ -100,7 +102,8 @@ class _HomePageState extends State { ), Container( margin: EdgeInsets.only( - left: 10.0, top: 10.0), + left: 10.0, + top: 10.0), child: Column( children: [ Text("Drive-Thru", @@ -127,7 +130,8 @@ class _HomePageState extends State { 0.15, height: 25.0, child: RaisedButton( - color: Colors.red[800], + color: Colors + .red[800], textColor: Colors.white, disabledTextColor: @@ -136,11 +140,10 @@ class _HomePageState extends State { new Color( 0xFFbcc2c4), onPressed: () { -// if (_isButtonDisabled == false) { -// _searchDoctor(context); -// } + navigateToCovidDriveThru(); }, - child: Text("BOOK NOW", + child: Text( + "BOOK NOW", style: TextStyle( fontSize: 12.0)), @@ -170,8 +173,9 @@ class _HomePageState extends State { borderRadius: BorderRadius.all( Radius.circular(5))), child: SvgPicture.asset( - projectViewModel.isArabic ? 'assets/images/new-design/livecare_arabic_logo.svg' : - 'assets/images/new-design/liveCare_white_logo.svg', + projectViewModel.isArabic + ? 'assets/images/new-design/livecare_arabic_logo.svg' + : 'assets/images/new-design/liveCare_white_logo.svg', ), ), ), @@ -742,6 +746,11 @@ class _HomePageState extends State { ), ); } + + navigateToCovidDriveThru() { + Navigator.push(context, + MaterialPageRoute(builder: (context) => CovidDrivethruLocation())); + } } class DashboardItem extends StatelessWidget { diff --git a/lib/services/appointment_services/GetDoctorsList.dart b/lib/services/appointment_services/GetDoctorsList.dart index 542ea3e2..24d81bdf 100644 --- a/lib/services/appointment_services/GetDoctorsList.dart +++ b/lib/services/appointment_services/GetDoctorsList.dart @@ -28,7 +28,6 @@ class DoctorsListService extends BaseService { Future getDoctorsList( int clinicID, int projectID, bool isNearest, BuildContext context, {doctorId}) async { - //Utils.showProgressDialog(context); Map request; if (await this.sharedPref.getObject(USER_PROFILE) != null) { diff --git a/lib/services/covid-drivethru/covid-drivethru.dart b/lib/services/covid-drivethru/covid-drivethru.dart new file mode 100644 index 00000000..a9ebbecd --- /dev/null +++ b/lib/services/covid-drivethru/covid-drivethru.dart @@ -0,0 +1,52 @@ +import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/service/base_service.dart'; +import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; +import 'package:diplomaticquarterapp/models/Request.dart'; +import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart'; +import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; +import 'package:flutter/material.dart'; + +class CovidDriveThruService extends BaseService { + AppSharedPreferences sharedPref = AppSharedPreferences(); + AppGlobal appGlobal = new AppGlobal(); + + AuthenticatedUser authUser = new AuthenticatedUser(); + AuthProvider authProvider = new AuthProvider(); + + Future getCovidProjectsList(BuildContext context) async { + Map request; + + if (await this.sharedPref.getObject(USER_PROFILE) != null) { + var data = AuthenticatedUser.fromJson( + await this.sharedPref.getObject(USER_PROFILE)); + authUser = data; + } + + var languageID = await sharedPref.getString(APP_LANGUAGE); + Request req = appGlobal.getPublicRequest(); + request = { + "LanguageID": languageID == 'ar' ? 1 : 2, + "IPAdress": "10.20.10.20", + "VersionID": req.VersionID, + "Channel": req.Channel, + "generalid": 'Cs2020@2016\$2958', + "PatientOutSA": authUser.outSA, + "TokenID": "", + "DeviceTypeID": req.DeviceTypeID, + "SessionID": "YckwoXhUmWBsnHKEKig", + "PatientID": authUser.patientID != null ? authUser.patientID : 0, + "License": true + }; + + dynamic localRes; + + await baseAppClient.post(GET_COVID_DRIVETHRU_PROJECT_LIST, + onSuccess: (response, statusCode) async { + localRes = response; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: request); + return Future.value(localRes); + } +} diff --git a/lib/widgets/others/arrow_back.dart b/lib/widgets/others/arrow_back.dart index 498554fd..619f4f41 100644 --- a/lib/widgets/others/arrow_back.dart +++ b/lib/widgets/others/arrow_back.dart @@ -18,9 +18,9 @@ class ArrowBack extends StatelessWidget { }, context), child: Icon( projectViewModel.isArabic - ? Icons.arrow_back_ios - : Icons.arrow_forward_ios, - color: Theme.of(context).primaryColor), + ? Icons.arrow_forward_ios + : Icons.arrow_back_ios, + color: Colors.white), ); } } From f543126152217317eb318fad4e2ca03487940b47 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Thu, 1 Oct 2020 09:26:26 +0300 Subject: [PATCH 05/14] Ambulance Service --- assets/images/covid-car.png | Bin 0 -> 3140 bytes assets/images/covid_bg_transparent.png | Bin 0 -> 11952 bytes assets/images/home_health_care_icon.png | Bin 0 -> 4679 bytes lib/config/config.dart | 4 +- lib/core/model/er/PatientAllPresOrders.dart | 132 ++++++++++++++++++ lib/core/service/er/am_service.dart | 26 +++- .../viewModels/er/am_request_view_model.dart | 45 ++++-- lib/pages/ErService/AmbulanceReq.dart | 15 +- .../ErService/AmbulanceRequestIndex.dart | 59 ++++++++ lib/pages/ErService/BillAmount.dart | 37 +++++ lib/pages/ErService/PickupLocation.dart | 36 +++++ .../ErService/SelectTransportationMethod.dart | 39 ++++++ lib/pages/ErService/Summary.dart | 37 +++++ .../ErService/widgets/StepesWideget.dart | 114 +++++++++++++++ lib/pages/landing/home_page.dart | 77 ++++++++-- 15 files changed, 577 insertions(+), 44 deletions(-) create mode 100644 assets/images/covid-car.png create mode 100644 assets/images/covid_bg_transparent.png create mode 100644 assets/images/home_health_care_icon.png create mode 100644 lib/core/model/er/PatientAllPresOrders.dart create mode 100644 lib/pages/ErService/AmbulanceRequestIndex.dart create mode 100644 lib/pages/ErService/BillAmount.dart create mode 100644 lib/pages/ErService/PickupLocation.dart create mode 100644 lib/pages/ErService/SelectTransportationMethod.dart create mode 100644 lib/pages/ErService/Summary.dart create mode 100644 lib/pages/ErService/widgets/StepesWideget.dart diff --git a/assets/images/covid-car.png b/assets/images/covid-car.png new file mode 100644 index 0000000000000000000000000000000000000000..01090b744bda40c3e6ae3d0b4d9c1f631099bdc3 GIT binary patch literal 3140 zcmV-K47>A*P){hY5kj{0_78lgk?J%;l2XGxVc`cEO39xvr-em^ixVV<7mK#weTJ?rY*o1} zA<59S1-xOqDUfYxzX%^MvJ`B__}uz%tIBMZ#J}%4>xteHFk}|3Uj}k%#w445w_9|Mg%i z%4-El51p|s93?Fo8Cr(j;L{RT8M?Nj*=07BBscW)rQJ;R4Vtwx_96+hXih)W>}E7u zlbqpTUvUiYDCD5vpl$IcZ8CIiUNhU)G?ENmM@|Avp_-)?3( zlO~BR$N>a;H$e5ZjxNJ-sX?qrmNRtgp6!V->AK1~` zKX4k;VbRafwVl+$dPQmRO4T%h&^cH1_75EPtJRb)`Wd>$P0;m>vKdJbhZ-TEj@#sH zv1z>kVC76=JrNhoNgL0eq3#Y(^OiRq(^GG73wRHanTA zq%?uf0(Tj@7RrW>ut-|N|A{SLfO+?Q3z(C3CefJ!-Z5>;kXW@E^EQ6XYc+T3SB4>i zur|J3&HssCcLNqa{9`9&kG+lyFYUnS-j`vX7z9y>>^rnCC}3O6iMe#Ix&?D@y94Pp zw?gesBloU>k>~&BHEl^4Z466nJZ=XiIUey&+;EeVu6+DwFwcC9%&Yq_y8pkpbZ`&o zxr}oUw}#rm666+}V-Q4uMDGnqul@qMSKop}?=ldzd=ggEJ>s9~Fv_1aNp5u4G3k^p z|A=?=iUpXv;T|V(m>&-!`_}6id+P|Y?;J<|y|-ZvU6^cD!bJ>-e|o8tl6^NK(f3)z zm-c}~qxBRsJxBsj>N2;{i3jgR_Q(TDKO1^IL!A-E zjvfLtYk!4@-}~VckKp32mn(jIiG(sz)P#?Siq~w(cgO)BZ23CIj`~J-0x|a5!O-g$ zswT0FjZ;7QJ}$d^Gn9C8!h7xW!#MNIZ&7&vr0?$uP+VxCRgol>>dG!zII(3j=5Kxg zsTDW#z~uxvFy!BV8^h23KJ>bUZWL$s9dOcQaV;xgkhI2T=b~R4c+hq?IdIE@!40MqMhfhyeGbf#)v~G_asq6$>N4rnC)aHYap{D6fRld&3y+Hqcxi zL}|{jbaxV18z(qz@~t-EEGY6u&s7+%jshxWV3R(b!5_nnTo*<@kq{2gP+7sO;zLXh zJ!0%BEKq08XzJS@Ia=9s8sQEm5nu zlpe%N&HbYmlB!WpV3psMV+_AA=in@x89P#5wPVQAi&!g3GgqX61P~(1bwa`>lA_MqbXXH(jF@}@j1%RiJ$W``2=ed`D_JH3o-(Ysg5yTRMY;LOHBcFXBuS*tasgt& z#FRS1F4EAx^tQ$@QSpXV?i61rc2q@{*93(566HsdA3;PYB;tPNDasgAGHiT29x!t_ zU3{N(#^K-65eR39vp^VilP9x?KpLrqD0xmI!c|Oi5AZ(o9hvH&ZDWBOpnS8#USO^V zM_3ma%%TukQM=p?DPAx3&fKGJBJj5Qm!G#+HjjxU$!u24KhkICcS>pGUurj&q3F=w zggj2LD6F<4WeEw_ToaBK7Xp*NzF|jAG;)zuy9AF6?;3l}_fFC<{?2&9Xn`vWS%Fx%> z_dqh4EI$F$e;Q6p1m%S}9RbEfS!a#}SahN$i9?-7lt)&KQd;?1rVkin>1lcxZbOhe z=LAT*m~YH6Z1Z6cKCyCJcd= zX5kYis#QBW>P=c6Sg!HbiU5H7 zy`OA-QH>~t+UQ;?e_L>$C$ zQ6O2Os`>dwF(JZ`a3}wSXx(`cUP4I3XGrsoAn4fF{>b=xxY$POjxv_3L7sn3~xd+vQy!6E<=#~JU=Pt%F%OfZ6A#)LqrOV z2Nj_BIALDFezB*S4l#-#hlKL3+^P}fk>zXaGpPU);DpJ+!K$X@Oi`|Y&Mp#Fm|%GG z)g-w9Z+(LZB$*O%CdyZ6iH~_XQz2WyUdOg2!^;u~5;X}jQ4xt8j|fG006vAOf{{_n zT74&zCii?MeHOJzUQd!qVxqxNtKlGjrwAkw$(oz#!<-D+w+vdD^)toG5Y*#q-s8}~ z|E)LEAa;0pS%Uc(3uRh_0O9)W7J|>!&yt%ZYaFshP)W1ot2|7W5F}K;O)2ovv}*ax zqEh&>rpQBF)#0w%Z?ohyjv%rieP4lEgk0^OS)!_=T3Bqt-|H3dEFs~c=6GhWNySpYd(6|IAL4q|B zTyAD|c6Rsd+}Hb1Rp->H`XByN4^?0NvD%tS1bEbV&z?OaP*IlG{Wo6xYY8}5|9Umc zh<_7|&s5}P^!>7rEKGdKlroY`^&R+d8{-v586zA~&*-lf2N0S2R$F-+R#QFwHNp2g zpCv<1XD-x#x~vRu^fekMBw*n1e8|vsEa%yMac&XRCNHmOXRBhM5VE^hrvF2D>-cIo zF@4vcQ?p37+_=V98DyxMqp$jR`x3Kw)~0w?m4%+|SkwW7TC}DL^;iY-dAr9^Jj)Rj zlAmsh=l>XZ7!+HoS{``%=FbxgbkBIbM~=h5Ky^+wccC~v%TSeoqgX(-oUVA56yZOn zoc)eeLM}UBg$W^DVMur4f#^p_vVPJ%P%WP;@!!Uv-32R=7tj7%jXyHAucK-~evc%$ zJ*{dCZT!Jr`elP^D}qdWKSlPyPkrPy3;!#da6SZ^N8P&*kPLVe@;k`9Hbc6D|Dsvf zDgNQXoTG_h>s~V2CV)l42sS*>(%q4j%?7tQ&;qLEWQ|B()XreU?YPZ7x*^`D--v~J5kyOs?#6JM@^15owev`#$r^5+;|#*g_mJ`0 z?;|AytcI^Hw(pbaYiC@&ioBZ_l%Jkdg{KC5=k9H z!)*$L<$aRJxNi;+$B^Na@rS>#X@CYxLIqsU)xb+y`{twtmR?+~{bC5QM~@?zbtOCk zP?{+$VD+U_KPvD#AsIt6gbG+iN_Bi7>9IjIl|@|%4sn2U)4)*rU4oH^I8j;~8J#DS(8-;3-*R5-$Dk~Kv;gFk zH(qgeDKy~xitxRGDOMfdL`qEG1^wXLN}Flk%?>b36fmav+}UQPOX? zAgVw#X!!06k0QUL_$vnmr_QH6K%U7g@38K z+e-L0OnYwyS9>5$`0LXe$>j_fOZIhDKrAPaR0*3}83(^0 zOw;}^Y1hew@v26VdfXcZ^1R;i+YDLY=jRt3jrtS__SCSFx|?DSvJTXFbZv;w(j_oz zr9vJvK?U%o|BjED#}jS+O|QLVUbx=~F;4v)94

yfg5XnJb*p@D*Z@fHI*0Y5N;P^-nM5? zJ=k?vaS`^X=At;?h{xNYP9rpNc91a%^UMk9zHwknp&X%Xmf_nDNo;Zp_FFE#>SK= zC@2E#?Co35Zh~HQKZ$o}_2e%&;)JVQuF|hnVN?9ed4IsBY zwhf%@4YBt~B^h@b_VesH92!g)PkMkp^rS9fQVz%A`}X(gQ>mx9P5W__eh4W-^+d~$o3$Y&n~y=x;lx#Y9Oc6 z78E<<$Xil3jaDfs^Tr#jAI*(i`)p1^O`2SVwmTXpYB{{F&zU(yOG`Y`)lT@Og?p!h zGNX?LJOPA9*RZfzNsUeXKED8*zdw!V>u%MpG8E_hq&jSG_mn3tF21rwWvz3RFCruP z{?O#56Vra5;+Mc?gP`c8n@g~8BM18se^TF=$-M!o=B$a#@MIG)44XOFaHI=|P5!o$ z0d~auSi%hV01Fb|SV)|_>;22Nq39LHWVK&3y-v*^ffG?;q6k(1%_gnmi#80HWn$)I|H=eX)do)9rJEaAYtc>zf)5 z)-%S&7ATdX9GTN#sy;Y6==Ym&X)c-P1bu@B zV7Abzt3KM{+pJ;piUgWETdXgKN?FbcrbU82_&qYOPfA5pw?4N3XpaO zHUoa5O3ir{a^t?-M_*h2W?$M_7#QQM zDE-Q7WK%#mgDspvlx7l8;Q60e-y+|!?NBzxboQJk2NV29bR9R-cyrrzHNhuwWG}gf z#ucMb&dJl$A^zt{si#h#o3r14wIpxeW_nYYOyRU>umaTcKbdtwIt%?W)X-$=aLw~t zB(m%?zDF|;OgGZBDnR$JLB>?yKk3-wal=7b(`viIh$i$jc!e#}0I!mzh56rKGF}ooy4Uv+SK~!sauYH22fLtPE(-ar z=T9GQO8v8228WNxX=C+8&S#(m3FheY%mz z=gw$=stChUMZe|`Bua!QLrlRBn9adI3}blHYoOL-*os!eo$d_Pq$gL(@JKvZ8P1Vx zs+|@_n8?AR1S7$1ey3Cyh$nyvYe(le5V=;G`t_hc@TPwqpM7*O;-^iVg|^G{sI!b@K@P%Biqxwn2q%#^gMS3_@OE2|{Yxk;ykSWKUCE!Itz}0J1yfX6Qu_b3y=9n+f^r{!B}n}qAxWRoO%o}7C`h}2Yg*P)&8U1T zgdq}D;@xFysK}no7OU{_8e;<297UH}UV)Tv{)-&xL*b`17gF0@N=Lk1cB28^W(vvC zBtEm&j9s=(B7uJ{Ei7U+>+R4CyJ?qM852_*5Ks!j-L$ZS1}C4g6=*G?ImIKaRJ%85 zcFGlMr%ZRsI2KgKK)MnTipDy^tdqg(_99bUXi_49j0`{XHAzf4^TcU>Uy$G*D@ar> zdAH}Qiq%A$%_mZDp3C>;GP%I7g-Gh)j2Ka2XQ{*CF#Q|_(J5Pal|-;{*g+wwI{n#j zqn8Ikm|)hJBcje(@5Tk($Tsaz2vRdettSeYt}buA1cxx(&n@U2J>&Y_DW@L6d;0gC2gd;SeqHbPm@rXpyClFs4cY5>PwaGtBu*>3b00Mn;3L+<_^WVkDh;q^1C=zCBmWRY4$ z#xuP@q_TX9Xc0Uv^XpQ!_KOLXRTX%o%0-hf#PvMu|wGKW2o) z7@jx%0Uh!`}#$Nl$CExy{^AQiOg|CcCyg0T1Bz&^3ou@gd4AlR(!--%A$3c*xXG|Z`-v$ z1FEnQB6vc{Lv>4EWKI3iJ@aOE5ILA143^?dfHwDjFaR7z6brru-rqe6cJL9i^LVp_ zx)G5Cpi@MxJhGPcp;c7}I6)c{pgbZ>46p(@@3Dwlu7T~0KtBnTz8%j; z5gyYrig0hJtjvr6yZQl3S_*&g$qa5)%AIDXpv$w3$XehIf5=CrKPp$kv}e!-A(g+o zh#Eu2wP*#EGhsnVgTKqS+(Av>|K)~p57p2^xWR=>5g>~d}VVCBpH+?o}+X4a#heY_PW&2es8Ua+(ndt z2z?JE_g`=RX-P;lEt(8W1i|oGfY_gvQR?yneOoQ#BYbh6vw`|R_BSwZz2B`=z zf+n0bg#9rOJ^VuUz#Nkmc5!QfQ)t%y9r^cK~doe$o=dil&XfKa5#* zLCf^lDrU)OSf-oeQrO7{7;aFZd+ZyDK$iRRD6g?b{&y^58X^Hn)Qfb2WlT{YX(p5+ zT@y@;57>$cSmFCwP24KZSO{Y$PjTq52+WCQnkUUg@Tbt1B4G}5&i1V4KU{c!9Jjgf z$*B!I^!eT=l^C(;iWBT-#Bz2f>!|p$rjsgCoQs=Ij?enjd6mYo>+D&+3KZq!vFlVfNnqBSa zMK%&tjxRKN2fV|uKFKH#93H$6xkB-R8)c8LzLmgK`!McqKEMJ9jxx&Sw103wuP^&M z`jIcwQ#I>Es>!blu}x-vqFghfsqo#SNZ-f;a-65nwH@Yz2~j>{>M0w&m(iLjj56CE z|L%-z$|;O?F911=GBixkJq+As9Nd3%NJV9km<&urwjYU0(nw4arJ0hSm;&~KVYoy@ z6p+4fVEI3@Ww4%H6B*^egC1HslJ;)kb!dF%h-&#KMTwAl8x=pHtchi)ru7nDDK01g zFHr8r4+!PkxLUj+(W0rV3+P8~PFep$&>W3{W2ZlE`mYmnR0S6iDBL|T3hgJfL5%uY zKcLZR?)2V0`k*l;`3_05@z)fA?kVZPj#`jmgveGFQWGgxAK0{l)LyAR5Qk7yh`#D7w&yybe~2+dDeu34M>?{Ip?}Z~Px?>j z#-u~?I#y7lLq$LLhV^C)@PF}^g2H@p)wH?)Z|IgDYcQeu$J|R!F?j!9<_;;x1HP!&x;lV-A%Z&#z zYBrIN7ZrHIGI6`Eajh%4#UI}UX%1X0jWDW&4okVx=IxrQlQKkZm=L`_exb`|f>SAq zQ-guttvlVS(4PJq7dz^>_XHQAM?riN%pT7yK3_Vs&a`kiIh9!ENlGI(l3y%H{In1& z!vJ0XzOpWfxT1yMa)2_E%$#NH9@&B(r_K%^#dD#dMC`@9T*ckudwU`Haw9Av0f!V9 ziv;6psF4S%YO~?p8THII#i6Dcga4OrzxV%7-Ig9=#KlFa_MZ?pfGZ-+fD zcHkstSkAD=aPB3TiO~Ubw{a|2Uy;QX!KqfCqp3Bv?!dkInSIha2um)tS$$)F|NI8d ztm)6QkQQC#zZTZ#3&dU?NiRK*y=H-zVrI*Qx30lh_o!d^TYa#FS_c`0A%B3PMT8Wh z{2zL>%+8~>Loh88>!hosLVE0l_B;G3W%TG(-y~CAb4BV-%z(RY%rV-u!eVSahRw9h zd-mVNP+E;Vv*`CF2h7JXk$}jPxk;&MtmzNPB9`gK`0Y33Jg?;+TTHuhCA`7UuIR-KehGyOuQLkZ>JbsCANz^2M5RaV<_i`+ z*!I2g5OcVj-u0?`iO(RIB6}9xCnkt^4lUuP`ml?$0o+9XHBHKt`--vNIIvN@e>U)d z7SHa7D8S3=q%PpT=4GCDL~aVHyZw74&Zkm5Z~Ea>!HM{SPdu@z5R!}{`}p^(-xJ5R z2!Y8HE&8K;p8cc`p`&;#0LO>qG+JP-DPlVb(rL*Uf<)^>x+30@IQW`0%gGwuTrGQh zG#1r^w#&-;yw5bQi7@r@qMbp%@JcqEN>G|}hR{7iVh%t!uRL8|t>^qE&3ESsYX}Sv zO#p0*&G;@i%9xoFqs>&EM1%Tq6XP)#`ecS~^SN(N6yx4}jL3{&m!HBpiu#dBuD1c^ zU-mhqFk(1a0K#Gr# zxmrBNdBO~lBNGmW6I$;9Tk&BPo4cID`QZu*Qb=>&@I4MXxsw$N4$f4W@(-CyI$2jl!`*6HA^KVh&Nq@{d}(_7^tA->Pqu#lN_$7Nf>;Fa zzB~ z%A<7(#Mxh*w5Uu0TmP736gl6%b ze-j_`W9)1?|Kxa-K7o@ro&y^HXY$6Q`495m)%VM&96l`F#gi)(30X?x!Y4A7`vTLY z-S$If4_OIs%IA>3y*JMl#6doLM(F$>wE#c!0~urNy;tJhWs4?nnHGFsPlq}ntDI0gSVLE~7?OC9^ecdDC5EFE2B}e>*Im;ZwkK%a znR*5x#~Gmt@V>?xq%L9EUl*DRv}RpUxaJ)VhwjiOU*&D4eXudqEl=mZsgiNt6+Ul| zXgic&DP&&}ii>>bpSwT|>|BOvWru4?!OktH%=>h=T>OI3?&@CKg<<}wmM)0=gCC0I ziBTmSdDr{O5BRlB+H?ScN8*9Iz)t|+pCm2NA^c{QGBL?K?rd#`DU}M(MAvQ^0tKRa z%DnXL4Nry;h;Ly>zAqjQKcM*tpMd)!=6Dha4A3(A@@rO7WeZTP#@u#0ySo~ITX+}c z??@wJGml6wDX)wdE!Q!;ipG#yqPh>xCFxaMazxS{`$<J63RkHh+yU(3BePg=JM6k>Gmayk1my)fw`7z+k+Vu8TEX&5f-Ddcv7-dJ?HO27K}wv(Vzud zYi2iFGxOj*6~K=;oX4Wn5=KR$<)$s-ia%3OHH@#L5(sJPC`Z$3p@WcQr=(3$#p8x# zmiBhStqrtKz29nqt;wTOj#_c>1qkarn77%lpK)iJ^hEh2W8_Iwnq5cCnIFRA*U+@? zAEqo(rBGdeQhabqw|5p-QW6Nvnn+f;Kg93+A7Fgte}eJk8;J&WNivhX7L0l>IjLT? zQRV6c&NNatYX?=noCWX#p1L(}acq7vhJNIcY`iyaf6u=%hu$l_EKf&(fGi{kUj@E^ z^Dz}f6+pV|M@D*)ohV4YI_kSV^x6k{7HIq}d~$>xZUah?{m0^57@s&qZ0_jj=(=Zx zMqWR++wh*A<-23<=Hd?vot!eNs(abVnxfD|u=AMG#wb!@jF(HWX(s_WsHXI;{s@Ts zE#3Jg>$ll1flN}eu{88QNjz3Ea&Fvmx|wn7xm*oD47+@M{F55tpelRVzEUQ5(Qc<& zb~Xb)oN@f}=fE6;S2j|<{>qr90L`Ibq2(Oy4=a9mIYZE7{&btC|jB zBgiT?#b6dOjgbQ&3RkZ3yR-&YPWp}S@V?_4D>vX8A;`1}0`N_BiYp);Lqh&bjEx$R zLc972-OB8ys@f1(Y2Zg^o!jP7cgCiXY{+ZPKOH z#epO?S5VBJAyAnwAt-Ya z|FYVxS6W<-+xURNJs#J=Lgyn)x^4379Ge2m(3kg-X;8urWE8to$sPx&orv1pH>VBU zL?}j}aS$+8nV?NCHyu{AhMP@lOios}ZcLsv+Dw1@8pjFkql^9kf?i!r;HZTF@W9P$ zmxRlq=GBIQwY|??E=+-{)?>VIb-1&|Rx8B%+Ft6|;~7WHoap_d@30D1^2>7qlGHfo zkF~t1h7&xlYPf#oCxZ8=GYm5o_9XnY@5jnt7PBqkuosA`JA;TEi~BZ+ExpEj%=>Wju5DZ=`chtrso;*A*fS0>JpCH! zLC{F3kE?L=k8@)F!_VhuaaoDV8RGd;j(mT;F3~M_$v%mlU1Q(5 zVoNZ2h3?kgG^FO2EV**!tuGE)n-Cv#WG7*;%PwmzVmNWfl@J=-305dVS%$N=kbbNj zeaw}wgS~hJeD$&I)J9wXZSrcI3UC1jbS=}!7C<-&DDKdqcjo6G%aN4a6^XNxk_$Y+xZ!q$-_IO zUS;lQ(>CqkQ&Lu{T&hND%u&`puY(k2n|F~&Go0_Uvy74xnt8PJ)@Y4b-T(|?qMbk3 zGL;+Rq#k>G^pwczui zR&s}YUmMp?Gbz2iF(@WDkNvS&udBxdbjE`c9IeFS?%73Xe6o!P$^UWSD26gH zCs+5yxqusHLjp5?M+AfYw~QTa`-6A7C5Y4Jhu&|cRXzr-GIc5aE}%*jpE^78ONgeO<*N3FdEX;AiXvdMaafR^i6G+8nH|e=F z%`-nH?g)QGc|xdzUW$nvTg-oPINWQRun1FX_=I6mn#!mE!(lfKtKq1a$*&>8UK|S@ zRO=AOS=|tK)s%_IH7?`xfYWr%rDSZrY%W9$wW71$f1g?iT@6tRT7Q4!3s^9J>nck% z;#j2=j+fuI{o&P(ZXC|aHj9qm8*e%|7R-p=?ur6sd1&|ZvFJqRp7DXlh zCH@3=#)eMkcd$I4W0NwkY-R!M7Y+Gz@H$E2QDm%2$!UTjNwi7CL|wGkln2;{T&B3y zXEX+%wQrwOI~>Deta05DJw3%gzp=D3fF``;L_TN(lfq-L`L6u!9{&!@Q~1ro17uNv zwKM^n-;t9g6@x6}aKOHh-Io~g4v$ee&xGyf(tVX(1I3Bm31q<&0o*xtP$ay2mH&|R zcF?NK-o|18(Bx99)6-WNORt`ek@CS>W^`u{N1IaE_WQ{CX;qU1e@($ydWSC>f=Jp+;=1cMB#`ud*BmBpc2M#?0 z3%+@Mo=rbAvt(@Zx^Q04cbSAc|8sQh|8n#whhJAeHHZ`g&NSLyUZM``Zg_be-bT-X zq%j4RxQ~3NQ4jBqPIaC4``+(;ulIef>zU_%?)!KDm*0PR?rV;^?6H%PQjr1x zK*qryPXwQ~Yqz90_^Xz#s|`NZh1&091HgLuwOa_tFH`~mF-4l2C&!cEge5cS`Xma| zpQ;~44+YTxU~Ul=N+JhSIS_wpAdP{8PTy>TLTD5m)We8?B!t>fgJ||KEb6Z@d)&w| z!DI{tYOxby9)$%3(5V~}B#IuwU}K|j&~I|F;CO8s0fl^naDs7At2KoXPl5}?hRLEr zjP;RlG7^b~m|*l##)byQNIeJ|iAExjXavdtjznRRCRj8Y^8JE>+E|nTED^u!yDsnz z2MywILa_)$WMrg%q=7z@6^KA#FqkzNXfzx|z}e9Z4k-%GU~B%6fTyy_ELtds#$-U& zB$E7@;T#+kwDd0*=%GKwGT7f~0trJzkwOtDedL-;-+&bIPh4m?E99GU3K>BSq0*@g z4jaUxequv|m>ecMi247B{<-`Q3P5TJgr7S8sV#K+PZeyAZ3O7XcS8Otn(Y=HN<|Q< zY-Tu%Otp;w&D31;CKPMKqLMgFmK&29@*_|#KTL+8K~Eqs4;q8QjAU#7Z37ig;!ttW zwWz_7#&DFe8w!OrG{B;fx<~^o68RUDz@*RuqW>?{5Nl+DH8A=ID3~%75{L9}!4xt! zfXSkhK!<5`QXmx($_Ru)e$t4wVTLeSpkmNEgTK!^*x0zRm;tm9aDh#+8CoS z#>Q~8KI)sf1OnE9!RC+{WU2!m2L;K|r_m@_v|)e=m1=4Lr;-f~;Yf@j8E$H1K!F>W zBB`b*1ET;8#pK6+Jd+&0mI6QaQ~tyK&MX>Of~1iDTFzQwuH_Eap2h~F8vVU=ex-(e zABE5$-_iw3BCnMJ4oY5&Ka~RgK27_t8TdTmLri z5TNmhwSxW255)g=@!Q(piu(r~>=o)gsyJ3uTY63*qv*_-Z-T^>X{UA>P8G>#Sk}JMNvf zsZLMNDv`y+zO?znv_`(kZ$|_r5fl6NjzjY03{$8?q}nUfj3?^@I;SR|zpt5XFt~~v z@pk`=M3`JP7`bX@U}m?{U9oq*-+6iIVtHvp!$nWMb6)!AU0{~33eq;#l6dGQH=SQ} zavwe`#vN23^rW)&H!CV8k45|FDP|3YL1#iGwmvVKZ9&t0nxa2Yo;NIm^K=&-+(@f@~T+?C+L!_`P=Ftc#xF!S;=kKv{YD z9%tu-hyw=%>M63Bq-PS+L$<+|D_F(f<8Bvg@v;GP=xd^*7@!Fi=Gt##=>ioM6|s)4 z*|nr0jG^;8QBkf_Y0oTp)eqHean#BhC?#GrFmeIP{VtT2HW@jcP?l1#faE#7ooa1u z{h~y+5C-lKKIwTkSDKTX>)UkNuWpOf*z<}`4b{ZL-8|wEWwNtLu7~?P9$U0C3e_B< zo2>=$4RWj$x#7`sja($~4nYo!^VYR56FSfZoyBWgmbty|BC{Pl9&Z54{k#y7G^7Z# zvOL-GCyCHg{LIO$yuA1k1ubF5y+Ji=mR55#fuvOvgf33_bCqG)Rw5UJ2mQpwsW-X3 zMovhP#F`OHfr{ek+h?WM+k3YFJ)5&hAmnEAoHP|;narK@vVU@jGa^{66zRaYjL0t? zFl(NhGv_fOMC)q3KhI#3`kE3%1)dd|+m8jO@;N}(B7dW6yNGwl>%s(x;_o<>6K#uq zkpnS&jSGGKuZWL)nK6_x_mbf+D|Mh}J;>V{2 z8pm20#xe?zat=E;S&DADTYL!BcDUv~ z&*}`<8)*KN(HtTLlB}eZp*J=%e44LWeH2RS6xL`-{_=XZ>I_DByV?fB29HcyGbUPXqU|_WPq!)r zIBhW_(j(U>Bq_|A4&Zu45ApVo^IvinCWr2PoXqM6v{tg z)*?iDAh=yZ<(Bu`+Ts#}@*@npN>pUOtx57sb|g|k)Ja>vG^4ULT>#(H~u z`x9krfwS#FO>qP*8BweCr8y z`)zXR$BMZ2+9W0MyRVSRvH;Mk(){ens>ltpUCHs|waS9{rQ+pQ`M?#c$_k$$fA9KV zj;bW&Zx?a^PR&hN%pqPe6KY4b937C>TKC)TH@nwnR>Gtld2+{Eq0%i}Sz$0I!Mc$U zG6&P)iWZdUe#-i6S0{chyDoB?znoURu}`&Ql-2P}jpZgO)Pj^fig(dDbqDjp??OdH zS0LE~8^2`s`s<7lWqfKrX`5<-ep!U3rNSli<>>@P@!O5n`Ajy^dLSH(@p-VbxalOK z7KmC|7<>GS^tLx&fIBr6mm;U0&6D7AN1a51JaK6B%+;Zxq4RjrfpF4rM2kV4PUd4T ztHVBGW2PC!13vbyPlXBg?T%t_m+L@^lZ&bJKK(i)UbFAUjLMUzm}Ey zUh|x4Y8i|-r$qkfsn^d!wS~oJb_V$NRyGLAqc!er3>m)t*s$}yHFIA-HHYfm?>4qP z%EDxKP~LZ6yWqNGG{rX~X{KPTV$bYjt!*jeQ8EMJC=@CTrjj17Uv_&e`j_FlGj8tl zGU=%<`nhMS=w_t+w=G1+lvpjfwy@VXy!0>7eiH{2PMoj$U|h4qmy6vx;WnBiUX79t z(p>CbFZ;2m>zM5augc8F7?!C_t#Wd4BlXm`J(SHnT7X+ zo3^dU2>PalF6vlv8xquE6k(uuaZ;=}ZiAsp3afQA{Q$I9bY%gPQEpx6E1s~d_sqW- zevHjPz~OPYg3fr&O#45K2)mhTO7ToP#nkb%v1l{;@PZOKPT5*Rp8v4a^%I^xuYJl7 zHwRdsX_5eBm%8J+EW$K{?j<#p8mGIfRg8Qt{jjG{I8W=3mk{qO`Xh1eVQM}X-S}?q z;g7F4*};g8r!TDQF?3ikeZvfr^^6n?Z|Q>BO!&k)|HBjhBZ zz(YM>a>qrny*Gc3-3q^?onK>FS|P{ z{9@a@v=qZ6#dSRpvCMgZ+&CgMaaIER*5me~QencfGGN*C3agY53xF&=(n#LPF8i(h zO}p=ESk#p>V&SF-wr>xeUx&Qa(8l(zf4X?v$0oN}f*d2BHL$Y5FI_apJz~dKgQJ$O zG6m1yY;L6KWPg$lT?#L0X;)qC3_iOfK*K9?J?=ww?U@JNK1bp^Ymp2raAU9J@!t-; z&VH+^#;H&FAoDB4%%3E%Z6|gHkukO(=f#)vgGu~YpeEzR$>k!$)6V+^s@4`vk~II_ zfTcxrUHI-2nCzJ1%Ud%l?S?>G%JL`IuAsTQvkE02qlmY!KFjCp5rq>Owjzn$lkm&R zCoM&5tjo+7woOhmKWww^``ziPlp!VQOssNnn{!Ez{q~;m>ob7T>0IE@SIP38HzMvL zQFJ4cbT9oTWP8a(U+B*3UI%SN(k_dO^IpLT-G~><-eb8;e&2LFZ{AvtGOkPSXl;%& zH6DC2Y8>VG=|-uA1mwf3$2VO?;!IxXiZxX&uG$`oHBryX$~ttQvUFmjqlog(aEO6{ z!ELI}J9mWyBMHT$&_#jn>D86^(&H?4A4fGfhKv19rxWJh$E&5Gzq}uY&pI zX2cZu@lOWNOqZCj0wM5Vc5hqSQHQ8jXwB*uIfZm9Qs0YR4(ARuWFs$J*mPs2yfPx~ z_}(Yg5<(XcumZ7eR&%J*)%q7HL&MX8vF?`OV{`~44Nqk9`G_dDBSW} zotY&S9rZHwxVRCMUnNNs4L+i>BIR~!he?y`jH2)Uc%4PiP=h+nxqJn}{%A(5QkLh^m$Ng~y@tL)a zjj>tYu0E zmfzA*@k*8C5#KEe#nNM9mWXa6Y)_l>fqlp0S_J}u>QKnS3aCPQtntl0=c~ptt#xz? zI json) { + iD = json['ID']; + patientID = json['PatientID']; + patientOutSA = json['PatientOutSA']; + isOutPatient = json['IsOutPatient']; + projectID = json['ProjectID']; + nearestProjectID = json['NearestProjectID']; + longitude = json['Longitude']; + latitude = json['Latitude']; + appointmentNo = json['AppointmentNo']; + dischargeID = json['DischargeID']; + lineItemNo = json['LineItemNo']; + status = json['Status']; + description = json['Description']; + descriptionN = json['DescriptionN']; + createdOn = json['CreatedOn']; + serviceID = json['ServiceID']; + createdBy = json['CreatedBy']; + editedOn = json['EditedOn']; + editedBy = json['EditedBy']; + channel = json['Channel']; + clientRequestID = json['ClientRequestID']; + returnedToQueue = json['ReturnedToQueue']; + pickupDateTime = json['PickupDateTime']; + pickupLocationName = json['PickupLocationName']; + dropoffLocationName = json['DropoffLocationName']; + realRRTHaveTransactions = json['RealRRT_HaveTransactions']; + nearestProjectDescription = json['NearestProjectDescription']; + nearestProjectDescriptionN = json['NearestProjectDescriptionN']; + projectDescription = json['ProjectDescription']; + projectDescriptionN = json['ProjectDescriptionN']; + } + + Map toJson() { + final Map data = new Map(); + data['ID'] = this.iD; + data['PatientID'] = this.patientID; + data['PatientOutSA'] = this.patientOutSA; + data['IsOutPatient'] = this.isOutPatient; + data['ProjectID'] = this.projectID; + data['NearestProjectID'] = this.nearestProjectID; + data['Longitude'] = this.longitude; + data['Latitude'] = this.latitude; + data['AppointmentNo'] = this.appointmentNo; + data['DischargeID'] = this.dischargeID; + data['LineItemNo'] = this.lineItemNo; + data['Status'] = this.status; + data['Description'] = this.description; + data['DescriptionN'] = this.descriptionN; + data['CreatedOn'] = this.createdOn; + data['ServiceID'] = this.serviceID; + data['CreatedBy'] = this.createdBy; + data['EditedOn'] = this.editedOn; + data['EditedBy'] = this.editedBy; + data['Channel'] = this.channel; + data['ClientRequestID'] = this.clientRequestID; + data['ReturnedToQueue'] = this.returnedToQueue; + data['PickupDateTime'] = this.pickupDateTime; + data['PickupLocationName'] = this.pickupLocationName; + data['DropoffLocationName'] = this.dropoffLocationName; + data['RealRRT_HaveTransactions'] = this.realRRTHaveTransactions; + data['NearestProjectDescription'] = this.nearestProjectDescription; + data['NearestProjectDescriptionN'] = this.nearestProjectDescriptionN; + data['ProjectDescription'] = this.projectDescription; + data['ProjectDescriptionN'] = this.projectDescriptionN; + return data; + } +} diff --git a/lib/core/service/er/am_service.dart b/lib/core/service/er/am_service.dart index 181ad37b..016cc2df 100644 --- a/lib/core/service/er/am_service.dart +++ b/lib/core/service/er/am_service.dart @@ -1,25 +1,39 @@ import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; import '../base_service.dart'; class AmService extends BaseService { - List AmModelList = List(); - Map body = Map(); + List amModelList = List(); + List patientAllPresOrdersList = List(); Future getAllTransportationOrders() async { hasError = false; - await baseAppClient.post(GET_AMBULANCE_REQUEST, onSuccess: (dynamic response, int statusCode) { - AmModelList.clear(); + amModelList.clear(); response['AmModelList'].forEach((vital) { - AmModelList.add( + amModelList.add( PatientER_RRT_GetAllTransportationMethodListModel.fromJson(vital)); }); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - }, body: body); + }, body: Map()); + } + + Future getPatientAllPresOrdersList() async { + hasError = false; + await baseAppClient.post(GET_PATIENT_ALL_PRES_ORDERS, + onSuccess: (dynamic response, int statusCode) { + patientAllPresOrdersList.clear(); + response['PatientER_GetPatientAllPresOrdersList'].forEach((vital) { + patientAllPresOrdersList.add(PatientAllPresOrders.fromJson(vital)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: Map()); } } diff --git a/lib/core/viewModels/er/am_request_view_model.dart b/lib/core/viewModels/er/am_request_view_model.dart index db1acbf0..6e08d984 100644 --- a/lib/core/viewModels/er/am_request_view_model.dart +++ b/lib/core/viewModels/er/am_request_view_model.dart @@ -1,32 +1,49 @@ - import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; import 'package:diplomaticquarterapp/core/service/er/am_service.dart'; +import 'package:diplomaticquarterapp/core/service/hospital_service.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; import '../base_view_model.dart'; import '../../../locator.dart'; -class AmRequestViewModel extends BaseViewModel{ +class AmRequestViewModel extends BaseViewModel { + AmService _amService = locator(); + HospitalService _hospitalService = locator(); + List + get amRequestModeList => _amService.amModelList; - AmService _amService = locator(); + List get patientAllPresOrdersList =>_amService.patientAllPresOrdersList; - List get AmRequestModeList=> - _amService.AmModelList; - getAmRequestOrders({int id, int projectID}) async { + Future getAmRequestOrders() async { setState(ViewState.Busy); + await _amService.getAllTransportationOrders(); + if (_amService.hasError) { + error = _amService.error; + setState(ViewState.Error); + } else + getHospitals(); + } + Future getHospitals() async { + setState(ViewState.Busy); + await _hospitalService.getHospitals(); + if (_hospitalService.hasError) { + error = _hospitalService.error; + setState(ViewState.Error); + } else + getPatientAllPresOrdersList(); + } - await _amService.getAllTransportationOrders(); - - if ( _amService.hasError) { - error = _amService.error; + Future getPatientAllPresOrdersList()async{ + setState(ViewState.Busy); + await _amService.getPatientAllPresOrdersList(); + if (_hospitalService.hasError) { + error = _hospitalService.error; setState(ViewState.Error); } else setState(ViewState.Idle); } - - - -} \ No newline at end of file +} diff --git a/lib/pages/ErService/AmbulanceReq.dart b/lib/pages/ErService/AmbulanceReq.dart index 9c4dfa29..8e9f54bc 100644 --- a/lib/pages/ErService/AmbulanceReq.dart +++ b/lib/pages/ErService/AmbulanceReq.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/medical/prescriptions_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_history_page.dart'; @@ -9,6 +10,8 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'AmbulanceRequestIndex.dart'; + class AmbulanceReq extends StatefulWidget { @override _AmbulanceReqState createState() => _AmbulanceReqState(); @@ -30,8 +33,8 @@ class _AmbulanceReqState extends State } @override Widget build(BuildContext context) { - return BaseView( - onModelReady: (model) => model.getPrescriptions(), + return BaseView( + // onModelReady: (model) => model.getAmRequestOrders(), builder: (_, model, widget) => AppScaffold( isShowAppBar: true, appBarTitle: "Ambulance Request", @@ -106,12 +109,8 @@ class _AmbulanceReqState extends State physics: BouncingScrollPhysics(), controller: _tabController, children: [ - PrescriptionsPage( - prescriptionsViewModel: model, - ), - PrescriptionsHistoryPage( - prescriptionsViewModel: model, - ) + AmbulanceRequestIndex(), + Container() ], ), ) diff --git a/lib/pages/ErService/AmbulanceRequestIndex.dart b/lib/pages/ErService/AmbulanceRequestIndex.dart new file mode 100644 index 00000000..863d3b57 --- /dev/null +++ b/lib/pages/ErService/AmbulanceRequestIndex.dart @@ -0,0 +1,59 @@ +import 'package:diplomaticquarterapp/pages/ErService/widgets/StepesWideget.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/cupertino.dart'; + +import 'BillAmount.dart'; +import 'PickupLocation.dart'; +import 'SelectTransportationMethod.dart'; +import 'Summary.dart'; + +class AmbulanceRequestIndex extends StatefulWidget { + @override + _AmbulanceRequestIndexState createState() => _AmbulanceRequestIndexState(); +} + +class _AmbulanceRequestIndexState extends State { + + int currentIndex = 0; + PageController pageController; + + _changeCurrentTab(int tab) { + setState(() { + currentIndex = tab; + }); + pageController.animateToPage(tab, duration: Duration(milliseconds: 800), curve: Curves.easeOutQuart); + } + + @override + void initState() { + super.initState(); + pageController = new PageController(); + + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + body: Column( + children: [ + SizedBox(height: 80,), + Container( + margin: EdgeInsets.only(left: 12,right: 12), + child: StepesWidget(index: currentIndex,changeCurrentTab: _changeCurrentTab,)), + Expanded( + child: PageView( + physics: NeverScrollableScrollPhysics(), + controller: pageController, + children: [ + SelectTransportationMethod(changeCurrentTab: _changeCurrentTab,), + PickupLocation(changeCurrentTab: _changeCurrentTab,), + BillAmount(changeCurrentTab: _changeCurrentTab,), + Summary(changeCurrentTab: _changeCurrentTab,), + ], + ), + ), + ], + ), + ); + } +} diff --git a/lib/pages/ErService/BillAmount.dart b/lib/pages/ErService/BillAmount.dart new file mode 100644 index 00000000..86b0d181 --- /dev/null +++ b/lib/pages/ErService/BillAmount.dart @@ -0,0 +1,37 @@ +import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class BillAmount extends StatefulWidget { + final Function changeCurrentTab; + + BillAmount({Key key, this.changeCurrentTab}); + + @override + _BillAmountState createState() => _BillAmountState(); +} + +class _BillAmountState extends State { + @override + Widget build(BuildContext context) { + return Column( + children: [ + Texts('BillAmount 3'), + SizedBox(height: 45,), + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child:SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + onTap: ()=> widget.changeCurrentTab(3), + label: 'Next', + + ), + ) + ], + ); + } +} diff --git a/lib/pages/ErService/PickupLocation.dart b/lib/pages/ErService/PickupLocation.dart new file mode 100644 index 00000000..bdb1ea52 --- /dev/null +++ b/lib/pages/ErService/PickupLocation.dart @@ -0,0 +1,36 @@ +import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class PickupLocation extends StatefulWidget { + final Function changeCurrentTab; + + PickupLocation({Key key, this.changeCurrentTab}); + + @override + _PickupLocationState createState() => _PickupLocationState(); +} + +class _PickupLocationState extends State { + @override + Widget build(BuildContext context) { + return Column( + children: [ + Texts('PickupLocation 2'), + SizedBox(height: 45,), + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child:SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + onTap: ()=> widget.changeCurrentTab(2), + label: 'Next', + ), + ) + ], + ); + } +} diff --git a/lib/pages/ErService/SelectTransportationMethod.dart b/lib/pages/ErService/SelectTransportationMethod.dart new file mode 100644 index 00000000..a5fcbb75 --- /dev/null +++ b/lib/pages/ErService/SelectTransportationMethod.dart @@ -0,0 +1,39 @@ +import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class SelectTransportationMethod extends StatefulWidget { + final Function changeCurrentTab; + + SelectTransportationMethod({Key key, this.changeCurrentTab}); + + @override + _SelectTransportationMethodState createState() => + _SelectTransportationMethodState(); +} + +class _SelectTransportationMethodState + extends State { + @override + Widget build(BuildContext context) { + return Column( + children: [ + Texts('SelectTransportationMethod 1'), + SizedBox(height: 45,), + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child:SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + onTap: ()=> widget.changeCurrentTab(1), + label: 'Next', + ), + ) + ], + ); + } +} diff --git a/lib/pages/ErService/Summary.dart b/lib/pages/ErService/Summary.dart new file mode 100644 index 00000000..4f792b68 --- /dev/null +++ b/lib/pages/ErService/Summary.dart @@ -0,0 +1,37 @@ +import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class Summary extends StatefulWidget { + final Function changeCurrentTab; + + Summary({Key key, this.changeCurrentTab}); + + @override + _SummaryState createState() => _SummaryState(); +} + +class _SummaryState extends State

{ + @override + Widget build(BuildContext context) { + return Column( + children: [ + Texts('Summary 4'), + SizedBox(height: 45,), + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child:SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + label: 'Next', + + // onTap: ()=> widget.changeCurrentTab(2), + ), + ) + ], + ); + } +} diff --git a/lib/pages/ErService/widgets/StepesWideget.dart b/lib/pages/ErService/widgets/StepesWideget.dart new file mode 100644 index 00000000..3f6b57a4 --- /dev/null +++ b/lib/pages/ErService/widgets/StepesWideget.dart @@ -0,0 +1,114 @@ +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class StepesWidget extends StatelessWidget { + final int index; + final Function changeCurrentTab; + + StepesWidget({Key key, this.index, this.changeCurrentTab}); + + @override + Widget build(BuildContext context) { + return Stack( + children: [ + Container( + height: 50, + width: MediaQuery.of(context).size.width, + color: Colors.transparent, + child: Center( + child: Divider( + color: Colors.black, + height: 3, + thickness: 3, + ), + ), + ), + Positioned( + top: 10, + left: 0, + child: InkWell( + onTap: () => changeCurrentTab(0), + child: Container( + width: 25, + height: 25, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: index == 0 ? Colors.grey[800] : Colors.white, + ), + child: Center( + child: Texts( + '1', + color: index == 0 ? Colors.white:Colors.grey[800] , + ), + ), + ), + ), + ), + Positioned( + top: 10, + left: MediaQuery.of(context).size.width *0.3, + child: InkWell( + onTap: () => changeCurrentTab(1), + child: Container( + width: 25, + height: 25, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: index == 1 ? Colors.grey[800] : Colors.white, + ), + child: Center( + child: Texts( + '2', + color: index == 1 ? Colors.white:Colors.grey[800], + ), + ), + ), + ), + ), + Positioned( + top: 10, + left: MediaQuery.of(context).size.width *0.6, + child: InkWell( + onTap: () => changeCurrentTab(2), + child: Container( + width: 25, + height: 25, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: index == 2 ? Colors.grey[800] : Colors.white, + ), + child: Center( + child: Texts( + '3', + color: index == 2 ? Colors.white: Colors.grey[800] , + ), + ), + ), + ), + ), + Positioned( + top: 10, + right: 0, + child: InkWell( + onTap: () => changeCurrentTab(3), + child: Container( + width: 25, + height: 25, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: index == 3 ? Colors.grey[800] : Colors.white, + ), + child: Center( + child: Texts( + '4', + color: index == 3 ? Colors.white:Colors.grey[800] , + ), + ), + ), + ), + ), + ], + ); + } +} diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 59c0a167..b811ef8f 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -64,6 +64,68 @@ class _HomePageState extends State { MediaQuery.of(context).size.width * 0.8, child: Row( children: [ + Expanded( + child: Container( + height: 110, + // padding: EdgeInsets.all(15), + margin: EdgeInsets.all(5), + decoration: BoxDecoration( + color: + Colors.white.withOpacity(0.3), + borderRadius: BorderRadius.all( + Radius.circular(5), + ), + image: DecorationImage( + image: ExactAssetImage( + 'assets/images/covid_bg_transparent.png'), + fit: BoxFit.cover), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox(height: 8,), + Texts('COVID-19 TEST',color: Colors.white,), + SizedBox(height: 15,), + Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Image.asset( + 'assets/images/covid-car.png',width: 55,height: 55,fit: BoxFit.cover, + ), + Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Texts('Drove-Thru',color: Colors.white,fontSize: 14,), + SizedBox(height: 4,), + Container( + margin: EdgeInsets.all(2), + width: 90, + height: 30, + decoration: BoxDecoration( + color: Hexcolor('#D81A2E'), + shape: BoxShape.rectangle, + border: Border.all( + color: Colors.transparent, + width: 0.5), + borderRadius: BorderRadius.all( + Radius.circular(5)), + ), + child: Center( + child: Texts('BOOK Now', + color: Colors.white, + fontSize: 12, + ), + ), + ) + ], + ) + ], + ) + ], + ) + ), + ), Expanded( child: InkWell( onTap: () => Navigator.push(context, @@ -83,19 +145,6 @@ class _HomePageState extends State { ), ), ), - Expanded( - child: Container( - height: 110, - padding: EdgeInsets.all(15), - margin: EdgeInsets.all(5), - decoration: BoxDecoration( - color: - Colors.white.withOpacity(0.3), - borderRadius: BorderRadius.all( - Radius.circular(5))), - // child: Image.asset('assets/images/livecare_white_logo.png',), - ), - ), ], ), ), @@ -359,7 +408,7 @@ class _HomePageState extends State { child: Column( children: [ Image.asset( - 'assets/images/Dr_Schedule_report.png', + 'assets/images/home_health_care_icon.png', width: 50, height: 50, ), From c7d396875e13240b960309d6f02d8f70d834de4d Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Sun, 4 Oct 2020 10:06:01 +0300 Subject: [PATCH 06/14] Ambulance Service steps --- lib/core/model/er/PatientER.dart | 200 +++++++++++++ ..._all_transportation_method_list_model.dart | 10 +- lib/core/service/er/am_service.dart | 7 +- .../viewModels/er/am_request_view_model.dart | 2 +- lib/pages/ErService/AmbulanceReq.dart | 5 +- .../ErService/AmbulanceRequestIndex.dart | 49 +++- lib/pages/ErService/BillAmount.dart | 6 +- lib/pages/ErService/PickupLocation.dart | 7 +- .../ErService/SelectTransportationMethod.dart | 272 ++++++++++++++++-- lib/pages/ErService/Summary.dart | 6 +- .../{StepesWideget.dart => StepsWidget.dart} | 55 ++-- 11 files changed, 552 insertions(+), 67 deletions(-) create mode 100644 lib/core/model/er/PatientER.dart rename lib/pages/ErService/widgets/{StepesWideget.dart => StepsWidget.dart} (55%) diff --git a/lib/core/model/er/PatientER.dart b/lib/core/model/er/PatientER.dart new file mode 100644 index 00000000..9c2d660e --- /dev/null +++ b/lib/core/model/er/PatientER.dart @@ -0,0 +1,200 @@ +class PatientER { + double versionID; + int channel; + int languageID; + String iPAdress; + String generalid; + int patientOutSA; + String sessionID; + bool isDentalAllowedBackend; + int deviceTypeID; + int patientID; + String tokenID; + int patientTypeID; + int patientType; + int orderServiceID; + String patientIdentificationID; + int direction; + bool haveAppointment; + int tripType; + int pickupUrgency; + int pickupSpot; + String pickupDateTime; + int transportationMethodId; + int selectedAmbulate; + String requesterNote; + int requesterFileNo; + String requesterMobileNo; + bool requesterIsOutSA; + int isOutPatient; + String pickupLocationName; + String dropoffLocationName; + int projectID; + int createdBy; + int lineItemNo; + int cost; + double vAT; + double totalPrice; + String pickupLocationLattitude; + String pickupLocationLongitude; + String dropoffLocationLattitude; + String dropoffLocationLongitude; + String latitude; + String longitude; + String appointmentNo; + dynamic appointmentClinicName; + dynamic appointmentDoctorName; + dynamic appointmentBranch; + dynamic appointmentTime; + + PatientER( + {this.versionID, + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID, + this.patientID, + this.tokenID, + this.patientTypeID, + this.patientType, + this.orderServiceID = 4, + this.patientIdentificationID, + this.direction, + this.haveAppointment, + this.tripType, + this.pickupUrgency, + this.pickupSpot, + this.pickupDateTime, + this.transportationMethodId, + this.selectedAmbulate, + this.requesterNote, + this.requesterFileNo, + this.requesterMobileNo, + this.requesterIsOutSA, + this.isOutPatient, + this.pickupLocationName, + this.dropoffLocationName, + this.projectID, + this.createdBy, + this.lineItemNo, + this.cost, + this.vAT, + this.totalPrice, + this.pickupLocationLattitude, + this.pickupLocationLongitude, + this.dropoffLocationLattitude, + this.dropoffLocationLongitude, + this.latitude, + this.longitude, + this.appointmentNo, + this.appointmentClinicName, + this.appointmentDoctorName, + this.appointmentBranch, + this.appointmentTime}); + + PatientER.fromJson(Map json) { + versionID = json['VersionID']; + channel = json['Channel']; + languageID = json['LanguageID']; + iPAdress = json['IPAdress']; + generalid = json['generalid']; + patientOutSA = json['PatientOutSA']; + sessionID = json['SessionID']; + isDentalAllowedBackend = json['isDentalAllowedBackend']; + deviceTypeID = json['DeviceTypeID']; + patientID = json['PatientID']; + tokenID = json['TokenID']; + patientTypeID = json['PatientTypeID']; + patientType = json['PatientType']; + orderServiceID = json['OrderServiceID']; + patientIdentificationID = json['PatientIdentificationID']; + direction = json['Direction']; + haveAppointment = json['HaveAppointment']; + tripType = json['TripType']; + pickupUrgency = json['PickupUrgency']; + pickupSpot = json['PickupSpot']; + pickupDateTime = json['PickupDateTime']; + transportationMethodId = json['TransportationMethodId']; + selectedAmbulate = json['SelectedAmbulate']; + requesterNote = json['RequesterNote']; + requesterFileNo = json['RequesterFileNo']; + requesterMobileNo = json['RequesterMobileNo']; + requesterIsOutSA = json['RequesterIsOutSA']; + isOutPatient = json['IsOutPatient']; + pickupLocationName = json['PickupLocationName']; + dropoffLocationName = json['DropoffLocationName']; + projectID = json['ProjectID']; + createdBy = json['CreatedBy']; + lineItemNo = json['LineItemNo']; + cost = json['Cost']; + vAT = json['VAT']; + totalPrice = json['TotalPrice']; + pickupLocationLattitude = json['PickupLocationLattitude']; + pickupLocationLongitude = json['PickupLocationLongitude']; + dropoffLocationLattitude = json['DropoffLocationLattitude']; + dropoffLocationLongitude = json['DropoffLocationLongitude']; + latitude = json['Latitude']; + longitude = json['Longitude']; + appointmentNo = json['AppointmentNo']; + appointmentClinicName = json['AppointmentClinicName']; + appointmentDoctorName = json['AppointmentDoctorName']; + appointmentBranch = json['AppointmentBranch']; + appointmentTime = json['AppointmentTime']; + } + + Map toJson() { + final Map data = new Map(); + data['VersionID'] = this.versionID; + data['Channel'] = this.channel; + data['LanguageID'] = this.languageID; + data['IPAdress'] = this.iPAdress; + data['generalid'] = this.generalid; + data['PatientOutSA'] = this.patientOutSA; + data['SessionID'] = this.sessionID; + data['isDentalAllowedBackend'] = this.isDentalAllowedBackend; + data['DeviceTypeID'] = this.deviceTypeID; + data['PatientID'] = this.patientID; + data['TokenID'] = this.tokenID; + data['PatientTypeID'] = this.patientTypeID; + data['PatientType'] = this.patientType; + data['OrderServiceID'] = this.orderServiceID; + data['PatientIdentificationID'] = this.patientIdentificationID; + data['Direction'] = this.direction; + data['HaveAppointment'] = this.haveAppointment; + data['TripType'] = this.tripType; + data['PickupUrgency'] = this.pickupUrgency; + data['PickupSpot'] = this.pickupSpot; + data['PickupDateTime'] = this.pickupDateTime; + data['TransportationMethodId'] = this.transportationMethodId; + data['SelectedAmbulate'] = this.selectedAmbulate; + data['RequesterNote'] = this.requesterNote; + data['RequesterFileNo'] = this.requesterFileNo; + data['RequesterMobileNo'] = this.requesterMobileNo; + data['RequesterIsOutSA'] = this.requesterIsOutSA; + data['IsOutPatient'] = this.isOutPatient; + data['PickupLocationName'] = this.pickupLocationName; + data['DropoffLocationName'] = this.dropoffLocationName; + data['ProjectID'] = this.projectID; + data['CreatedBy'] = this.createdBy; + data['LineItemNo'] = this.lineItemNo; + data['Cost'] = this.cost; + data['VAT'] = this.vAT; + data['TotalPrice'] = this.totalPrice; + data['PickupLocationLattitude'] = this.pickupLocationLattitude; + data['PickupLocationLongitude'] = this.pickupLocationLongitude; + data['DropoffLocationLattitude'] = this.dropoffLocationLattitude; + data['DropoffLocationLongitude'] = this.dropoffLocationLongitude; + data['Latitude'] = this.latitude; + data['Longitude'] = this.longitude; + data['AppointmentNo'] = this.appointmentNo; + data['AppointmentClinicName'] = this.appointmentClinicName; + data['AppointmentDoctorName'] = this.appointmentDoctorName; + data['AppointmentBranch'] = this.appointmentBranch; + data['AppointmentTime'] = this.appointmentTime; + return data; + } +} diff --git a/lib/core/model/er/get_all_transportation_method_list_model.dart b/lib/core/model/er/get_all_transportation_method_list_model.dart index 3402873e..b149e296 100644 --- a/lib/core/model/er/get_all_transportation_method_list_model.dart +++ b/lib/core/model/er/get_all_transportation_method_list_model.dart @@ -1,5 +1,5 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; -class PatientER_RRT_GetAllTransportationMethodListModel { +class PatientERTransportationMethod { int id; DateTime createDate; DateTime lastEditDate; @@ -9,15 +9,15 @@ class PatientER_RRT_GetAllTransportationMethodListModel { String title; String titleAR; int price; - Null isDefault; + dynamic isDefault; int visibility; - Null durationId; + dynamic durationId; String description; String descriptionAR; int totalPrice; int vAT; - PatientER_RRT_GetAllTransportationMethodListModel( + PatientERTransportationMethod( { this.id, this.createDate, @@ -36,7 +36,7 @@ class PatientER_RRT_GetAllTransportationMethodListModel { this.totalPrice, this.vAT}); - PatientER_RRT_GetAllTransportationMethodListModel.fromJson( + PatientERTransportationMethod.fromJson( Map json) { id = json['Id']; createDate = DateUtil.convertStringToDate(json['CreateDate']); diff --git a/lib/core/service/er/am_service.dart b/lib/core/service/er/am_service.dart index 016cc2df..6c9704ae 100644 --- a/lib/core/service/er/am_service.dart +++ b/lib/core/service/er/am_service.dart @@ -5,17 +5,20 @@ import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method import '../base_service.dart'; class AmService extends BaseService { - List amModelList = List(); + List amModelList = List(); List patientAllPresOrdersList = List(); Future getAllTransportationOrders() async { hasError = false; + Map body = Map(); + body['isDentalAllowedBackend']= false; + body['IdentificationNo'] = user.patientIdentificationNo; await baseAppClient.post(GET_AMBULANCE_REQUEST, onSuccess: (dynamic response, int statusCode) { amModelList.clear(); response['AmModelList'].forEach((vital) { amModelList.add( - PatientER_RRT_GetAllTransportationMethodListModel.fromJson(vital)); + PatientERTransportationMethod.fromJson(vital)); }); }, onFailure: (String error, int statusCode) { hasError = true; diff --git a/lib/core/viewModels/er/am_request_view_model.dart b/lib/core/viewModels/er/am_request_view_model.dart index 6e08d984..9045ee90 100644 --- a/lib/core/viewModels/er/am_request_view_model.dart +++ b/lib/core/viewModels/er/am_request_view_model.dart @@ -11,7 +11,7 @@ class AmRequestViewModel extends BaseViewModel { AmService _amService = locator(); HospitalService _hospitalService = locator(); - List + List get amRequestModeList => _amService.amModelList; List get patientAllPresOrdersList =>_amService.patientAllPresOrdersList; diff --git a/lib/pages/ErService/AmbulanceReq.dart b/lib/pages/ErService/AmbulanceReq.dart index 8e9f54bc..c50093be 100644 --- a/lib/pages/ErService/AmbulanceReq.dart +++ b/lib/pages/ErService/AmbulanceReq.dart @@ -34,10 +34,11 @@ class _AmbulanceReqState extends State @override Widget build(BuildContext context) { return BaseView( - // onModelReady: (model) => model.getAmRequestOrders(), + onModelReady: (model) => model.getAmRequestOrders(), builder: (_, model, widget) => AppScaffold( isShowAppBar: true, appBarTitle: "Ambulance Request", + baseViewModel: model, body: Scaffold( extendBodyBehindAppBar: true, appBar: PreferredSize( @@ -109,7 +110,7 @@ class _AmbulanceReqState extends State physics: BouncingScrollPhysics(), controller: _tabController, children: [ - AmbulanceRequestIndex(), + AmbulanceRequestIndex(amRequestViewModel: model,), Container() ], ), diff --git a/lib/pages/ErService/AmbulanceRequestIndex.dart b/lib/pages/ErService/AmbulanceRequestIndex.dart index 863d3b57..46d803cd 100644 --- a/lib/pages/ErService/AmbulanceRequestIndex.dart +++ b/lib/pages/ErService/AmbulanceRequestIndex.dart @@ -1,4 +1,6 @@ -import 'package:diplomaticquarterapp/pages/ErService/widgets/StepesWideget.dart'; +import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; +import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; +import 'package:diplomaticquarterapp/pages/ErService/widgets/StepsWidget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; @@ -8,27 +10,31 @@ import 'SelectTransportationMethod.dart'; import 'Summary.dart'; class AmbulanceRequestIndex extends StatefulWidget { + final AmRequestViewModel amRequestViewModel; + + AmbulanceRequestIndex({Key key, this.amRequestViewModel}); + @override _AmbulanceRequestIndexState createState() => _AmbulanceRequestIndexState(); } class _AmbulanceRequestIndexState extends State { - int currentIndex = 0; PageController pageController; + PatientER _patientER = PatientER(); _changeCurrentTab(int tab) { setState(() { currentIndex = tab; }); - pageController.animateToPage(tab, duration: Duration(milliseconds: 800), curve: Curves.easeOutQuart); + pageController.animateToPage(tab, + duration: Duration(milliseconds: 800), curve: Curves.easeOutQuart); } @override void initState() { super.initState(); pageController = new PageController(); - } @override @@ -36,19 +42,40 @@ class _AmbulanceRequestIndexState extends State { return AppScaffold( body: Column( children: [ - SizedBox(height: 80,), + SizedBox( + height: 80, + ), Container( - margin: EdgeInsets.only(left: 12,right: 12), - child: StepesWidget(index: currentIndex,changeCurrentTab: _changeCurrentTab,)), + margin: EdgeInsets.only(left: 12, right: 12), + child: StepsWidget( + index: currentIndex, + changeCurrentTab: _changeCurrentTab, + )), Expanded( child: PageView( physics: NeverScrollableScrollPhysics(), controller: pageController, children: [ - SelectTransportationMethod(changeCurrentTab: _changeCurrentTab,), - PickupLocation(changeCurrentTab: _changeCurrentTab,), - BillAmount(changeCurrentTab: _changeCurrentTab,), - Summary(changeCurrentTab: _changeCurrentTab,), + SelectTransportationMethod( + changeCurrentTab: _changeCurrentTab, + patientER: _patientER, + amRequestViewModel: widget.amRequestViewModel, + ), + PickupLocation( + changeCurrentTab: _changeCurrentTab, + patientER: _patientER, + amRequestViewModel: widget.amRequestViewModel, + ), + BillAmount( + changeCurrentTab: _changeCurrentTab, + patientER: _patientER, + amRequestViewModel: widget.amRequestViewModel, + ), + Summary( + changeCurrentTab: _changeCurrentTab, + patientER: _patientER, + amRequestViewModel: widget.amRequestViewModel, + ), ], ), ), diff --git a/lib/pages/ErService/BillAmount.dart b/lib/pages/ErService/BillAmount.dart index 86b0d181..3dca195f 100644 --- a/lib/pages/ErService/BillAmount.dart +++ b/lib/pages/ErService/BillAmount.dart @@ -1,3 +1,5 @@ +import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; +import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; @@ -5,8 +7,10 @@ import 'package:flutter/material.dart'; class BillAmount extends StatefulWidget { final Function changeCurrentTab; + final PatientER patientER; + final AmRequestViewModel amRequestViewModel; - BillAmount({Key key, this.changeCurrentTab}); + BillAmount({Key key, this.changeCurrentTab, this.patientER, this.amRequestViewModel}); @override _BillAmountState createState() => _BillAmountState(); diff --git a/lib/pages/ErService/PickupLocation.dart b/lib/pages/ErService/PickupLocation.dart index bdb1ea52..2b44d4cb 100644 --- a/lib/pages/ErService/PickupLocation.dart +++ b/lib/pages/ErService/PickupLocation.dart @@ -1,3 +1,5 @@ +import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; +import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; @@ -5,8 +7,9 @@ import 'package:flutter/material.dart'; class PickupLocation extends StatefulWidget { final Function changeCurrentTab; - - PickupLocation({Key key, this.changeCurrentTab}); + final PatientER patientER; + PickupLocation({Key key, this.changeCurrentTab, this.patientER, this.amRequestViewModel}); + final AmRequestViewModel amRequestViewModel; @override _PickupLocationState createState() => _PickupLocationState(); diff --git a/lib/pages/ErService/SelectTransportationMethod.dart b/lib/pages/ErService/SelectTransportationMethod.dart index a5fcbb75..d8148b3c 100644 --- a/lib/pages/ErService/SelectTransportationMethod.dart +++ b/lib/pages/ErService/SelectTransportationMethod.dart @@ -1,13 +1,24 @@ -import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; +import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; +import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; +import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +enum Direction { ToHospital, FromHospital } +enum Way { OneWay, TwoWays } + class SelectTransportationMethod extends StatefulWidget { final Function changeCurrentTab; + final PatientER patientER; + final AmRequestViewModel amRequestViewModel; - SelectTransportationMethod({Key key, this.changeCurrentTab}); + SelectTransportationMethod( + {Key key, + this.changeCurrentTab, + this.patientER, + this.amRequestViewModel}); @override _SelectTransportationMethodState createState() => @@ -16,24 +27,251 @@ class SelectTransportationMethod extends StatefulWidget { class _SelectTransportationMethodState extends State { + PatientERTransportationMethod _erTransportationMethod = + PatientERTransportationMethod(); + Direction _direction = Direction.FromHospital; + Way _way = Way.OneWay; + @override Widget build(BuildContext context) { - return Column( - children: [ - Texts('SelectTransportationMethod 1'), - SizedBox(height: 45,), - Container( - padding: EdgeInsets.all(15), - width: double.maxFinite, - height: 76, - child:SecondaryButton( - color: Colors.grey[800], - textColor: Colors.white, - onTap: ()=> widget.changeCurrentTab(1), - label: 'Next', + return Container( + margin: EdgeInsets.only(left: 12, right: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 12, + ), + Texts('Select Transportation Method'), + ...List.generate( + widget.amRequestViewModel.amRequestModeList.length, + (index) => InkWell( + onTap: () { + setState(() { + _erTransportationMethod = + widget.amRequestViewModel.amRequestModeList[index]; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + children: [ + Expanded( + flex: 3, + child: ListTile( + title: Text(widget + .amRequestViewModel.amRequestModeList[index].title), + leading: Radio( + value: widget + .amRequestViewModel.amRequestModeList[index], + groupValue: _erTransportationMethod, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _erTransportationMethod = value; + }); + }, + ), + ), + ), + Expanded( + flex: 1, + child: Texts( + 'SR ${widget.amRequestViewModel.amRequestModeList[index].price}'), + ) + ], + ), + ), + ), + ), + SizedBox( + height: 12, + ), + Texts('Select Direction'), + SizedBox( + height: 5, + ), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + _direction = Direction.ToHospital; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + children: [ + ListTile( + title: Text('To Hospital'), + leading: Radio( + value: Direction.ToHospital, + groupValue: _direction, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _direction = value; + }); + }, + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: InkWell( + onTap: () { + setState(() { + _direction = Direction.FromHospital; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + children: [ + ListTile( + title: Text('To Hospital'), + leading: Radio( + value: Direction.FromHospital, + groupValue: _direction, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _direction = value; + }); + }, + ), + ), + ], + ), + ), + ), + ), + ], + ), + if (_direction == Direction.ToHospital) + Column( + children: [ + Texts('Select Direction'), + SizedBox( + height: 5, + ), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + _way = Way.OneWay; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + children: [ + ListTile( + title: Text('One Way'), + leading: Radio( + value: Way.OneWay, + groupValue: _way, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _way = value; + }); + }, + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: InkWell( + onTap: () { + setState(() { + _way = Way.TwoWays; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + children: [ + ListTile( + title: Text('Two Ways'), + leading: Radio( + value: Way.TwoWays, + groupValue: _way, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _way = value; + }); + }, + ), + ), + ], + ), + ), + ), + ), + ], + ), + ], + ), + SizedBox( + height: 15, ), - ) - ], + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child: SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + onTap: () { + setState(() { + widget.patientER.direction = _direction == Direction.ToHospital ? 1 : 2; + widget.patientER.tripType = _way == Way.TwoWays ? 1 : 2; + widget.patientER.selectedAmbulate = (widget.amRequestViewModel.amRequestModeList.indexOf(_erTransportationMethod)+1); + widget.changeCurrentTab(1); + }); + }, + label: 'Next', + ), + ) + ], + ), ); } } diff --git a/lib/pages/ErService/Summary.dart b/lib/pages/ErService/Summary.dart index 4f792b68..13beee8c 100644 --- a/lib/pages/ErService/Summary.dart +++ b/lib/pages/ErService/Summary.dart @@ -1,3 +1,5 @@ +import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; +import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; @@ -5,8 +7,10 @@ import 'package:flutter/material.dart'; class Summary extends StatefulWidget { final Function changeCurrentTab; + final PatientER patientER; + final AmRequestViewModel amRequestViewModel; - Summary({Key key, this.changeCurrentTab}); + Summary({Key key, this.changeCurrentTab, this.patientER, this.amRequestViewModel}); @override _SummaryState createState() => _SummaryState(); diff --git a/lib/pages/ErService/widgets/StepesWideget.dart b/lib/pages/ErService/widgets/StepsWidget.dart similarity index 55% rename from lib/pages/ErService/widgets/StepesWideget.dart rename to lib/pages/ErService/widgets/StepsWidget.dart index 3f6b57a4..1e4077cb 100644 --- a/lib/pages/ErService/widgets/StepesWideget.dart +++ b/lib/pages/ErService/widgets/StepsWidget.dart @@ -2,11 +2,11 @@ import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -class StepesWidget extends StatelessWidget { +class StepsWidget extends StatelessWidget { final int index; final Function changeCurrentTab; - StepesWidget({Key key, this.index, this.changeCurrentTab}); + StepsWidget({Key key, this.index, this.changeCurrentTab}); @override Widget build(BuildContext context) { @@ -18,9 +18,9 @@ class StepesWidget extends StatelessWidget { color: Colors.transparent, child: Center( child: Divider( - color: Colors.black, - height: 3, - thickness: 3, + color: Colors.grey, + height: 0.75, + thickness: 0.75, ), ), ), @@ -30,16 +30,17 @@ class StepesWidget extends StatelessWidget { child: InkWell( onTap: () => changeCurrentTab(0), child: Container( - width: 25, - height: 25, + width: 35, + height: 35, decoration: BoxDecoration( + border: index > 0 ? null:Border.all(color: Colors.black,width: 0.75), shape: BoxShape.circle, - color: index == 0 ? Colors.grey[800] : Colors.white, + color: index == 0 ? Colors.grey[800] : index > 0 ?Colors.green: Colors.white, ), child: Center( child: Texts( '1', - color: index == 0 ? Colors.white:Colors.grey[800] , + color: index == 0 ? Colors.white : index > 0 ?Colors.white: Colors.grey[800], ), ), ), @@ -47,20 +48,21 @@ class StepesWidget extends StatelessWidget { ), Positioned( top: 10, - left: MediaQuery.of(context).size.width *0.3, + left: MediaQuery.of(context).size.width * 0.3, child: InkWell( - onTap: () => changeCurrentTab(1), + onTap: () => index >= 2 ? changeCurrentTab(1) : null, child: Container( - width: 25, - height: 25, + width: 35, + height: 35, decoration: BoxDecoration( + border: index > 1 ? null:Border.all(color: Colors.black,width: 0.75), shape: BoxShape.circle, - color: index == 1 ? Colors.grey[800] : Colors.white, + color: index == 1 ? Colors.grey[800] : index > 1 ?Colors.green: Colors.white, ), child: Center( child: Texts( '2', - color: index == 1 ? Colors.white:Colors.grey[800], + color: index == 1? Colors.white : index > 1 ?Colors.white: Colors.grey[800], ), ), ), @@ -68,20 +70,21 @@ class StepesWidget extends StatelessWidget { ), Positioned( top: 10, - left: MediaQuery.of(context).size.width *0.6, + left: MediaQuery.of(context).size.width * 0.6, child: InkWell( - onTap: () => changeCurrentTab(2), + onTap: () => index >= 3 ? changeCurrentTab(2) : null, child: Container( - width: 25, - height: 25, + width: 35, + height: 35, decoration: BoxDecoration( shape: BoxShape.circle, - color: index == 2 ? Colors.grey[800] : Colors.white, + border: index > 2 ? null:Border.all(color: Colors.black,width: 0.75), + color: index == 2 ? Colors.grey[800] : index > 1 ?Colors.green: Colors.white, ), child: Center( child: Texts( '3', - color: index == 2 ? Colors.white: Colors.grey[800] , + color: index == 2? Colors.white : index > 1 ?Colors.white: Colors.grey[800], ), ), ), @@ -91,18 +94,20 @@ class StepesWidget extends StatelessWidget { top: 10, right: 0, child: InkWell( - onTap: () => changeCurrentTab(3), + onTap: () => index == 2 ?changeCurrentTab(3):null, child: Container( - width: 25, - height: 25, + width: 35, + height: 35, decoration: BoxDecoration( + border: Border.all(color: Colors.black,width: 0.75), + shape: BoxShape.circle, color: index == 3 ? Colors.grey[800] : Colors.white, ), child: Center( child: Texts( '4', - color: index == 3 ? Colors.white:Colors.grey[800] , + color: index == 3 ? Colors.white : Colors.grey[800], ), ), ), From 3d6eafe4731c72a7a24dd0ee32373aa308c8c97b Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Sun, 4 Oct 2020 15:05:10 +0300 Subject: [PATCH 07/14] Ambulance Service first step --- ..._all_transportation_method_list_model.dart | 14 +- lib/core/service/er/am_service.dart | 7 +- .../ErService/AmbulanceRequestIndex.dart | 1 + lib/pages/ErService/PickupLocation.dart | 277 +++++++++++- .../ErService/SelectTransportationMethod.dart | 408 +++++++++--------- 5 files changed, 484 insertions(+), 223 deletions(-) diff --git a/lib/core/model/er/get_all_transportation_method_list_model.dart b/lib/core/model/er/get_all_transportation_method_list_model.dart index b149e296..ebc9caf7 100644 --- a/lib/core/model/er/get_all_transportation_method_list_model.dart +++ b/lib/core/model/er/get_all_transportation_method_list_model.dart @@ -1,21 +1,21 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; class PatientERTransportationMethod { - int id; + dynamic id; DateTime createDate; DateTime lastEditDate; - int createdBy; - int lastEditBy; + dynamic createdBy; + dynamic lastEditBy; bool isActive; String title; String titleAR; - int price; + dynamic price; dynamic isDefault; - int visibility; + dynamic visibility; dynamic durationId; String description; String descriptionAR; - int totalPrice; - int vAT; + dynamic totalPrice; + dynamic vAT; PatientERTransportationMethod( { diff --git a/lib/core/service/er/am_service.dart b/lib/core/service/er/am_service.dart index 6c9704ae..b6a91871 100644 --- a/lib/core/service/er/am_service.dart +++ b/lib/core/service/er/am_service.dart @@ -16,14 +16,13 @@ class AmService extends BaseService { await baseAppClient.post(GET_AMBULANCE_REQUEST, onSuccess: (dynamic response, int statusCode) { amModelList.clear(); - response['AmModelList'].forEach((vital) { - amModelList.add( - PatientERTransportationMethod.fromJson(vital)); + response['PatientER_RRT_GetAllTransportationMethodList'].forEach((vital) { + amModelList.add(PatientERTransportationMethod.fromJson(vital)); }); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - }, body: Map()); + }, body: body); } Future getPatientAllPresOrdersList() async { diff --git a/lib/pages/ErService/AmbulanceRequestIndex.dart b/lib/pages/ErService/AmbulanceRequestIndex.dart index 46d803cd..16d07b88 100644 --- a/lib/pages/ErService/AmbulanceRequestIndex.dart +++ b/lib/pages/ErService/AmbulanceRequestIndex.dart @@ -56,6 +56,7 @@ class _AmbulanceRequestIndexState extends State { physics: NeverScrollableScrollPhysics(), controller: pageController, children: [ + //Container(), SelectTransportationMethod( changeCurrentTab: _changeCurrentTab, patientER: _patientER, diff --git a/lib/pages/ErService/PickupLocation.dart b/lib/pages/ErService/PickupLocation.dart index 2b44d4cb..46a8928b 100644 --- a/lib/pages/ErService/PickupLocation.dart +++ b/lib/pages/ErService/PickupLocation.dart @@ -4,11 +4,20 @@ import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +enum HaveAppointment { YES, NO } class PickupLocation extends StatefulWidget { final Function changeCurrentTab; final PatientER patientER; - PickupLocation({Key key, this.changeCurrentTab, this.patientER, this.amRequestViewModel}); + + PickupLocation( + {Key key, + this.changeCurrentTab, + this.patientER, + this.amRequestViewModel}); + final AmRequestViewModel amRequestViewModel; @override @@ -16,24 +25,258 @@ class PickupLocation extends StatefulWidget { } class _PickupLocationState extends State { + bool _isInsideHome = false; + HaveAppointment _haveAppointment = HaveAppointment.NO; + @override Widget build(BuildContext context) { - return Column( - children: [ - Texts('PickupLocation 2'), - SizedBox(height: 45,), - Container( - padding: EdgeInsets.all(15), - width: double.maxFinite, - height: 76, - child:SecondaryButton( - color: Colors.grey[800], - textColor: Colors.white, - onTap: ()=> widget.changeCurrentTab(2), - label: 'Next', - ), - ) - ], + return SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Container( + margin: EdgeInsets.only(left: 12, right: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (widget.patientER.direction == 1) + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Pickup Location'), + SizedBox( + height: 15, + ), + Container( + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts('Select From Map'), + Icon( + FontAwesomeIcons.mapMarkerAlt, + size: 24, + color: Colors.black, + ) + ], + ), + ), + SizedBox( + height: 12, + ), + Texts('Pickup Spot'), + SizedBox( + height: 5, + ), + InkWell( + onTap: () { + setState(() { + _isInsideHome = !_isInsideHome; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Texts('Inside Home'), + leading: Checkbox( + activeColor: Colors.red[800], + value: _isInsideHome, + onChanged: (value) { + setState(() { + _isInsideHome = value; + }); + }, + ), + ), + ), + ), + SizedBox( + height: 12, + ), + Texts('Do you have an appointment ?'), + SizedBox( + height: 5, + ), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + _haveAppointment = HaveAppointment.YES; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('Yes'), + leading: Radio( + value: HaveAppointment.YES, + groupValue: _haveAppointment, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _haveAppointment = value; + }); + }, + ), + ), + ), + ), + ), + Expanded( + child: InkWell( + onTap: () { + setState(() { + _haveAppointment = HaveAppointment.NO; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('No'), + leading: Radio( + value: HaveAppointment.NO, + groupValue: _haveAppointment, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _haveAppointment = value; + }); + }, + ), + ), + ), + ), + ), + ], + ), + SizedBox( + height: 12, + ), + Texts('Drop off Location'), + SizedBox( + height: 8, + ), + Container( + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts('Pickup Location'), + Icon( + Icons.arrow_drop_down, + size: 24, + color: Colors.black, + ) + ], + ), + ), + ], + ), + if (widget.patientER.direction == 2) + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Pickup Location'), + SizedBox( + height: 15, + ), + Container( + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts('Pickup Location'), + Icon( + Icons.arrow_drop_down, + size: 24, + color: Colors.black, + ) + ], + ), + ), + SizedBox( + height: 12, + ), + Texts('Drop off Location'), + SizedBox( + height: 8, + ), + Container( + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts('Select From Map'), + Icon( + FontAwesomeIcons.mapMarkerAlt, + size: 24, + color: Colors.black, + ) + ], + ), + ), + ], + ), + //TODO show dialog projects + + SizedBox( + height: 45, + ), + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child: SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + onTap: () => widget.changeCurrentTab(2), + label: 'Next', + ), + ) + ], + ), + ), ); } } diff --git a/lib/pages/ErService/SelectTransportationMethod.dart b/lib/pages/ErService/SelectTransportationMethod.dart index d8148b3c..38eec5b4 100644 --- a/lib/pages/ErService/SelectTransportationMethod.dart +++ b/lib/pages/ErService/SelectTransportationMethod.dart @@ -32,89 +32,108 @@ class _SelectTransportationMethodState Direction _direction = Direction.FromHospital; Way _way = Way.OneWay; + @override + void initState() { + super.initState(); + if (widget.patientER.direction != null) { + _direction = widget.patientER.direction == 1 + ? Direction.ToHospital + : Direction.FromHospital; + _way = widget.patientER.tripType == 1 ? Way.OneWay : Way.TwoWays; + _erTransportationMethod = widget.amRequestViewModel + .amRequestModeList[(widget.patientER.selectedAmbulate - 1)]; + } + } + @override Widget build(BuildContext context) { - return Container( - margin: EdgeInsets.only(left: 12, right: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox( - height: 12, - ), - Texts('Select Transportation Method'), - ...List.generate( - widget.amRequestViewModel.amRequestModeList.length, - (index) => InkWell( - onTap: () { - setState(() { - _erTransportationMethod = - widget.amRequestViewModel.amRequestModeList[index]; - }); - }, - child: Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - children: [ - Expanded( - flex: 3, - child: ListTile( - title: Text(widget - .amRequestViewModel.amRequestModeList[index].title), - leading: Radio( - value: widget - .amRequestViewModel.amRequestModeList[index], - groupValue: _erTransportationMethod, - activeColor: Colors.red[800], - onChanged: (value) { - setState(() { - _erTransportationMethod = value; - }); - }, + return SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Container( + margin: EdgeInsets.only(left: 12, right: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 12, + ), + Texts('Select Transportation Method'), + ...List.generate( + widget.amRequestViewModel.amRequestModeList.length, + (index) => InkWell( + onTap: () { + setState(() { + _erTransportationMethod = + widget.amRequestViewModel.amRequestModeList[index]; + }); + }, + child: Container( + margin: EdgeInsets.all(5), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + children: [ + Expanded( + flex: 3, + child: ListTile( + title: Text(widget.amRequestViewModel + .amRequestModeList[index].title), + leading: Radio( + value: widget + .amRequestViewModel.amRequestModeList[index], + groupValue: _erTransportationMethod, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _erTransportationMethod = value; + }); + }, + ), ), ), - ), - Expanded( - flex: 1, - child: Texts( - 'SR ${widget.amRequestViewModel.amRequestModeList[index].price}'), - ) - ], + Expanded( + flex: 1, + child: Texts( + 'SR ${widget.amRequestViewModel.amRequestModeList[index].price}'), + ) + ], + ), ), ), ), - ), - SizedBox( - height: 12, - ), - Texts('Select Direction'), - SizedBox( - height: 5, - ), - Row( - children: [ - Expanded( - child: InkWell( - onTap: () { - setState(() { - _direction = Direction.ToHospital; - }); - }, - child: Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - children: [ - ListTile( + SizedBox( + height: 12, + ), + Texts('Select Direction'), + SizedBox( + height: 5, + ), + Container( + width: double.maxFinite, + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + _direction = Direction.ToHospital; + }); + }, + child: Container( + width: double.maxFinite, + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( title: Text('To Hospital'), leading: Radio( value: Direction.ToHospital, @@ -127,29 +146,26 @@ class _SelectTransportationMethodState }, ), ), - ], + ), ), ), - ), - ), - Expanded( - child: InkWell( - onTap: () { - setState(() { - _direction = Direction.FromHospital; - }); - }, - child: Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - children: [ - ListTile( - title: Text('To Hospital'), + Expanded( + child: InkWell( + onTap: () { + setState(() { + _direction = Direction.FromHospital; + }); + }, + child: Container( + width: double.maxFinite, + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('Form Hospital'), leading: Radio( value: Direction.FromHospital, groupValue: _direction, @@ -161,116 +177,118 @@ class _SelectTransportationMethodState }, ), ), - ], + ), ), ), - ), + ], ), - ], - ), - if (_direction == Direction.ToHospital) - Column( - children: [ - Texts('Select Direction'), - SizedBox( - height: 5, - ), - Row( - children: [ - Expanded( - child: InkWell( - onTap: () { - setState(() { - _way = Way.OneWay; - }); - }, - child: Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - children: [ - ListTile( - title: Text('One Way'), - leading: Radio( - value: Way.OneWay, - groupValue: _way, - activeColor: Colors.red[800], - onChanged: (value) { - setState(() { - _way = value; - }); - }, - ), + ), + if (_direction == Direction.ToHospital) + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 8, + ), + Texts('Select Direction'), + SizedBox( + height: 5, + ), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + _way = Way.OneWay; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('One Way'), + leading: Radio( + value: Way.OneWay, + groupValue: _way, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _way = value; + }); + }, ), - ], + ), ), ), ), - ), - Expanded( - child: InkWell( - onTap: () { - setState(() { - _way = Way.TwoWays; - }); - }, - child: Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - children: [ - ListTile( - title: Text('Two Ways'), - leading: Radio( - value: Way.TwoWays, - groupValue: _way, - activeColor: Colors.red[800], - onChanged: (value) { - setState(() { - _way = value; - }); - }, - ), + Expanded( + child: InkWell( + onTap: () { + setState(() { + _way = Way.TwoWays; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('Two Ways'), + leading: Radio( + value: Way.TwoWays, + groupValue: _way, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _way = value; + }); + }, ), - ], + ), ), ), ), - ), - ], - ), - ], - ), - SizedBox( - height: 15, - ), - Container( - padding: EdgeInsets.all(15), - width: double.maxFinite, - height: 76, - child: SecondaryButton( - color: Colors.grey[800], - textColor: Colors.white, - onTap: () { - setState(() { - widget.patientER.direction = _direction == Direction.ToHospital ? 1 : 2; - widget.patientER.tripType = _way == Way.TwoWays ? 1 : 2; - widget.patientER.selectedAmbulate = (widget.amRequestViewModel.amRequestModeList.indexOf(_erTransportationMethod)+1); - widget.changeCurrentTab(1); - }); - }, - label: 'Next', + ], + ), + ], + ), + SizedBox( + height: 15, ), - ) - ], + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child: SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + onTap: () { + setState(() { + widget.patientER.direction = + _direction == Direction.ToHospital ? 1 : 2; + widget.patientER.tripType = _way == Way.TwoWays ? 2 : 1; + widget.patientER.selectedAmbulate = (widget + .amRequestViewModel.amRequestModeList + .indexOf(_erTransportationMethod) + + 1); + widget.changeCurrentTab(1); + }); + }, + label: 'Next', + ), + ) + ], + ), ), ); } From 1ce55e687f8ee2b0a175a788ecaff529d04d2ffc Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 6 Oct 2020 18:02:35 +0300 Subject: [PATCH 08/14] Ambulance Service second step --- android/app/build.gradle | 4 +- android/app/src/main/AndroidManifest.xml | 6 + android/gradle.properties | 2 +- lib/core/enum/Ambulate.dart | 27 ++ lib/core/model/er/PatientER.dart | 11 +- lib/core/service/medical/medical_service.dart | 9 +- .../viewModels/er/am_request_view_model.dart | 17 + .../ErService/AvailableAppointmentsPage.dart | 45 +++ lib/pages/ErService/BillAmount.dart | 327 +++++++++++++++++- lib/pages/ErService/PickupLocation.dart | 163 +++++++-- .../ErService/SelectTransportationMethod.dart | 6 + lib/pages/ErService/Summary.dart | 98 +++++- .../ErService/widgets/AppointmentCard.dart | 47 +++ lib/pages/ErService/widgets/StepsWidget.dart | 109 +++++- lib/uitl/ProgressDialog.dart | 12 + pubspec.yaml | 6 +- 16 files changed, 819 insertions(+), 70 deletions(-) create mode 100644 lib/core/enum/Ambulate.dart create mode 100644 lib/pages/ErService/AvailableAppointmentsPage.dart create mode 100644 lib/pages/ErService/widgets/AppointmentCard.dart create mode 100644 lib/uitl/ProgressDialog.dart diff --git a/android/app/build.gradle b/android/app/build.gradle index 1f71421f..9640ea61 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -27,7 +27,7 @@ apply plugin: 'com.google.gms.google-services' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion 28 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -41,7 +41,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.cloud.diplomaticquarterapp" minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName multiDexEnabled true diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f1a5a3f8..8c32edfd 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -17,6 +17,9 @@ + + + + + diff --git a/android/gradle.properties b/android/gradle.properties index 3f45ee5b..9c0729c9 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -2,4 +2,4 @@ android.enableR8=true android.useAndroidX=true android.enableJetifier=true -org.gradle.jvmargs=-Xmx4608m \ No newline at end of file +org.gradle.jvmargs=-Xmx4608m diff --git a/lib/core/enum/Ambulate.dart b/lib/core/enum/Ambulate.dart new file mode 100644 index 00000000..059a281c --- /dev/null +++ b/lib/core/enum/Ambulate.dart @@ -0,0 +1,27 @@ +import 'package:flutter/cupertino.dart'; + +enum Ambulate { Wheelchair, Walker, Stretcher, None } + +extension SelectedAmbulate on Ambulate { + String getAmbulateTitle(BuildContext context) { + switch (this) { + case Ambulate.Wheelchair: + // TODO: Handle this case. + return 'Wheelchair'; + break; + case Ambulate.Walker: + // TODO: Handle this case. + return 'Walker'; + break; + case Ambulate.Stretcher: + // TODO: Handle this case. + return 'Stretcher'; + break; + case Ambulate.None: + // TODO: Handle this case. + return 'None'; + break; + } + return 'None'; + } +} diff --git a/lib/core/model/er/PatientER.dart b/lib/core/model/er/PatientER.dart index 9c2d660e..d0827311 100644 --- a/lib/core/model/er/PatientER.dart +++ b/lib/core/model/er/PatientER.dart @@ -1,3 +1,7 @@ +import 'package:diplomaticquarterapp/core/enum/Ambulate.dart'; + +import 'get_all_transportation_method_list_model.dart'; + class PatientER { double versionID; int channel; @@ -46,7 +50,8 @@ class PatientER { dynamic appointmentDoctorName; dynamic appointmentBranch; dynamic appointmentTime; - + PatientERTransportationMethod patientERTransportationMethod; + Ambulate ambulate; PatientER( {this.versionID, this.channel, @@ -94,7 +99,9 @@ class PatientER { this.appointmentClinicName, this.appointmentDoctorName, this.appointmentBranch, - this.appointmentTime}); + this.appointmentTime, + this.patientERTransportationMethod, + this.ambulate}); PatientER.fromJson(Map json) { versionID = json['VersionID']; diff --git a/lib/core/service/medical/medical_service.dart b/lib/core/service/medical/medical_service.dart index 90230f6d..572e5096 100644 --- a/lib/core/service/medical/medical_service.dart +++ b/lib/core/service/medical/medical_service.dart @@ -5,9 +5,14 @@ import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResu class MedicalService extends BaseService { List appoitmentAllHistoryResultList = List(); - getAppointmentHistory() async { + getAppointmentHistory({bool isActiveAppointment = false}) async { hasError = false; super.error = ""; + Map body = Map(); + if(isActiveAppointment) { + body['IsActiveAppointment'] = true; + body['isDentalAllowedBackend'] = false; + } await baseAppClient.post(GET_PATIENT_APPOINTMENT_HISTORY, onSuccess: (response, statusCode) async { @@ -19,6 +24,6 @@ class MedicalService extends BaseService { }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - }, body: Map()); + }, body: body); } } diff --git a/lib/core/viewModels/er/am_request_view_model.dart b/lib/core/viewModels/er/am_request_view_model.dart index 9045ee90..a5261456 100644 --- a/lib/core/viewModels/er/am_request_view_model.dart +++ b/lib/core/viewModels/er/am_request_view_model.dart @@ -3,19 +3,36 @@ import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; import 'package:diplomaticquarterapp/core/service/er/am_service.dart'; import 'package:diplomaticquarterapp/core/service/hospital_service.dart'; +import 'package:diplomaticquarterapp/core/service/medical/medical_service.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; +import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; import '../base_view_model.dart'; import '../../../locator.dart'; class AmRequestViewModel extends BaseViewModel { AmService _amService = locator(); HospitalService _hospitalService = locator(); + MedicalService _medicalService = locator(); List get amRequestModeList => _amService.amModelList; List get patientAllPresOrdersList =>_amService.patientAllPresOrdersList; + List get appoitmentAllHistoryResultList => + _medicalService.appoitmentAllHistoryResultList; + + Future getAppointmentHistory() async { + setState(ViewState.BusyLocal); + await _medicalService.getAppointmentHistory(isActiveAppointment: true); + if (_medicalService.hasError) { + error = _medicalService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + Future getAmRequestOrders() async { setState(ViewState.Busy); diff --git a/lib/pages/ErService/AvailableAppointmentsPage.dart b/lib/pages/ErService/AvailableAppointmentsPage.dart new file mode 100644 index 00000000..7180d5dd --- /dev/null +++ b/lib/pages/ErService/AvailableAppointmentsPage.dart @@ -0,0 +1,45 @@ +import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; +import 'package:diplomaticquarterapp/pages/ErService/widgets/AppointmentCard.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class AvailableAppointmentsPage extends StatelessWidget { + final List appointmentsAllHistoryList; + + const AvailableAppointmentsPage({Key key, this.appointmentsAllHistoryList}) + : super(key: key); + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Available Appointments', + body: SingleChildScrollView( + child: Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Texts('Available Appointments'), + SizedBox( + height: 12, + ), + ...List.generate( + appointmentsAllHistoryList.length, + (index) => InkWell( + onTap: (){ + Navigator.pop(context, appointmentsAllHistoryList[index]); + }, + child: AppointmentCard(appointment: appointmentsAllHistoryList[index],), + ), + ) + ], + ), + ), + ), + ); + } +} + + diff --git a/lib/pages/ErService/BillAmount.dart b/lib/pages/ErService/BillAmount.dart index 3dca195f..44e17c3a 100644 --- a/lib/pages/ErService/BillAmount.dart +++ b/lib/pages/ErService/BillAmount.dart @@ -1,41 +1,334 @@ +import 'package:diplomaticquarterapp/core/enum/Ambulate.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; +import 'package:diplomaticquarterapp/pages/Blood/new_text_Field.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + class BillAmount extends StatefulWidget { final Function changeCurrentTab; final PatientER patientER; final AmRequestViewModel amRequestViewModel; - BillAmount({Key key, this.changeCurrentTab, this.patientER, this.amRequestViewModel}); + BillAmount( + {Key key, + this.changeCurrentTab, + this.patientER, + this.amRequestViewModel}); @override _BillAmountState createState() => _BillAmountState(); } class _BillAmountState extends State { + Ambulate _ambulate = Ambulate.None; + String note =""; @override Widget build(BuildContext context) { - return Column( - children: [ - Texts('BillAmount 3'), - SizedBox(height: 45,), - Container( - padding: EdgeInsets.all(15), - width: double.maxFinite, - height: 76, - child:SecondaryButton( - color: Colors.grey[800], - textColor: Colors.white, - onTap: ()=> widget.changeCurrentTab(3), - label: 'Next', + return SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Container( + margin: EdgeInsets.only(left: 12, right: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Bill Amount '), + SizedBox( + height: 10, + ), + Table( + border: TableBorder.symmetric( + inside: BorderSide(width: 1.0, color: Colors.grey[300]), + outside: BorderSide(width: 1.0, color: Colors.grey[300])), + children: [ + TableRow( + children: [ + Container( + height: MediaQuery.of(context).size.height * 0.09, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.only( + topLeft: Radius.circular(10.0), + ), + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Texts( + 'Amount before tax: ', + textAlign: TextAlign.start, + color: Colors.black, + fontSize: 15, + ), + ), + ), + Container( + height: MediaQuery.of(context).size.height * 0.09, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.only( + topRight: Radius.circular(10.0), + ), + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Texts( + 'SR ${widget.patientER.patientERTransportationMethod.price}', + color: Colors.black, + textAlign: TextAlign.start, + fontSize: 15, + ), + ), + ), + ], + ), + TableRow( + children: [ + Container( + color: Colors.white, + height: MediaQuery.of(context).size.height * 0.09, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Texts( + 'Tax amount :', + color: Colors.black, + fontSize: 15, + textAlign: TextAlign.start, + ), + ), + ), + Container( + height: MediaQuery.of(context).size.height * 0.09, + color: Colors.white, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Texts( + 'SR ${widget.patientER.patientERTransportationMethod.vAT}', + color: Colors.black, + fontSize: 15, + textAlign: TextAlign.start, + ), + ), + ), + ], + ), + TableRow( + children: [ + Container( + height: MediaQuery.of(context).size.height * 0.09, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.only( + bottomLeft: Radius.circular(10.0), + ), + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Texts( + 'Total amount payable', + color: Colors.black, + fontSize: 15, + textAlign: TextAlign.start, + bold: true, + ), + ), + ), + Container( + height: MediaQuery.of(context).size.height * 0.09, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.only( + bottomRight: Radius.circular(10.0), + ), + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Texts( + 'SR ${widget.patientER.patientERTransportationMethod.totalPrice}', + color: Colors.black, + fontSize: 15, + textAlign: TextAlign.start, + ), + ), + ), + ], + ), + ], + ), + SizedBox( + height: 10, + ), + Texts('Select Ambulate',bold: true,), + SizedBox(height: 5,), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + _ambulate = Ambulate.Wheelchair; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('Wheelchair'), + leading: Radio( + value: Ambulate.Wheelchair, + groupValue: _ambulate, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _ambulate = value; + }); + }, + ), + ), + ), + ), + ), + Expanded( + child: InkWell( + onTap: () { + setState(() { + _ambulate = Ambulate.Walker; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('Walker'), + leading: Radio( + value: Ambulate.Walker, + groupValue: _ambulate, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _ambulate = value; + }); + }, + ), + ), + ), + ), + ), + ], + ), + SizedBox(height: 5,), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + _ambulate = Ambulate.Stretcher; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('Stretcher'), + leading: Radio( + value: Ambulate.Stretcher, + groupValue: _ambulate, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _ambulate = value; + }); + }, + ), + ), + ), + ), + ), + Expanded( + child: InkWell( + onTap: () { + setState(() { + _ambulate = Ambulate.None; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('Walker'), + leading: Radio( + value: Ambulate.None, + groupValue: _ambulate, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _ambulate = value; + }); + }, + ), + ), + ), + ), + ), + ], + ), + SizedBox(height: 12,), + NewTextFields( + hintText: 'Note', + initialValue: note, + onChanged: (value){ + setState(() { + note = value; + }); + }, + ), - ), - ) - ], + SizedBox( + height: 15, + ), + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child: SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + onTap: () { + setState(() { + widget.patientER.ambulate = _ambulate; + widget.patientER.requesterNote = note; + widget.changeCurrentTab(3); + }); + }, + label: 'Next', + ), + ) + ], + ), + ), ); } } diff --git a/lib/pages/ErService/PickupLocation.dart b/lib/pages/ErService/PickupLocation.dart index 46a8928b..4b32c9bb 100644 --- a/lib/pages/ErService/PickupLocation.dart +++ b/lib/pages/ErService/PickupLocation.dart @@ -1,16 +1,29 @@ +import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; +import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; +import 'package:diplomaticquarterapp/pages/ErService/widgets/AppointmentCard.dart'; +import 'package:diplomaticquarterapp/pages/landing/home_page.dart'; +import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:geolocator/geolocator.dart'; +import 'package:google_maps_place_picker/google_maps_place_picker.dart'; +import 'package:google_maps_flutter/google_maps_flutter.dart'; + +import 'AmbulanceReq.dart'; +import 'AvailableAppointmentsPage.dart'; enum HaveAppointment { YES, NO } class PickupLocation extends StatefulWidget { final Function changeCurrentTab; final PatientER patientER; + final AmRequestViewModel amRequestViewModel; PickupLocation( {Key key, @@ -18,8 +31,6 @@ class PickupLocation extends StatefulWidget { this.patientER, this.amRequestViewModel}); - final AmRequestViewModel amRequestViewModel; - @override _PickupLocationState createState() => _PickupLocationState(); } @@ -27,6 +38,26 @@ class PickupLocation extends StatefulWidget { class _PickupLocationState extends State { bool _isInsideHome = false; HaveAppointment _haveAppointment = HaveAppointment.NO; + double _latitude; + double _longitude; + AppoitmentAllHistoryResultList myAppointment; + + @override + void initState() { + super.initState(); + _getCurrentLocation(); + } + + _getCurrentLocation() async { + await getLastKnownPosition().then((value) { + _latitude = value.latitude; + _longitude = value.longitude; + }).catchError((e) { + _longitude = 0; + _latitude = 0; + }); + // currentLocation = LatLng(position.latitude, position.longitude); + } @override Widget build(BuildContext context) { @@ -111,9 +142,12 @@ class _PickupLocationState extends State { Expanded( child: InkWell( onTap: () { - setState(() { - _haveAppointment = HaveAppointment.YES; - }); + if(myAppointment == null) { + getAppointment(); + setState(() { + _haveAppointment = HaveAppointment.YES; + }); + } }, child: Container( decoration: BoxDecoration( @@ -130,9 +164,13 @@ class _PickupLocationState extends State { groupValue: _haveAppointment, activeColor: Colors.red[800], onChanged: (value) { - setState(() { - _haveAppointment = value; - }); + if(myAppointment == null) { + getAppointment(); + setState(() { + _haveAppointment = value; + }); + } + }, ), ), @@ -144,6 +182,7 @@ class _PickupLocationState extends State { onTap: () { setState(() { _haveAppointment = HaveAppointment.NO; + myAppointment = null; }); }, child: Container( @@ -163,6 +202,7 @@ class _PickupLocationState extends State { onChanged: (value) { setState(() { _haveAppointment = value; + myAppointment = null; }); }, ), @@ -172,6 +212,18 @@ class _PickupLocationState extends State { ), ], ), + + if(myAppointment!=null) + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 12, + ), + AppointmentCard(appointment: myAppointment,) + ], + ), + SizedBox( height: 12, ), @@ -209,24 +261,43 @@ class _PickupLocationState extends State { SizedBox( height: 15, ), - Container( - padding: EdgeInsets.all(12), - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Texts('Pickup Location'), - Icon( - Icons.arrow_drop_down, - size: 24, - color: Colors.black, - ) - ], + InkWell( + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => PlacePicker( + apiKey: 'AIzaSyCiD4YqVqLNYbt8-htvFy4Wp8XSph9E3wM​', + // Put YOUR OWN KEY here. + onPlacePicked: (PickResult result) { + print(result.adrAddress); + Navigator.of(context).pop(); + }, + initialPosition: LatLng(_latitude, _longitude), + useCurrentLocation: true, + ), + ), + ); + }, + child: Container( + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts('Pickup Location'), + Icon( + Icons.arrow_drop_down, + size: 24, + color: Colors.black, + ) + ], + ), ), ), SizedBox( @@ -270,7 +341,12 @@ class _PickupLocationState extends State { child: SecondaryButton( color: Colors.grey[800], textColor: Colors.white, - onTap: () => widget.changeCurrentTab(2), + onTap: () { + setState(() { + widget.patientER.pickupSpot = _isInsideHome ? 1 : 0; + widget.changeCurrentTab(2); + }); + }, label: 'Next', ), ) @@ -279,4 +355,37 @@ class _PickupLocationState extends State { ), ); } + + getAppointment() { + widget.amRequestViewModel.getAppointmentHistory().then((value) { + if (widget.amRequestViewModel.state == ViewState.Error || + widget.amRequestViewModel.state == ViewState.ErrorLocal) { + AppToast.showErrorToast(message: widget.amRequestViewModel.error); + } else if (widget.amRequestViewModel.appoitmentAllHistoryResultList.length > 0) { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => AvailableAppointmentsPage( + appointmentsAllHistoryList: + widget.amRequestViewModel.appoitmentAllHistoryResultList, + ), + ), + ).then((value) { + if (value != null) + setState(() { + myAppointment = value; + }); + else + setState(() { + _haveAppointment = HaveAppointment.NO; + }); + }); + } else { + setState(() { + _haveAppointment = HaveAppointment.NO; + }); + AppToast.showErrorToast(message: 'You don\'t have any appointment'); + } + }); + } } diff --git a/lib/pages/ErService/SelectTransportationMethod.dart b/lib/pages/ErService/SelectTransportationMethod.dart index 38eec5b4..261b9f83 100644 --- a/lib/pages/ErService/SelectTransportationMethod.dart +++ b/lib/pages/ErService/SelectTransportationMethod.dart @@ -42,6 +42,10 @@ class _SelectTransportationMethodState _way = widget.patientER.tripType == 1 ? Way.OneWay : Way.TwoWays; _erTransportationMethod = widget.amRequestViewModel .amRequestModeList[(widget.patientER.selectedAmbulate - 1)]; + } else { + if (widget.amRequestViewModel.amRequestModeList.length != 0) + _erTransportationMethod = widget.amRequestViewModel.amRequestModeList[ + widget.amRequestViewModel.amRequestModeList.length - 1]; } } @@ -281,6 +285,8 @@ class _SelectTransportationMethodState .amRequestViewModel.amRequestModeList .indexOf(_erTransportationMethod) + 1); + widget.patientER.patientERTransportationMethod = + _erTransportationMethod; widget.changeCurrentTab(1); }); }, diff --git a/lib/pages/ErService/Summary.dart b/lib/pages/ErService/Summary.dart index 13beee8c..4c189707 100644 --- a/lib/pages/ErService/Summary.dart +++ b/lib/pages/ErService/Summary.dart @@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:diplomaticquarterapp/core/enum/Ambulate.dart'; class Summary extends StatefulWidget { final Function changeCurrentTab; @@ -19,23 +20,86 @@ class Summary extends StatefulWidget { class _SummaryState extends State { @override Widget build(BuildContext context) { - return Column( - children: [ - Texts('Summary 4'), - SizedBox(height: 45,), - Container( - padding: EdgeInsets.all(15), - width: double.maxFinite, - height: 76, - child:SecondaryButton( - color: Colors.grey[800], - textColor: Colors.white, - label: 'Next', - - // onTap: ()=> widget.changeCurrentTab(2), - ), - ) - ], + return SingleChildScrollView( + child: Container( + margin: EdgeInsets.only(left: 12, right: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Summary'), + SizedBox(height: 5,), + Container( + width: double.infinity, + + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(12), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Transportation Method',color: Colors.grey,), + Texts('${widget.patientER.patientERTransportationMethod.title}',bold: true,), + SizedBox(height: 8,), + + Texts('Direction',color: Colors.grey,), + Texts('From Hospital',bold: true,), + SizedBox(height: 8,), + + Texts('Pickup Location',color: Colors.grey,), + Texts('SZR Medical Center',bold: true,), + SizedBox(height: 8,), + + Texts('Drop off location',color: Colors.grey,), + Texts('6199, Al Ameen wlfn nif',bold: true,), + SizedBox(height: 8,), + + Texts('Select Ambulate',color: Colors.grey,), + Texts('${widget.patientER.ambulate.getAmbulateTitle(context)}',bold: true,), + SizedBox(height: 8,), + + Texts('Note',color: Colors.grey,), + Texts('${widget.patientER.requesterNote?? '---'}',bold: true,), + SizedBox(height: 8,), + ], + ), + ), + SizedBox(height: 20,), + Texts('Bill Amount',textAlign: TextAlign.start,), + SizedBox(height: 5,), + Container( + height: 55, + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8) + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts('Total amount payable:'), + Texts('SR ${widget.patientER.patientERTransportationMethod.totalPrice}') + ], + ), + ), + + SizedBox(height: 45,), + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child:SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + label: 'Next', + + // onTap: ()=> widget.changeCurrentTab(2), + ), + ) + ], + ), + ), ); } } diff --git a/lib/pages/ErService/widgets/AppointmentCard.dart b/lib/pages/ErService/widgets/AppointmentCard.dart new file mode 100644 index 00000000..0437c32f --- /dev/null +++ b/lib/pages/ErService/widgets/AppointmentCard.dart @@ -0,0 +1,47 @@ +import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; +import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class AppointmentCard extends StatelessWidget { + final AppoitmentAllHistoryResultList appointment; + + const AppointmentCard({Key key, this.appointment}) : super(key: key); + @override + Widget build(BuildContext context) { + return Container( + width: double.infinity, + margin: EdgeInsets.all(8), + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + ), + child: Row( + children: [ + LargeAvatar( + url: appointment.doctorImageURL, + name: appointment.doctorNameObj, + ), + Expanded( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts(appointment.doctorNameObj,bold: true,), + SizedBox(height: 4,), + Texts(appointment.projectName), + Texts(appointment.clinicName), + Texts(DateUtil.getMonthDayYearDateFormatted(DateUtil.convertStringToDate(appointment.bookDate))), + ], + ), + ), + ) + ], + ), + ); + } +} diff --git a/lib/pages/ErService/widgets/StepsWidget.dart b/lib/pages/ErService/widgets/StepsWidget.dart index 1e4077cb..c5864710 100644 --- a/lib/pages/ErService/widgets/StepsWidget.dart +++ b/lib/pages/ErService/widgets/StepsWidget.dart @@ -1,6 +1,8 @@ +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; class StepsWidget extends StatelessWidget { final int index; @@ -10,7 +12,8 @@ class StepsWidget extends StatelessWidget { @override Widget build(BuildContext context) { - return Stack( + ProjectViewModel projectViewModel = Provider.of(context); + return projectViewModel.isArabic? Stack( children: [ Container( height: 50, @@ -114,6 +117,110 @@ class StepsWidget extends StatelessWidget { ), ), ], + ):Stack( + children: [ + Container( + height: 50, + width: MediaQuery.of(context).size.width, + color: Colors.transparent, + child: Center( + child: Divider( + color: Colors.grey, + height: 0.75, + thickness: 0.75, + ), + ), + ), + Positioned( + top: 10, + right: 0, + child: InkWell( + onTap: () => changeCurrentTab(0), + child: Container( + width: 35, + height: 35, + decoration: BoxDecoration( + border: index > 0 ? null:Border.all(color: Colors.black,width: 0.75), + shape: BoxShape.circle, + color: index == 0 ? Colors.grey[800] : index > 0 ?Colors.green: Colors.white, + ), + child: Center( + child: Texts( + '1', + color: index == 0 ? Colors.white : index > 0 ?Colors.white: Colors.grey[800], + ), + ), + ), + ), + ), + Positioned( + top: 10, + right: MediaQuery.of(context).size.width * 0.3, + child: InkWell( + onTap: () => index >= 2 ? changeCurrentTab(1) : null, + child: Container( + width: 35, + height: 35, + decoration: BoxDecoration( + border: index > 1 ? null:Border.all(color: Colors.black,width: 0.75), + shape: BoxShape.circle, + color: index == 1 ? Colors.grey[800] : index > 1 ?Colors.green: Colors.white, + ), + child: Center( + child: Texts( + '2', + color: index == 1? Colors.white : index > 1 ?Colors.white: Colors.grey[800], + ), + ), + ), + ), + ), + Positioned( + top: 10, + right: MediaQuery.of(context).size.width * 0.6, + child: InkWell( + onTap: () => index >= 3 ? changeCurrentTab(2) : null, + child: Container( + width: 35, + height: 35, + decoration: BoxDecoration( + shape: BoxShape.circle, + border: index > 2 ? null:Border.all(color: Colors.black,width: 0.75), + color: index == 2 ? Colors.grey[800] : index > 1 ?Colors.green: Colors.white, + ), + child: Center( + child: Texts( + '3', + color: index == 2? Colors.white : index > 1 ?Colors.white: Colors.grey[800], + ), + ), + ), + ), + ), + Positioned( + top: 10, + left: 0, + child: InkWell( + onTap: () => index == 2 ?changeCurrentTab(3):null, + child: Container( + width: 35, + height: 35, + decoration: BoxDecoration( + border: Border.all(color: Colors.black,width: 0.75), + + shape: BoxShape.circle, + color: index == 3 ? Colors.grey[800] : Colors.white, + ), + child: Center( + child: Texts( + '4', + color: index == 3 ? Colors.white : Colors.grey[800], + ), + ), + ), + ), + ), + ], ); } } diff --git a/lib/uitl/ProgressDialog.dart b/lib/uitl/ProgressDialog.dart new file mode 100644 index 00000000..728b27dd --- /dev/null +++ b/lib/uitl/ProgressDialog.dart @@ -0,0 +1,12 @@ +import 'package:flutter/material.dart'; + +class ProgressDialogUtil{ + + static AlertDialog alert = AlertDialog( + content: new Row( + children: [ + CircularProgressIndicator(), + Container(margin: EdgeInsets.only(left: 7),child:Text("Loading..." )), + ],), + ); +} \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 8bc2c52a..6e9349ab 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ description: A new Flutter application. version: 1.0.0+1 environment: - sdk: ">=2.2.2 <3.0.0" + sdk: ">=2.6.0 <3.0.0" dependencies: flutter: @@ -128,6 +128,10 @@ dependencies: #Handle Geolocation geolocator: ^6.0.0+1 + + #google maps places + google_maps_place_picker: ^0.10.0 + #Dependencies for video call implementation native_device_orientation: ^0.3.0 enum_to_string: ^1.0.9 From 06416b49345000080c8955eca05b79cf2a66baa6 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Sun, 11 Oct 2020 14:32:14 +0300 Subject: [PATCH 09/14] add Not authenticated Page --- assets/images/Wifi-AR.png | Bin 0 -> 18245 bytes assets/images/wifi-EN.png | Bin 0 -> 19261 bytes lib/config/config.dart | 4 +- lib/config/localized_values.dart | 11 +- lib/core/enum/Ambulate.dart | 41 +++- lib/core/enum/OrderService.dart | 22 ++ lib/core/model/er/PickUpRequestPresOrder.dart | 204 ++++++++++++++++++ lib/core/service/client/base_app_client.dart | 4 +- lib/core/service/er/am_service.dart | 49 ++++- lib/core/service/medical/medical_service.dart | 19 ++ lib/core/viewModels/base_view_model.dart | 1 + .../viewModels/er/am_request_view_model.dart | 30 ++- .../viewModels/medical/labs_view_model.dart | 86 ++++---- .../medical/medical_view_model.dart | 19 +- lib/pages/ErService/AmbulanceReq.dart | 21 +- .../AmbulanceRequestIndex.dart | 8 +- .../BillAmount.dart | 19 +- .../PickupLocation.dart | 200 ++++++++++++----- .../SelectTransportationMethod.dart | 23 +- .../Summary.dart | 0 lib/pages/ErService/OrderLogPage.dart | 62 ++++++ lib/pages/base/base_view.dart | 4 +- lib/pages/landing/home_page.dart | 1 + lib/pages/login/confirm-login.dart | 1 + lib/pages/login/forgot-password.dart | 1 + lib/pages/login/login-type.dart | 1 + lib/pages/login/login.dart | 1 + lib/pages/login/register-info.dart | 1 + lib/pages/login/register.dart | 1 + lib/pages/login/welcome.dart | 1 + lib/pages/medical/labs/labs_home_page.dart | 1 + lib/pages/medical/medical_profile_page.dart | 1 + .../radiology/radiology_home_page.dart | 1 + lib/uitl/ProgressDialog.dart | 32 ++- lib/uitl/translations_delegate_base.dart | 4 + lib/widgets/others/OrderLogItem.dart | 32 +++ lib/widgets/others/app_scaffold_widget.dart | 95 ++++---- lib/widgets/others/not_auh_page.dart | 79 +++++++ pubspec.yaml | 3 + 39 files changed, 884 insertions(+), 199 deletions(-) create mode 100644 assets/images/Wifi-AR.png create mode 100644 assets/images/wifi-EN.png create mode 100644 lib/core/enum/OrderService.dart create mode 100644 lib/core/model/er/PickUpRequestPresOrder.dart rename lib/pages/ErService/{ => AmbulanceRequestIndexPages}/AmbulanceRequestIndex.dart (89%) rename lib/pages/ErService/{ => AmbulanceRequestIndexPages}/BillAmount.dart (96%) rename lib/pages/ErService/{ => AmbulanceRequestIndexPages}/PickupLocation.dart (67%) rename lib/pages/ErService/{ => AmbulanceRequestIndexPages}/SelectTransportationMethod.dart (92%) rename lib/pages/ErService/{ => AmbulanceRequestIndexPages}/Summary.dart (100%) create mode 100644 lib/pages/ErService/OrderLogPage.dart create mode 100644 lib/widgets/others/OrderLogItem.dart create mode 100644 lib/widgets/others/not_auh_page.dart diff --git a/assets/images/Wifi-AR.png b/assets/images/Wifi-AR.png new file mode 100644 index 0000000000000000000000000000000000000000..a8e2d9af3fd23ab15c89bc14bb4602cf257c7567 GIT binary patch literal 18245 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 literal 0 HcmV?d00001 diff --git a/assets/images/wifi-EN.png b/assets/images/wifi-EN.png new file mode 100644 index 0000000000000000000000000000000000000000..5711925c73665a7cbccd0bba985c4b9acafad527 GIT binary patch literal 19261 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 jfq{X6fnh}9{{> localizedValues = { "All":{"en":"All","ar":"الكل"}, "QuestionHere":{"en":"Enter the question here...","ar":"اضف الاستفسار هنا"}, "ViewDoctorResponses":{"en":"View Doctor Responses","ar":"الاطلاع على ردود الأطباء"}, - + "ServiceInformationButton":{"en":"LOGIN / REGISTER","ar":"دخول / تسجيل"}, + "ServiceInformationTitle":{"en":"Service Information","ar":"معلومات الخدمة"}, + "info-lab": { + "en": "This service allows you to view the results of all laboratory tests performed in Al Habib Medical Group as well as sending the report via e-mail.", + "ar": "خدمة نتائج المختبر: هذه الخدمة تمكنك من الاطلاع على نتائج جميع الفحوصات المخبرية التي تمت في مجموعة الحبيب الطبية." + }, + "info-radiology": { + "en": "This service allows you to view the reports and photos of radiology in Al Habib Medical Group as well as send the report by e-mail.", + "ar": "خدمة الاشعة: هذه الخدمة تمكنك من الاطلاع على تقارير وصور الاشعة التي تمت في مجموعة الحبيب الطبية وكذلك ارسال التقرير عن طريق الايميل." + }, }; diff --git a/lib/core/enum/Ambulate.dart b/lib/core/enum/Ambulate.dart index 059a281c..f8b2e8be 100644 --- a/lib/core/enum/Ambulate.dart +++ b/lib/core/enum/Ambulate.dart @@ -6,22 +6,55 @@ extension SelectedAmbulate on Ambulate { String getAmbulateTitle(BuildContext context) { switch (this) { case Ambulate.Wheelchair: - // TODO: Handle this case. return 'Wheelchair'; break; case Ambulate.Walker: - // TODO: Handle this case. return 'Walker'; break; case Ambulate.Stretcher: - // TODO: Handle this case. return 'Stretcher'; break; case Ambulate.None: - // TODO: Handle this case. return 'None'; break; } return 'None'; } + + int selectAmbulateNumber() { + switch (this) { + case Ambulate.Wheelchair: + return 0; + break; + case Ambulate.Walker: + return 1; + break; + case Ambulate.Stretcher: + return 2; + break; + case Ambulate.None: + return 3; + break; + } + return 3; + } + + Ambulate getAmbulateById(int id) { + switch (id) { + case 0: + return Ambulate.Wheelchair; + break; + case 1: + return Ambulate.Walker; + break; + case 2: + return Ambulate.Stretcher; + break; + case 3: + return Ambulate.None; + break; + } + + return Ambulate.None; + } } diff --git a/lib/core/enum/OrderService.dart b/lib/core/enum/OrderService.dart new file mode 100644 index 00000000..e6ce24eb --- /dev/null +++ b/lib/core/enum/OrderService.dart @@ -0,0 +1,22 @@ +enum OrderService { AMBULANCE } + +extension SelectedOrderService on OrderService { + int getIdOrderService() { + switch (this) { + case OrderService.AMBULANCE: + return 4; + break; + } + return 4; + } + + OrderService getOrderServiceById(int id) { + switch (id) { + case 4: + return OrderService.AMBULANCE; + break; + } + + return OrderService.AMBULANCE; + } +} diff --git a/lib/core/model/er/PickUpRequestPresOrder.dart b/lib/core/model/er/PickUpRequestPresOrder.dart new file mode 100644 index 00000000..9ce3e678 --- /dev/null +++ b/lib/core/model/er/PickUpRequestPresOrder.dart @@ -0,0 +1,204 @@ +class PickUpRequestPresOrder { + int id; + int presOrderID; + String createDate; + String lastEditDate; + int createdBy; + int lastEditBy; + bool isActive; + String requestNo; + int requesterId; + int direction; + bool haveAppointment; + dynamic appointmentId; + int tripType; + int pickupUrgency; + String pickupDateTime; + dynamic pickupLocationId; + int pickupSpot; + dynamic dropoffLocationId; + int transportationMethodId; + int cost; + double vAT; + double totalPrice; + int amountCollected; + int selectedAmbulate; + String requesterNote; + int status; + int paymentStatus; + dynamic rejectReason; + int visibility; + dynamic durationId; + dynamic imageId; + String requesterFileNo; + String requesterMobileNo; + bool requesterIsOutSA; + String pickupLocationLongitude; + String pickupLocationLattitude; + String dropoffLocationLongitude; + String dropoffLocationLattitude; + dynamic appointmentClinicName; + dynamic appointmentDoctorName; + dynamic appointmentBranch; + dynamic appointmentTime; + String pickupLocationName; + String dropoffLocationName; + String title; + String titleAR; + String ambulateDescription; + String ambulateDescriptionN; + + PickUpRequestPresOrder( + {this.id, + this.presOrderID, + this.createDate, + this.lastEditDate, + this.createdBy, + this.lastEditBy, + this.isActive, + this.requestNo, + this.requesterId, + this.direction, + this.haveAppointment, + this.appointmentId, + this.tripType, + this.pickupUrgency, + this.pickupDateTime, + this.pickupLocationId, + this.pickupSpot, + this.dropoffLocationId, + this.transportationMethodId, + this.cost, + this.vAT, + this.totalPrice, + this.amountCollected, + this.selectedAmbulate, + this.requesterNote, + this.status, + this.paymentStatus, + this.rejectReason, + this.visibility, + this.durationId, + this.imageId, + this.requesterFileNo, + this.requesterMobileNo, + this.requesterIsOutSA, + this.pickupLocationLongitude, + this.pickupLocationLattitude, + this.dropoffLocationLongitude, + this.dropoffLocationLattitude, + this.appointmentClinicName, + this.appointmentDoctorName, + this.appointmentBranch, + this.appointmentTime, + this.pickupLocationName, + this.dropoffLocationName, + this.title, + this.titleAR, + this.ambulateDescription, + this.ambulateDescriptionN}); + + PickUpRequestPresOrder.fromJson(Map json) { + id = json['Id']; + presOrderID = json['PresOrderID']; + createDate = json['CreateDate']; + lastEditDate = json['LastEditDate']; + createdBy = json['CreatedBy']; + lastEditBy = json['LastEditBy']; + isActive = json['IsActive']; + requestNo = json['RequestNo']; + requesterId = json['RequesterId']; + direction = json['Direction']; + haveAppointment = json['HaveAppointment']; + appointmentId = json['AppointmentId']; + tripType = json['TripType']; + pickupUrgency = json['PickupUrgency']; + pickupDateTime = json['PickupDateTime']; + pickupLocationId = json['PickupLocationId']; + pickupSpot = json['PickupSpot']; + dropoffLocationId = json['DropoffLocationId']; + transportationMethodId = json['TransportationMethodId']; + cost = json['Cost']; + vAT = json['VAT']; + totalPrice = json['TotalPrice']; + amountCollected = json['AmountCollected']; + selectedAmbulate = json['SelectedAmbulate']; + requesterNote = json['RequesterNote']; + status = json['Status']; + paymentStatus = json['PaymentStatus']; + rejectReason = json['RejectReason']; + visibility = json['Visibility']; + durationId = json['DurationId']; + imageId = json['ImageId']; + requesterFileNo = json['RequesterFileNo']; + requesterMobileNo = json['RequesterMobileNo']; + requesterIsOutSA = json['RequesterIsOutSA']; + pickupLocationLongitude = json['PickupLocationLongitude']; + pickupLocationLattitude = json['PickupLocationLattitude']; + dropoffLocationLongitude = json['DropoffLocationLongitude']; + dropoffLocationLattitude = json['DropoffLocationLattitude']; + appointmentClinicName = json['AppointmentClinicName']; + appointmentDoctorName = json['AppointmentDoctorName']; + appointmentBranch = json['AppointmentBranch']; + appointmentTime = json['AppointmentTime']; + pickupLocationName = json['PickupLocationName']; + dropoffLocationName = json['DropoffLocationName']; + title = json['Title']; + titleAR = json['TitleAR']; + ambulateDescription = json['AmbulateDescription']; + ambulateDescriptionN = json['AmbulateDescriptionN']; + } + + Map toJson() { + final Map data = new Map(); + data['Id'] = this.id; + data['PresOrderID'] = this.presOrderID; + data['CreateDate'] = this.createDate; + data['LastEditDate'] = this.lastEditDate; + data['CreatedBy'] = this.createdBy; + data['LastEditBy'] = this.lastEditBy; + data['IsActive'] = this.isActive; + data['RequestNo'] = this.requestNo; + data['RequesterId'] = this.requesterId; + data['Direction'] = this.direction; + data['HaveAppointment'] = this.haveAppointment; + data['AppointmentId'] = this.appointmentId; + data['TripType'] = this.tripType; + data['PickupUrgency'] = this.pickupUrgency; + data['PickupDateTime'] = this.pickupDateTime; + data['PickupLocationId'] = this.pickupLocationId; + data['PickupSpot'] = this.pickupSpot; + data['DropoffLocationId'] = this.dropoffLocationId; + data['TransportationMethodId'] = this.transportationMethodId; + data['Cost'] = this.cost; + data['VAT'] = this.vAT; + data['TotalPrice'] = this.totalPrice; + data['AmountCollected'] = this.amountCollected; + data['SelectedAmbulate'] = this.selectedAmbulate; + data['RequesterNote'] = this.requesterNote; + data['Status'] = this.status; + data['PaymentStatus'] = this.paymentStatus; + data['RejectReason'] = this.rejectReason; + data['Visibility'] = this.visibility; + data['DurationId'] = this.durationId; + data['ImageId'] = this.imageId; + data['RequesterFileNo'] = this.requesterFileNo; + data['RequesterMobileNo'] = this.requesterMobileNo; + data['RequesterIsOutSA'] = this.requesterIsOutSA; + data['PickupLocationLongitude'] = this.pickupLocationLongitude; + data['PickupLocationLattitude'] = this.pickupLocationLattitude; + data['DropoffLocationLongitude'] = this.dropoffLocationLongitude; + data['DropoffLocationLattitude'] = this.dropoffLocationLattitude; + data['AppointmentClinicName'] = this.appointmentClinicName; + data['AppointmentDoctorName'] = this.appointmentDoctorName; + data['AppointmentBranch'] = this.appointmentBranch; + data['AppointmentTime'] = this.appointmentTime; + data['PickupLocationName'] = this.pickupLocationName; + data['DropoffLocationName'] = this.dropoffLocationName; + data['Title'] = this.title; + data['TitleAR'] = this.titleAR; + data['AmbulateDescription'] = this.ambulateDescription; + data['AmbulateDescriptionN'] = this.ambulateDescriptionN; + return data; + } +} diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index f5494049..4ad8de79 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -15,7 +15,7 @@ AppSharedPreferences sharedPref = new AppSharedPreferences(); ///await BaseAppClient.post('', /// onSuccess: (dynamic response, int statusCode) {}, /// onFailure: (String error, int statusCode) {}, -/// body: null); +/// body: Map(); class BaseAppClient { post(String endPoint, @@ -78,7 +78,7 @@ class BaseAppClient { print("URL : $url"); print("Body : ${json.encode(body)}"); - var asd=""; + if (await Utils.checkConnection()) { final response = await http.post(url.trim(), body: json.encode(body), diff --git a/lib/core/service/er/am_service.dart b/lib/core/service/er/am_service.dart index b6a91871..b654e0eb 100644 --- a/lib/core/service/er/am_service.dart +++ b/lib/core/service/er/am_service.dart @@ -1,23 +1,30 @@ import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/enum/OrderService.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; +import 'package:diplomaticquarterapp/core/model/er/PickUpRequestPresOrder.dart'; import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; import '../base_service.dart'; class AmService extends BaseService { List amModelList = List(); List patientAllPresOrdersList = List(); + bool hasPendingOrder = false; + int pendingOrderID = 0; + String pendingOrderStatus = ""; + String pendingOrderStatusAR = ""; + PickUpRequestPresOrder pickUpRequestPresOrder; Future getAllTransportationOrders() async { hasError = false; Map body = Map(); - body['isDentalAllowedBackend']= false; + body['isDentalAllowedBackend'] = false; body['IdentificationNo'] = user.patientIdentificationNo; await baseAppClient.post(GET_AMBULANCE_REQUEST, onSuccess: (dynamic response, int statusCode) { - amModelList.clear(); - response['PatientER_RRT_GetAllTransportationMethodList'].forEach((vital) { - amModelList.add(PatientERTransportationMethod.fromJson(vital)); + amModelList.clear(); + response['PatientER_RRT_GetAllTransportationMethodList'].forEach((item) { + amModelList.add(PatientERTransportationMethod.fromJson(item)); }); }, onFailure: (String error, int statusCode) { hasError = true; @@ -27,11 +34,39 @@ class AmService extends BaseService { Future getPatientAllPresOrdersList() async { hasError = false; + hasPendingOrder = false; await baseAppClient.post(GET_PATIENT_ALL_PRES_ORDERS, onSuccess: (dynamic response, int statusCode) { - patientAllPresOrdersList.clear(); - response['PatientER_GetPatientAllPresOrdersList'].forEach((vital) { - patientAllPresOrdersList.add(PatientAllPresOrders.fromJson(vital)); + patientAllPresOrdersList.clear(); + response['PatientER_GetPatientAllPresOrdersList'].forEach((item) { + if (item['ServiceID'] == OrderService.AMBULANCE.getIdOrderService()) { + var order = PatientAllPresOrders.fromJson(item); + patientAllPresOrdersList.add(order); + if (order.status == 1) { + hasPendingOrder = true; + pendingOrderID = order.iD; + pendingOrderStatus = order.description; + pendingOrderStatusAR = order.descriptionN; + } + } + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: Map()); + } + + Future getOrderDetails() async { + hasError = false; + hasPendingOrder = false; + Map body = Map(); + body['PresOrderID'] = pendingOrderID; + await baseAppClient.post(GET_PICK_UP_REQUEST_BY_PRES_ORDER_ID, + onSuccess: (dynamic response, int statusCode) { + patientAllPresOrdersList.clear(); + response['PatientER_RRT_GetPickUpRequestByPresOrderIDList'] + .forEach((item) { + pickUpRequestPresOrder = PickUpRequestPresOrder.fromJson(item); }); }, onFailure: (String error, int statusCode) { hasError = true; diff --git a/lib/core/service/medical/medical_service.dart b/lib/core/service/medical/medical_service.dart index 572e5096..f90280cf 100644 --- a/lib/core/service/medical/medical_service.dart +++ b/lib/core/service/medical/medical_service.dart @@ -1,6 +1,8 @@ import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/service/base_service.dart'; import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; +import 'package:flutter/cupertino.dart'; class MedicalService extends BaseService { List appoitmentAllHistoryResultList = List(); @@ -26,4 +28,21 @@ class MedicalService extends BaseService { super.error = error; }, body: body); } + + addAmbulanceRequest({@required PatientER patientER}) async { + hasError = false; + super.error = ""; + Map body = Map(); + body['RequesterFileNo'] = user.patientID; + body['RequesterMobileNo'] = user.mobileNumber; + body['RequesterIsOutSA'] = user.outSA; + await baseAppClient.post(GET_PATIENT_APPOINTMENT_HISTORY, + onSuccess: (response, statusCode) async { + + + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } } diff --git a/lib/core/viewModels/base_view_model.dart b/lib/core/viewModels/base_view_model.dart index 7e16d22d..18ab02e3 100644 --- a/lib/core/viewModels/base_view_model.dart +++ b/lib/core/viewModels/base_view_model.dart @@ -18,6 +18,7 @@ class BaseViewModel extends ChangeNotifier { AuthenticatedUser user; AppSharedPreferences sharedPref = AppSharedPreferences(); + AuthenticatedUserObject authenticatedUserObject = locator(); void setState(ViewState viewState) { _state = viewState; diff --git a/lib/core/viewModels/er/am_request_view_model.dart b/lib/core/viewModels/er/am_request_view_model.dart index a5261456..fbd3d95d 100644 --- a/lib/core/viewModels/er/am_request_view_model.dart +++ b/lib/core/viewModels/er/am_request_view_model.dart @@ -1,6 +1,7 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; +import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart'; import 'package:diplomaticquarterapp/core/service/er/am_service.dart'; import 'package:diplomaticquarterapp/core/service/hospital_service.dart'; import 'package:diplomaticquarterapp/core/service/medical/medical_service.dart'; @@ -14,17 +15,22 @@ class AmRequestViewModel extends BaseViewModel { HospitalService _hospitalService = locator(); MedicalService _medicalService = locator(); - List - get amRequestModeList => _amService.amModelList; + List get amRequestModeList => + _amService.amModelList; - List get patientAllPresOrdersList =>_amService.patientAllPresOrdersList; + List get patientAllPresOrdersList => + _amService.patientAllPresOrdersList; List get appoitmentAllHistoryResultList => _medicalService.appoitmentAllHistoryResultList; + List get hospitals => _hospitalService.hospitals; + + bool get hasPendingOrder =>_amService.hasPendingOrder; + Future getAppointmentHistory() async { setState(ViewState.BusyLocal); - await _medicalService.getAppointmentHistory(isActiveAppointment: true); + await _medicalService.getAppointmentHistory(isActiveAppointment: true); if (_medicalService.hasError) { error = _medicalService.error; setState(ViewState.ErrorLocal); @@ -32,8 +38,6 @@ class AmRequestViewModel extends BaseViewModel { setState(ViewState.Idle); } - - Future getAmRequestOrders() async { setState(ViewState.Busy); await _amService.getAllTransportationOrders(); @@ -54,9 +58,21 @@ class AmRequestViewModel extends BaseViewModel { getPatientAllPresOrdersList(); } - Future getPatientAllPresOrdersList()async{ + Future getPatientAllPresOrdersList() async { setState(ViewState.Busy); await _amService.getPatientAllPresOrdersList(); + if (_hospitalService.hasError) { + error = _hospitalService.error; + setState(ViewState.Error); + } else if (_amService.hasPendingOrder) { + getOrderDetails(); + } else + setState(ViewState.Idle); + } + + Future getOrderDetails() async { + setState(ViewState.Busy); + await _amService.getOrderDetails(); if (_hospitalService.hasError) { error = _hospitalService.error; setState(ViewState.Error); diff --git a/lib/core/viewModels/medical/labs_view_model.dart b/lib/core/viewModels/medical/labs_view_model.dart index 032aeb1e..8cbf0efc 100644 --- a/lib/core/viewModels/medical/labs_view_model.dart +++ b/lib/core/viewModels/medical/labs_view_model.dart @@ -21,52 +21,54 @@ class LabsViewModel extends BaseViewModel { : _patientLabOrdersListHospital; void getLabs() async { - setState(ViewState.Busy); - await _labsService.getPatientLabOrdersList(); - if (_labsService.hasError) { - error = _labsService.error; - setState(ViewState.Error); - } else { - _labsService.patientLabOrdersList.forEach((element) { - List patientLabOrdersClinic = - _patientLabOrdersListClinic - .where((elementClinic) => - elementClinic.filterName == element.clinicDescription) - .toList(); + if (authenticatedUserObject.isLogin) { + setState(ViewState.Busy); + await _labsService.getPatientLabOrdersList(); + if (_labsService.hasError) { + error = _labsService.error; + setState(ViewState.Error); + } else { + _labsService.patientLabOrdersList.forEach((element) { + List patientLabOrdersClinic = + _patientLabOrdersListClinic + .where((elementClinic) => + elementClinic.filterName == element.clinicDescription) + .toList(); - if (patientLabOrdersClinic.length != 0) { - _patientLabOrdersListClinic[_patientLabOrdersListClinic - .indexOf(patientLabOrdersClinic[0])] - .patientLabOrdersList - .add(element); - } else { - _patientLabOrdersListClinic.add(PatientLabOrdersList( - filterName: element.clinicDescription, - patientDoctorAppointment: element)); - } + if (patientLabOrdersClinic.length != 0) { + _patientLabOrdersListClinic[_patientLabOrdersListClinic + .indexOf(patientLabOrdersClinic[0])] + .patientLabOrdersList + .add(element); + } else { + _patientLabOrdersListClinic.add(PatientLabOrdersList( + filterName: element.clinicDescription, + patientDoctorAppointment: element)); + } - // doctor list sort via project - List patientLabOrdersHospital = - _patientLabOrdersListHospital - .where( - (elementClinic) => - elementClinic.filterName == element.projectName, - ) - .toList(); + // doctor list sort via project + List patientLabOrdersHospital = + _patientLabOrdersListHospital + .where( + (elementClinic) => + elementClinic.filterName == element.projectName, + ) + .toList(); - if (patientLabOrdersHospital.length != 0) { - _patientLabOrdersListHospital[_patientLabOrdersListHospital - .indexOf(patientLabOrdersHospital[0])] - .patientLabOrdersList - .add(element); - } else { - _patientLabOrdersListHospital.add(PatientLabOrdersList( - filterName: element.projectName, - patientDoctorAppointment: element)); - } - }); + if (patientLabOrdersHospital.length != 0) { + _patientLabOrdersListHospital[_patientLabOrdersListHospital + .indexOf(patientLabOrdersHospital[0])] + .patientLabOrdersList + .add(element); + } else { + _patientLabOrdersListHospital.add(PatientLabOrdersList( + filterName: element.projectName, + patientDoctorAppointment: element)); + } + }); - setState(ViewState.Idle); + setState(ViewState.Idle); + } } } diff --git a/lib/core/viewModels/medical/medical_view_model.dart b/lib/core/viewModels/medical/medical_view_model.dart index fa330aad..4563f615 100644 --- a/lib/core/viewModels/medical/medical_view_model.dart +++ b/lib/core/viewModels/medical/medical_view_model.dart @@ -1,4 +1,5 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/service/medical/medical_service.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; import 'package:diplomaticquarterapp/locator.dart'; @@ -11,13 +12,15 @@ class MedicalViewModel extends BaseViewModel { _medicalService.appoitmentAllHistoryResultList; getAppointmentHistory() async { - setState(ViewState.Busy); - if (_medicalService.appoitmentAllHistoryResultList.length == 0) - await _medicalService.getAppointmentHistory(); - if (_medicalService.hasError) { - error = _medicalService.error; - setState(ViewState.Error); - } else - setState(ViewState.Idle); + if (authenticatedUserObject.isLogin) { + setState(ViewState.Busy); + if (_medicalService.appoitmentAllHistoryResultList.length == 0) + await _medicalService.getAppointmentHistory(); + if (_medicalService.hasError) { + error = _medicalService.error; + setState(ViewState.Error); + } else + setState(ViewState.Idle); + } } } diff --git a/lib/pages/ErService/AmbulanceReq.dart b/lib/pages/ErService/AmbulanceReq.dart index c50093be..ec96f482 100644 --- a/lib/pages/ErService/AmbulanceReq.dart +++ b/lib/pages/ErService/AmbulanceReq.dart @@ -10,7 +10,8 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; -import 'AmbulanceRequestIndex.dart'; +import 'AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart'; +import 'OrderLogPage.dart'; class AmbulanceReq extends StatefulWidget { @override @@ -26,11 +27,13 @@ class _AmbulanceReqState extends State super.initState(); _tabController = TabController(length: 2, vsync: this); } + @override void dispose() { super.dispose(); _tabController.dispose(); } + @override Widget build(BuildContext context) { return BaseView( @@ -80,13 +83,14 @@ class _AmbulanceReqState extends State indicatorColor: Colors.red[800], labelColor: Theme.of(context).primaryColor, labelPadding: - EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), + EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), unselectedLabelColor: Colors.grey[800], tabs: [ Container( width: MediaQuery.of(context).size.width * 0.40, child: Center( - child: Texts("Ambulance Request"),//TranslationBase.of(context).prescriptions + child: Texts( + "Ambulance Request"), //TranslationBase.of(context).prescriptions ), ), Container( @@ -110,8 +114,14 @@ class _AmbulanceReqState extends State physics: BouncingScrollPhysics(), controller: _tabController, children: [ - AmbulanceRequestIndex(amRequestViewModel: model,), - Container() + model.hasPendingOrder + ? Container() + : AmbulanceRequestIndexPage( + amRequestViewModel: model, + ), + OrderLogPage( + amRequestViewModel: model, + ) ], ), ) @@ -121,5 +131,4 @@ class _AmbulanceReqState extends State ), ); } - } diff --git a/lib/pages/ErService/AmbulanceRequestIndex.dart b/lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart similarity index 89% rename from lib/pages/ErService/AmbulanceRequestIndex.dart rename to lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart index 16d07b88..55e75e22 100644 --- a/lib/pages/ErService/AmbulanceRequestIndex.dart +++ b/lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart @@ -9,16 +9,16 @@ import 'PickupLocation.dart'; import 'SelectTransportationMethod.dart'; import 'Summary.dart'; -class AmbulanceRequestIndex extends StatefulWidget { +class AmbulanceRequestIndexPage extends StatefulWidget { final AmRequestViewModel amRequestViewModel; - AmbulanceRequestIndex({Key key, this.amRequestViewModel}); + AmbulanceRequestIndexPage({Key key, this.amRequestViewModel}); @override - _AmbulanceRequestIndexState createState() => _AmbulanceRequestIndexState(); + _AmbulanceRequestIndexPageState createState() => _AmbulanceRequestIndexPageState(); } -class _AmbulanceRequestIndexState extends State { +class _AmbulanceRequestIndexPageState extends State { int currentIndex = 0; PageController pageController; PatientER _patientER = PatientER(); diff --git a/lib/pages/ErService/BillAmount.dart b/lib/pages/ErService/AmbulanceRequestIndexPages/BillAmount.dart similarity index 96% rename from lib/pages/ErService/BillAmount.dart rename to lib/pages/ErService/AmbulanceRequestIndexPages/BillAmount.dart index 44e17c3a..cc6af0f2 100644 --- a/lib/pages/ErService/BillAmount.dart +++ b/lib/pages/ErService/AmbulanceRequestIndexPages/BillAmount.dart @@ -26,6 +26,22 @@ class BillAmount extends StatefulWidget { class _BillAmountState extends State { Ambulate _ambulate = Ambulate.None; String note =""; + + + @override + void initState() { + + if(widget.patientER.ambulate!=null) + { + setState(() { + _ambulate = widget.patientER.ambulate; + note = widget.patientER.requesterNote; + }); + } + super.initState(); + } + + @override Widget build(BuildContext context) { return SingleChildScrollView( @@ -278,7 +294,7 @@ class _BillAmountState extends State { color: Colors.white, ), child: ListTile( - title: Text('Walker'), + title: Text('None'), leading: Radio( value: Ambulate.None, groupValue: _ambulate, @@ -320,6 +336,7 @@ class _BillAmountState extends State { setState(() { widget.patientER.ambulate = _ambulate; widget.patientER.requesterNote = note; + widget.patientER.selectedAmbulate = _ambulate.selectAmbulateNumber(); widget.changeCurrentTab(3); }); }, diff --git a/lib/pages/ErService/PickupLocation.dart b/lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart similarity index 67% rename from lib/pages/ErService/PickupLocation.dart rename to lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart index 4b32c9bb..795f4dcc 100644 --- a/lib/pages/ErService/PickupLocation.dart +++ b/lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart @@ -1,9 +1,12 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; +import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; +import 'package:diplomaticquarterapp/pages/Blood/dialogs/SelectHospitalDialog.dart'; import 'package:diplomaticquarterapp/pages/ErService/widgets/AppointmentCard.dart'; import 'package:diplomaticquarterapp/pages/landing/home_page.dart'; +import 'package:diplomaticquarterapp/uitl/ProgressDialog.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; @@ -15,8 +18,8 @@ import 'package:geolocator/geolocator.dart'; import 'package:google_maps_place_picker/google_maps_place_picker.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; -import 'AmbulanceReq.dart'; -import 'AvailableAppointmentsPage.dart'; +import '../AmbulanceReq.dart'; +import '../AvailableAppointmentsPage.dart'; enum HaveAppointment { YES, NO } @@ -41,6 +44,8 @@ class _PickupLocationState extends State { double _latitude; double _longitude; AppoitmentAllHistoryResultList myAppointment; + HospitalsModel _selectedHospital; + PickResult _result; @override void initState() { @@ -142,7 +147,7 @@ class _PickupLocationState extends State { Expanded( child: InkWell( onTap: () { - if(myAppointment == null) { + if (myAppointment == null) { getAppointment(); setState(() { _haveAppointment = HaveAppointment.YES; @@ -164,13 +169,12 @@ class _PickupLocationState extends State { groupValue: _haveAppointment, activeColor: Colors.red[800], onChanged: (value) { - if(myAppointment == null) { + if (myAppointment == null) { getAppointment(); setState(() { _haveAppointment = value; }); } - }, ), ), @@ -212,18 +216,18 @@ class _PickupLocationState extends State { ), ], ), - - if(myAppointment!=null) + if (myAppointment != null) Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox( height: 12, ), - AppointmentCard(appointment: myAppointment,) + AppointmentCard( + appointment: myAppointment, + ) ], ), - SizedBox( height: 12, ), @@ -231,29 +235,35 @@ class _PickupLocationState extends State { SizedBox( height: 8, ), - Container( - padding: EdgeInsets.all(12), - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Texts('Pickup Location'), - Icon( - Icons.arrow_drop_down, - size: 24, - color: Colors.black, - ) - ], + InkWell( + onTap: () { + confirmSelectHospitalDialog( + widget.amRequestViewModel.hospitals); + }, + child: Container( + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts(getHospitalName('Pickup Location')), + Icon( + Icons.arrow_drop_down, + size: 24, + color: Colors.black, + ) + ], + ), ), ), ], ), - if (widget.patientER.direction == 2) + if (widget.patientER.direction == 1) Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -261,6 +271,39 @@ class _PickupLocationState extends State { SizedBox( height: 15, ), + InkWell( + onTap: () { + confirmSelectHospitalDialog( + widget.amRequestViewModel.hospitals); + }, + child: Container( + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts(getHospitalName('Pickup Location')), + Icon( + Icons.arrow_drop_down, + size: 24, + color: Colors.black, + ) + ], + ), + ), + ), + SizedBox( + height: 12, + ), + Texts('Drop off Location'), + SizedBox( + height: 8, + ), InkWell( onTap: () { Navigator.push( @@ -271,6 +314,9 @@ class _PickupLocationState extends State { // Put YOUR OWN KEY here. onPlacePicked: (PickResult result) { print(result.adrAddress); + setState(() { + _result = result; + }); Navigator.of(context).pop(); }, initialPosition: LatLng(_latitude, _longitude), @@ -290,9 +336,9 @@ class _PickupLocationState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Texts('Pickup Location'), + Texts('Select From Map'), Icon( - Icons.arrow_drop_down, + FontAwesomeIcons.mapMarkerAlt, size: 24, color: Colors.black, ) @@ -300,33 +346,6 @@ class _PickupLocationState extends State { ), ), ), - SizedBox( - height: 12, - ), - Texts('Drop off Location'), - SizedBox( - height: 8, - ), - Container( - padding: EdgeInsets.all(12), - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Texts('Select From Map'), - Icon( - FontAwesomeIcons.mapMarkerAlt, - size: 24, - color: Colors.black, - ) - ], - ), - ), ], ), //TODO show dialog projects @@ -342,7 +361,41 @@ class _PickupLocationState extends State { color: Colors.grey[800], textColor: Colors.white, onTap: () { + if(_result==null || _selectedHospital == null) + AppToast.showErrorToast(message: 'please select all fields'); + else setState(() { + widget.patientER.pickupSpot = _isInsideHome ? 1 : 0; + if (widget.patientER.direction == 0) { + widget.patientER.pickupLocationLattitude = _result.geometry.location.lat.toString(); + widget.patientER.pickupLocationLongitude = _result.geometry.location.lng.toString(); + widget.patientER.dropoffLocationLattitude = _selectedHospital.latitude; + widget.patientER.dropoffLocationLongitude = _selectedHospital.longitude; + + } else { + widget.patientER.pickupLocationLattitude = _selectedHospital.latitude; + widget.patientER.pickupLocationLongitude = _selectedHospital.longitude; + widget.patientER.dropoffLocationLattitude = _result.geometry.location.lat.toString(); + widget.patientER.dropoffLocationLongitude = _result.geometry.location.lng.toString(); + } + + widget.patientER.latitude = widget.patientER.pickupLocationLattitude; + widget.patientER.longitude = widget.patientER.pickupLocationLongitude; + + if(_haveAppointment == HaveAppointment.YES){ + widget.patientER.appointmentNo = myAppointment.appointmentNo.toString(); + widget.patientER.appointmentClinicName = myAppointment.clinicName; + widget.patientER.appointmentDoctorName = myAppointment.doctorNameObj; + widget.patientER.appointmentBranch = myAppointment.projectName; + widget.patientER.appointmentTime = myAppointment.appointmentDate; + }else{ + widget.patientER.appointmentNo ="0"; + widget.patientER.appointmentClinicName = null; + widget.patientER.appointmentDoctorName = null; + widget.patientER.appointmentBranch = null; + widget.patientER.appointmentTime = null; + } + widget.patientER.pickupSpot = _isInsideHome ? 1 : 0; widget.changeCurrentTab(2); }); @@ -356,12 +409,35 @@ class _PickupLocationState extends State { ); } + void confirmSelectHospitalDialog(List hospitals) { + showDialog( + context: context, + child: SelectHospitalDialog( + hospitals: hospitals, + selectedHospital: _selectedHospital, + onValueSelected: (value) { + setState(() { + _selectedHospital = value; + }); + }, + ), + ); + } + + String getHospitalName(String title) { + return _selectedHospital == null ? title : _selectedHospital.name; + } + getAppointment() { + ProgressDialogUtil.showProgressDialog(context); widget.amRequestViewModel.getAppointmentHistory().then((value) { if (widget.amRequestViewModel.state == ViewState.Error || widget.amRequestViewModel.state == ViewState.ErrorLocal) { AppToast.showErrorToast(message: widget.amRequestViewModel.error); - } else if (widget.amRequestViewModel.appoitmentAllHistoryResultList.length > 0) { + } else if (widget + .amRequestViewModel.appoitmentAllHistoryResultList.length > + 0) { + ProgressDialogUtil.hideProgressDialog(context); Navigator.push( context, MaterialPageRoute( @@ -375,17 +451,23 @@ class _PickupLocationState extends State { setState(() { myAppointment = value; }); - else + else { + ProgressDialogUtil.hideProgressDialog(context); setState(() { _haveAppointment = HaveAppointment.NO; }); + } }); } else { + ProgressDialogUtil.hideProgressDialog(context); setState(() { _haveAppointment = HaveAppointment.NO; }); AppToast.showErrorToast(message: 'You don\'t have any appointment'); } + }).catchError((e) { + ProgressDialogUtil.hideProgressDialog(context); + AppToast.showErrorToast(message: e); }); } } diff --git a/lib/pages/ErService/SelectTransportationMethod.dart b/lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart similarity index 92% rename from lib/pages/ErService/SelectTransportationMethod.dart rename to lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart index 261b9f83..436aabe8 100644 --- a/lib/pages/ErService/SelectTransportationMethod.dart +++ b/lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/core/enum/OrderService.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; @@ -32,11 +33,13 @@ class _SelectTransportationMethodState Direction _direction = Direction.FromHospital; Way _way = Way.OneWay; + OrderService _orderService = OrderService.AMBULANCE; + @override void initState() { super.initState(); if (widget.patientER.direction != null) { - _direction = widget.patientER.direction == 1 + _direction = widget.patientER.direction == 0 ? Direction.ToHospital : Direction.FromHospital; _way = widget.patientER.tripType == 1 ? Way.OneWay : Way.TwoWays; @@ -278,15 +281,17 @@ class _SelectTransportationMethodState textColor: Colors.white, onTap: () { setState(() { - widget.patientER.direction = - _direction == Direction.ToHospital ? 1 : 2; + widget.patientER.direction = _direction == Direction.ToHospital ? 0 : 1; widget.patientER.tripType = _way == Way.TwoWays ? 2 : 1; - widget.patientER.selectedAmbulate = (widget - .amRequestViewModel.amRequestModeList - .indexOf(_erTransportationMethod) + - 1); - widget.patientER.patientERTransportationMethod = - _erTransportationMethod; + widget.patientER.selectedAmbulate = (widget.amRequestViewModel.amRequestModeList.indexOf(_erTransportationMethod) + 1); + widget.patientER.patientERTransportationMethod = _erTransportationMethod; + widget.patientER.orderServiceID = _orderService.getIdOrderService(); + widget.patientER.pickupUrgency = 1; + widget.patientER.lineItemNo = 1; + widget.patientER.cost = _erTransportationMethod.price; + widget.patientER.vAT = _erTransportationMethod.vAT ?? 0; + widget.patientER.totalPrice = _erTransportationMethod.totalPrice; + widget.changeCurrentTab(1); }); }, diff --git a/lib/pages/ErService/Summary.dart b/lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart similarity index 100% rename from lib/pages/ErService/Summary.dart rename to lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart diff --git a/lib/pages/ErService/OrderLogPage.dart b/lib/pages/ErService/OrderLogPage.dart new file mode 100644 index 00000000..cbb508e5 --- /dev/null +++ b/lib/pages/ErService/OrderLogPage.dart @@ -0,0 +1,62 @@ +import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; +import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; +import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/others/OrderLogItem.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class OrderLogPage extends StatelessWidget { + final AmRequestViewModel amRequestViewModel; + + OrderLogPage({Key key, @required this.amRequestViewModel}); + + @override + Widget build(BuildContext context) { + return Container( + margin: EdgeInsets.all(10), + padding: EdgeInsets.all(8), + child: ListView.builder( + itemCount: amRequestViewModel.patientAllPresOrdersList.length, + itemBuilder: (context, index) => Container( + margin: EdgeInsets.all(8), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(2), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + OrderLogItem( + title: 'Request ID', + value: amRequestViewModel.patientAllPresOrdersList[index].iD + .toString(), + ), + OrderLogItem( + title: 'Status', + value: amRequestViewModel + .patientAllPresOrdersList[index].description, + ), + OrderLogItem( + title: 'Pickup Date', + value: DateUtil.getDayMonthYearDateFormatted( + DateUtil.convertStringToDate(amRequestViewModel + .patientAllPresOrdersList[index].createdOn)), + ), + OrderLogItem( + title: 'Pickup Location', + value: amRequestViewModel + .patientAllPresOrdersList[index].pickupLocationName, + ), + OrderLogItem( + title: 'Drop off Location', + value: amRequestViewModel + .patientAllPresOrdersList[index].dropoffLocationName, + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/pages/base/base_view.dart b/lib/pages/base/base_view.dart index 6014b6c3..f5311aae 100644 --- a/lib/pages/base/base_view.dart +++ b/lib/pages/base/base_view.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -19,10 +20,11 @@ class BaseView extends StatefulWidget { class _BaseViewState extends State> { T model = locator(); + AuthenticatedUserObject authenticatedUserObject = locator(); @override void initState() { - if (widget.onModelReady != null) { + if (widget.onModelReady != null && authenticatedUserObject.isLogin) { widget.onModelReady(model); } super.initState(); diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index b811ef8f..b20648e2 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -34,6 +34,7 @@ class _HomePageState extends State { return BaseView( onModelReady: (model) => model.getPatientRadOrders(), builder: (_, model, wi) => AppScaffold( + isShowDecPage: false, body: Container( width: double.infinity, child: SingleChildScrollView( diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index ac36c7d6..52afe85f 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -74,6 +74,7 @@ class _ConfirmLogin extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).confirm, isShowAppBar: true, + isShowDecPage: false, body: isLoading == false ? SingleChildScrollView( child: Container( diff --git a/lib/pages/login/forgot-password.dart b/lib/pages/login/forgot-password.dart index c1fa7b18..bbdbb1ae 100644 --- a/lib/pages/login/forgot-password.dart +++ b/lib/pages/login/forgot-password.dart @@ -21,6 +21,7 @@ class _ForgotPassword extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).forgotPassword, isShowAppBar: true, + isShowDecPage: false, body: SingleChildScrollView( child: Container( padding: EdgeInsets.only(top: 10, left: 20, right: 20), diff --git a/lib/pages/login/login-type.dart b/lib/pages/login/login-type.dart index 7a8a940d..d1ac54bb 100644 --- a/lib/pages/login/login-type.dart +++ b/lib/pages/login/login-type.dart @@ -16,6 +16,7 @@ class LoginType extends StatelessWidget { return AppScaffold( appBarTitle: TranslationBase.of(context).welcome, isShowAppBar: true, + isShowDecPage: false, body: Padding( padding: EdgeInsets.all(20), child: Column( diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index c1f04a71..22178444 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -57,6 +57,7 @@ class _Login extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).login, isShowAppBar: true, + isShowDecPage: false, body: isLoading == true ? AppCircularProgressIndicator() : SingleChildScrollView( diff --git a/lib/pages/login/register-info.dart b/lib/pages/login/register-info.dart index 70e5fb29..e94c1af6 100644 --- a/lib/pages/login/register-info.dart +++ b/lib/pages/login/register-info.dart @@ -39,6 +39,7 @@ class _RegisterInfo extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).register, isShowAppBar: true, + isShowDecPage: false, body: SingleChildScrollView( child: Container( padding: EdgeInsets.only(top: 10, left: 20, right: 20, bottom: 30), diff --git a/lib/pages/login/register.dart b/lib/pages/login/register.dart index 3706f452..3ee13a4c 100644 --- a/lib/pages/login/register.dart +++ b/lib/pages/login/register.dart @@ -45,6 +45,7 @@ class _Register extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).register, isShowAppBar: true, + isShowDecPage: false, body: isLoading == true ? AppCircularProgressIndicator() : SingleChildScrollView( diff --git a/lib/pages/login/welcome.dart b/lib/pages/login/welcome.dart index b4b05900..90bc2a2c 100644 --- a/lib/pages/login/welcome.dart +++ b/lib/pages/login/welcome.dart @@ -28,6 +28,7 @@ class _WelcomeLogin extends State { Widget build(BuildContext context) { return AppScaffold( appBarTitle: TranslationBase.of(context).welcome, + isShowDecPage: false, isShowAppBar: true, body: Padding( padding: EdgeInsets.all(20), diff --git a/lib/pages/medical/labs/labs_home_page.dart b/lib/pages/medical/labs/labs_home_page.dart index 325d5dcd..995365d9 100644 --- a/lib/pages/medical/labs/labs_home_page.dart +++ b/lib/pages/medical/labs/labs_home_page.dart @@ -20,6 +20,7 @@ class LabsHomePage extends StatelessWidget { builder: (context, LabsViewModel model, widget) => AppScaffold( baseViewModel: model, isShowAppBar: true, + description: TranslationBase.of(context).infoLab, appBarTitle: TranslationBase.of(context).labOrders, body: SingleChildScrollView( physics: BouncingScrollPhysics(), diff --git a/lib/pages/medical/medical_profile_page.dart b/lib/pages/medical/medical_profile_page.dart index d2b9a9ea..2c5a6fb2 100644 --- a/lib/pages/medical/medical_profile_page.dart +++ b/lib/pages/medical/medical_profile_page.dart @@ -48,6 +48,7 @@ class _MedicalProfilePageState extends State { return BaseView( onModelReady: (model) => model.getAppointmentHistory(), builder: (_, model, widget) => AppScaffold( + isShowDecPage: false, baseViewModel: model, body: Container( child: SingleChildScrollView( diff --git a/lib/pages/medical/radiology/radiology_home_page.dart b/lib/pages/medical/radiology/radiology_home_page.dart index 0f9f4c7b..995ac485 100644 --- a/lib/pages/medical/radiology/radiology_home_page.dart +++ b/lib/pages/medical/radiology/radiology_home_page.dart @@ -20,6 +20,7 @@ class RadiologyHomePage extends StatelessWidget { isShowAppBar: true, appBarTitle: TranslationBase.of(context).radiology, baseViewModel: model, + description: TranslationBase.of(context).infoRadiology, body: FractionallySizedBox( widthFactor: 1.0, child: ListView( diff --git a/lib/uitl/ProgressDialog.dart b/lib/uitl/ProgressDialog.dart index 728b27dd..6820a6d5 100644 --- a/lib/uitl/ProgressDialog.dart +++ b/lib/uitl/ProgressDialog.dart @@ -1,12 +1,26 @@ import 'package:flutter/material.dart'; -class ProgressDialogUtil{ +AlertDialog _alert = AlertDialog( + content: Row( + children: [ + CircularProgressIndicator(), + Container(margin: EdgeInsets.only(left: 7), child: Text("Loading...")), + ], + ), +); - static AlertDialog alert = AlertDialog( - content: new Row( - children: [ - CircularProgressIndicator(), - Container(margin: EdgeInsets.only(left: 7),child:Text("Loading..." )), - ],), - ); -} \ No newline at end of file +class ProgressDialogUtil { + static showProgressDialog(BuildContext context) { + showDialog( + barrierDismissible: false, + context: context, + builder: (BuildContext context) { + return _alert; + }, + ); + } + + static hideProgressDialog(BuildContext context) { + Navigator.pop(context); + } +} diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 28b273e5..493bc327 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -589,6 +589,10 @@ class TranslationBase { String get all => localizedValues['All'][locale.languageCode]; String get questionHere => localizedValues['QuestionHere'][locale.languageCode]; String get viewDoctorResponses => localizedValues['ViewDoctorResponses'][locale.languageCode]; + String get serviceInformationButton => localizedValues['ServiceInformationButton'][locale.languageCode]; + String get serviceInformationTitle => localizedValues['ServiceInformationTitle'][locale.languageCode]; + String get infoLab => localizedValues['info-lab'][locale.languageCode]; + String get infoRadiology => localizedValues['info-radiology'][locale.languageCode]; } diff --git a/lib/widgets/others/OrderLogItem.dart b/lib/widgets/others/OrderLogItem.dart new file mode 100644 index 00000000..3e8305d3 --- /dev/null +++ b/lib/widgets/others/OrderLogItem.dart @@ -0,0 +1,32 @@ +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class OrderLogItem extends StatelessWidget { + final String title; + final String value; + OrderLogItem({ this.title, this.value}); + @override + Widget build(BuildContext context) { + return Container( + padding: EdgeInsets.all(10), + width: double.maxFinite, + margin: EdgeInsets.only(bottom: 4,left: 4,right: 4), + decoration: BoxDecoration( + borderRadius: BorderRadius.only( + bottomRight: Radius.circular(12), + bottomLeft: Radius.circular(12), + ), + color: Colors.white + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts(title,color: Colors.grey,), + SizedBox(height: 4,), + Texts(value??''), + ], + ), + ); + } +} diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index 80a3e7af..dabe3097 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -1,8 +1,10 @@ import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/routes.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/others/bottom_bar.dart'; import 'package:diplomaticquarterapp/widgets/progress_indicator/app_loader_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; @@ -12,10 +14,12 @@ import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:provider/provider.dart'; +import '../../locator.dart'; import 'floating_button_search.dart'; import '../progress_indicator/app_loader_widget.dart'; import 'arrow_back.dart'; import 'network_base_view.dart'; +import 'not_auh_page.dart'; class AppScaffold extends StatelessWidget { final String appBarTitle; @@ -26,6 +30,12 @@ class AppScaffold extends StatelessWidget { final bool hasAppBarParam; final BaseViewModel baseViewModel; final Widget floatingActionButton; + final String title; + final String description; + final bool isShowDecPage; + + AuthenticatedUserObject authenticatedUserObject = + locator(); AppScaffold( {@required this.body, @@ -34,50 +44,61 @@ class AppScaffold extends StatelessWidget { this.isShowAppBar = false, this.hasAppBarParam, this.bottomSheet, - this.baseViewModel, this.floatingActionButton}); + this.baseViewModel, + this.floatingActionButton, + this.title, + this.description, + this.isShowDecPage = true}); @override Widget build(BuildContext context) { AppGlobal.context = context; return Scaffold( - backgroundColor: Theme.of(context).scaffoldBackgroundColor, - appBar: isShowAppBar - ? AppBar( - elevation: 0, - backgroundColor: Theme.of(context).appBarTheme.color, - textTheme: TextTheme( - headline6: TextStyle( - color: Colors.white, fontWeight: FontWeight.bold), - ), - title: Text(appBarTitle.toUpperCase()), - leading: Builder( - builder: (BuildContext context) { - return ArrowBack(); + backgroundColor: Theme.of(context).scaffoldBackgroundColor, + appBar: isShowAppBar + ? AppBar( + elevation: 0, + backgroundColor: Theme.of(context).appBarTheme.color, + textTheme: TextTheme( + headline6: + TextStyle(color: Colors.white, fontWeight: FontWeight.bold), + ), + title: Text(authenticatedUserObject.isLogin + ? appBarTitle.toUpperCase() + : TranslationBase.of(context).serviceInformationTitle), + leading: Builder( + builder: (BuildContext context) { + return ArrowBack(); + }, + ), + centerTitle: true, + actions: [ + IconButton( + icon: Icon(FontAwesomeIcons.home), + color: Colors.white, + onPressed: () { + Navigator.of(context).popUntil(ModalRoute.withName('/')); }, ), - centerTitle: true, - actions: [ - IconButton( - icon: Icon(FontAwesomeIcons.home), - color: Colors.white, - onPressed: () { - Navigator.of(context).popUntil(ModalRoute.withName('/')); - }, - ), - ], - ) - : null, - body: baseViewModel != null - ? NetworkBaseView( - child: buildBodyWidget(), - baseViewModel: baseViewModel, - ) - : buildBodyWidget(), - bottomSheet: bottomSheet, - // bottomNavigationBar: BottomBarSearch() - floatingActionButton: floatingActionButton??floatingActionButton, - ); + ], + ) + : null, + body: (!authenticatedUserObject.isLogin && isShowDecPage) + ? NotAutPage( + title: appBarTitle, + description: description, + ) + : baseViewModel != null + ? NetworkBaseView( + child: buildBodyWidget(), + baseViewModel: baseViewModel, + ) + : buildBodyWidget(), + bottomSheet: bottomSheet, + // bottomNavigationBar: BottomBarSearch() + floatingActionButton: floatingActionButton ?? floatingActionButton, + ); } buildAppLoaderWidget(bool isLoading) { @@ -85,6 +106,6 @@ class AppScaffold extends StatelessWidget { } buildBodyWidget() { - return body ;//Stack(children: [body, buildAppLoaderWidget(isLoading)]); + return body; //Stack(children: [body, buildAppLoaderWidget(isLoading)]); } } diff --git a/lib/widgets/others/not_auh_page.dart b/lib/widgets/others/not_auh_page.dart new file mode 100644 index 00000000..298b5609 --- /dev/null +++ b/lib/widgets/others/not_auh_page.dart @@ -0,0 +1,79 @@ +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; +import 'package:diplomaticquarterapp/pages/login/login-type.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:hexcolor/hexcolor.dart'; +import 'package:provider/provider.dart'; + +class NotAutPage extends StatelessWidget { + final String title; + final String description; + + NotAutPage({@required this.title, @required this.description}); + + @override + Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); + return Scaffold( + body: SingleChildScrollView( + padding: EdgeInsets.all(12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts( + title ?? 'Service', + fontWeight: FontWeight.w800, + fontSize: 25, + bold: true, + color: Hexcolor("#60686b"), + ), + SizedBox( + height: 12, + ), + Texts( + description ?? 'Description', + fontWeight: FontWeight.normal, + fontSize: 17, + ), + SizedBox( + height: 22, + ), + Center( + child: SizedBox( + height: MediaQuery.of(context).size.height * 0.55, + width: MediaQuery.of(context).size.width * 0.50, + child: Image.asset(projectViewModel.isArabic + ? 'assets/images/wifi-EN.png' + : 'assets/images/Wifi-AR.png'), + ), + ), + SizedBox( + height: 77, + ), + ], + ), + ), + bottomSheet: Container( + height: MediaQuery.of(context).size.height * 0.10, + width: double.infinity, + child: Column( + children: [ + Container( + width: MediaQuery.of(context).size.width * 0.9, + child: SecondaryButton( + onTap: () => Navigator.pushReplacement( + context, FadePage(page: LoginType())), + label: TranslationBase.of(context).serviceInformationButton, + textColor: Theme.of(context).backgroundColor), + ), + ], + ), + ), + ); + } +} diff --git a/pubspec.yaml b/pubspec.yaml index 6e9349ab..2b078a1d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -60,6 +60,9 @@ dependencies: image_picker: ^0.6.7+1 image_cropper: ^1.2.1 + #GIF image + flutter_gifimage: ^1.0.1 + # UI Reqs dotted_border: 1.0.5 expandable: ^4.1.4 From 41d50e23e3df837e9a17bbe58e01472325a9e7d7 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 6 Oct 2020 14:06:28 +0300 Subject: [PATCH 10/14] covid drivethru implemented --- .../new-design/covid-19-big-banner-bg.png | Bin 0 -> 10233 bytes ios/Runner/Runner.entitlements | 5 +- .../Appointments/PatientShareResposne.dart | 34 +- .../CovidPaymentInfoResponse.dart | 96 +++ .../health_converter/blood_cholesterol.dart | 2 +- .../health_converter/blood_sugar.dart | 2 +- .../health_converter/triglycerides.dart | 2 +- .../components/DocAvailableAppointments.dart | 4 +- .../Covid-DriveThru/Covid-TimeSlots.dart | 599 ++++++++++++++++++ .../covid-drivethru-location.dart | 77 ++- .../Covid-DriveThru/covid-payment-alert.dart | 288 +++++++++ .../covid-payment-details.dart | 257 ++++++++ lib/pages/ToDoList/ToDo.dart | 2 +- lib/pages/landing/home_page.dart | 6 +- lib/pages/landing/landing_page.dart | 3 - .../covid-drivethru/covid-drivethru.dart | 74 +++ 16 files changed, 1406 insertions(+), 45 deletions(-) create mode 100644 assets/images/new-design/covid-19-big-banner-bg.png create mode 100644 lib/models/CovidDriveThru/CovidPaymentInfoResponse.dart create mode 100644 lib/pages/Covid-DriveThru/Covid-TimeSlots.dart create mode 100644 lib/pages/Covid-DriveThru/covid-payment-alert.dart create mode 100644 lib/pages/Covid-DriveThru/covid-payment-details.dart diff --git a/assets/images/new-design/covid-19-big-banner-bg.png b/assets/images/new-design/covid-19-big-banner-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..a66d681553e9014c80c6452df934b6900d599f32 GIT binary patch literal 10233 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 literal 0 HcmV?d00001 diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements index 0c67376e..903def2a 100644 --- a/ios/Runner/Runner.entitlements +++ b/ios/Runner/Runner.entitlements @@ -1,5 +1,8 @@ - + + aps-environment + development + diff --git a/lib/models/Appointments/PatientShareResposne.dart b/lib/models/Appointments/PatientShareResposne.dart index 2e22ed60..40670990 100644 --- a/lib/models/Appointments/PatientShareResposne.dart +++ b/lib/models/Appointments/PatientShareResposne.dart @@ -1,19 +1,19 @@ class PatientShareResponse { int advanceNumber; - String appointmentDate; + dynamic appointmentDate; int appointmentNo; int cashPrice; int cashPriceTax; int cashPriceWithTax; int clinicID; - String clinicName; + dynamic clinicName; int companyId; - String companyName; + dynamic companyName; int companyShareWithTax; - String doctorImageURL; - String doctorNameObj; + dynamic doctorImageURL; + dynamic doctorNameObj; int doctorID; - List doctorSpeciality; + List doctorSpeciality; dynamic errCode; int groupID; bool iSAllowOnlineCheckedIN; @@ -22,7 +22,7 @@ class PatientShareResponse { int isFollowup; bool isLiveCareAppointment; bool isOnlineCheckedIN; - String message; + dynamic message; int nextAction; dynamic patientCardID; int patientID; @@ -30,19 +30,19 @@ class PatientShareResponse { dynamic patientShareWithTax; int patientStatusType; dynamic patientTaxAmount; - String patientType; + dynamic patientType; int paymentAmount; - String paymentDate; + dynamic paymentDate; dynamic paymentMethodName; dynamic paymentReferenceNumber; int policyId; - String policyName; - String procedureName; + dynamic policyName; + dynamic procedureName; int projectID; - String projectName; + dynamic projectName; dynamic setupID; int sourceType; - String startTime; + dynamic startTime; int status; int statusCode; dynamic statusDesc; @@ -102,7 +102,7 @@ class PatientShareResponse { this.userID, this.serviceID}); - PatientShareResponse.fromJson(Map json) { + PatientShareResponse.fromJson(Map json) { advanceNumber = json['AdvanceNumber']; appointmentDate = json['AppointmentDate']; appointmentNo = json['AppointmentNo']; @@ -117,7 +117,7 @@ class PatientShareResponse { doctorID = json['DoctorID']; doctorImageURL = json['DoctorImageURL']; doctorNameObj = json['DoctorNameObj']; - doctorSpeciality = json['DoctorSpeciality'].cast(); +// doctorSpeciality = json['DoctorSpeciality'].cast(); errCode = json['ErrCode']; groupID = json['GroupID']; iSAllowOnlineCheckedIN = json['ISAllowOnlineCheckedIN']; @@ -155,8 +155,8 @@ class PatientShareResponse { serviceID = json['ServiceID']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['AdvanceNumber'] = this.advanceNumber; data['AppointmentDate'] = this.appointmentDate; data['AppointmentNo'] = this.appointmentNo; diff --git a/lib/models/CovidDriveThru/CovidPaymentInfoResponse.dart b/lib/models/CovidDriveThru/CovidPaymentInfoResponse.dart new file mode 100644 index 00000000..a1290e4d --- /dev/null +++ b/lib/models/CovidDriveThru/CovidPaymentInfoResponse.dart @@ -0,0 +1,96 @@ +class CovidPaymentInfoResponse { + dynamic propertyChanged; + dynamic cashPriceField; + dynamic cashPriceTaxField; + dynamic cashPriceWithTaxField; + dynamic companyIdField; + String companyNameField; + dynamic companyShareWithTaxField; + dynamic errCodeField; + dynamic groupIDField; + dynamic insurancePolicyNoField; + String messageField; + dynamic patientCardIDField; + dynamic patientShareField; + dynamic patientShareWithTaxField; + dynamic patientTaxAmountField; + dynamic policyIdField; + dynamic policyNameField; + String procedureNameField; + dynamic setupIDField; + dynamic statusCodeField; + dynamic subPolicyNoField; + + CovidPaymentInfoResponse( + {this.propertyChanged, + this.cashPriceField, + this.cashPriceTaxField, + this.cashPriceWithTaxField, + this.companyIdField, + this.companyNameField, + this.companyShareWithTaxField, + this.errCodeField, + this.groupIDField, + this.insurancePolicyNoField, + this.messageField, + this.patientCardIDField, + this.patientShareField, + this.patientShareWithTaxField, + this.patientTaxAmountField, + this.policyIdField, + this.policyNameField, + this.procedureNameField, + this.setupIDField, + this.statusCodeField, + this.subPolicyNoField}); + + CovidPaymentInfoResponse.fromJson(Map json) { + propertyChanged = json['PropertyChanged']; + cashPriceField = json['cashPriceField']; + cashPriceTaxField = json['cashPriceTaxField']; + cashPriceWithTaxField = json['cashPriceWithTaxField']; + companyIdField = json['companyIdField']; + companyNameField = json['companyNameField']; + companyShareWithTaxField = json['companyShareWithTaxField']; + errCodeField = json['errCodeField']; + groupIDField = json['groupIDField']; + insurancePolicyNoField = json['insurancePolicyNoField']; + messageField = json['messageField']; + patientCardIDField = json['patientCardIDField']; + patientShareField = json['patientShareField']; + patientShareWithTaxField = json['patientShareWithTaxField']; + patientTaxAmountField = json['patientTaxAmountField']; + policyIdField = json['policyIdField']; + policyNameField = json['policyNameField']; + procedureNameField = json['procedureNameField']; + setupIDField = json['setupIDField']; + statusCodeField = json['statusCodeField']; + subPolicyNoField = json['subPolicyNoField']; + } + + Map toJson() { + final Map data = new Map(); + data['PropertyChanged'] = this.propertyChanged; + data['cashPriceField'] = this.cashPriceField; + data['cashPriceTaxField'] = this.cashPriceTaxField; + data['cashPriceWithTaxField'] = this.cashPriceWithTaxField; + data['companyIdField'] = this.companyIdField; + data['companyNameField'] = this.companyNameField; + data['companyShareWithTaxField'] = this.companyShareWithTaxField; + data['errCodeField'] = this.errCodeField; + data['groupIDField'] = this.groupIDField; + data['insurancePolicyNoField'] = this.insurancePolicyNoField; + data['messageField'] = this.messageField; + data['patientCardIDField'] = this.patientCardIDField; + data['patientShareField'] = this.patientShareField; + data['patientShareWithTaxField'] = this.patientShareWithTaxField; + data['patientTaxAmountField'] = this.patientTaxAmountField; + data['policyIdField'] = this.policyIdField; + data['policyNameField'] = this.policyNameField; + data['procedureNameField'] = this.procedureNameField; + data['setupIDField'] = this.setupIDField; + data['statusCodeField'] = this.statusCodeField; + data['subPolicyNoField'] = this.subPolicyNoField; + return data; + } +} diff --git a/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart b/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart index 9a2f08df..58caee36 100644 --- a/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart +++ b/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart @@ -190,7 +190,7 @@ class _BloodCholesterolState extends State { child: TextFormField( controller: textController, inputFormatters: [ - FilteringTextInputFormatter.digitsOnly +// FilteringTextInputFormatter.digitsOnly ], keyboardType: TextInputType.number, decoration: InputDecoration( diff --git a/lib/pages/AlHabibMedicalService/health_converter/blood_sugar.dart b/lib/pages/AlHabibMedicalService/health_converter/blood_sugar.dart index a90a5bbb..f5d66ccf 100644 --- a/lib/pages/AlHabibMedicalService/health_converter/blood_sugar.dart +++ b/lib/pages/AlHabibMedicalService/health_converter/blood_sugar.dart @@ -192,7 +192,7 @@ class _BloodSugarState extends State { child: TextFormField( controller: textController, inputFormatters: [ - FilteringTextInputFormatter.digitsOnly +// FilteringTextInputFormatter.digitsOnly ], keyboardType: TextInputType.number, decoration: InputDecoration( diff --git a/lib/pages/AlHabibMedicalService/health_converter/triglycerides.dart b/lib/pages/AlHabibMedicalService/health_converter/triglycerides.dart index fdf8d191..a86fdb88 100644 --- a/lib/pages/AlHabibMedicalService/health_converter/triglycerides.dart +++ b/lib/pages/AlHabibMedicalService/health_converter/triglycerides.dart @@ -188,7 +188,7 @@ class _TriglyceridesState extends State { child: TextFormField( controller: textController, inputFormatters: [ - FilteringTextInputFormatter.digitsOnly +// FilteringTextInputFormatter.digitsOnly ], keyboardType: TextInputType.number, decoration: InputDecoration( diff --git a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart index aca0884f..88116cd9 100644 --- a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart +++ b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart @@ -385,8 +385,8 @@ class _DocAvailableAppointmentsState extends State color: _calendarController.isSelected(date) ? Colors.green[400] : _calendarController.isToday(date) - ? Colors.brown[300] - : Colors.blue[400], + ? Colors.brown[300] + : Colors.blue[400], ), width: 40.0, height: 40.0, diff --git a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart new file mode 100644 index 00000000..060a8132 --- /dev/null +++ b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart @@ -0,0 +1,599 @@ +import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; +import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart'; +import 'package:diplomaticquarterapp/models/Appointments/FreeSlot.dart'; +import 'package:diplomaticquarterapp/models/Appointments/PatientShareResposne.dart'; +import 'package:diplomaticquarterapp/models/Appointments/timeSlot.dart'; +import 'package:diplomaticquarterapp/pages/Covid-DriveThru/covid-payment-alert.dart'; +import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; +import 'package:diplomaticquarterapp/services/covid-drivethru/covid-drivethru.dart'; +import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; +import 'package:diplomaticquarterapp/uitl/app_toast.dart'; +import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:intl/intl.dart'; +import 'package:smart_progress_bar/smart_progress_bar.dart'; +import 'package:table_calendar/table_calendar.dart'; + +class CovidTimeSlots extends StatefulWidget { + int projectID; + static bool areSlotsAvailable = false; + static DateTime selectedAppoDateTime; + static String selectedDate; + static String selectedTime; + + int selectedClinicID; + int selectedDoctorID; + + PatientShareResponse patientShareResponse; + + CovidTimeSlots({@required this.projectID}); + + @override + _CovidTimeSlotsState createState() => _CovidTimeSlotsState(); +} + +class _CovidTimeSlotsState extends State + with TickerProviderStateMixin { + Map _events; + AnimationController _animationController; + CalendarController _calendarController; + + AppSharedPreferences sharedPref = new AppSharedPreferences(); + + var selectedDate = ""; + dynamic selectedDateJSON; + dynamic jsonFreeSlots; + + List docFreeSlots = []; + List dayEvents = []; + + int selectedButtonIndex = 0; + + dynamic freeSlotsResponse; + + ScrollController _scrollController; + + @override + void initState() { + final _selectedDay = DateTime.now(); + + widget.patientShareResponse = new PatientShareResponse(); + + _scrollController = new ScrollController(); + + _events = { + _selectedDay: ['Event A0'] + }; + + WidgetsBinding.instance.addPostFrameCallback( + (_) => getCovidFreeSlots(context, widget.projectID)); + + _calendarController = CalendarController(); + _animationController = AnimationController( + vsync: this, + duration: const Duration(milliseconds: 50), + ); + + _animationController.forward(); + super.initState(); + } + + @override + void dispose() { + _animationController.dispose(); + _calendarController.dispose(); + super.dispose(); + } + + void _onDaySelected(DateTime day, List events) { + final DateFormat formatter = DateFormat('yyyy-MM-dd'); + setState(() { + this.selectedDate = DateUtil.getMonthDayYearDateFormatted(day); + openTimeSlotsPickerForDate(day, docFreeSlots); + CovidTimeSlots.selectedDate = formatter.format(day); + print(CovidTimeSlots.selectedDate); + }); + } + + void _onVisibleDaysChanged( + DateTime first, DateTime last, CalendarFormat format) { + print('CALLBACK: _onVisibleDaysChanged'); + } + + void _onCalendarCreated( + DateTime first, DateTime last, CalendarFormat format) { + print('CALLBACK: _onCalendarCreated'); + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + appBarTitle: "COVID-19 TEST", + isShowAppBar: true, + body: SingleChildScrollView( + child: Container( + margin: EdgeInsets.fromLTRB(15.0, 15.0, 15.0, 0.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 150.0, + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage( + "assets/images/new-design/covid-19-big-banner-bg.png"), + fit: BoxFit.fill, + ), + color: Colors.white.withOpacity(0.3), + borderRadius: BorderRadius.all(Radius.circular(10))), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: + EdgeInsets.only(left: 15.0, right: 15.0, top: 30.0), + child: SvgPicture.asset( + 'assets/images/new-design/covid-19-car.svg', + width: 90.0, + height: 90.0), + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.only( + left: 20.0, right: 20.0, top: 40.0), + child: Text("COVID-19 TEST", + style: TextStyle( + color: Colors.white, + fontWeight: FontWeight.bold, + fontSize: 24.0)), + ), + Container( + margin: EdgeInsets.only( + left: 20.0, right: 20.0, top: 10.0), + child: Text("Drive-Thru", + style: TextStyle( + color: Colors.white, fontSize: 24.0)), + ), + ], + ), + ], + ), + ), + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.0), + color: Colors.white), + margin: EdgeInsets.fromLTRB(0.0, 20.0, 0.0, 5.0), + padding: EdgeInsets.fromLTRB(20.0, 0.0, 20.0, 20.0), + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height * 0.65, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.all(10.0), + child: Text( + "Kindly select one of the available appointments from below: ", + style: + TextStyle(color: Colors.black, fontSize: 16.0)), + ), + Container( + margin: EdgeInsets.only(top: 10.0), + alignment: Alignment.center, + child: Text(selectedDate, + style: TextStyle( + fontSize: 18.0, fontWeight: FontWeight.bold)), + ), + Container( + height: 50, + margin: EdgeInsets.all(20.0), + child: ListView.builder( + controller: _scrollController, + scrollDirection: Axis.horizontal, + itemCount: dayEvents.length, + itemBuilder: (context, index) { + return Container( + margin: EdgeInsets.only(right: 10.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(5.0), + side: BorderSide( + color: Colors.blue[400], + //Color of the border + style: BorderStyle.solid, + //Style of the border + width: 1.5, //width of the border + ), + ), + minWidth: + MediaQuery.of(context).size.width * 0.2, + child: index == selectedButtonIndex + ? getSelectedButton(index) + : getNormalButton(index)), + ); + }, + ), + ), + _buildTableCalendarWithBuilders(), + ], + ), + ), + SizedBox( + height: 100.0, + ), + ], + ), + ), + ), + bottomSheet: Container( + margin: EdgeInsets.all(10.0), + child: Flex( + direction: Axis.horizontal, + children: [ + Expanded( + flex: 1, + child: Container( + margin: EdgeInsets.fromLTRB(10.0, 0.0, 5.0, 0.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + minWidth: MediaQuery.of(context).size.width * 0.7, + height: 45.0, + child: RaisedButton( + color: new Color(0xFF60686b), + textColor: Colors.white, + disabledTextColor: Colors.white, + disabledColor: Colors.grey[500], + onPressed: () { + bookCovidTestAppointment(); + }, + child: Text("BOOK", style: TextStyle(fontSize: 18.0)), + ), + ), + ), + ), + ], + ), + ), + ); + } + + Widget _buildTableCalendarWithBuilders() { + return TableCalendar( + locale: 'en_US', + calendarController: _calendarController, + events: _events, + initialCalendarFormat: CalendarFormat.month, + startDay: DateTime.now(), + formatAnimation: FormatAnimation.slide, + startingDayOfWeek: StartingDayOfWeek.sunday, + weekendDays: [DateTime.friday, DateTime.saturday], + availableGestures: AvailableGestures.horizontalSwipe, + availableCalendarFormats: const { + CalendarFormat.month: '', + CalendarFormat.week: '', + }, + calendarStyle: CalendarStyle( + outsideDaysVisible: false, + weekendStyle: TextStyle().copyWith(color: Colors.blue[800]), + holidayStyle: TextStyle().copyWith(color: Colors.blue[800]), + ), + daysOfWeekStyle: DaysOfWeekStyle( + weekendStyle: TextStyle().copyWith(color: Colors.blue[600]), + ), + headerStyle: HeaderStyle( + centerHeaderTitle: true, + formatButtonVisible: false, + ), + builders: CalendarBuilders( + selectedDayBuilder: (context, date, _) { + return FadeTransition( + opacity: Tween(begin: 0.0, end: 1.0).animate(_animationController), + child: Container( + margin: const EdgeInsets.all(4.0), + padding: const EdgeInsets.only(top: 5.0, left: 6.0), + color: Colors.transparent, + width: 0, + height: 0, + child: Text( + '${date.day}', + style: TextStyle().copyWith(fontSize: 16.0), + ), + ), + ); + }, + todayDayBuilder: (context, date, _) { + return Container( + decoration: BoxDecoration( + shape: BoxShape.circle, + color: _calendarController.isSelected(date) + ? Colors.green[400] + : _calendarController.isToday(date) + ? Colors.brown[300] + : Colors.blue[400], + ), + width: 40.0, + height: 40.0, + child: Center( + child: Text( + '${date.day}', + style: TextStyle().copyWith( + color: Colors.white, + fontSize: 14.0, + ), + ), + ), + ); + }, + markersBuilder: (context, date, events, holidays) { + final children = []; + + if (events.isNotEmpty) { + children.add( + Positioned( + right: 4, + bottom: 4, + child: _buildEventsMarker(date, events), + ), + ); + } + + return children; + }, + ), + onDaySelected: (date, events) { + _onDaySelected(date, events); + _animationController.forward(from: 0.0); + }, + onVisibleDaysChanged: _onVisibleDaysChanged, + onCalendarCreated: _onCalendarCreated, + ); + } + + openTimeSlotsPickerForDate(DateTime dateStart, List freeSlots) { + dayEvents.clear(); + DateTime dateStartObj = new DateTime( + dateStart.year, dateStart.month, dateStart.day, 0, 0, 0, 0, 0); + + freeSlots.forEach((v) { + if (v.start == dateStartObj) dayEvents.add(v); + }); + + setState(() { + if (dayEvents.length != 0) + CovidTimeSlots.areSlotsAvailable = true; + else + CovidTimeSlots.areSlotsAvailable = false; + + selectedButtonIndex = 0; + + CovidTimeSlots.selectedTime = dayEvents[selectedButtonIndex].isoTime; + }); + } + + Future> _getJSONSlots() async { + Map _eventsParsed; + List slotsList = []; + DateTime date; + final DateFormat formatter = DateFormat('HH:mm'); + final DateFormat dateFormatter = DateFormat('yyyy-MM-dd'); + for (var i = 0; i < freeSlotsResponse.length; i++) { + date = + DateUtil.convertStringToDate(freeSlotsResponse[i]['FreeTimeSlots']); + slotsList.add(FreeSlot(date, ['slot'])); + docFreeSlots.add(TimeSlot( + isoTime: formatter.format(date), + start: new DateTime(date.year, date.month, date.day, 0, 0, 0, 0), + end: date)); + } + _eventsParsed = + Map.fromIterable(slotsList, key: (e) => e.slot, value: (e) => e.event); + setState(() { + CovidTimeSlots.selectedDate = dateFormatter.format( + DateUtil.convertStringToDate(freeSlotsResponse[0]['FreeTimeSlots'])); + selectedDate = DateUtil.getMonthDayYearDateFormatted( + DateUtil.convertStringToDate(freeSlotsResponse[0]['FreeTimeSlots'])); + selectedDateJSON = freeSlotsResponse[0]['FreeTimeSlots']; + }); + openTimeSlotsPickerForDate( + DateUtil.convertStringToDate(selectedDateJSON), docFreeSlots); + _calendarController + .setFocusedDay(DateUtil.convertStringToDate(selectedDateJSON)); + return _eventsParsed; + } + + Widget _buildEventsMarker(DateTime date, List events) { + return Container( + decoration: BoxDecoration( + shape: BoxShape.circle, + color: _calendarController.isSelected(date) + ? Colors.green[400] + : _calendarController.isToday(date) + ? Colors.brown[300] + : Colors.blue[400], + ), + width: 40.0, + height: 40.0, + child: Center( + child: Text( + '${date.day}', + style: TextStyle().copyWith( + color: Colors.white, + fontSize: 14.0, + ), + ), + ), + ); + } + + Widget getNormalButton(int index) { + return RaisedButton( + color: Colors.white, + textColor: new Color(0xFF60686b), + onPressed: () { + setState(() { + selectedButtonIndex = index; + CovidTimeSlots.selectedTime = dayEvents[index].isoTime; + print(CovidTimeSlots.selectedTime); + }); + }, + child: Text(dayEvents[index].isoTime, + style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold)), + ); + } + + Widget getSelectedButton(int index) { + return RaisedButton( + color: Colors.blue[400], + textColor: Colors.white, + onPressed: () { + setState(() { + selectedButtonIndex = index; + CovidTimeSlots.selectedTime = dayEvents[index].isoTime; + print(CovidTimeSlots.selectedTime); + }); + }, + child: Text(dayEvents[index].isoTime, + style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold)), + ); + } + + bookCovidTestAppointment() { +// Navigator.push(context, +// MaterialPageRoute(builder: (context) => CovidPaymentAlert())); + + DoctorList docObject = new DoctorList(); + docObject.doctorID = widget.selectedDoctorID; + docObject.clinicID = widget.selectedClinicID; + docObject.projectID = widget.projectID; + insertAppointmentCovidTest(context, docObject); + } + + insertAppointmentCovidTest(context, DoctorList docObject) { + DoctorsListService service = new DoctorsListService(); + AppoitmentAllHistoryResultList appo; + service + .insertAppointment( + docObject.doctorID, + docObject.clinicID, + docObject.projectID, + CovidTimeSlots.selectedTime, + CovidTimeSlots.selectedDate, + context) + .then((res) { + print(res); + if (res['MessageStatus'] == 1) { + AppToast.showSuccessToast(message: "Appointment Booked Successfully"); + Future.delayed(new Duration(milliseconds: 1800), () { + getPatientShare(context, res['AppointmentNo'], docObject.clinicID, + docObject.projectID, docObject); + }); + } else { + appo = new AppoitmentAllHistoryResultList(); + appo.appointmentNo = res['SameClinicApptList'][0]['AppointmentNo']; + appo.clinicID = res['SameClinicApptList'][0]['DoctorID']; + appo.projectID = res['SameClinicApptList'][0]['ProjectID']; + appo.endTime = res['SameClinicApptList'][0]['EndTime']; + appo.startTime = res['SameClinicApptList'][0]['StartTime']; + appo.doctorID = res['SameClinicApptList'][0]['DoctorID']; + appo.isLiveCareAppointment = false; + appo.originalClinicID = 0; + appo.originalProjectID = 0; + appo.appointmentDate = res['SameClinicApptList'][0]['AppointmentDate']; + + ConfirmDialog dialog = new ConfirmDialog( + context: context, + confirmMessage: res['ErrorEndUserMessage'], + okText: TranslationBase.of(context).confirm, + cancelText: TranslationBase.of(context).cancel_nocaps, + okFunction: () => {cancelAppointment(docObject, appo, context)}, + cancelFunction: () => {}); + dialog.showAlertDialog(context); + } + }).catchError((err) { + AppToast.showErrorToast(message: err); + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + } + + cancelAppointment(DoctorList docObject, AppoitmentAllHistoryResultList appo, + BuildContext context) { + ConfirmDialog.closeAlertDialog(context); + DoctorsListService service = new DoctorsListService(); + service.cancelAppointment(appo, context).then((res) { + if (res['MessageStatus'] == 1) { + Future.delayed(new Duration(milliseconds: 1500), () { + insertAppointmentCovidTest(context, docObject); + }); + } else { + AppToast.showErrorToast(message: res['ErrorEndUserMessage']); + } + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + } + + getPatientShare(context, String appointmentNo, int clinicID, int projectID, + DoctorList docObject) { + DoctorsListService service = new DoctorsListService(); + service + .getPatientShare(appointmentNo, clinicID, projectID, context) + .then((res) { + print(res); + widget.patientShareResponse = new PatientShareResponse.fromJson(res); + }) + .catchError((err) { + print(err); + }) + .showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)) + .then((value) { + navigateToPaymentAlert(); + }); + } + + navigateToPaymentAlert() { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => CovidPaymentAlert( + patientShareResponse: widget.patientShareResponse))); + } + + getCovidFreeSlots(BuildContext context, int projectID) { + CovidDriveThruService service = new CovidDriveThruService(); + service.getCovidFreeSlots(context, projectID).then((res) { + print(res['COVID19_FreeTimeSlots']); + if (res['MessageStatus'] == 1) { + if (res['COVID19_FreeTimeSlots'].length != 0) { + freeSlotsResponse = res['COVID19_FreeTimeSlots']; + print(res['COVID19_FreeTimeSlots'].length); + _getJSONSlots().then((value) => { + setState(() => { + widget.selectedClinicID = + freeSlotsResponse[0]['ClinicID'], + widget.selectedDoctorID = + freeSlotsResponse[0]['DoctorID'], + _events.clear(), + _events = value + }) + }); + } else {} + } else { + AppToast.showErrorToast(message: res['ErrorEndUserMessage']); + } + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + } +} diff --git a/lib/pages/Covid-DriveThru/covid-drivethru-location.dart b/lib/pages/Covid-DriveThru/covid-drivethru-location.dart index 6b1c5f2b..0563c4bd 100644 --- a/lib/pages/Covid-DriveThru/covid-drivethru-location.dart +++ b/lib/pages/Covid-DriveThru/covid-drivethru-location.dart @@ -1,11 +1,13 @@ +import 'package:diplomaticquarterapp/models/CovidDriveThru/CovidPaymentInfoResponse.dart'; import 'package:diplomaticquarterapp/models/CovidDriveThru/DriveThroughTestingCenterModel.dart'; +import 'package:diplomaticquarterapp/pages/Covid-DriveThru/covid-payment-details.dart'; import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/services/covid-drivethru/covid-drivethru.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; import 'package:maps_launcher/maps_launcher.dart'; +import 'package:smart_progress_bar/smart_progress_bar.dart'; class CovidDrivethruLocation extends StatefulWidget { @override @@ -19,6 +21,7 @@ class _CovidDrivethruLocationState extends State { String projectLat = ""; String projectLong = ""; String projectName = ""; + String projectID = ""; @override void initState() { @@ -94,15 +97,16 @@ class _CovidDrivethruLocationState extends State { )), isLocationSelected ? Container( - margin: EdgeInsets.only(top: 15.0), - alignment: Alignment.centerLeft, - child: Text("Selected Location", - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 18.0, - letterSpacing: 0.8, - color: Colors.black)), - ) : Container(), + margin: EdgeInsets.only(top: 15.0), + alignment: Alignment.centerLeft, + child: Text("Selected Location", + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 18.0, + letterSpacing: 0.8, + color: Colors.black)), + ) + : Container(), isLocationSelected ? Container( margin: EdgeInsets.only(top: 5.0), @@ -212,15 +216,22 @@ class _CovidDrivethruLocationState extends State { } getDirections() { - if(isLocationSelected) { - MapsLauncher.launchCoordinates(double.parse(projectLat),double.parse(projectLong), this.projectName); + if (isLocationSelected) { + MapsLauncher.launchCoordinates(double.parse(projectLat), + double.parse(projectLong), this.projectName); } else { - Utils.showErrorToast("Please select address from the dropdown menu to get directions"); + Utils.showErrorToast( + "Please select address from the dropdown menu to get directions"); } } next() { - + if (isLocationSelected) { + getPaymentInfo(context, projectID); + } else { + Utils.showErrorToast( + "Please select address from the dropdown menu to continue"); + } } back() { @@ -229,21 +240,57 @@ class _CovidDrivethruLocationState extends State { setProjectLocation(newValue) { print(newValue); - print(projectsList[(int.parse(newValue) - 1)].projectName); setState(() { this.projectLat = projectsList[(int.parse(newValue) - 1)].latitude.toString(); this.projectLong = projectsList[(int.parse(newValue) - 1)].longitude.toString(); this.projectName = projectsList[(int.parse(newValue) - 1)].projectName; + this.projectID = + projectsList[(int.parse(newValue) - 1)].projectID.toString(); isLocationSelected = true; }); } + getPaymentInfo(BuildContext context, String projectID) { + CovidDriveThruService service = new CovidDriveThruService(); + + CovidPaymentInfoResponse covidPaymentInfoResponse = + new CovidPaymentInfoResponse(); + + service + .getCovidPaymentInformation(context, int.parse(projectID)) + .then((res) { + if (res['MessageStatus'] == 1) { + setState(() { + covidPaymentInfoResponse = CovidPaymentInfoResponse.fromJson( + res['COVID19_PatientShare']); + print(covidPaymentInfoResponse.procedureNameField); + }); + } else {} + }) + .catchError((err) { + print(err); + }) + .showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)) + .then((value) { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => CovidPaymentDetails( + covidPaymentInfoResponse: covidPaymentInfoResponse, + projectID: int.parse(projectID), + ))); + }); + } + getProjectsList(BuildContext context) { CovidDriveThruService service = new CovidDriveThruService(); service.getCovidProjectsList(context).then((res) { + print(res); if (res['MessageStatus'] == 1) { + print(res); setState(() { res['List_COVID19_ProjectDriveThroughTestingCenter'].forEach((v) { projectsList.add(new DriveThroughTestingCenterModel.fromJson(v)); diff --git a/lib/pages/Covid-DriveThru/covid-payment-alert.dart b/lib/pages/Covid-DriveThru/covid-payment-alert.dart new file mode 100644 index 00000000..ac5f45fc --- /dev/null +++ b/lib/pages/Covid-DriveThru/covid-payment-alert.dart @@ -0,0 +1,288 @@ +import 'package:diplomaticquarterapp/models/Appointments/PatientShareResposne.dart'; +import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; + +class CovidPaymentAlert extends StatefulWidget { + PatientShareResponse patientShareResponse; + + CovidPaymentAlert({@required this.patientShareResponse}); + + @override + _CovidPaymentAlertState createState() => _CovidPaymentAlertState(); +} + +class _CovidPaymentAlertState extends State { + @override + Widget build(BuildContext context) { + return AppScaffold( + appBarTitle: "COVID-19 TEST", + isShowAppBar: true, + body: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 200.0, + color: new Color(0xFFc5272d), + child: Row( + children: [ + Container( + margin: EdgeInsets.only(left: 50.0), + child: SvgPicture.asset( + 'assets/images/new-design/alert_icon.svg', + width: 80.0, + height: 80.0), + ), + Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + margin: EdgeInsets.only(left: 30.0, right: 20.0), + child: Text("Alert", + style: TextStyle( + color: Colors.white, + fontWeight: FontWeight.bold, + fontSize: 24.0)), + ), + Container( + width: MediaQuery.of(context).size.width * 0.55, + margin: EdgeInsets.only( + left: 30.0, right: 20.0, top: 5.0), + child: Text( + "Pay With-in 15 mins to confirm the appointment", + overflow: TextOverflow.clip, + style: TextStyle( + color: Colors.white, fontSize: 20.0)), + ), + ], + ), + ), + ], + ), + ), + Container( + margin: EdgeInsets.only(left: 20.0, right: 20.0, top: 30.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + alignment: Alignment.center, + child: Text("Pay With-in 15 mins", + overflow: TextOverflow.clip, + style: TextStyle( + color: new Color(0xFFc5272d), + fontSize: 24.0, + fontWeight: FontWeight.bold)), + ), + Container( + alignment: Alignment.center, + margin: EdgeInsets.only(top: 15.0), + child: Text( + "Payment for Covid-19 Test should Be made with-in 15 mins otherwise The system will Cancel the Scheduled appointment automatically​.", + textAlign: TextAlign.center, + style: TextStyle( + color: Colors.grey[700], + fontSize: 18.0, + letterSpacing: 0.8)), + ), + Container( + margin: EdgeInsets.only( + top: 40.0, bottom: 10.0, left: 0.0, right: 20.0), + child: Text(TranslationBase.of(context).appoInfo, + style: TextStyle( + fontSize: 18.0, + color: Colors.grey[700], + fontWeight: FontWeight.bold)), + ), + Container( + margin: EdgeInsets.only(left: 0.0, bottom: 20.0), + width: MediaQuery.of(context).size.width, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + color: Colors.grey[200], + boxShadow: [ + BoxShadow(color: Colors.grey, spreadRadius: 2), + ], + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.only( + top: 15.0, bottom: 10.0, left: 20.0, right: 20.0), + child: Text("COVID-19 TEST", + style: TextStyle( + fontSize: 18.0, + color: Colors.black, + fontWeight: FontWeight.bold)), + ), + Container( + margin: EdgeInsets.only(bottom: 10.0), + child: Row( + children: [ + Container( + margin: + EdgeInsets.only(left: 20.0, right: 20.0), + child: Icon( + Icons.local_hospital, + size: 24, + color: Colors.grey[700], + )), + Container( + child: Text( + widget.patientShareResponse.projectName != + null + ? widget.patientShareResponse.projectName + : "NULL", + style: TextStyle( + fontSize: 18.0, color: Colors.grey[700])), + ), + ], + ), + ), + Container( + margin: EdgeInsets.only(bottom: 10.0), + child: Row( + children: [ + Container( + margin: + EdgeInsets.only(left: 20.0, right: 20.0), + child: Icon( + Icons.date_range, + size: 24, + color: Colors.grey[700], + )), + Container( + child: Text( + widget.patientShareResponse.appointmentDate != + null + ? getDate(widget.patientShareResponse + .appointmentDate) + .split(" ")[0] + : "NULL", + style: TextStyle( + fontSize: 18.0, color: Colors.grey[700])), + ), + ], + ), + ), + Container( + margin: EdgeInsets.only(bottom: 10.0), + child: Row( + children: [ + Container( + margin: + EdgeInsets.only(left: 20.0, right: 20.0), + child: Icon( + Icons.access_time, + size: 24, + color: Colors.grey[700], + )), + Container( + child: Text( + widget.patientShareResponse.appointmentDate != + null + ? getDate(widget.patientShareResponse + .appointmentDate) + .split(" ")[1] + : "NULL", + style: TextStyle( + fontSize: 18.0, color: Colors.grey[700])), + ), + ], + ), + ), + Container( + margin: EdgeInsets.only(bottom: 10.0), + child: Row( + children: [ + Container( + margin: + EdgeInsets.only(left: 20.0, right: 20.0), + child: SvgPicture.asset( + "assets/images/new-design/track_icon.svg", + width: 20.0, + height: 20.0)), + Container( + child: Text( + widget.patientShareResponse.doctorNameObj != + null + ? widget + .patientShareResponse.doctorNameObj + : "NULL", + style: TextStyle( + fontSize: 18.0, color: Colors.grey[700])), + ), + ], + ), + ), + ], + ), + ), + ], + ), + ), + ], + ), + ), + bottomSheet: Container( + margin: EdgeInsets.all(10.0), + child: Flex( + direction: Axis.horizontal, + children: [ + Expanded( + flex: 1, + child: Container( + margin: EdgeInsets.fromLTRB(10.0, 0.0, 5.0, 0.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + minWidth: MediaQuery.of(context).size.width * 0.7, + height: 45.0, + child: RaisedButton( + color: new Color(0xFF60686b), + textColor: Colors.white, + disabledTextColor: Colors.white, + disabledColor: Colors.grey[500], + onPressed: () { +// bookCovidTestAppointment(); + }, + child: Text("NEXT", style: TextStyle(fontSize: 18.0)), + ), + ), + ), + ), + ], + ), + ), + ); + } + + String getDate(String appoDate) { + var appoDateFormatted = ""; + + var dateObj = DateUtil.convertStringToDate(appoDate); + + setState(() { + appoDateFormatted = DateUtil.getWeekDay(dateObj.weekday) + + ", " + + dateObj.day.toString() + + " " + + DateUtil.getMonth(dateObj.month) + + " " + + dateObj.year.toString() + + " " + + dateObj.hour.toString() + + ":" + + dateObj.minute.toString() + + ":00"; + }); + return appoDateFormatted; + } +} diff --git a/lib/pages/Covid-DriveThru/covid-payment-details.dart b/lib/pages/Covid-DriveThru/covid-payment-details.dart new file mode 100644 index 00000000..1254997d --- /dev/null +++ b/lib/pages/Covid-DriveThru/covid-payment-details.dart @@ -0,0 +1,257 @@ +import 'package:diplomaticquarterapp/models/CovidDriveThru/CovidPaymentInfoResponse.dart'; +import 'package:diplomaticquarterapp/pages/Covid-DriveThru/Covid-TimeSlots.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; + +class CovidPaymentDetails extends StatefulWidget { + CovidPaymentInfoResponse covidPaymentInfoResponse; + int projectID; + + CovidPaymentDetails( + {@required this.covidPaymentInfoResponse, @required this.projectID}); + + @override + _CovidPaymentDetailsState createState() => _CovidPaymentDetailsState(); +} + +class _CovidPaymentDetailsState extends State { + bool isAgree = false; + + @override + Widget build(BuildContext context) { + return AppScaffold( + appBarTitle: "COVID-19 TEST", + isShowAppBar: true, + body: SingleChildScrollView( + child: Container( + margin: EdgeInsets.fromLTRB(15.0, 15.0, 15.0, 0.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 150.0, + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage( + "assets/images/new-design/covid-19-big-banner-bg.png"), + fit: BoxFit.fill, + ), + color: Colors.white.withOpacity(0.3), + borderRadius: BorderRadius.all(Radius.circular(10))), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: + EdgeInsets.only(left: 15.0, right: 15.0, top: 30.0), + child: SvgPicture.asset( + 'assets/images/new-design/covid-19-car.svg', + width: 90.0, + height: 90.0), + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.only( + left: 20.0, right: 20.0, top: 40.0), + child: Text("COVID-19 TEST", + style: TextStyle( + color: Colors.white, + fontWeight: FontWeight.bold, + fontSize: 24.0)), + ), + Container( + margin: EdgeInsets.only( + left: 20.0, right: 20.0, top: 10.0), + child: Text("Drive-Thru", + style: TextStyle( + color: Colors.white, fontSize: 24.0)), + ), + ], + ), + ], + ), + ), + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.0), + color: Colors.white), + margin: EdgeInsets.fromLTRB(0.0, 30.0, 0.0, 5.0), + padding: EdgeInsets.fromLTRB(20.0, 0.0, 20.0, 20.0), + child: Column( + children: [ + Container( + alignment: Alignment.center, + margin: + EdgeInsets.only(left: 0.0, right: 20.0, top: 30.0), + child: Text("Test Fees", + style: TextStyle( + color: Colors.black, + fontSize: 22.0, + fontWeight: FontWeight.bold)), + ), + Table( + children: [ + TableRow(children: [ + TableCell( + child: _getNormalText(TranslationBase.of(context) + .patientShareToDo)), + TableCell( + child: _getNormalText(widget + .covidPaymentInfoResponse.patientShareField + .toString())), + ]), + TableRow(children: [ + TableCell( + child: _getNormalText( + TranslationBase.of(context).patientTaxToDo)), + TableCell( + child: _getNormalText(widget + .covidPaymentInfoResponse + .patientTaxAmountField + .toString())), + ]), + TableRow(children: [ + TableCell( + child: _getNormalText(TranslationBase.of(context) + .patientShareTotalToDo)), + TableCell( + child: _getNormalText(widget + .covidPaymentInfoResponse + .patientShareWithTaxField + .toString())), + ]), + ], + ), + ], + ), + ), + Container( + margin: EdgeInsets.fromLTRB(0.0, 15.0, 0.0, 5.0), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Checkbox( + value: isAgree, + onChanged: (value) { + setState(() { + isAgree = !isAgree; + }); + }, + activeColor: Colors.blue, + ), + Texts(TranslationBase.of(context) + .iAgreeToTheTermsAndConditions), + ], + ), + ), + Divider( + color: Colors.grey, + ), + Container( + alignment: Alignment.center, + margin: EdgeInsets.fromLTRB(20.0, 15.0, 20.0, 5.0), + child: Text("You can pay by following options: ", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.bold, + fontFamily: "Open-Sans")), + ), + Container( + alignment: Alignment.center, + margin: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 5.0), + child: Image.asset( + "assets/images/new-design/payment_options_invoice_confirmation.png", + width: 300), + ), + ], + ), + ), + ), + bottomSheet: Container( + margin: EdgeInsets.fromLTRB(10.0, 5.0, 10.0, 20.0), + child: Flex( + direction: Axis.horizontal, + children: [ + Expanded( + flex: 1, + child: Container( + margin: EdgeInsets.fromLTRB(10.0, 0.0, 5.0, 0.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + minWidth: MediaQuery.of(context).size.width * 0.7, + height: 45.0, + child: RaisedButton( + color: new Color(0xFF60686b), + textColor: Colors.white, + disabledTextColor: Colors.white, + disabledColor: Colors.grey[500], + onPressed: () { + cancel(); + }, + child: Text("CANCEL", style: TextStyle(fontSize: 18.0)), + ), + ), + ), + ), + Expanded( + flex: 1, + child: Container( + margin: EdgeInsets.fromLTRB(10.0, 0.0, 5.0, 0.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + minWidth: MediaQuery.of(context).size.width * 0.7, + height: 45.0, + child: RaisedButton( + color: new Color(0xFF60686b), + textColor: Colors.white, + disabledTextColor: Colors.white, + disabledColor: Colors.grey[500], + onPressed: isAgree ? next : null, + child: Text("NEXT", style: TextStyle(fontSize: 18.0)), + ), + ), + ), + ), + ], + ), + ), + ); + } + + void next() { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => CovidTimeSlots( + projectID: widget.projectID, + ))); + } + + cancel() { + Navigator.pop(context); + } + + _getNormalText(text) { + return Container( + margin: EdgeInsets.only(top: 20.0, right: 10.0), + child: Text(text, + textAlign: TextAlign.end, + style: TextStyle( + fontSize: 15, + fontFamily: 'Open-Sans', + letterSpacing: 0.5, + color: Colors.grey[700])), + ); + } +} diff --git a/lib/pages/ToDoList/ToDo.dart b/lib/pages/ToDoList/ToDo.dart index 796794b2..7c20b53d 100644 --- a/lib/pages/ToDoList/ToDo.dart +++ b/lib/pages/ToDoList/ToDo.dart @@ -107,7 +107,7 @@ class _ToDoState extends State { .liveCareAppo, style: TextStyle(fontSize: 12.0)) : Text(widget.appoList[index].projectName != null ? widget.appoList[index].projectName : "-", - style: TextStyle(fontSize: 12.0)), + style: TextStyle(fontSize: 11.0)), ), ], ), diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index d427c2f1..79671682 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -94,11 +94,11 @@ class _HomePageState extends State { children: [ Container( margin: EdgeInsets.only( - top: 15.0), + top: 15.0, left: 3.5, right: 3.5), child: SvgPicture.asset( 'assets/images/new-design/covid-19-car.svg', - width: 50.0, - height: 50.0), + width: 45.0, + height: 45.0), ), Container( margin: EdgeInsets.only( diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index a545f8a7..0c6a2144 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -29,9 +29,6 @@ import 'package:rxdart/rxdart.dart'; import 'home_page.dart'; - - - class LandingPage extends StatefulWidget { static bool isOpenCallPage = false; diff --git a/lib/services/covid-drivethru/covid-drivethru.dart b/lib/services/covid-drivethru/covid-drivethru.dart index a9ebbecd..2681783b 100644 --- a/lib/services/covid-drivethru/covid-drivethru.dart +++ b/lib/services/covid-drivethru/covid-drivethru.dart @@ -49,4 +49,78 @@ class CovidDriveThruService extends BaseService { }, body: request); return Future.value(localRes); } + + Future getCovidPaymentInformation(BuildContext context, int projectID) async { + Map request; + + if (await this.sharedPref.getObject(USER_PROFILE) != null) { + var data = AuthenticatedUser.fromJson( + await this.sharedPref.getObject(USER_PROFILE)); + authUser = data; + } + + var languageID = await sharedPref.getString(APP_LANGUAGE); + Request req = appGlobal.getPublicRequest(); + request = { + "LanguageID": languageID == 'ar' ? 1 : 2, + "IPAdress": "10.20.10.20", + "ProjectID": projectID, + "VersionID": req.VersionID, + "Channel": req.Channel, + "generalid": 'Cs2020@2016\$2958', + "PatientOutSA": authUser.outSA, + "TokenID": "", + "DeviceTypeID": req.DeviceTypeID, + "SessionID": "YckwoXhUmWBsnHKEKig", + "PatientID": authUser.patientID != null ? authUser.patientID : 0, + "License": true + }; + + dynamic localRes; + + await baseAppClient.post(GET_COVID_DRIVETHRU_PAYMENT_INFO, + onSuccess: (response, statusCode) async { + localRes = response; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: request); + return Future.value(localRes); + } + + Future getCovidFreeSlots(BuildContext context, int projectID) async { + Map request; + + if (await this.sharedPref.getObject(USER_PROFILE) != null) { + var data = AuthenticatedUser.fromJson( + await this.sharedPref.getObject(USER_PROFILE)); + authUser = data; + } + + var languageID = await sharedPref.getString(APP_LANGUAGE); + Request req = appGlobal.getPublicRequest(); + request = { + "LanguageID": languageID == 'ar' ? 1 : 2, + "IPAdress": "10.20.10.20", + "ProjectID": projectID, + "VersionID": req.VersionID, + "Channel": req.Channel, + "generalid": 'Cs2020@2016\$2958', + "PatientOutSA": authUser.outSA, + "TokenID": "", + "DeviceTypeID": req.DeviceTypeID, + "SessionID": "YckwoXhUmWBsnHKEKig", + "PatientID": authUser.patientID != null ? authUser.patientID : 0, + "License": true + }; + + dynamic localRes; + + await baseAppClient.post(GET_COVID_DRIVETHRU_FREE_SLOTS, + onSuccess: (response, statusCode) async { + localRes = response; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: request); + return Future.value(localRes); + } } From a8ee7db62b038f5895cace43ac58edc84410a2ec Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 11 Oct 2020 13:20:22 +0300 Subject: [PATCH 11/14] fixes # Conflicts: # lib/config/config.dart --- lib/config/config.dart | 9 ++++++++- .../AlHabibMedicalService/​ health_calculators.dart | 4 ++-- lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 96804aeb..0f92db66 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -258,6 +258,14 @@ const GET_PATIENT_INFO_BY_ID_AND_MOBILE_NUMBER = 'Services/Patients.svc/REST/AP_ const SEND_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT = 'Services/Authentication.svc/REST/SendActivationCodeForAdvancePayment'; const CHECK_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT = 'Services/Authentication.svc/REST/CheckActivationCodeForAdvancePayment'; + +const GET_COVID_DRIVETHRU_PROJECT_LIST = 'Services/Doctors.svc/REST/COVID19_ProjectDriveThroughTestingCenter'; + +const GET_COVID_DRIVETHRU_PAYMENT_INFO = 'Services/Doctors.svc/REST/COVID19_GetPatientPaymentInormation'; + +const GET_COVID_DRIVETHRU_FREE_SLOTS = 'Services/Doctors.svc/REST/COVID19_GetFreeSlots'; + + ///My Trackers const GET_DIABETIC_RESULT_AVERAGE='Services/Patients.svc/REST/Patient_GetDiabeticResultAverage'; const GET_DIABTEC_RESULT='Services/Patients.svc/REST/Patient_GetDiabtecResults'; @@ -304,7 +312,6 @@ const GET_ALL_CITIES = 'services/Lists.svc/rest/GetAllCities'; const CREATE_E_REFERRAL = "Services/Patients.svc/REST/CreateEReferral"; const GET_E_REFERRALS = "Services/Patients.svc/REST/GetEReferrals"; -const GET_COVID_DRIVETHRU_PROJECT_LIST = 'Services/Doctors.svc/REST/COVID19_ProjectDriveThroughTestingCenter'; const TIMER_MIN = 10; diff --git a/lib/pages/AlHabibMedicalService/​ health_calculators.dart b/lib/pages/AlHabibMedicalService/​ health_calculators.dart index 56fb0428..97141716 100644 --- a/lib/pages/AlHabibMedicalService/​ health_calculators.dart +++ b/lib/pages/AlHabibMedicalService/​ health_calculators.dart @@ -1,5 +1,3 @@ -import 'file:///C:/Users/admin/AndroidStudioProjects/diplomatic-quarter/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/diplomatic-quarter/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart'; import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart'; @@ -8,7 +6,9 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'health_calculator/bmi_calculator/bmi_calculator.dart'; import 'health_calculator/bmr_calculator/bmr_calculator.dart'; +import 'health_calculator/calorie_calculator/calorie_calculator.dart'; import 'health_calculator/ideal_body/ideal_body.dart'; class HealthCalculators extends StatefulWidget { diff --git a/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart b/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart index 2113d2b5..8e9fe806 100644 --- a/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart +++ b/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart @@ -140,7 +140,6 @@ class _HospitalsLiveChatPageState extends State { icon: Icon( Icons .arrow_forward_ios, - .arrow_forward, color: tappedIndex == index ? Colors.white From cd36749e4e09233a563bd6e06c1f99cad1a45ccb Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Mon, 12 Oct 2020 14:22:19 +0300 Subject: [PATCH 12/14] files import fix --- .../health_calculator/bmi_calculator/bmi_calculator.dart | 3 ++- .../health_calculator/bmr_calculator/bmr_calculator.dart | 3 ++- .../health_calculator/body_fat/body_fat.dart | 3 ++- .../calorie_calculator/calorie_calculator.dart | 3 ++- .../health_calculator/carbs/carbs.dart | 6 +++--- .../health_calculator/ideal_body/ideal_body.dart | 3 ++- .../ovulation_period/ovulation_period.dart | 3 ++- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart index 62729222..c84053c5 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart @@ -1,4 +1,3 @@ -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/bmi_calculator/result_page.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; @@ -6,6 +5,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'dart:math'; +import 'result_page.dart'; + const activeCardColor = Color(0xff70777A); const inactiveCardColor = Color(0xffFAFAFd); diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart index 3d287610..1af0f949 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart @@ -1,10 +1,11 @@ -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'dart:math'; +import 'bmr_result_page.dart'; + const activeCardColorGender = Color(0xffC5272D); const inactiveCardColorGender = Color(0xffFAFAFd); const activeCardColor = Color(0xff70777A); diff --git a/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart index ccc7d212..91847e37 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart @@ -1,10 +1,11 @@ -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat_result_page.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'dart:math'; +import 'body_fat_result_page.dart'; + const activeCardColorGender = Color(0xffC5272D); const inactiveCardColorGender = Color(0xffFAFAFd); const activeCardColor = Color(0xff70777A); diff --git a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart index 994484e7..4361425a 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart @@ -1,9 +1,10 @@ -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; +import 'calorie_result_page.dart'; + const activeCardColorGender = Color(0xffC5272D); const inactiveCardColorGender = Color(0xffFAFAFd); const activeCardColor = Color(0xff70777A); diff --git a/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart b/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart index 2dfc3f92..e273b075 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart @@ -1,13 +1,13 @@ -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart'; -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/carbs/carbs_result_page.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'dart:math'; - +import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart'; import 'package:flutter/services.dart'; +import 'carbs_result_page.dart'; + class Carbs extends StatefulWidget { @override _CarbsState createState() => _CarbsState(); diff --git a/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart b/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart index fb4f8948..9bdbfb36 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart @@ -1,10 +1,11 @@ -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body_result_page.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'dart:math'; +import 'ideal_body_result_page.dart'; + const activeCardColor = Color(0xff70777A); const inactiveCardColor = Color(0xffFAFAFd); diff --git a/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart b/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart index adc2f06d..1a272c11 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart @@ -1,4 +1,3 @@ -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_result_page.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; @@ -7,6 +6,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; import 'package:intl/intl.dart'; +import 'ovulation_result_page.dart'; + class OvulationPeriod extends StatefulWidget { @override _OvulationPeriodState createState() => _OvulationPeriodState(); From 53bbafdc2b265f69853eb51697a271e48f7266f4 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 13 Oct 2020 11:22:49 +0300 Subject: [PATCH 13/14] fix Authenticated User Object --- lib/core/service/AuthenticatedUserObject.dart | 10 +++++++--- lib/core/service/base_service.dart | 1 + lib/core/viewModels/medical/medical_view_model.dart | 2 +- .../all_habib_medical_service_page.dart | 1 + .../{hmg_service.dart => contact_us_page.dart} | 7 ++++--- lib/pages/landing/home_page.dart | 4 ++-- lib/pages/login/login.dart | 5 +++++ lib/pages/medical/medical_profile_page.dart | 1 + lib/services/authentication/auth_provider.dart | 5 +++++ lib/widgets/drawer/app_drawer_widget.dart | 8 ++++---- 10 files changed, 31 insertions(+), 13 deletions(-) rename lib/pages/ContactUs/{hmg_service.dart => contact_us_page.dart} (93%) diff --git a/lib/core/service/AuthenticatedUserObject.dart b/lib/core/service/AuthenticatedUserObject.dart index 1aaa4755..600e17e1 100644 --- a/lib/core/service/AuthenticatedUserObject.dart +++ b/lib/core/service/AuthenticatedUserObject.dart @@ -2,16 +2,17 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; -class AuthenticatedUserObject{ +class AuthenticatedUserObject { AuthenticatedUser user; AppSharedPreferences sharedPref = AppSharedPreferences(); bool isLogin = false; - AuthenticatedUserObject(){ + + AuthenticatedUserObject() { getUser(); } getUser() async { - if (user==null) { + if (user == null) { var userData = await sharedPref.getObject(USER_PROFILE); if (userData != null) user = AuthenticatedUser.fromJson(userData); } @@ -20,4 +21,7 @@ class AuthenticatedUserObject{ this.isLogin = isLogin != null; } + logout() async { + isLogin = false; + } } diff --git a/lib/core/service/base_service.dart b/lib/core/service/base_service.dart index f2820dc1..fdb80604 100644 --- a/lib/core/service/base_service.dart +++ b/lib/core/service/base_service.dart @@ -17,6 +17,7 @@ class BaseService { AppSharedPreferences sharedPref = AppSharedPreferences(); BaseService() { + authenticatedUserObject.getUser(); user = authenticatedUserObject.user; // getUser(); } diff --git a/lib/core/viewModels/medical/medical_view_model.dart b/lib/core/viewModels/medical/medical_view_model.dart index 4563f615..f8b14c6e 100644 --- a/lib/core/viewModels/medical/medical_view_model.dart +++ b/lib/core/viewModels/medical/medical_view_model.dart @@ -12,7 +12,7 @@ class MedicalViewModel extends BaseViewModel { _medicalService.appoitmentAllHistoryResultList; getAppointmentHistory() async { - if (authenticatedUserObject.isLogin) { + if (authenticatedUserObject.isLogin) { setState(ViewState.Busy); if (_medicalService.appoitmentAllHistoryResultList.length == 0) await _medicalService.getAppointmentHistory(); diff --git a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart index 3fa2aeab..5117ba4b 100644 --- a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart +++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart @@ -39,6 +39,7 @@ class _AllHabibMedicalServiceState extends State { return AppScaffold( isShowAppBar: true, appBarTitle: TranslationBase.of(context).alhabiServices, + isShowDecPage: false, body: Column( children: [ Expanded( diff --git a/lib/pages/ContactUs/hmg_service.dart b/lib/pages/ContactUs/contact_us_page.dart similarity index 93% rename from lib/pages/ContactUs/hmg_service.dart rename to lib/pages/ContactUs/contact_us_page.dart index 4f19e8f8..7d2192f9 100644 --- a/lib/pages/ContactUs/hmg_service.dart +++ b/lib/pages/ContactUs/contact_us_page.dart @@ -6,12 +6,12 @@ import 'package:flutter/material.dart'; import '../../uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart'; -class HmgServicePage extends StatefulWidget { +class ContactUsPage extends StatefulWidget { @override - _HmgServicePageState createState() => _HmgServicePageState(); + _ContactUsPageState createState() => _ContactUsPageState(); } -class _HmgServicePageState extends State { +class _ContactUsPageState extends State { LocationUtils locationUtils; @@ -29,6 +29,7 @@ class _HmgServicePageState extends State { return AppScaffold( isShowAppBar: true,//widget.isAppbar, appBarTitle: "HMG Services",//TranslationBase.of(context).bookAppo, + isShowDecPage: false, body: Container( margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0), child: Column( diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index b20648e2..933f6f50 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -2,7 +2,7 @@ import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/core/viewModels/dashboard_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/all_habib_medical_service_page.dart'; -import 'package:diplomaticquarterapp/pages/ContactUs/hmg_service.dart'; +import 'package:diplomaticquarterapp/pages/ContactUs/contact_us_page.dart'; import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/feedback/feedback_home_page.dart'; @@ -663,7 +663,7 @@ class _HomePageState extends State { // Navigator.push( // context, FadePage(page: FeedbackHomePage())); Navigator.push( - context, FadePage(page: HmgServicePage())); + context, FadePage(page: ContactUsPage())); }, child: Container( width: double.infinity, diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 22178444..a575f8c4 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -1,5 +1,6 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/size_config.dart'; +import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart'; import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart'; @@ -40,6 +41,9 @@ class _Login extends State { AppointmentRateViewModel appointmentRateViewModel = locator(); + AuthenticatedUserObject authenticatedUserObject = locator(); + + @override void initState() { // getDeviceToken(); @@ -196,6 +200,7 @@ class _Login extends State { // request.isRegister = false; this.authService.checkActivationCode(request, code).then((result) => { result = CheckActivationCode.fromJson(result), + authenticatedUserObject.getUser(), this.sharedPref.setObject(USER_PROFILE, result.list), this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID), this.sharedPref.setString(TOKEN, result.authenticationTokenID), diff --git a/lib/pages/medical/medical_profile_page.dart b/lib/pages/medical/medical_profile_page.dart index 2c5a6fb2..e7d75e7f 100644 --- a/lib/pages/medical/medical_profile_page.dart +++ b/lib/pages/medical/medical_profile_page.dart @@ -74,6 +74,7 @@ class _MedicalProfilePageState extends State { fit: BoxFit.cover, width: double.infinity, ), + if(model.authenticatedUserObject.isLogin) ListView.builder( itemBuilder: (context, index) => TimeLineWidget( isUp: index % 2 == 1, diff --git a/lib/services/authentication/auth_provider.dart b/lib/services/authentication/auth_provider.dart index 1598184c..c8d88f9d 100644 --- a/lib/services/authentication/auth_provider.dart +++ b/lib/services/authentication/auth_provider.dart @@ -1,5 +1,6 @@ import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_request.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart'; @@ -14,6 +15,8 @@ import 'package:diplomaticquarterapp/core/service/client/base_app_client.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:flutter/cupertino.dart'; +import '../../locator.dart'; + // SharedPreferences sharedPref = new SharedPreferences(); enum APP_STATUS { LOADING, UNAUTHENTICATED, AUTHENTICATED } AppSharedPreferences sharedPref = new AppSharedPreferences(); @@ -41,6 +44,8 @@ class AuthProvider with ChangeNotifier { bool isLogin = false; bool isLoading = true; dynamic authenticatedUser; + AuthenticatedUserObject authenticatedUserObject = locator(); + AuthProvider() { getUserAuthentication(); } diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 3c5ac608..9a387e4e 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -1,4 +1,5 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/service/client/base_app_client.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; @@ -16,6 +17,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import '../../config/size_config.dart'; +import '../../locator.dart'; import 'drawer_item_widget.dart'; class AppDrawer extends StatefulWidget { @@ -34,6 +36,7 @@ class _AppDrawerState extends State { var sharedPref = new AppSharedPreferences(); var familyFileProvider = FamilyFilesProvider(); AuthenticatedUser user; + AuthenticatedUserObject authenticatedUserObject = locator(); @override Widget build(BuildContext context) { @@ -329,10 +332,7 @@ class _AppDrawerState extends State { } logout() async { - // this.sharedPref.remove(USER_PROFILE); - // this.sharedPref.remove(IMEI_USER_DATA); - // this.sharedPref.remove(TOKEN); - // this.sharedPref.remove(LOGIN_TOKEN_ID); + authenticatedUserObject.logout(); await sharedPref.clear(); this.user = null; From a31796322bf8363ff14339da69487445289d9bc9 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 13 Oct 2020 11:28:14 +0300 Subject: [PATCH 14/14] fix icons issue --- .../health_calculator/delivery_due/delivery_due.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart b/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart index 1e8cb50c..c9993b95 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart @@ -96,7 +96,7 @@ class _DeliveryDueState extends State { children: [ Row( children: [ - Icon(Icons.date_range_rounded), + Icon(Icons.date_range), Texts('Date'), ], ),