Commit Graph

590 Commits (335e6a6649b5acdfd1128d2e01503f246ab4c005)
 

Author SHA1 Message Date
aamir-csol 335e6a6649 Health Calculators 10 months ago
aamir-csol f91f8e63d7 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/medical_file/widgets/lab_rad_card.dart
10 months ago
aamir-csol d256eec392 medical file changes 10 months ago
aamir-csol 19365375f6 medical file changes 10 months ago
Haroon6138 03811586f1 Merge pull request 'haroon_dev' (#107) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/107
10 months ago
haroon amjad b37804d012 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/prescriptions/prescriptions_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
10 months ago
haroon amjad 5c0d3144d6 iOS App Icons Added 10 months ago
Haroon6138 88039534e2 Merge pull request 'Calendar reminder added for both prescription and appointment.' (#105) from calender_reminder into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/105
10 months ago
Haroon6138 de0227dd57 Merge pull request 'silent login case handled.' (#106) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/106
10 months ago
Haroon6138 980b72f23f Merge branch 'master' into dev_sultan 10 months ago
haroon amjad 581a4a5a74 WalkIn Appointment implementation done 10 months ago
aamir-csol 0f17a655ed Merge branch 'master' into dev_aamir
# Conflicts:
#	ios/Runner/AppDelegate.swift
#	lib/core/dependencies.dart
#	lib/core/utils/utils.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/authentication/quick_login.dart
#	lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/appbar/collapsing_list_view.dart
#	lib/widgets/common_bottom_sheet.dart
10 months ago
haroon amjad 2b7379c1c3 Waiting appointment implementation in progress 10 months ago
haroon amjad 36bf63dcde Incoming call updates 10 months ago
Sultan khan ddac155a6a silent login case handled. 10 months ago
tahaalam e200479332 old calender util deleted 10 months ago
tahaalam e0e41d1900 calender reminder added on appointment and pescription 10 months ago
haroon amjad 5a1c58e6b2 Merge branch 'master' into haroon_dev 10 months ago
haroon amjad 1e5744cf44 Updates & enhancements 10 months ago
tahaalam fc0f98da1d calender reminder added 10 months ago
Haroon6138 a3d89c7afa Merge pull request 'dev_sultan' (#104) from dev_sultan into master
Reviewed-on: #104
10 months ago
Sultan khan 9e0336687c virtual tour. 10 months ago
Sultan khan 2532b494f7 e-referral done. 10 months ago
Sultan khan a4d3bb3533 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 10 months ago
Sultan khan fb69723a65 e-referral done. 10 months ago
haroon amjad f142ff90be updates 10 months ago
haroon amjad 32adf754ce prescription delivery implemented 10 months ago
haroon amjad 9fd7f71a34 prescription delivery implementation contd 10 months ago
Haroon Amjad bad76059c0 prescription delivery implementation contd. 10 months ago
haroon amjad b90883a596 prescription order implementation contd. 10 months ago
haroon amjad 1be430aa76 Merge branch 'master' into haroon_dev 11 months ago
haroon amjad fee84a2928 Nearest appointment implemented 11 months ago
Haroon6138 9ca0a985a3 Merge pull request 'single map screen added to the project for multiple place usage' (#102) from ambulance_listing_and_request into master
Reviewed-on: #102
11 months ago
tahaalam cbaea9d5e6 screen documentation added. 11 months ago
tahaalam 5983caf83a single map screen added to the project for multiple place usage 11 months ago
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