Commit Graph

758 Commits (main)
 

Author SHA1 Message Date
Sultan khan 5f047e1b6f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/hmg_services/hmg_services_repo.dart
#	lib/features/hmg_services/hmg_services_view_model.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/pickup_location.dart
11 months ago
Sultan khan d8a9d8443a e-referral work done search-referral in progress. 11 months ago
Haroon6138 05d4b10a09 Merge pull request 'haroon_dev' (#101) from haroon_dev into master
Reviewed-on: #101
11 months ago
haroon amjad eb9c38729b Prescription delivery implementation contd. 11 months ago
haroon amjad 07a3052b8e appointment prescription implemented 11 months ago
haroon amjad 63d844a5e9 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/features/radiology/radiology_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
#	lib/presentation/emergency_services/history/widget/ambulance_history_item.dart
#	lib/presentation/emergency_services/history/widget/rrt_item.dart
11 months ago
Haroon6138 b9a274ed33 Merge pull request 'Comprehensive Checkup Complete Flow (faiz_dev)' (#98) from faiz_dev into master
Reviewed-on: #98
11 months ago
faizatflutter 91e3e9387e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/emergency_services/emergency_services_view_model.dart
11 months ago
Haroon6138 e23f2c1e48 Merge pull request 'ambulance_listing_and_request' (#99) from ambulance_listing_and_request into master
Reviewed-on: #99
11 months ago
tahaalam 0e1a643c93 padding added to rrt screen 11 months ago
haroon amjad c03c84287c Appointment details Lab & radiology integration implemented 11 months ago
faizatflutter 8ddfdeeac4 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/core/utils/date_util.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/widgets/common_bottom_sheet.dart
11 months ago
faizatflutter fe00447483 HHC in Progress 11 months ago
tahaalam 224463feb4 closing the login first dialog 11 months ago
tahaalam 8f46dddbd6 terms and condition added to the rrt module. 11 months ago
haroon amjad ffca4317aa updates 11 months ago
faizatflutter 95bd2a2a7e CMC Tweaks Completed 11 months ago
tahaalam f3676f5596 ui issues resolve for ambulance and rrt request 11 months ago
haroon amjad b13adde9d2 send feedback implementation done 11 months ago
faizatflutter da579dfd09 CMC Module Completed 11 months ago
faizatflutter 3331edc10d Comprehensive checkup Completed 11 months ago
haroon amjad a4e55cb6df fixes 11 months ago
haroon amjad 938463aabc Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/utils/date_util.dart
11 months ago
haroon amjad 9f845f1de8 Feedback page implementation contd. 11 months ago
Haroon6138 c0cd558916 Merge pull request 'ambulance_listing_and_request' (#97) from ambulance_listing_and_request into master
Reviewed-on: #97
11 months ago
tahaalam a3b4c1bc8c Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request 11 months ago
tahaalam 31261092a8 rrt request creation and history listing 11 months ago
Sultan khan 9a04974db3 Merge branch 'faiz_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/api_consts.dart
11 months ago
Sultan khan c43f96c619 e-referral work in progress 11 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 11 months ago
Haroon Amjad 73b05276f6 Feedback page implementation contd. 11 months ago
Haroon Amjad c88bff8cf2 todo update 11 months ago
Haroon Amjad 37a0692be4 Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev 11 months ago
haroon amjad f9f17f3a76 LiveChat implemented 11 months ago
Sultan khan 8e132e964f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/presentation/radiology/radiology_orders_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
11 months ago
Sultan khan 171bd644d1 e-referral work in progress. 11 months ago
Haroon6138 4aa368d13a Merge pull request 'ambulance_listing_and_request' (#96) from ambulance_listing_and_request into master
Reviewed-on: #96
11 months ago
tahaalam 525504265c issue resolution 11 months ago
tahaalam 53be50b40c Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/appointments/widgets/appointment_doctor_card.dart
#	lib/widgets/common_bottom_sheet.dart
11 months ago
Haroon6138 8b9e757e61 Merge pull request 'ambulance_listing_and_request' (#95) from ambulance_listing_and_request into main
Reviewed-on: #95
11 months ago
tahaalam fbe5d35013 merge issues resolve for the ambulance request. 11 months ago
Haroon6138 5b7c1c5a41 Merge pull request 'Ancillary Orders Complete Flow (faiz_dev)' (#94) from faiz_dev into master
Reviewed-on: #94
11 months ago
faizatflutter 7d64f78246 merge changes 11 months ago
faizatflutter 617b68021a Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/appointments/appointment_payment_page.dart
11 months ago
faizatflutter 16b5ff1b62 Ancillary Orders Flow Completed 11 months ago
tahaalam a669265076 Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/features/emergency_services/models/resp_model/EROnlineCheckInPaymentDetailsResponse.dart
#	lib/main.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/HospitalBottomSheetBody.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/type_selection_widget.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/widgets/input_widget.dart
11 months ago
Haroon6138 21f5067ea4 Merge pull request 'haroon_dev' (#93) from haroon_dev into master
Reviewed-on: #93
11 months ago
haroon amjad 2b6ee56d71 PenguinIn iOS implementation 11 months ago
tahaalam 1f852f63cf penguin sdk added 11 months ago
haroon amjad 096b2b7cbf livechat implementation contd. 11 months ago