Commit Graph

38 Commits (f8fdd7570eb0611ed3cef81748d4833f2667eefe)

Author SHA1 Message Date
Sultan khan 873b2a1591 sorting done, covid inprogress 2 weeks ago
tahaalam e200479332 old calender util deleted 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
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 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 938463aabc Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/utils/date_util.dart
2 months ago
tahaalam 31261092a8 rrt request creation and history listing 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
tahaalam 525504265c issue resolution 2 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
2 months ago
faizatflutter 16b5ff1b62 Ancillary Orders Flow Completed 2 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 2 months ago
faizatflutter 21be3a2d06 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
#	lib/widgets/buttons/custom_button.dart
#	lib/widgets/common_bottom_sheet.dart
#	lib/widgets/input_widget.dart
3 months ago
faizatflutter eabfaf8182 Design Updates 3 months ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 3 months ago
aamir-csol 1125437a56 family screen & widgets 4 months ago
aamir-csol f9bfc131a8 family screen & widgets 4 months ago
aamir-csol 3b1b51ef6f otp screen & register Uae & resend Activation Code. 4 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 4 months ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 4 months ago
Sultan khan 299c0b0e29 login flow complete 4 months ago
Haroon6138 0e76e95636 Merge pull request 'dev_sultan' (#20) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/20
4 months ago
Sultan khan 2a081e30b5 saved login done. 4 months ago
Sikander Saleem 60fe32131e Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 4 months ago
Sikander Saleem 0ce43fde5f Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	assets/images/svg/bell.svg
#	lib/widgets/common_bottom_sheet.dart
4 months ago
Sikander Saleem cb4601050c prescription reminder bottom sheet added. 4 months ago
Sultan khan 7d5b941df3 merged conflict 4 months ago
Sultan khan 384ac814f8 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/common_bottom_sheet.dart
4 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 4 months ago
Sultan khan ac17202b7a search lab order updated. 4 months ago
haroon amjad 2f9fbaef7a insurance update implementation contd. 4 months ago
haroon amjad 333b813f90 bottom sheet fixes 4 months ago
Sultan khan 2f2a8f3f8f search lab result screen added 4 months ago