Commit Graph

703 Commits (34e47421a31b10ab7529ea08b8d0c34a96e2d9c8)

Author SHA1 Message Date
Faiz Hashmi 0967e45752 Added till andesfit blood sugar device 2 years ago
Sultan khan a4ed832147 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
#	lib/pages/ErService/OrderLogPage.dart
#	lib/pages/ErService/rapid-response-team/rrt-request-page.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/services/payfort_services/payfort_service.dart
#	lib/services/payfort_services/payfort_view_model.dart
#	lib/splashPage.dart
#	pubspec.yaml
2 years ago
Sultan khan 001417f9b3 fixes 2 years ago
haroon amjad 46ad672649 Apple Pay fixes 2 years ago
Sultan khan 735582e3ab updated code. 2 years ago
Sultan khan 6983e309e0 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	android/build.gradle
#	android/gradle.properties
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/config/config.dart
#	lib/core/model/prescriptions/prescription_report_inp.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
#	lib/pages/BookAppointment/widgets/DoctorView.dart
#	lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/services/clinic_services/get_clinic_service.dart
#	pubspec.yaml
2 years ago
Sultan khan 90dc8e5e05 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/models/LiveCare/ApplePayInsertRequest.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/gif_loader_dialog_utils.dart
#	lib/uitl/location_util.dart
#	pubspec.yaml
2 years ago
Faiz Hashmi a494f454cb Andesfit WeightScale InProgress 2 years ago
haroon amjad 9043e3c687 Apple Pay Updates 2 years ago
Sultan khan 30c14c2167 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
#	lib/core/model/reports/Reports.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/medical/ask_doctor_view_model.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/PrescriptionReport.dart
#	lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/medical/eye/EyeHomePage.dart
#	lib/pages/medical/reports/report_list_widget.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/location_util.dart
#	lib/uitl/utils.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
Faiz Hashmi 4893a1f3af Merge remote-tracking branch 'origin/dev_3.3_BLE' into dev_3.3_BLE 2 years ago
Faiz Hashmi 43f149d940 Added ER1 Without fileList 2 years ago
haroon amjad 5dc0f571c8 Updates 2 years ago
Faiz Hashmi 1cc77e7d32 Completed the available ECG devices 2 years ago
Faiz Hashmi 8611903db0 Merge remote-tracking branch 'origin/dev_3.3_BLE' into dev_3.3_BLE 2 years ago
Faiz Hashmi 70ca4071fc Completed the oxymeter category 2 years ago
haroon amjad bea15150aa Merge branch 'development_v3.3' into dev_3.3_faiz_payfort 2 years ago
haroon amjad ec0bed04d3 Apple Pay in production implemented & tested 2 years ago
Faiz Hashmi 0a700270f4 Oxymeter integration completed 2 years ago
haroon amjad ac52ba75a7 Updates & Fixes 2 years ago
Faiz Hashmi c3ce151a79 Merge branch 'dev_3.3_BLE' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_3.3_BLE
# Conflicts:
#	lib/viatom_ble/ble_connect.dart
2 years ago
Faiz Hashmi 6e97f8556f BP tracker Integration Completed 2 years ago
haroon amjad 6aea29e06a ECG iOS Updates 2 years ago
haroon amjad 7e49dac7bd Updates 2 years ago
Faiz Hashmi 7d023cdb35 BP tracker Integration in Progress 2 years ago
haroon amjad b39357a497 Medical report changes, Loading added in Location Check-In 2 years ago
haroon amjad e5d8505c2d Updates & fixes 2 years ago
Sultan khan d0c7b08eac Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/core/viewModels/er/EdOnlineViewModel.dart
	lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart
	lib/pages/BookAppointment/DentalComplaints.dart
	lib/pages/BookAppointment/components/SearchByClinic.dart
	lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/landing/landing_page.dart
	lib/pages/livecare/widgets/clinic_card.dart
	lib/pages/login/login.dart
	lib/pages/rateAppointment/rate_appointment_clinic.dart
	lib/pages/rateAppointment/rate_appointment_doctor.dart
	lib/services/clinic_services/get_clinic_service.dart
	lib/uitl/push-notification-handler.dart
	lib/widgets/others/bottom_bar.dart
	pubspec.yaml
