Commit Graph

36 Commits (05e5b41dc69915f3cebf6ed48c845a449e2809b6)

Author SHA1 Message Date
aamir-csol 54f8391066 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
6 months ago
aamir-csol 135b05e561 Health calculators & converters 6 months ago
Sultan khan 366429f083 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  Health calculators & converters
  Health calculators & converters
  collapsing_list_view improvement

# Conflicts:
#	lib/widgets/appbar/collapsing_list_view.dart
6 months ago
haroon amjad ca47315b2c Merge branch 'master' into haroon_dev 7 months ago
haroon amjad 3185d1e9e7 Allergies list implemented 7 months ago
aamir-csol e113c4c1ee updates & fixes & RRT Flow 8 months ago
aamir-csol 02ae79c458 Merge branch 'refs/heads/master' into dev_aamir 8 months ago
haroon amjad d693850ef4 ER services implementation contd. 9 months ago
aamir-csol cd81372fc6 family screen add fixes & remove & switch & widgets 9 months ago
aamir-csol bf8f98ffb1 family screen add fixes & remove & switch & widgets 9 months ago
aamir-csol 24362f67cb family screen & widgets 9 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
9 months ago
aamir-csol d918b6e464 family screen & widgets 9 months ago
haroon amjad db979977ca Tamara implementation & enhancements 9 months ago
haroon amjad 093e645f60 request medical report implementation completed. 9 months ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 9 months ago
aamir-csol 1335d3a7c8 family screen & widgets 9 months ago
aamir-csol 288a0018ce family screen & widgets 9 months ago
aamir-csol 36193d349c Merge remote-tracking branch 'origin/dev_sultan' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/medical_file/medical_file_view_model.dart
9 months ago
aamir-csol 02433e1bef family screen & widgets 9 months ago
Sultan khan e2188b5a69 switch family member with super user 9 months ago
Sultan khan 3642523fdf Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/medical_file/medical_file_view_model.dart
9 months ago
Sultan khan 3acd549de7 no message 9 months ago
aamir-csol 47ce5022d3 family screen & widgets 9 months ago
aamir-csol 192d617350 family screen & widgets 9 months ago
aamir-csol 1125437a56 family screen & widgets 9 months ago
aamir-csol a79dcad221 family screen & widgets 9 months ago
Sultan khan 5ce7548656 family file work-in-progress 9 months ago
Sultan khan 0a653a61f2 family file bottomsheet added 9 months ago
Sultan khan eafb52ab86 family file work in-progress 9 months ago
haroon amjad 5de5fc8be9 updates 9 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 9 months ago
Haroon Amjad 14725616c6 medical report implementation contd. 9 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 10 months ago
Haroon Amjad b240293064 medical file implementation contd. 10 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 10 months ago