From f25d18353f4c08c98d11b04ee91602412126ad1f Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 27 Sep 2020 10:22:32 +0300 Subject: [PATCH 01/30] 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/30] 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/30] 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/30] 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 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 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? 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~3NQ4jBqDkonrG(O zFT_+DiKW4ftm?L=wk96|i%n^dAZl^}3s86hO$nR?9v(gi6->b656YYbI2vg@Qu;-iG>*scVD}ugL^<6Y>x852L60uh|yo?&jXD<>lq;e-}tUEx7gf z{D(YMOVPdOX|H~_Z8WQjZ`pidP&z5Gk>%fbFFQ zeq#o>fD2|WHq}O>YpVZ43GFCOyoto_2tZZC#Lflbu^|z_8MELHaE=Ij(FfZT#M5^m z(lbs{qDESS6aqLJA6S@~HOabY0Zrjh4V$>k-!Ych@l|0^y|`qhZXCQw)m(yiVF}ad z?_CZA@e^UtD3sggW#m&z0N>ST<^Y$n`wMEoiuRa^f}sock^*?T+(+tGs+noI@9Y%E ziLs2GUk^Nv8(#`rM2(0M5&><|PcTM~kYFHU0W4g$YJ=yQonz>*p9;ft;f)p<_Vpd` z;<;3)&c7RKmq*>88y^&&-+5yTaP%~42My+y1pCtiESBC*{4F1sQ)oNx_O~mq-Gswn zt-0=m+xF+UkJBcy=c4N|NAmD&|MXOa4bKB=CE{Ix?!IwhQQ*K@h0%^I+<4l7XZ3bj z3F?RPWl=4#J3)Lm$3~z8YMGU)+{g+gboN_Y$=@fK933fE%E+?^G4U)gPZ`Ccnv!q7Zo)! zY|8hJHX*&?N3&jyqRJjcQ;nbdE5oK?h^5G^$PxruLRp&`^gmHmf|3sTE9|5y6K^{&^8H6hWo74q zb_jJn9Z(jXH=}xrpFL4|HiU?x8!N%G-wl(5anyArRcxLtvy~U{+l@YJ#FSL_2$jd4 zkLgOQpjttx^o!umm-HHu!~(NA=`VA-h4-^uY(*MJf1M1Ojjjs8wzNot+24%Y2Cn3H zlG5}`1US&VxRS5%eJsy&E+BdZ;}K0i;F{{bX8!C>P;U6iS(rG1*Pk$MC^ouxK?pcz z+7s{-Dz%*hw|xV%0=ejeDFzb2Hp19m$$h#iYk|n>YRAR87sxp7ZW50A4Nx)$fK7e^ znT(Jp4E=5~y*_HHll@>lZ9oDGN*i?xB0APFp#ip5&GuaSVL#=Jx+oTQ*boXx?zqGy zT?FgKA(EI=so~Q_K=G;mid&UoV8y$6c4>%G0xP1L0*NmA9X~L<&51o2kJ^#SYHmue zUtn{AO2L*j)1!9%8?q2Rf`FXannR_{R|pmIa7;+1R)&HK8Jrmm*t+XOdP3k5_?04v z>2q^s{pusBmEgUp(=_jmL{~8NHmeTnP)&Z}QHq6}^Rk+jTfZA%X}Y+a99^sa(>@S=R>_Y)cOb5LwLo7_ZFJ`ZaisBLng-sd(Ov#rn#U>MA{6~smH^&c zk0hL8%l*a5pr5&9QD#3@7r6Fk^X}5am`#6Z%}5_r)ie3z6R*+30Q8WGPA~V{!(o#> z_4if-cj60;W(vJ8*jNp^8L;H+B%P_A`efC#$%|DJ~d%CnI!Xz z%dS}Is9_&_nYnB?Hr$yb*?)eQm$B<;F@1k^Hz?ZV^i@{P>R*labb6qxkFeQQXAJ+@ zcB*3e#`OmRQ)D)W(_M@kWw;u(|Cq|ex?KL!*2 zx9o3zu7+8_puN+apuEyl%KR;T8rD`tu41?YNxN1rlF{dRJ>qPkYNi*B>bxIXQPWdmUuCE7cKf|>yTz~5$Nv6e26{hs) zz@X%0k}oN`EEQ1fS;4o+)pTNAEjz{}%Cp~N)vDjl`}q*7fQ>6Pp-UY9Xo`Q9JPLu1 zBx$Q03)S13M!+nO+rUdjg6)LWfU2CeMeH+Mix^ElRKjn_oGrPKkHaf~`*qi~bj4=@ zxhzm9CkH`u1b0g^ts>)g;Z@Yv!mR=}IYqN&79M%N#3S^(Prg?zuL+r9w7^^yCX(Xh zl1sPQVa?dso?`@y?;<{G|H^^D`$%oMovqn|4)mry2)WRvjihb#VC$ zEzpgh&iXfs)w-tbi!d|{?&N|!yI}#e0MKtY0*~=vQda1WQE@m2%~CWwPzWHGOQ^hY z-Q7()9=^S{VH%5c@$Ir>&xolqd{nn-yeN+TbSK|_#q`6On(VLOcGU07o=i5QDw_}r z8YXGO9lFS()nSY;*?4Rp%V`tmjRSM|dDe$*Ss% z9xtrLT~48Z8Fa~F*~8^ZG8Da>P^7phTv+7C`Jn7fLGKDI&c14wtm*UgIh;s>{-ePw zf`mI_c`!xFH!sQ4Fro2G`q4&nTY zHnj`3P5BNNrHR_9*4IF&E!_5ZKNT**D;kcf*~u`9itL23qy`!qdntttXIbcr7DD>A(K>oJN0_{It@$}@4N>Xp+yqqzNP%JIM{5n4b{F44ZUyn(GAPLzPg&p@@_d$JS5x z+f(J?ADrK#`5+sz*CjypKQqt-D`SWJ7)dq$q@mKOFEuSC$QneRa}`b&mw4{VK199m zcGyoI|B@wbk2UVH@K(oHs_s{Gr&P_aqv%}e;$uT>eY1R_%Cwp$SpCvFyi9&sQRDqN z19LLuEMWlKHn{e2R`R7gQ}i?y_uHsvpNha*iA-rjy5{xf0o!AiC{~kcKGpXfW(sl- zk_JG@PFJ z+efHGFx+xA3jbMgUuG4|m-?VHt9gIm|>3+LQKxMX>`&ZJMVl36^nawMf8pGj}E4)(CT= ztbhdx&kAd*u>B)5>+P2W$h>-;1MSE@neDZTK#_UN0C=aadSXr&I%C=OGw3q(G9$D# zY;}3GW-Z#s)}oz86KWsyMqpp9yR^$~(CugT=nI5U6i4%7%v@#AenEv?5P84;UJ#|@n@OpH`_q;+a zAmPTT5skFSL8K`@YE3?j_bHgiXQki@1=s%qsm9FJmS;(Qh+{Z$ z8HKb5*?5IpD3584&v*#rPc(AucXWnir#--PiZF3{z`SD?Zyq>}ZY0|-w%^#mKX}-G zL0_IgOH5y;d_@&&#^uZ{gyT{X8M}GD^(t7#m{R8z&%~QG2VkJMglX6lla{O1!Wx*j6Rc$(? z5_7s4FJ4*tH8?tv!j7eCC{NPR3pVys{FYEhL9B@yNSOg5 z%LpK7zD{24>tk0CqqC0CyG72lEm}?aNHsg_7q=IhzQK0H!jLXhTqvEc2{2MKj@5;K z0>|CzUChL=jC(`;aP^ByBRZ9yf|(_|HAkHT!d3y?MI_R3%SVWXF@B#)`TIspjvlI) zq+7_-cIk&M+}Sg2$128LoZH0PevGIco+Tk8 z@u(UTYFs8I2|@*fcG&zbhrBMGeJ@%qZc!Q!yQt?1xoNvcF1}~V!E+A1^DaI&UR_$~ z$qlosWz_~3QfmWOtU&O?iqUl{lt@-AGs)I7xzlshM71Sl!s8FPp3by5>!6mXt_DD_ zWEg`H=rY+@;^f=}!V~SwOagL*#!U13%ZCRav{W7DyW=2Rz2C>uPH`^&Yj%~Wvb!gk zWqCQ3$hs&%D#zo65(rM1eS6q+he&WfaWVxX0Zr8PC`;-GxmV3N2jktV4$1*};gi#V zL6JeGv6zNjv;ft}fpN0P2j{nG@i38yx_+uDPZF207S!l2h}AjZ+fnqvn~imP-e;M)Ye8^WDIj)aTC0TOZUccvlTT z=#Px~&{v|i8XOyWU-&uj)Ac9#@h1E}-Ozqk`oG6_smq#ZOk%09BN7_H`$huJH7p1U zeKsQ54TPzvJb{%N7l$KB+BO)q1nN?ybiv-Ir47oT++brd!{UHey{W2GN@D#sDtfLv zk%s9RiUE$9qs^9PDT3JVjD-@9WgO=lG(rtOuQ~^*oY++yHMZZmfB2B0gg@1Ut(xwh zstDee%gy4zcY9|^e>Qrv3(BmnhDIhEh)Ar)r~`)BE7b|gQUBG^xQlaZN<3={<%=4G zCWL+oSYN2xpB(s|UnzTp&;oWUY6C@?0iqN+_^!{mZ}1FWxXG?43d2uPk%X7{Plz$0 zbZiC?ZBD!Ce|J6#qJ0 zc32Ag(XJ6{)?Y>(adBg^=I34gXXiD!?F5~`;2c|p^T2OnAs&^g3uT{n-d;o_J~^Yd zz)9XbX`mtY0x!|scf_&!zLvRO5coM#MXr32B+S`ffFON^?y#o^*OE50Yx8@cZ>j0n zxh5Q#Al5UCM6=(h@arjZXD+Q!u^0egt&@TdAFwjNE!3FI^oN~NdWc}J;+D?E$ccM?H0yuOGV?*ND&sjp>kA1NO z=Vc!!H1P(-UX&mcbsGtjBUGoif{p++5hj1S;on_U7W@JBV}9d*MwkDPX-4=DzedgR zhlLNo?61m)ZNuK)yn?4^^OtHNS_JQbt3474&!*vXnRw#kXFe50{|=;GnzKM$)0_*zH;lvpjIwRdb<&bJe-z_Kxe$bhSzVX;x&4Z_8!7iJc)x*e{idzPvSNj zS~A8TJQ+TJ{3$cX9~LAKiB#?sL^`Mi>CVf}+X+38nJ^&7wU~u2$E?@Dm6ZYK?6gDY zzmeW73S=Dq`N581iViSUc`iu?*f`~D!=0LB#~qNr_%SnI_gIn9Bq%OGES(w?GBOB6JnhJxQCBs3Oetgq9Irv0;zdywXIcqkB zywL1_iM9Tz+Z!(0mhQjX?h7TDZ98Gqm9Fnwu?aeO8k~1M(oqylLp(+IR+KO{RGI5A zQA6k!aQwXFrW@(>dVK4wihg=*Q%p~9)B-kk87Ppi(_FB#`42^oJe`X73 zI?qEoKA~-RTLzSZ9YfdTB{QkSX*#6bRFn38GAG7RWHBvi>_>bx|0u2V^5=iJW=6}F z6K}1~rOE`I+IrrZHTr}O5xnxsX2se_k)I*dnCGa`<0?r)HnXGZ*+&hUEW=B``H$*p ziWHBjjcEZLYu~oziP+A4D8go@bsuRena*qRRsFX)60}{cj~;%F$k;ET46*1l#sDOT z`rgyGak3`J;!juk%;wBAr)R}!Q`5DVSz0f%A%-alk~8N@p{VOy{X-iwX&8Ku zyBRua{J(IV2JUfGE+WW91c>|-aJ9Y=O|dR+6(@I@_~W8h;0_|y1O-CG@0dNU6z^Z3 zInkO_ARM=(0DGAlKG%jYKQ31UH_BT<6 z{J&?OyMxczO)L~4D$CpAyQ)MqX-#`-BIMo8da47>c07!VKDm2FeBr>9P=1GW(|@^a z-}%!`A;!~QDA`VB;8WT~b8U_1>}S6z@~ItuY9|vfM^|$V2fo9OiXBpce1fySf-BC) zV>$03$6%@F*K!5U3hOpl?X0H>D>q< z^31NKqd)!}$^YJq7ZmxKK%o#tG(uaX*RRt+_G6C^uyH?ST0}-Tg<|SFTUmw=m=t-Z zR9bc29G017;k1~wqxP<=Rxk=FRStLqV+(xm?97U2F+$Qv_m)L*m@furA|?UKR#J}dA$4ebI=aj zMHn9*3$C;pH!nPs+lb3TBxe}O<;2XR1{R7*z_MsDmR9hk{A{x?Ia(H9dk~_u3niyl zO~EN{SqhC(M|-CNT2y}s>Gz#peUC|c0A1ovn;-_KXZ{-%v4MBb!o2s(kzRZS3E5cj z%DWA(%P#S$)VNtqjZIjsLdZ`GS-T(M6M9Y*Qdo!KvsK=ft zOJn=5?=_lxC$Ti@H4nTZZ3)-#Mm1C>PEl8FxN@VG={ZFcxdRpv%ntZsOa;}1uelAu z7vWIF*Fp#;c`5T|uB~rU}8|2J%%bZZW8UyC|4aUDn09 zjUyHh`NbUxU0oP#WV2KE49p}7!Meb47N>^(i6mZl; z9avon40>6XMsyo7TQx@omLLxsSz6261|Ex+$S|G}rz9_u7g6CcjABX%A-*3p6*-CY zGXX(M-QtRHwRIvSB{@VkYU}4<*t(#`=9j90Nt)h1LGH zW5`~g8bdUwB6@AtIjo;jUan3YX)W{MjY~qU+e8>n39E1Lan^$&NXC+`orrjwj4p-~ z(nj=AKlU3X8t94?^VtOESt5R;HH#x9vipY)%dvrJyT#%wX1;b4;~y{3pBv9X`<6~o zkYNl9-){Se*RqanrneKxg%7(wnmFBgL}>{g&J!}~n{J>GZF~!LyxuZ*)*suO+G4|k zkS5Vu`11*F7QLu@CL`a4KX-Fv&*@>OP>N z++x;Nt~hvY(F8egBXS_)q0M+bim9IM(BgQ;pfrRf6^OJ&^^Gf~O`R-%F=0fGEx~4U z^Wbz=9Cmlt7s9pQy+V6)(ptAeaV$rnd{=%`rkl#Xr2##@odVLsI4JCpC^TSL`U z5|fG8Dusv%4T(Ey5xgURgvkdPqVpa9qIjQ)l`SduBCuIH(7_8e5ynV)w*Rtt zsA)B-9n5q>#fZ^9v>)VfGAy`yq2T2yw3e77Qg?XMAUc%qD69aTjP1ui9X3d zm)fZLIK~A@osi2uAmzBTA|kVV99$h55El)sFu8U+zTn3ZpczfvsPn=doz(g1>93!d zMKQbhR(JIjf}IF8UdRqL*Be2gC7chx{M!K!XVdCwh&V3{uo7uG3WV{#p9CuusOV z_tN5v8#b0BA$bzW0num;H@cZIJRmDHN>_y_F@>swzWmg7`&~a6PPO5@Y9zZ++4YOQ zhBEkuX1n2r6)GUbP8^G+%Kh&+Q5pYkV10Az#ChnX6-zDbk542sueY86&yXie%AEn7 zELWs&BLsNfh2>^2`<6!hGfEGf}wuF8t6F|(4^PcH_%EZ07vNQ`HeK5Ql`87Cy-tOP|awgX}EZEH~4 z+)<I^_!QxMLAQap{3(W)a0%Y zdhz+|C1E&h%wWMZw)o#*W6OJ65!5~V+RL6&w}9=i{GN8iI0T6u^Tmeh6GnCX^ZtQF z9UfVQRN4^6Z$yk6G%u`Wo{YuW*jYSLpSECPhfX8|B`0FElTjs!{i`;gULqf6q8j&l zk$O||5tE;NcNSZ*1cmNa=edF|#DfS>P0nLqe$h>ru7S5#q>MTmcg$rI#QJJ<#hX!lk6f5*Ci5;1{{sI zBWWX?5|7Bl$zNvefDVr73w$q8Mp%ySk0=S6pyyw+B+YI!TbFJ^5qE2WjmP0kK?xr@_)5d4p&Jkbr(OQHYmbpW92 zm>RIZW2paNCmAI93p+~-tyehyi$8ZQ(!*wU?%?q^$;uRVN21GIO0tlHwAIg3AQnE2xq~0n zGH$@xA?+@)aOpNVN!4kCLu*QR^%pkAxG*oedJpYj?x7R6%4Z6$W0y(?7JEmFEV%!g zEsMEPPWiz<5wiTN9aRN?l*k;s^gC#C|DW&#ekmi^f7DN;OKCf*VodPCF$Q6oKVr>Z zx%gNCy`l#ucBjekK0R<^MDy>?5f)WLk^31(9;af_uMLY)udkJZw6wh3nTgq#k37wm zwYNg+cxPz_bbHz$;m8B2tQR`SA?Su+{_2^MnlNnK(Qf@w{#`a*|O#Sr5 zJ{xTv;PAQf4!m7T@p}1&fI{ZWGQSJaA5EOPCiz=}kyqVhaiEDINwOTTgr;*pvs=6b z1H;9H2_lwV%s15bjq4I54xJIlN(ehF8OwCRebTC5mzgcdzXl7<@2h z-N!gv$QKK!x;t9&B^pXS$O=!{TxCL~Ke??a(b9`;1 ze&I{bMzIsT$UAU3YT~=sIS_4Fg-X!pEZIk3^UQV|pDGMYo^gm)*qxThb?aoA+R>9l z>SQj?Q)*EpnDn**nAwrCzpQUZ$RA-Y&O`lYWcm^b&qnbpR5Gx8+JVq5g8hEwH~U)- z;$kBD9h1W*$(_Fyqh1#XyvRdqzzG4_P{xb*p#*;Gt679q5uBe{_$iofPts_l%Q{|5 zWBu`jwcOxRkQJ|VxQ?W{S~RcwslJ=FnkROEt8jYajec>)W^v7)^A zS_dy(*hngpN*Y1Ca>qMN zd>rh0AdXGBd6OP6!y2^ff@sFvJ1Pt;aqvGM*N``aTNJ7ERYf0UvB}>VT~CwsKksnB zegj1NX_`77-&>2_7}3zBQfg+GutcMx;0^giiwLGY4643xN~?63(G>d5C0dK1%MdAW z^i+Y0n*PwAB8|$aY|_2F$m56baz$^ZZ zIiJze|LS=A6ut4<$}cV_<5 z*HneIKI4;#?uGb7&q6rn-WS;1C{OAhGSvS>P|0856k#T)c5~113v|=MTT-YYHdS3ZnRDl^_`zSUB_<$EsJYjl?M zvgB#Eo2Pm)-oUnFT+Qn-ss8c-+rLJQZgOUc2M+>>ebVyKZ9sMo#T0#sq-w-U> zhqaRWO}w>sxxVT5jaK8PH|R~e7NVUE(R&e$#zr-stR0Yw3>HoX96s9sh*N?NW5tm` z`XrlKubX0>?tF{_*%CD(E>jGAgX8>4?)qG7kWL>S(S=w2NH_^&lnaVL%p?&HlkXy2 zT{d5Ov4e8>KT^lN1=y}dOt|{h0AFqb;u@ANO>h=?lrG0(GK0sC){@W zNIOr%Ve`=^3_W4tKXlEd&b<#6(D1EEtDY#bc}<-|E>(`&um7%V3n;pXu&zsyWrlbU zjsK%0A@1>LZ+C3q>8+H<-Sn?!mlqIPVI^Uvr51;X-Fi=VZ{!94dYWVZ1^k7*ESE}C zeIGqeB@rfj4G#(x23!>^JjCwGUp>o9W{9s96iE?JtR~%ypH^%Nd;AZKzRtrH_S08I zrl`#ZpH2{n15InhpQ&W4YN(@cFSOh(K;s*KoZL#hvzbjoHw=?J34_WXbSVH)9;Q)b z^0T9Ay#n`vLT_BC=sh!jd*LE(o*R+3pt$C)r#&ilquh64_tali`gtq4gg3`tYFjO? zQ+V(eN_#VGldx=QF0-JvP`2Vi7%v?7Q{tJe^`cd2SxHpRnZlPwab)uyrx6DW9`wYF z&Cz;bA6|mB(XuN>9CE)6wyjQPJg`rPC(90QpQ&@vM8)@3{@7VV^`b%Gs2PQ_qw;T3 zvvn~vqypqhAZUKRW)50=9Wx6u#Jn=S7)wFFVS5by4HAh-3wf81v8{r<0Vt@Uh`IPf zQp)$d(g%a7+WUk@v1n(a|cF3Qhux&$h1*2KurVEvbk-qW^{up+9#$H$N9(Ob8#P1LOmpQ#^W*~gjm-WFW3 zhSaInAZAlD)I$u31xKO9>cN>M$Af7a`tPy4bXW;P>phWc55l^fAO=LY=QD=!90V)D zbG7(J-uQum1i!Dtv_L`SP$>(=7bMIlAbZNMzmQBhmbfl1>w>=UAStZhw?p-dM+~B! zRBfAHAD4O1k~_(r-dVY#{jtdG9`Tv`qW14fheEwd+D=*~miVK8avq0}&}GHI93Q1< zKDxPW%|y-KMWXOOu>td5-#0`il!<;Za9BL4c;MlP+wM%C(seF5H|x-tt9z zhA;;+%}l1`k-wn93C1-Y)_>S!{ouSUc3xR_DUc(Uf-Gz{va{h+H$e5KI+x7c``|cI z#?iY$Z)Yh#Jh6~lQQ(;jE4>@yDa(-C{BPMC7Ybis%hSbuTBx_50Zf>#n>;6jfP`%s z+@7tD|KpF^;{XF0W91`R-V2Ojbf7QYHm-AFd@@JxI92WKAQn!v6M3?YX35Z6LC4@P~zPdhCoa3=IXulDS>Xxt0>B?xPl)pFfWwgsWQJzHPN*WLEMMk(4g0 z5I#Zc&U5^+}f1OSB_!QJ4 zHMh}UDH^>hOb2S=F-%f@4?4LI5n4EFHJMA#J~>QUEmPlm)%Z8Tsfen@5tF9DRc(6x z<~Q{4S#D#(lLv@gPemOCjiEWdCK!by-6pNBxN1vgZq< zpPOJ4cwpl^CdAu|c8^2&)N0KOmo}aX0E9v-bK}Q=^(r}%8@WrPr%5bIh1<2Qdhv%> zAtmQpF-xAZ7lP$0nwG}#rRw~eYEu+Tit8;{dB&B?S9`4As(^BBAuUtX=ye~Co7Cms zSs&846{h(kENn=`x(s)Xw6Hj*#U?Yy__#wuv3`7It?V`ZyM#1OyZUet{h$;|*-L`C z-NqfZ;0{*%*WLQ+N65^=1u=vT)FeoY^YfHG`yl(>6N#Ahrat&k5?)gUE6p;#&8O*R zETxVOyjaj7wl4!uiQoq)Hxeazmn3=JNfVACs5_rsqT-&VX3)KFJ?Fw`y{E+I^C_LFeZB)!qqTg2@c)W#*BaHhUH{<2!s(z~u+O+RQSMw&qq zI}ciW>Q7Z8pmueIo~Xsfd8OS>LsaNU%(E*-&VOUocSQk=iXB(uCBu%$ppu%as5R+* zVs6Y0-aR5S*plz8z*<Q9|TQRC}PADx1|%IvZTmo{zhm(1%rCiztFtgV(j} zcs?T)dnEVV4JDpqHRLH@qjCf`iIF1e;`!joE;BNdMk5-|{ISFm1;M1)+st>IUE@yE zRM7LF(7DcNT@aP{aZ9HLsu%sTWtW1EjN{6;;o-zCdPNr(wPI$9mQ4QM5ZSzjzE#>e z$p-O8(qjpdjA8c#J5G00WI9WZtw)ZbI{WT44$IWSG`mKIoJmNg&1uAUA!1IvqS*(r zurWSt641E|_IN}WTkVKJc(rHj4!w&(2Hs<|<9Z#e=VL})K2^}M!85zS@Byy6EhE4M&2AoUj|jj7XD45} z#D3BD4lag&j{qSBKQFv;(15w;SFpZk6KBsQ6OFm0$IqCN7w|BDo@76|63SS+z3{q- z-nB&866NX$x<_&bXE2?J@BX9Kc{IAc^Bvp{TgI7%Fu7zIn#aYJF=#fT2Pk)zX5ra? zwLI?XNm#ZuO_q82vv{3PfQMaHlRoT`t{aYTU>P07i_Ff+EZBKG%m@aBPho-C|XyO$THO!Bpca9Y3>_KA8@nYf#< z0W4{_ju$y*N=?Zs)Q{J*$1>RcHSHOFhk7qb<=2bXfD_6R9v!9vDb0gI*1|?~=NxgV zef|ao3pHq$8XA;~rGD|~83?&URfA5Z{9RukAQNW$exXTvMlsQn4Xs1g6r+f_CDzdr zIoWQ0vPF82MvEj!i~7BIa^pvrr469J-q5As`SpdB0^y4u^`P6D>yJrUVQuI3S~GJN z?y9}oO*rCsj6~f7`$JZ)RsOLj$!e(e$J#h}J9Xl5i`I(IneObbjYO)AjJwA8?x7{| zTjZ)CEsBRXs@X<8(2oEi*jF+#CDzm|A-~l7Brwu7*-5l~3g|DZ5p!O;sZF45AZVb@ zOtK(#Vqm4QAoq#gB{oR7>1z%fYWI~TZ|lhDH`{OXclSEt;Urn|;WwjXGs`uihpFyD z6BR35A*5)Dx-HH{-RxeDjwE#c>)r=uFR|i|I!R~@F-=@|NH|tes-F0+o&Tu^2=xqJzxAj zx~br7F_HGUCv)Alm1@Ysp`$j*B0ik7P@gGcJCM$s9hdoGF*yIby^Rl;m|z6`XcU|( zDXQ_E@-R40(?^aN*65j1;|n~w*(@m6-AwNC0m=KE(h>C*!~k?e|=(WbLnsha392sbD_ zYp#N?`M+umb$*5DhNlnCEpvijwUdpIW$i%f8tZ>NS;c|;n$g^mWhj?LyhAPpM8h^% zJUL}^P5EA(Dx>~xl{Et`v+p}ZZJ;g3tZqEkPga9^V_%}@ScKJ~^hD|_`Q6r;QOxAc z+XdF$t?K%}KFBFsqtbt+(jdfshR2u6D4QI9EeXn~iYt)drzy2B&${>sa27`O;kkrm z43grgR3wadktj%er~o*(gppxylSRb6#8~fGj~ZBHPUN)`DZpRlM}K=sJ=oOng_ptU+!-Qj+EHy$MQiELEh^AOMU)Wi^siA_ki68RCN7?v_(4f zzP?Xj#cPOV_U0}>$m%ow*6%RiR9&4JE#f5tSYvao-eWjvRN~2mWR%4u#;w-k1D13T zH|BAeL8UCsSysHMFLoB4hDlZLT&PYwljK`SN6sg+2uD$pR z|FZ|JA0Nq4af#4lDkz(y2YwT_ixM%oL-|&K(Vs&Ap1`=vgQw|j^I;ANff;6i|sWxBeFNygu8*SeRv;0qd)fi%HL!?F%P(AAqd5rIHEm0hxqBB9k(0o zi_l-ciPr-)CNV*dL`89-Lg~D?q&t(I{_!`TR~H=rLQDo4rXfPTsXCfH9U&6=Q+zwA zuoPiXzsK63rBVtgQ8v_TcJ-b2P2{PXAiZKK&W|T{e;fD475;pq&vdyBvD08Js;dxi zO}gLMZyiwCc9D`5N{(CX=IBXpJcvzyAiJRVAk&LHn6%%E1FzOL(tP{R#KDNO$%Tc{ zu=tVzZ^IzA$&dZi5q3J%9{(SnGi~sx=Xey75B~ zFxiH~enK8BKN+RZGZDmY0fXOS`@8!rG{FwsNW-q!Ey!cht)YaE_UJJh4^AX8AtW}N zwkuK9kmwC=(9h2B?{BKek<&EerRVRw*ez&z`B~lH_!sqhd%ROY$|AjD1rU$lVL}W5 z%o3E-fsXM%HLfsyTh0V=$XF4flo1OgXKDR)Z8_3y9-B|r0kxk{)0h3SsQ|J6%y>dR zZfwuu_2cM{_73ka={{cHU7G7}xChp!;sT8Me^@+dehlCwy}mR37_iMw*tiR6r8FEN za-e4qQTh(<4@P(Fv;RS}VJ_7Bb&0>^>B0Q_2?aAi!-$Vi_)FrA<39_^E!N#~j%CeD^^#jEFHp`p$qDTN^exr=HqU(bU6L6g6YuS6on6 z1T^w=(SVa+zz4jmh20YQ>1N_l*NW=xyZI&&wwCdt`Fr2?iwQx2fTa|iLTE%felm7;x+B_y>S?uXxO9eZj2jU%=|tos||cg#WlzfFi^bG|#|CseS6HG(40 z8BvHMtS%RnV}vS}^s?PySKr0bBi$uNbH zlhCvQQgX$3XB#?wdq3&=dc61!IWNI2GZ6?~Sz}2X%#N=lwa0DpE0lKmdW7oB$qz#7ePt04u))XnHqi_~-(n1Kr-I?pWZRC48+7P%doyh$Ad1%~6V>S5< za5N1ILSzIvspw@-nBH!S%QI$6@QWNgi9|+dv0Mt)of!1@Y;+rM<7*1I=M-0y{$*(U z+<@eV|KnXQyU~@ZUC~U1`&HR>Hgv@P(p8>(P%NhXVRgWm4;^tua1v?M`09>J`0k5x zRxeyK$`))jY>Q43fw@YSj}HtWk6YM*bYo6jyAwr*d+Soyn-ZSlIn#%>?VWq#$xJ%t zgv#(~Q@Ao-}N>9KwV9B?%a1zhMEwox)8vd@oiw-9jFdHuqF-E^zJ z57dTR=%w+Q2%^=47d^X_v{=oIkA`-E6R;(nbYAlLig zUC*KLa5R`h8G<2RZkUO`WEqBNQJbwszi=PKU3R4u<=X>~{SvOUP*LkBtkR*C7nokq z@bK~}^D|?tB-P12n7pn_Y^di5#3*xy}5rQ%kznkwD+5P9Z&kN8hgbB|r6+_V0 zJXPTL%Q20%FixT@H#-{h>bHxWcQHifSD04k_#C5?ysbhD5d_;aPVOmk>@$#6r2)O6 zh-32_kiCClDqU=R_bk6Z0dleo&10Cc+6BoNQ{*`95B4+s)V##%VKgzb72w<^ zrUf8g!gH9z0&HSYo@X?PcIG3GCf-MTvJw4O>O!j9SWK1wHrE_i4BE$P^E?Da46S1^&5_15?!6eX7M{nUm>lyFlqA}` z6_|_j9rtTCJYRv>7bD*$+<-ZeCP4gtQ9$dn5Y6P%5a=(3Xop1{urX1-Sl#oW1RWMR z7V;cggH?u5H1j`*AxLgUP_1L+z9@!ed4!MysptwQR86GOyc~sZLC$ES3z2(>1vhNX z^HdQMsNoknTF6(Tk#h%)Zdp$M)Q8xWdXLKl^fSou{0oIc3nX=Uz;NP^&~$|janFY! zeNfFJBcm8MK^(HXaAF-@;22HfgU;tB?mvjeu${43SKt_>J=p|5m}1ZS=V&cvuyF{B zV$W;_W9gzI$9;?m@+ih#7_wwxQ4y@}1SKdEEH*B?jd^_LB`5lCbJ5-a!I=)Qm=E@x zS3~=^=o&7?Gz$)D{AH-KFUP6$3U>die0Id!bN(<`h^eC(k^zs?Xg4Alf?y~r^=_^e z#8K3H|8)UKhwywFd?K#=?x7_h=^IjH0W=YXldMF%XA7Hgcm?yJHNe7{U;&L%gR_|H z*9X`*csC+`Sc8p25bc+mGjHJ+_ISkimBh68Dx|jBbT#-pm%f`2~3bguv{-U3201l9OIQRTkQ z!s#azTSKVGH69^nLoqaw=b|IPu|insheT%-!xYRZ&(U`-q@dW?9_m?CljH&^R-a}X z&$8G8@FJR^bpzbPmS_ly^?!YU+DOSFCdjDKWRzqGidXpEt^tl;3+-N%p}uo@HWMQ{ zUnBD>h&E9mXhUO2z?Lpzit=J5<79Y&W9qoSAR1r`i%4M!N-(6+Mm$D7f?}Gdv+z|B zb~E#FR4s(fi1zRkE)G5{w~`m4kh(jG4SFpIL1O@o%QpC+bcEb3-G_$g#3IL?8&YsC z#MkDa09ks!#{b%%VIGdrwhOx+wo!CeO4H41LE8jg1Vtj7K{SSsst<}zwp8f;QV8-wBu)E{=wsey(Y>67@KJWjs}N3m^P6Lh zByB>XxUb_`eOne`X z`39sZ$b$SLgyGki+3q6rT}P#Sj&XVj`Cv|mWSHk3$F8`YoGG(8-@%yJ7P6Rc&-w0v zL|w$#c$RUi$xk<9F3lp{RxZjhrz{FMvr+YlR%_bI=&#=%Z470=y1)>wCuu$*9&bk9rz%~58 zCBo(|c7(eiknZ*DVw*7s9bn{X`3S=F2cLURlTq?OG%qQ3k$|>qc^MXb0WBnFr$xXHUl%%Y}CD`naTLF?7&ayvU;Vx`(_p z^Q`~wlLXEWqe)_B*5X-!`S5D)e+C3$cpkHe)}A!w+1V%f{zA;OW-`PU5)SUhTsH5u z3m>A1$dWe0A-IFZ`%e&@QIrMvgnTDv=HmoyI|&s(2Iy{|yh{f%?h46<(8#_#SC(zL zn>a%vtzo(`#B_})Pihf6)VMljpb`{|%3wOAqgY5|ny~9e5_HufE?@yXCg!$jQV@me zSw|FgM^FK{7N8w~<95iL3MqKFz~)5bQWm*=JvF)fur}oZMj6C^6`O)XnJ;IsA&DEu zLr~^GhTdna%%UwHLYm*GKwF9o2w% z6pM1ugTKm!Fy42JL~xCy-5!f?#2Gc-(~E1|O!5yF(FHhF=Cl1T#CITQ&Y9H}m*Nj} z5ybCJ!r%v?ty&+)*HbD?PK0(mNSiFmhl{3c*MPZ|EUJgaICuA&UabbjA}Z{J1MCE} zC%Rhi<2X##I<)ifTXsaOHgGUKZVM@CfTS)W3hs|KL0M%Gvj#Iu;1=n;nNn~?f(lBaMol#0PBbcRQAADn zqrpTCxFw>9F~$uA{oxvZm`GG&Xy2Q%4PYs>P$(dR&{CkCt<&i?-KL$H=Q%UapxF0j zd+)w;JNG2#Pct)jdcL{$o#i{{N)l(HEtXCVRbMgV_sc?}pX;Q&}hngp!@ z5a&mg^UoDX=@L{XTm^>t0koeGSVr3KSLN>mm1R>(cZaF&tHBT}iS4eOcOjk(LDe&} zbe>;Tp6kJ@Q#b@`G);k41**%g8?%75tgaXjuJ|%ecUUgZ!If?6({5 z@Q;PZAYdnJ6rC9SpE*Ak%O(cAuFWL?*vYzy+c3hfxMpX5fh7mpKiUl^%_ICAjXr6d zUv)3m&wZ`LHHFXh{i~*)PTR#_mX+TvGT zSI~>iO2ca`+Usmn#CWSc zC_G`!{Mc;ux-W&IV@MdkXpID_T~{&z4c%Jwkc81K)8lY#dh89ZcV2gzP9G2kw^r+I z4bmZy{8Sj(CROB*?5R|H<@@ydlQ6Pf=`qFipw(`_2R^t%7}s{~45||D6?h5oEoS5o z95zQVJl9i+L5&CL+OvS=^R6;4(AuixYgxx^T55y~;JWv{!q!pAhqDQ9_=UA6m5fKY z0IqY_^Q^thRk?u%ym%*wK7B{OArD$&D5M3~UCEqm8}yb>&1JX!;6&^atgc9VZ6mS2 zj9r6~UTwH%k1d+$KW4h_fd5ymeakJ5#C6zcVhS3z5jov86W#fgp#kGvJ8fIHd+*DJ z>kfug$BV9!-!44IjKun!(^-Saw)+hYIMUZ-+qyjmml&?w-}tc3G_HQ@XKQmKJ1*>!}HlIq7Ve zrww&%$r&)LqT`MYZJf??W602$01iFLe1QvZoWVVCd>)mM)gS3^Dg3BR4#82mEFEg_ zdQ@`ioFuJrPM}bVokILMCp?7%ko`bzr9I)m6MTgOd$({h5my}oc zZu`66lEYfZwg>n~d2x|sKKd=Y#t!I;4Q-glL6VtzSqJK3rez%)WT<@|4`m&`3#ntM z4=%q#DrM?I?_WzD>xCmvU7$-Ax(dib-43@6ze<-ZM35Q*h{dZcIijGml)fWh(sJ0m@@*$>n(|egLFqZybKo5^4g1)WPPXZT zUYpf#q^1dBx{YL;RR%b?$dyWC!1kA5f!bQNDL3p*#tw;~$xh zgmTQU#F0=yW5;9MnKF+2UG`aCaAk-yL)gC6s7rDv>_ljg+YmNA1@^NTdq|_)11I25 zV$i516$8fY#rcl+MP7p#?fZXWIoj8+$ZPVS$qXZ9(*vDZ4b#qpjqGIltNr)em<`j0 zX@=7ayP8FnS1^m;pqtbwnnI4`OQ^_yz%XueeO~ar1Nz|60LzddQhN{43nQ*!S#t}u ztgaYe+!ZZ~JeT9<2u{`glr@(k5i0qVfch-C6iHk|##F7lhD==i$4pa@N~ZN1zU>0!dqmTR4@m)oL5yc5f?u}&D*SzJ$Ta8BdtjvFThhdaYL-6O!rS^KcHO`;%rB_S+8 z$*LXjL%%_yB;m^P$-qQ9EWk0;7AR0(E>V=@YdtRLDc>$Y`X9BfmYK_6aFFhk#z7Wf zF$GpMg)|mSwOD3*aBZo_skmnII&R7$?FJ|0VTni4`w>d9B;+&X`ST=j#?L82i6p!aUO9B#0(kkf6w)OG_(pVKe=BpedwY?Nl=n7_I@hG7x_cZ*Ka=HVP z2pHyTrBW5VFkWvo>E|I`g$)?kUm*#}2sWjo6O;ZWtMUl3=T{BnW9MgWbt-j1R~j#J z)jMRJm 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 98947d5f6b6525da5815946a22e7c4e06b93e8cf Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Sun, 4 Oct 2020 10:06:48 +0300 Subject: [PATCH 05/30] Blood Denote --- .../AlHabibMedicalService/all_habib_medical_service_page.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart index 8b04bc31..e0f07385 100644 --- a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart +++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart @@ -5,6 +5,7 @@ import 'package:diplomaticquarterapp/pages/Blood/advance_payment_page.dart'; import 'package:diplomaticquarterapp/pages/Blood/blood_donation.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/BookingOptions.dart'; +import 'package:diplomaticquarterapp/pages/ChildVaccines/child_vaccines_page.dart'; import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart'; import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart'; import 'package:diplomaticquarterapp/pages/family/my-family.dart'; @@ -188,7 +189,7 @@ class _AllHabibMedicalServiceState extends State { ServicesContainer( onTap: () => Navigator.push( context, - FadePage(), + FadePage(page: ChildVaccinesPage()), ), imageLocation: 'assets/images/new-design/children_vaccines_icon.png', From 20ef255ee6bf0834f93ac62b398992c2bd920a6f Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Sun, 4 Oct 2020 10:22:12 +0300 Subject: [PATCH 06/30] Blood Denote --- lib/core/viewModels/base_view_model.dart | 2 +- lib/pages/ChildVaccines/child_vaccines_page.dart | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 lib/pages/ChildVaccines/child_vaccines_page.dart diff --git a/lib/core/viewModels/base_view_model.dart b/lib/core/viewModels/base_view_model.dart index 3d7122bd..d19905f7 100644 --- a/lib/core/viewModels/base_view_model.dart +++ b/lib/core/viewModels/base_view_model.dart @@ -4,7 +4,7 @@ import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.da import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:flutter/material.dart'; -class BaseViewModel extends ChangeNotifier { +class BaseViewModel extends ChangeNotifier { ViewState _state = ViewState.Idle; bool isInternetConnection = true; bool isLogin = false; diff --git a/lib/pages/ChildVaccines/child_vaccines_page.dart b/lib/pages/ChildVaccines/child_vaccines_page.dart new file mode 100644 index 00000000..07031ceb --- /dev/null +++ b/lib/pages/ChildVaccines/child_vaccines_page.dart @@ -0,0 +1,15 @@ + +import 'package:flutter/cupertino.dart'; + +class ChildVaccinesPage extends StatefulWidget { + @override + _ChildVaccinesPageState createState() => _ChildVaccinesPageState(); +} + +class _ChildVaccinesPageState extends State { + @override + Widget build(BuildContext context) { + return Container(); + } +} + From db19eec35f03ce48574fb3ba2e0788b21087452d Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Sun, 4 Oct 2020 13:12:31 +0300 Subject: [PATCH 07/30] Blood Denote --- .../ChildVaccines/child_vaccines_page.dart | 430 +++++++++++++++++- 1 file changed, 429 insertions(+), 1 deletion(-) diff --git a/lib/pages/ChildVaccines/child_vaccines_page.dart b/lib/pages/ChildVaccines/child_vaccines_page.dart index 07031ceb..cec04f12 100644 --- a/lib/pages/ChildVaccines/child_vaccines_page.dart +++ b/lib/pages/ChildVaccines/child_vaccines_page.dart @@ -1,5 +1,13 @@ +import 'package:diplomaticquarterapp/core/viewModels/medical/my_balance_view_model.dart'; +import 'package:diplomaticquarterapp/pages/base/base_view.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/input/text_field.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; class ChildVaccinesPage extends StatefulWidget { @override @@ -7,9 +15,429 @@ class ChildVaccinesPage extends StatefulWidget { } class _ChildVaccinesPageState extends State { + TextEditingController titleController = TextEditingController(); + var checkedValue=false; + String addEmail=""; @override Widget build(BuildContext context) { - return Container(); + + return BaseView( + onModelReady: (model) => model.getCities(),//model.getHospitals(), + builder: (_, model, w) => AppScaffold( + isShowAppBar: true, + appBarTitle: " Vaccination",//TranslationBase.of(context).advancePayment, + body: SingleChildScrollView( + physics: ScrollPhysics(), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + SizedBox( + height: 20, + ), + + Padding( + padding: const EdgeInsets.all(10.0), + child:Container( + child: Texts("Welcome back",fontSize: 20,), + ) , + ), + Divider(color:Colors.black ,), + SizedBox( + height: 20, + ), + Padding( + padding: const EdgeInsets.all(10.0), + child:Container( + child: Texts("Please ensure that the email address is up-to-date and process to view the schedule",fontSize: 20,), + ) , + ), + + Divider(color:Colors.black ,), + Padding( + padding: const EdgeInsets.all(10.0), + child:Container( + margin: EdgeInsets.only(left: 10, right: 10, top: 15), + child: TextFields( + hintText: model.user.emailAddress,//'Title', + controller: titleController, + fontSize: 20, + hintColor: Colors.black, + fontWeight: FontWeight.w600, + onChanged: (text) { + addEmail=text; + model.user.emailAddress==addEmail?checkedValue=false:checkedValue=true; + // checkedValue=true; + // print("First text field: $text"); + // print("First text field:"+ model.user.emailAddress); + + }, + validator: (value) { + + if (value == null) + { + return model.user.emailAddress; + + } + else + + { + return model.user.emailAddress;} + }, + ), + ), + ), + Container( + height: MediaQuery.of(context).size.height * 0.12, + width: double.infinity, + + padding: EdgeInsets.all(12), + child: SecondaryButton( + textColor: Colors.white, + color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,), + label: "UPDATE EMAIL", + // + onTap: (){ + model.user.emailAddress=model.user.emailAddress+addEmail.toString(); + AppToast.showSuccessToast( + message: "Email updated"); + // bloodDetails.city=_selectedHospital.toString(); + + // bloodDetails. + }, + + + ), + ), + Container( + height: MediaQuery.of(context).size.height * 0.12, + width: double.infinity, + + padding: EdgeInsets.all(12), + child: SecondaryButton( + textColor: Colors.white, + color: Color.fromRGBO(63, 72, 74, 1,), + label: " VIEW LIST OF CHILDREN", + // + onTap: (){ + + // bloodDetails.city=_selectedHospital.toString(); + + // bloodDetails. + }, + + + ), + ), + // Texts( + // // TranslationBase.of(context).advancePaymentLabel, + // model.user.emailAddress, + // textAlign: TextAlign.center, + // ), + SizedBox( + height: 12, + ), + // InkWell( + // onTap: () => confirmSelectHospitalDialog(model.CitiesModelList),//model.hospitals + // child: Container( + // padding: EdgeInsets.all(12), + // width: double.infinity, + // height: 65, + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(12), + // color: Colors.white), + // child: Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // Texts(getHospitalName()), + // Icon(Icons.arrow_drop_down) + // ], + // ), + // ), + // ), + SizedBox( + height: 12, + ), + // InkWell( + // //======Gender======== + // onTap: () => confirmSelectGenderDialog(),//confirmSelectBeneficiaryDialog(model), + // child: Container( + // padding: EdgeInsets.all(12), + // width: double.infinity, + // height: 65, + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(12), + // color: Colors.white), + // child: Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // //Texts(getBeneficiaryType()), + // Texts(getGender()), + // Icon(Icons.arrow_drop_down) + // ], + // ), + // ), + // ), + // if (beneficiaryType == BeneficiaryType.MyFamilyFiles) + // SizedBox( + // height: 12, + // ), + // if (beneficiaryType == BeneficiaryType.MyFamilyFiles) + // InkWell( + // onTap: () { + // model.getFamilyFiles().then((value) { + // confirmSelectFamilyDialog(model + // .getAllSharedRecordsByStatusResponse + // .getAllSharedRecordsByStatusList); + // }).showProgressBar( + // text: "Loading", + // backgroundColor: Colors.blue.withOpacity(0.6)); + // }, + // child: Container( + // padding: EdgeInsets.all(12), + // width: double.infinity, + // height: 65, + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(12), + // color: Colors.white), + // child: Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // Texts(getFamilyMembersName()), + // Icon(Icons.arrow_drop_down) + // ], + // ), + // ), + // ), + SizedBox( + height: 12, + ), + // InkWell( + // //======Gender======== + // onTap: () => confirmSelectBloodDialog(),//confirmSelectBeneficiaryDialog(model), + // child: Container( + // padding: EdgeInsets.all(12), + // width: double.infinity, + // height: 65, + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(12), + // color: Colors.white), + // child: Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // //Texts(getBeneficiaryType()), + // Texts(getBlood()), + // Icon(Icons.arrow_drop_down) + // ], + // ), + // ), + // ), + // if (beneficiaryType == BeneficiaryType.MyFamilyFiles) + // SizedBox( + // height: 12, + // ), + // if (beneficiaryType == BeneficiaryType.MyFamilyFiles) + // InkWell( + // onTap: () { + // model.getFamilyFiles().then((value) { + // confirmSelectFamilyDialog(model + // .getAllSharedRecordsByStatusResponse + // .getAllSharedRecordsByStatusList); + // }).showProgressBar( + // text: "Loading", + // backgroundColor: Colors.blue.withOpacity(0.6)); + // }, + // child: Container( + // padding: EdgeInsets.all(12), + // width: double.infinity, + // height: 65, + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(12), + // color: Colors.white), + // child: Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // Texts(getFamilyMembersName()), + // Icon(Icons.arrow_drop_down) + // ], + // ), + // ), + // ), + SizedBox( + height: 12, + ), + // Row( + // children: [ + // Container( + // child: Text(" To view the terms and conditions "), + // ), + // SizedBox( + // width: MediaQuery.of(context).size.height * 0.10, + // ), + // // InkWell( + // // onTap: () { + // // Navigator.of(context).push(MaterialPageRoute( + // // builder: (BuildContext context) => UserAgreementPage())); + // // }, + // // child: Container( + // // child: Texts(" Click here ",color: Colors.blue,), + // // ), + // // ) + // ], + // ), + SizedBox( + height: 12, + ), + // Row( + // children: [ + // Checkbox( + // onChanged: (bool value) { + // setState(() { + // checkedValue = value; + // }); + // }, + // // tristate: checkedValue==true,//i == 1, + // value: checkedValue, + // activeColor: Colors.red,//Color(0xFF6200EE), + // ), + // SizedBox(height: 10,), + // Row(children: [ + // + // ],), + // SizedBox( + // width: 10, + // ), + // Text( + // 'I agree to the terms and conditions ', + // style: Theme.of(context).textTheme.subtitle1.copyWith(color: checkedValue? Colors.red : Colors.black), + // ), + // ], + // ), + // NewTextFields( + // hintText: TranslationBase.of(context).fileNumber, + // controller: _fileTextController, + // ), + // if (beneficiaryType == BeneficiaryType.OtherAccount) + // SizedBox( + // height: 12, + // ), + // if (beneficiaryType == BeneficiaryType.OtherAccount) + // InkWell( + // onTap: () { + // if (_fileTextController.text.isNotEmpty) + // model + // .getPatientInfoByPatientID( + // id: _fileTextController.text) + // .then((value) { + // confirmSelectPatientDialog(model.patientInfoList); + // }).showProgressBar( + // text: "Loading", + // backgroundColor: + // Colors.blue.withOpacity(0.6)); + // else + // AppToast.showErrorToast( + // message: 'Please Enter The File Number'); + // }, + // child: Container( + // padding: EdgeInsets.all(12), + // width: double.infinity, + // height: 65, + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(12), + // color: Colors.white), + // child: Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // Texts(getPatientName()), + // Icon(Icons.arrow_drop_down) + // ], + // ), + // ), + // ), + // SizedBox( + // height: 12, + // ), + + // NewTextFields( + // hintText: TranslationBase.of(context).amount, + // keyboardType: TextInputType.number, + // onChanged: (value) { + // setState(() { + // amount = value; + // }); + // }, + // ), + // SizedBox( + // height: 12, + // ), + // NewTextFields( + // hintText: TranslationBase.of(context).depositorEmail, + // initialValue: model.user.emailAddress, + // onChanged: (value) { + // email = value; + // }, + // ), + // SizedBox( + // height: 12, + // ), + // NewTextFields( + // hintText: TranslationBase.of(context).notes, + // controller: _notesTextController, + // ), + SizedBox( + height: 10, + ), + // Row( + // mainAxisAlignment: MainAxisAlignment.center, + // crossAxisAlignment: CrossAxisAlignment.center, + // children: [ + // Center( + // child: Container( + // color: Colors.white, + // width: 350, + // child: InkWell( + // onTap: () { + // showDialog( + // context: context, + // builder: (_) => + // AssetGiffyDialog( + // title: Text( + // "", + // style: TextStyle( + // fontSize: 22.0, + // fontWeight: + // FontWeight + // .w600), + // ), + // image: Image.asset( + // 'assets/images/BloodChrt_EN.png'), + // buttonCancelText: + // Text('cancel'), + // buttonCancelColor: + // Colors.grey, + // onlyCancelButton: true, + // )); + // }, + // child: Container( + // width: 250, + // height: 200, + // child:Image.asset( + // 'assets/images/BloodChrt_EN.png')), + // ), + // ), + // ), + // ], + // ), + + SizedBox( + height: MediaQuery.of(context).size.height * 0.15, + ) + ], + ), + + ), + ), + ); } } From 9ab0d6688827fe1c7a67e78b8b4263e94acd7639 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Mon, 5 Oct 2020 09:17:38 +0300 Subject: [PATCH 08/30] child Vaccines --- .../childvaccines/child_vaccines_service.dart | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 lib/core/service/childvaccines/child_vaccines_service.dart diff --git a/lib/core/service/childvaccines/child_vaccines_service.dart b/lib/core/service/childvaccines/child_vaccines_service.dart new file mode 100644 index 00000000..dc317a3e --- /dev/null +++ b/lib/core/service/childvaccines/child_vaccines_service.dart @@ -0,0 +1,29 @@ + +import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; +import 'package:diplomaticquarterapp/config/config.dart'; +import '../base_service.dart'; + +class ChildVaccinesService extends BaseService{ + +List BabyInformationModelList = List(); + Map body = Map(); +Future getAllBabyInformationOrders() async { + hasError = false; + body['List_BabyInformationModel'] = false; + + + await baseAppClient.post(GET_BABYINFORMATION_REQUEST, + onSuccess: (dynamic response, int statusCode) { + BabyInformationModelList.clear(); + + response['List_BabyInformationModel'].forEach((vital) { + + BabyInformationModelList.add(List_BabyInformationModel.fromJson(vital)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); +} + +} \ No newline at end of file From 0e4ff1f804c5c0b7c9229b43eceecbc48d33055e Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Mon, 5 Oct 2020 12:37:24 +0300 Subject: [PATCH 09/30] child Vaccines --- .../childvaccines/child_vaccines_service.dart | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/lib/core/service/childvaccines/child_vaccines_service.dart b/lib/core/service/childvaccines/child_vaccines_service.dart index dc317a3e..d614f9a5 100644 --- a/lib/core/service/childvaccines/child_vaccines_service.dart +++ b/lib/core/service/childvaccines/child_vaccines_service.dart @@ -1,29 +1,30 @@ - import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; import '../base_service.dart'; -class ChildVaccinesService extends BaseService{ - -List BabyInformationModelList = List(); +class ChildVaccinesService extends BaseService { + List babyInformationModelList = List(); + List userInformationModelList = List(); Map body = Map(); -Future getAllBabyInformationOrders() async { - hasError = false; - body['List_BabyInformationModel'] = false; - - - await baseAppClient.post(GET_BABYINFORMATION_REQUEST, - onSuccess: (dynamic response, int statusCode) { - BabyInformationModelList.clear(); - - response['List_BabyInformationModel'].forEach((vital) { - - BabyInformationModelList.add(List_BabyInformationModel.fromJson(vital)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: body); + Future getAllBabyInformationOrders() async { + hasError = false; + body['isDentalAllowedBackend'] = false; + body['IsLogin'] = true; + //body['UserID'] = babyInformationModelList[0].userID; + body['UserID'] = 42843; + + + await baseAppClient.post(GET_BABYINFORMATION_REQUEST, + onSuccess: (dynamic response, int statusCode) { + babyInformationModelList.clear(); + + response['List_BabyInformationModel'].forEach((vital) { + babyInformationModelList.add(List_BabyInformationModel.fromJson(vital)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } } - -} \ No newline at end of file From 37b817e0c8377156b60314a2e2c0b41d82145386 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Mon, 5 Oct 2020 16:02:20 +0300 Subject: [PATCH 10/30] child Vaccines --- lib/pages/ChildVaccines/child_page.dart | 129 ++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 lib/pages/ChildVaccines/child_page.dart diff --git a/lib/pages/ChildVaccines/child_page.dart b/lib/pages/ChildVaccines/child_page.dart new file mode 100644 index 00000000..e5a5058f --- /dev/null +++ b/lib/pages/ChildVaccines/child_page.dart @@ -0,0 +1,129 @@ +import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; +import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart'; +import 'package:diplomaticquarterapp/pages/base/base_view.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:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class ChildPage extends StatefulWidget { +//final List babyInformationModelList; + + // ChildPage({Key key, this.babyInformationModelList}) ; + + @override + _ChildPageState createState() => _ChildPageState(); +} + +class _ChildPageState extends State with SingleTickerProviderStateMixin { + @override + Widget build(BuildContext context) { + var checkedValue= false; + return BaseView( + onModelReady: (model) => model.getBabyInformatioRequestOrders(),//model.getCOC(),getFindUsRequestOrders() + builder: (_, model, widget) => AppScaffold( + baseViewModel: model, + body: SingleChildScrollView( + child: Container( + margin: EdgeInsets.only(left: 15,right: 15,top: 70), + child: Column( + children: [ + ...List.generate(model.babyInformationModelList.length, (index) => + Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + border: Border.all(color: Colors.white, width: 0.5), + borderRadius: BorderRadius.all(Radius.circular(5)), + color: Colors.white, + + ), + child: Column( + children: [ + Row(children:[Texts("CHILD NAME"),]), + Row(children:[Texts(model.babyInformationModelList[index].babyName),]), + + Row( + children: [IconButton( + icon: Icon(Icons.phone,color: Colors.red,), + tooltip: 'Increase volume by 10', + onPressed: () { + setState(() { + // _volume += 10; + // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + }); + }, + ), + Texts(model.babyInformationModelList[index].babyName), + IconButton( + icon: Icon(Icons.phone,color: Colors.red,), + tooltip: 'Increase volume by 10', + onPressed: () { + setState(() { + // _volume += 10; + // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + }); + }, + )] + ), + Row(children:[Texts("Birthday"),]), + Row(children:[IconButton( + icon: Icon(Icons.phone,color: Colors.red,), + tooltip: 'Increase volume by 10', + onPressed: () { + setState(() { + // _volume += 10; + // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + }); + }, + ), + Texts(model.babyInformationModelList[index].dOB.toString()),]), + Row(children:[IconButton( + icon: Icon(Icons.phone,color: Colors.red,), + tooltip: 'Increase volume by 10', + onPressed: () { + setState(() { + // _volume += 10; + // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + }); + }, + ), + Texts("Birthday"),]), + ], + ) + + + ) + + ) + + ], + + + ) + ) + ), + bottomSheet: Container( + height: MediaQuery.of(context).size.height * 0.12, + width: double.infinity, + + padding: EdgeInsets.all(12), + child: SecondaryButton( + textColor: Colors.white, + color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,), + label: "ADD NEW CHILD ", + // + onTap: (){ + + // bloodDetails.city=_selectedHospital.toString(); + + // bloodDetails. + }, + + + ), + ), + ) + ); + } +} From e14d619eddd036065dfb69a6c587861b5f5c8bd6 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Mon, 5 Oct 2020 16:33:07 +0300 Subject: [PATCH 11/30] child Vaccines --- .../images/new-design/calender-secondary.png | Bin 0 -> 16215 bytes assets/images/new-design/female.png | Bin 0 -> 2344 bytes assets/images/new-design/garbage.png | Bin 0 -> 1628 bytes assets/images/new-design/male.png | Bin 0 -> 6152 bytes lib/config/config.dart | 12 +++++ .../List_BabyInformationModel.dart | 45 ++++++++++++++++ .../childvaccines/user_information_model.dart | 48 ++++++++++++++++++ .../childvaccines/child_vaccines_service.dart | 2 +- .../user_information_service.dart | 34 +++++++++++++ .../child_vaccines_view_model.dart | 29 +++++++++++ .../user_information_view_model.dart | 25 +++++++++ lib/locator.dart | 8 +++ lib/pages/Blood/blood_donation.dart | 2 +- lib/pages/ChildVaccines/child_page.dart | 13 +++-- .../ChildVaccines/child_vaccines_page.dart | 29 ++++++++--- 15 files changed, 232 insertions(+), 15 deletions(-) create mode 100644 assets/images/new-design/calender-secondary.png create mode 100644 assets/images/new-design/female.png create mode 100644 assets/images/new-design/garbage.png create mode 100644 assets/images/new-design/male.png create mode 100644 lib/core/model/childvaccines/List_BabyInformationModel.dart create mode 100644 lib/core/model/childvaccines/user_information_model.dart create mode 100644 lib/core/service/childvaccines/user_information_service.dart create mode 100644 lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart create mode 100644 lib/core/viewModels/child_vaccines/user_information_view_model.dart diff --git a/assets/images/new-design/calender-secondary.png b/assets/images/new-design/calender-secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..a790849d3f7979c473f5d489fe5b7d49aec72b3e GIT binary patch literal 16215 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 z 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 TO?@NSz6-#SK(^!9c;EO3rQ_^~ literal 0 HcmV?d00001 diff --git a/assets/images/new-design/male.png b/assets/images/new-design/male.png new file mode 100644 index 0000000000000000000000000000000000000000..e957df707e9201793820bb08943f07b19d212705 GIT binary patch literal 6152 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 json) { + alertBy = json['AlertBy']; + babyID = json['BabyID']; + babyName = json['BabyName']; + dOB = DateUtil.convertStringToDate(json['DOB']); + gender = json['Gender']; + genderDescription = json['GenderDescription']; + patientID = json['PatientID']; + userID = json['UserID']; + } + + Map toJson() { + final Map data = new Map(); + data['AlertBy'] = this.alertBy; + data['BabyID'] = this.babyID; + data['BabyName'] = this.babyName; + data['DOB'] = this.dOB; + data['Gender'] = this.gender; + data['GenderDescription'] = this.genderDescription; + data['PatientID'] = this.patientID; + data['UserID'] = this.userID; + return data; + } +} \ No newline at end of file diff --git a/lib/core/model/childvaccines/user_information_model.dart b/lib/core/model/childvaccines/user_information_model.dart new file mode 100644 index 00000000..9e1687d3 --- /dev/null +++ b/lib/core/model/childvaccines/user_information_model.dart @@ -0,0 +1,48 @@ +class List_UserInformationModel { + int userID; + String mobileNumber; + String nationalID; + String emailAddress; + int patientID; + int patientType; + bool patientOutSA; + int createdBy; + int editedBy; + + List_UserInformationModel( + {this.userID, + this.mobileNumber, + this.nationalID, + this.emailAddress, + this.patientID, + this.patientType, + this.patientOutSA, + this.createdBy, + this.editedBy}); + + List_UserInformationModel.fromJson(Map json) { + userID = json['UserID']; + mobileNumber = json['MobileNumber']; + nationalID = json['NationalID']; + emailAddress = json['EmailAddress']; + patientID = json['PatientID']; + patientType = json['PatientType']; + patientOutSA = json['PatientOutSA']; + createdBy = json['CreatedBy']; + editedBy = json['EditedBy']; + } + + Map toJson() { + final Map data = new Map(); + data['UserID'] = this.userID; + data['MobileNumber'] = this.mobileNumber; + data['NationalID'] = this.nationalID; + data['EmailAddress'] = this.emailAddress; + data['PatientID'] = this.patientID; + data['PatientType'] = this.patientType; + data['PatientOutSA'] = this.patientOutSA; + data['CreatedBy'] = this.createdBy; + data['EditedBy'] = this.editedBy; + return data; + } +} \ No newline at end of file diff --git a/lib/core/service/childvaccines/child_vaccines_service.dart b/lib/core/service/childvaccines/child_vaccines_service.dart index d614f9a5..097f6bb0 100644 --- a/lib/core/service/childvaccines/child_vaccines_service.dart +++ b/lib/core/service/childvaccines/child_vaccines_service.dart @@ -11,7 +11,7 @@ class ChildVaccinesService extends BaseService { hasError = false; body['isDentalAllowedBackend'] = false; body['IsLogin'] = true; - //body['UserID'] = babyInformationModelList[0].userID; + // body['UserID'] = babyInformationModelList[0].userID; body['UserID'] = 42843; diff --git a/lib/core/service/childvaccines/user_information_service.dart b/lib/core/service/childvaccines/user_information_service.dart new file mode 100644 index 00000000..9082039f --- /dev/null +++ b/lib/core/service/childvaccines/user_information_service.dart @@ -0,0 +1,34 @@ + +import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; +import '../base_service.dart'; + +class UserInformationService extends BaseService{ + + List userInformationModelList = List(); + Map body = Map(); + + + + Future getUserInformationOrders() async { + hasError = false; + // body['isDentalAllowedBackend'] = false; + // body['IsLogin'] = true; + // body['UserID'] = 42843; + + + await baseAppClient.post(GET_USERINFORMATION_REQUEST, + onSuccess: (dynamic response, int statusCode) { + userInformationModelList.clear(); + + response['List_UserInformationModel_New'].forEach((vital) { + userInformationModelList.add(List_UserInformationModel.fromJson(vital)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } + + +} \ No newline at end of file diff --git a/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart b/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart new file mode 100644 index 00000000..e6a8ca60 --- /dev/null +++ b/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart @@ -0,0 +1,29 @@ +import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; + +import 'package:diplomaticquarterapp/core/service/childvaccines/child_vaccines_service.dart'; + +import '../../../locator.dart'; +import '../base_view_model.dart'; + +class ChildVaccinesViewModel extends BaseViewModel{ + + + ChildVaccinesService _childVaccinesService = locator(); + + + + List get babyInformationModelList=> _childVaccinesService.babyInformationModelList;//BabyInformationModelList; + getBabyInformatioRequestOrders() async { + setState(ViewState.Busy); + + await _childVaccinesService.getAllBabyInformationOrders(); + + if (_childVaccinesService.hasError) { + error = _childVaccinesService.error; + setState(ViewState.Error); + } else + setState(ViewState.Idle); + } + +} \ No newline at end of file diff --git a/lib/core/viewModels/child_vaccines/user_information_view_model.dart b/lib/core/viewModels/child_vaccines/user_information_view_model.dart new file mode 100644 index 00000000..c362ef73 --- /dev/null +++ b/lib/core/viewModels/child_vaccines/user_information_view_model.dart @@ -0,0 +1,25 @@ +import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; +import 'package:diplomaticquarterapp/core/service/childvaccines/user_information_service.dart'; +import '../../../locator.dart'; +import '../base_view_model.dart'; +import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; + +class UserInformationViewModel extends BaseViewModel { + UserInformationService _userInformationService = + locator(); + + List get userInformationModelList => + _userInformationService.userInformationModelList; + + getUserInformatioRequestOrders() async { + setState(ViewState.Busy); + + await _userInformationService.getUserInformationOrders(); + + if (_userInformationService.hasError) { + error = _userInformationService.error; + setState(ViewState.Error); + } else + setState(ViewState.Idle); + } +} diff --git a/lib/locator.dart b/lib/locator.dart index 8a7022c6..b57a63a1 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -1,6 +1,7 @@ import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/H2O_service.dart'; import 'package:diplomaticquarterapp/core/service/qr_service.dart'; import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/H2O_view_model.dart'; +import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/user_information_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/dashboard_view_model.dart'; import 'package:diplomaticquarterapp/uitl/navigation_service.dart'; import 'package:get_it/get_it.dart'; @@ -10,6 +11,8 @@ import 'core/service/AuthenticatedUserObject.dart'; import 'core/service/appointment_rate_service.dart'; import 'core/service/blood/blood_details_servies.dart'; import 'core/service/blood/blood_donation_service.dart'; +import 'core/service/childvaccines/child_vaccines_service.dart'; +import 'core/service/childvaccines/user_information_service.dart'; import 'core/service/contactus/finadus_service.dart'; import 'core/service/contactus/livechat_service.dart'; import 'core/service/dashboard_service.dart'; @@ -37,6 +40,7 @@ import 'core/viewModels/all_habib_medical_services/e_referral_view_model.dart'; import 'core/viewModels/appointment_rate_view_model.dart'; import 'core/viewModels/blooddonation/blood_details_view_model.dart'; import 'core/viewModels/blooddonation/booddonation_view_model.dart'; +import 'core/viewModels/child_vaccines/child_vaccines_view_model.dart'; import 'core/viewModels/contactus/findus_view_model.dart'; import 'core/viewModels/contactus/livechat_view_model.dart'; import 'core/viewModels/er/am_request_view_model.dart'; @@ -112,6 +116,8 @@ void setupLocator() { locator.registerLazySingleton(() => BloodDonationService()); locator.registerLazySingleton(() => BloodDetailsService()); + locator.registerLazySingleton(() => ChildVaccinesService()); + locator.registerLazySingleton(() => UserInformationService()); /// View Model locator.registerFactory(() => HospitalViewModel()); @@ -139,6 +145,8 @@ void setupLocator() { locator.registerFactory(() => LiveChatViewModel()); locator.registerFactory(() => BloodDonationViewModel()); locator.registerFactory(() => BloodDeatailsViewModel()); + locator.registerFactory(() => ChildVaccinesViewModel()); + locator.registerFactory(() => UserInformationViewModel()); locator.registerFactory(() => H2OViewModel()); locator.registerFactory(() => BloodSugarViewMode()); diff --git a/lib/pages/Blood/blood_donation.dart b/lib/pages/Blood/blood_donation.dart index 6132e38c..99e5242e 100644 --- a/lib/pages/Blood/blood_donation.dart +++ b/lib/pages/Blood/blood_donation.dart @@ -87,7 +87,7 @@ class _BloodDonationPageState extends State { children: [ Texts( // TranslationBase.of(context).advancePaymentLabel, - "Enter the required information, In order to register for Blood Donation Service", + "Enter the required information, In order to register for Blood Donation Service",//+model.user.firstName, textAlign: TextAlign.center, ), SizedBox( diff --git a/lib/pages/ChildVaccines/child_page.dart b/lib/pages/ChildVaccines/child_page.dart index e5a5058f..ea107600 100644 --- a/lib/pages/ChildVaccines/child_page.dart +++ b/lib/pages/ChildVaccines/child_page.dart @@ -6,6 +6,7 @@ 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'; +import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; class ChildPage extends StatefulWidget { //final List babyInformationModelList; @@ -38,14 +39,16 @@ class _ChildPageState extends State with SingleTickerProviderStateMix color: Colors.white, ), + width: 150, child: Column( + children: [ Row(children:[Texts("CHILD NAME"),]), Row(children:[Texts(model.babyInformationModelList[index].babyName),]), Row( children: [IconButton( - icon: Icon(Icons.phone,color: Colors.red,), + icon: new Image.asset('assets/images/new-design/female.png'), tooltip: 'Increase volume by 10', onPressed: () { setState(() { @@ -56,7 +59,7 @@ class _ChildPageState extends State with SingleTickerProviderStateMix ), Texts(model.babyInformationModelList[index].babyName), IconButton( - icon: Icon(Icons.phone,color: Colors.red,), + icon: Icon(Icons.remove_red_eye_outlined,color: Colors.red,), tooltip: 'Increase volume by 10', onPressed: () { setState(() { @@ -68,7 +71,7 @@ class _ChildPageState extends State with SingleTickerProviderStateMix ), Row(children:[Texts("Birthday"),]), Row(children:[IconButton( - icon: Icon(Icons.phone,color: Colors.red,), + icon: new Image.asset('assets/images/new-design/calender-secondary.png'), tooltip: 'Increase volume by 10', onPressed: () { setState(() { @@ -77,9 +80,9 @@ class _ChildPageState extends State with SingleTickerProviderStateMix }); }, ), - Texts(model.babyInformationModelList[index].dOB.toString()),]), + Texts(DateUtil.yearMonthDay(model.babyInformationModelList[index].dOB)),]), Row(children:[IconButton( - icon: Icon(Icons.phone,color: Colors.red,), + icon: new Image.asset('assets/images/new-design/garbage.png'), tooltip: 'Increase volume by 10', onPressed: () { setState(() { diff --git a/lib/pages/ChildVaccines/child_vaccines_page.dart b/lib/pages/ChildVaccines/child_vaccines_page.dart index cec04f12..269c9259 100644 --- a/lib/pages/ChildVaccines/child_vaccines_page.dart +++ b/lib/pages/ChildVaccines/child_vaccines_page.dart @@ -1,28 +1,35 @@ +import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart'; +import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/user_information_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/medical/my_balance_view_model.dart'; +import 'package:diplomaticquarterapp/pages/ChildVaccines/child_page.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.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/input/text_field.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'; + + class ChildVaccinesPage extends StatefulWidget { @override _ChildVaccinesPageState createState() => _ChildVaccinesPageState(); } -class _ChildVaccinesPageState extends State { +class _ChildVaccinesPageState extends State + with SingleTickerProviderStateMixin{ TextEditingController titleController = TextEditingController(); var checkedValue=false; String addEmail=""; @override Widget build(BuildContext context) { - return BaseView( - onModelReady: (model) => model.getCities(),//model.getHospitals(), + return BaseView( + onModelReady: (model) => model.getUserInformatioRequestOrders(), builder: (_, model, w) => AppScaffold( isShowAppBar: true, appBarTitle: " Vaccination",//TranslationBase.of(context).advancePayment, @@ -98,7 +105,7 @@ class _ChildVaccinesPageState extends State { label: "UPDATE EMAIL", // onTap: (){ - model.user.emailAddress=model.user.emailAddress+addEmail.toString(); + model.user.emailAddress=addEmail.toString(); AppToast.showSuccessToast( message: "Email updated"); // bloodDetails.city=_selectedHospital.toString(); @@ -119,12 +126,18 @@ class _ChildVaccinesPageState extends State { color: Color.fromRGBO(63, 72, 74, 1,), label: " VIEW LIST OF CHILDREN", // - onTap: (){ + onTap: () => Navigator.push( + context, + FadePage( + page: ChildPage(), - // bloodDetails.city=_selectedHospital.toString(); + //ChildPage(babyInformationModelList:model.BabyInformationModelList) + // HospitalsPage( + // findusHospitalModelList: model.FindusHospitalModelList, + // ) - // bloodDetails. - }, + ), + ), ), From 4009aed0009b0fdd19bb46596dedaa696a092deb Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Tue, 6 Oct 2020 13:05:18 +0300 Subject: [PATCH 12/30] child Vaccines --- .../ChildVaccines/add_newchild_page.dart | 235 +++++++++++++++++ lib/pages/ChildVaccines/child_page.dart | 22 +- lib/pages/ChildVaccines/new_text_Field.dart | 239 ++++++++++++++++++ .../medical/balance/advance_payment_page.dart | 1 + 4 files changed, 491 insertions(+), 6 deletions(-) create mode 100644 lib/pages/ChildVaccines/add_newchild_page.dart create mode 100644 lib/pages/ChildVaccines/new_text_Field.dart diff --git a/lib/pages/ChildVaccines/add_newchild_page.dart b/lib/pages/ChildVaccines/add_newchild_page.dart new file mode 100644 index 00000000..0d87cda3 --- /dev/null +++ b/lib/pages/ChildVaccines/add_newchild_page.dart @@ -0,0 +1,235 @@ +import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; +import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart'; +import 'package:diplomaticquarterapp/pages/ChildVaccines/add_newchild_page.dart'; +import 'package:diplomaticquarterapp/pages/base/base_view.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:flutter_datetime_picker/flutter_datetime_picker.dart'; +import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:diplomaticquarterapp/uitl/CalendarUtils.dart'; +import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; + +import 'new_text_Field.dart'; + +enum Gender { Male, Female, NON } +enum BeneficiaryType { MyAccount, MyFamilyFiles, OtherAccount, NON } + +class AddNewChildPage extends StatefulWidget { + @override + _AddNewChildPageState createState() => _AddNewChildPageState(); +} + +class _AddNewChildPageState extends State { + int tappedIndex; + int checkedValue; + + @override + void initState() { + super.initState(); + tappedIndex = -1; + } + + TextEditingController _firstTextController = TextEditingController(); + TextEditingController _secondTextController = TextEditingController(); + TextEditingController _notesTextController = TextEditingController(); + BeneficiaryType beneficiaryType = BeneficiaryType.NON; + Gender gender = Gender.Male; + ChildVaccinesViewModel AddvancedModel = ChildVaccinesViewModel(); + + @override + Widget build(BuildContext context) { + + return AppScaffold( + isShowAppBar: true, + appBarTitle: "Vaccintion", + body: SingleChildScrollView( + physics: ScrollPhysics(), + child: Container( + margin: EdgeInsets.all(12), + child: Column( + // crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox( + height: 50, + ), + Texts( + "Add the child's information below to recieve the schedule of vaccinations.", //+model.user.firstName, + textAlign: TextAlign.center, + ), + SizedBox( + height: 12, + ), + NewTextFields( + hintText: "First Name", + controller: _firstTextController, + ), + SizedBox( + height: 12, + ), + NewTextFields( + hintText: "Second Name", + controller: _secondTextController, + ), + SizedBox( + height: 12, + ), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Gender:", + textAlign: TextAlign.end, + + ), + ],), + Container( + height: MediaQuery.of(context).size.height * 0.12, + width: double.infinity, + padding: EdgeInsets.all(12), + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisAlignment: MainAxisAlignment.center, + + + children: [ + + Container( + height: MediaQuery.of(context).size.height * 0.12, + width: 170, + child: SecondaryButton( + + textColor:checkedValue == 1 + ? Colors.white + : Colors.black, + color: checkedValue == 1 + ? Colors.red + : Colors.white, + + label: "Male", + // + onTap: () { + // bloodDetails.city=_selectedHospital.toString(); + setState(() { + checkedValue=1; + print("checkedValue="+checkedValue.toString()); + }); + + // bloodDetails. + }, + ), + ), + Container( + height: MediaQuery.of(context).size.height * 0.12, + width: 170, + child: SecondaryButton( + textColor:checkedValue == 2 + ? Colors.white + : Colors.black, + color: checkedValue == 2 + ? Colors.red + : Colors.white, + label: "Female", + // + onTap: () { + setState(() { + checkedValue=2; + print("checkedValue="+checkedValue.toString()); + }); + // bloodDetails.city=_selectedHospital.toString(); + + // bloodDetails. + }, + ), + ) + ],) , + ), + //========== + SizedBox( + height: 6, + ), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Date Of Birth::", + textAlign: TextAlign.end, + + ), + ],), + InkWell( + onTap: () { + DatePicker.showDatePicker(context, + showTitleActions: true, + minTime: DateTime( + DateTime.now().year, DateTime.now().month - 1, 1), + maxTime: DateTime.now(), onConfirm: (date) { + setState(() { + // widget.startDay = date; + }); + }, + // currentTime: widget.startDay, + // locale: projectViewModel.localeType + ); + }, + child: Container( + padding: EdgeInsets.all(12), + width: double.infinity, + height: 65, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12), + color: Colors.white), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts( DateUtil.yearMonthDay(DateTime.now()) + //getStartDay() + ), + Icon( + Icons.calendar_today, + color: Colors.black, + ) + ], + ), + ), + ), + SizedBox( + height: 12, + ), + //========= + + ], + ), + ), + ), + bottomSheet: Container( + height: MediaQuery.of(context).size.height * 0.12, + width: double.infinity, + padding: EdgeInsets.all(12), + child: SecondaryButton( + textColor: Colors.white, + color: checkedValue == false + ? Colors.white24 + : Color.fromRGBO( + 63, + 72, + 74, + 1, + ), + label: "Add", + // + onTap: () { + // bloodDetails.city=_selectedHospital.toString(); + + // bloodDetails. + }, + ), + + ), + ); + } +} diff --git a/lib/pages/ChildVaccines/child_page.dart b/lib/pages/ChildVaccines/child_page.dart index ea107600..54e2b60d 100644 --- a/lib/pages/ChildVaccines/child_page.dart +++ b/lib/pages/ChildVaccines/child_page.dart @@ -1,9 +1,11 @@ import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart'; +import 'package:diplomaticquarterapp/pages/ChildVaccines/add_newchild_page.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.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:diplomaticquarterapp/uitl/date_uitl.dart'; @@ -20,10 +22,12 @@ class ChildPage extends StatefulWidget { class _ChildPageState extends State with SingleTickerProviderStateMixin { @override Widget build(BuildContext context) { - var checkedValue= false; + var checkedValue= true; return BaseView( onModelReady: (model) => model.getBabyInformatioRequestOrders(),//model.getCOC(),getFindUsRequestOrders() builder: (_, model, widget) => AppScaffold( + isShowAppBar: true, + appBarTitle: " Vaccination", baseViewModel: model, body: SingleChildScrollView( child: Container( @@ -83,7 +87,7 @@ class _ChildPageState extends State with SingleTickerProviderStateMix Texts(DateUtil.yearMonthDay(model.babyInformationModelList[index].dOB)),]), Row(children:[IconButton( icon: new Image.asset('assets/images/new-design/garbage.png'), - tooltip: 'Increase volume by 10', + tooltip: '', onPressed: () { setState(() { // _volume += 10; @@ -116,12 +120,18 @@ class _ChildPageState extends State with SingleTickerProviderStateMix color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,), label: "ADD NEW CHILD ", // - onTap: (){ + onTap: () => Navigator.push( + context, + FadePage( + page: AddNewChildPage(), - // bloodDetails.city=_selectedHospital.toString(); + //ChildPage(babyInformationModelList:model.BabyInformationModelList) + // HospitalsPage( + // findusHospitalModelList: model.FindusHospitalModelList, + // ) - // bloodDetails. - }, + ), + ), ), diff --git a/lib/pages/ChildVaccines/new_text_Field.dart b/lib/pages/ChildVaccines/new_text_Field.dart new file mode 100644 index 00000000..ad9eb580 --- /dev/null +++ b/lib/pages/ChildVaccines/new_text_Field.dart @@ -0,0 +1,239 @@ +import 'package:eva_icons_flutter/eva_icons_flutter.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +class NumberTextInputFormatter extends TextInputFormatter { + @override + TextEditingValue formatEditUpdate( + TextEditingValue oldValue, TextEditingValue newValue) { + final int newTextLength = newValue.text.length; + int selectionIndex = newValue.selection.end; + int usedSubstringIndex = 0; + final StringBuffer newText = StringBuffer(); + if (newTextLength >= 1) { + newText.write('('); + if (newValue.selection.end >= 1) selectionIndex++; + } + if (newTextLength >= 4) { + newText.write(newValue.text.substring(0, usedSubstringIndex = 3) + ') '); + if (newValue.selection.end >= 3) selectionIndex += 2; + } + if (newTextLength >= 7) { + newText.write(newValue.text.substring(3, usedSubstringIndex = 6) + '-'); + if (newValue.selection.end >= 6) selectionIndex++; + } + if (newTextLength >= 11) { + newText.write(newValue.text.substring(6, usedSubstringIndex = 10) + ' '); + if (newValue.selection.end >= 10) selectionIndex++; + } + // Dump the rest. + if (newTextLength >= usedSubstringIndex) + newText.write(newValue.text.substring(usedSubstringIndex)); + return TextEditingValue( + text: newText.toString(), + selection: TextSelection.collapsed(offset: selectionIndex), + ); + } +} + +final _mobileFormatter = NumberTextInputFormatter(); + +class NewTextFields extends StatefulWidget { + NewTextFields( + {Key key, + this.type, + this.hintText, + this.suffixIcon, + this.autoFocus, + this.onChanged, + this.initialValue, + this.minLines, + this.maxLines, + this.inputFormatters, + this.padding, + this.focus = false, + this.maxLengthEnforced = true, + this.suffixIconColor, + this.inputAction, + this.onSubmit, + this.keepPadding = true, + this.textCapitalization = TextCapitalization.none, + this.controller, + this.keyboardType, + this.validator, + this.borderOnlyError = false, + this.onSaved, + this.onSuffixTap, + this.readOnly: false, + this.maxLength, + this.prefixIcon, + this.bare = false, + this.onTap, + this.fontSize = 16.0, + this.fontWeight = FontWeight.w700, + this.autoValidate = false, + this.hintColor,this.isEnabled=true}) + : super(key: key); + + final String hintText; + + // final String initialValue; + final String type; + final bool autoFocus; + final IconData suffixIcon; + final Color suffixIconColor; + final Icon prefixIcon; + final VoidCallback onTap; + final TextEditingController controller; + final TextInputType keyboardType; + final FormFieldValidator validator; + final Function onSaved; + final Function onSuffixTap; + final Function onChanged; + final Function onSubmit; + final bool readOnly; + final int maxLength; + final int minLines; + final int maxLines; + final bool maxLengthEnforced; + final bool bare; + final bool isEnabled; + final TextInputAction inputAction; + final double fontSize; + final FontWeight fontWeight; + final bool keepPadding; + final TextCapitalization textCapitalization; + final List inputFormatters; + final bool autoValidate; + final EdgeInsets padding; + final bool focus; + final bool borderOnlyError; + final Color hintColor; + final String initialValue; + @override + _NewTextFieldsState createState() => _NewTextFieldsState(); +} + +class _NewTextFieldsState extends State { + final FocusNode _focusNode = FocusNode(); + bool focus = false; + bool view = false; + + @override + void initState() { + super.initState(); + _focusNode.addListener(() { + setState(() { + focus = _focusNode.hasFocus; + }); + }); + } + + @override + void didUpdateWidget(NewTextFields oldWidget) { + if (widget.focus) _focusNode.requestFocus(); + super.didUpdateWidget(oldWidget); + } + + @override + void dispose() { + _focusNode.dispose(); + super.dispose(); + } + + + bool _determineReadOnly() { + if (widget.readOnly != null && widget.readOnly) { + _focusNode.unfocus(); + return true; + } else { + return false; + } + } + + @override + Widget build(BuildContext context) { + return AnimatedContainer( + duration: Duration(milliseconds: 300), + decoration:BoxDecoration( + borderRadius: BorderRadius.circular(12), + color: Colors.white), + child: Container( + margin: EdgeInsets.only(top: 8), + + child: TextFormField( + enabled: widget.isEnabled, + initialValue: widget.initialValue, + keyboardAppearance: Theme.of(context).brightness, + scrollPhysics: BouncingScrollPhysics(), + autovalidate: widget.autoValidate, + textCapitalization: widget.textCapitalization, + onFieldSubmitted: widget.inputAction == TextInputAction.next + ? (widget.onSubmit != null + ? widget.onSubmit + : (val) { + _focusNode.nextFocus(); + }) + : widget.onSubmit, + textInputAction: widget.inputAction, + minLines: widget.minLines ?? 1, + maxLines: widget.maxLines ?? 1, + maxLengthEnforced: widget.maxLengthEnforced, + onChanged: widget.onChanged, + focusNode: _focusNode, + maxLength: widget.maxLength ?? null, + controller: widget.controller, + keyboardType: widget.keyboardType, + readOnly: _determineReadOnly(), + obscureText: widget.type == "password" && !view ? true : false, + autofocus: widget.autoFocus ?? false, + validator: widget.validator, + onSaved: widget.onSaved, + + style: Theme.of(context) + .textTheme + .body2 + .copyWith(fontSize: widget.fontSize, fontWeight: widget.fontWeight), + inputFormatters: widget.keyboardType == TextInputType.phone + ? [ + WhitelistingTextInputFormatter.digitsOnly, + _mobileFormatter, + ] + : widget.inputFormatters, + decoration: InputDecoration( + labelText: widget.hintText, + labelStyle: TextStyle(color: Colors.black), + errorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Theme.of(context) + .errorColor + .withOpacity(0.5), + width: 1.0), + borderRadius: BorderRadius.circular(12.0)), + focusedErrorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Theme.of(context) + .errorColor + .withOpacity(0.5), + width: 1.0), + borderRadius: BorderRadius.circular(8.0)), + focusedBorder: OutlineInputBorder( + borderSide: + BorderSide(color: Colors.white, width: 1.0), + borderRadius: BorderRadius.circular(12)), + disabledBorder: OutlineInputBorder( + borderSide: + BorderSide(color: Colors.white, width: 1.0), + borderRadius: BorderRadius.circular(12)), + enabledBorder: OutlineInputBorder( + borderSide: + BorderSide(color: Colors.white, width: 1.0), + borderRadius: BorderRadius.circular(12), + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/medical/balance/advance_payment_page.dart b/lib/pages/medical/balance/advance_payment_page.dart index 5cef835f..02d08682 100644 --- a/lib/pages/medical/balance/advance_payment_page.dart +++ b/lib/pages/medical/balance/advance_payment_page.dart @@ -29,6 +29,7 @@ import 'new_text_Field.dart'; enum BeneficiaryType { MyAccount, MyFamilyFiles, OtherAccount, NON } + class AdvancePaymentPage extends StatefulWidget { @override _AdvancePaymentPageState createState() => _AdvancePaymentPageState(); From 42554ffa675a0119c943ff1f0e5baa6721faec89 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Tue, 6 Oct 2020 15:45:58 +0300 Subject: [PATCH 13/30] child Vaccines --- .../ChildVaccines/add_newchild_page.dart | 109 ++++++++++++++++-- 1 file changed, 97 insertions(+), 12 deletions(-) diff --git a/lib/pages/ChildVaccines/add_newchild_page.dart b/lib/pages/ChildVaccines/add_newchild_page.dart index 0d87cda3..b28c1986 100644 --- a/lib/pages/ChildVaccines/add_newchild_page.dart +++ b/lib/pages/ChildVaccines/add_newchild_page.dart @@ -1,7 +1,10 @@ +import 'package:device_calendar/device_calendar.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart'; import 'package:diplomaticquarterapp/pages/ChildVaccines/add_newchild_page.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; +import 'package:diplomaticquarterapp/pages/medical/active_medications/DayCheckBoxDialog.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/others/app_scaffold_widget.dart'; @@ -10,9 +13,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; -import 'package:diplomaticquarterapp/uitl/CalendarUtils.dart'; -import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; -import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; + import 'new_text_Field.dart'; @@ -20,6 +21,35 @@ enum Gender { Male, Female, NON } enum BeneficiaryType { MyAccount, MyFamilyFiles, OtherAccount, NON } class AddNewChildPage extends StatefulWidget { + final int frequency; + final int days; + final String itemDescription; + + List _scheduleList = List(); + List daysOfWeek = [ + DayOfWeek.Monday, + DayOfWeek.Tuesday, + DayOfWeek.Wednesday, + DayOfWeek.Thursday, + DayOfWeek.Friday, + DayOfWeek.Saturday, + DayOfWeek.Sunday + ]; + + DateTime startDay; + DateTime endDay; + + //AddNewChildPage({Key key, this.frequency, this.days, this.itemDescription}) : super(key: key); + AddNewChildPage({Key key, this.frequency, this.days, this.itemDescription}) { + startDay = DateTime.now(); + endDay = DateTime.now();//endDay = DateTime.now().add(Duration(days: days)); + int hour = 24;//(24 / frequency).round(); + int durations = 24 ~/ hour; + for (int count = 0; count < durations; count++) { + _scheduleList.add(DateTime(DateTime.now().year, DateTime.now().month, + DateTime.now().day, (hour * count))); + } + } @override _AddNewChildPageState createState() => _AddNewChildPageState(); } @@ -39,7 +69,8 @@ class _AddNewChildPageState extends State { TextEditingController _notesTextController = TextEditingController(); BeneficiaryType beneficiaryType = BeneficiaryType.NON; Gender gender = Gender.Male; - ChildVaccinesViewModel AddvancedModel = ChildVaccinesViewModel(); + //ChildVaccinesViewModel addvancedModel = ChildVaccinesViewModel(); + List_BabyInformationModel addvancedModel = List_BabyInformationModel(); @override Widget build(BuildContext context) { @@ -165,14 +196,17 @@ class _AddNewChildPageState extends State { onTap: () { DatePicker.showDatePicker(context, showTitleActions: true, - minTime: DateTime( - DateTime.now().year, DateTime.now().month - 1, 1), - maxTime: DateTime.now(), onConfirm: (date) { + // minTime: DateTime( + // DateTime.now().year, DateTime.now().month - 1, 1), + minTime: DateTime( + 1, 1, 1), + maxTime: DateTime.now(), + onConfirm: (date) { setState(() { - // widget.startDay = date; + widget.startDay = date; }); }, - // currentTime: widget.startDay, + currentTime: widget.startDay, // locale: projectViewModel.localeType ); }, @@ -186,8 +220,9 @@ class _AddNewChildPageState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Texts( DateUtil.yearMonthDay(DateTime.now()) - //getStartDay() + Texts( //getStartDay() + // DateUtil.yearMonthDay(DateTime.now()) + getStartDay() ), Icon( Icons.calendar_today, @@ -223,7 +258,23 @@ class _AddNewChildPageState extends State { label: "Add", // onTap: () { - // bloodDetails.city=_selectedHospital.toString(); + + addvancedModel.babyName=_firstTextController.text + " "+_secondTextController.text; + addvancedModel.gender=checkedValue; + addvancedModel.dOB=DateUtil.convertStringToDate(getStartDay()) ; + addvancedModel.alertBy=2; + addvancedModel.alertBy=addvancedModel.babyID; + addvancedModel.genderDescription=checkedValue==1?"Male":"Female"; + addvancedModel.patientID=addvancedModel.patientID; + addvancedModel.userID=addvancedModel.userID; + // // advanceModel.fileNumber = _fileTextController.text; + // // advanceModel.hospitalsModel = _selectedHospital; + // // advanceModel.note = _notesTextController.text; + // // advanceModel.email = email ?? model.user.emailAddress; + // // advanceModel.amount = amount; + // // bloodDetails.city=_selectedHospital.toString(); + AppToast.showSuccessToast( + message: "Email updated"); // bloodDetails. }, @@ -232,4 +283,38 @@ class _AddNewChildPageState extends State { ), ); } + String getStartDay() { + return "${DateUtil.getMonth(widget.startDay.month)} ${widget.startDay.day}, ${widget.startDay.year}"; + } + + String getEndDay() { + return "${DateUtil.getMonth(widget.endDay.month)} ${widget.endDay.day}, ${widget.endDay.year}"; + } + + String getDateTime(DateTime dateTime) { + return '${dateTime.hour}:${dateTime.minute}'; + } + + String getDays() { + String days = ""; + widget.daysOfWeek.forEach((element) { + days += "${DateUtil.getDay(element)},"; + }); + return days; + } + + void confirmSelectDayDialog() { + showDialog( + context: context, + child: DayCheckBoxDialog( + title: 'Select Day', + selectedDaysOfWeek: widget.daysOfWeek, + onValueSelected: (value) { + setState(() { + widget.daysOfWeek = value; + }); + }, + ), + ); + } } From 8a6511404f849bdd3b00a575f2f72380515231b8 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Tue, 6 Oct 2020 17:03:42 +0300 Subject: [PATCH 14/30] child Vaccines --- .../ChildVaccines/add_newchild_page.dart | 399 +++++++++--------- 1 file changed, 211 insertions(+), 188 deletions(-) diff --git a/lib/pages/ChildVaccines/add_newchild_page.dart b/lib/pages/ChildVaccines/add_newchild_page.dart index b28c1986..f4f2db94 100644 --- a/lib/pages/ChildVaccines/add_newchild_page.dart +++ b/lib/pages/ChildVaccines/add_newchild_page.dart @@ -1,7 +1,11 @@ import 'package:device_calendar/device_calendar.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; +import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/add_new_child_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart'; import 'package:diplomaticquarterapp/pages/ChildVaccines/add_newchild_page.dart'; +import 'package:diplomaticquarterapp/pages/ChildVaccines/child_page.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/medical/active_medications/DayCheckBoxDialog.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; @@ -14,7 +18,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; - import 'new_text_Field.dart'; enum Gender { Male, Female, NON } @@ -24,6 +27,7 @@ class AddNewChildPage extends StatefulWidget { final int frequency; final int days; final String itemDescription; + String dateAdd; List _scheduleList = List(); List daysOfWeek = [ @@ -41,9 +45,10 @@ class AddNewChildPage extends StatefulWidget { //AddNewChildPage({Key key, this.frequency, this.days, this.itemDescription}) : super(key: key); AddNewChildPage({Key key, this.frequency, this.days, this.itemDescription}) { - startDay = DateTime.now(); - endDay = DateTime.now();//endDay = DateTime.now().add(Duration(days: days)); - int hour = 24;//(24 / frequency).round(); + startDay = DateTime.now(); + endDay = + DateTime.now(); //endDay = DateTime.now().add(Duration(days: days)); + int hour = 24; //(24 / frequency).round(); int durations = 24 ~/ hour; for (int count = 0; count < durations; count++) { _scheduleList.add(DateTime(DateTime.now().year, DateTime.now().month, @@ -71,218 +76,236 @@ class _AddNewChildPageState extends State { Gender gender = Gender.Male; //ChildVaccinesViewModel addvancedModel = ChildVaccinesViewModel(); List_BabyInformationModel addvancedModel = List_BabyInformationModel(); + CreateNewBaby newChild=CreateNewBaby(); + List_UserInformationModel informationModel =List_UserInformationModel(); @override Widget build(BuildContext context) { - - return AppScaffold( - isShowAppBar: true, - appBarTitle: "Vaccintion", - body: SingleChildScrollView( - physics: ScrollPhysics(), - child: Container( - margin: EdgeInsets.all(12), - child: Column( - // crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - height: 50, - ), - Texts( - "Add the child's information below to recieve the schedule of vaccinations.", //+model.user.firstName, - textAlign: TextAlign.center, - ), - SizedBox( - height: 12, - ), - NewTextFields( - hintText: "First Name", - controller: _firstTextController, - ), - SizedBox( - height: 12, - ), - NewTextFields( - hintText: "Second Name", - controller: _secondTextController, - ), - SizedBox( - height: 12, - ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - "Gender:", - textAlign: TextAlign.end, - + return BaseView( + builder: (_,model,w)=> AppScaffold( + isShowAppBar: true, + appBarTitle: "Vaccintion", + body: SingleChildScrollView( + physics: ScrollPhysics(), + child: Container( + margin: EdgeInsets.all(12), + child: Column( + // crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox( + height: 50, ), - ],), - Container( - height: MediaQuery.of(context).size.height * 0.12, - width: double.infinity, - padding: EdgeInsets.all(12), - child: Row( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.center, - - + Texts( + "Add the child's information below to recieve the schedule of vaccinations.", //+model.user.firstName, + textAlign: TextAlign.center, + ), + SizedBox( + height: 12, + ), + NewTextFields( + hintText: "First Name", + controller: _firstTextController, + ), + SizedBox( + height: 12, + ), + NewTextFields( + hintText: "Second Name", + controller: _secondTextController, + ), + SizedBox( + height: 12, + ), + Row( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - - Container( - height: MediaQuery.of(context).size.height * 0.12, - width: 170, - child: SecondaryButton( - - textColor:checkedValue == 1 - ? Colors.white - : Colors.black, - color: checkedValue == 1 - ? Colors.red - : Colors.white, - - label: "Male", - // - onTap: () { - // bloodDetails.city=_selectedHospital.toString(); - setState(() { - checkedValue=1; - print("checkedValue="+checkedValue.toString()); - }); - - // bloodDetails. - }, - ), + Text( + "Gender:", + textAlign: TextAlign.end, ), - Container( - height: MediaQuery.of(context).size.height * 0.12, - width: 170, - child: SecondaryButton( - textColor:checkedValue == 2 - ? Colors.white - : Colors.black, - color: checkedValue == 2 - ? Colors.red - : Colors.white, - label: "Female", - // - onTap: () { - setState(() { - checkedValue=2; - print("checkedValue="+checkedValue.toString()); - }); - // bloodDetails.city=_selectedHospital.toString(); + ], + ), + Container( + height: MediaQuery.of(context).size.height * 0.12, + width: double.infinity, + padding: EdgeInsets.all(12), + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + height: MediaQuery.of(context).size.height * 0.12, + width: 170, + child: SecondaryButton( + textColor: + checkedValue == 1 ? Colors.white : Colors.black, + color: checkedValue == 1 ? Colors.red : Colors.white, + + label: "Male", + // + onTap: () { + // bloodDetails.city=_selectedHospital.toString(); + setState(() { + checkedValue = 1; + print("checkedValue=" + checkedValue.toString()); + }); - // bloodDetails. - }, + // bloodDetails. + }, + ), ), - ) - ],) , - ), - //========== - SizedBox( - height: 6, - ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - "Date Of Birth::", - textAlign: TextAlign.end, + Container( + height: MediaQuery.of(context).size.height * 0.12, + width: 170, + child: SecondaryButton( + textColor: + checkedValue == 2 ? Colors.white : Colors.black, + color: checkedValue == 2 ? Colors.red : Colors.white, + label: "Female", + // + onTap: () { + setState(() { + checkedValue = 2; + print("checkedValue=" + checkedValue.toString()); + }); + // bloodDetails.city=_selectedHospital.toString(); + // bloodDetails. + }, + ), + ) + ], ), - ],), - InkWell( - onTap: () { - DatePicker.showDatePicker(context, + ), + //========== + SizedBox( + height: 6, + ), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Date Of Birth::", + textAlign: TextAlign.end, + ), + ], + ), + InkWell( + onTap: () { + DatePicker.showDatePicker( + context, showTitleActions: true, // minTime: DateTime( // DateTime.now().year, DateTime.now().month - 1, 1), - minTime: DateTime( - 1, 1, 1), + minTime: DateTime(1, 1, 1), maxTime: DateTime.now(), - onConfirm: (date) { + onConfirm: (date) { setState(() { - widget.startDay = date; + widget.startDay = date; }); }, currentTime: widget.startDay, - // locale: projectViewModel.localeType - ); - }, - child: Container( - padding: EdgeInsets.all(12), - width: double.infinity, - height: 65, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12), - color: Colors.white), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Texts( //getStartDay() - // DateUtil.yearMonthDay(DateTime.now()) - getStartDay() - ), - Icon( - Icons.calendar_today, - color: Colors.black, - ) - ], + // locale: projectViewModel.localeType + ); + }, + child: Container( + padding: EdgeInsets.all(12), + width: double.infinity, + height: 65, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12), + color: Colors.white), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts(//getStartDay() + // DateUtil.yearMonthDay(DateTime.now()) + getStartDay() + ), + Icon( + Icons.calendar_today, + color: Colors.black, + ) + ], + ), ), ), - ), - SizedBox( - height: 12, - ), - //========= - - ], + SizedBox( + height: 12, + ), + //========= + ], + ), ), ), - ), - bottomSheet: Container( - height: MediaQuery.of(context).size.height * 0.12, - width: double.infinity, - padding: EdgeInsets.all(12), - child: SecondaryButton( - textColor: Colors.white, - color: checkedValue == false - ? Colors.white24 - : Color.fromRGBO( - 63, - 72, - 74, - 1, - ), - label: "Add", - // - onTap: () { + bottomSheet: Container( + height: MediaQuery.of(context).size.height * 0.12, + width: double.infinity, + padding: EdgeInsets.all(12), + child: SecondaryButton( + textColor: Colors.white, + color: checkedValue == false + ? Colors.white24 + : Color.fromRGBO( + 63, + 72, + 74, + 1, + ), + label: "Add", + // + onTap: () { - addvancedModel.babyName=_firstTextController.text + " "+_secondTextController.text; - addvancedModel.gender=checkedValue; - addvancedModel.dOB=DateUtil.convertStringToDate(getStartDay()) ; - addvancedModel.alertBy=2; - addvancedModel.alertBy=addvancedModel.babyID; - addvancedModel.genderDescription=checkedValue==1?"Male":"Female"; - addvancedModel.patientID=addvancedModel.patientID; - addvancedModel.userID=addvancedModel.userID; - // // advanceModel.fileNumber = _fileTextController.text; - // // advanceModel.hospitalsModel = _selectedHospital; - // // advanceModel.note = _notesTextController.text; - // // advanceModel.email = email ?? model.user.emailAddress; - // // advanceModel.amount = amount; - // // bloodDetails.city=_selectedHospital.toString(); - AppToast.showSuccessToast( - message: "Email updated"); + newChild.babyName = + _firstTextController.text + " " + _secondTextController.text; + newChild.gender = checkedValue.toString(); + newChild.strDOB=getStartDay() ; + newChild.createdBy=informationModel.createdBy ; + newChild.editedBy=informationModel.createdBy; + newChild.tempValue=true; + newChild.userID=addvancedModel.userID; + newChild.isLogin=true; + newChild.alertBy=addvancedModel.alertBy; + + model.getNewBabyOrders(newChild: newChild); - // bloodDetails. - }, - ), + //DateTime.now();//DateUtil.convertStringToDate(getStartDay()); + // addvancedModel.alertBy = 2; + // addvancedModel.alertBy = addvancedModel.babyID; + // addvancedModel.genderDescription = + // checkedValue == 1 ? "Male" : "Female"; + // addvancedModel.patientID = addvancedModel.patientID; + // addvancedModel.userID = addvancedModel.userID; + // // advanceModel.fileNumber = _fileTextController.text; + // // advanceModel.hospitalsModel = _selectedHospital; + // // advanceModel.note = _notesTextController.text; + // // advanceModel.email = email ?? model.user.emailAddress; + // // advanceModel.amount = amount; + // // bloodDetails.city=_selectedHospital.toString(); + AppToast.showSuccessToast(message: "Record Added"); + //============ + Navigator.push( + context, + FadePage( + page: ChildPage(), + + //ChildPage(babyInformationModelList:model.BabyInformationModelList) + // HospitalsPage( + // findusHospitalModelList: model.FindusHospitalModelList, + // ) + ), + ); + //============== + + // bloodDetails. + }, + ), + ), ), ); } + String getStartDay() { return "${DateUtil.getMonth(widget.startDay.month)} ${widget.startDay.day}, ${widget.startDay.year}"; } From 6830996f9c838f2a213bb29af38ce971402086db Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Tue, 6 Oct 2020 18:01:32 +0300 Subject: [PATCH 15/30] child Vaccines --- .../add_new_child_view_model.dart | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 lib/core/viewModels/child_vaccines/add_new_child_view_model.dart diff --git a/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart b/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart new file mode 100644 index 00000000..26355bd7 --- /dev/null +++ b/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart @@ -0,0 +1,28 @@ +import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; +import 'package:diplomaticquarterapp/core/service/childvaccines/add_new_child_service.dart'; + +import '../../../locator.dart'; +import '../base_view_model.dart'; + + +class AddNewChildViewModel extends BaseViewModel{ + + CreteNewBabyService _creteNewBabyService = locator(); + + + + List get creteNewBabyModelList=> _creteNewBabyService.createNewBabyModelList; + getNewBabyOrders({ CreateNewBaby newChild}) async { + setState(ViewState.Busy); + + await _creteNewBabyService.getCreateNewBabyOrders(newChild: newChild); + + if ( _creteNewBabyService.hasError) { + error = _creteNewBabyService.error; + setState(ViewState.Error); + } else + setState(ViewState.Idle); + } + +} From fe17c20bdf19c746989824ccfe114f7af1911fd7 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Tue, 6 Oct 2020 18:04:14 +0300 Subject: [PATCH 16/30] child Vaccines --- lib/config/config.dart | 5 + .../childvaccines/add_newchild_model.dart | 100 ++++++++++++++++++ .../childvaccines/add_new_child_service.dart | 26 +++++ lib/locator.dart | 7 ++ 4 files changed, 138 insertions(+) create mode 100644 lib/core/model/childvaccines/add_newchild_model.dart create mode 100644 lib/core/service/childvaccines/add_new_child_service.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index 204148b6..65f1553e 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -78,6 +78,11 @@ const GET_USERINFORMATION_REQUEST= 'Services/Community.svc/REST/GetUserInformation_New'; +///addNewChild +const GET_NEWCHILD_REQUEST= + 'Services/Community.svc/REST/CreateNewBaby'; + + ///BloodDenote diff --git a/lib/core/model/childvaccines/add_newchild_model.dart b/lib/core/model/childvaccines/add_newchild_model.dart new file mode 100644 index 00000000..9bbfe6ad --- /dev/null +++ b/lib/core/model/childvaccines/add_newchild_model.dart @@ -0,0 +1,100 @@ +class CreateNewBaby { + String babyName; + String gender; + String strDOB; + int editedBy; + int createdBy; + bool tempValue; + int userID; + bool isLogin; + int alertBy; + 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; + + CreateNewBaby( + {this.babyName, + this.gender, + this.strDOB, + this.editedBy, + this.createdBy, + this.tempValue, + this.userID, + this.isLogin, + this.alertBy, + 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}); + + CreateNewBaby.fromJson(Map json) { + babyName = json['BabyName']; + gender = json['Gender']; + strDOB = json['StrDOB']; + editedBy = json['EditedBy']; + createdBy = json['CreatedBy']; + tempValue = json['TempValue']; + userID = json['UserID']; + isLogin = json['IsLogin']; + alertBy = json['AlertBy']; + 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']; + } + + Map toJson() { + final Map data = new Map(); + data['BabyName'] = this.babyName; + data['Gender'] = this.gender; + data['StrDOB'] = this.strDOB; + data['EditedBy'] = this.editedBy; + data['CreatedBy'] = this.createdBy; + data['TempValue'] = this.tempValue; + data['UserID'] = this.userID; + data['IsLogin'] = this.isLogin; + data['AlertBy'] = this.alertBy; + 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; + return data; + } +} \ No newline at end of file diff --git a/lib/core/service/childvaccines/add_new_child_service.dart b/lib/core/service/childvaccines/add_new_child_service.dart new file mode 100644 index 00000000..22a081a3 --- /dev/null +++ b/lib/core/service/childvaccines/add_new_child_service.dart @@ -0,0 +1,26 @@ +import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; +import '../base_service.dart'; + +class CreteNewBabyService extends BaseService { + List createNewBabyModelList = List(); + + + Future getCreateNewBabyOrders({ CreateNewBaby newChild}) async { + hasError = false; + await baseAppClient.post(GET_NEWCHILD_REQUEST, + onSuccess: (dynamic response, int statusCode) { + createNewBabyModelList.clear(); + + response['List_UserInformationModel_New'].forEach((vital) { + createNewBabyModelList.add( + CreateNewBaby.fromJson(vital)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: newChild.toJson()); + } + +} \ No newline at end of file diff --git a/lib/locator.dart b/lib/locator.dart index b57a63a1..dee65ccc 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -11,6 +11,7 @@ import 'core/service/AuthenticatedUserObject.dart'; import 'core/service/appointment_rate_service.dart'; import 'core/service/blood/blood_details_servies.dart'; import 'core/service/blood/blood_donation_service.dart'; +import 'core/service/childvaccines/add_new_child_service.dart'; import 'core/service/childvaccines/child_vaccines_service.dart'; import 'core/service/childvaccines/user_information_service.dart'; import 'core/service/contactus/finadus_service.dart'; @@ -40,6 +41,7 @@ import 'core/viewModels/all_habib_medical_services/e_referral_view_model.dart'; import 'core/viewModels/appointment_rate_view_model.dart'; import 'core/viewModels/blooddonation/blood_details_view_model.dart'; import 'core/viewModels/blooddonation/booddonation_view_model.dart'; +import 'core/viewModels/child_vaccines/add_new_child_view_model.dart'; import 'core/viewModels/child_vaccines/child_vaccines_view_model.dart'; import 'core/viewModels/contactus/findus_view_model.dart'; import 'core/viewModels/contactus/livechat_view_model.dart'; @@ -118,6 +120,8 @@ void setupLocator() { locator.registerLazySingleton(() => BloodDetailsService()); locator.registerLazySingleton(() => ChildVaccinesService()); locator.registerLazySingleton(() => UserInformationService()); + locator.registerLazySingleton(() => CreteNewBabyService()); + /// View Model locator.registerFactory(() => HospitalViewModel()); @@ -147,6 +151,9 @@ void setupLocator() { locator.registerFactory(() => BloodDeatailsViewModel()); locator.registerFactory(() => ChildVaccinesViewModel()); locator.registerFactory(() => UserInformationViewModel()); + locator.registerFactory(() => UserInformationViewModel()); + + locator.registerFactory(() => AddNewChildViewModel()); locator.registerFactory(() => H2OViewModel()); locator.registerFactory(() => BloodSugarViewMode()); From 1d29aa36a2f3f48a18ba0cff506e1b41ee0abc5b Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Wed, 7 Oct 2020 10:39:42 +0300 Subject: [PATCH 17/30] child Vaccines --- lib/config/config.dart | 4 + .../create_vaccination_table.dart | 25 ++ .../childvaccines/child_vaccines_service.dart | 9 +- .../user_information_service.dart | 13 +- .../vaccination_table_service.dart | 39 +++ .../vaccination_table_view_model.dart | 30 +++ lib/locator.dart | 7 +- .../ChildVaccines/add_newchild_page.dart | 10 +- lib/pages/ChildVaccines/child_page.dart | 34 ++- .../ChildVaccines/child_vaccines_page.dart | 1 + .../dialogs/SelectGenderDialog.dart | 146 +++++++++++ lib/pages/ChildVaccines/new_text_Field.dart | 239 ------------------ .../ChildVaccines/vaccinationtable_page.dart | 136 ++++++++++ 13 files changed, 435 insertions(+), 258 deletions(-) create mode 100644 lib/core/model/childvaccines/create_vaccination_table.dart create mode 100644 lib/core/service/childvaccines/vaccination_table_service.dart create mode 100644 lib/core/viewModels/child_vaccines/vaccination_table_view_model.dart create mode 100644 lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart delete mode 100644 lib/pages/ChildVaccines/new_text_Field.dart create mode 100644 lib/pages/ChildVaccines/vaccinationtable_page.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index 65f1553e..2f497de2 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -83,6 +83,10 @@ const GET_NEWCHILD_REQUEST= 'Services/Community.svc/REST/CreateNewBaby'; +///addNewTABLE +const GET_TABLE_REQUEST= + 'Services/Community.svc/REST/CreateVaccinationTable'; + ///BloodDenote diff --git a/lib/core/model/childvaccines/create_vaccination_table.dart b/lib/core/model/childvaccines/create_vaccination_table.dart new file mode 100644 index 00000000..d39f2a64 --- /dev/null +++ b/lib/core/model/childvaccines/create_vaccination_table.dart @@ -0,0 +1,25 @@ +class CreateVaccinationTable { + String givenAt; + String status; + String vaccinesDescription; + String visit; + + CreateVaccinationTable( + {this.givenAt, this.status, this.vaccinesDescription, this.visit}); + + CreateVaccinationTable.fromJson(Map json) { + givenAt = json['GivenAt']; + status = json['Status']; + vaccinesDescription = json['VaccinesDescription']; + visit = json['Visit']; + } + + Map toJson() { + final Map data = new Map(); + data['GivenAt'] = this.givenAt; + data['Status'] = this.status; + data['VaccinesDescription'] = this.vaccinesDescription; + data['Visit'] = this.visit; + return data; + } +} \ No newline at end of file diff --git a/lib/core/service/childvaccines/child_vaccines_service.dart b/lib/core/service/childvaccines/child_vaccines_service.dart index 097f6bb0..75a07338 100644 --- a/lib/core/service/childvaccines/child_vaccines_service.dart +++ b/lib/core/service/childvaccines/child_vaccines_service.dart @@ -1,3 +1,5 @@ +import 'dart:convert'; + import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; @@ -6,13 +8,16 @@ import '../base_service.dart'; class ChildVaccinesService extends BaseService { List babyInformationModelList = List(); List userInformationModelList = List(); + Map body = Map(); Future getAllBabyInformationOrders() async { hasError = false; + body['isDentalAllowedBackend'] = false; body['IsLogin'] = true; - // body['UserID'] = babyInformationModelList[0].userID; - body['UserID'] = 42843; + + //body['UserID'] = userInformationModelList[0].userID;//AuthenticatedUser.fromJson(json['List'][0] //babyInformationModelList[0].userID; + body['UserID'] = 46013;//42843; await baseAppClient.post(GET_BABYINFORMATION_REQUEST, diff --git a/lib/core/service/childvaccines/user_information_service.dart b/lib/core/service/childvaccines/user_information_service.dart index 9082039f..7651ef0f 100644 --- a/lib/core/service/childvaccines/user_information_service.dart +++ b/lib/core/service/childvaccines/user_information_service.dart @@ -12,9 +12,16 @@ class UserInformationService extends BaseService{ Future getUserInformationOrders() async { hasError = false; - // body['isDentalAllowedBackend'] = false; - // body['IsLogin'] = true; - // body['UserID'] = 42843; + await getUser(); + body['CreatedBy'] = 102; + body['EditedBy'] = 102; + body['EmailAddress'] = user.emailAddress; + body['IsLogin'] =true; + body['LogInTokenID'] = 'ZBGoQFUG50eQJd6Y7u1ykA=='; + body['MobileNumber'] = user.mobileNumber; + body['NationalID'] = user.nationalityID; + body['ZipCode'] = user.zipCode; + body['isDentalAllowedBackend'] = false; await baseAppClient.post(GET_USERINFORMATION_REQUEST, diff --git a/lib/core/service/childvaccines/vaccination_table_service.dart b/lib/core/service/childvaccines/vaccination_table_service.dart new file mode 100644 index 00000000..7f987b76 --- /dev/null +++ b/lib/core/service/childvaccines/vaccination_table_service.dart @@ -0,0 +1,39 @@ +import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/create_vaccination_table.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; +import '../base_service.dart'; + +class VaccinationTableService extends BaseService { + List createVaccinationTableModelList = List(); + Map body = Map(); + + + + Future getCreateVaccinationTableOrders() async { + hasError = false; + await getUser(); + body['BabyName']="fffffffffff eeeeeeeeeeeeee"; + body['DOB'] = "/Date(1585774800000+0300)/"; + body['EmailAddress'] = user.emailAddress; + body['isDentalAllowedBackend'] = false; + body['SendEmail'] = false; + body['IsLogin'] =true; + + + + + await baseAppClient.post(GET_TABLE_REQUEST, + onSuccess: (dynamic response, int statusCode) { + createVaccinationTableModelList.clear(); + response['List_CreateVaccinationTableModel'].forEach((vital) { + createVaccinationTableModelList.add( + CreateVaccinationTable.fromJson(vital)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } + +} \ No newline at end of file diff --git a/lib/core/viewModels/child_vaccines/vaccination_table_view_model.dart b/lib/core/viewModels/child_vaccines/vaccination_table_view_model.dart new file mode 100644 index 00000000..3b72dd50 --- /dev/null +++ b/lib/core/viewModels/child_vaccines/vaccination_table_view_model.dart @@ -0,0 +1,30 @@ +import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/create_vaccination_table.dart'; +import 'package:diplomaticquarterapp/core/service/childvaccines/add_new_child_service.dart'; +import 'package:diplomaticquarterapp/core/service/childvaccines/vaccination_table_service.dart'; + +import '../../../locator.dart'; +import '../base_view_model.dart'; + + +class VaccinationTableViewModel extends BaseViewModel{ + + VaccinationTableService _creteVaccinationTableService = locator(); + + // String get creteVaccinationTableContent => _creteVaccinationTableService.userAgreementContent; + //String get userAgreementContent => _creteNewBabyService.v//_reportsService.userAgreementContent; + List get creteVaccinationTableModelList=> _creteVaccinationTableService.createVaccinationTableModelList;//.createNewBabyModelList; + getCreateVaccinationTable() async { + setState(ViewState.Busy); + + await _creteVaccinationTableService.getCreateVaccinationTableOrders();//getCreateNewBabyOrders(); + + if ( _creteVaccinationTableService.hasError) { + error = _creteVaccinationTableService.error; + setState(ViewState.Error); + } else + setState(ViewState.Idle); + } + +} diff --git a/lib/locator.dart b/lib/locator.dart index dee65ccc..46b97fce 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -14,6 +14,7 @@ import 'core/service/blood/blood_donation_service.dart'; import 'core/service/childvaccines/add_new_child_service.dart'; import 'core/service/childvaccines/child_vaccines_service.dart'; import 'core/service/childvaccines/user_information_service.dart'; +import 'core/service/childvaccines/vaccination_table_service.dart'; import 'core/service/contactus/finadus_service.dart'; import 'core/service/contactus/livechat_service.dart'; import 'core/service/dashboard_service.dart'; @@ -43,6 +44,7 @@ import 'core/viewModels/blooddonation/blood_details_view_model.dart'; import 'core/viewModels/blooddonation/booddonation_view_model.dart'; import 'core/viewModels/child_vaccines/add_new_child_view_model.dart'; import 'core/viewModels/child_vaccines/child_vaccines_view_model.dart'; +import 'core/viewModels/child_vaccines/vaccination_table_view_model.dart'; import 'core/viewModels/contactus/findus_view_model.dart'; import 'core/viewModels/contactus/livechat_view_model.dart'; import 'core/viewModels/er/am_request_view_model.dart'; @@ -121,6 +123,7 @@ void setupLocator() { locator.registerLazySingleton(() => ChildVaccinesService()); locator.registerLazySingleton(() => UserInformationService()); locator.registerLazySingleton(() => CreteNewBabyService()); + locator.registerLazySingleton(() => VaccinationTableService()); /// View Model @@ -151,7 +154,9 @@ void setupLocator() { locator.registerFactory(() => BloodDeatailsViewModel()); locator.registerFactory(() => ChildVaccinesViewModel()); locator.registerFactory(() => UserInformationViewModel()); - locator.registerFactory(() => UserInformationViewModel()); + locator.registerFactory(() => VaccinationTableViewModel()); + + locator.registerFactory(() => AddNewChildViewModel()); locator.registerFactory(() => H2OViewModel()); diff --git a/lib/pages/ChildVaccines/add_newchild_page.dart b/lib/pages/ChildVaccines/add_newchild_page.dart index f4f2db94..a24fa5a4 100644 --- a/lib/pages/ChildVaccines/add_newchild_page.dart +++ b/lib/pages/ChildVaccines/add_newchild_page.dart @@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/add_new_child_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart'; +import 'package:diplomaticquarterapp/pages/Blood/new_text_Field.dart'; import 'package:diplomaticquarterapp/pages/ChildVaccines/add_newchild_page.dart'; import 'package:diplomaticquarterapp/pages/ChildVaccines/child_page.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; @@ -18,7 +19,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; -import 'new_text_Field.dart'; + enum Gender { Male, Female, NON } enum BeneficiaryType { MyAccount, MyFamilyFiles, OtherAccount, NON } @@ -260,12 +261,15 @@ class _AddNewChildPageState extends State { _firstTextController.text + " " + _secondTextController.text; newChild.gender = checkedValue.toString(); newChild.strDOB=getStartDay() ; + newChild.alertBy=addvancedModel.alertBy; newChild.createdBy=informationModel.createdBy ; newChild.editedBy=informationModel.createdBy; newChild.tempValue=true; - newChild.userID=addvancedModel.userID; + // newChild.userID=46013;//informationModel.userID; newChild.isLogin=true; - newChild.alertBy=addvancedModel.alertBy; + //newChild.tokenID='qMgbP94U23RkXtWWT0Sw=='; + //'ZBGoQFUG50eQJd6Y7u1ykA=='; + model.getNewBabyOrders(newChild: newChild); diff --git a/lib/pages/ChildVaccines/child_page.dart b/lib/pages/ChildVaccines/child_page.dart index 54e2b60d..c657b3ca 100644 --- a/lib/pages/ChildVaccines/child_page.dart +++ b/lib/pages/ChildVaccines/child_page.dart @@ -1,6 +1,7 @@ import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart'; import 'package:diplomaticquarterapp/pages/ChildVaccines/add_newchild_page.dart'; +import 'package:diplomaticquarterapp/pages/ChildVaccines/vaccinationtable_page.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; @@ -43,17 +44,18 @@ class _ChildPageState extends State with SingleTickerProviderStateMix color: Colors.white, ), - width: 150, + padding: EdgeInsets.all(12), + width: double.infinity, child: Column( children: [ Row(children:[Texts("CHILD NAME"),]), - Row(children:[Texts(model.babyInformationModelList[index].babyName),]), + Row(children:[Texts(model.babyInformationModelList[index].babyName.trim()),]), Row( children: [IconButton( - icon: new Image.asset('assets/images/new-design/female.png'), - tooltip: 'Increase volume by 10', + icon: Image.asset(model.babyInformationModelList[index].gender==1? 'assets/images/new-design/male.png':'assets/images/new-design/female.png'), + tooltip: '', onPressed: () { setState(() { // _volume += 10; @@ -61,15 +63,27 @@ class _ChildPageState extends State with SingleTickerProviderStateMix }); }, ), - Texts(model.babyInformationModelList[index].babyName), + Texts(model.babyInformationModelList[index].genderDescription), IconButton( - icon: Icon(Icons.remove_red_eye_outlined,color: Colors.red,), + icon: Icon(Icons.remove_red_eye,color: Colors.red,), tooltip: 'Increase volume by 10', onPressed: () { - setState(() { - // _volume += 10; - // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - }); + Navigator.push( + context, + FadePage( + page: VaccinationTablePage(), + + //ChildPage(babyInformationModelList:model.BabyInformationModelList) + // HospitalsPage( + // findusHospitalModelList: model.FindusHospitalModelList, + // ) + + ), + ); + // setState(() { + // // _volume += 10; + // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + // }); }, )] ), diff --git a/lib/pages/ChildVaccines/child_vaccines_page.dart b/lib/pages/ChildVaccines/child_vaccines_page.dart index 269c9259..ba4589a9 100644 --- a/lib/pages/ChildVaccines/child_vaccines_page.dart +++ b/lib/pages/ChildVaccines/child_vaccines_page.dart @@ -32,6 +32,7 @@ class _ChildVaccinesPageState extends State onModelReady: (model) => model.getUserInformatioRequestOrders(), builder: (_, model, w) => AppScaffold( isShowAppBar: true, + baseViewModel: model, appBarTitle: " Vaccination",//TranslationBase.of(context).advancePayment, body: SingleChildScrollView( physics: ScrollPhysics(), diff --git a/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart b/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart new file mode 100644 index 00000000..295c6dcd --- /dev/null +++ b/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart @@ -0,0 +1,146 @@ +import 'package:diplomaticquarterapp/pages/Blood/blood_donation.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class SelectGenderDialog extends StatefulWidget { + final Gender beneficiaryType; + final Function(Gender) onValueSelected; + + SelectGenderDialog({Key key, this.beneficiaryType, this.onValueSelected}); + + @override + _SelectGenderDialogState createState() => + _SelectGenderDialogState(this.beneficiaryType); +} + +class _SelectGenderDialogState extends State { + _SelectGenderDialogState(this.beneficiaryType); + Gender beneficiaryType; + + @override + Widget build(BuildContext context) { + return SimpleDialog( + children: [ + Container( + child: Column( + children: [ + Divider(), + Row( + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () { + setState(() { + beneficiaryType = Gender.Male; + }); + }, + child: ListTile( + title: Text("Male"), + leading: Radio( + value: Gender.Male, + groupValue: beneficiaryType, + activeColor: Colors.red[800], + onChanged: (Gender value) { + setState(() { + beneficiaryType = value; + }); + }, + ), + ), + ), + ) + ], + ), + SizedBox( + height: 5.0, + ), + Row( + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () { + setState(() { + beneficiaryType = Gender.Female; + }); + }, + child: ListTile( + title: Text("Female"), + leading: Radio( + value: Gender.Female, + groupValue: beneficiaryType, + activeColor: Colors.red[800], + onChanged: (Gender value) { + setState(() { + beneficiaryType = value; + }); + }, + ), + ), + ), + ) + ], + ), + SizedBox( + height: 5.0, + ), + SizedBox( + height: 5.0, + ), + Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () { + Navigator.pop(context); + }, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Container( + child: Center( + child: Texts( + TranslationBase.of(context).cancel.toUpperCase(), + color: Colors.red, + ), + ), + ), + ), + ), + ), + Container( + width: 1, + height: 30, + color: Colors.grey[500], + ), + Expanded( + flex: 1, + child: InkWell( + onTap: () { + widget.onValueSelected(beneficiaryType); + Navigator.pop(context); + }, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Center( + child: Texts( + TranslationBase.of(context).ok, + fontWeight: FontWeight.w400, + ), + ), + ), + ), + ), + ], + ) + ], + ), + ) + ], + ); + } +} diff --git a/lib/pages/ChildVaccines/new_text_Field.dart b/lib/pages/ChildVaccines/new_text_Field.dart deleted file mode 100644 index ad9eb580..00000000 --- a/lib/pages/ChildVaccines/new_text_Field.dart +++ /dev/null @@ -1,239 +0,0 @@ -import 'package:eva_icons_flutter/eva_icons_flutter.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; - -class NumberTextInputFormatter extends TextInputFormatter { - @override - TextEditingValue formatEditUpdate( - TextEditingValue oldValue, TextEditingValue newValue) { - final int newTextLength = newValue.text.length; - int selectionIndex = newValue.selection.end; - int usedSubstringIndex = 0; - final StringBuffer newText = StringBuffer(); - if (newTextLength >= 1) { - newText.write('('); - if (newValue.selection.end >= 1) selectionIndex++; - } - if (newTextLength >= 4) { - newText.write(newValue.text.substring(0, usedSubstringIndex = 3) + ') '); - if (newValue.selection.end >= 3) selectionIndex += 2; - } - if (newTextLength >= 7) { - newText.write(newValue.text.substring(3, usedSubstringIndex = 6) + '-'); - if (newValue.selection.end >= 6) selectionIndex++; - } - if (newTextLength >= 11) { - newText.write(newValue.text.substring(6, usedSubstringIndex = 10) + ' '); - if (newValue.selection.end >= 10) selectionIndex++; - } - // Dump the rest. - if (newTextLength >= usedSubstringIndex) - newText.write(newValue.text.substring(usedSubstringIndex)); - return TextEditingValue( - text: newText.toString(), - selection: TextSelection.collapsed(offset: selectionIndex), - ); - } -} - -final _mobileFormatter = NumberTextInputFormatter(); - -class NewTextFields extends StatefulWidget { - NewTextFields( - {Key key, - this.type, - this.hintText, - this.suffixIcon, - this.autoFocus, - this.onChanged, - this.initialValue, - this.minLines, - this.maxLines, - this.inputFormatters, - this.padding, - this.focus = false, - this.maxLengthEnforced = true, - this.suffixIconColor, - this.inputAction, - this.onSubmit, - this.keepPadding = true, - this.textCapitalization = TextCapitalization.none, - this.controller, - this.keyboardType, - this.validator, - this.borderOnlyError = false, - this.onSaved, - this.onSuffixTap, - this.readOnly: false, - this.maxLength, - this.prefixIcon, - this.bare = false, - this.onTap, - this.fontSize = 16.0, - this.fontWeight = FontWeight.w700, - this.autoValidate = false, - this.hintColor,this.isEnabled=true}) - : super(key: key); - - final String hintText; - - // final String initialValue; - final String type; - final bool autoFocus; - final IconData suffixIcon; - final Color suffixIconColor; - final Icon prefixIcon; - final VoidCallback onTap; - final TextEditingController controller; - final TextInputType keyboardType; - final FormFieldValidator validator; - final Function onSaved; - final Function onSuffixTap; - final Function onChanged; - final Function onSubmit; - final bool readOnly; - final int maxLength; - final int minLines; - final int maxLines; - final bool maxLengthEnforced; - final bool bare; - final bool isEnabled; - final TextInputAction inputAction; - final double fontSize; - final FontWeight fontWeight; - final bool keepPadding; - final TextCapitalization textCapitalization; - final List inputFormatters; - final bool autoValidate; - final EdgeInsets padding; - final bool focus; - final bool borderOnlyError; - final Color hintColor; - final String initialValue; - @override - _NewTextFieldsState createState() => _NewTextFieldsState(); -} - -class _NewTextFieldsState extends State { - final FocusNode _focusNode = FocusNode(); - bool focus = false; - bool view = false; - - @override - void initState() { - super.initState(); - _focusNode.addListener(() { - setState(() { - focus = _focusNode.hasFocus; - }); - }); - } - - @override - void didUpdateWidget(NewTextFields oldWidget) { - if (widget.focus) _focusNode.requestFocus(); - super.didUpdateWidget(oldWidget); - } - - @override - void dispose() { - _focusNode.dispose(); - super.dispose(); - } - - - bool _determineReadOnly() { - if (widget.readOnly != null && widget.readOnly) { - _focusNode.unfocus(); - return true; - } else { - return false; - } - } - - @override - Widget build(BuildContext context) { - return AnimatedContainer( - duration: Duration(milliseconds: 300), - decoration:BoxDecoration( - borderRadius: BorderRadius.circular(12), - color: Colors.white), - child: Container( - margin: EdgeInsets.only(top: 8), - - child: TextFormField( - enabled: widget.isEnabled, - initialValue: widget.initialValue, - keyboardAppearance: Theme.of(context).brightness, - scrollPhysics: BouncingScrollPhysics(), - autovalidate: widget.autoValidate, - textCapitalization: widget.textCapitalization, - onFieldSubmitted: widget.inputAction == TextInputAction.next - ? (widget.onSubmit != null - ? widget.onSubmit - : (val) { - _focusNode.nextFocus(); - }) - : widget.onSubmit, - textInputAction: widget.inputAction, - minLines: widget.minLines ?? 1, - maxLines: widget.maxLines ?? 1, - maxLengthEnforced: widget.maxLengthEnforced, - onChanged: widget.onChanged, - focusNode: _focusNode, - maxLength: widget.maxLength ?? null, - controller: widget.controller, - keyboardType: widget.keyboardType, - readOnly: _determineReadOnly(), - obscureText: widget.type == "password" && !view ? true : false, - autofocus: widget.autoFocus ?? false, - validator: widget.validator, - onSaved: widget.onSaved, - - style: Theme.of(context) - .textTheme - .body2 - .copyWith(fontSize: widget.fontSize, fontWeight: widget.fontWeight), - inputFormatters: widget.keyboardType == TextInputType.phone - ? [ - WhitelistingTextInputFormatter.digitsOnly, - _mobileFormatter, - ] - : widget.inputFormatters, - decoration: InputDecoration( - labelText: widget.hintText, - labelStyle: TextStyle(color: Colors.black), - errorBorder: OutlineInputBorder( - borderSide: BorderSide( - color: Theme.of(context) - .errorColor - .withOpacity(0.5), - width: 1.0), - borderRadius: BorderRadius.circular(12.0)), - focusedErrorBorder: OutlineInputBorder( - borderSide: BorderSide( - color: Theme.of(context) - .errorColor - .withOpacity(0.5), - width: 1.0), - borderRadius: BorderRadius.circular(8.0)), - focusedBorder: OutlineInputBorder( - borderSide: - BorderSide(color: Colors.white, width: 1.0), - borderRadius: BorderRadius.circular(12)), - disabledBorder: OutlineInputBorder( - borderSide: - BorderSide(color: Colors.white, width: 1.0), - borderRadius: BorderRadius.circular(12)), - enabledBorder: OutlineInputBorder( - borderSide: - BorderSide(color: Colors.white, width: 1.0), - borderRadius: BorderRadius.circular(12), - ), - ), - ), - ), - ); - } -} diff --git a/lib/pages/ChildVaccines/vaccinationtable_page.dart b/lib/pages/ChildVaccines/vaccinationtable_page.dart new file mode 100644 index 00000000..8039765e --- /dev/null +++ b/lib/pages/ChildVaccines/vaccinationtable_page.dart @@ -0,0 +1,136 @@ +import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/vaccination_table_view_model.dart'; +import 'package:diplomaticquarterapp/core/viewModels/medical/reports_monthly_view_model.dart'; +import 'package:diplomaticquarterapp/pages/base/base_view.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_html/flutter_html.dart'; +import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; + +class VaccinationTablePage extends StatelessWidget { + @override + Widget build(BuildContext context) { + var checkedValue; + return BaseView( + onModelReady: (model) => model.getCreateVaccinationTable(),//getUserTermsAndConditions(), + builder: (_, model, w) => AppScaffold( + isShowAppBar: true, + baseViewModel: model, + appBarTitle: "Vaccination", + body: SingleChildScrollView( + child:Container( + margin: EdgeInsets.only(left: 15,right: 15,top: 70), + child: Column( + children: [//babyInformationModelList.length + ...List.generate(model.creteVaccinationTableModelList.length, (index) => + Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + border: Border.all(color: Colors.white, width: 0.5), + borderRadius: BorderRadius.all(Radius.circular(5)), + color: Colors.white, + + ), + padding: EdgeInsets.all(12), + width: double.infinity, + child: Column( + + children: [ + Html( + data:"
BCG
HEPATITIS B
"//model.creteVaccinationTableModelList[index].vaccinesDescription + , + ), + // Row(children:[Texts("CHILD NAME"),]), + // Row(children:[Texts(model.babyInformationModelList[index].babyName.trim()),]), + + // Row( + // children: [IconButton( + // icon: Image.asset(model.babyInformationModelList[index].gender==1? 'assets/images/new-design/male.png':'assets/images/new-design/female.png'), + // tooltip: '', + // onPressed: () { + // setState(() { + // // _volume += 10; + // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + // }); + // }, + // ), + // Texts(model.babyInformationModelList[index].genderDescription), + // IconButton( + // icon: Icon(Icons.remove_red_eye,color: Colors.red,), + // tooltip: 'Increase volume by 10', + // onPressed: () { + // Navigator.push( + // context, + // FadePage( + // page: VaccinationTablePage(), + // + // //ChildPage(babyInformationModelList:model.BabyInformationModelList) + // // HospitalsPage( + // // findusHospitalModelList: model.FindusHospitalModelList, + // // ) + // + // ), + // ); + // // setState(() { + // // // _volume += 10; + // // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + // // }); + // }, + // )] + // ), + // Row(children:[Texts("Birthday"),]), + // Row(children:[IconButton( + // icon: new Image.asset('assets/images/new-design/calender-secondary.png'), + // tooltip: 'Increase volume by 10', + // onPressed: () { + // setState(() { + // // _volume += 10; + // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + // }); + // }, + // ), + // Texts(DateUtil.yearMonthDay(model.babyInformationModelList[index].dOB)),]), + // Row(children:[IconButton( + // icon: new Image.asset('assets/images/new-design/garbage.png'), + // tooltip: '', + // onPressed: () { + // setState(() { + // // _volume += 10; + // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + // }); + // }, + // ), + // Texts("Birthday"),]), + ], + ) + + + ) + + ) + ], + ), + + ), + ), + bottomSheet: Container( + height: MediaQuery.of(context).size.height * 0.12, + width: double.infinity, + + padding: EdgeInsets.all(12), + child: SecondaryButton( + textColor: Colors.white, + color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,), + label: " ", + // + onTap: () {} + + + ), + ), + ), + ); + } +} From dcb93bf5cc58071887b871670cded223780bfc64 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Wed, 7 Oct 2020 12:12:15 +0300 Subject: [PATCH 18/30] child Vaccines --- .../ChildVaccines/vaccinationtable_page.dart | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/lib/pages/ChildVaccines/vaccinationtable_page.dart b/lib/pages/ChildVaccines/vaccinationtable_page.dart index 8039765e..952cfb0c 100644 --- a/lib/pages/ChildVaccines/vaccinationtable_page.dart +++ b/lib/pages/ChildVaccines/vaccinationtable_page.dart @@ -38,10 +38,27 @@ class VaccinationTablePage extends StatelessWidget { child: Column( children: [ - Html( - data:"
BCG
HEPATITIS B
"//model.creteVaccinationTableModelList[index].vaccinesDescription - , - ), + Row(children: [ + Text(model.creteVaccinationTableModelList[index].visit), + SizedBox(width: 10,), + + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Html( + // data:"
BCG
HEPATITIS B
"//model.creteVaccinationTableModelList[index].vaccinesDescription + data:model.creteVaccinationTableModelList[index].vaccinesDescription, + + ), + ],), + ), + Text(model.creteVaccinationTableModelList[index].givenAt), + + + ],), + Divider(color:Colors.black ,), // Row(children:[Texts("CHILD NAME"),]), // Row(children:[Texts(model.babyInformationModelList[index].babyName.trim()),]), @@ -123,7 +140,7 @@ class VaccinationTablePage extends StatelessWidget { child: SecondaryButton( textColor: Colors.white, color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,), - label: " ", + label: "Send Email ", // onTap: () {} From dbda69baa15f9b45cf198ca8273e4844de4e7b0e Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Wed, 7 Oct 2020 12:44:17 +0300 Subject: [PATCH 19/30] health Calculator'General Health' --- assets/images/medical/BMR_calculator.png | Bin 0 -> 3177 bytes .../images/medical/bmi_health_calculator.png | Bin 0 -> 2209 bytes assets/images/medical/body_fat.png | Bin 0 -> 4309 bytes assets/images/medical/body_weight.png | Bin 0 -> 2775 bytes assets/images/medical/calories-calculator.png | Bin 0 -> 3309 bytes assets/images/medical/carb_protein.png | Bin 0 -> 3732 bytes assets/images/medical/delivery_date_icon.png | Bin 0 -> 8713 bytes .../images/medical/ovulation_period_icon.png | Bin 0 -> 2506 bytes .../all_habib_medical_service_page.dart | 5 +- .../bmi_calculator/bmi_calculator.dart | 521 +++++++++ .../bmi_calculator/result_page.dart | 101 ++ .../bmr_calculator/bmr_calculator.dart | 721 ++++++++++++ .../bmr_calculator/bmr_result_page.dart | 65 ++ .../health_calculator/body_fat/body_fat.dart | 1003 +++++++++++++++++ .../body_fat/body_fat_result_page.dart | 77 ++ .../calorie_calculator.dart | 676 +++++++++++ .../calorie_result_page.dart | 59 + .../health_calculator/carbs/carbs.dart | 367 ++++++ .../carbs/carbs_result_page.dart | 175 +++ .../ideal_body/ideal_body.dart | 550 +++++++++ .../ideal_body/ideal_body_result_page.dart | 170 +++ .../health_converter/blood_cholesterol.dart | 2 +- .../​ health_calculators.dart | 279 +++++ pubspec.yaml | 3 + 24 files changed, 4772 insertions(+), 2 deletions(-) create mode 100644 assets/images/medical/BMR_calculator.png create mode 100644 assets/images/medical/bmi_health_calculator.png create mode 100644 assets/images/medical/body_fat.png create mode 100644 assets/images/medical/body_weight.png create mode 100644 assets/images/medical/calories-calculator.png create mode 100644 assets/images/medical/carb_protein.png create mode 100644 assets/images/medical/delivery_date_icon.png create mode 100644 assets/images/medical/ovulation_period_icon.png create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/result_page.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat_result_page.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs_result_page.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body_result_page.dart create mode 100644 lib/pages/AlHabibMedicalService/​ health_calculators.dart diff --git a/assets/images/medical/BMR_calculator.png b/assets/images/medical/BMR_calculator.png new file mode 100644 index 0000000000000000000000000000000000000000..2c32b80da9aa28ade902c8324a2f3d28babeee59 GIT binary patch literal 3177 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 P00000NkvXXu0mjfWD5>` literal 0 HcmV?d00001 diff --git a/assets/images/medical/bmi_health_calculator.png b/assets/images/medical/bmi_health_calculator.png new file mode 100644 index 0000000000000000000000000000000000000000..2eb494408ac68ae525b49b1bfa56bde5aafb376b GIT binary patch literal 2209 zcmV;S2wwMzP)7000PRNkl zX>3(R6vzLRDwG1Ph_WeEL5YF}P_Z9Six`o(A!^hRMfsv8H6X?iBjCaZjSDs!_aG*a zh=c@jiAW+s+&~3E0^$lNQZ{8(inM*^;JIWv%-nnC&b^Pm_WqJdU+;46%y~0sX3m_s zuMLi+9e_aq`U2<-puORmmcTv$n*n?V;E=66T>#Vo*b5-niV`X3F|G_vI0L|MtxOqu z`W!$fQc4?6UjV2CPzPWlfQ9_Ir9-A+47ZRI04(7DF-+0e9i)_A$^oktZsFvV;teTkrAi2+EK`bsVgMzM_gqNE2taoLZS#`Lc+>-^ z1@H-gRW1^WO@kH-JpjxGFygosGd>>yxD&uOi3Dl$=?dV>0#yhxl6#mgl8dEEc?Liq z0Mh}Ss0{iFAyG?s8bCh)Pf4}-jxuneiJ(pychxzrF@;Ds&Oeo-qapuQiVikOYRUkv z9bn^Chy>#=D#v+I`7ag}@KnJyG?6-4J4Un5zapMp%CmAQ?K$mHuJ6Jwj)1xdgW4_X zSxJmjUgv^s)Y6{-wsSi!)9$I_j8oy}Dm5{T+W_nWup7Y3%5~GU=gv)_Op!Kav~s>& zJ9n{gTE2nDH36%%^EDB9yg;#QL8|0)HQI60{H);sDP|8wHud*#siK_A!DFZCBBhRLgzeprqvJa)&y@v&|$iA!wFjd$qB~BVj z33?K;0~Ol2UxhMeC7dTGic@Gp6D-H6mb_~@w@({@>HGtrL$cYlQxuVzB$*vD(xeIJ z&mqsM&Ql(bkk2l8jAb%L><4hO#Yg-iFFoXqG?cQ2lU^&R%e^k-J~FP8v|}{#eISKA zhLVP%4WT<^xiaXO+DHPMO zJmQ*<0SpE3t>?4yhObTe7r-U#CpkqscYvGBABOwJay&@D+KA`;ZE!-Z;J-69Z`&@n zA{>iEDSIN$*K>_=;RDC(53}3U#9Dz;UCJYBJ{y!!1ykT)ArP#2=L|lcSW2Pc`eOb( zD&pGa%JrPD#gg@8sZF6cxUbmx{IJkj)LbCjbq@D{6D4^n7Wyfu%3TRyzF_{+93f+W zlcebcN|Cz!mh-Uvb^wb;Dh869am*+yt z)}*FDsFZ#l;oZwvMq74J$C05%FRb*)OHYYXq}A^<;dLhZ@Uc!o?0XDOQf|>hK3tH5 zmE_fRP%!vR2(M;$qYkYh-z}6ei9KMl~|lRePSvB_Ikp zH{lbCF*WW(6~-qZV#*6@*$6gi0;X)W2{v1Su2ZP2{u_n0!&*cFkZ z$UvPml1ge*cCd44s!lu@twWmIA{pR+wy2M6%qGLKCLeU#5GGia5znj9-qrT8qD2G1y% zC0Cze{)3hk{?W=ZWfU)1_6$>Zd!JCoLd)WNSKd(RjE_?0TbxW44oX>KDbOAVrI68m z(~^%^O3Aup1DR3`WJ)oRDaC+~p{=xx8C=E@11(kSfJA9+C0`U$@s|fl7_(uZ<}qX9-_5BK4;{5hILZD+d+_jN_PC7a99` zOMd{_kDZP(DBgEUNZFc92-~nyf{D^#%MxTjiR1+eOg(=yx?i-Iy?2tiQ1I>QuF&AE zW76=l?GfQ!Rmz(7W>-Ud(6cFl3%J=+Mx%$nHxd`6jNnP2w5zM`i;UQ>K=Dz^8jpJe=EyD!WpdIl zEYF&c0jW}UdORbDz&_ydF8%|`XK~<-fv|U39!07Y3OWBUMkX4R*OJk!`S}+H1xr4y846x>DvN`Y2I;v4z4hrO}Tqh2HGd%ds9x0^h_? z4x1tc)p7eP)K@pVP|Uvr(2o7jRUGDel))bE!a`5$RC}s>u}E{|+_{P^d`talEP`4D j`DUo2A!pbBEd#)RN<(b-`aAnp00000NkvXXu0mjfec~A1 literal 0 HcmV?d00001 diff --git a/assets/images/medical/body_fat.png b/assets/images/medical/body_fat.png new file mode 100644 index 0000000000000000000000000000000000000000..3dd3615078a66ed8457e11edda369a7b682b952f GIT binary patch literal 4309 zcmV;`5GwD9P)d(cru)2p-T!s>UAv45 z58oxCBZz1pBHD$Bwj`p>iKvl?{!2u2h-f?!jU}QF9KCNxL_>+FKN0mNq6Q+WBcc^V zw3LYE646^k^fJR?o_R144IrXDiKr7eRuj<|L^KZ^&lAz~0vyLy!QMpl6cIHOQBGN2 zC8A+O6#e*m5z)OwwA_Q^bt3vH5tW0ZI}zPUL|=Juyh}u<5K-mEJ_$AWQp{uwB%+;& zs5YUV`LZ7O7@(wLzPwRHv@Qk53?jOXh}NXwn1>Z&qk;Lg?@L6tqw}s8Gt1i@n9M;$ zv?S$(6--OHp~y=IUJ|WF}cHhxw)cD~}U4k%&4gJ8dT9u>_9y z@Fi$ag_CTY<6|P)UCCj7MArtqtC0gAfC3<|xLMgD^XoeY+K75+6ZRmY^Re6|wV4V{ zh7ZhujU=K;_%+``MC}6x;6x(&Cp0B@K?~!Ht5W<}&GOqL9}{Ot*9s5+2+NLyWfNfRg5LzYnVvh%V6-#esC!IYXsYuu-~Rd1r*}D z;LtEGu)p8I%5@15Z70;71G#vu??WnK_;dXtLiVzq9SUaiMQ;|s7hxw1WSsXwn2JKt z12(fb@BJ{AhQPe%t%@&hLp|0QATwnJi`3Fm(~JbM&h1pyF7UOJ$=_U=@C-55U^@SPm{xyO3f{eYc#xrBy zJE_4oko399GFIiIGwf&=9CQW;*wQq-L-NEsG-KWfbD6QNXe;O? zH*lS3BW!}k$!6QqWaSk{Fyo(i>OD;O%8n_Xu_;(Q%Z&e+q)y+-G?-H8F3v@O{=!G| z^Q2dt$TT=(Qy%`drhMLRP{UMgRCIDnMku^l`H~e(VBrK0L3X5rV=)o!s^sVg z-;Owk8Pt=M9CeJ#`Q46#-EhUk^|KqSVk&kJI>;SWbI_njxKQBWY!k%B5T`a-4$|e zFUE_Qa}75EFndLl#(fQkGXtg(x}`c=!Ck5+xlWKGoL0jj)k*t4vk?s9!k$qF{?7Q; zm0|Ntil>^P=$w>eV+n%wI5gvB(mY4gUk!&;M>8g~VLWx=S>|sowEa&9uH~-^?S?B} z;tHP)*nt58$A^kQzIH;kg=VGa)fk~KzYy9V!nAEMp_2Y%9jqn?01J?%c4PkuorNNG{6*2)OaXg_|V)ta`VO+fOBw^wbt*1Cl+ybYaW#Bp0 zQ_)k4&YvN|VxR=;}~bM`gU-k;zQO(~5hX3I>&e z6R#;}*`4L~vo4$VShgCD7AEYIC~l$>@{ubYQBzL^)g=I`1Po_N4 z4u$}4bB;-w*JLP^0}U+H&pdBeEYOpwADC4;#XysGS#>R%r<1%{$kj zu9I*OV}zaSNCj-8t6+@I#Z_@!Wo^J*xgy!wO`Zc$q2RnB51haAv4ipMHDzPs?iXfyQzr#Ov@@1CpSbftZFVIKvjHa?xR5E#XGn@ElIHbbH@tr&by zQKz$KoVLd2a$C<_!5U6&0?!DVch}S*SSnnowT+-}Fcl9`=04;Cy(4^$rC5tE6!lhM zFVSLYM(<)n!}+C>>s`T4O8}!nB1J zmh0|{w00$%TI=9v%pA0^Twf*}okwS=n=66Ge#~D#jQ$~={1$jrSlYB2zPpjvtf zvQ5r|qa3ojqd3xD&W5v3G=9?VydcG1t|O6!2fgGlB{@JHddu z4mTlb-OKyK{1flX%N~Z!2JGWWCunJ4BUCsp9$JCG#Uz|Bd}%M*ZMaF(XxVRM+BYfh z7&}nt@JIzmXTix+qgXCOK7AL*M@maMr-N{BWzQq{K)Pomwk?t&*~Na{~GN! z=famm_B+XDcAdbHQ$%qNQE*%=aBQxyc8qnjJxOSHpIw=Yx#kqTM=D-Y+Sh6o965zH zpUXNF73tO_&BVI~Ji@*TjwWWw=dO=7TTV?{%e5v9Nm@=MhnEOaS_;jwl|^49ONWMo zJN!kaC>M9%XwqI~9&i}5tjt$*Q1XpfqCAyJ&(ipHNPTH7j>U|p+ibyd-8cG2C&6+( z)A7rwQg|UX1KtyT%kYhs@S8Yyv=18c#cC#io;p1@3t#Smg}b-G0Xci z6Fx(@Of|xmhVIPTy#!p!a6G2u7{DCv<|&p~E@5YjQ?L|sokQ~F zBe%>TccY+$YPul~wh>?w4I1?wy0O`)g$2H6imUjm5M$m?xmvieJ>)VU zck{u__&*n~yp`gXc#WW2LOO7k>xbj15f;I#h=WE;QbIcH&9qKDoj%IUa%0JYop)?5 zM1vj`??9!Xg1M^r#;D+MF*E+nNjF3GW*V$XdB7+^MtAsLy5=C!eg9;p0jD)7Aw3#| z=%pMEC>!Kx;-WRVoRB4?Lm#9Ix$3=}%3$;%kRyCCqc>%A4czWwc_uu?~5 zF%;QOoX9kOIpBqp5WhSwsT>}_D_#AO3yiXPK*76#>?D9Y@Y!W$lAs;m)3}SU2WBK# zYkWqu4m37gxhT`}YAg(zXWP)+Lca_VJ>%nlh)>!K#yD5$ky(_3Ce(Ia0Iw?tvyC+c z!Ykd@I~`V+L@_HqX=`ypa^WJ6fNvKx3DPD7@M_wGh%Fl4$)22CT-{7enAi3H!-RGA z?Ubg9-oi~4GnA>;lX$uKx_1J3cNVPrA-tUPk1LpvMU^5s%7m2Zh|Y3MoRI~4q~JZx z!Mg}~wX){@Bv1w%!Hn(Wp`GMNqw*O{_`bI;Md*v9(6g~*UYpTDr!P)?v%q^@MmkgD z+;l&9CxLeZ<*gETG2?ozMBx(H$`Mwh5gfmSo4`z%ZrVce*$lsuX98cWSWyFKDAy0^ z1h{GhVLL(NtS!EIrivX>y4%!o?FT4a$}}Y;FGn$=s}P#&dkS^pxC|yvbL~j6qb`;U zGO1*GY3`tyOPOz3k%L2(MpNR21|c{=DpLbH)ee4$ zS0flix@|BCn?c`qH6l|&6w>vMfqw(CZ4zfMWH937yr`U&&^|L5Y5gf>N8;s0&%0xG zgBIQ9dCgNa=!VR0HpfiGMSC_HAU<&Kwh9`Tu`s19_86DRDf~0NPzV3{+o9BaPubB~ ziW`|TOOSw6THb~x{BW`?Uu2*fOpT{JzPb^x{%!#cOFu+W zN*Wn^X*vgcMje*0-q4XwS8_~8(&yf2zXh}>r{k;6*JR~zz$=IxEn5qId!_RKvK+~( z3kE|K$k{Rq3L<>2 ze+)$r_-}-yt+la0a&S@L!;~RZ1pmYlRw!^SJji-NZ`cMC`56KTCkEam@~xv1-my}s zZ&H~6qhUD&IOQ-*K4d8&Sn*TFk0ooSTfSX!=uFAfo>Po6|s>E?^_b00000NkvXXu0mjf Do~aw3 literal 0 HcmV?d00001 diff --git a/assets/images/medical/body_weight.png b/assets/images/medical/body_weight.png new file mode 100644 index 0000000000000000000000000000000000000000..d1f0b324620bff4bbefccdd4589626e1f2414cc0 GIT binary patch literal 2775 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 rUK5~|7>eeu!Pa-{800000NkvXXu0mjf#~?xR literal 0 HcmV?d00001 diff --git a/assets/images/medical/carb_protein.png b/assets/images/medical/carb_protein.png new file mode 100644 index 0000000000000000000000000000000000000000..eb6c664047e682238647df697e0d995fd5294135 GIT binary patch literal 3732 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 U=VTw@!vFvP07*qoM6N<$g4U|Q?*IS* literal 0 HcmV?d00001 diff --git a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart index 6854cb27..b3387b34 100644 --- a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart +++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/%E2%80%8B%20health_calculators.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_converter.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/parking_page.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/BookingOptions.dart'; @@ -216,7 +217,9 @@ class _AllHabibMedicalServiceState extends State { ServicesContainer( onTap: () => Navigator.push( context, - FadePage(), + FadePage( + page: (HealthCalculators()), + ), ), imageLocation: 'assets/images/new-design/health_calculator_icon.png', diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart new file mode 100644 index 00000000..62729222 --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart @@ -0,0 +1,521 @@ +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'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'dart:math'; + +const activeCardColor = Color(0xff70777A); +const inactiveCardColor = Color(0xffFAFAFd); + +class BMICalculator extends StatefulWidget { + @override + _BMICalculatorState createState() => _BMICalculatorState(); +} + +class _BMICalculatorState extends State { + TextEditingController textController = new TextEditingController(); + String textResult; + String msg; + double bmiResult; + int height = 150; + int weight = 40; + Color cmCard = activeCardColor; + Color ftCard = inactiveCardColor; + Color lbCard = inactiveCardColor; + Color kgCard = activeCardColor; + void updateColor(int type) { + //MG/DLT card + if (type == 1) { + if (cmCard == inactiveCardColor) { + cmCard = activeCardColor; + ftCard = inactiveCardColor; + } else { + cmCard = inactiveCardColor; + } + } + if (type == 2) { + if (ftCard == inactiveCardColor) { + ftCard = activeCardColor; + cmCard = inactiveCardColor; + } else { + ftCard = inactiveCardColor; + } + } + } + + void updateColorWeight(int type) { + //MG/DLT card + if (type == 1) { + if (kgCard == inactiveCardColor) { + kgCard = activeCardColor; + lbCard = inactiveCardColor; + } else { + kgCard = inactiveCardColor; + } + } + if (type == 2) { + if (lbCard == inactiveCardColor) { + lbCard = activeCardColor; + kgCard = inactiveCardColor; + } else { + lbCard = inactiveCardColor; + } + } + } + + double convertToCm(double number) { + return number * 30.48; + } + + double convertToKg(double number) { + return number / 2.205; + } + + double calculateBMI() { + if (ftCard == activeCardColor) { + convertToCm(height.toDouble()); + } + bmiResult = weight / pow(height / 100, 2); + + return bmiResult; + } + + void showTextResult() { + if (bmiResult >= 30) { + textResult = 'Obese'; + } else if (bmiResult < 30 && bmiResult >= 25) { + textResult = 'OverWeight'; + } else if (bmiResult < 25 && bmiResult >= 18.5) { + textResult = 'Healthy'; + } else if (bmiResult < 18.5) { + textResult = 'UnderWeight'; + } + } + + void showMsg() { + if (bmiResult >= 30) { + msg = + 'A BMI of over 30 indicates that are heavily overweight. Health may be at risk if not lose weight. Recommended talking to a doctor or a dietician for advice. To book an appointment, click below to get started.'; + } else if (bmiResult < 30 && bmiResult >= 25) { + msg = + 'A BMI of 25 - 30 indicates that are slightly overweight. May be advised to lose some weight for health reasons. Recommended talking to a doctor or a dietician for advice. To book an appointment, click below to get '; + } else if (bmiResult < 25 && bmiResult >= 18.5) { + msg = + 'A BMI of 18.5 - 25 indicates that are at a healthy weight for the height. By maintaining a healthy weight, lower the risk of developing severe health problems. To book an appointment, click below to get started.'; + } else if (bmiResult < 18.5) { + msg = + 'A BMI of less than 18.5 indicates that are underweight, so may need to put on some weight. Recommended talking to a doctor or a dietician for advice. To book an appointment, click below to get started.'; + } + } + + @override + void initState() { + super.initState(); + textController.text = '0'; // Setting the initial value for the field. + } + + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'BMI Calculator', + body: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Center( + child: Container( + width: 350.0, + child: Padding( + padding: EdgeInsets.symmetric(vertical: 15.0), + child: Text( + 'Calculate the BMI value and weight\n status to identify the healthy weight .\n Not appropriate for children and women\n who are pregnant or breastfeeding', + style: TextStyle(fontSize: 18.0), + ), + ), + ), + ), + Container( + height: 200.0, + width: 350.0, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(12.0), + ), + child: Column( + children: [ + Row( + children: [ + Padding( + padding: EdgeInsets.all(8.0), + child: Texts('Height'), + ), + ], + ), + Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(height.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (height < 250) height++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (height > 120) height--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Slider( + value: height.toDouble(), + min: 120, + max: 250, + onChanged: (double newValue) { + setState(() { + height = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ], + ), + Row( + children: [ + Padding( + padding: EdgeInsets.all(8.0), + child: Texts('Select Unit'), + ), + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColor(1); + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: + Offset(0, 3), // changes position of shadow + ), + ], + color: cmCard, + borderRadius: BorderRadius.circular(3.0), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 18.0), + child: Center(child: Texts('CM')), + ), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColor(2); + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + color: ftCard, + borderRadius: BorderRadius.circular(3.0), + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: + Offset(0, 3), // changes position of shadow + ), + ], + ), + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0), + child: Center(child: Texts('FT')), + ), + ), + ), + ], + ), + ], + ), + ), + SizedBox( + height: 25.0, + ), + Container( + height: 200.0, + width: 350.0, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(12.0), + ), + child: Column( + children: [ + Row( + children: [ + Padding( + padding: EdgeInsets.all(8.0), + child: Texts('Weight'), + ), + ], + ), + Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(weight.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (weight < 250) weight++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (weight > 40) weight--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Slider( + value: weight.toDouble(), + min: 40, + max: 250, + onChanged: (double newValue) { + setState(() { + weight = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ], + ), + Row( + children: [ + Padding( + padding: EdgeInsets.all(8.0), + child: Texts('Select Unit'), + ), + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColorWeight(1); + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: + Offset(0, 3), // changes position of shadow + ), + ], + color: kgCard, + borderRadius: BorderRadius.circular(3.0), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 18.0), + child: Center(child: Texts('KG')), + ), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColorWeight(2); + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + color: lbCard, + borderRadius: BorderRadius.circular(3.0), + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: + Offset(0, 3), // changes position of shadow + ), + ], + ), + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0), + child: Center(child: Texts('LB')), + ), + ), + ), + ], + ), + ], + ), + ), + SizedBox( + height: 25.0, + ), + Container( + height: 100.0, + width: 350.0, + child: Button( + label: 'CALCULATE', + onTap: () { + setState(() { + calculateBMI(); + showTextResult(); + showMsg(); + { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => ResultPage( + finalResult: bmiResult, + textResult: textResult, + msg: msg, + )), + ); + } + }); + }, + ), + ), + ], + ), + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/result_page.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/result_page.dart new file mode 100644 index 00000000..bfbd10b7 --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/result_page.dart @@ -0,0 +1,101 @@ +import 'dart:ffi'; + +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 'package:percent_indicator/percent_indicator.dart'; + +class ResultPage extends StatelessWidget { + final double finalResult; + final String textResult; + final String msg; + + ResultPage({this.finalResult, this.textResult, this.msg}); + Color inductorColor; + double percent; + + Color colorInductor() { + if (finalResult >= 30) { + inductorColor = Color(0xffC70D00); + } else if (finalResult < 30 && finalResult >= 25) { + inductorColor = Color(0xffC25400); + } else if (finalResult < 25 && finalResult >= 18.5) { + inductorColor = Color(0xff36D600); + } else if (finalResult < 18.5) { + inductorColor = Color(0xff1BE0EE); + } + return inductorColor; + } + + double percentInductor() { + if (finalResult >= 30) { + percent = 1.0; + } else if (finalResult < 30 && finalResult >= 25) { + percent = 0.73; + } else if (finalResult < 25 && finalResult >= 18.5) { + percent = 0.5; + } else if (finalResult < 18.5) { + percent = 0.25; + } + return percent; + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: "BMI Calculator", + body: Column( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + SizedBox( + // height: 40.0, + ), + Center( + child: CircularPercentIndicator( + radius: 220.0, + lineWidth: 20.0, + percent: percentInductor(), + center: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + finalResult.toStringAsFixed(1), + style: TextStyle( + fontSize: 18.0, + fontWeight: FontWeight.bold, + ), + ), + SizedBox( + height: 5.0, + ), + Text( + textResult, + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + progressColor: colorInductor(), + backgroundColor: Colors.white, + ), + ), + Container( + height: 120, + width: 280.0, + child: Texts(msg), + ), + Container( + width: 350, + child: Button( + label: 'See List Of Doctors', + ), + ), + ], + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart new file mode 100644 index 00000000..05d3d07a --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart @@ -0,0 +1,721 @@ +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'; + +const activeCardColorGender = Color(0xffC5272D); +const inactiveCardColorGender = Color(0xffFAFAFd); +const activeCardColor = Color(0xff70777A); +const inactiveCardColor = Color(0xffFAFAFd); + +class BmrCalculator extends StatefulWidget { + @override + _BmrCalculatorState createState() => _BmrCalculatorState(); +} + +class _BmrCalculatorState extends State { + bool isMale = false; + bool isHeightCm = true; + Color maleCard = activeCardColorGender; + Color femaleCard = inactiveCardColorGender; + Color kgCard = activeCardColor; + Color lbCard = inactiveCardColor; + Color cmCard = activeCardColor; + Color ftCard = inactiveCardColor; + int age = 0; + int height = 0; + int weight = 0; + double bmrResult = 0; + String dropdownValue = 'Lighty Active (1-3) days per week'; + double calories = 0; + + void updateColor(int type) { + //MG/DLT card + if (type == 1) { + if (maleCard == inactiveCardColorGender) { + maleCard = activeCardColorGender; + femaleCard = inactiveCardColorGender; + } else { + maleCard = inactiveCardColorGender; + } + } + if (type == 2) { + if (femaleCard == inactiveCardColorGender) { + femaleCard = activeCardColorGender; + maleCard = inactiveCardColorGender; + } else { + femaleCard = inactiveCardColorGender; + } + } + } + + void updateColorHeight(int type) { + //MG/DLT card + if (type == 1) { + if (cmCard == inactiveCardColor) { + cmCard = activeCardColor; + ftCard = inactiveCardColor; + } else { + cmCard = inactiveCardColor; + } + } + if (type == 2) { + if (ftCard == inactiveCardColor) { + ftCard = activeCardColor; + cmCard = inactiveCardColor; + } else { + ftCard = inactiveCardColor; + } + } + } + + void updateColorWeight(int type) { + //MG/DLT card + if (type == 1) { + if (kgCard == inactiveCardColor) { + kgCard = activeCardColor; + lbCard = inactiveCardColor; + } else { + kgCard = inactiveCardColor; + } + } + if (type == 2) { + if (lbCard == inactiveCardColor) { + lbCard = activeCardColor; + kgCard = inactiveCardColor; + } else { + lbCard = inactiveCardColor; + } + } + } + + void calculateBmr() { + if (isMale == true) { + bmrResult = 66.5 + (13.75 * weight) + (5.003 * height) - (6.755 * age); + } else if (isMale == false) { + bmrResult = + 655.0955 + (9.5634 * weight) + (1.850 * height) - (4.676 * age); + } + + bmrResult = bmrResult.roundToDouble(); + } + + void calculateCalories() { + if (dropdownValue == "Almost Inactive(Little or no exercises)") { + calories = bmrResult * 1.2; + } else if (dropdownValue == "Lighty Active (1-3) days per week") { + calories = bmrResult * 1.375; + } else if (dropdownValue == "very Active(6-7) days per week") { + calories = bmrResult * 1.55; + } else if (dropdownValue == "Super Active(very hard exercises)") { + calories = bmrResult * 1.725; + } else if (dropdownValue == "") { + calories = bmrResult * 10.725; + } + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Bmr Calculator', + body: Padding( + padding: EdgeInsets.symmetric(horizontal: 25.0, vertical: 15.0), + child: SingleChildScrollView( + child: Container( + height: 850, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.all(10.0), + child: Texts( + 'Calculates the amount of energy that the person’s body expends in a day'), + ), + Divider( + thickness: 2.0, + ), + SizedBox( + height: 5.0, + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Gender'), + SizedBox( + height: 5.0, + ), + Container( + width: 350, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(35.0), + color: Colors.white, + border: Border.all( + color: Colors.black45, + )), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColor(1); + isMale = false; + }); + }, + child: Container( + height: 55.0, + width: 170.0, + decoration: BoxDecoration( + color: maleCard, + borderRadius: BorderRadius.circular(35.0), + ), + child: Center(child: Texts('FEMALE')), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColor(2); + isMale = true; + }); + }, + child: Container( + height: 55.0, + width: 170.0, + decoration: BoxDecoration( + color: femaleCard, + borderRadius: BorderRadius.circular(35.0), + ), + child: Center(child: Texts('MALE')), + ), + ), + ], + ), + ), + SizedBox( + height: 5.0, + ), + Texts( + 'The Age ( 11 - 120 ) yrs', + ), + SizedBox( + height: 10.0, + ), + Row( + children: [ + Container( + width: 335.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(age.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (age < 120) age++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (age > 0) age--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: age.toDouble(), + min: 0, + max: 120, + onChanged: (double newValue) { + setState(() { + age = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + Texts( + 'Height', + ), + Row( + children: [ + Container( + width: 335.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(height.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (height < 250) + height++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (height > 0) height--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: height.toDouble(), + min: 0, + max: 250, + onChanged: (double newValue) { + setState(() { + height = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + Texts('Select Unit'), + SizedBox( + height: 5.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColorHeight(1); + isHeightCm = true; + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + color: cmCard, + borderRadius: BorderRadius.circular(3.0), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 18.0), + child: Center(child: Texts('CM')), + ), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColorHeight(2); + isHeightCm = false; + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + color: ftCard, + borderRadius: BorderRadius.circular(3.0), + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + ), + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0), + child: Center(child: Texts('Ft')), + ), + ), + ), + ], + ), + SizedBox( + height: 5.0, + ), + Texts( + 'Weight', + ), + SizedBox( + height: 5.0, + ), + Row( + children: [ + Container( + width: 335.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(weight.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (weight < 250) + weight++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (weight > 0) weight--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: weight.toDouble(), + min: 0, + max: 250, + onChanged: (double newValue) { + setState(() { + weight = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + Texts('Select Unit'), + SizedBox( + height: 5.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColorWeight(1); + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + color: kgCard, + borderRadius: BorderRadius.circular(3.0), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 18.0), + child: Center(child: Texts('KG')), + ), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColorWeight(2); + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + color: lbCard, + borderRadius: BorderRadius.circular(3.0), + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + ), + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0), + child: Center(child: Texts('LB')), + ), + ), + ), + ], + ), + SizedBox( + height: 45.0, + ), + Divider( + thickness: 2.0, + ), + SizedBox( + height: 5.0, + ), + Texts('Activity level'), + Container( + width: 300, + child: DropdownButton( + value: dropdownValue, + icon: Icon(Icons.arrow_downward), + iconSize: 24, + elevation: 16, + style: TextStyle(color: Colors.black87), + underline: Container( + height: 2, + color: Colors.black54, + ), + onChanged: (String newValue) { + setState(() { + dropdownValue = newValue; + }); + }, + items: [ + 'Almost Inactive(Little or no exercises)', + 'Lighty Active (1-3) days per week', + 'very Active(6-7) days per week', + 'Super Active(very hard exercises)' + ].map>((String value) { + return DropdownMenuItem( + value: value, + child: Text(value), + ); + }).toList(), + ), + ), + SizedBox( + height: 30.0, + ), + Container( + height: 100.0, + width: 350.0, + child: Button( + label: 'CALCULATE', + onTap: () { + setState(() { + calculateBmr(); + calculateCalories(); + + { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => BmrResultPage( + bmrResult: bmrResult, + calories: calories, + )), + ); + } + }); + }, + ), + ), + ], + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart new file mode 100644 index 00000000..a3fdb5f7 --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart @@ -0,0 +1,65 @@ +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 'package:percent_indicator/circular_percent_indicator.dart'; + +class BmrResultPage extends StatelessWidget { + final double bmrResult; + final double calories; + BmrResultPage({this.bmrResult, this.calories}); + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'BMR Calculator', + body: Column( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Center( + child: CircularPercentIndicator( + radius: 220.0, + lineWidth: 20.0, + percent: ((this.bmrResult > 3500) ? 100 : this.bmrResult / 3500), + center: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + bmrResult.toStringAsFixed(1), + style: TextStyle( + fontSize: 18.0, + fontWeight: FontWeight.bold, + ), + ), + SizedBox( + height: 5.0, + ), + Text( + 'Calories/Day', + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + progressColor: Color(0xff3C3939), + ), + ), + Container( + height: 120, + width: 280.0, + child: Texts( + 'This means the body will burn ( ${bmrResult.toStringAsFixed(1)} ) calories each day, if engaged in no activity for the entire day.. Note: Daily calorie requirement is ( ${calories.toStringAsFixed(1)} ) calories, to maintain the current weight.'), + ), + Container( + width: 350, + child: Button( + label: 'See List Of Doctors', + ), + ), + ], + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart new file mode 100644 index 00000000..4a939b3f --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart @@ -0,0 +1,1003 @@ +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'; + +const activeCardColorGender = Color(0xffC5272D); +const inactiveCardColorGender = Color(0xffFAFAFd); +const activeCardColor = Color(0xff70777A); +const inactiveCardColor = Color(0xffFAFAFd); + +class BodyFat extends StatefulWidget { + @override + _BodyFatState createState() => _BodyFatState(); +} + +class _BodyFatState extends State { + bool isMale = false; + bool isHeightCm = true; + Color maleCard = activeCardColorGender; + Color femaleCard = inactiveCardColorGender; + Color neckCmCard = activeCardColor; + Color neckFtCard = inactiveCardColor; + Color waistCmCard = activeCardColor; + Color waistFtCard = inactiveCardColor; + Color hipCmCard = activeCardColor; + Color hipFtCard = inactiveCardColor; + Color cmCard = activeCardColor; + Color ftCard = inactiveCardColor; + int neck = 10; + int heightCm = 0; + int heightFt = 0; + int hip = 5; + double heightInches; + double minRange; + double maxRange; + double overWeightBy; + int waist = 5; + double bodyFat = 0; + double fat = 0; + String dropdownValue; + double calories = 0; + String textResult = ''; + + void updateColorHeight(int type) { + //MG/DLT card + if (type == 1) { + if (cmCard == inactiveCardColor) { + cmCard = activeCardColor; + ftCard = inactiveCardColor; + } else { + cmCard = inactiveCardColor; + } + } + if (type == 2) { + if (ftCard == inactiveCardColor) { + ftCard = activeCardColor; + cmCard = inactiveCardColor; + } else { + ftCard = inactiveCardColor; + } + } + } + + void updateColorNeck(int type) { + //MG/DLT card + if (type == 1) { + if (neckCmCard == inactiveCardColor) { + neckCmCard = activeCardColor; + neckFtCard = inactiveCardColor; + } else { + neckCmCard = inactiveCardColor; + } + } + if (type == 2) { + if (neckFtCard == inactiveCardColor) { + neckFtCard = activeCardColor; + neckCmCard = inactiveCardColor; + } else { + neckFtCard = inactiveCardColor; + } + } + } + + void updateColorWaist(int type) { + //MG/DLT card + if (type == 1) { + if (waistCmCard == inactiveCardColor) { + waistCmCard = activeCardColor; + waistFtCard = inactiveCardColor; + } else { + waistCmCard = inactiveCardColor; + } + } + if (type == 2) { + if (waistFtCard == inactiveCardColor) { + waistFtCard = activeCardColor; + waistCmCard = inactiveCardColor; + } else { + waistFtCard = inactiveCardColor; + } + } + } + + void updateColorHip(int type) { + //MG/DLT card + if (type == 1) { + if (hipCmCard == inactiveCardColor) { + hipCmCard = activeCardColor; + hipFtCard = inactiveCardColor; + } else { + hipCmCard = inactiveCardColor; + } + } + if (type == 2) { + if (hipFtCard == inactiveCardColor) { + hipFtCard = activeCardColor; + hipCmCard = inactiveCardColor; + } else { + hipFtCard = inactiveCardColor; + } + } + } + + void updateColor(int type) { + //MG/DLT card + if (type == 1) { + if (maleCard == inactiveCardColorGender) { + maleCard = activeCardColorGender; + femaleCard = inactiveCardColorGender; + } else { + maleCard = inactiveCardColorGender; + } + } + if (type == 2) { + if (femaleCard == inactiveCardColorGender) { + femaleCard = activeCardColorGender; + maleCard = inactiveCardColorGender; + } else { + femaleCard = inactiveCardColorGender; + } + } + } + + void calculateBodyFat() { + if (isMale == true) { + bodyFat = 495 / + (1.0324 - + 0.19077 * (log(waist - neck) / ln10) + + 0.15456 * (log(heightCm) / ln10)) - + 450; + fat = (bodyFat * 10) / 10.round(); + } else if (isMale == false) { + bodyFat = 495 / + (1.29579 - + 0.35004 * (log(waist + hip - neck) / ln10) + + 0.22100 * (log(heightCm) / ln10)) - + 450; + fat = (bodyFat * 10) / 10.round(); + } + if (fat <= 0) { + fat = 0; + } + } + + void showTextResult() { + if (isMale == false) { + if (bodyFat > 9 && bodyFat <= 13) { + textResult = 'The category falls under essential'; + } else if (bodyFat > 13 && bodyFat <= 20) { + textResult = 'The category falls under athlete'; + } else if (bodyFat > 20 && bodyFat <= 24) { + textResult = 'The category falls under fitness'; + } else if (bodyFat > 24 && bodyFat <= 31) { + textResult = 'The category falls under acceptable'; + } else if (bodyFat > 31 && bodyFat <= 60) { + textResult = 'The category falls under obese'; + } else if (bodyFat > 60) { + textResult = + 'Please check the value you have entered, since the body fat percentage has crosed the limits.'; + } else if (bodyFat <= 9) { + textResult = + 'Please check the value you have entered, since the body fat percentage cannot be this low.'; + } + } else { + if (bodyFat > 5 && fat <= 13) { + textResult = 'The category falls under essential'; + } else if (bodyFat > 13 && bodyFat <= 17) { + textResult = 'The category falls under athlete'; + } else if (bodyFat > 17 && bodyFat <= 24) { + textResult = 'The category falls under fitness'; + } else if (bodyFat > 24 && bodyFat <= 45) { + textResult = 'The category falls under obese'; + } else if (bodyFat > 45) { + textResult = + 'Please check the value you have entered, since the body fat percentage has crosed the limits.'; + } else if (bodyFat <= 5) { + textResult = + 'Please check the value you have entered, since the body fat percentage cannot be this low.'; + } + } + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Body Fat', + body: Padding( + padding: EdgeInsets.symmetric(horizontal: 25.0, vertical: 15.0), + child: SingleChildScrollView( + child: Container( + height: 1000.0, + child: Column( + children: [ + Padding( + padding: EdgeInsets.all(10.0), + child: + Texts('Estimates the total body fat based on\n the size'), + ), + Divider( + thickness: 2.0, + ), + SizedBox( + height: 5.0, + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Gender'), + SizedBox( + height: 5.0, + ), + Container( + width: 350, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(35.0), + color: Colors.white, + border: Border.all( + color: Colors.black45, + )), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColor(1); + isMale = false; + }); + }, + child: Container( + height: 55.0, + width: 170.0, + decoration: BoxDecoration( + color: maleCard, + borderRadius: BorderRadius.circular(35.0), + ), + child: Center(child: Texts('FEMALE')), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColor(2); + isMale = true; + }); + }, + child: Container( + height: 55.0, + width: 170.0, + decoration: BoxDecoration( + color: femaleCard, + borderRadius: BorderRadius.circular(35.0), + ), + child: Center(child: Texts('MALE')), + ), + ), + ], + ), + ), + Texts( + 'Height', + ), + Row( + children: [ + Container( + width: 335.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(heightCm.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (heightCm < 250) + heightCm++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (heightCm > 0) + heightCm--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: heightCm.toDouble(), + min: 0, + max: 250, + onChanged: (double newValue) { + setState(() { + heightCm = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + Texts('Select Unit'), + SizedBox( + height: 5.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColorHeight(1); + isHeightCm = true; + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + color: cmCard, + borderRadius: BorderRadius.circular(3.0), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 18.0), + child: Center(child: Texts('CM')), + ), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColorHeight(2); + isHeightCm = false; + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + color: ftCard, + borderRadius: BorderRadius.circular(3.0), + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + ), + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0), + child: Center(child: Texts('Ft')), + ), + ), + ), + ], + ), + SizedBox( + height: 10.0, + ), + Texts( + 'Neck', + ), + Row( + children: [ + Container( + width: 335.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(neck.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (neck < 60) neck++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (neck > 5) neck--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: neck.toDouble(), + min: 5, + max: 60, + onChanged: (double newValue) { + setState(() { + neck = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + Texts('Select Unit'), + SizedBox( + height: 5.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColorNeck(1); + isHeightCm = true; + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + color: neckCmCard, + borderRadius: BorderRadius.circular(3.0), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 18.0), + child: Center(child: Texts('CM')), + ), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColorNeck(2); + isHeightCm = false; + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + color: neckFtCard, + borderRadius: BorderRadius.circular(3.0), + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + ), + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0), + child: Center(child: Texts('Ft')), + ), + ), + ), + ], + ), + SizedBox( + height: 10.0, + ), + Texts( + 'Waist', + ), + Row( + children: [ + Container( + width: 335.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(waist.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (waist < 200) waist++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (waist > 5) waist--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: waist.toDouble(), + min: 5, + max: 200, + onChanged: (double newValue) { + setState(() { + waist = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + Texts('Select Unit'), + SizedBox( + height: 5.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColorWaist(1); + isHeightCm = true; + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + color: waistCmCard, + borderRadius: BorderRadius.circular(3.0), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 18.0), + child: Center(child: Texts('CM')), + ), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColorWaist(2); + isHeightCm = false; + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + color: waistFtCard, + borderRadius: BorderRadius.circular(3.0), + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + ), + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0), + child: Center(child: Texts('Ft')), + ), + ), + ), + ], + ), + SizedBox( + height: 10.0, + ), + Texts( + 'Hip', + ), + Row( + children: [ + Container( + width: 335.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(hip.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (hip < 140) hip++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (hip > 5) hip--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: hip.toDouble(), + min: 5, + max: 140, + onChanged: (double newValue) { + setState(() { + hip = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + Texts('Select Unit'), + SizedBox( + height: 5.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColorHip(1); + isHeightCm = true; + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + color: hipCmCard, + borderRadius: BorderRadius.circular(3.0), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 18.0), + child: Center(child: Texts('CM')), + ), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColorHip(2); + isHeightCm = false; + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + color: hipFtCard, + borderRadius: BorderRadius.circular(3.0), + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + ), + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0), + child: Center(child: Texts('Ft')), + ), + ), + ), + ], + ), + SizedBox( + height: 35.0, + ), + ], + ), + Container( + height: 100.0, + width: 350.0, + child: Button( + label: 'CALCULATE', + onTap: () { + setState(() { + calculateBodyFat(); + showTextResult(); + + { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => FatResult( + bodyFat: bodyFat, + fat: fat, + textResult: textResult, + )), + ); + } + }); + }, + ), + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat_result_page.dart b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat_result_page.dart new file mode 100644 index 00000000..c8c5476e --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat_result_page.dart @@ -0,0 +1,77 @@ +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 'package:percent_indicator/circular_percent_indicator.dart'; + +class FatResult extends StatelessWidget { + final double bodyFat; + final double fat; + final String textResult; + + FatResult({this.bodyFat, this.fat, this.textResult = ''}); + Color inductorColor; + Color colorInductor() { + if (bodyFat >= 17) { + inductorColor = Color(0xffC70D00); + } else if (bodyFat < 20 && bodyFat >= 24) { + inductorColor = Color(0xffC25400); + } else if (bodyFat < 24 && bodyFat >= 31) { + inductorColor = Color(0xff36D600); + } else if (bodyFat > 45) { + inductorColor = Color(0xff1BE0EE); + } + return inductorColor; + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Body Fat', + body: Column( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + SizedBox( + // height: 40.0, + ), + Center( + child: CircularPercentIndicator( + radius: 220.0, + lineWidth: 20.0, + percent: ((fat > 70) ? 100 : fat / 100), + center: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + fat.toStringAsFixed(1) + '%', + style: TextStyle( + fontSize: 18.0, + fontWeight: FontWeight.bold, + ), + ), + SizedBox( + height: 5.0, + ), + ], + ), + progressColor: inductorColor, + backgroundColor: Colors.white, + ), + ), + Container( + height: 120, + width: 280.0, + child: Texts(textResult), + ), + Container( + width: 350, + child: Button( + label: 'See List Of Doctors', + ), + ), + ], + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart new file mode 100644 index 00000000..ac1aacc3 --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart @@ -0,0 +1,676 @@ +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'; + +const activeCardColorGender = Color(0xffC5272D); +const inactiveCardColorGender = Color(0xffFAFAFd); +const activeCardColor = Color(0xff70777A); +const inactiveCardColor = Color(0xffFAFAFd); + +class CalorieCalculator extends StatefulWidget { + @override + _CalorieCalculatorState createState() => _CalorieCalculatorState(); +} + +class _CalorieCalculatorState extends State { + bool isMale = false; + Color maleCard = activeCardColorGender; + Color femaleCard = inactiveCardColorGender; + Color kgCard = activeCardColor; + Color lbCard = inactiveCardColor; + Color cmCard = activeCardColor; + Color ftCard = inactiveCardColor; + int age = 0; + int height = 0; + int weight = 0; + double calories; + String dropdownValue; + void updateColor(int type) { + //MG/DLT card + if (type == 1) { + if (maleCard == inactiveCardColorGender) { + maleCard = activeCardColorGender; + femaleCard = inactiveCardColorGender; + } else { + maleCard = inactiveCardColorGender; + } + } + if (type == 2) { + if (femaleCard == inactiveCardColorGender) { + femaleCard = activeCardColorGender; + maleCard = inactiveCardColorGender; + } else { + femaleCard = inactiveCardColorGender; + } + } + } + + void updateColorWeight(int type) { + //MG/DLT card + if (type == 1) { + if (kgCard == inactiveCardColor) { + kgCard = activeCardColor; + lbCard = inactiveCardColor; + } else { + kgCard = inactiveCardColor; + } + } + if (type == 2) { + if (lbCard == inactiveCardColor) { + lbCard = activeCardColor; + kgCard = inactiveCardColor; + } else { + lbCard = inactiveCardColor; + } + } + } + + void updateColorHeight(int type) { + //MG/DLT card + if (type == 1) { + if (cmCard == inactiveCardColor) { + cmCard = activeCardColor; + ftCard = inactiveCardColor; + } else { + cmCard = inactiveCardColor; + } + } + if (type == 2) { + if (ftCard == inactiveCardColor) { + ftCard = activeCardColor; + cmCard = inactiveCardColor; + } else { + ftCard = inactiveCardColor; + } + } + } + + void calculateCalories() { + if (isMale == true) { + calories = 66.5 + (13.75 * weight) + (5.003 * height) - (6.755 * age); + } else if (isMale == false) { + calories = + 655.0955 + (9.5634 * weight) + (1.850 * height) - (4.676 * age); + } + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Calorie Calculator', + body: Padding( + padding: const EdgeInsets.symmetric(horizontal: 25.0, vertical: 15.0), + child: SingleChildScrollView( + child: Container( + height: 890.0, + child: Column( + //mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.all(10.0), + child: Texts( + 'Calculates daily calorie intake based on several factors, like height, weight, age, gender and daily physical activity rate', + ), + ), + Padding( + padding: + EdgeInsets.symmetric(horizontal: 10.0, vertical: 15.0), + child: Texts('Gender'), + ), + Container( + width: 350, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(35.0), + color: Colors.white, + border: Border.all( + color: Colors.black45, + )), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColor(1); + isMale = false; + }); + }, + child: Container( + height: 55.0, + width: 170.0, + decoration: BoxDecoration( + color: maleCard, + borderRadius: BorderRadius.circular(35.0), + ), + child: Center(child: Texts('FEMALE')), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColor(2); + isMale = true; + }); + }, + child: Container( + height: 55.0, + width: 170.0, + decoration: BoxDecoration( + color: femaleCard, + borderRadius: BorderRadius.circular(35.0), + ), + child: Center(child: Texts('MALE')), + ), + ), + ], + ), + ), + SizedBox( + height: 15.0, + ), + Texts( + 'The Age ( 11 - 120 ) yrs', + ), + SizedBox( + height: 10.0, + ), + Row( + children: [ + Container( + width: 335.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(age.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (age < 120) age++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (age > 0) age--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: age.toDouble(), + min: 0, + max: 120, + onChanged: (double newValue) { + setState(() { + age = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + Texts( + 'Height', + ), + Row( + children: [ + Container( + width: 335.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(height.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (height < 250) height++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (height > 0) height--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: height.toDouble(), + min: 0, + max: 250, + onChanged: (double newValue) { + setState(() { + height = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + Texts('Select Unit'), + SizedBox( + height: 5.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColorHeight(1); + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: + Offset(0, 3), // changes position of shadow + ), + ], + color: cmCard, + borderRadius: BorderRadius.circular(3.0), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 18.0), + child: Center(child: Texts('CM')), + ), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColorHeight(2); + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + color: ftCard, + borderRadius: BorderRadius.circular(3.0), + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: + Offset(0, 3), // changes position of shadow + ), + ], + ), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: Center(child: Texts('Ft')), + ), + ), + ), + ], + ), + SizedBox( + height: 5.0, + ), + Texts( + 'Weight', + ), + Row( + children: [ + Container( + width: 335.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(weight.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (weight < 250) weight++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (weight > 0) weight--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: weight.toDouble(), + min: 0, + max: 250, + onChanged: (double newValue) { + setState(() { + weight = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + Texts('Select Unit'), + SizedBox( + height: 5.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColorWeight(1); + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: + Offset(0, 3), // changes position of shadow + ), + ], + color: kgCard, + borderRadius: BorderRadius.circular(3.0), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 18.0), + child: Center(child: Texts('KG')), + ), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColorWeight(2); + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + color: lbCard, + borderRadius: BorderRadius.circular(3.0), + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: + Offset(0, 3), // changes position of shadow + ), + ], + ), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: Center(child: Texts('LB')), + ), + ), + ), + ], + ), + SizedBox( + height: 5.0, + ), + Texts('Activity level'), + Container( + width: 300, + child: DropdownButton( + value: dropdownValue, + icon: Icon(Icons.arrow_downward), + iconSize: 24, + elevation: 16, + style: TextStyle(color: Colors.black87), + underline: Container( + height: 2, + color: Colors.black54, + ), + onChanged: (String newValue) { + setState(() { + dropdownValue = newValue; + }); + }, + items: [ + 'Almost Inactive(Little or no exercises)', + 'Lighty Active (1-3) days per week', + 'very Active(6-7) days per week', + 'Super Active(very hard exercises)' + ].map>((String value) { + return DropdownMenuItem( + value: value, + child: Text(value), + ); + }).toList(), + ), + ), + SizedBox( + height: 25.0, + ), + Container( + height: 100.0, + width: 350.0, + child: Button( + label: 'CALCULATE', + onTap: () { + setState(() { + calculateCalories(); + print(calories); + { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => CalorieResultPage( + calorie: calories, + )), + ); + } + }); + }, + ), + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart new file mode 100644 index 00000000..5c52ecb0 --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart @@ -0,0 +1,59 @@ +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 'package:percent_indicator/circular_percent_indicator.dart'; + +class CalorieResultPage extends StatelessWidget { + final double calorie; + + CalorieResultPage({this.calorie}); + + @override + Widget build(BuildContext context) { + return AppScaffold( + appBarTitle: 'Calorie Calculator', + isShowAppBar: true, + body: Column( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Center( + child: CircularPercentIndicator( + radius: 220.0, + lineWidth: 20.0, + percent: ((this.calorie > 3500) ? 100 : this.calorie / 3500), + center: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + calorie.toStringAsFixed(1), + style: TextStyle( + fontSize: 18.0, + fontWeight: FontWeight.bold, + ), + ), + SizedBox( + height: 5.0, + ), + Texts('Calories'), + ], + ), + progressColor: Color(0xff3C3939), + backgroundColor: Colors.white, + ), + ), + Container( + child: + Texts('Daily intake is ${calorie.toStringAsFixed(1)} calories'), + ), + Container( + width: 350, + child: Button( + label: 'See List Of Doctors', + ), + ), + ], + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart b/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart new file mode 100644 index 00000000..32ec9262 --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart @@ -0,0 +1,367 @@ +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:flutter/services.dart'; + +class Carbs extends StatefulWidget { + @override + _CarbsState createState() => _CarbsState(); +} + +class _CarbsState extends State { + TextEditingController textController = new TextEditingController(); + int calories; + String dropdownValue; + bool _visible = false; + int meals; + int protein; + int carbs; + + int fat; + double pCal; + double cCal; + double fCal; + double pCalGram; + double cCalGram; + double fCalGram; + double pCalMeal; + double cCalMeal; + double fCalMeal; + + void calculateDietRatios() { + if (dropdownValue == 'Very Low Carb') { + meals = 3; + protein = 45; + carbs = 10; + fat = 45; + } else if (dropdownValue == 'Low Carb') { + meals = 3; + protein = 40; + carbs = 30; + fat = 30; + } else if (dropdownValue == 'Moderate Carb') { + meals = 3; + protein = 25; + carbs = 50; + fat = 25; + } else if (dropdownValue == 'USDA Gudilines') { + meals = 3; + protein = 15; + carbs = 55; + fat = 30; + } else if (dropdownValue == 'Zone Diet') { + meals = 3; + protein = 30; + carbs = 40; + fat = 30; + } + } + + void calculate() { + pCal = (protein / 100.0) * int.parse(textController.text).ceil(); + cCal = (carbs / 100.0) * int.parse(textController.text); + ; + fCal = (fat / 100) * int.parse(textController.text); + ; + pCalGram = pCal / 4.0; + cCalGram = cCal / 4.0; + fCalGram = fCal / 9.0; + pCalMeal = pCalGram / meals.ceil(); + cCalMeal = cCalGram / meals.ceil(); + fCalMeal = fCalGram / meals.ceil(); + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Carb Protein Fat', + body: Padding( + padding: EdgeInsets.symmetric(horizontal: 25.0, vertical: 15.0), + child: SingleChildScrollView( + child: Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts( + 'Calculates carbohydrate protein and fat\n ratio in calories and grams according to a\n pre-set ratio', + ), + SizedBox( + height: 15.0, + ), + Column( + children: [ + Container( + width: 335.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 300.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: TextFormField( + controller: textController, + inputFormatters: [ + FilteringTextInputFormatter + .digitsOnly + ], + keyboardType: TextInputType.number, + decoration: InputDecoration( + hintText: " The Calories per day ", + labelStyle: TextStyle( + color: Colors.black87, + ), + ), + ), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + int currentValue = int.parse( + textController.text); + currentValue++; + textController.text = + (currentValue).toString(); + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + int currentValue = int.parse( + textController.text); + currentValue--; + textController.text = + (currentValue).toString(); + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + ], + ), + ), + SizedBox( + height: 20.0, + ), + Button( + backgroundColor: Color(0xffC5272D), + label: 'NOT SURE? CLICK HERE ', + onTap: () { + setState(() { + { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => CalorieCalculator()), + ); + } + }); + }, + ), + ], + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Select Diet Type'), + Container( + width: 400, + child: DropdownButton( + value: dropdownValue, + icon: Icon(Icons.arrow_downward), + iconSize: 24, + elevation: 16, + style: TextStyle(color: Colors.black87), + underline: Container( + height: 2, + color: Colors.black54, + ), + onChanged: (String newValue) { + setState(() { + dropdownValue = newValue; + calculateDietRatios(); + + dropdownValue == null + ? _visible = false + : _visible = true; + }); + }, + items: [ + 'Very Low Carb', + 'Low Carb', + 'Moderate Carb', + 'USDA Gudilines', + 'Zone Diet', + ].map>((String value) { + return DropdownMenuItem( + value: value, + child: Text(value), + ); + }).toList(), + ), + ), + Visibility( + visible: _visible, + child: Container( + height: 170.0, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Texts( + 'Ratios are divided according to the selected diet'), + RichText( + text: TextSpan( + style: TextStyle(color: Colors.black), + children: [ + TextSpan(text: 'Meals Per Day '), + TextSpan( + text: '$meals', + style: TextStyle(color: Color(0xffC5272D)), + ), + ], + ), + ), + RichText( + text: TextSpan( + style: TextStyle(color: Colors.black), + children: [ + TextSpan( + text: 'Protein ', + ), + TextSpan( + text: '$protein%', + style: TextStyle(color: Color(0xffC5272D)), + ) + ], + ), + ), + RichText( + text: TextSpan( + style: TextStyle(color: Colors.black), + children: [ + TextSpan( + text: 'Carbohydrate ', + ), + TextSpan( + text: '$carbs%', + style: TextStyle(color: Color(0xffC5272D)), + ) + ], + ), + ), + RichText( + text: TextSpan( + style: TextStyle(color: Colors.black), + children: [ + TextSpan( + text: 'Fat ', + ), + TextSpan( + text: '$fat%', + style: TextStyle(color: Color(0xffC5272D)), + ) + ], + ), + ), + ], + ), + ), + ) + ], + ), + SizedBox( + height: 55.0, + ), + Container( + height: 100.0, + width: 350.0, + child: Button( + label: 'CALCULATE', + onTap: () { + setState(() { + { + calculate(); + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => CarbsResult( + cCal: cCal, + pCal: pCal, + fCal: fCal, + pCalGram: pCalGram, + pCalMeal: pCalMeal, + fCalGram: fCalGram, + fCalMeal: fCalMeal, + cCalGram: cCalGram, + cCalMeal: cCalMeal, + )), + ); + } + }); + }, + ), + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs_result_page.dart b/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs_result_page.dart new file mode 100644 index 00000000..f8d0815a --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs_result_page.dart @@ -0,0 +1,175 @@ +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:flutter/painting.dart'; + +class CarbsResult extends StatelessWidget { + double pCal; + double cCal; + double fCal; + double pCalGram; + double cCalGram; + double fCalGram; + double pCalMeal; + double cCalMeal; + double fCalMeal; + + CarbsResult( + {this.pCal, + this.cCal, + this.fCal, + this.pCalGram, + this.cCalGram, + this.fCalGram, + this.fCalMeal, + this.cCalMeal, + this.pCalMeal}); + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Carb Protein Fat', + body: Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Padding( + padding: EdgeInsets.symmetric(vertical: 30.0, horizontal: 10.0), + child: Table( + border: TableBorder( + verticalInside: BorderSide(width: 1, color: Colors.black54), + bottom: BorderSide(width: 1, color: Colors.black54), + left: BorderSide(width: 1, color: Colors.black54), + right: BorderSide(width: 1, color: Colors.black54), + top: BorderSide(width: 1, color: Colors.black54), + ), + children: [ + TableRow( + decoration: BoxDecoration( + color: Colors.white, + ), + children: [ + TableCell( + child: Center( + child: Texts('Description'), + ), + ), + TableCell( + child: Center( + child: Texts('Protein'), + ), + ), + TableCell( + child: Center( + child: Texts( + 'Carbohydrate', + ), + ), + ), + TableCell( + child: Center( + child: Texts('Fat'), + ), + ), + ]), + TableRow(children: [ + Padding( + padding: EdgeInsets.all(8.0), + child: TableCell( + child: Center( + child: Texts('Calories\n Per Day'), + ), + ), + ), + TableCell( + child: Center( + child: Texts(pCal.ceil().toString() + ' Cals'), + ), + ), + TableCell( + child: Center( + child: Texts(cCal.ceil().toString() + ' Cals'), + ), + ), + TableCell( + child: Center( + child: Texts(fCal.ceil().toString() + ' Cals'), + ), + ), + ]), + TableRow(children: [ + Padding( + padding: EdgeInsets.all(8.0), + child: TableCell( + child: Center( + child: Texts('Grams Per\n Day'), + ), + ), + ), + TableCell( + child: Center( + child: Texts(pCalGram.ceil().toString() + ' gr'), + ), + ), + TableCell( + child: Center( + child: Texts(cCalGram.ceil().toString() + ' gr'), + ), + ), + TableCell( + child: Center( + child: Texts(fCalGram.ceil().toString() + ' gr'), + ), + ), + ]), + TableRow(children: [ + Padding( + padding: EdgeInsets.all(8.0), + child: TableCell( + child: Center( + child: Texts('Grams Per\n Meal'), + ), + ), + ), + TableCell( + child: Center( + child: Texts(pCalMeal.ceil().toString() + ' gr'), + ), + ), + TableCell( + child: Center( + child: Texts(cCalMeal.ceil().toString() + ' gr'), + ), + ), + TableCell( + child: Center( + child: Texts(fCalMeal.ceil().toString() + ' gr'), + ), + ), + ]), + ], + ), + ), + Container( + width: 350, + child: Button( + label: 'See List Of Doctors', + ), + ), + ], + ), + + // Texts(pCal.ceil().toString()), + // Texts(cCal.ceil().toString()), + // Texts(fCal.ceil().toString()), + // Texts(pCalGram.ceil().toString()), + // Texts(cCalGram.ceil().toString()), + // Texts(fCalGram.ceil().toString()), + // Texts(pCalMeal.ceil().toString()), + // Texts(cCalMeal.ceil().toString()), + // Texts(fCalMeal.ceil().toString()), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart b/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart new file mode 100644 index 00000000..f534416f --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart @@ -0,0 +1,550 @@ +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'; + +const activeCardColor = Color(0xff70777A); +const inactiveCardColor = Color(0xffFAFAFd); + +class IdealBody extends StatefulWidget { + @override + _IdealBodyState createState() => _IdealBodyState(); +} + +class _IdealBodyState extends State { + bool isMale = false; + bool isHeightCm = true; + + Color kgCard = activeCardColor; + Color lbCard = inactiveCardColor; + Color cmCard = activeCardColor; + Color ftCard = inactiveCardColor; + int age = 0; + int height = 0; + double heightInches; + double minRange; + double maxRange; + double overWeightBy; + int weight = 0; + double idealWeight = 0; + String dropdownValue; + double calories = 0; + String textResult = ''; + double maxIdealWeight; + double heightFeet; + + void updateColorHeight(int type) { + //MG/DLT card + if (type == 1) { + if (cmCard == inactiveCardColor) { + cmCard = activeCardColor; + ftCard = inactiveCardColor; + } else { + cmCard = inactiveCardColor; + } + } + if (type == 2) { + if (ftCard == inactiveCardColor) { + ftCard = activeCardColor; + cmCard = inactiveCardColor; + } else { + ftCard = inactiveCardColor; + } + } + } + + void updateColorWeight(int type) { + //MG/DLT card + if (type == 1) { + if (kgCard == inactiveCardColor) { + kgCard = activeCardColor; + lbCard = inactiveCardColor; + } else { + kgCard = inactiveCardColor; + } + } + if (type == 2) { + if (lbCard == inactiveCardColor) { + lbCard = activeCardColor; + kgCard = inactiveCardColor; + } else { + lbCard = inactiveCardColor; + } + } + } + + void calculateIdealWeight() { + heightInches = height * .39370078740157477; + heightFeet = heightInches / 12; + idealWeight = (50 + 2.3 * (heightInches - 60)); + if (dropdownValue == 'Small(fingers overlap)') { + idealWeight = idealWeight - 10; + } else if (dropdownValue == 'Medium(fingers touch)') { + idealWeight = idealWeight; + } else if (dropdownValue == 'Large(fingers don\'n touch)') { + idealWeight = idealWeight + 10; + } + + maxIdealWeight = (((idealWeight) * 1.1).round() * 100) / 100; + overWeightBy = weight - maxIdealWeight.roundToDouble(); + minRange = ((idealWeight / 1.1) * 10).round() / 10; + maxRange = maxIdealWeight; + idealWeight = idealWeight; + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Ideal Body Weight', + body: Padding( + padding: EdgeInsets.symmetric(vertical: 15.0, horizontal: 25.0), + child: SingleChildScrollView( + child: Container( + height: 800.0, + child: Column( + children: [ + Padding( + padding: EdgeInsets.all(10.0), + child: Texts( + 'Calculates the ideal body weight based on height, Weight, and Body Size', + ), + ), + Divider( + thickness: 2.0, + ), + SizedBox( + height: 5.0, + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts( + 'Height', + ), + Row( + children: [ + Container( + width: 335.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(height.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (height < 250) + height++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (height > 0) height--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: height.toDouble(), + min: 0, + max: 250, + onChanged: (double newValue) { + setState(() { + height = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + Texts('Select Unit'), + SizedBox( + height: 5.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColorHeight(1); + isHeightCm = true; + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + color: cmCard, + borderRadius: BorderRadius.circular(3.0), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 18.0), + child: Center(child: Texts('CM')), + ), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColorHeight(2); + isHeightCm = false; + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + color: ftCard, + borderRadius: BorderRadius.circular(3.0), + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + ), + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0), + child: Center(child: Texts('Ft')), + ), + ), + ), + ], + ), + SizedBox( + height: 45.0, + ), + Divider( + thickness: 2.0, + ), + Texts( + 'Weight', + ), + SizedBox( + height: 5.0, + ), + Row( + children: [ + Container( + width: 335.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(weight.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (weight < 250) + weight++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (weight > 0) weight--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: weight.toDouble(), + min: 0, + max: 250, + onChanged: (double newValue) { + setState(() { + weight = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + Texts('Select Unit'), + SizedBox( + height: 5.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + setState(() { + updateColorWeight(1); + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + color: kgCard, + borderRadius: BorderRadius.circular(3.0), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 18.0), + child: Center(child: Texts('KG')), + ), + ), + ), + GestureDetector( + onTap: () { + setState(() { + updateColorWeight(2); + }); + }, + child: Container( + height: 55.0, + width: 150.0, + decoration: BoxDecoration( + color: lbCard, + borderRadius: BorderRadius.circular(3.0), + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + ), + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0), + child: Center(child: Texts('LB')), + ), + ), + ), + ], + ), + SizedBox( + height: 45.0, + ), + Divider( + thickness: 2.0, + ), + SizedBox( + height: 5.0, + ), + Texts('Body Frame Size'), + Container( + width: 300, + child: DropdownButton( + value: dropdownValue, + icon: Icon(Icons.arrow_downward), + iconSize: 24, + elevation: 16, + style: TextStyle(color: Colors.black87), + underline: Container( + height: 2, + color: Colors.black54, + ), + onChanged: (String newValue) { + setState(() { + dropdownValue = newValue; + }); + }, + items: [ + 'Small(fingers overlap)', + 'Medium(fingers touch)', + 'Large(fingers don\'n touch)', + ].map>((String value) { + return DropdownMenuItem( + value: value, + child: Text(value), + ); + }).toList(), + ), + ), + SizedBox( + height: 30.0, + ), + Container( + height: 100.0, + width: 350.0, + child: Button( + label: 'CALCULATE', + onTap: () { + setState(() { + // calculateBmr(); + // calculateCalories(); + calculateIdealWeight(); + + print(idealWeight); + //print(overWeightBy); + { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => IdealBodyResult( + idealBodyWeight: idealWeight, + minRange: minRange, + mixRange: maxRange, + overWeightBy: overWeightBy, + textResult: textResult, + )), + ); + } + }); + }, + ), + ), + ], + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body_result_page.dart b/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body_result_page.dart new file mode 100644 index 00000000..605e499a --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body_result_page.dart @@ -0,0 +1,170 @@ +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'; + +class IdealBodyResult extends StatelessWidget { + final double idealBodyWeight; + final double minRange; + final double mixRange; + final double overWeightBy; + final String textResult; + + IdealBodyResult( + {this.idealBodyWeight, + this.minRange, + this.mixRange, + this.overWeightBy, + this.textResult}); + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Ideal Body Weight', + body: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Texts( + 'Ideal weight range is', + fontSize: 23.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Row( + children: [ + Texts( + minRange.toStringAsFixed(1), + fontSize: 30.0, + ), + Padding( + padding: EdgeInsets.only(top: 8.0, left: 4.0), + child: Text( + 'Kg', + style: TextStyle(color: Colors.red), + ), + ), + ], + ), + Icon( + Icons.arrow_forward, + color: Colors.red, + size: 55.0, + ), + Row( + children: [ + Texts( + mixRange.toStringAsFixed(1), + fontSize: 30.0, + ), + Padding( + padding: EdgeInsets.only(top: 8.0, left: 4.0), + child: Text( + 'Kg', + style: TextStyle(color: Colors.red), + ), + ), + ], + ), + ], + ), + overWeightBy >= 0 && overWeightBy <= 10 + ? Column( + children: [ + Texts( + 'Congratulations! The current weight is\n perfect and considered healthy', + fontSize: 20.0, + ), + ], + ) + : overWeightBy > 10 && overWeightBy < 17 + ? Column( + children: [ + Texts( + 'This means that the weight is a little bit more than ideal weight by'), + Texts(overWeightBy.toStringAsFixed(1)), + Texts( + 'May wish to consult with the doctor for medical help. Click to view our list of Doctors'), + ], + ) + : overWeightBy >= 18 + ? Container( + height: 250.0, + width: 350, + child: Column( + children: [ + Texts( + 'Means that you suffer from excessive\n obesity by', + ), + SizedBox( + height: 55.0, + ), + Texts( + overWeightBy.toStringAsFixed(1), + fontSize: 40.0, + ), + SizedBox( + height: 25.0, + ), + Texts( + 'May wish to consult with the doctor for\n medical help. Click to view our list of\n Doctors'), + ], + ), + ) + : overWeightBy < -18 + ? Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: Texts( + 'Under Weight', + fontSize: 18.0, + ), + ), + SizedBox( + height: 55.0, + ), + Texts( + overWeightBy.toStringAsFixed(1), + fontSize: 20.0, + ), + ], + ) + : Container( + height: 250.0, + width: 350.0, + child: Column( + children: [ + Texts( + 'under wheight', + fontSize: 20.0, + ), + SizedBox( + height: 55.0, + ), + Texts( + overWeightBy.toStringAsFixed(1), + fontSize: 20.0, + ), + SizedBox( + height: 25.0, + ), + Texts( + 'May wish to consult with the doctor for\n medical help. Click to view our list of\n Doctors'), + ], + ), + ), + Container( + width: 350, + child: Button( + label: 'See List Of Doctors', + ), + ), + ], + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart b/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart index 7a48cf9b..9a2f08df 100644 --- a/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart +++ b/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart @@ -96,7 +96,7 @@ class _BloodCholesterolState extends State { children: [ Texts( 'Convert from', - ) + ), ], ), ), diff --git a/lib/pages/AlHabibMedicalService/​ health_calculators.dart b/lib/pages/AlHabibMedicalService/​ health_calculators.dart new file mode 100644 index 00000000..56fb0428 --- /dev/null +++ b/lib/pages/AlHabibMedicalService/​ health_calculators.dart @@ -0,0 +1,279 @@ +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'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +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/bmr_calculator/bmr_calculator.dart'; +import 'health_calculator/ideal_body/ideal_body.dart'; + +class HealthCalculators extends StatefulWidget { + @override + _HealthCalculatorsState createState() => _HealthCalculatorsState(); +} + +class _HealthCalculatorsState extends State + with SingleTickerProviderStateMixin { + TabController _tabController; + void initState() { + super.initState(); + _tabController = TabController(length: 2, vsync: this); + } + + void dispose() { + super.dispose(); + _tabController.dispose(); + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Health Calculators', + body: Scaffold( + extendBodyBehindAppBar: true, + appBar: PreferredSize( + preferredSize: Size.fromHeight(70.0), + child: Stack( + children: [ + Center( + child: Container( + height: 60.0, + margin: EdgeInsets.only(top: 10.0), + width: MediaQuery.of(context).size.width * 1.9, + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + color: Theme.of(context).dividerColor, + width: 5.7, + ), + ), + color: Colors.white, + ), + child: Center( + child: TabBar( + controller: _tabController, + isScrollable: true, + indicatorWeight: 4.0, + indicatorColor: Colors.red, + labelColor: Theme.of(context).primaryColor, + labelPadding: + EdgeInsets.symmetric(horizontal: 13.0, vertical: 2.0), + unselectedLabelColor: Colors.grey, + tabs: [ + Container( + width: MediaQuery.of(context).size.width * 0.35, + child: Center( + child: Texts('General Health'), + ), + ), + Container( + width: MediaQuery.of(context).size.width * 0.35, + child: Center( + child: Texts("Women's Health"), + ), + ), + ], + ), + ), + ), + ) + ], + ), + ), + body: Column( + children: [ + Expanded( + child: TabBarView( + physics: BouncingScrollPhysics(), + controller: _tabController, + children: [ + Container( + child: Column( + children: [ + Container( + width: double.infinity, + height: 80, + ), + Row( + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () { + Navigator.push( + context, + FadePage(page: BMICalculator()), + ); + }, + child: MedicalProfileItem( + title: 'BMI', + imagePath: 'bmi_health_calculator.png', + subTitle: 'Calculators', + ), + ), + ), + Expanded( + flex: 1, + child: InkWell( + onTap: () { + Navigator.push( + context, + FadePage( + page: CalorieCalculator(), + ), + ); + }, + child: MedicalProfileItem( + title: 'Calories', + imagePath: 'calories-calculator.png', + subTitle: 'Calculators', + ), + ), + ), + ], + ), + Row( + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () { + Navigator.push( + context, + FadePage( + page: BmrCalculator(), + ), + ); + }, + child: MedicalProfileItem( + title: 'BMR', + imagePath: 'BMR_calculator.png', + subTitle: 'Calculators', + ), + ), + ), + Expanded( + flex: 1, + child: InkWell( + onTap: () { + Navigator.push( + context, + FadePage( + page: IdealBody(), + ), + ); + }, + child: MedicalProfileItem( + title: 'Ideal Body', + imagePath: 'body_weight.png', + subTitle: 'Weight', + ), + ), + ), + ], + ), + Row( + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () { + Navigator.push( + context, + FadePage( + page: BodyFat(), + ), + ); + }, + child: MedicalProfileItem( + title: 'Body', + imagePath: 'body_fat.png', + subTitle: 'Fat', + ), + ), + ), + Expanded( + flex: 1, + child: InkWell( + onTap: () { + Navigator.push( + context, + FadePage( + page: Carbs(), + ), + ); + }, + child: MedicalProfileItem( + title: 'Carbohydrate', + imagePath: 'carb_protein.png', + subTitle: 'Protein Fat', + ), + ), + ), + ], + ), + ], + ), + ), + Container( + child: Column( + children: [ + Container( + width: double.infinity, + height: 80, + ), + Row( + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () { + // Navigator.push( + // context, + // FadePage(page: BloodSugar()), + // ); + }, + child: MedicalProfileItem( + title: 'Ovulation', + imagePath: 'ovulation_period_icon.png', + subTitle: 'Period', + ), + ), + ), + Expanded( + flex: 1, + child: InkWell( + onTap: () { + // Navigator.push( + // context, + // FadePage( + // page: BloodCholesterol(), + // ), + // ); + }, + child: MedicalProfileItem( + title: 'Delivery', + imagePath: 'delivery_date_icon.png', + subTitle: 'Due Date', + ), + ), + ), + ], + ), + ], + ), + ), + ], + ), + ) + ], + ), + ), + ); + } +} diff --git a/pubspec.yaml b/pubspec.yaml index 9b9588fd..ff2c0a00 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -110,6 +110,9 @@ dependencies: #Popup_window popup_box: ^0.1.0 + #Numbers + number_inc_dec: ^0.6.6 + From 84f429e559dddd4f2c18d7c1c88ec7ce37344683 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Wed, 7 Oct 2020 12:50:08 +0300 Subject: [PATCH 20/30] merge --- .../all_habib_medical_service_page.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart index 5cd92898..bc30626e 100644 --- a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart +++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart @@ -220,7 +220,7 @@ class _AllHabibMedicalServiceState extends State { ServicesContainer( onTap: () => Navigator.push( context, - FadePage(page:BloodDonationPage()), + FadePage(page: BloodDonationPage()), ), imageLocation: 'assets/images/new-design/blood_icon.png', title: 'Blood Donation', @@ -288,7 +288,8 @@ class _AllHabibMedicalServiceState extends State { Navigator.of(context).push(MaterialPageRoute( builder: (BuildContext context) => MyWebView( title: "HMG News", - selectedUrl: "https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live", + selectedUrl: + "https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live", ))); }, imageLocation: From 24795e808f5ef4bc1da8924f904bc4666416c409 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Wed, 7 Oct 2020 12:56:42 +0300 Subject: [PATCH 21/30] child Vaccines --- .../dialogs/SelectGenderDialog.dart | 85 ++++++++----------- .../ChildVaccines/vaccinationtable_page.dart | 13 ++- 2 files changed, 47 insertions(+), 51 deletions(-) diff --git a/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart b/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart index 295c6dcd..5eb461c6 100644 --- a/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart +++ b/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart @@ -5,20 +5,11 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; class SelectGenderDialog extends StatefulWidget { - final Gender beneficiaryType; - final Function(Gender) onValueSelected; - - SelectGenderDialog({Key key, this.beneficiaryType, this.onValueSelected}); - @override - _SelectGenderDialogState createState() => - _SelectGenderDialogState(this.beneficiaryType); + _SelectGenderDialogState createState() => _SelectGenderDialogState(); } class _SelectGenderDialogState extends State { - _SelectGenderDialogState(this.beneficiaryType); - Gender beneficiaryType; - @override Widget build(BuildContext context) { return SimpleDialog( @@ -34,21 +25,12 @@ class _SelectGenderDialogState extends State { child: InkWell( onTap: () { setState(() { - beneficiaryType = Gender.Male; + //beneficiaryType = Gender.Male; }); }, child: ListTile( - title: Text("Male"), - leading: Radio( - value: Gender.Male, - groupValue: beneficiaryType, - activeColor: Colors.red[800], - onChanged: (Gender value) { - setState(() { - beneficiaryType = value; - }); - }, - ), + title: Text("Send the child's schedule to the email\n Tamer.dasdasdas@gmail.com "), + ), ), ) @@ -57,33 +39,33 @@ class _SelectGenderDialogState extends State { SizedBox( height: 5.0, ), - Row( - children: [ - Expanded( - flex: 1, - child: InkWell( - onTap: () { - setState(() { - beneficiaryType = Gender.Female; - }); - }, - child: ListTile( - title: Text("Female"), - leading: Radio( - value: Gender.Female, - groupValue: beneficiaryType, - activeColor: Colors.red[800], - onChanged: (Gender value) { - setState(() { - beneficiaryType = value; - }); - }, - ), - ), - ), - ) - ], - ), + // Row( + // children: [ + // Expanded( + // flex: 1, + // child: InkWell( + // onTap: () { + // setState(() { + // beneficiaryType = Gender.Female; + // }); + // }, + // child: ListTile( + // title: Text("Female"), + // leading: Radio( + // value: Gender.Female, + // groupValue: beneficiaryType, + // activeColor: Colors.red[800], + // onChanged: (Gender value) { + // setState(() { + // beneficiaryType = value; + // }); + // }, + // ), + // ), + // ), + // ) + // ], + // ), SizedBox( height: 5.0, ), @@ -121,7 +103,7 @@ class _SelectGenderDialogState extends State { flex: 1, child: InkWell( onTap: () { - widget.onValueSelected(beneficiaryType); + // widget.onValueSelected(beneficiaryType); Navigator.pop(context); }, child: Padding( @@ -143,4 +125,7 @@ class _SelectGenderDialogState extends State { ], ); } + + + } diff --git a/lib/pages/ChildVaccines/vaccinationtable_page.dart b/lib/pages/ChildVaccines/vaccinationtable_page.dart index 952cfb0c..6ac11e4f 100644 --- a/lib/pages/ChildVaccines/vaccinationtable_page.dart +++ b/lib/pages/ChildVaccines/vaccinationtable_page.dart @@ -9,6 +9,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; +import 'dialogs/SelectGenderDialog.dart'; + class VaccinationTablePage extends StatelessWidget { @override Widget build(BuildContext context) { @@ -142,7 +144,16 @@ class VaccinationTablePage extends StatelessWidget { color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,), label: "Send Email ", // - onTap: () {} + onTap: () { + //SelectGenderDialog(); +//=============== + showDialog( + context: context, + child: SelectGenderDialog( + ), + ); + //========= + } ), From cb2a78e2ee721f07974fb91065ae400db1ed750e Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Wed, 7 Oct 2020 16:17:16 +0300 Subject: [PATCH 22/30] child Vaccines --- .../get_vacainations_itemsmodel.dart | 18 +++++++++ .../get_vaccinations_item_services.dart | 38 +++++++++++++++++++ .../ChildVaccines/add_newchild_page.dart | 18 +-------- lib/pages/ChildVaccines/child_page.dart | 6 --- .../dialogs/SelectGenderDialog.dart | 28 +------------- 5 files changed, 58 insertions(+), 50 deletions(-) create mode 100644 lib/core/model/childvaccines/get_vacainations_itemsmodel.dart create mode 100644 lib/core/service/childvaccines/get_vaccinations_item_services.dart diff --git a/lib/core/model/childvaccines/get_vacainations_itemsmodel.dart b/lib/core/model/childvaccines/get_vacainations_itemsmodel.dart new file mode 100644 index 00000000..14891852 --- /dev/null +++ b/lib/core/model/childvaccines/get_vacainations_itemsmodel.dart @@ -0,0 +1,18 @@ +class GET_VACCINATIONS_ITEMSMODEL { + String dESCRIPTION; + String iTEMCODE; + + GET_VACCINATIONS_ITEMSMODEL({this.dESCRIPTION, this.iTEMCODE}); + + GET_VACCINATIONS_ITEMSMODEL.fromJson(Map json) { + dESCRIPTION = json['DESCRIPTION']; + iTEMCODE = json['ITEM_CODE']; + } + + Map toJson() { + final Map data = new Map(); + data['DESCRIPTION'] = this.dESCRIPTION; + data['ITEM_CODE'] = this.iTEMCODE; + return data; + } +} \ No newline at end of file diff --git a/lib/core/service/childvaccines/get_vaccinations_item_services.dart b/lib/core/service/childvaccines/get_vaccinations_item_services.dart new file mode 100644 index 00000000..f7fe4662 --- /dev/null +++ b/lib/core/service/childvaccines/get_vaccinations_item_services.dart @@ -0,0 +1,38 @@ +import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/get_vacainations_itemsmodel.dart'; + +import '../base_service.dart'; + +class GetVccinationsItemsService extends BaseService { + List getVaccinationsItemModelList = List(); + Map body = Map(); + + + + Future getaccinationsitemOrders() async { + hasError = false; + // await getUser(); + // body['BabyName']="fffffffffff eeeeeeeeeeeeee"; + // body['DOB'] = "/Date(1585774800000+0300)/"; + // body['EmailAddress'] = user.emailAddress; + // body['isDentalAllowedBackend'] = false; + // body['SendEmail'] = false; + // body['IsLogin'] =true; + + + + + await baseAppClient.post(GET_TABLE_REQUEST, + onSuccess: (dynamic response, int statusCode) { + getVaccinationsItemModelList.clear(); + response['List_CreateVaccinationTableModel'].forEach((vital) { + getVaccinationsItemModelList.add( + GET_VACCINATIONS_ITEMSMODEL.fromJson(vital)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } + +} \ No newline at end of file diff --git a/lib/pages/ChildVaccines/add_newchild_page.dart b/lib/pages/ChildVaccines/add_newchild_page.dart index a24fa5a4..f2970cad 100644 --- a/lib/pages/ChildVaccines/add_newchild_page.dart +++ b/lib/pages/ChildVaccines/add_newchild_page.dart @@ -274,19 +274,7 @@ class _AddNewChildPageState extends State { model.getNewBabyOrders(newChild: newChild); - //DateTime.now();//DateUtil.convertStringToDate(getStartDay()); - // addvancedModel.alertBy = 2; - // addvancedModel.alertBy = addvancedModel.babyID; - // addvancedModel.genderDescription = - // checkedValue == 1 ? "Male" : "Female"; - // addvancedModel.patientID = addvancedModel.patientID; - // addvancedModel.userID = addvancedModel.userID; - // // advanceModel.fileNumber = _fileTextController.text; - // // advanceModel.hospitalsModel = _selectedHospital; - // // advanceModel.note = _notesTextController.text; - // // advanceModel.email = email ?? model.user.emailAddress; - // // advanceModel.amount = amount; - // // bloodDetails.city=_selectedHospital.toString(); + AppToast.showSuccessToast(message: "Record Added"); //============ Navigator.push( @@ -294,10 +282,6 @@ class _AddNewChildPageState extends State { FadePage( page: ChildPage(), - //ChildPage(babyInformationModelList:model.BabyInformationModelList) - // HospitalsPage( - // findusHospitalModelList: model.FindusHospitalModelList, - // ) ), ); //============== diff --git a/lib/pages/ChildVaccines/child_page.dart b/lib/pages/ChildVaccines/child_page.dart index c657b3ca..6a937aad 100644 --- a/lib/pages/ChildVaccines/child_page.dart +++ b/lib/pages/ChildVaccines/child_page.dart @@ -12,9 +12,7 @@ import 'package:flutter/material.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; class ChildPage extends StatefulWidget { -//final List babyInformationModelList; - // ChildPage({Key key, this.babyInformationModelList}) ; @override _ChildPageState createState() => _ChildPageState(); @@ -139,10 +137,6 @@ class _ChildPageState extends State with SingleTickerProviderStateMix FadePage( page: AddNewChildPage(), - //ChildPage(babyInformationModelList:model.BabyInformationModelList) - // HospitalsPage( - // findusHospitalModelList: model.FindusHospitalModelList, - // ) ), ), diff --git a/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart b/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart index 5eb461c6..f84dea29 100644 --- a/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart +++ b/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart @@ -39,33 +39,7 @@ class _SelectGenderDialogState extends State { SizedBox( height: 5.0, ), - // Row( - // children: [ - // Expanded( - // flex: 1, - // child: InkWell( - // onTap: () { - // setState(() { - // beneficiaryType = Gender.Female; - // }); - // }, - // child: ListTile( - // title: Text("Female"), - // leading: Radio( - // value: Gender.Female, - // groupValue: beneficiaryType, - // activeColor: Colors.red[800], - // onChanged: (Gender value) { - // setState(() { - // beneficiaryType = value; - // }); - // }, - // ), - // ), - // ), - // ) - // ], - // ), + SizedBox( height: 5.0, ), From 67e3a13a95c010e1a343696cae2a4dbaf77996f5 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Thu, 8 Oct 2020 16:34:27 +0300 Subject: [PATCH 23/30] child Vaccines add new child modified --- lib/config/config.dart | 8 +- .../childvaccines/create_new_user_model.dart | 165 ++++++++++ .../childvaccines/add_new_child_service.dart | 41 ++- .../childvaccines/child_vaccines_service.dart | 39 ++- .../get_vaccinations_item_services.dart | 11 - .../user_information_service.dart | 50 ++- .../add_new_child_view_model.dart | 32 +- .../child_vaccines_view_model.dart | 16 +- .../user_information_view_model.dart | 4 +- lib/locator.dart | 1 + .../ChildVaccines/add_newchild_page.dart | 74 ++--- lib/pages/ChildVaccines/child_page.dart | 285 ++++++++++-------- .../ChildVaccines/child_vaccines_page.dart | 7 +- 13 files changed, 473 insertions(+), 260 deletions(-) create mode 100644 lib/core/model/childvaccines/create_new_user_model.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index 2f497de2..e45d5cf8 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -69,14 +69,16 @@ const GET_FINDUS_REQUEST= const GET_LIVECHAT_REQUEST= 'Services/Patients.svc/REST/GetPatientICProjects'; -///babyInformation -const GET_BABYINFORMATION_REQUEST= - 'Services/Community.svc/REST/GetBabyByUserID'; +///Get Baby By User ID +const GET_BABY_BY_USER_ID= 'Services/Community.svc/REST/GetBabyByUserID'; ///userInformation const GET_USERINFORMATION_REQUEST= 'Services/Community.svc/REST/GetUserInformation_New'; +///newUserId +const GET_NEW_USER_REQUEST= + 'Services/Community.svc/REST/CreateNewUser_New'; ///addNewChild const GET_NEWCHILD_REQUEST= diff --git a/lib/core/model/childvaccines/create_new_user_model.dart b/lib/core/model/childvaccines/create_new_user_model.dart new file mode 100644 index 00000000..980567e2 --- /dev/null +++ b/lib/core/model/childvaccines/create_new_user_model.dart @@ -0,0 +1,165 @@ +class CreateNewUser_New { + Null date; + int languageID; + int serviceName; + Null time; + Null androidLink; + Null authenticationTokenID; + Null data; + bool dataw; + int dietType; + Null errorCode; + Null errorEndUserMessage; + Null errorEndUserMessageN; + Null errorMessage; + int errorType; + int foodCategory; + Null iOSLink; + bool isAuthenticated; + int mealOrderStatus; + int mealType; + int messageStatus; + int numberOfResultRecords; + Null patientBlodType; + Null successMsg; + Null successMsgN; + Null htmlResult; + bool isHMGPatient; + bool isRegister; + bool isSendSMS; + Null listBabyInformationModel; + Null listBabyNeedReminderModel; + Null listCreateVaccinationTableModel; + Null listHisPatientModel; + Null listUserInformationModel; + Null listUserInformationModelNew; + Null listVaccinationTableModel; + Null tokinID; + int userID; + Null verificationCode; + + CreateNewUser_New( + {this.date, + this.languageID, + this.serviceName, + this.time, + this.androidLink, + this.authenticationTokenID, + this.data, + this.dataw, + this.dietType, + this.errorCode, + this.errorEndUserMessage, + this.errorEndUserMessageN, + this.errorMessage, + this.errorType, + this.foodCategory, + this.iOSLink, + this.isAuthenticated, + this.mealOrderStatus, + this.mealType, + this.messageStatus, + this.numberOfResultRecords, + this.patientBlodType, + this.successMsg, + this.successMsgN, + this.htmlResult, + this.isHMGPatient, + this.isRegister, + this.isSendSMS, + this.listBabyInformationModel, + this.listBabyNeedReminderModel, + this.listCreateVaccinationTableModel, + this.listHisPatientModel, + this.listUserInformationModel, + this.listUserInformationModelNew, + this.listVaccinationTableModel, + this.tokinID, + this.userID, + this.verificationCode}); + + CreateNewUser_New.fromJson(Map json) { + date = json['Date']; + languageID = json['LanguageID']; + serviceName = json['ServiceName']; + time = json['Time']; + androidLink = json['AndroidLink']; + authenticationTokenID = json['AuthenticationTokenID']; + data = json['Data']; + dataw = json['Dataw']; + dietType = json['DietType']; + errorCode = json['ErrorCode']; + errorEndUserMessage = json['ErrorEndUserMessage']; + errorEndUserMessageN = json['ErrorEndUserMessageN']; + errorMessage = json['ErrorMessage']; + errorType = json['ErrorType']; + foodCategory = json['FoodCategory']; + iOSLink = json['IOSLink']; + isAuthenticated = json['IsAuthenticated']; + mealOrderStatus = json['MealOrderStatus']; + mealType = json['MealType']; + messageStatus = json['MessageStatus']; + numberOfResultRecords = json['NumberOfResultRecords']; + patientBlodType = json['PatientBlodType']; + successMsg = json['SuccessMsg']; + successMsgN = json['SuccessMsgN']; + htmlResult = json['HtmlResult']; + isHMGPatient = json['IsHMGPatient']; + isRegister = json['IsRegister']; + isSendSMS = json['IsSendSMS']; + listBabyInformationModel = json['List_BabyInformationModel']; + listBabyNeedReminderModel = json['List_BabyNeedReminderModel']; + listCreateVaccinationTableModel = json['List_CreateVaccinationTableModel']; + listHisPatientModel = json['List_His_PatientModel']; + listUserInformationModel = json['List_UserInformationModel']; + listUserInformationModelNew = json['List_UserInformationModel_New']; + listVaccinationTableModel = json['List_VaccinationTableModel']; + tokinID = json['TokinID']; + userID = json['UserID']; + verificationCode = json['VerificationCode']; + } + + Map toJson() { + final Map data = new Map(); + data['Date'] = this.date; + data['LanguageID'] = this.languageID; + data['ServiceName'] = this.serviceName; + data['Time'] = this.time; + data['AndroidLink'] = this.androidLink; + data['AuthenticationTokenID'] = this.authenticationTokenID; + data['Data'] = this.data; + data['Dataw'] = this.dataw; + data['DietType'] = this.dietType; + data['ErrorCode'] = this.errorCode; + data['ErrorEndUserMessage'] = this.errorEndUserMessage; + data['ErrorEndUserMessageN'] = this.errorEndUserMessageN; + data['ErrorMessage'] = this.errorMessage; + data['ErrorType'] = this.errorType; + data['FoodCategory'] = this.foodCategory; + data['IOSLink'] = this.iOSLink; + data['IsAuthenticated'] = this.isAuthenticated; + data['MealOrderStatus'] = this.mealOrderStatus; + data['MealType'] = this.mealType; + data['MessageStatus'] = this.messageStatus; + data['NumberOfResultRecords'] = this.numberOfResultRecords; + data['PatientBlodType'] = this.patientBlodType; + data['SuccessMsg'] = this.successMsg; + data['SuccessMsgN'] = this.successMsgN; + data['HtmlResult'] = this.htmlResult; + data['IsHMGPatient'] = this.isHMGPatient; + data['IsRegister'] = this.isRegister; + data['IsSendSMS'] = this.isSendSMS; + data['List_BabyInformationModel'] = this.listBabyInformationModel; + data['List_BabyNeedReminderModel'] = this.listBabyNeedReminderModel; + data['List_CreateVaccinationTableModel'] = + this.listCreateVaccinationTableModel; + data['List_His_PatientModel'] = this.listHisPatientModel; + data['List_UserInformationModel'] = this.listUserInformationModel; + data['List_UserInformationModel_New'] = this.listUserInformationModelNew; + data['List_VaccinationTableModel'] = this.listVaccinationTableModel; + data['TokinID'] = this.tokinID; + data['UserID'] = this.userID; + data['VerificationCode'] = this.verificationCode; + return data; + } +} \ No newline at end of file diff --git a/lib/core/service/childvaccines/add_new_child_service.dart b/lib/core/service/childvaccines/add_new_child_service.dart index 22a081a3..5e4a4d86 100644 --- a/lib/core/service/childvaccines/add_new_child_service.dart +++ b/lib/core/service/childvaccines/add_new_child_service.dart @@ -1,26 +1,41 @@ import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/create_new_user_model.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; import '../base_service.dart'; class CreteNewBabyService extends BaseService { List createNewBabyModelList = List(); + List userModelList = List(); + List newUserModelList = List(); - Future getCreateNewBabyOrders({ CreateNewBaby newChild}) async { + + Future getCreateNewBabyOrders({CreateNewBaby newChild,int userID}) async { hasError = false; + await getUser(); + Map body = Map.from(newChild.toJson()); + body['CreatedBy'] = 102; + body['EditedBy'] = 102; + body['UserID'] = userID; + body['AlertBy'] = 2; + body['EmailAddress'] = user.emailAddress; + body['IsLogin'] = true; + body['LogInTokenID'] = await sharedPref.getString(TOKEN); + body['MobileNumber'] = user.mobileNumber; + body['NationalID'] = user.nationalityID; + body['ZipCode'] = user.zipCode; + + body['isDentalAllowedBackend'] = false; + await baseAppClient.post(GET_NEWCHILD_REQUEST, onSuccess: (dynamic response, int statusCode) { - createNewBabyModelList.clear(); - - response['List_UserInformationModel_New'].forEach((vital) { - createNewBabyModelList.add( - CreateNewBaby.fromJson(vital)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: newChild.toJson()); + var asd =""; + }, + onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); } - -} \ No newline at end of file +} diff --git a/lib/core/service/childvaccines/child_vaccines_service.dart b/lib/core/service/childvaccines/child_vaccines_service.dart index 75a07338..09256f47 100644 --- a/lib/core/service/childvaccines/child_vaccines_service.dart +++ b/lib/core/service/childvaccines/child_vaccines_service.dart @@ -1,5 +1,6 @@ import 'dart:convert'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; @@ -8,22 +9,17 @@ import '../base_service.dart'; class ChildVaccinesService extends BaseService { List babyInformationModelList = List(); List userInformationModelList = List(); + int userID = 0; - Map body = Map(); Future getAllBabyInformationOrders() async { + Map body = Map(); hasError = false; - body['isDentalAllowedBackend'] = false; body['IsLogin'] = true; - - //body['UserID'] = userInformationModelList[0].userID;//AuthenticatedUser.fromJson(json['List'][0] //babyInformationModelList[0].userID; - body['UserID'] = 46013;//42843; - - - await baseAppClient.post(GET_BABYINFORMATION_REQUEST, + body['UserID'] = userID; + await baseAppClient.post(GET_BABY_BY_USER_ID, onSuccess: (dynamic response, int statusCode) { babyInformationModelList.clear(); - response['List_BabyInformationModel'].forEach((vital) { babyInformationModelList.add(List_BabyInformationModel.fromJson(vital)); }); @@ -32,4 +28,29 @@ class ChildVaccinesService extends BaseService { super.error = error; }, body: body); } + + Future getNewUserOrders() async { + Map body = Map(); + hasError = false; + await getUser(); + body['CreatedBy'] = 102; + body['EditedBy'] = 102; + body['UserID'] = userID; + body['AlertBy'] = 2; + body['EmailAddress'] = user.emailAddress; + body['IsLogin'] = true; + body['LogInTokenID'] = await sharedPref.getString(TOKEN); + body['MobileNumber'] = user.mobileNumber; + body['NationalID'] = user.nationalityID; + body['ZipCode'] = user.zipCode; + body['isDentalAllowedBackend'] = false; + + await baseAppClient.post(GET_NEW_USER_REQUEST, + onSuccess: (dynamic response, int statusCode) { + userID = response['UserID']; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } } diff --git a/lib/core/service/childvaccines/get_vaccinations_item_services.dart b/lib/core/service/childvaccines/get_vaccinations_item_services.dart index f7fe4662..5ff936af 100644 --- a/lib/core/service/childvaccines/get_vaccinations_item_services.dart +++ b/lib/core/service/childvaccines/get_vaccinations_item_services.dart @@ -11,17 +11,6 @@ class GetVccinationsItemsService extends BaseService { Future getaccinationsitemOrders() async { hasError = false; - // await getUser(); - // body['BabyName']="fffffffffff eeeeeeeeeeeeee"; - // body['DOB'] = "/Date(1585774800000+0300)/"; - // body['EmailAddress'] = user.emailAddress; - // body['isDentalAllowedBackend'] = false; - // body['SendEmail'] = false; - // body['IsLogin'] =true; - - - - await baseAppClient.post(GET_TABLE_REQUEST, onSuccess: (dynamic response, int statusCode) { getVaccinationsItemModelList.clear(); diff --git a/lib/core/service/childvaccines/user_information_service.dart b/lib/core/service/childvaccines/user_information_service.dart index 7651ef0f..0628920c 100644 --- a/lib/core/service/childvaccines/user_information_service.dart +++ b/lib/core/service/childvaccines/user_information_service.dart @@ -1,41 +1,35 @@ - import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; import '../base_service.dart'; -class UserInformationService extends BaseService{ - +class UserInformationService extends BaseService { List userInformationModelList = List(); Map body = Map(); - - Future getUserInformationOrders() async { hasError = false; - await getUser(); - body['CreatedBy'] = 102; - body['EditedBy'] = 102; - body['EmailAddress'] = user.emailAddress; - body['IsLogin'] =true; - body['LogInTokenID'] = 'ZBGoQFUG50eQJd6Y7u1ykA=='; - body['MobileNumber'] = user.mobileNumber; - body['NationalID'] = user.nationalityID; - body['ZipCode'] = user.zipCode; - body['isDentalAllowedBackend'] = false; - + await getUser(); + body['CreatedBy'] = 102; + body['EditedBy'] = 102; + body['EmailAddress'] = user.emailAddress; + body['IsLogin'] = true; + body['LogInTokenID'] = await sharedPref.getString(TOKEN); + body['MobileNumber'] = user.mobileNumber; + body['NationalID'] = user.nationalityID; + body['ZipCode'] = user.zipCode; + body['isDentalAllowedBackend'] = false; await baseAppClient.post(GET_USERINFORMATION_REQUEST, onSuccess: (dynamic response, int statusCode) { - userInformationModelList.clear(); - - response['List_UserInformationModel_New'].forEach((vital) { - userInformationModelList.add(List_UserInformationModel.fromJson(vital)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: body); + userInformationModelList.clear(); + + response['List_UserInformationModel_New'].forEach((vital) { + userInformationModelList.add(List_UserInformationModel.fromJson(vital)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); } - - -} \ No newline at end of file +} diff --git a/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart b/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart index 26355bd7..f0b55caa 100644 --- a/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart +++ b/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart @@ -1,28 +1,36 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; import 'package:diplomaticquarterapp/core/service/childvaccines/add_new_child_service.dart'; +import 'package:diplomaticquarterapp/core/service/childvaccines/child_vaccines_service.dart'; import '../../../locator.dart'; import '../base_view_model.dart'; -class AddNewChildViewModel extends BaseViewModel{ +class AddNewChildViewModel extends BaseViewModel { CreteNewBabyService _creteNewBabyService = locator(); - - - - List get creteNewBabyModelList=> _creteNewBabyService.createNewBabyModelList; - getNewBabyOrders({ CreateNewBaby newChild}) async { + ChildVaccinesService _childVaccinesService = locator(); + bool isAdded = false; + ///create new baby + createNewBabyOrders({ CreateNewBaby newChild}) async { setState(ViewState.Busy); - - await _creteNewBabyService.getCreateNewBabyOrders(newChild: newChild); - - if ( _creteNewBabyService.hasError) { - error = _creteNewBabyService.error; + await _creteNewBabyService.getCreateNewBabyOrders(newChild: newChild, userID: _childVaccinesService.userID); + if (_creteNewBabyService.hasError) { + error = _creteNewBabyService.error; setState(ViewState.Error); - } else + } else { + isAdded = true; setState(ViewState.Idle); + // await _childVaccinesService.getAllBabyInformationOrders(); + // if (_childVaccinesService.hasError) { + // error = _childVaccinesService.error; + // setState(ViewState.Error); + // } else{ + // + // } + } } + } diff --git a/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart b/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart index e6a8ca60..c19d9168 100644 --- a/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart +++ b/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart @@ -7,18 +7,22 @@ import '../../../locator.dart'; import '../base_view_model.dart'; class ChildVaccinesViewModel extends BaseViewModel{ - - ChildVaccinesService _childVaccinesService = locator(); + List get babyInformationModelList=> _childVaccinesService.babyInformationModelList; - - List get babyInformationModelList=> _childVaccinesService.babyInformationModelList;//BabyInformationModelList; - getBabyInformatioRequestOrders() async { + getNewUserOrders() async { setState(ViewState.Busy); + await _childVaccinesService.getNewUserOrders(); + if (_childVaccinesService.hasError) { + error = _childVaccinesService.error; + setState(ViewState.Error); + } else + getBabyInformatioRequestOrders(); + } + getBabyInformatioRequestOrders() async { await _childVaccinesService.getAllBabyInformationOrders(); - if (_childVaccinesService.hasError) { error = _childVaccinesService.error; setState(ViewState.Error); diff --git a/lib/core/viewModels/child_vaccines/user_information_view_model.dart b/lib/core/viewModels/child_vaccines/user_information_view_model.dart index c362ef73..43269f42 100644 --- a/lib/core/viewModels/child_vaccines/user_information_view_model.dart +++ b/lib/core/viewModels/child_vaccines/user_information_view_model.dart @@ -11,11 +11,9 @@ class UserInformationViewModel extends BaseViewModel { List get userInformationModelList => _userInformationService.userInformationModelList; - getUserInformatioRequestOrders() async { + getUserInformationRequestOrders() async { setState(ViewState.Busy); - await _userInformationService.getUserInformationOrders(); - if (_userInformationService.hasError) { error = _userInformationService.error; setState(ViewState.Error); diff --git a/lib/locator.dart b/lib/locator.dart index 46b97fce..734e281f 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -123,6 +123,7 @@ void setupLocator() { locator.registerLazySingleton(() => ChildVaccinesService()); locator.registerLazySingleton(() => UserInformationService()); locator.registerLazySingleton(() => CreteNewBabyService()); + locator.registerLazySingleton(() => VaccinationTableService()); diff --git a/lib/pages/ChildVaccines/add_newchild_page.dart b/lib/pages/ChildVaccines/add_newchild_page.dart index f2970cad..a8e97b60 100644 --- a/lib/pages/ChildVaccines/add_newchild_page.dart +++ b/lib/pages/ChildVaccines/add_newchild_page.dart @@ -1,6 +1,7 @@ import 'package:device_calendar/device_calendar.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/create_new_user_model.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/add_new_child_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart'; @@ -19,8 +20,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; - - enum Gender { Male, Female, NON } enum BeneficiaryType { MyAccount, MyFamilyFiles, OtherAccount, NON } @@ -56,6 +55,7 @@ class AddNewChildPage extends StatefulWidget { DateTime.now().day, (hour * count))); } } + @override _AddNewChildPageState createState() => _AddNewChildPageState(); } @@ -75,15 +75,17 @@ class _AddNewChildPageState extends State { TextEditingController _notesTextController = TextEditingController(); BeneficiaryType beneficiaryType = BeneficiaryType.NON; Gender gender = Gender.Male; + CreateNewUser_New newUserChild = CreateNewUser_New(); + //ChildVaccinesViewModel addvancedModel = ChildVaccinesViewModel(); List_BabyInformationModel addvancedModel = List_BabyInformationModel(); - CreateNewBaby newChild=CreateNewBaby(); - List_UserInformationModel informationModel =List_UserInformationModel(); + CreateNewBaby newChild = CreateNewBaby(); + List_UserInformationModel informationModel = List_UserInformationModel(); @override Widget build(BuildContext context) { return BaseView( - builder: (_,model,w)=> AppScaffold( + builder: (_, model, w) => AppScaffold( isShowAppBar: true, appBarTitle: "Vaccintion", body: SingleChildScrollView( @@ -97,7 +99,8 @@ class _AddNewChildPageState extends State { height: 50, ), Texts( - "Add the child's information below to recieve the schedule of vaccinations.", //+model.user.firstName, + "Add the child's information below to recieve the schedule of vaccinations.", + //+model.user.firstName, textAlign: TextAlign.center, ), SizedBox( @@ -139,13 +142,13 @@ class _AddNewChildPageState extends State { width: 170, child: SecondaryButton( textColor: - checkedValue == 1 ? Colors.white : Colors.black, + checkedValue == 1 ? Colors.white : Colors.black, color: checkedValue == 1 ? Colors.red : Colors.white, label: "Male", // onTap: () { - // bloodDetails.city=_selectedHospital.toString(); + setState(() { checkedValue = 1; print("checkedValue=" + checkedValue.toString()); @@ -160,7 +163,7 @@ class _AddNewChildPageState extends State { width: 170, child: SecondaryButton( textColor: - checkedValue == 2 ? Colors.white : Colors.black, + checkedValue == 2 ? Colors.white : Colors.black, color: checkedValue == 2 ? Colors.red : Colors.white, label: "Female", // @@ -220,9 +223,8 @@ class _AddNewChildPageState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Texts(//getStartDay() - // DateUtil.yearMonthDay(DateTime.now()) - getStartDay() - ), + // DateUtil.yearMonthDay(DateTime.now()) + getStartDay()), Icon( Icons.calendar_today, color: Colors.black, @@ -248,45 +250,29 @@ class _AddNewChildPageState extends State { color: checkedValue == false ? Colors.white24 : Color.fromRGBO( - 63, - 72, - 74, - 1, - ), + 63, + 72, + 74, + 1, + ), label: "Add", // - onTap: () { - - newChild.babyName = - _firstTextController.text + " " + _secondTextController.text; + onTap: () async{ + newChild.babyName = _firstTextController.text + " " + _secondTextController.text; newChild.gender = checkedValue.toString(); - newChild.strDOB=getStartDay() ; - newChild.alertBy=addvancedModel.alertBy; - newChild.createdBy=informationModel.createdBy ; - newChild.editedBy=informationModel.createdBy; - newChild.tempValue=true; - // newChild.userID=46013;//informationModel.userID; - newChild.isLogin=true; - //newChild.tokenID='qMgbP94U23RkXtWWT0Sw=='; - //'ZBGoQFUG50eQJd6Y7u1ykA=='; - - - model.getNewBabyOrders(newChild: newChild); - - + newChild.strDOB = getStartDay(); + newChild.tempValue = true; + newChild.isLogin = true; + await model.createNewBabyOrders(newChild: newChild); + if(model.isAdded){ AppToast.showSuccessToast(message: "Record Added"); - //============ - Navigator.push( - context, - FadePage( - page: ChildPage(), + Navigator.pop(context,model.isAdded); + }else{ - ), - ); - //============== + //TODO handling error + } - // bloodDetails. }, ), ), diff --git a/lib/pages/ChildVaccines/child_page.dart b/lib/pages/ChildVaccines/child_page.dart index 6a937aad..becd086f 100644 --- a/lib/pages/ChildVaccines/child_page.dart +++ b/lib/pages/ChildVaccines/child_page.dart @@ -12,139 +12,172 @@ import 'package:flutter/material.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; class ChildPage extends StatefulWidget { - - @override _ChildPageState createState() => _ChildPageState(); } -class _ChildPageState extends State with SingleTickerProviderStateMixin { +class _ChildPageState extends State + with SingleTickerProviderStateMixin { @override Widget build(BuildContext context) { - var checkedValue= true; + var checkedValue = true; return BaseView( - onModelReady: (model) => model.getBabyInformatioRequestOrders(),//model.getCOC(),getFindUsRequestOrders() - builder: (_, model, widget) => AppScaffold( - isShowAppBar: true, - appBarTitle: " Vaccination", - baseViewModel: model, - body: SingleChildScrollView( - child: Container( - margin: EdgeInsets.only(left: 15,right: 15,top: 70), - child: Column( - children: [ - ...List.generate(model.babyInformationModelList.length, (index) => - Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - border: Border.all(color: Colors.white, width: 0.5), - borderRadius: BorderRadius.all(Radius.circular(5)), - color: Colors.white, - - ), - padding: EdgeInsets.all(12), + onModelReady: (model) => model.getNewUserOrders(), + builder: (_, model, widget) => AppScaffold( + isShowAppBar: true, + appBarTitle: " Vaccination", + baseViewModel: model, + body: SingleChildScrollView( + child: Container( + margin: EdgeInsets.only(left: 15, right: 15, top: 70), + child: Column( + children: [ + ...List.generate( + model.babyInformationModelList.length, + (index) => Container( + margin: EdgeInsets.only( + left: 0, right: 0, bottom: 20), + + decoration: BoxDecoration( + shape: BoxShape.rectangle, + border: Border.all( + color: Colors.white, width: 0.5), + borderRadius: + BorderRadius.all(Radius.circular(5)), + color: Colors.white, + ), + padding: EdgeInsets.all(12), + width: double.infinity, + child: Column( + children: [ + Row(children: [ + Texts("CHILD NAME"), + ]), + Row(children: [ + Texts(model + .babyInformationModelList[index] + .babyName + .trim()), + ]), + Row(children: [ + IconButton( + icon: Image.asset(model + .babyInformationModelList[ + index] + .gender == + 1 + ? 'assets/images/new-design/male.png' + : 'assets/images/new-design/female.png'), + tooltip: '', + onPressed: () { + setState(() { + // _volume += 10; + // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + }); + }, + ), + Texts(model + .babyInformationModelList[index] + .genderDescription), + IconButton( + icon: Icon( + Icons.remove_red_eye, + color: Colors.red, + ), + tooltip: 'Increase volume by 10', + onPressed: () { + Navigator.push( + context, + FadePage( + page: VaccinationTablePage(), + + //ChildPage(babyInformationModelList:model.BabyInformationModelList) + // HospitalsPage( + // findusHospitalModelList: model.FindusHospitalModelList, + // ) + ), + ); + // setState(() { + // // _volume += 10; + // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + // }); + }, + ) + ]), + Row(children: [ + Texts("Birthday"), + ]), + Row(children: [ + IconButton( + icon: new Image.asset( + 'assets/images/new-design/calender-secondary.png'), + tooltip: 'Increase volume by 10', + onPressed: () { + setState(() { + // _volume += 10; + // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + }); + }, + ), + Texts(DateUtil.yearMonthDay(model + .babyInformationModelList[index] + .dOB)), + ]), + Row(children: [ + IconButton( + icon: new Image.asset( + 'assets/images/new-design/garbage.png'), + tooltip: '', + onPressed: () { + setState(() { + // _volume += 10; + // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + }); + }, + ), + Texts("Birthday"), + ]), + SizedBox( + height: 12, + ), + ], + ), + + ), + + + ) + ], + )) + ), + bottomSheet: Container( + height: MediaQuery.of(context).size.height * 0.12, width: double.infinity, - child: Column( - - children: [ - Row(children:[Texts("CHILD NAME"),]), - Row(children:[Texts(model.babyInformationModelList[index].babyName.trim()),]), - - Row( - children: [IconButton( - icon: Image.asset(model.babyInformationModelList[index].gender==1? 'assets/images/new-design/male.png':'assets/images/new-design/female.png'), - tooltip: '', - onPressed: () { - setState(() { - // _volume += 10; - // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - }); - }, - ), - Texts(model.babyInformationModelList[index].genderDescription), - IconButton( - icon: Icon(Icons.remove_red_eye,color: Colors.red,), - tooltip: 'Increase volume by 10', - onPressed: () { - Navigator.push( - context, - FadePage( - page: VaccinationTablePage(), - - //ChildPage(babyInformationModelList:model.BabyInformationModelList) - // HospitalsPage( - // findusHospitalModelList: model.FindusHospitalModelList, - // ) - - ), - ); - // setState(() { - // // _volume += 10; - // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - // }); - }, - )] - ), - Row(children:[Texts("Birthday"),]), - Row(children:[IconButton( - icon: new Image.asset('assets/images/new-design/calender-secondary.png'), - tooltip: 'Increase volume by 10', - onPressed: () { - setState(() { - // _volume += 10; - // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - }); - }, - ), - Texts(DateUtil.yearMonthDay(model.babyInformationModelList[index].dOB)),]), - Row(children:[IconButton( - icon: new Image.asset('assets/images/new-design/garbage.png'), - tooltip: '', - onPressed: () { - setState(() { - // _volume += 10; - // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - }); - }, - ), - Texts("Birthday"),]), - ], - ) - - - ) - - ) - - ], - - - ) - ) - ), - bottomSheet: Container( - height: MediaQuery.of(context).size.height * 0.12, - width: double.infinity, - - padding: EdgeInsets.all(12), - child: SecondaryButton( - textColor: Colors.white, - color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,), - label: "ADD NEW CHILD ", - // - onTap: () => Navigator.push( - context, - FadePage( - page: AddNewChildPage(), - - - ), - ), - - - ), - ), - ) - ); + padding: EdgeInsets.all(12), + child: SecondaryButton( + textColor: Colors.white, + color: checkedValue == false + ? Colors.white24 + : Color.fromRGBO( + 63, + 72, + 74, + 1, + ), + label: "ADD NEW CHILD ", + // + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => AddNewChildPage(), + ), + ).then((value) { + if (value) model.getNewUserOrders(); + }); + }, + ), + ), + )); } } diff --git a/lib/pages/ChildVaccines/child_vaccines_page.dart b/lib/pages/ChildVaccines/child_vaccines_page.dart index ba4589a9..f8fe7b74 100644 --- a/lib/pages/ChildVaccines/child_vaccines_page.dart +++ b/lib/pages/ChildVaccines/child_vaccines_page.dart @@ -29,7 +29,7 @@ class _ChildVaccinesPageState extends State Widget build(BuildContext context) { return BaseView( - onModelReady: (model) => model.getUserInformatioRequestOrders(), + onModelReady: (model) => model.getUserInformationRequestOrders(), builder: (_, model, w) => AppScaffold( isShowAppBar: true, baseViewModel: model, @@ -132,10 +132,7 @@ class _ChildVaccinesPageState extends State FadePage( page: ChildPage(), - //ChildPage(babyInformationModelList:model.BabyInformationModelList) - // HospitalsPage( - // findusHospitalModelList: model.FindusHospitalModelList, - // ) + ), ), From 8ddec0ad99112cc5aa9b9ba852908e85edf55342 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Sun, 11 Oct 2020 08:37:05 +0300 Subject: [PATCH 24/30] child Vaccines add new child modified --- lib/pages/ChildVaccines/child_page.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/ChildVaccines/child_page.dart b/lib/pages/ChildVaccines/child_page.dart index becd086f..9f9f933c 100644 --- a/lib/pages/ChildVaccines/child_page.dart +++ b/lib/pages/ChildVaccines/child_page.dart @@ -47,7 +47,7 @@ class _ChildPageState extends State color: Colors.white, ), padding: EdgeInsets.all(12), - width: double.infinity, + width: 200,//double.infinity, child: Column( children: [ Row(children: [ From 41d50e23e3df837e9a17bbe58e01472325a9e7d7 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 6 Oct 2020 14:06:28 +0300 Subject: [PATCH 25/30] 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 26/30] 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 83735ab68d183f733387c5f278cd77e178275545 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Sun, 11 Oct 2020 15:23:01 +0300 Subject: [PATCH 27/30] modified Child vaccintion note --- lib/config/config.dart | 4 + .../childvaccines/delete_baby_model.dart | 76 ++++++ .../childvaccines/delete_baby_service.dart | 75 +++++ .../add_new_child_view_model.dart | 20 +- .../child_vaccines_view_model.dart | 40 +++ lib/locator.dart | 4 + .../ChildVaccines/add_newchild_page.dart | 79 +++--- lib/pages/ChildVaccines/child_page.dart | 57 ++-- .../ChildVaccines/child_vaccines_page.dart | 256 +----------------- .../dialogs/SelectGenderDialog.dart | 6 + .../ChildVaccines/dialogs/delete_child.dart | 103 +++++++ .../ChildVaccines/vaccinationtable_page.dart | 62 +---- lib/widgets/input/text_field.dart | 9 +- 13 files changed, 424 insertions(+), 367 deletions(-) create mode 100644 lib/core/model/childvaccines/delete_baby_model.dart create mode 100644 lib/core/service/childvaccines/delete_baby_service.dart create mode 100644 lib/pages/ChildVaccines/dialogs/delete_child.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index e45d5cf8..1342c28e 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -84,6 +84,10 @@ const GET_NEW_USER_REQUEST= const GET_NEWCHILD_REQUEST= 'Services/Community.svc/REST/CreateNewBaby'; +///delteChild +const DELETE_CHILD_REQUEST= + 'Services/Community.svc/REST/DeleteBaby'; + ///addNewTABLE const GET_TABLE_REQUEST= diff --git a/lib/core/model/childvaccines/delete_baby_model.dart b/lib/core/model/childvaccines/delete_baby_model.dart new file mode 100644 index 00000000..9274b1e8 --- /dev/null +++ b/lib/core/model/childvaccines/delete_baby_model.dart @@ -0,0 +1,76 @@ +class DeleteBaby { + bool isLogin; + int babyID; + int editedBy; + 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; + + DeleteBaby( + {this.isLogin, + this.babyID, + this.editedBy, + 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}); + + DeleteBaby.fromJson(Map json) { + isLogin = json['IsLogin']; + babyID = json['BabyID']; + editedBy = json['EditedBy']; + 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']; + } + + Map toJson() { + final Map data = new Map(); + data['IsLogin'] = this.isLogin; + data['BabyID'] = this.babyID; + data['EditedBy'] = this.editedBy; + 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; + return data; + } +} \ No newline at end of file diff --git a/lib/core/service/childvaccines/delete_baby_service.dart b/lib/core/service/childvaccines/delete_baby_service.dart new file mode 100644 index 00000000..115d13c5 --- /dev/null +++ b/lib/core/service/childvaccines/delete_baby_service.dart @@ -0,0 +1,75 @@ +import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/create_new_user_model.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/delete_baby_model.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; +import '../base_service.dart'; + + + +class DeleteBabyService extends BaseService{ + + List createNewBabyModelList = List(); + List userModelList = List(); + List newUserModelList = List(); + + List deleteBabyModelList= List(); + + + Future getDeleteBabyOrder({DeleteBaby deleteChild,int babyID}) async { + hasError = false; + await getUser(); + Map body = Map.from(deleteChild.toJson()); + // body['CreatedBy'] = 102; + body['EditedBy'] = 102; + //body['BabyID'] = babyID; + //body['BabyID'] = createNewBabyModelList ; + // body['AlertBy'] = 2; + // body['EmailAddress'] = user.emailAddress; + body['IsLogin'] = true; + body['LogInTokenID'] = await sharedPref.getString(TOKEN); + body['MobileNumber'] = user.mobileNumber; + body['NationalID'] = user.nationalityID; + body['ZipCode'] = user.zipCode; + + body['isDentalAllowedBackend'] = false; + + await baseAppClient.post(DELETE_CHILD_REQUEST, + onSuccess: (dynamic response, int statusCode) { + var asd =""; + }, + onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } + + // Future getCreateNewBabyOrders({CreateNewBaby newChild,int userID}) async { + // hasError = false; + // await getUser(); + // Map body = Map.from(newChild.toJson()); + // body['CreatedBy'] = 102; + // body['EditedBy'] = 102; + // body['UserID'] = userID; + // body['AlertBy'] = 2; + // body['EmailAddress'] = user.emailAddress; + // body['IsLogin'] = true; + // body['LogInTokenID'] = await sharedPref.getString(TOKEN); + // body['MobileNumber'] = user.mobileNumber; + // body['NationalID'] = user.nationalityID; + // body['ZipCode'] = user.zipCode; + // + // body['isDentalAllowedBackend'] = false; + // + // await baseAppClient.post(GET_NEWCHILD_REQUEST, + // onSuccess: (dynamic response, int statusCode) { + // var asd =""; + // }, + // onFailure: (String error, int statusCode) { + // hasError = true; + // super.error = error; + // }, body: body); + // } + +} \ No newline at end of file diff --git a/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart b/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart index f0b55caa..eebaca02 100644 --- a/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart +++ b/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart @@ -1,7 +1,9 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/delete_baby_model.dart'; import 'package:diplomaticquarterapp/core/service/childvaccines/add_new_child_service.dart'; import 'package:diplomaticquarterapp/core/service/childvaccines/child_vaccines_service.dart'; +import 'package:diplomaticquarterapp/core/service/childvaccines/delete_baby_service.dart'; import '../../../locator.dart'; import '../base_view_model.dart'; @@ -11,6 +13,7 @@ class AddNewChildViewModel extends BaseViewModel { CreteNewBabyService _creteNewBabyService = locator(); ChildVaccinesService _childVaccinesService = locator(); + // DeleteBabyService _deleteBabyService = locator(); bool isAdded = false; ///create new baby createNewBabyOrders({ CreateNewBaby newChild}) async { @@ -22,15 +25,18 @@ class AddNewChildViewModel extends BaseViewModel { } else { isAdded = true; setState(ViewState.Idle); - // await _childVaccinesService.getAllBabyInformationOrders(); - // if (_childVaccinesService.hasError) { - // error = _childVaccinesService.error; - // setState(ViewState.Error); - // } else{ - // - // } + await _childVaccinesService.getAllBabyInformationOrders(); + if (_childVaccinesService.hasError) { + error = _childVaccinesService.error; + setState(ViewState.Error); + } else{ + + } } } + + + } diff --git a/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart b/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart index c19d9168..7c4af285 100644 --- a/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart +++ b/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart @@ -1,7 +1,12 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/delete_baby_model.dart'; import 'package:diplomaticquarterapp/core/service/childvaccines/child_vaccines_service.dart'; +//======== +import 'package:diplomaticquarterapp/core/service/childvaccines/add_new_child_service.dart'; +import 'package:diplomaticquarterapp/core/service/childvaccines/child_vaccines_service.dart'; +import 'package:diplomaticquarterapp/core/service/childvaccines/delete_baby_service.dart'; import '../../../locator.dart'; import '../base_view_model.dart'; @@ -11,6 +16,16 @@ class ChildVaccinesViewModel extends BaseViewModel{ List get babyInformationModelList=> _childVaccinesService.babyInformationModelList; + +//=========== + CreteNewBabyService _creteNewBabyService = locator(); + + DeleteBabyService _deleteBabyService = locator(); + bool isAdded = false; + bool isDeleted = false; + //============ + + getNewUserOrders() async { setState(ViewState.Busy); await _childVaccinesService.getNewUserOrders(); @@ -30,4 +45,29 @@ class ChildVaccinesViewModel extends BaseViewModel{ setState(ViewState.Idle); } + + + ///delete baby + deleteBabyOrders({ DeleteBaby newChild}) async { + setState(ViewState.Busy); + //await _creteNewBabyService.getCreateNewBabyOrders(newChild: newChild, userID: _childVaccinesService.userID); + await _deleteBabyService.getDeleteBabyOrder(deleteChild: newChild,babyID: newChild.babyID); + //getDeleteBabyOrder(deleteChild: newChild,); + // getDeleteBabyOrder + if (_creteNewBabyService.hasError) { + error = _creteNewBabyService.error; + setState(ViewState.Error); + } else { + isDeleted = true; + setState(ViewState.Idle); + await _childVaccinesService.getAllBabyInformationOrders(); + if (_childVaccinesService.hasError) { + error = _childVaccinesService.error; + setState(ViewState.Error); + } else{ + + } + } + } + } \ No newline at end of file diff --git a/lib/locator.dart b/lib/locator.dart index 734e281f..e6140ce1 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -13,6 +13,7 @@ import 'core/service/blood/blood_details_servies.dart'; import 'core/service/blood/blood_donation_service.dart'; import 'core/service/childvaccines/add_new_child_service.dart'; import 'core/service/childvaccines/child_vaccines_service.dart'; +import 'core/service/childvaccines/delete_baby_service.dart'; import 'core/service/childvaccines/user_information_service.dart'; import 'core/service/childvaccines/vaccination_table_service.dart'; import 'core/service/contactus/finadus_service.dart'; @@ -123,6 +124,9 @@ void setupLocator() { locator.registerLazySingleton(() => ChildVaccinesService()); locator.registerLazySingleton(() => UserInformationService()); locator.registerLazySingleton(() => CreteNewBabyService()); + locator.registerLazySingleton(() => DeleteBabyService()); + + locator.registerLazySingleton(() => VaccinationTableService()); diff --git a/lib/pages/ChildVaccines/add_newchild_page.dart b/lib/pages/ChildVaccines/add_newchild_page.dart index a8e97b60..51b89f98 100644 --- a/lib/pages/ChildVaccines/add_newchild_page.dart +++ b/lib/pages/ChildVaccines/add_newchild_page.dart @@ -133,13 +133,16 @@ class _AddNewChildPageState extends State { height: MediaQuery.of(context).size.height * 0.12, width: double.infinity, padding: EdgeInsets.all(12), + + child: Row( crossAxisAlignment: CrossAxisAlignment.stretch, mainAxisAlignment: MainAxisAlignment.center, children: [ Container( height: MediaQuery.of(context).size.height * 0.12, - width: 170, + width: 175, + color: Colors.white, child: SecondaryButton( textColor: checkedValue == 1 ? Colors.white : Colors.black, @@ -160,7 +163,8 @@ class _AddNewChildPageState extends State { ), Container( height: MediaQuery.of(context).size.height * 0.12, - width: 170, + width: 175, + color: Colors.white, child: SecondaryButton( textColor: checkedValue == 2 ? Colors.white : Colors.black, @@ -236,46 +240,47 @@ class _AddNewChildPageState extends State { SizedBox( height: 12, ), - //========= - ], - ), - ), - ), - bottomSheet: Container( - height: MediaQuery.of(context).size.height * 0.12, - width: double.infinity, - padding: EdgeInsets.all(12), - child: SecondaryButton( - textColor: Colors.white, - color: checkedValue == false - ? Colors.white24 - : Color.fromRGBO( - 63, - 72, - 74, - 1, - ), - label: "Add", - // - onTap: () async{ - newChild.babyName = _firstTextController.text + " " + _secondTextController.text; - newChild.gender = checkedValue.toString(); - newChild.strDOB = getStartDay(); - newChild.tempValue = true; - newChild.isLogin = true; + Container( + height: MediaQuery.of(context).size.height * 0.12, + width: double.infinity, + padding: EdgeInsets.all(15), + child: SecondaryButton( + textColor: Colors.white, + color: checkedValue == false + ? Colors.white24 + : Color.fromRGBO( + 63, + 72, + 74, + 1, + ), + label: "Add", + // + onTap: () async{ + newChild.babyName = _firstTextController.text + " " + _secondTextController.text; + newChild.gender = checkedValue.toString(); + newChild.strDOB = getStartDay(); + newChild.tempValue = true; + newChild.isLogin = true; - await model.createNewBabyOrders(newChild: newChild); - if(model.isAdded){ - AppToast.showSuccessToast(message: "Record Added"); - Navigator.pop(context,model.isAdded); - }else{ + await model.createNewBabyOrders(newChild: newChild); + if(model.isAdded){ + AppToast.showSuccessToast(message: "Record Added"); + Navigator.pop(context,model.isAdded); + }else{ - //TODO handling error - } + //TODO handling error + } - }, + }, + ), + ), + //========= + ], + ), ), ), + // bottomSheet: ), ); } diff --git a/lib/pages/ChildVaccines/child_page.dart b/lib/pages/ChildVaccines/child_page.dart index 9f9f933c..806a5b71 100644 --- a/lib/pages/ChildVaccines/child_page.dart +++ b/lib/pages/ChildVaccines/child_page.dart @@ -1,8 +1,10 @@ import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/delete_baby_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart'; import 'package:diplomaticquarterapp/pages/ChildVaccines/add_newchild_page.dart'; import 'package:diplomaticquarterapp/pages/ChildVaccines/vaccinationtable_page.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.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/others/app_scaffold_widget.dart'; @@ -11,6 +13,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'dialogs/delete_child.dart'; + class ChildPage extends StatefulWidget { @override _ChildPageState createState() => _ChildPageState(); @@ -18,6 +22,9 @@ class ChildPage extends StatefulWidget { class _ChildPageState extends State with SingleTickerProviderStateMixin { + + DeleteBaby deleteBaby = DeleteBaby(); + @override Widget build(BuildContext context) { var checkedValue = true; @@ -84,23 +91,19 @@ class _ChildPageState extends State Icons.remove_red_eye, color: Colors.red, ), - tooltip: 'Increase volume by 10', + tooltip: '', onPressed: () { Navigator.push( context, FadePage( + + page: VaccinationTablePage(), - //ChildPage(babyInformationModelList:model.BabyInformationModelList) - // HospitalsPage( - // findusHospitalModelList: model.FindusHospitalModelList, - // ) + ), ); - // setState(() { - // // _volume += 10; - // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - // }); + }, ) ]), @@ -111,11 +114,10 @@ class _ChildPageState extends State IconButton( icon: new Image.asset( 'assets/images/new-design/calender-secondary.png'), - tooltip: 'Increase volume by 10', + tooltip: '', onPressed: () { setState(() { - // _volume += 10; - // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + }); }, ), @@ -128,14 +130,31 @@ class _ChildPageState extends State icon: new Image.asset( 'assets/images/new-design/garbage.png'), tooltip: '', - onPressed: () { - setState(() { - // _volume += 10; - // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - }); + onPressed: ()async { + + //===================== + await model.deleteBabyOrders(newChild:deleteBaby ); + + + deleteBaby.babyID=model.babyInformationModelList[index] + .babyID; + + await model.deleteBabyOrders(newChild:deleteBaby ); + if(model.isDeleted){ + AppToast.showSuccessToast(message: "Record Deleted"); + Navigator.pop(context,model.isDeleted); + }else{ + + //TODO handling error + } + + + + + }, ), - Texts("Birthday"), + Texts("Delete"), ]), SizedBox( height: 12, @@ -153,7 +172,7 @@ class _ChildPageState extends State bottomSheet: Container( height: MediaQuery.of(context).size.height * 0.12, width: double.infinity, - padding: EdgeInsets.all(12), + padding: EdgeInsets.all(15), child: SecondaryButton( textColor: Colors.white, color: checkedValue == false diff --git a/lib/pages/ChildVaccines/child_vaccines_page.dart b/lib/pages/ChildVaccines/child_vaccines_page.dart index f8fe7b74..92f3a0be 100644 --- a/lib/pages/ChildVaccines/child_vaccines_page.dart +++ b/lib/pages/ChildVaccines/child_vaccines_page.dart @@ -50,7 +50,8 @@ class _ChildVaccinesPageState extends State child: Texts("Welcome back",fontSize: 20,), ) , ), - Divider(color:Colors.black ,), + Divider(color:Colors.black , indent: 10, + endIndent: 10,), SizedBox( height: 20, ), @@ -61,13 +62,17 @@ class _ChildVaccinesPageState extends State ) , ), - Divider(color:Colors.black ,), + Divider(color:Colors.black , indent: 10, + endIndent: 10,), Padding( padding: const EdgeInsets.all(10.0), child:Container( + margin: EdgeInsets.only(left: 10, right: 10, top: 15), child: TextFields( - hintText: model.user.emailAddress,//'Title', + fillColor: Colors.red, + + hintText: model.user.emailAddress, controller: titleController, fontSize: 20, hintColor: Colors.black, @@ -75,9 +80,7 @@ class _ChildVaccinesPageState extends State onChanged: (text) { addEmail=text; model.user.emailAddress==addEmail?checkedValue=false:checkedValue=true; - // checkedValue=true; - // print("First text field: $text"); - // print("First text field:"+ model.user.emailAddress); + }, validator: (value) { @@ -99,7 +102,7 @@ class _ChildVaccinesPageState extends State height: MediaQuery.of(context).size.height * 0.12, width: double.infinity, - padding: EdgeInsets.all(12), + padding: EdgeInsets.all(15), child: SecondaryButton( textColor: Colors.white, color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,), @@ -121,7 +124,7 @@ class _ChildVaccinesPageState extends State height: MediaQuery.of(context).size.height * 0.12, width: double.infinity, - padding: EdgeInsets.all(12), + padding: EdgeInsets.all(15), child: SecondaryButton( textColor: Colors.white, color: Color.fromRGBO(63, 72, 74, 1,), @@ -140,6 +143,7 @@ class _ChildVaccinesPageState extends State ), ), + // Texts( // // TranslationBase.of(context).advancePaymentLabel, // model.user.emailAddress, @@ -148,253 +152,21 @@ class _ChildVaccinesPageState extends State SizedBox( height: 12, ), - // InkWell( - // onTap: () => confirmSelectHospitalDialog(model.CitiesModelList),//model.hospitals - // child: Container( - // padding: EdgeInsets.all(12), - // width: double.infinity, - // height: 65, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(12), - // color: Colors.white), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // Texts(getHospitalName()), - // Icon(Icons.arrow_drop_down) - // ], - // ), - // ), - // ), SizedBox( height: 12, ), - // InkWell( - // //======Gender======== - // onTap: () => confirmSelectGenderDialog(),//confirmSelectBeneficiaryDialog(model), - // child: Container( - // padding: EdgeInsets.all(12), - // width: double.infinity, - // height: 65, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(12), - // color: Colors.white), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // //Texts(getBeneficiaryType()), - // Texts(getGender()), - // Icon(Icons.arrow_drop_down) - // ], - // ), - // ), - // ), - // if (beneficiaryType == BeneficiaryType.MyFamilyFiles) - // SizedBox( - // height: 12, - // ), - // if (beneficiaryType == BeneficiaryType.MyFamilyFiles) - // InkWell( - // onTap: () { - // model.getFamilyFiles().then((value) { - // confirmSelectFamilyDialog(model - // .getAllSharedRecordsByStatusResponse - // .getAllSharedRecordsByStatusList); - // }).showProgressBar( - // text: "Loading", - // backgroundColor: Colors.blue.withOpacity(0.6)); - // }, - // child: Container( - // padding: EdgeInsets.all(12), - // width: double.infinity, - // height: 65, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(12), - // color: Colors.white), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // Texts(getFamilyMembersName()), - // Icon(Icons.arrow_drop_down) - // ], - // ), - // ), - // ), SizedBox( height: 12, ), - // InkWell( - // //======Gender======== - // onTap: () => confirmSelectBloodDialog(),//confirmSelectBeneficiaryDialog(model), - // child: Container( - // padding: EdgeInsets.all(12), - // width: double.infinity, - // height: 65, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(12), - // color: Colors.white), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // //Texts(getBeneficiaryType()), - // Texts(getBlood()), - // Icon(Icons.arrow_drop_down) - // ], - // ), - // ), - // ), - // if (beneficiaryType == BeneficiaryType.MyFamilyFiles) - // SizedBox( - // height: 12, - // ), - // if (beneficiaryType == BeneficiaryType.MyFamilyFiles) - // InkWell( - // onTap: () { - // model.getFamilyFiles().then((value) { - // confirmSelectFamilyDialog(model - // .getAllSharedRecordsByStatusResponse - // .getAllSharedRecordsByStatusList); - // }).showProgressBar( - // text: "Loading", - // backgroundColor: Colors.blue.withOpacity(0.6)); - // }, - // child: Container( - // padding: EdgeInsets.all(12), - // width: double.infinity, - // height: 65, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(12), - // color: Colors.white), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // Texts(getFamilyMembersName()), - // Icon(Icons.arrow_drop_down) - // ], - // ), - // ), - // ), + SizedBox( height: 12, ), - // Row( - // children: [ - // Container( - // child: Text(" To view the terms and conditions "), - // ), - // SizedBox( - // width: MediaQuery.of(context).size.height * 0.10, - // ), - // // InkWell( - // // onTap: () { - // // Navigator.of(context).push(MaterialPageRoute( - // // builder: (BuildContext context) => UserAgreementPage())); - // // }, - // // child: Container( - // // child: Texts(" Click here ",color: Colors.blue,), - // // ), - // // ) - // ], - // ), + SizedBox( height: 12, ), - // Row( - // children: [ - // Checkbox( - // onChanged: (bool value) { - // setState(() { - // checkedValue = value; - // }); - // }, - // // tristate: checkedValue==true,//i == 1, - // value: checkedValue, - // activeColor: Colors.red,//Color(0xFF6200EE), - // ), - // SizedBox(height: 10,), - // Row(children: [ - // - // ],), - // SizedBox( - // width: 10, - // ), - // Text( - // 'I agree to the terms and conditions ', - // style: Theme.of(context).textTheme.subtitle1.copyWith(color: checkedValue? Colors.red : Colors.black), - // ), - // ], - // ), - // NewTextFields( - // hintText: TranslationBase.of(context).fileNumber, - // controller: _fileTextController, - // ), - // if (beneficiaryType == BeneficiaryType.OtherAccount) - // SizedBox( - // height: 12, - // ), - // if (beneficiaryType == BeneficiaryType.OtherAccount) - // InkWell( - // onTap: () { - // if (_fileTextController.text.isNotEmpty) - // model - // .getPatientInfoByPatientID( - // id: _fileTextController.text) - // .then((value) { - // confirmSelectPatientDialog(model.patientInfoList); - // }).showProgressBar( - // text: "Loading", - // backgroundColor: - // Colors.blue.withOpacity(0.6)); - // else - // AppToast.showErrorToast( - // message: 'Please Enter The File Number'); - // }, - // child: Container( - // padding: EdgeInsets.all(12), - // width: double.infinity, - // height: 65, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(12), - // color: Colors.white), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // Texts(getPatientName()), - // Icon(Icons.arrow_drop_down) - // ], - // ), - // ), - // ), - // SizedBox( - // height: 12, - // ), - // NewTextFields( - // hintText: TranslationBase.of(context).amount, - // keyboardType: TextInputType.number, - // onChanged: (value) { - // setState(() { - // amount = value; - // }); - // }, - // ), - // SizedBox( - // height: 12, - // ), - // NewTextFields( - // hintText: TranslationBase.of(context).depositorEmail, - // initialValue: model.user.emailAddress, - // onChanged: (value) { - // email = value; - // }, - // ), - // SizedBox( - // height: 12, - // ), - // NewTextFields( - // hintText: TranslationBase.of(context).notes, - // controller: _notesTextController, - // ), SizedBox( height: 10, ), diff --git a/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart b/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart index f84dea29..259bbdb7 100644 --- a/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart +++ b/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart @@ -1,10 +1,14 @@ import 'package:diplomaticquarterapp/pages/Blood/blood_donation.dart'; +import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; class SelectGenderDialog extends StatefulWidget { + final Email; + + const SelectGenderDialog({Key key, this.Email}) : super(key: key); @override _SelectGenderDialogState createState() => _SelectGenderDialogState(); } @@ -31,6 +35,7 @@ class _SelectGenderDialogState extends State { child: ListTile( title: Text("Send the child's schedule to the email\n Tamer.dasdasdas@gmail.com "), + ), ), ) @@ -77,6 +82,7 @@ class _SelectGenderDialogState extends State { flex: 1, child: InkWell( onTap: () { + AppToast.showSuccessToast(message: "Email Sended"); // widget.onValueSelected(beneficiaryType); Navigator.pop(context); }, diff --git a/lib/pages/ChildVaccines/dialogs/delete_child.dart b/lib/pages/ChildVaccines/dialogs/delete_child.dart new file mode 100644 index 00000000..250f40d3 --- /dev/null +++ b/lib/pages/ChildVaccines/dialogs/delete_child.dart @@ -0,0 +1,103 @@ +import 'package:diplomaticquarterapp/pages/Blood/blood_donation.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + + +class DeleteChild extends StatefulWidget { + @override + _DeleteChildState createState() => _DeleteChildState(); +} + +class _DeleteChildState extends State { + @override + Widget build(BuildContext context) { + return SimpleDialog( + children: [ + Container( + child: Column( + children: [ + Divider(), + Row( + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () { + setState(() { + //beneficiaryType = Gender.Male; + }); + }, + child: ListTile( + title: Text("Delete the child "), + + ), + ), + ) + ], + ), + SizedBox( + height: 5.0, + ), + + SizedBox( + height: 5.0, + ), + SizedBox( + height: 5.0, + ), + Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () { + Navigator.pop(context); + }, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Container( + child: Center( + child: Texts( + TranslationBase.of(context).cancel.toUpperCase(), + color: Colors.red, + ), + ), + ), + ), + ), + ), + Container( + width: 1, + height: 30, + color: Colors.grey[500], + ), + Expanded( + flex: 1, + child: InkWell( + onTap: () { + // widget.onValueSelected(beneficiaryType); + Navigator.pop(context); + }, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Center( + child: Texts( + TranslationBase.of(context).ok, + fontWeight: FontWeight.w400, + ), + ), + ), + ), + ), + ], + ) + ], + ), + ) + ], + ); + } +} diff --git a/lib/pages/ChildVaccines/vaccinationtable_page.dart b/lib/pages/ChildVaccines/vaccinationtable_page.dart index 6ac11e4f..c160acfb 100644 --- a/lib/pages/ChildVaccines/vaccinationtable_page.dart +++ b/lib/pages/ChildVaccines/vaccinationtable_page.dart @@ -61,67 +61,7 @@ class VaccinationTablePage extends StatelessWidget { ],), Divider(color:Colors.black ,), - // Row(children:[Texts("CHILD NAME"),]), - // Row(children:[Texts(model.babyInformationModelList[index].babyName.trim()),]), - - // Row( - // children: [IconButton( - // icon: Image.asset(model.babyInformationModelList[index].gender==1? 'assets/images/new-design/male.png':'assets/images/new-design/female.png'), - // tooltip: '', - // onPressed: () { - // setState(() { - // // _volume += 10; - // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - // }); - // }, - // ), - // Texts(model.babyInformationModelList[index].genderDescription), - // IconButton( - // icon: Icon(Icons.remove_red_eye,color: Colors.red,), - // tooltip: 'Increase volume by 10', - // onPressed: () { - // Navigator.push( - // context, - // FadePage( - // page: VaccinationTablePage(), - // - // //ChildPage(babyInformationModelList:model.BabyInformationModelList) - // // HospitalsPage( - // // findusHospitalModelList: model.FindusHospitalModelList, - // // ) - // - // ), - // ); - // // setState(() { - // // // _volume += 10; - // // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - // // }); - // }, - // )] - // ), - // Row(children:[Texts("Birthday"),]), - // Row(children:[IconButton( - // icon: new Image.asset('assets/images/new-design/calender-secondary.png'), - // tooltip: 'Increase volume by 10', - // onPressed: () { - // setState(() { - // // _volume += 10; - // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - // }); - // }, - // ), - // Texts(DateUtil.yearMonthDay(model.babyInformationModelList[index].dOB)),]), - // Row(children:[IconButton( - // icon: new Image.asset('assets/images/new-design/garbage.png'), - // tooltip: '', - // onPressed: () { - // setState(() { - // // _volume += 10; - // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - // }); - // }, - // ), - // Texts("Birthday"),]), + ], ) diff --git a/lib/widgets/input/text_field.dart b/lib/widgets/input/text_field.dart index 0476c352..7cfba5e6 100644 --- a/lib/widgets/input/text_field.dart +++ b/lib/widgets/input/text_field.dart @@ -46,6 +46,7 @@ class TextFields extends StatefulWidget { this.suffixIcon, this.autoFocus, this.onChanged, + // this.initialValue, this.minLines, this.maxLines, @@ -72,6 +73,7 @@ class TextFields extends StatefulWidget { this.fontSize = 16.0, this.fontWeight = FontWeight.w700, this.autoValidate = false, + this.fillColor, this.hintColor}) : super(key: key); @@ -108,6 +110,7 @@ class TextFields extends StatefulWidget { final bool focus; final bool borderOnlyError; final Color hintColor; + final Color fillColor; @override _TextFieldsState createState() => _TextFieldsState(); @@ -211,7 +214,7 @@ class _TextFieldsState extends State { blurRadius: focus ? 34.0 : 12.0) ]), child: TextFormField( - + keyboardAppearance: Theme.of(context).brightness, scrollPhysics: BouncingScrollPhysics(), autovalidate: widget.autoValidate, @@ -242,6 +245,7 @@ class _TextFieldsState extends State { .textTheme .body2 .copyWith(fontSize: widget.fontSize, fontWeight: widget.fontWeight), + inputFormatters: widget.keyboardType == TextInputType.phone ? [ WhitelistingTextInputFormatter.digitsOnly, @@ -249,12 +253,15 @@ class _TextFieldsState extends State { ] : widget.inputFormatters, decoration: InputDecoration( + counterText: "", hintText: widget.hintText, hintStyle: TextStyle( fontSize: widget.fontSize, fontWeight: widget.fontWeight, color: widget.hintColor ?? Theme.of(context).hintColor, + + ), contentPadding: widget.padding != null ? widget.padding From c6a9b6653803b9ce3839e7df2c75b9ab4deac01e Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Sun, 11 Oct 2020 16:11:57 +0300 Subject: [PATCH 28/30] women health --- .../bmr_calculator/bmr_calculator.dart | 6 +- .../health_calculator/body_fat/body_fat.dart | 593 +++++++++--------- .../calorie_calculator.dart | 6 +- .../health_calculator/carbs/carbs.dart | 2 +- .../delivery_due/delivery_due.dart | 146 +++++ .../delivery_due_result_page.dart | 106 ++++ .../ideal_body/ideal_body.dart | 300 ++++----- .../ovulation_period/ovulation_period.dart | 350 +++++++++++ .../ovulation_result_page.dart | 96 +++ .../​ health_calculators.dart | 22 +- 10 files changed, 1173 insertions(+), 454 deletions(-) create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due_result_page.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_result_page.dart 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 05d3d07a..3d287610 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart @@ -207,7 +207,7 @@ class _BmrCalculatorState extends State { Row( children: [ Container( - width: 335.0, + width: 340.0, height: 60.0, decoration: BoxDecoration( color: Colors.white, @@ -306,7 +306,7 @@ class _BmrCalculatorState extends State { Row( children: [ Container( - width: 335.0, + width: 340.0, height: 60.0, decoration: BoxDecoration( color: Colors.white, @@ -481,7 +481,7 @@ class _BmrCalculatorState extends State { Row( children: [ Container( - width: 335.0, + width: 340.0, height: 60.0, decoration: BoxDecoration( color: Colors.white, 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 4a939b3f..ccc7d212 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart @@ -285,98 +285,101 @@ class _BodyFatState extends State { ), Row( children: [ - Container( - width: 335.0, - height: 60.0, - decoration: BoxDecoration( - color: Colors.white, - ), - child: Row( - children: [ - Padding( - padding: EdgeInsets.symmetric( - vertical: 10.0, horizontal: 8.0), - child: Center( - child: Container( - width: 60.0, - foregroundDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(5.0), - border: Border.all( - color: Colors.blueGrey, - width: 2.0, + Expanded( + child: Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: + BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), ), - ), - child: Row( - children: [ - Expanded( - child: Center( - child: Text(heightCm.toString()), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(heightCm.toString()), + ), ), - ), - Container( - height: 38.0, - child: Column( - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Container( - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - width: 0.5, + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, ), + onTap: () { + setState(() { + if (heightCm < 250) + heightCm++; + }); + }, ), ), - child: InkWell( + InkWell( child: Icon( - Icons.arrow_drop_up, + Icons.arrow_drop_down, size: 18.0, ), onTap: () { setState(() { - if (heightCm < 250) - heightCm++; + if (heightCm > 0) + heightCm--; }); }, ), - ), - InkWell( - child: Icon( - Icons.arrow_drop_down, - size: 18.0, - ), - onTap: () { - setState(() { - if (heightCm > 0) - heightCm--; - }); - }, - ), - ], + ], + ), ), - ), - ], + ], + ), ), ), ), - ), - Expanded( - child: Slider( - value: heightCm.toDouble(), - min: 0, - max: 250, - onChanged: (double newValue) { - setState(() { - heightCm = newValue.round(); - }); - }, - activeColor: Color(0xffC5272D), - inactiveColor: Color(0xffF3C5C6), + Expanded( + child: Slider( + value: heightCm.toDouble(), + min: 0, + max: 250, + onChanged: (double newValue) { + setState(() { + heightCm = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), ), - ), - ], + ], + ), ), ), ], @@ -458,96 +461,99 @@ class _BodyFatState extends State { ), Row( children: [ - Container( - width: 335.0, - height: 60.0, - decoration: BoxDecoration( - color: Colors.white, - ), - child: Row( - children: [ - Padding( - padding: EdgeInsets.symmetric( - vertical: 10.0, horizontal: 8.0), - child: Center( - child: Container( - width: 60.0, - foregroundDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(5.0), - border: Border.all( - color: Colors.blueGrey, - width: 2.0, + Expanded( + child: Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: + BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), ), - ), - child: Row( - children: [ - Expanded( - child: Center( - child: Text(neck.toString()), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(neck.toString()), + ), ), - ), - Container( - height: 38.0, - child: Column( - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Container( - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - width: 0.5, + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, ), + onTap: () { + setState(() { + if (neck < 60) neck++; + }); + }, ), ), - child: InkWell( + InkWell( child: Icon( - Icons.arrow_drop_up, + Icons.arrow_drop_down, size: 18.0, ), onTap: () { setState(() { - if (neck < 60) neck++; + if (neck > 5) neck--; }); }, ), - ), - InkWell( - child: Icon( - Icons.arrow_drop_down, - size: 18.0, - ), - onTap: () { - setState(() { - if (neck > 5) neck--; - }); - }, - ), - ], + ], + ), ), - ), - ], + ], + ), ), ), ), - ), - Expanded( - child: Slider( - value: neck.toDouble(), - min: 5, - max: 60, - onChanged: (double newValue) { - setState(() { - neck = newValue.round(); - }); - }, - activeColor: Color(0xffC5272D), - inactiveColor: Color(0xffF3C5C6), + Expanded( + child: Slider( + value: neck.toDouble(), + min: 5, + max: 60, + onChanged: (double newValue) { + setState(() { + neck = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), ), - ), - ], + ], + ), ), ), ], @@ -629,96 +635,100 @@ class _BodyFatState extends State { ), Row( children: [ - Container( - width: 335.0, - height: 60.0, - decoration: BoxDecoration( - color: Colors.white, - ), - child: Row( - children: [ - Padding( - padding: EdgeInsets.symmetric( - vertical: 10.0, horizontal: 8.0), - child: Center( - child: Container( - width: 60.0, - foregroundDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(5.0), - border: Border.all( - color: Colors.blueGrey, - width: 2.0, + Expanded( + child: Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: + BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), ), - ), - child: Row( - children: [ - Expanded( - child: Center( - child: Text(waist.toString()), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(waist.toString()), + ), ), - ), - Container( - height: 38.0, - child: Column( - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Container( - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - width: 0.5, + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, ), + onTap: () { + setState(() { + if (waist < 200) + waist++; + }); + }, ), ), - child: InkWell( + InkWell( child: Icon( - Icons.arrow_drop_up, + Icons.arrow_drop_down, size: 18.0, ), onTap: () { setState(() { - if (waist < 200) waist++; + if (waist > 5) waist--; }); }, ), - ), - InkWell( - child: Icon( - Icons.arrow_drop_down, - size: 18.0, - ), - onTap: () { - setState(() { - if (waist > 5) waist--; - }); - }, - ), - ], + ], + ), ), - ), - ], + ], + ), ), ), ), - ), - Expanded( - child: Slider( - value: waist.toDouble(), - min: 5, - max: 200, - onChanged: (double newValue) { - setState(() { - waist = newValue.round(); - }); - }, - activeColor: Color(0xffC5272D), - inactiveColor: Color(0xffF3C5C6), + Expanded( + child: Slider( + value: waist.toDouble(), + min: 5, + max: 200, + onChanged: (double newValue) { + setState(() { + waist = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), ), - ), - ], + ], + ), ), ), ], @@ -800,96 +810,99 @@ class _BodyFatState extends State { ), Row( children: [ - Container( - width: 335.0, - height: 60.0, - decoration: BoxDecoration( - color: Colors.white, - ), - child: Row( - children: [ - Padding( - padding: EdgeInsets.symmetric( - vertical: 10.0, horizontal: 8.0), - child: Center( - child: Container( - width: 60.0, - foregroundDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(5.0), - border: Border.all( - color: Colors.blueGrey, - width: 2.0, + Expanded( + child: Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: + BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), ), - ), - child: Row( - children: [ - Expanded( - child: Center( - child: Text(hip.toString()), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(hip.toString()), + ), ), - ), - Container( - height: 38.0, - child: Column( - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Container( - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - width: 0.5, + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, ), + onTap: () { + setState(() { + if (hip < 140) hip++; + }); + }, ), ), - child: InkWell( + InkWell( child: Icon( - Icons.arrow_drop_up, + Icons.arrow_drop_down, size: 18.0, ), onTap: () { setState(() { - if (hip < 140) hip++; + if (hip > 5) hip--; }); }, ), - ), - InkWell( - child: Icon( - Icons.arrow_drop_down, - size: 18.0, - ), - onTap: () { - setState(() { - if (hip > 5) hip--; - }); - }, - ), - ], + ], + ), ), - ), - ], + ], + ), ), ), ), - ), - Expanded( - child: Slider( - value: hip.toDouble(), - min: 5, - max: 140, - onChanged: (double newValue) { - setState(() { - hip = newValue.round(); - }); - }, - activeColor: Color(0xffC5272D), - inactiveColor: Color(0xffF3C5C6), + Expanded( + child: Slider( + value: hip.toDouble(), + min: 5, + max: 140, + onChanged: (double newValue) { + setState(() { + hip = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), ), - ), - ], + ], + ), ), ), ], 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 ac1aacc3..994484e7 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart @@ -181,7 +181,7 @@ class _CalorieCalculatorState extends State { Row( children: [ Container( - width: 335.0, + width: 340.0, height: 60.0, decoration: BoxDecoration( color: Colors.white, @@ -280,7 +280,7 @@ class _CalorieCalculatorState extends State { Row( children: [ Container( - width: 335.0, + width: 340.0, height: 60.0, decoration: BoxDecoration( color: Colors.white, @@ -448,7 +448,7 @@ class _CalorieCalculatorState extends State { Row( children: [ Container( - width: 335.0, + width: 340.0, height: 60.0, decoration: BoxDecoration( color: Colors.white, diff --git a/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart b/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart index 32ec9262..2dfc3f92 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart @@ -97,7 +97,7 @@ class _CarbsState extends State { Column( children: [ Container( - width: 335.0, + width: 340.0, height: 60.0, decoration: BoxDecoration( color: Colors.white, diff --git a/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart b/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart new file mode 100644 index 00000000..1e8cb50c --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart @@ -0,0 +1,146 @@ +import 'package:diplomaticquarterapp/uitl/date_uitl.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 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; +import 'package:intl/intl.dart'; + +import 'delivery_due_result_page.dart'; + +class DeliveryDue extends StatefulWidget { + @override + _DeliveryDueState createState() => _DeliveryDueState(); +} + +class _DeliveryDueState extends State { + DateTime bloodSugarDate = DateTime.now(); + DateTime timeSugarDate = DateTime.now(); + var dateFrom = DateTime.now(); + var dateTo = DateTime.now(); + var conceivedDate = DateTime.now(); + var deliveryDue = DateTime.now(); + var firstTrimester = DateTime.now(); + var secondTrimester = DateTime.now(); + var thirdTrimester = DateTime.now(); + var dt = DateTime.now(); + var newFormat = DateFormat("yy-MM-dd"); + + String getDate() { + return "${DateUtil.getMonth(bloodSugarDate.month)} ${bloodSugarDate.day}, ${bloodSugarDate.year}"; + } + + String getTime() { + return " ${timeSugarDate.hour}:${timeSugarDate.minute}"; + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Delivery Due Date', + body: Padding( + padding: EdgeInsets.symmetric(horizontal: 35.0, vertical: 20.0), + child: SingleChildScrollView( + child: Container( + child: Column( + //mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Texts( + 'Congratulations, you are pregnant! Now when will the new baby arrive? To estimate the due date, enter the date when the last menstrual perios began (the first day), then click calculate.', + ), + Divider( + //height: 2, + thickness: 2, + ), + Column( + children: [ + Texts( + 'What was the date of the first day of the last period?', + ), + InkWell( + onTap: () { + DatePicker.showDatePicker( + context, + showTitleActions: true, + minTime: DateTime(DateTime.now().year - 1, 1, 1), + maxTime: DateTime.now(), + onConfirm: (date) { + print('confirm $date'); + setState(() { + bloodSugarDate == date + ? null + : bloodSugarDate = DateTime.now(); + dateFrom = date.add(Duration(days: 10)); + + dateTo = date.add(Duration(days: 20)); + conceivedDate = date.add(Duration(days: 14)); + deliveryDue = date.add(Duration(days: 280)); + firstTrimester = date.add(Duration(days: 85)); + secondTrimester = date.add(Duration(days: 190)); + thirdTrimester = date.add(Duration(days: 280)); + }); + }, + currentTime: DateTime.now(), + ); + }, + child: Container( + padding: EdgeInsets.all(12), + width: double.infinity, + height: 65, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12), + color: Colors.white), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Icon(Icons.date_range_rounded), + Texts('Date'), + ], + ), + Texts(getDate()), + ], + ), + ), + ), + ], + ), + SizedBox( + height: 280.0, + ), + Container( + height: 100.0, + width: 350.0, + child: Button( + label: 'CALCULATE', + onTap: () { + setState(() { + { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => DeliveryDueResult( + conceivedDate: conceivedDate, + dateFrom: dateFrom, + dateTo: dateTo, + deliveryDue: deliveryDue, + firstTrimester: firstTrimester, + secondTrimester: secondTrimester, + thirdTrimester: thirdTrimester, + )), + ); + } + }); + }, + ), + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due_result_page.dart b/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due_result_page.dart new file mode 100644 index 00000000..fc53b044 --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due_result_page.dart @@ -0,0 +1,106 @@ +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 'package:intl/intl.dart'; + +class DeliveryDueResult extends StatelessWidget { + var dateFrom; + var dateTo; + var conceivedDate; + var deliveryDue; + var firstTrimester; + var secondTrimester; + var thirdTrimester; + DeliveryDueResult( + {this.dateFrom, + this.dateTo, + this.conceivedDate, + this.deliveryDue, + this.firstTrimester, + this.secondTrimester, + this.thirdTrimester}); + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Delivery Due Date', + body: Padding( + padding: EdgeInsets.symmetric(horizontal: 30.0, vertical: 12.0), + child: SingleChildScrollView( + child: Container( + height: 750.0, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Texts( + 'The next ovulation period is estimated to be:', + fontWeight: FontWeight.w400, + ), + Texts( + 'From:', + fontWeight: FontWeight.w400, + ), + Texts(DateFormat.yMMMEd().format(dateFrom), + fontWeight: FontWeight.w800, + fontSize: 21.0, + color: Color(0xffC5272D)), + Texts( + 'To:', + fontWeight: FontWeight.w400, + ), + Texts(DateFormat.yMMMEd().format(dateTo), + fontWeight: FontWeight.w800, + fontSize: 21.0, + color: Color(0xffC5272D)), + Texts( + 'You have conceived on:', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(conceivedDate), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Texts( + 'First Trimester Ends (12 weeks):', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(firstTrimester), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Texts( + 'Second Trimester Ends (27 weeks):', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(secondTrimester), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Texts( + 'Third Trimester, Estimated Due Date (40 weeks):', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(thirdTrimester), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Container( + width: 350, + child: Button( + label: 'See List Of Doctors', + ), + ), + ], + ), + ), + ), + ), + ); + } +} 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 f534416f..fb4f8948 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart @@ -29,7 +29,7 @@ class _IdealBodyState extends State { double overWeightBy; int weight = 0; double idealWeight = 0; - String dropdownValue; + String dropdownValue = 'Medium(fingers touch)'; double calories = 0; String textResult = ''; double maxIdealWeight; @@ -126,97 +126,100 @@ class _IdealBodyState extends State { ), Row( children: [ - Container( - width: 335.0, - height: 60.0, - decoration: BoxDecoration( - color: Colors.white, - ), - child: Row( - children: [ - Padding( - padding: EdgeInsets.symmetric( - vertical: 10.0, horizontal: 8.0), - child: Center( - child: Container( - width: 60.0, - foregroundDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(5.0), - border: Border.all( - color: Colors.blueGrey, - width: 2.0, + Expanded( + child: Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: + BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), ), - ), - child: Row( - children: [ - Expanded( - child: Center( - child: Text(height.toString()), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(height.toString()), + ), ), - ), - Container( - height: 38.0, - child: Column( - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Container( - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - width: 0.5, + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), ), ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (height < 250) + height++; + }); + }, + ), ), - child: InkWell( + InkWell( child: Icon( - Icons.arrow_drop_up, + Icons.arrow_drop_down, size: 18.0, ), onTap: () { setState(() { - if (height < 250) - height++; + if (height > 0) height--; }); }, ), - ), - InkWell( - child: Icon( - Icons.arrow_drop_down, - size: 18.0, - ), - onTap: () { - setState(() { - if (height > 0) height--; - }); - }, - ), - ], + ], + ), ), - ), - ], + ], + ), ), ), ), - ), - Expanded( - child: Slider( - value: height.toDouble(), - min: 0, - max: 250, - onChanged: (double newValue) { - setState(() { - height = newValue.round(); - }); - }, - activeColor: Color(0xffC5272D), - inactiveColor: Color(0xffF3C5C6), + Expanded( + child: Slider( + value: height.toDouble(), + min: 0, + max: 250, + onChanged: (double newValue) { + setState(() { + height = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), ), - ), - ], + ], + ), ), ), ], @@ -304,97 +307,100 @@ class _IdealBodyState extends State { ), Row( children: [ - Container( - width: 335.0, - height: 60.0, - decoration: BoxDecoration( - color: Colors.white, - ), - child: Row( - children: [ - Padding( - padding: EdgeInsets.symmetric( - vertical: 10.0, horizontal: 8.0), - child: Center( - child: Container( - width: 60.0, - foregroundDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(5.0), - border: Border.all( - color: Colors.blueGrey, - width: 2.0, + Expanded( + child: Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: + BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), ), - ), - child: Row( - children: [ - Expanded( - child: Center( - child: Text(weight.toString()), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(weight.toString()), + ), ), - ), - Container( - height: 38.0, - child: Column( - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Container( - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - width: 0.5, + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), ), ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (weight < 250) + weight++; + }); + }, + ), ), - child: InkWell( + InkWell( child: Icon( - Icons.arrow_drop_up, + Icons.arrow_drop_down, size: 18.0, ), onTap: () { setState(() { - if (weight < 250) - weight++; + if (weight > 0) weight--; }); }, ), - ), - InkWell( - child: Icon( - Icons.arrow_drop_down, - size: 18.0, - ), - onTap: () { - setState(() { - if (weight > 0) weight--; - }); - }, - ), - ], + ], + ), ), - ), - ], + ], + ), ), ), ), - ), - Expanded( - child: Slider( - value: weight.toDouble(), - min: 0, - max: 250, - onChanged: (double newValue) { - setState(() { - weight = newValue.round(); - }); - }, - activeColor: Color(0xffC5272D), - inactiveColor: Color(0xffF3C5C6), + Expanded( + child: Slider( + value: weight.toDouble(), + min: 0, + max: 250, + onChanged: (double newValue) { + setState(() { + weight = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), ), - ), - ], + ], + ), ), ), ], diff --git a/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart b/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart new file mode 100644 index 00000000..adc2f06d --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart @@ -0,0 +1,350 @@ +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'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; +import 'package:intl/intl.dart'; + +class OvulationPeriod extends StatefulWidget { + @override + _OvulationPeriodState createState() => _OvulationPeriodState(); +} + +class _OvulationPeriodState extends State { + DateTime bloodSugarDate = DateTime.now(); + DateTime timeSugarDate = DateTime.now(); + int cycleLength = 0; + int lutealPhaseLength = 0; + String selectedDate; + var dateFrom = DateTime.now(); + var dateTo = DateTime.now(); + var conceivedDate = DateTime.now(); + var deliveryDue = DateTime.now(); + var dt = DateTime.now(); + var newFormat = DateFormat("yy-MM-dd"); + String updatedDt; + + String getTime() { + return " ${timeSugarDate.hour}:${timeSugarDate.minute}"; + } + + String getDate() { + return "${DateUtil.getMonth(bloodSugarDate.month)} ${bloodSugarDate.day}, ${bloodSugarDate.year}"; + } + + // void calculate() {} + // + // void calculateFertility(DateTime selectedDate) {const diff = Date.} + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Ovulation Period', + body: Padding( + padding: EdgeInsets.symmetric(horizontal: 25.0, vertical: 15.0), + child: SingleChildScrollView( + child: Container( + height: 700.0, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Calculates Ovulation Period'), + SizedBox( + height: 12.0, + ), + Divider( + //height: 2, + thickness: 2, + ), + SizedBox( + height: 12.0, + ), + InkWell( + onTap: () { + DatePicker.showDatePicker( + context, + showTitleActions: true, + minTime: DateTime(DateTime.now().year - 1, 1, 1), + maxTime: DateTime.now(), + onConfirm: (date) { + print('confirm $date'); + setState(() { + bloodSugarDate = date; + dateFrom = date.add(Duration(days: 10)); + updatedDt = DateFormat.yMMMEd().format(dateFrom); + + dateTo = date.add(Duration(days: 20)); + conceivedDate = date.add(Duration(days: 14)); + deliveryDue = date.add(Duration(days: 280)); + }); + }, + currentTime: DateTime.now(), + ); + }, + child: Container( + padding: EdgeInsets.all(12), + width: double.infinity, + height: 65, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12), + color: Colors.white), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts('Date'), + Texts(getDate()), + ], + ), + ), + ), + SizedBox( + height: 5.0, + ), + Texts( + 'Average Cycle Length (usually 28 days):', + fontWeight: FontWeight.w400, + ), + SizedBox( + height: 5.0, + ), + Row( + children: [ + Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(cycleLength.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (cycleLength < 45) + cycleLength++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (cycleLength > 0) + cycleLength--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: cycleLength.toDouble(), + min: 0, + max: 45, + onChanged: (double newValue) { + setState(() { + cycleLength = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + Texts( + 'Average Luteal Phase Length (usually 14 days):', + fontWeight: FontWeight.w400, + ), + SizedBox( + height: 5.0, + ), + Row( + children: [ + Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: + Text(lutealPhaseLength.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (lutealPhaseLength < 15) + lutealPhaseLength++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (lutealPhaseLength > 0) + lutealPhaseLength--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: lutealPhaseLength.toDouble(), + min: 0, + max: 15, + onChanged: (double newValue) { + setState(() { + lutealPhaseLength = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + SizedBox( + height: 220.0, + ), + Container( + height: 100.0, + width: 350.0, + child: Button( + label: 'CALCULATE', + onTap: () { + setState(() { + { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => OvulationResult( + conceivedDate: conceivedDate, + dateFrom: dateFrom, + dateTo: dateTo, + deliveryDue: deliveryDue, + )), + ); + } + }); + }, + ), + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_result_page.dart b/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_result_page.dart new file mode 100644 index 00000000..6669bf75 --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_result_page.dart @@ -0,0 +1,96 @@ +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 'package:intl/intl.dart'; + +class OvulationResult extends StatelessWidget { + var dateFrom; + var dateTo; + var conceivedDate; + var deliveryDue; + OvulationResult( + {this.dateFrom, this.dateTo, this.deliveryDue, this.conceivedDate}); + //var newFormat = DateFormat("yy-MM-dd"); + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Ovulation Period', + body: Padding( + padding: EdgeInsets.symmetric(horizontal: 30.0, vertical: 15.0), + child: SingleChildScrollView( + child: Container( + height: 750.0, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Texts( + 'The next ovulation period is estimated to be:', + fontWeight: FontWeight.w400, + ), + Texts( + 'From:', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(dateFrom), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Texts( + 'To:', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(dateTo), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Texts( + 'Useful Information:', + color: Color(0xffC5272D), + ), + Texts( + 'You have conceived on:', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(conceivedDate), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Texts( + 'The baby\'s age right now:', + fontWeight: FontWeight.w400, + ), + Texts( + '5 Weeks, 2', + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Texts( + 'The delivery due date is estimated to be on the: ', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(deliveryDue), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Container( + width: 350, + child: Button( + label: 'See List Of Doctors', + ), + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/​ health_calculators.dart b/lib/pages/AlHabibMedicalService/​ health_calculators.dart index 56fb0428..15f7209b 100644 --- a/lib/pages/AlHabibMedicalService/​ health_calculators.dart +++ b/lib/pages/AlHabibMedicalService/​ health_calculators.dart @@ -2,6 +2,7 @@ import 'file:///C:/Users/admin/AndroidStudioProjects/diplomatic-quarter/lib/page 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/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart'; import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; @@ -9,6 +10,7 @@ import 'package:flutter/material.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'health_calculator/bmr_calculator/bmr_calculator.dart'; +import 'health_calculator/delivery_due/delivery_due.dart'; import 'health_calculator/ideal_body/ideal_body.dart'; class HealthCalculators extends StatefulWidget { @@ -233,10 +235,10 @@ class _HealthCalculatorsState extends State flex: 1, child: InkWell( onTap: () { - // Navigator.push( - // context, - // FadePage(page: BloodSugar()), - // ); + Navigator.push( + context, + FadePage(page: OvulationPeriod()), + ); }, child: MedicalProfileItem( title: 'Ovulation', @@ -249,12 +251,12 @@ class _HealthCalculatorsState extends State flex: 1, child: InkWell( onTap: () { - // Navigator.push( - // context, - // FadePage( - // page: BloodCholesterol(), - // ), - // ); + Navigator.push( + context, + FadePage( + page: DeliveryDue(), + ), + ); }, child: MedicalProfileItem( title: 'Delivery', From cd36749e4e09233a563bd6e06c1f99cad1a45ccb Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Mon, 12 Oct 2020 14:22:19 +0300 Subject: [PATCH 29/30] 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 a31796322bf8363ff14339da69487445289d9bc9 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 13 Oct 2020 11:28:14 +0300 Subject: [PATCH 30/30] 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'), ], ),