Commit Graph

1143 Commits (2d7aa5d80db53fba809bd4e341f5b4dce42e12de)
 

Author SHA1 Message Date
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
Fatimah.Alshammari 8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
11 months ago
Fatimah.Alshammari e17d3cde87 fix toggle 11 months ago
Fatimah.Alshammari 77242825bb fix toggle 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
Fatimah.Alshammari 27ad4e0764 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/home/landing_page.dart
11 months ago
Fatimah.Alshammari eae16eec44 active medication 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
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
haroon amjad 2a6c7fc0a1 Find us implemented 11 months ago
tahaalam 5b0a8ad898 cancel and listing request added 11 months ago
haroon amjad 14f57027f4 Eye measurements done 11 months ago
haroon amjad c600b0ee7a Ask doctor implemented 11 months ago
haroon amjad 21b7b32013 Ask doctor implementation contd. 11 months ago
Haroon6138 43d64b761c Merge pull request 'haroon_dev' (#92) from haroon_dev into master
Reviewed-on: #92
11 months ago
haroon amjad 9a48421271 ER Online Check-In implemented 11 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 11 months ago
Haroon Amjad cc1e073f6d ER Online CheckIn implementation contd. 11 months ago
haroon amjad 60bd9ee55a ER Online CheckIn implementation contd. 11 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 11 months ago
Sultan khan c701572dde radiology search 11 months ago
Sultan khan 028e03a97b filter radiology 11 months ago
Haroon6138 955f3c1888 Merge pull request 'haroon_dev' (#91) from haroon_dev into master
Reviewed-on: #91
11 months ago
haroon amjad f280d4a28a todo page implementation started 11 months ago
haroon amjad d3a8d545b2 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
11 months ago
haroon amjad 8dcc8dfbe3 updates 11 months ago
Haroon6138 5aef8d67de Merge pull request 'Fixed App CustomChip' (#90) from faiz_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/90
11 months ago
faizatflutter f96f3e563c Fixed App CustomChip 11 months ago