2 years ago
haroon amjad cfa341aba5 Apple Pay Updates 2 years ago
haroon amjad 4ac11b2169 LanguageID Fixes 2 years ago
Sultan khan 4338da513d Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/patient_lab_orders.dart
#	lib/core/model/labs/request_patient_lab_special_result.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/model/radiology/final_radiology.dart
#	lib/core/model/radiology/request_send_rad_report_email.dart
#	lib/core/model/rate/appoitment_rated.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/service/medical/radiology_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/medical/radiology_view_model.dart
#	lib/models/Authentication/check_activation_code_request.dart
#	lib/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/pages/DrawerPages/notifications/notification_details_page.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/login/login.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/splashPage.dart
#	lib/uitl/push-notification-handler.dart
#	lib/widgets/drawer/app_drawer_widget.dart
2 years ago
haroon amjad 52b3c196d6 updates 2 years ago
Faiz Hashmi ccb9e93d62 Added InAppApple Pay with PayFort 2 years ago
haroon amjad 6ee64b923e updates 2 years ago
haroon amjad 6fd40305b4 ECG File list issue resolved 2 years ago
haroon amjad 1fd978e0c2 ECG Files concurrent reading from device 2 years ago
haroon amjad 47779f6fa7 last appointment rating fixed 2 years ago
haroon amjad 68b83e5f98 LiveData retrieved from native layer 2 years ago
haroon amjad b137f4b09a ECG RealTime implementation 2 years ago
haroon amjad 433616c7b6 ECG Graph implemented 2 years ago
haroon amjad b6a3ae2380 updates EKG 2 years ago
haroon amjad 28cd6769ec updates for EKG 2 years ago
haroon amjad e52e75aefd Integrating EKG device 2 years ago
haroon amjad c6c4f933b2 Invoice Type param added in Labs & Rad 2 years ago
Sultan khan 359a177797 updates 2 years ago
Aamir Muhammad 7f890bb24a Changes 3 years ago
Aamir Muhammad b4bc99369f Changes into Rating Bar 3 years ago
devamirsaleemahmad 0e8c1a8b2f Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/book_reminder_page.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/ToDoList/widgets/paymentDialog.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	pubspec.yaml
3 years ago
Sultan khan 413535ef0b null safety fixed. 3 years ago
devamirsaleemahmad 8f591654a5 changes 3 years ago
devamirsaleemahmad cbc38940ea changes 3 years ago
devamirsaleemahmad ed748a626b changes 3 years ago
devamirsaleemahmad 23b7d85911 changes 3 years ago
haroon amjad 81de6f9848 updated app to stores Version ID 11.0 3 years ago
devamirsaleemahmad 4231c85055 Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/patient_lab_orders.dart
#	lib/core/model/labs/request_patient_lab_special_result.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/model/privilege/VidaPlusProjectListModel.dart
#	lib/core/model/radiology/final_radiology.dart
#	lib/core/model/radiology/request_send_rad_report_email.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/service/medical/radiology_service.dart
#	lib/core/service/privilege_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/medical/radiology_view_model.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/models/anicllary-orders/ancillary_order_list_model.dart
#	lib/models/anicllary-orders/ancillary_orders_proc_list.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/Blood/confirm_payment_page.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/insurance/insurance_update_screen.dart
#	lib/pages/login/login.dart
#	lib/pages/medical/ask_doctor/doctor_response.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/pages/medical/balance/my_balance_page.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/pages/medical/radiology/radiology_home_page.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/splashPage.dart
#	lib/uitl/utils.dart
#	lib/widgets/bottom_navigation/bottom_navigation_item.dart
#	lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	lib/widgets/data_display/medical/doctor_card.dart
#	lib/widgets/data_display/medical/medical_profile_item.dart
#	pubspec.yaml
3 years ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 3 years ago
devamirsaleemahmad 720c0ac6e9 changes & Deletion 3 years ago
Sultan khan 4d52f639aa Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/livecare/live_care_payment_page.dart
#	lib/pages/medical/smart_watch_health_data/steps/stepsTracker.dart
#	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
#	lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart
#	lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
#	lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart
3 years ago
Sultan khan 0c534cffae code update in progress 3 years ago
devamirsaleemahmad 2c9e51aef0 changes 3 years ago
devamirsaleemahmad 1c34843bc5 Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6 3 years ago
Sultan khan 6a8de14d5d code update in progress 3 years ago
devamirsaleemahmad 519f396e76 changes 3 years ago
Sultan khan 40656a65d8 update in progress 3 years ago
devamirsaleemahmad 49d3df8c87 changes 3 years ago
devamirsaleemahmad c1fd6313b1 changes 3 years ago
devamirsaleemahmad cb56750e6b models updates -> 3.13.6 3 years ago
Sultan khan b45cbbcf29 updates 3 years ago
haroon amjad 2500441832 ViBeat device integrated 3 years ago
haroon amjad 7c804f77fb updates & fixes 3 years ago
haroon amjad d11b12ac9a no message 3 years ago
haroon amjad f0a4bd6925 Commented the CRs code 3 years ago
haroon amjad 3f6c05825d updates 3 years ago
haroon amjad 4e962bda07 Merge branch 'development_v3.3' into PatientApp_VIDA_Plus_3.3
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/service/medical/ask_doctor_services.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/pages/conference/web_rtc/call_home_page_.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/pages/webRTC/call_page.dart
#	lib/pages/webRTC/signaling.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/SignalRUtil.dart
#	lib/uitl/utils.dart
#	lib/widgets/others/floating_button_search.dart
3 years ago
haroon amjad e59734ce43 VT CheckMe O2 integrated 3 years ago
haroon amjad 55b447926e Merge branch 'development_v3.3' into dev_3.3_BLE
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad b2f390c19d CR 6204 implemented 3 years ago
haroon amjad 14928ad833 CR 6204 3 years ago
haroon amjad 34d3cf2945 CR 6204 Lab reports enhancements in progress 3 years ago
haroon amjad 1b39b1a5a8 updates 3 years ago
haroon amjad df610690d5 updates 3 years ago
haroon amjad 448740a854 updates 3 years ago
haroon amjad 767f81c8cf Spirometer implementation completed 3 years ago
haroon amjad e282d73dcf Spirometer implementation 3 years ago
haroon amjad b183518a19 weight BLE implemented 3 years ago
haroon amjad efba7faa78 updates 3 years ago
haroon amjad 5b7cde43d1 Weight Scale BLE 3 years ago
haroon amjad 3f767f738a Weight scale in progress 3 years ago
haroon amjad 382ff07a89 updates 3 years ago
haroon amjad 992f7dd454 updates 3 years ago
haroon amjad ee5f90aba1 BLE Blood Pressure implemented 3 years ago
haroon amjad 4dd16bde59 Inpatient medical report fixes 3 years ago
haroon amjad 336c0f17b6 temperature device implemented 3 years ago
haroon amjad 23ab0483e0 BLE implementation started 3 years ago
haroon amjad 38661621e3 updates & fixes 3 years ago
haroon amjad 0f863cd259 Updates & fixes 3 years ago
haroon amjad 5ddf8d4b7a View Dr response fix 3 years ago
haroon amjad 66600fe66c Medical report CR implemented 3 years ago
haroon amjad 75685b1f61 Project selection added in Laser & advance payment 3 years ago
haroon amjad e64a91855f fixes 3 years ago