Commit Graph

828 Commits (7d8537fae63ff4e4d5d3fdc676bebcfdd8a87be3)
 

Author SHA1 Message Date
haroon amjad 9fd7f71a34 prescription delivery implementation contd 2 months ago
faizatflutter 8068de70cb Completed the HHC and CMC 2 months ago
faizatflutter 5e437e42a9 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/location/location_view_model.dart
2 months ago
faizatflutter c84564dafd minor changes 2 months ago
Haroon Amjad bad76059c0 prescription delivery implementation contd. 2 months ago
haroon amjad b90883a596 prescription order implementation contd. 2 months ago
haroon amjad 1be430aa76 Merge branch 'master' into haroon_dev 2 months ago
haroon amjad fee84a2928 Nearest appointment implemented 2 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
2 months ago
tahaalam cbaea9d5e6 screen documentation added. 2 months ago
tahaalam 5983caf83a single map screen added to the project for multiple place usage 2 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
2 months ago
Sultan khan d8a9d8443a e-referral work done search-referral in progress. 2 months ago
Haroon6138 05d4b10a09 Merge pull request 'haroon_dev' (#101) from haroon_dev into master
Reviewed-on: #101
2 months ago
haroon amjad eb9c38729b Prescription delivery implementation contd. 2 months ago
haroon amjad 07a3052b8e appointment prescription implemented 2 months ago
Fatimah.Alshammari 89ff10f506 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/theme/colors.dart
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
Haroon6138 b9a274ed33 Merge pull request 'Comprehensive Checkup Complete Flow (faiz_dev)' (#98) from faiz_dev into master
Reviewed-on: #98
2 months ago
faizatflutter 91e3e9387e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/emergency_services/emergency_services_view_model.dart
2 months ago
Haroon6138 e23f2c1e48 Merge pull request 'ambulance_listing_and_request' (#99) from ambulance_listing_and_request into master
Reviewed-on: #99
2 months ago
tahaalam 0e1a643c93 padding added to rrt screen 2 months ago
haroon amjad c03c84287c Appointment details Lab & radiology integration implemented 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
faizatflutter fe00447483 HHC in Progress 2 months ago
tahaalam 224463feb4 closing the login first dialog 2 months ago
tahaalam 8f46dddbd6 terms and condition added to the rrt module. 2 months ago
haroon amjad ffca4317aa updates 2 months ago
faizatflutter 95bd2a2a7e CMC Tweaks Completed 2 months ago
tahaalam f3676f5596 ui issues resolve for ambulance and rrt request 2 months ago
haroon amjad b13adde9d2 send feedback implementation done 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
haroon amjad 938463aabc Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/utils/date_util.dart
2 months ago
haroon amjad 9f845f1de8 Feedback page implementation contd. 2 months ago
Haroon6138 c0cd558916 Merge pull request 'ambulance_listing_and_request' (#97) from ambulance_listing_and_request into master
Reviewed-on: #97
2 months ago
tahaalam a3b4c1bc8c Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request 2 months ago
tahaalam 31261092a8 rrt request creation and history listing 2 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
2 months ago
Sultan khan c43f96c619 e-referral work in progress 2 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 2 months ago
Fatimah.Alshammari 8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
2 months ago
Fatimah.Alshammari e17d3cde87 fix toggle 2 months ago
Fatimah.Alshammari 77242825bb fix toggle 2 months ago
Haroon Amjad 73b05276f6 Feedback page implementation contd. 2 months ago
Haroon Amjad c88bff8cf2 todo update 2 months ago
Haroon Amjad 37a0692be4 Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev 2 months ago
haroon amjad f9f17f3a76 LiveChat implemented 2 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
2 months ago