Commit Graph

60 Commits (0ddaa6899da2debdff5cdf4f0ef1b13de88c6bda)

Author SHA1 Message Date
Fatimah.Alshammari 250af1506c Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/services/dialog_service.dart
#	lib/theme/colors.dart
3 days ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 4 days ago
Fatimah.Alshammari 20e4f82df3 Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
1 week ago
faizatflutter f8fdd7570e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
2 weeks ago
Fatimah.Alshammari 11de01e079 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
2 weeks ago
faizatflutter d4dd475e0b Added Graph 2 weeks ago
Sultan khan 873b2a1591 sorting done, covid inprogress 2 weeks ago
Fatimah.Alshammari f3674ba06f Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/routes/app_routes.dart
3 weeks ago
faizatflutter fd2abbbc7b Water Intake Design completed 3 weeks ago
haroon amjad 450f07d39d updates & fixes 1 month ago
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
1 month ago
faizatflutter 6f72c99975 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/theme/colors.dart
1 month ago
haroon amjad a83a35a284 Services Page Revamp 1 month ago
faizatflutter ac84d268e9 triage design 1 month ago
faizatflutter acb6d31ff3 Added possible conditions screen 2 months ago
faizatflutter 757ace2ba1 Added Organ Selector 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
faizatflutter fe00447483 HHC in Progress 2 months ago
faizatflutter da579dfd09 CMC Module Completed 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 eae16eec44 active medication 2 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 2 months ago
tahaalam 90128a812b call ambulance module design added. 3 months ago
tahaalam 6cf08c04d2 appointment filters added. 3 months ago
haroon amjad 093e645f60 request medical report implementation completed. 4 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 4 months ago
Sultan khan 32c7608c83 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
taha.alam 5151997c7f custom linear added with parameters to customize the properties of graph 4 months ago
aamir-csol a79dcad221 family screen & widgets 4 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 4 months ago
Sikander Saleem f9859036ef ui improvements. 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 ba2c8327fe login flow inprogress 4 months ago
aamir-csol da035650c0 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
4 months ago
haroon amjad efb22aec4e prescription details page implemented 4 months ago
aamir-csol cf1908b44a Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
4 months ago
aamir-csol 85fac13314 changes 4 months ago
haroon amjad 712e11c69a prescription details page implementation contd. 4 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 4 months ago
Sultan khan 39c284d036 Merge remote-tracking branch 'origin/master' into dev_sultan
# Conflicts:
#	lib/presentation/home/landing_page.dart
4 months ago
Sultan khan f55d82ddb3 bottom navigation 4 months ago
Haroon Amjad 36c6f0d541 Landing page updates 4 months ago
aamir-csol 7321da67e3 register step 2 & fixes 4 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
4 months ago
haroon amjad e044fc8c5e lab implementation contd. 5 months ago
aamir-csol 23a4035117 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
#	lib/widgets/buttons/custom_button.dart
5 months ago
aamir-csol 67e580447e changes 5 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
5 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 5 months ago