Commit Graph

627 Commits (bb4719bd8747b27cd6f663b6ed842e41ef8bceda)

Author SHA1 Message Date
Haroon6138 96ebc3c7e9 Merge pull request 'dev_aamir' (#149) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/149
3 weeks ago
Sultan khan 0514716910 no message 3 weeks ago
Sultan khan e903f9c418 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:
  search filter on select doctor page.
  family file fix
  blood group
3 weeks ago
Sultan khan ac0d72b3ff vital sign finalized. 3 weeks ago
aamir-csol c11e859df1 search doctor by name filter. 3 weeks ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
3 weeks ago
faizatflutter 001808488c Added 'send report to email' feature 3 weeks ago
haroon amjad 91c16f13d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
3 weeks ago
haroon amjad 1c0842ab95 updates 3 weeks ago
aamir-csol 83f04bc0e6 search filter on select doctor page. 3 weeks ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 3 weeks ago
aamir-csol c7e4018ddc Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
3 weeks ago
aamir-csol b815affe5c blood group 3 weeks ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 3 weeks 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
3 weeks ago
Fatimah.Alshammari 8ae81d2b24 fixed parking qr 3 weeks ago
Sultan khan 34e8386ca1 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 3 weeks ago
Sultan khan cc255e9c9a vital sign detail page 3 weeks ago
haroon amjad 1656ca58c1 Merge branch 'ambulance_service' into haroon_dev 4 weeks ago
haroon amjad d6b1744176 updates 4 weeks ago
tahaalam 85f9609cbb Merge remote-tracking branch 'origin/master' into ambulance_service
# Conflicts:
#	android/app/libs/PenNavUI.aar
#	android/app/libs/Penguin.aar
#	android/app/libs/PenguinRenderer.aar
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	android/app/src/main/res/values/strings.xml
#	android/build/reports/problems/problems-report.html
#	ios/Runner/AppDelegate.swift
4 weeks ago
haroon amjad ede8844f19 Monthly Reports implemented 4 weeks ago
faizatflutter 17f32e34d3 Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
#	lib/presentation/symptoms_checker/user_info_selection.dart
4 weeks ago
faizatflutter 4ee0d1d3c8 only explain api left. 4 weeks ago
faizatflutter 8c91b6830a Triage Completed. Explain API left 4 weeks ago
haroon amjad e9dd2f0648 updates 4 weeks ago
haroon amjad 210da3404c updates 4 weeks ago
haroon amjad 32ee47ca66 Merge branch 'master' into haroon_dev 4 weeks ago
Haroon6138 ba211ea4c2 Merge pull request 'hospital_filter' (#141) from hospital_filter into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/141
4 weeks ago
haroon amjad b10d715d55 App updates 4 weeks ago
tahaalam f19d06512a filters changed in region selection bottom sheet 4 weeks ago
faizatflutter 49d091547a Till Triage Completed 4 weeks ago
haroon amjad 05e5b41dc6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
4 weeks ago
haroon amjad 6f067d92d6 My invoices implemented 4 weeks ago
Sultan khan d62324044a default appointment load fix 4 weeks 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)
1 month ago
Sultan khan f7021f685a no message 1 month ago
faizatflutter 597579e677 refactoring 1 month ago
haroon amjad 93979707e4 Merge branch 'master' into haroon_dev 1 month ago
haroon amjad 213662e718 updates 1 month ago
faizatflutter 57f693e0d9 fixed the suggested design changes. (Not reminder ones) 1 month ago
faizatflutter 460e32d25a Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
1 month ago
faizatflutter a29c0dd6bc fixed the suggested design changes. (Not reminder ones) 1 month ago
Haroon6138 06f6cb1514 Merge pull request 'dev_sultan' (#137) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/137
1 month ago
Sultan khan 0895d94df2 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 month ago
Sultan khan afe169d2d9 silent login fix 1 month ago
faizatflutter 40f6cafb48 fixed routing again and again. 1 month ago
faizatflutter 81e0680cb3 fixed routing again and again. 1 month ago
Sultan khan 449c693fdb Merge branch 'refs/heads/faiz_dev' into dev_sultan
# Conflicts:
#	lib/presentation/book_appointment/laser/laser_appointment.dart
1 month ago
faizatflutter f8fdd7570e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
1 month ago
faizatflutter 0e2de5a55d Completed Graph 1 month ago
haroon amjad e9590a15d3 updates & fixes 1 month ago
haroon amjad 162337b317 Added appointment nearest gate & floor 1 month 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
1 month ago
Fatimah.Alshammari 62bb667cb8 added parking part 1 month ago
faizatflutter d4dd475e0b Added Graph 1 month ago
Sultan khan d55fe5e527 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 month ago
Sultan khan 0e26505692 covid page inprogress 1 month ago
aamir-csol 6c1707128b Merge branch 'master' into dev_aamir 1 month ago
aamir-csol 3601e39a29 Health calculators & converters 1 month 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
1 month 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
1 month ago
Sultan khan 873b2a1591 sorting done, covid inprogress 1 month ago
faizatflutter a1aaa041d1 Water Intake Final Touches 1 month 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
1 month ago
haroon amjad dcdd17f0e9 sickleave fix 1 month ago
aamir-csol 54f8391066 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
1 month ago
aamir-csol 135b05e561 Health calculators & converters 1 month ago
haroon amjad 510d82b592 Merge branch 'master' into haroon_dev 1 month 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
1 month ago
haroon amjad 3cc2610d30 updates 1 month ago
haroon amjad f886357bcd updates 1 month 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
1 month ago
Sultan khan 40638cfec4 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:
  collapsing_list_view improvement
  Updated design for HHC
  updates & fixes
  QLine API implementation enhancements
  LiveCare flow from clinic selection implemented

# Conflicts:
#	lib/presentation/home/landing_page.dart
1 month ago
Fatimah.Alshammari 68f044de52 added monthly report 1 month ago
faizatflutter fd2abbbc7b Water Intake Design completed 1 month ago
haroon amjad b8ecb70aa2 Merge branch 'master' into haroon_dev 2 months ago
aamir-csol ada169f83f Health calculators & converters 2 months ago
aamir-csol c921228ad9 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/health_calculators/health_calculator_result.dart
2 months ago
aamir-csol f509a09b34 Health calculators & converters 2 months ago
haroon amjad 15f5eaf8e5 updates 2 months ago
haroon amjad 87fd9a42b7 Nearest Appointment selected 2 months ago
faizatflutter 94668997aa Updated design for HHC 2 months ago
haroon amjad 450f07d39d updates & fixes 2 months ago
haroon amjad d8c7503c56 QLine API implementation enhancements 2 months ago
haroon amjad a80410d64b LiveCare flow from clinic selection implemented 2 months ago
Fatimah.Alshammari c9de23347a fix error 2 months ago
Fatimah.Alshammari 190492a191 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/routes/app_routes.dart
2 months ago
Sultan khan d28c94606b 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
  updates
  updates & fixes
2 months ago
Sultan khan 68e1b116f9 last rated updated. 2 months ago
haroon amjad fe294ae8f6 updates 2 months ago
haroon amjad bee4aafc44 Merge branch 'master' into haroon_dev 2 months ago
haroon amjad 3060c57201 updates 2 months 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
2 months ago
Sultan khan 70d5b06987 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: (45 commits)
  Health Calculators
  Smartwatch integration started
  refactor
  Complete UserInfo Selection Module
  Complete UserInfo Selection Module
  update
  Complete USerInfo Selectoiun
  Ancillary order fixes, QLine API integrated & other enhancements
  Added user_info module IAP
  Medical File page updates
  Master merged
  Services Page Revamp
  loading view added
  graph shaded region added from horizontal spaces
  Refactoring
  Appointment Queue implemented, Blood Donation implementation contd.
  Integrated the API for Symptoms Checker
  Queueing system screen implementation contd.
  medical file changes
  Added symptoms selector
  ...

# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/my_appointments/my_appointments_repo.dart
#	lib/features/my_appointments/my_appointments_view_model.dart
#	lib/presentation/home/landing_page.dart
2 months ago
Fatimah.Alshammari 0b3fea230f monthly report 2 months ago
haroon amjad f1004f39af Merge branch 'master' into haroon_dev 2 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
2 months ago
aamir-csol 335e6a6649 Health Calculators 2 months ago
haroon amjad eff6cbbaad updates & fixes 2 months ago