Commit Graph

783 Commits (a13d0cf0e4655cb5ca4763079700410b0fd5771d)

Author SHA1 Message Date
Sultan khan d6eb6970af 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: (29 commits)
  calender package added
  Android zoom fixes
  updates
  updates
  wallet page fix
  updates
  fixed Ar and En files
  Insurance approvals page fixes
  fixed Ar En files
  Added immediate patient insurance update API
  updates
  sickleave & medical report fixes
  test description issue in lab results fixed
  Updates & fixes, Filter issues fixed for lab & rad
  Ancillary order fixes
  NPHIES Eligibility checks implemented
  updates
  Android package name updated to new package details
  Updates & fixes
  App update page implemented
  ...
1 month ago
haroon amjad 961a1f5b03 updates 1 month ago
haroon amjad 68ff91561f Merge branch 'master' into haroon_dev 1 month ago
haroon amjad 631fabad23 updates 1 month ago
tahaalam 71ac91a076 calender package added 1 month ago
haroon amjad 79b23584db updates 1 month ago
haroon amjad 295709cbc2 Merge branch 'master' into haroon_dev 1 month ago
haroon amjad 1286455f8c wallet page fix 1 month ago
haroon amjad 5e16169867 updates 1 month ago
Fatimah.Alshammari ee358259f5 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
1 month ago
haroon amjad dffed5df6b Insurance approvals page fixes 1 month ago
Haroon Amjad d9013a1dc2 Added immediate patient insurance update API 1 month ago
haroon amjad a25df34f42 updates 1 month ago
haroon amjad 84224ae61b sickleave & medical report fixes 1 month ago
tahaalam 3f9046f1e4 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/core/api_consts.dart
#	lib/generated/locale_keys.g.dart
1 month ago
Haroon Amjad c2028841c5 test description issue in lab results fixed 2 months ago
tahaalam bfeb3dce4e data integration along with the data representation 2 months ago
haroon amjad dc0e4e5eb6 Updates & fixes, Filter issues fixed for lab & rad 2 months ago
Fatimah.Alshammari 46c8fbf0f6 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
2 months ago
haroon amjad 2a819a2d97 Ancillary order fixes 2 months ago
haroon amjad 9413e54d3a NPHIES Eligibility checks implemented 2 months ago
Sultan khan b91850d388 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: (67 commits)
  added women support in symptoms checker module.
  family fil fixes
  PMA-1100
  updates
  updates
  Updates & fixes
  updates
  Ai Analysis & PMA-(1078,1079)
  update
  updates
  arabic fixes
  arabic fixes
  Vital sign data connected to Symptom checker
  Date format changed to en-US
  confirm button added
  iOS BundleID changes
  Services price list implemented
  Indoor navigation implemented
  updates & fixes
  JIRA bug fixes & updates
  ...

