Commit Graph

35 Commits (5a1c58e6b2b5ea4f5f7a1d018ce0c6a7d08ae2fa)

Author SHA1 Message Date
Sultan khan a4d3bb3533 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 months ago
Sultan khan fb69723a65 e-referral done. 2 months ago
tahaalam 5983caf83a single map screen added to the project for multiple place usage 2 months ago
haroon amjad eb9c38729b Prescription delivery implementation contd. 2 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
2 months ago
faizatflutter 91e3e9387e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/emergency_services/emergency_services_view_model.dart
2 months ago
tahaalam 0e1a643c93 padding added to rrt screen 2 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
2 months ago
tahaalam 8f46dddbd6 terms and condition added to the rrt module. 2 months ago
tahaalam f3676f5596 ui issues resolve for ambulance and rrt request 2 months ago
faizatflutter da579dfd09 CMC Module Completed 2 months ago
faizatflutter 3331edc10d Comprehensive checkup Completed 2 months ago
haroon amjad a4e55cb6df fixes 2 months ago
tahaalam 31261092a8 rrt request creation and history listing 2 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 2 months ago
tahaalam fbe5d35013 merge issues resolve for the ambulance request. 2 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
2 months ago
tahaalam 5b0a8ad898 cancel and listing request added 2 months ago
haroon amjad 9a48421271 ER Online Check-In implemented 2 months ago
Haroon Amjad cc1e073f6d ER Online CheckIn implementation contd. 2 months ago
haroon amjad 60bd9ee55a ER Online CheckIn implementation contd. 2 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 2 months ago
haroon amjad 8976f4db9d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/medical_file/medical_file_page.dart
2 months ago
haroon amjad 2160f87c59 updates 2 months ago
Haroon Amjad 2e16622cc3 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/utils/size_utils.dart
#	lib/presentation/home/widgets/large_service_card.dart
3 months ago
faizatflutter dc5eba7d12 refactored code 3 months ago
faizatflutter 28f8aec60f resolved fSize issue 3 months ago
haroon amjad 487b29fec3 Merge branch 'master' into haroon_dev 3 months ago
tahaalam 90128a812b call ambulance module design added. 3 months ago
haroon amjad 8a6f94cc1d updates 3 months ago
haroon amjad 1c3ed8f2e1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.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
3 months ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 3 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 3 months ago
haroon amjad d755eb0df8 contd. 3 months ago
haroon amjad d693850ef4 ER services implementation contd. 3 months ago