Commit Graph

199 Commits (63cdced84ec5651127310bd0e0a9e7ccb739bfe3)

Author SHA1 Message Date
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
6 months ago
faizatflutter fd2abbbc7b Water Intake Design completed 6 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
6 months ago
aamir-csol f509a09b34 Health calculators & converters 6 months ago
haroon amjad 450f07d39d updates & fixes 6 months ago
Sultan khan 68e1b116f9 last rated updated. 6 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
6 months ago
Fatimah.Alshammari 0b3fea230f monthly report 6 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
6 months ago
aamir-csol 335e6a6649 Health Calculators 6 months ago
haroon amjad d202aa8423 Smartwatch integration started 6 months ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
6 months ago
faizatflutter 6f72c99975 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/theme/colors.dart
6 months ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 7 months ago
faizatflutter c7c0a0ac09 Added user_info module IAP 7 months ago
haroon amjad c97a492244 Medical File page updates 7 months ago
haroon amjad a83a35a284 Services Page Revamp 7 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
7 months ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 7 months ago
faizatflutter 2ffd4cc1ae Integrated the API for Symptoms Checker 7 months ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 7 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
7 months ago
haroon amjad 2b7379c1c3 Waiting appointment implementation in progress 7 months ago
haroon amjad 36bf63dcde Incoming call updates 7 months ago
faizatflutter acb6d31ff3 Added possible conditions screen 7 months ago
faizatflutter 757ace2ba1 Added Organ Selector 7 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
7 months ago
tahaalam 31261092a8 rrt request creation and history listing 7 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 7 months ago
tahaalam 5b0a8ad898 cancel and listing request added 7 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 8 months ago
tahaalam 90128a812b call ambulance module design added. 8 months ago
haroon amjad 1c3ed8f2e1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.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
8 months ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 8 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 9 months ago
haroon amjad d693850ef4 ER services implementation contd. 9 months ago
tahaalam ea92a0c75c laser appointment screen added 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
tahaalam 483a1571d9 Merge remote-tracking branch 'origin/master' into appointment_filter
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
9 months ago
tahaalam 6cf08c04d2 appointment filters added. 9 months ago
tahaalam 641df8b51b logs removed 9 months ago
tahaalam 36bf229787 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/api/api_client.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
9 months ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
9 months ago
haroon amjad 8a7f46441c updates 9 months ago
tahaalam 6ef9ae813d doctors search filter added 9 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 9 months ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 9 months ago
tahaalam da89c41925 lab result by hospital and translations are added 9 months ago
haroon amjad 2f4d6f5553 immediate livecare consultation implementation contd. 9 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
9 months ago
aamir-csol 1335d3a7c8 family screen & widgets 9 months ago
aamir-csol 060e7a8d68 Merge branch 'master' into dev_aamir 9 months ago
aamir-csol 288a0018ce family screen & widgets 9 months ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
9 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 9 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 9 months ago
haroon amjad a07369165d Updates 9 months ago
haroon amjad f7e26da6f4 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad 344ecaba18 LiveCare Schedule implementation done 9 months ago
Sikander Saleem 604e503e52 flow improvement & translation added. 9 months ago
Sikander Saleem c553876c8a Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Haroon6138 938d95cb06 Merge pull request 'feature/search_by_region' (#55) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/55
9 months ago
Sultan khan 6d85227f11 lab order by test 9 months ago
taha.alam 7093a26cb8 selection region arabic handling 9 months ago
Sikander Saleem 005157fe5e Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/recharge_wallet_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/splashPage.dart
9 months ago
Sikander Saleem 12cef74f16 splash animation added. 9 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
9 months ago
haroon amjad 3e95999bf3 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 9 months ago
aamir-csol a79dcad221 family screen & widgets 9 months ago
aamir-csol 8240d3e78d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/authentication/register_step2.dart
9 months ago
Haroon Amjad c9206f1ab8 Radiology report implemented 9 months ago
aamir-csol 17c47d093c otp screen & register Uae & resend Activation Code. 9 months ago
Sikander Saleem bb0ac4a0fe Merge branch 'refs/heads/master' into dev_sikander 9 months ago
aamir-csol 2b7656d83a otp screen & register Uae & resend Activation Code. 9 months ago
Sikander Saleem f04f3bcd9c Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem 8f0e910e4f profile and settings ui completed. 9 months ago
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 9 months ago
aamir-csol b9b0dfd1fa Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
9 months ago
aamir-csol 15c07cb4e2 otp screen & register Uae & resend Activation Code. 9 months ago
taha.alam 788887a7f1 Merge remote-tracking branch 'origin/master' into feature/search_by_region
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/book_appointment_page.dart
#	lib/presentation/home/navigation_screen.dart
9 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 9 months ago
Sultan khan b78c78ed8b no message 9 months ago
Sultan khan 6b766e558d Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/navigation_screen.dart
9 months ago
aamir-csol fbd6ef0cf8 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/en-US.json
#	lib/features/authentication/widgets/otp_verification_screen.dart
#	lib/widgets/input_widget.dart
9 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 9 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 9 months ago
Sultan khan fdd5d4cf6d fixes 9 months ago
haroon amjad 73f8baa77e Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/extensions/string_extensions.dart
#	lib/widgets/input_widget.dart
9 months ago
Sikander Saleem a25f42a43d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	pubspec.yaml
9 months ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 9 months ago
haroon amjad 3066bc8ea3 Book appointment implementation contd. 9 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment 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 151351c0bf medical file updates 10 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 10 months ago
haroon amjad 1de551e799 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart
10 months ago
Sikander Saleem f9859036ef ui improvements. 10 months ago