Commit Graph

3092 Commits (656d8dd6b4e78a280e02c347bf3377e48eff23cf)

Author SHA1 Message Date
haroon amjad 968e59707e updates 2 years ago
Sultan khan 99e2edea31 lab result change for PMA-892 2 years ago
haroon amjad 2ebaed4841 label updated 2 years ago
haroon amjad d6dacfb743 Load more added in appointments timeline. 2 years ago
haroon amjad 5256d8873f ToDo & Appo Timeline changes 2 years ago
haroon amjad fe37de9621 Loading dialog updates 2 years ago
Sultan khan 63f5f7890e updates 2 years ago
Sultan khan eee2ccf148 updates 2 years ago
haroon amjad 727a9f1363 updates & checks 2 years ago
haroon amjad e0c9914206 Issue for appointment reschedule fixed 2 years ago
haroon amjad 7fc47ebf34 LiveCare invoice fix 2 years ago
haroon amjad 162b2fd22a updates 2 years ago
Sultan khan d255ada2ea eye measurements fixed 2 years ago
Aamir Muhammad b6d222a7ea JIRA Fixes 2 years ago
haroon amjad b42c47f074 Update to stores 2 years ago
Sultan khan 0e04012219 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/services/clinic_services/get_clinic_service.dart
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
haroon amjad e0ae8d7c8e Updates & fixes 2 years ago
Sultan khan 001417f9b3 fixes 2 years ago
haroon amjad 357f0f8c24 updates 2 years ago
haroon amjad a12558076f Merge branch 'development_v3.3' into dev_3.3_AmbulanceRequestCR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
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
haroon amjad 6e558bf5a6 Splash fix 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
haroon amjad 32757c85f8 updates 2 years ago
haroon amjad 180cc43705 Update to stores 2 years ago
haroon amjad cb79d625d1 Update to stores for LiveCare fix 2 years ago
haroon amjad 9043e3c687 Apple Pay Updates 2 years ago
haroon amjad e28805f70f updates 2 years ago
haroon amjad b4138b2066 Show Date check added in DoctorView 2 years ago
haroon amjad c65d668c92 updates 2 years ago
haroon amjad 7850748ea2 Dental 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
haroon amjad 0168f06bb9 updates 2 years ago
haroon amjad 1b0961a08f location timeout 2 years ago
haroon amjad c29e2c88f0 location timeout handled in online check-in via location 2 years ago
haroon amjad eb1bddf772 updates 2 years ago
haroon amjad f1a74749f7 param update 2 years ago
haroon amjad bbc42bd1e7 updates 2 years ago
haroon amjad d3bdcfa975 Apple Pay code merged into main branch 2 years ago
haroon amjad 48202ffd12 updates 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
haroon amjad fe7c2c6873 CR 6631 2 years ago
haroon amjad ac52ba75a7 Updates & Fixes 2 years ago
haroon amjad 98a5b7d049 my appointments fixes 2 years ago
haroon amjad 27ed5c95f2 update to stores 2 years ago
haroon amjad e67bd54c04 updates 2 years ago
haroon amjad b39357a497 Medical report changes, Loading added in Location Check-In 2 years ago
haroon amjad 63621b5fed Updates & fixes 2 years ago
haroon amjad cd8b76a374 In App Apple Pay implemented 2 years ago
haroon amjad e1718270eb updates 2 years ago
haroon amjad e6d093a84c updates 2 years ago
haroon amjad 86d3e03c06 Updates 2 years ago
haroon amjad 37aa700b2e fixes 2 years ago
haroon amjad e5d8505c2d Updates & fixes 2 years ago
Sultan khan 4b28581c55 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/models/Appointments/toDoCountProviderModel.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/login/login.dart
#	lib/services/authentication/auth_provider.dart
#	lib/widgets/drawer/app_drawer_widget.dart
2 years ago
haroon amjad 75bfeaa716 My appointment fixes 2 years ago
haroon amjad 27b6e04d33 updates 2 years ago
haroon amjad 3401496739 Updates & fixes 2 years ago
Sultan khan 86f5e81fea merge with 3.3 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 fddb423451 Updates & fixes 2 years ago
haroon amjad aa04e943ef updates & fixes 2 years ago
Sultan khan 98a2545a9b Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	lib/config/config.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/uitl/push-notification-handler.dart
2 years ago
Sultan khan c1fbce7eae bug fixes 2 years ago
haroon amjad cfa341aba5 Apple Pay Updates 2 years ago
haroon amjad 4ac11b2169 LanguageID Fixes 2 years ago
haroon amjad e4ce158277 updates 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 704c0bbbc6 Merge branch 'development_v3.3' into dev_3.3_faiz_payfort 2 years ago
haroon amjad 512db615be Language ID fixes & app update to stores, VersionID 11.5 2 years ago
Faiz Hashmi ccb9e93d62 Added InAppApple Pay with PayFort 2 years ago
Faiz Hashmi b769959823 Revert "changes to build app"
This reverts commit 1492efde
2 years ago
Faiz Hashmi 0e67851646 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3 2 years ago
haroon amjad f7dffea2eb Language ID fixes 2 years ago
haroon amjad 724a26ca68 Updates 2 years ago
haroon amjad a9d4cb2fd8 InApp Browser Update 2 years ago
haroon amjad bcfeff2661 updates 2 years ago
haroon amjad cfd8b5e8a5 Language ID Changes 2 years ago
haroon amjad 264aed70a0 NFC Check added 2 years ago
Faiz Hashmi d3b4f37c73 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	pubspec.yaml
2 years ago
haroon amjad 165f3fb9f6 NFC Check removed for appo checkin 2 years ago
haroon amjad 47779f6fa7 last appointment rating fixed 2 years ago
haroon amjad faf3bbdd9e Unit column position changed 2 years ago
haroon amjad 01db5408c9 fixes 2 years ago
haroon amjad 80167378d9 lat long fixes 2 years ago
haroon amjad eef6f78fd6 Updates 2 years ago
haroon amjad c6c4f933b2 Invoice Type param added in Labs & Rad 2 years ago
haroon amjad 0a9aee0246 updates 2 years ago
haroon amjad 421bae2037 updates 2 years ago
Sultan khan f2a57255fc no message 2 years ago
haroon amjad 8b468fe4b5 Updates & fixes 2 years ago
Sultan khan 6a74cdd2da Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Sultan khan 70077c97db local auth change 2 years ago
Aamir Muhammad 6f99aca8a5 Inpatient Cr Merge 2 years ago
Aamir Muhammad 77651f9652 Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/uitl/push-notification-handler.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/uitl/utils_new.dart
#	lib/widgets/avatar/large_avatar.dart
#	lib/widgets/bottom_navigation/bottom_navigation_item.dart
#	lib/widgets/bottom_options/BottomSheet.dart
#	lib/widgets/data_display/medical/medical_profile_item.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
haroon amjad 70176e0cb1 updates 2 years ago
Sultan khan 359a177797 updates 2 years ago
haroon amjad beb3453ff5 updates 2 years ago
Sultan khan f2079d4bbd payment fix 2 years ago
Sultan khan 557a3baafe theme change 2 years ago
haroon amjad ded6e02663 CheckIn By Param added 2 years ago
devamirsaleemahmad 6671dea8d8 Delete Event on Calender 2 years ago
haroon amjad a0bca92195 CR Implemented 2 years ago
Sultan khan f534ee6f58 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/BookAppointment/widgets/reminder_dialog.dart
2 years ago
Sultan khan 62dc3c162a updated 3.13.6 2 years ago
devamirsaleemahmad 2def9f3744 Merges From 3.3 2 years ago
devamirsaleemahmad d73cc13100 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/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
#	lib/splashPage.dart
#	lib/uitl/utils.dart
2 years ago
devamirsaleemahmad fb62ce2f19 Calender Fix Ios 17+ 2 years ago
devamirsaleemahmad 1ddac14efb Calender Permission Fix Ios 17+ 2 years ago
Aamir Muhammad a24afd4302 Calender Permission 2 years ago
Aamir Muhammad f211fd5617 Call Notification Fix 2 years ago
haroon amjad cb9ced27c2 updates 2 years ago
haroon amjad 1ecb8ebfe9 updated to stores version 11.3 2 years ago
Aamir Muhammad 542864c89c Gif Loader & My Family Fixes 2 years ago
haroon amjad f8fb336740 Location checkin privilege applied 2 years ago
Aamir Muhammad 75b969b265 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Aamir Muhammad 7f890bb24a Changes 2 years ago
Sultan khan 8c46d2577d updated with assets 2 years ago
Sultan khan 8c520d9431 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/BookAppointment/widgets/DoctorView.dart
2 years ago
Sultan khan 432e64e51d updates 2 years ago
Aamir Muhammad b4bc99369f Changes into Rating Bar 2 years ago
haroon amjad 245716119e Location based Check In implemented 2 years ago
haroon amjad 6dd5fda997 Location check in implementing 2 years ago
haroon amjad 5c8bb241b3 Next Actions handled when navigating from My Appointments to ToDo list 2 years ago
devamirsaleemahmad 8bdcfcb764 Changes & Latest Merges 3.3 2 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
2 years ago
devamirsaleemahmad 9d1b153739 Dropdown Changed 2 years ago
haroon amjad b579e494c1 updates 2 years ago
Sultan khan 413535ef0b null safety fixed. 2 years ago
Sultan khan 649521c31f Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Sultan khan c96c151f44 null safety issue fixed. 2 years ago
devamirsaleemahmad d6f51f6c82 changes 2 years ago
haroon amjad 7d2744d29c Lab report CR implemented 2 years ago
haroon amjad 7f753014df Inpatient advance payment projectID param issue resolved 2 years ago
haroon amjad 47ccf68b3a updates 2 years ago
haroon amjad 7c426b90e5 updates 2 years ago
haroon amjad a6a541b903 Lab Orders CR implementation contd. 2 years ago
Sultan khan 1a5687a27c Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/BookAppointment/widgets/DoctorView.dart
#	lib/uitl/app_toast.dart
2 years ago
Sultan khan ec13edc28b updates. 2 years ago
devamirsaleemahmad 8f591654a5 changes 2 years ago
haroon amjad b10383c3ff Translation updates 2 years ago
haroon amjad dd0099236d Insurance dialog added post registration 2 years ago
haroon amjad 1997dbe128 updates 2 years ago
haroon amjad c7ee76d816 updates 2 years ago
haroon amjad e4492cbc1f Medical instructions updates 2 years ago
haroon amjad cb2bacf539 Update insurance for cash patient in ToDo List 2 years ago
haroon amjad 4fcc698f50 CR 6654 done 2 years ago
haroon amjad bbee4dba66 CR 6654 cancel manual insurance update CR done. 2 years ago
devamirsaleemahmad cbc38940ea changes 2 years ago
devamirsaleemahmad ed748a626b changes 2 years ago
devamirsaleemahmad 23b7d85911 changes 2 years ago
haroon amjad 81de6f9848 updated app to stores Version ID 11.0 2 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
2 years ago
haroon amjad d5dd8757e9 Privileges added for QR & NFC CheckIn options 2 years ago
haroon amjad 772992e3ff updates 2 years ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 2 years ago
haroon amjad 41cd55e02b paymentRequestID added in the request 2 years ago
haroon amjad 13b2db47b5 HMC color change applied in my appointments 2 years ago
haroon amjad 6bd6572e7e Lab, Rad & prescription disabled in my appointments screen in case of ER appointment (Clinic ID 10) & project is Vida Plus. 2 years ago
haroon amjad ee5fb615db updates & fixes 2 years ago
haroon amjad 185f54d26d updates & fixes 2 years ago
haroon amjad 0a478e077a QR Code checkin implemented 2 years ago
haroon amjad 542501f5c5 updates 2 years ago
haroon amjad a5e0de08ce updates for ancillary 2 years ago
devamirsaleemahmad 8544b3ce3d changes & Deletion 2 years ago
devamirsaleemahmad 720c0ac6e9 changes & Deletion 2 years ago
haroon amjad 55f1e4166e updates 2 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
2 years ago
Sultan khan 0c534cffae code update in progress 2 years ago
devamirsaleemahmad 2c9e51aef0 changes 2 years ago
devamirsaleemahmad 1c34843bc5 Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6 2 years ago
Sultan khan 6a8de14d5d code update in progress 2 years ago
devamirsaleemahmad 519f396e76 changes 2 years ago
Sultan khan 40656a65d8 update in progress 2 years ago
devamirsaleemahmad 49d3df8c87 changes 2 years ago
devamirsaleemahmad 47801ecb36 changes 2 years ago
devamirsaleemahmad d8836d5e89 Merge branch 'dev_v3.13.6_automigrate' into dev_v3.13.6
# Conflicts:
#	lib/main.dart
#	lib/uitl/CalendarUtils.dart
#	lib/uitl/app_shared_preferences.dart
2 years ago
devamirsaleemahmad c1fd6313b1 changes 2 years ago
Sultan khan c63a1fadf5 code updated in-progress 2 years ago
Sultan khan 6a6ac76973 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Sultan khan 8a42bf8b2f Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/widgets/buttons/custom_text_button.dart
2 years ago
devamirsaleemahmad dfc6e86442 models updates -> 3.13.6 2 years ago
Sultan khan aa605a2e47 file updated 2 years ago
devamirsaleemahmad 1c19b36d2d models updates -> 3.13.6 2 years ago
devamirsaleemahmad b26f535749 models updates -> 3.13.6 2 years ago
devamirsaleemahmad 9c2948db29 models updates -> 3.13.6 2 years ago
devamirsaleemahmad 50816d452e Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6 2 years ago
devamirsaleemahmad b3587688b8 models updates -> 3.13.6 2 years ago
Sultan khan 391331f508 code update in progress 2 years ago
devamirsaleemahmad 971bab465c models updates -> 3.13.6 2 years ago
devamirsaleemahmad 03d550936e models updates -> 3.13.6 2 years ago
devamirsaleemahmad cb56750e6b models updates -> 3.13.6 2 years ago
Sultan khan 04244675e1 code updated. 2 years ago
Sultan khan 6f8be66f42 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
devamirsaleemahmad 511c9788da models updates -> 3.13.6 2 years ago
devamirsaleemahmad 2a4059fd66 models updates -> 3.13.6 2 years ago
Sultan khan 1eb38b1dc4 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
devamirsaleemahmad 3523daa9fa updates -> 3.13.6 2 years ago
Faiz Hashmi 1492efdedb changes to build app 2 years ago
devamirsaleemahmad 6ff864c4cd updates -> 3.13.6 2 years ago
Sultan khan 8bf5479f56 code updated. 2 years ago
devamirsaleemahmad e8e7a726f5 updates -> 3.13.6 2 years ago
Sultan khan b45cbbcf29 updates 2 years ago
haroon amjad 7c804f77fb updates & fixes 2 years ago
haroon amjad dac842f50c fixes for inpatient advance 2 years ago
haroon amjad d11b12ac9a no message 2 years ago
haroon amjad c5e88ac7ba fixes 2 years ago
haroon amjad 645e266af8 Vida plus updates sent to stores 2 years ago
haroon amjad f0a4bd6925 Commented the CRs code 2 years ago
haroon amjad 3f6c05825d updates 2 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
2 years ago
haroon amjad 0f4f98f31c fixes 2 years ago
haroon amjad af5b0766a2 CR 6654, Disable update manual insurance temporarily. 2 years ago
haroon amjad b2f390c19d CR 6204 implemented 2 years ago
haroon amjad 14928ad833 CR 6204 2 years ago
haroon amjad 34d3cf2945 CR 6204 Lab reports enhancements in progress 2 years ago
haroon amjad df610690d5 updates 2 years ago
haroon amjad e780df90e1 updates 2 years ago
haroon amjad d8e9f36844 updates 2 years ago
haroon amjad c0595a8dc6 updates 2 years ago
Sultan khan abcf82346e Excluded change 2 years ago
haroon amjad 31144c7c27 updates 2 years ago
haroon amjad 2048747a62 ancillary updates 2 years ago
haroon amjad 9ed454f67a Cash patient check implemented 2 years ago
haroon amjad 49963911ba Patient eligibility change 2 years ago
haroon amjad 4dd16bde59 Inpatient medical report fixes 2 years ago
haroon amjad a58e4452b8 ancillary changes 2 years ago
haroon amjad 38661621e3 updates & fixes 2 years ago
haroon amjad 6f20f1b871 InPatient Discharge Medications 2 years ago
haroon amjad 72ee34f9a7 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/uitl/translations_delegate_base.dart
2 years ago
haroon amjad 275c99a4ce updates 2 years ago
haroon amjad 0f863cd259 Updates & fixes 2 years ago
haroon amjad 652c19cdf8 updates 2 years ago
haroon amjad 5ddf8d4b7a View Dr response fix 2 years ago
haroon amjad 66600fe66c Medical report CR implemented 2 years ago
haroon amjad fb9a4d5297 Laser clinic changes 2 years ago
haroon amjad 6b121e7f39 Store build version 4.5.026 2 years ago
haroon amjad 75685b1f61 Project selection added in Laser & advance payment 2 years ago
haroon amjad e64a91855f fixes 2 years ago
haroon amjad 7702960bb5 InPatient medical report & view medical report commented out 2 years ago
haroon amjad 3642ca6a47 InPatient advance payment updates 2 years ago
haroon amjad 1300dadce1 Inpatient advance payment 2 years ago
haroon amjad 4a7ca9cd46 InPatient advance payment history implemented 2 years ago
haroon amjad 5c5ed35df8 Clinic & Doctor ID added 2 years ago
haroon amjad 2bf8d454f5 updates 2 years ago
haroon amjad c58e180c91 Updates 2 years ago
haroon amjad 965df33253 Appointment actions fixes 2 years ago
haroon amjad 7c68779324 Nphies integration 2 years ago
haroon amjad 3e63d80655 Ancillary order updates 2 years ago
haroon amjad ae0fca865d InPatient Advance payment API implemented 2 years ago
haroon amjad a9ae44ca89 Implemented checks for InPatient CR 2 years ago
haroon amjad 2455f48fe1 View medical report done 2 years ago
haroon amjad dd79b1dfca InPatient pending advance payment done 2 years ago
haroon amjad 4afdf5545e Translations added 2 years ago
haroon amjad d251ca0e1c Inpatient medical instructions implemented 2 years ago
haroon amjad 786dd76f57 updates 2 years ago
haroon amjad e4e3377c5c update 2 years ago
haroon amjad 3353c93de9 fixes 3 years ago
haroon amjad 44d8f0efe2 InPatient medical report contd. 3 years ago
haroon amjad da0a164b0e updates 3 years ago
haroon amjad a17b941c63 InPatient Medical Report continued 3 years ago
haroon amjad 9b3c07d3b1 Added AED in advance payment 3 years ago
haroon amjad 657248803f Ask doc disabled for LiveCare appointments 3 years ago
haroon amjad d261557cd7 Admitted patient API changed 3 years ago
haroon amjad ff23f3a8cb fixes 3 years ago
haroon amjad b2ec6c76bf ancillary fix 3 years ago
haroon amjad f624c70cee Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad b92e45aa93 Updates & fixes 3 years ago
haroon amjad a60f66a069 Updates 3 years ago
haroon amjad 3fb8876c31 Manual Insurance Card Update 3 years ago
haroon amjad fe606b7823 InPatient Advance Payment 3 years ago
haroon amjad 1eccaf0aac Regex added to allow characters only. 3 years ago
haroon amjad 1a45dd57e9 LiveCare Fix 3 years ago
haroon amjad 047877fb08 Add Doctor response rate comments validation 3 years ago
haroon amjad 20572f463a meal plan dev completed 3 years ago
Sultan khan 5d6b50a1da Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3 3 years ago
Sultan khan 83859e05f1 family file approve reject button refresh 3 years ago
haroon amjad 0e054429ef Meal Plan implementation completed 3 years ago
haroon amjad d9404d3abe Medical Report changes 3 years ago
haroon amjad bc27121c4e meal plan updates 3 years ago
haroon amjad 96f948a8c8 updates 3 years ago
haroon amjad 4b0a41d7d8 updates 3 years ago
haroon amjad 94296cec0d meal plan continued 3 years ago
haroon amjad 38648df897 Meal Plan development continued 3 years ago
haroon amjad d073eb9d5f MealPlan implementation continued 3 years ago
haroon amjad 77ab9373f8 Meal Plan APIs implementation continued 3 years ago
haroon amjad b337343df3 Project ID fix in ancillary orders 3 years ago
Sultan khan 27373b6972 doctor header. 3 years ago
Sultan khan 5e4ca336c2 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3 3 years ago
Sultan khan 68f39d965c Merge branch 'sultan_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
#	pubspec.yaml
3 years ago
haroon amjad 710e6274db mealplan updates 3 years ago
Sultan khan 0306c777ed rating bug fixed 3 years ago
haroon amjad 31d8443f87 insert call info updates 3 years ago
haroon amjad f2ab76eb24 updates 3 years ago
haroon amjad 9f44b25353 Meal Plan API integration in progress 3 years ago
haroon amjad 7bc105c6c7 updates 3 years ago
haroon amjad 12af8bb8a9 updates 3 years ago
haroon amjad 6877244d0e CR# 5805 Ask Doc Improvements dev completed. 3 years ago
haroon amjad 792b3ea249 no message 3 years ago
Sultan khan f29d33d7e7 Changes for voice command search 3 years ago
haroon amjad e4fe4baa27 nearest appo crash fixed 3 years ago
haroon amjad 3fda1da16a updates 3 years ago
haroon amjad 83ca5e8e4c ask doctor date param added 3 years ago
haroon amjad 58e598843b sickleave 3 years ago
haroon amjad 2d93b9753d Ask doctor improvements 3 years ago
haroon amjad f28fcbd006 AdvanceNumber_VP added 3 years ago
haroon amjad 17acae0a95 updates 3 years ago
haroon amjad 101f2dcab8 updates 3 years ago
haroon amjad 60d5ba4a9e Birth Notification implemented 3 years ago
haroon amjad 078482c21d updates 3 years ago
haroon amjad cf30762eec updates 3 years ago
haroon amjad 420aef3195 Updates 3 years ago
haroon amjad 2437d2da9c Updates 3 years ago
haroon amjad 01ee9a2710 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 77f3d0a238 radiology API fixes 3 years ago
haroon amjad e098705374 localized strings 3 years ago
haroon amjad 7280e2a1d7 Birth Notification UI Implemented 3 years ago
haroon amjad 17e7886907 VidaPlus Project changes 3 years ago
haroon amjad a7a06f4083 Home page change 3 years ago
haroon amjad b64ba9211e Inpatient services in dev 3 years ago
haroon amjad 906fd5fd6a Inpatient services in dev 3 years ago
haroon amjad 2fea4b2b07 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
#	lib/pages/landing/widgets/services_view.dart
3 years ago
haroon amjad 15c4f016df update to stores for version 10.5 3 years ago
haroon amjad 3675d05911 config changes 3 years ago
Sultan khan 0514fecae2 lab report email change 3 years ago
haroon amjad badc13d41a sickleave CR Enabled 3 years ago
Sultan khan 83c15196c8 VIDA PLUS CHANGE 3 years ago
Sultan khan ddcd0bb73c Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into PatientApp_VIDA_Plus_3.3
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
#	lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/push-notification-handler.dart
#	lib/widgets/others/bottom_bar.dart
#	lib/widgets/others/floating_button_search.dart
#	pubspec.yaml
3 years ago
haroon amjad fcf0c589a0 Updates & fixes 3 years ago
haroon amjad b304332526 Patient app release to stores 10.4 3 years ago
haroon amjad 872095c51f Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3 3 years ago
haroon amjad 5a741bf270 Sickleave changes 3 years ago
Sultan khan ad068d4f09 Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3 3 years ago
Sultan khan d59e436a97 dubai arabic change 3 years ago
haroon amjad 907d05c3d0 register 3 years ago
haroon amjad 9d2df00d87 Get General instructions implemented 3 years ago
Sultan khan baec968ae0 Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3
# Conflicts:
#	lib/pages/login/register-info.dart
3 years ago
Sultan khan c48f393f95 Dubai registration fixed 3 years ago
haroon amjad 0e4e285954 InPatient CR dev 3 years ago
haroon amjad 701eedf147 updates 3 years ago
haroon amjad 670991eca4 Lab result fix 3 years ago
haroon amjad e79454973c InPatient API 3 years ago
haroon amjad 9a7d0af6ea InPatient API implemented 3 years ago
haroon amjad af90ab3aa3 Sickleave & chart changes 3 years ago
haroon amjad 128bd2ec54 Inpatient services implementation 3 years ago