Commit Graph

112 Commits (3d8daeb58dd73ae0d256da54fd7dd8c3feba1301)

Author SHA1 Message Date
Fatimah.Alshammari 3d8daeb58d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/core/utils/calendar_utils.dart
#	lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
#	pubspec.yaml
3 months ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
3 months ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 3 months ago
faizatflutter c7c0a0ac09 Added user_info module IAP 3 months ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 3 months ago
faizatflutter 2ffd4cc1ae Integrated the API for Symptoms Checker 3 months ago
faizatflutter e35fe9ac05 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
3 months ago
haroon amjad 581a4a5a74 WalkIn Appointment implementation done 3 months ago
haroon amjad 36bf63dcde Incoming call updates 3 months ago
haroon amjad 1e5744cf44 Updates & enhancements 3 months ago
Fatimah.Alshammari 86a91ab383 Merge branch 'refs/heads/master' into fatima 4 months ago
faizatflutter 757ace2ba1 Added Organ Selector 4 months ago
haroon amjad 9fd7f71a34 prescription delivery implementation contd 4 months ago
haroon amjad b13adde9d2 send feedback implementation done 4 months ago
Fatimah.Alshammari 8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
4 months ago
haroon amjad f9f17f3a76 LiveChat implemented 4 months 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
4 months ago
Fatimah.Alshammari eae16eec44 active medication 4 months ago
haroon amjad 2a6c7fc0a1 Find us implemented 4 months ago
haroon amjad 9a48421271 ER Online Check-In implemented 4 months ago
haroon amjad 8dcc8dfbe3 updates 4 months ago
faizatflutter b698b74eb5 Design Updates 4 months ago
faizatflutter 8c956fc052 Design changes 5 months ago
Fatimah.Alshammari 3f123d12d6 Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/utils/utils.dart
#	lib/main.dart
5 months ago
Fatimah.Alshammari de8c7bc605 active medication 5 months ago
faizatflutter 3e61df218b Some Minor design updated 5 months ago
faizatflutter eabfaf8182 Design Updates 5 months ago
haroon amjad d693850ef4 ER services implementation contd. 5 months ago
Fatimah.Alshammari cb56503622 Merge remote-tracking branch 'refs/remotes/origin/master' into fatima 5 months ago
Fatimah.Alshammari e8319a0d3f active medication 5 months ago
haroon amjad b27e3268b1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
5 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 5 months ago
aamir-csol 24362f67cb family screen & widgets 5 months ago
aamir-csol aaa8222b1a Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/features/medical_file/medical_file_repo.dart
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
5 months ago
aamir-csol d918b6e464 family screen & widgets 5 months ago
haroon amjad c0606fb530 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/my_appointments/my_appointments_view_model.dart
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/lab/lab_orders_page.dart
5 months ago
tahaalam 6cf08c04d2 appointment filters added. 5 months ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 5 months ago
haroon amjad db979977ca Tamara implementation & enhancements 5 months ago
haroon amjad 5e000db556 updates 5 months ago
haroon amjad 8a7f46441c updates 5 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 5 months ago
haroon amjad 1af2db5c09 patient profile settings page integration implementation contd. 5 months ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
5 months ago
haroon amjad 6b28b57307 empty state implementation contd. 5 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 5 months ago
haroon amjad a07369165d Updates 6 months ago
Haroon6138 25f0b9d415 Merge pull request 'haroon_dev' (#49) from haroon_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/49
6 months ago
haroon amjad 3b5d2d27a4 Updates 6 months ago
Sikander Saleem 99e1036043 ui improvement. 6 months ago