Commit Graph

211 Commits (fb7de50bff2af0aed28d80e65e8afdfd2bcc3849)

Author SHA1 Message Date
haroon amjad 71030c0fe9 Updates & fixes 7 months ago
haroon amjad e3f5bb69ac Updates 7 months ago
haroon amjad 89a1da4407 Updates 7 months ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 7 months ago
haroon amjad 453cfc07e1 Updates 7 months ago
haroon amjad 3d39190c62 updates & fixes 7 months ago
haroon amjad deca29b423 updates & fixes 7 months ago
haroon amjad 837a934d0d updates 7 months ago
haroon amjad fbb2570d8e Vital sign updates 7 months ago
haroon amjad d4ed2b47bc updates 7 months ago
haroon amjad 4a3d66f01a Updates 7 months ago
haroon amjad 0ed6103b15 updates 7 months ago
haroon amjad d053f58b7d Updates 8 months ago
haroon amjad 3d877ed28d Updates 8 months ago
Haroon Amjad 55b8bc162c Updates 8 months ago
haroon amjad f46b3f745f Dark mode enabled 8 months ago
Fatimah.Alshammari 46c8fbf0f6 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
9 months ago
haroon amjad 05b6d02e4c Updates & fixes 9 months ago
haroon amjad 2be65cba51 Inactive Insurance case handled 9 months ago
Haroon Amjad a4573c8710 arabic fixes 9 months ago
Haroon Amjad 4ce1e912ce Vital sign data connected to Symptom checker 9 months ago
Fatimah.Alshammari 0d6d23dbbc Merge branch 'master' into fatima 9 months ago
haroon amjad 5c684a6a0d Doctor Rating details implemented 9 months ago
Fatimah.Alshammari f340f4fb8f Merge branch 'master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
9 months ago
Sikander Saleem 41a4005d41 Merge branch 'refs/heads/master' into dev_sikander 9 months ago
aamir-csol 0c2fe81c99 Merge branch 'master' into dev_aamir 10 months ago
aamir-csol bb4719bd87 logout & family file fix & PMA-1047 10 months ago
Fatimah.Alshammari 931e3fa968 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
10 months ago
Sikander Saleem 2648f304f6 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/data/landing_page_data.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
10 months ago
haroon amjad 10a5a6f558 Ask Doctor implemented 10 months ago
haroon amjad f54ce71177 translation changes 10 months ago
haroon amjad 6faca94b89 updates 10 months ago
Fatimah.Alshammari d027415302 fixed errors 10 months ago
Sikander Saleem e38892ff2d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/habib_wallet_page.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/insurance/insurance_home_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/presentation/radiology/radiology_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
10 months ago
haroon amjad 3ff9628cd3 Translation updates 10 months ago
Sikander Saleem 1599cfed4e UI/UX improvements-1. 10 months ago
Sikander Saleem 77a04e637e UI/UX improvements. 10 months ago
Fatimah.Alshammari 250af1506c Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/services/dialog_service.dart
#	lib/theme/colors.dart
10 months ago
Sultan khan 0c68ca4438 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:
  Added 'send report to email' feature
  Completed the health Tracker Module, Only the email part is left.
  only explain api left.
  Triage Completed. Explain API left
  Till Triage Completed
  refactoring

# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
10 months ago
Sultan khan ac0d72b3ff vital sign finalized. 10 months ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
10 months ago
faizatflutter 001808488c Added 'send report to email' feature 10 months 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
10 months ago
Fatimah.Alshammari 8ae81d2b24 fixed parking qr 10 months ago
haroon amjad ede8844f19 Monthly Reports implemented 10 months ago
haroon amjad b10d715d55 App updates 10 months ago
haroon amjad 05e5b41dc6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
10 months ago
haroon amjad 6f067d92d6 My invoices implemented 10 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)
10 months ago
Sultan khan f7021f685a no message 10 months ago
haroon amjad 213662e718 updates 10 months 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
10 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
10 months ago
haroon amjad dcdd17f0e9 sickleave fix 10 months ago
aamir-csol 54f8391066 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
10 months ago
aamir-csol 135b05e561 Health calculators & converters 10 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
10 months 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
11 months ago
haroon amjad 450f07d39d updates & fixes 11 months ago
haroon amjad d8c7503c56 QLine API implementation enhancements 11 months ago
Fatimah.Alshammari 190492a191 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/routes/app_routes.dart
11 months ago
haroon amjad 3060c57201 updates 11 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
11 months ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
11 months ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 11 months ago
haroon amjad c97a492244 Medical File page updates 11 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
11 months ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 11 months ago
haroon amjad ca47315b2c Merge branch 'master' into haroon_dev 11 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
11 months ago
aamir-csol d256eec392 medical file changes 11 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
11 months ago
aamir-csol 19365375f6 medical file changes 11 months ago
haroon amjad 3185d1e9e7 Allergies list implemented 11 months ago
haroon amjad 36bf63dcde Incoming call updates 11 months ago
haroon amjad 1e5744cf44 Updates & enhancements 11 months ago
Fatimah.Alshammari 86a91ab383 Merge branch 'refs/heads/master' into fatima 12 months ago
faizatflutter 757ace2ba1 Added Organ Selector 12 months ago
haroon amjad f142ff90be updates 12 months ago
haroon amjad 07a3052b8e appointment prescription implemented 12 months ago
Fatimah.Alshammari 89ff10f506 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/theme/colors.dart
12 months ago
haroon amjad 63d844a5e9 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/features/radiology/radiology_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
#	lib/presentation/emergency_services/history/widget/ambulance_history_item.dart
#	lib/presentation/emergency_services/history/widget/rrt_item.dart
12 months ago
haroon amjad c03c84287c Appointment details Lab & radiology integration implemented 12 months ago
haroon amjad ffca4317aa updates 12 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 12 months ago
Fatimah.Alshammari 8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
12 months ago
haroon amjad f9f17f3a76 LiveChat implemented 12 months ago
Fatimah.Alshammari 27ad4e0764 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/home/landing_page.dart
12 months ago
faizatflutter 617b68021a Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/appointments/appointment_payment_page.dart
12 months ago
haroon amjad 14f57027f4 Eye measurements done 12 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 1 year ago
haroon amjad d3a8d545b2 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
1 year ago
haroon amjad 8dcc8dfbe3 updates 1 year ago
faizatflutter f96f3e563c Fixed App CustomChip 1 year ago
haroon amjad 8976f4db9d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/medical_file/medical_file_page.dart
1 year ago
haroon amjad 2160f87c59 updates 1 year ago
faizatflutter b698b74eb5 Design Updates 1 year ago
faizatflutter 8c956fc052 Design changes 1 year ago
Fatimah.Alshammari 3f123d12d6 Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/utils/utils.dart
#	lib/main.dart
1 year ago
Fatimah.Alshammari de8c7bc605 active medication 1 year ago