Commit Graph

272 Commits (a2fde1ddebbdf07c006ba40faabbec3769b0e47a)

Author SHA1 Message Date
haroon amjad ede8844f19 Monthly Reports implemented 9 months ago
haroon amjad 255353dd21 Bottom nav updates 9 months ago
haroon amjad b10d715d55 App updates 9 months ago
haroon amjad 05e5b41dc6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
9 months ago
haroon amjad 6f067d92d6 My invoices implemented 9 months ago
Sultan khan dc8031bb41 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:
  updates
  fixed the suggested design changes. (Not reminder ones)
  fixed the suggested design changes. (Not reminder ones)
9 months ago
Sultan khan f7021f685a no message 9 months ago
faizatflutter a29c0dd6bc fixed the suggested design changes. (Not reminder ones) 9 months ago
faizatflutter f8fdd7570e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
9 months ago
faizatflutter d4dd475e0b Added Graph 9 months ago
faizatflutter 333046951c Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/routes/app_routes.dart
9 months ago
Sultan khan 6ceee6973f 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:
  sickleave fix
  Health calculators & converters
  updates
  updates
  updates
  updates
  Nearest Appointment selected

# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
9 months ago
Sultan khan 873b2a1591 sorting done, covid inprogress 9 months ago
faizatflutter a1aaa041d1 Water Intake Final Touches 9 months ago
haroon amjad b353de3cf8 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_doctor_page.dart
#	lib/presentation/book_appointment/widgets/doctor_card.dart
9 months ago
aamir-csol 135b05e561 Health calculators & converters 9 months ago
faizatflutter fd2abbbc7b Water Intake Design completed 10 months ago
haroon amjad 5581346a2d updates 10 months ago
Sikander Saleem edcab9d26d collapsing_list_view improvement 10 months ago
Sikander Saleem 5191ffeb2c Merge branch 'refs/heads/master' into dev_sikander 10 months ago
Sikander Saleem a78769df67 collapsing_list_view improvement 10 months ago
faizatflutter 94668997aa Updated design for HHC 10 months ago
haroon amjad 450f07d39d updates & fixes 10 months ago
aamir-csol 7d71d994ea Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/enums.dart
#	lib/core/utils/calender_utils_new.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/routes/app_routes.dart
10 months ago
aamir-csol 335e6a6649 Health Calculators 10 months ago
faizatflutter 6f72c99975 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/theme/colors.dart
10 months ago
faizatflutter cf26e71645 Complete USerInfo Selectoiun 10 months ago
faizatflutter c7c0a0ac09 Added user_info module IAP 10 months ago
tahaalam 2125e30c23 Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
10 months ago
tahaalam 95243c250f graph shaded region added from horizontal spaces 10 months ago
faizatflutter 34f4cd4f91 Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
10 months ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 10 months ago
aamir-csol f91f8e63d7 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/medical_file/widgets/lab_rad_card.dart
10 months ago
aamir-csol d256eec392 medical file changes 10 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
10 months ago
faizatflutter 2173d091ed Added symptoms selector 10 months ago
aamir-csol 19365375f6 medical file changes 10 months ago
tahaalam ac15ab26f5 graph changes for high and low 10 months ago
haroon amjad b37804d012 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/prescriptions/prescriptions_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
10 months ago
Haroon6138 88039534e2 Merge pull request 'Calendar reminder added for both prescription and appointment.' (#105) from calender_reminder into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/105
10 months ago
aamir-csol 0f17a655ed Merge branch 'master' into dev_aamir
# Conflicts:
#	ios/Runner/AppDelegate.swift
#	lib/core/dependencies.dart
#	lib/core/utils/utils.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/authentication/quick_login.dart
#	lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/appbar/collapsing_list_view.dart
#	lib/widgets/common_bottom_sheet.dart
10 months ago
haroon amjad 36bf63dcde Incoming call updates 10 months ago
faizatflutter ac84d268e9 triage design 10 months ago
tahaalam e200479332 old calender util deleted 10 months ago
haroon amjad 5a1c58e6b2 Merge branch 'master' into haroon_dev 10 months ago
haroon amjad 1e5744cf44 Updates & enhancements 10 months ago
faizatflutter 757ace2ba1 Added Organ Selector 10 months ago
Sultan khan a4d3bb3533 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 10 months ago
Sultan khan fb69723a65 e-referral done. 10 months ago
haroon amjad 9fd7f71a34 prescription delivery implementation contd 11 months ago