Commit Graph

348 Commits (b93e23a3143853af1412bd9d418dfa9dc6405d80)

Author SHA1 Message Date
Sultan khan 5f82f0db2d fixes and updates 6 days ago
haroon amjad 86fa198afc Updates & fixes 6 days ago
haroon amjad 408c0c83d9 updates 1 week ago
Sultan khan 21ae30a8cc profile picture upload 1 week ago
Sultan khan 5f559a44dd profile image upload 1 week ago
haroon amjad 5b44329972 updates 1 week ago
haroon amjad f8df84177d update 1 week ago
haroon amjad 708cbb138d Updates
# Conflicts:
#	lib/presentation/radiology/radiology_result_page.dart
1 week ago
haroon amjad 572c37785b updates 1 week ago
haroon amjad e3f5bb69ac Updates 1 week ago
haroon amjad 081dfce480 Merge branch 'master' into haroon_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/widgets/location_input_bottom_sheet.dart
#	lib/widgets/input_widget.dart
1 week ago
Sultan khan 0d4563542a WD:map issues resolved:
1. map type added to the screen along with the translation
2. null shown for the arabic name of the fixed to show the actual name.
3. if the user opens the locationBottomsheet and close it without input of the area the screen freezes with no action on the location.
4. Gms And Hms Maps handled.
5. theme handled inside the maps screen.
1 week ago
haroon amjad 89a1da4407 Updates 1 week ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 1 week ago
haroon amjad 453cfc07e1 Updates 1 week ago
haroon amjad 1fa03fff5e updates 1 week ago
haroon amjad 21477f34dc updates 1 week ago
haroon amjad 0eb9ec11d3 remote localization files added 1 week ago
haroon amjad f929bd9017 Updates 2 weeks ago
haroon amjad 3d39190c62 updates & fixes 2 weeks ago
haroon amjad 04cbb3db40 no message 2 weeks ago
tahaalam a2fa661db4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
2 weeks ago
tahaalam 8a11cc03cb pickup direction bottom sheet added and previous radio bottom sheet removed 2 weeks ago
aamir-csol 5be4f66718 doctor ratings. 2 weeks ago
haroon amjad 3703afe8bd updates 2 weeks ago
haroon amjad edeae70aa0 Updates 2 weeks ago
haroon amjad 1f290c5bfe updates 2 weeks ago
haroon amjad deca29b423 updates & fixes 2 weeks ago
haroon amjad 93af246700 updates 2 weeks ago
haroon amjad bd65d05e9e Merge branch 'master' into haroon_dev 2 weeks ago
haroon amjad a13d0cf0e4 updates 2 weeks ago
Sultan khan c970a3f697 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
  family file switch back issue fixed
  Vital sign updates
  updates
  Updates
  Added location option in region selection bottom sheet
  Updates
  Profile settings update
2 weeks ago
Sultan khan 6178062ed0 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: (33 commits)
  reminder start time added to the prescription
  Invoices Filter
  Updates
  updates
  Revert "graph values fix and comparision with the pdf"
  graph values fix and comparision with the pdf
  graph values fix and comparision with the pdf
  Updates
  Updates
  updates
  Updates
  Updates
  Updates
  Updates
  Habib Wallet updates
  Changes for AI Lab analysis
  App update page updates
  updates
  Updates
  warning dialog displayed to user if the watch intented is not currently implemented
  ...

# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
2 weeks ago
haroon amjad 837a934d0d updates 2 weeks ago
haroon amjad db89408185 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/generated/locale_keys.g.dart
2 weeks ago
haroon amjad 78a6d55b35 Merge branch 'master' into watch_integration
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
2 weeks ago
haroon amjad 841fca027c updates 2 weeks ago
haroon amjad 078b236b67 Merge branch 'master' into haroon_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
2 weeks ago
haroon amjad e29aba81da Updates 2 weeks ago
tahaalam a8138ba231 Merge remote-tracking branch 'origin/master' into reminer 2 weeks ago
tahaalam 8b829b9101 reminder start time added to the prescription 2 weeks ago
haroon amjad a45980162d Added location option in region selection bottom sheet 2 weeks ago
haroon amjad 444e7b562f Merge branch 'master' into haroon_dev 2 weeks ago
haroon amjad 7611c1d58c Updates 2 weeks ago
aamir-csol f1555c76a3 Invoices Filter 2 weeks ago
haroon amjad 1709b80e84 Updates 3 weeks ago
haroon amjad 4a3d66f01a Updates 3 weeks ago
haroon amjad d053f58b7d Updates 3 weeks ago
haroon amjad d703c382e5 Updates 3 weeks ago
haroon amjad 3d877ed28d Updates 3 weeks ago
Haroon Amjad 55b8bc162c Updates 4 weeks ago
haroon amjad 08928ddd28 Habib Wallet updates 1 month ago
tahaalam f84d5c6769 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	lib/splashPage.dart
1 month ago
haroon amjad 1a68ffd500 Updates 1 month ago
tahaalam 50d78551c2 warning dialog displayed to user if the watch intented is not currently implemented 1 month ago
haroon amjad abbf016694 Merge branch 'master' into haroon_dev 1 month ago
haroon amjad 2c0d010bac updates 1 month ago
tahaalam dda4dbeba9 merge issue resolution some import were missing from master. 1 month ago
Sultan khan f51e37db55 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
  lab test description update

# Conflicts:
#	lib/core/api/api_client.dart
#	lib/presentation/authentication/login.dart
1 month ago
Sultan khan 4f303d8496 other country login done. 1 month ago
tahaalam 151fcf23d1 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	android/app/build.gradle.kts
#	android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xxxhdpi/ic_launcher.png
#	android/build/reports/problems/problems-report.html
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	pubspec.yaml
1 month ago
haroon amjad 47b50e35a1 updates 1 month ago
haroon amjad f46b3f745f Dark mode enabled 1 month ago
Fatimah.Alshammari ee358259f5 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
2 months ago
Fatimah.Alshammari 8368dbd4d9 fixed Ar and En files 2 months ago
haroon amjad dffed5df6b Insurance approvals page fixes 2 months ago
Fatimah.Alshammari cf3c14281c fixed Ar En files 2 months 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
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 9413e54d3a NPHIES Eligibility checks implemented 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
haroon amjad 8309f311e6 App update page implemented 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 b44ae1e838 added women support in symptoms checker module. 2 months ago
haroon amjad 2be65cba51 Inactive Insurance case handled 2 months ago
haroon amjad 530b87282f updates & fixes 2 months ago
haroon amjad 2e1f4e87e0 AI Lab Analysis updates 2 months ago
haroon amjad 5015747580 LiveCare changes 2 months ago
haroon amjad 01c21377aa Updates & fixes 2 months ago
tahaalam 183bcce003 merge issue resolution 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
aamir-csol 2c7f4ddc48 Ai Analysis & PMA-(1078,1079) 2 months ago
haroon amjad c9279e2272 updates 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 3af43dc676 JIRA bug fixes & updates 2 months ago
Fatimah.Alshammari 0d6d23dbbc Merge branch 'master' into fatima 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 70a6d90ce3 updates & fixes 3 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
3 months ago
Sikander Saleem f376f430c6 Merge branch 'refs/heads/master' into dev_sikander 3 months ago
aamir-csol 8c7f4afe76 family file button fix 3 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
3 months ago
haroon amjad 4e6d3d3178 SmartWatch implementation contd. 3 months ago