Commit Graph

539 Commits (fatima)
 

Author SHA1 Message Date
Fatimah.Alshammari 89ff10f506 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/theme/colors.dart
1 week ago
Haroon6138 b9a274ed33 Merge pull request 'Comprehensive Checkup Complete Flow (faiz_dev)' (#98) from faiz_dev into master
Reviewed-on: #98
1 week ago
faizatflutter 91e3e9387e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/emergency_services/emergency_services_view_model.dart
1 week ago
Haroon6138 e23f2c1e48 Merge pull request 'ambulance_listing_and_request' (#99) from ambulance_listing_and_request into master
Reviewed-on: #99
1 week ago
tahaalam 0e1a643c93 padding added to rrt screen 2 weeks 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
2 weeks ago
faizatflutter fe00447483 HHC in Progress 2 weeks ago
tahaalam 224463feb4 closing the login first dialog 2 weeks ago
tahaalam 8f46dddbd6 terms and condition added to the rrt module. 2 weeks ago
faizatflutter 95bd2a2a7e CMC Tweaks Completed 2 weeks ago
tahaalam f3676f5596 ui issues resolve for ambulance and rrt request 2 weeks ago
faizatflutter da579dfd09 CMC Module Completed 2 weeks ago
faizatflutter 3331edc10d Comprehensive checkup Completed 2 weeks ago
Haroon6138 c0cd558916 Merge pull request 'ambulance_listing_and_request' (#97) from ambulance_listing_and_request into master
Reviewed-on: #97
2 weeks ago
tahaalam a3b4c1bc8c Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request 2 weeks ago
tahaalam 31261092a8 rrt request creation and history listing 2 weeks ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 2 weeks ago
Fatimah.Alshammari 8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
2 weeks ago
Fatimah.Alshammari e17d3cde87 fix toggle 2 weeks ago
Fatimah.Alshammari 77242825bb fix toggle 2 weeks 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
2 weeks ago
Sultan khan 171bd644d1 e-referral work in progress. 2 weeks 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
2 weeks ago
Fatimah.Alshammari eae16eec44 active medication 2 weeks ago
Haroon6138 4aa368d13a Merge pull request 'ambulance_listing_and_request' (#96) from ambulance_listing_and_request into master
Reviewed-on: #96
2 weeks ago
tahaalam 525504265c issue resolution 2 weeks 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
2 weeks ago
tahaalam fbe5d35013 merge issues resolve for the ambulance request. 2 weeks ago
Haroon6138 5b7c1c5a41 Merge pull request 'Ancillary Orders Complete Flow (faiz_dev)' (#94) from faiz_dev into master
Reviewed-on: #94
2 weeks ago
faizatflutter 7d64f78246 merge changes 2 weeks 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
2 weeks ago
faizatflutter 16b5ff1b62 Ancillary Orders Flow Completed 2 weeks 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
2 weeks ago
Haroon6138 21f5067ea4 Merge pull request 'haroon_dev' (#93) from haroon_dev into master
Reviewed-on: #93
2 weeks ago
haroon amjad 096b2b7cbf livechat implementation contd. 3 weeks ago
haroon amjad 2a6c7fc0a1 Find us implemented 3 weeks ago
tahaalam 5b0a8ad898 cancel and listing request added 3 weeks ago
haroon amjad 14f57027f4 Eye measurements done 3 weeks ago
haroon amjad c600b0ee7a Ask doctor implemented 3 weeks ago
haroon amjad 21b7b32013 Ask doctor implementation contd. 3 weeks ago
Haroon6138 43d64b761c Merge pull request 'haroon_dev' (#92) from haroon_dev into master
Reviewed-on: #92
3 weeks ago
haroon amjad 9a48421271 ER Online Check-In implemented 3 weeks ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 3 weeks ago
Haroon Amjad cc1e073f6d ER Online CheckIn implementation contd. 3 weeks ago
haroon amjad 60bd9ee55a ER Online CheckIn implementation contd. 3 weeks ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 3 weeks ago
Sultan khan c701572dde radiology search 4 weeks ago
Sultan khan 028e03a97b filter radiology 4 weeks ago
Haroon6138 955f3c1888 Merge pull request 'haroon_dev' (#91) from haroon_dev into master
Reviewed-on: #91
4 weeks ago
haroon amjad f280d4a28a todo page implementation started 4 weeks ago