Commit Graph

91 Commits (d62324044abc4265e8a3df59aa21037385211555)

Author SHA1 Message Date
Sultan khan 5a1fe2b5ca vital sign page added 2 weeks ago
faizatflutter f8fdd7570e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
2 weeks 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
2 weeks ago
Sultan khan 68a34369ee no message 2 weeks ago
faizatflutter a1aaa041d1 Water Intake Final Touches 3 weeks 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
3 weeks 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
3 weeks ago
faizatflutter fd2abbbc7b Water Intake Design completed 3 weeks 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
4 weeks ago
aamir-csol f509a09b34 Health calculators & converters 4 weeks ago
haroon amjad 450f07d39d updates & fixes 1 month ago
Sultan khan 68e1b116f9 last rated updated. 1 month 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
1 month ago
aamir-csol 335e6a6649 Health Calculators 1 month ago
haroon amjad d202aa8423 Smartwatch integration started 1 month ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
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 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 1 month ago
faizatflutter c7c0a0ac09 Added user_info module IAP 1 month ago
haroon amjad c97a492244 Medical File page updates 1 month ago
haroon amjad a83a35a284 Services Page Revamp 1 month 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
1 month ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 1 month ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 1 month 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
1 month ago
haroon amjad 2b7379c1c3 Waiting appointment implementation in progress 1 month ago
faizatflutter acb6d31ff3 Added possible conditions screen 2 months ago
faizatflutter 757ace2ba1 Added Organ Selector 2 months ago
faizatflutter 8ddfdeeac4 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/core/utils/date_util.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/widgets/common_bottom_sheet.dart
2 months ago
tahaalam 31261092a8 rrt request creation and history listing 2 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 2 months ago
tahaalam 5b0a8ad898 cancel and listing request added 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 c146747e5e nearest er clinic repo viewmodel and view added 3 months ago
haroon amjad d693850ef4 ER services implementation contd. 3 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
3 months ago
aamir-csol d918b6e464 family screen & widgets 3 months ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
3 months ago
tahaalam 6ef9ae813d doctors search filter added 4 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 4 months ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 4 months ago
haroon amjad 2f4d6f5553 immediate livecare consultation implementation contd. 4 months ago
aamir-csol e5488299b8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
#	lib/widgets/common_bottom_sheet.dart
4 months ago
aamir-csol 1335d3a7c8 family screen & widgets 4 months ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
4 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 4 months ago
haroon amjad a07369165d Updates 4 months ago
haroon amjad 344ecaba18 LiveCare Schedule implementation done 4 months ago
Sultan khan 8f8c4c7f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
4 months ago