# Conflicts:
#	lib/presentation/authentication/register_step2.dart
#	lib/presentation/vital_sign/vital_sign_page.dart
2 months ago
Haroon Amjad 105ab2326a updates 2 months ago
haroon amjad ec506869cc Android package name updated to new package details 2 months ago
haroon amjad 05b6d02e4c Updates & fixes 2 months ago
Sultan khan c416d84a3a register insurance in progress. 2 months ago
haroon amjad 8309f311e6 App update page implemented 2 months ago
haroon amjad c6ee3c453f contact us bottom sheet icons changed 2 months ago
haroon amjad 4b710523e8 Feedback status implemented 2 months ago
haroon amjad e1788f1187 Merge branch 'master' into haroon_dev 2 months ago
faizatflutter afae41c410 Merge branch 'master' into faiz_dev 2 months ago
faizatflutter b44ae1e838 added women support in symptoms checker module. 2 months ago
haroon amjad 2be65cba51 Inactive Insurance case handled 2 months ago
haroon amjad 2e1f4e87e0 AI Lab Analysis updates 2 months ago
haroon amjad 87e0c5b6eb Merge branch 'master' into haroon_dev 2 months ago
haroon amjad 1575a8e308 Feedback status implementation contd. 2 months ago
aamir-csol 7296bfb6fc family fil fixes 2 months ago
haroon amjad 305b3274c0 Symptoms checker doctor selection implemented 2 months ago
haroon amjad 5015747580 LiveCare changes 2 months ago
tahaalam 4912f686f9 platform channel added. 2 months ago
Haroon Amjad cb44e902a3 Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev 2 months ago
Haroon Amjad 9b3c172dd1 updates 2 months ago
haroon amjad 20ed54243b updates 2 months ago
haroon amjad 01c21377aa Updates & fixes 2 months ago
tahaalam 02398d3bb4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
2 months ago
tahaalam d137e1166d watch integration ui added. 2 months ago
aamir-csol a105d87241 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/features/authentication/authentication_view_model.dart
#	lib/generated/locale_keys.g.dart
2 months ago
haroon amjad 68f5e64557 updates 2 months ago
aamir-csol 2c7f4ddc48 Ai Analysis & PMA-(1078,1079) 2 months ago
haroon amjad 95b65ed8a5 Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
# Conflicts:
#	lib/features/book_appointments/book_appointments_view_model.dart
2 months ago
haroon amjad c9279e2272 updates 2 months ago
Haroon Amjad 23abbebf9e arabic fixes 2 months ago
Haroon Amjad a4573c8710 arabic fixes 2 months ago
Haroon Amjad 4ce1e912ce Vital sign data connected to Symptom checker 2 months ago
Haroon Amjad eeaa22357f Date format changed to en-US 2 months ago
haroon amjad 000c403f6b confirm button added 2 months ago
Fatimah.Alshammari 47ec43850d Merge branch 'master' into fatima 2 months ago
haroon amjad 3c9c3032a5 Services price list implemented 2 months ago
haroon amjad 2ab3e178a2 Indoor navigation implemented 2 months ago
haroon amjad 9ed016ad8b updates & fixes 2 months ago
haroon amjad 3af43dc676 JIRA bug fixes & updates 2 months ago
Fatimah.Alshammari 0d6d23dbbc Merge branch 'master' into fatima 2 months ago
haroon amjad 66ff6ed8b6 Prescription download changes 2 months ago
haroon amjad 85ccf41d04 Updates & fixes for Habib Wallet, Insurance update, Immediate LiveCare 2 months ago
haroon amjad b309342cdc lab fixes 2 months ago
haroon amjad 5c684a6a0d Doctor Rating details implemented 2 months ago
Fatimah.Alshammari f340f4fb8f Merge branch 'master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
2 months ago
haroon amjad bafe835ebd Scheduled livecare appointment booking fixes 2 months ago
haroon amjad 8472a45530 updates 2 months ago
haroon amjad 70a6d90ce3 updates & fixes 2 months ago
haroon amjad 8740178f8c Merge branch 'master' into haroon_dev 2 months ago
haroon amjad cfd0c16738 updates & fixes 2 months ago
aamir-csol 7014ac397e Merge remote-tracking branch 'origin/master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
2 months ago
Haroon Amjad 49542a9112 updates & fixes 2 months ago
Haroon Amjad 1ae1212733 Merge branch 'master' into haroon_dev 2 months ago
Haroon Amjad 537d93915e Zoom SDK fixes 2 months ago
Sikander Saleem f376f430c6 Merge branch 'refs/heads/master' into dev_sikander 2 months ago
Sikander Saleem b9350afead ui improvements 2 months ago
aamir-csol 2c2cb8bb99 family file button fix 2 months ago
aamir-csol 8c7f4afe76 family file button fix 2 months ago
Haroon6138 c50f8d63ef Merge pull request 'haroon_dev' (#171) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/171
2 months ago
haroon amjad 4e6d3d3178 SmartWatch implementation contd. 2 months ago
faizatflutter 9c7cfde5f4 ui improvements 2 months ago
tahaalam f78eb5da67 Wd: Unware clinic bottom sheet shown on appointment page. 2 months ago
Sikander Saleem 6e1eb0d0bb ui improvements 2 months ago
Sikander Saleem 41a4005d41 Merge branch 'refs/heads/master' into dev_sikander 2 months ago
haroon amjad 940ce5ff14 updates 2 months ago
haroon amjad 05e87bbb2e Merge branch 'master' into haroon_dev 2 months ago
haroon amjad ae3ed83dd0 contact us page changes 2 months ago
aamir-csol 0c2fe81c99 Merge branch 'master' into dev_aamir 2 months ago
aamir-csol bb4719bd87 logout & family file fix & PMA-1047 2 months ago
Fatimah.Alshammari 931e3fa968 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
2 months ago
Sikander Saleem 6e4d7519fb Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/widgets/habib_wallet_card.dart
2 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
2 months ago
haroon amjad b0708d85d9 updates & fixes 2 months ago
haroon amjad 20216cd4ae Merge branch 'master' into haroon_dev 2 months ago
aamir-csol 2bbfe1f131 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/profile_settings/profile_settings.dart
2 months ago
aamir-csol 8b701255ed logout & family file fix 2 months ago
haroon amjad 7ead6d79e5 updates 2 months ago
haroon amjad 3e9a381ed7 Merge branch 'master' into haroon_dev 2 months ago