Commit Graph

978 Commits (76ebdf606290686d5798bf9e4eb2d055ee9c6820)

Author SHA1 Message Date
haroon amjad 13a4c9e0f8 updates 2 months ago
haroon amjad e3f5bb69ac Updates 2 months 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
2 months ago
haroon amjad a9f46a39cc Updates 2 months ago
haroon amjad 92101d2b05 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/my_family/widget/family_cards.dart
2 months ago
Sultan khan b3fa4c9bdf Merge remote-tracking branch 'origin/master' into maptype 2 months 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.
2 months ago
haroon amjad 89a1da4407 Updates 2 months ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 2 months ago
tahaalam c716490b0e map type is added to the maps already present 2 months ago
aamir-csol 351026e42c Merge branch 'master' into dev_aamir 2 months ago
aamir-csol be6d33e51b family switch parent child and child 2 2 months ago
haroon amjad fed6cf6784 translation service changes 2 months ago
haroon amjad 453cfc07e1 Updates 2 months ago
haroon amjad 9c51f53a4d Merge branch 'master' into haroon_dev 2 months ago
haroon amjad 1fa03fff5e updates 2 months ago
tahaalam 07bf971575 print statement removed 2 months ago
tahaalam 2ae9ab9fac graph reference low nd high value address.
* if the referenncehigh is 0 then it will be neglected
* if the referencelow is 0 then it will be neglected.
2 months ago
aamir-csol e9ec23f506 family switch parent child and child 2 2 months ago
haroon amjad 21477f34dc updates 2 months ago
haroon amjad 0eb9ec11d3 remote localization files added 2 months ago
haroon amjad f929bd9017 Updates 2 months ago
haroon amjad 400e5daac0 Dr Search fixed 2 months ago
aamir-csol aa17688de6 Merge branch 'master' into dev_aamir 2 months ago
haroon amjad 3d39190c62 updates & fixes 2 months ago
haroon amjad 04cbb3db40 no message 2 months ago
haroon amjad 830086a5b9 Merge branch 'master' into haroon_dev 2 months ago
haroon amjad a8620c1f72 updates 2 months ago
haroon amjad 75531c2254 Merge branch 'master' into haroon_dev 2 months ago
haroon amjad 4959392f74 Updates 2 months ago
tahaalam 7135800552 should flip value changed 2 months 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 months ago
tahaalam bdeec6a412 hardcoded id removed that was added for uat 2 months ago
tahaalam 8a11cc03cb pickup direction bottom sheet added and previous radio bottom sheet removed 2 months ago
aamir-csol 5be4f66718 doctor ratings. 2 months ago
haroon amjad f7446d0d41 updates 2 months ago
aamir-csol 2a8f67bba1 family file switch back multi 2 months ago
haroon amjad 3703afe8bd updates 2 months ago
haroon amjad edeae70aa0 Updates 2 months ago
haroon amjad 1f290c5bfe updates 2 months ago
haroon amjad deca29b423 updates & fixes 2 months ago
haroon amjad 93af246700 updates 2 months ago
haroon amjad c18bf9f2c1 Layout fix for appointment details page 2 months ago
haroon amjad f9f2e22376 updates 2 months ago
haroon amjad ac8189fa17 Updates 2 months ago
haroon amjad 7e73741d08 Bookmark icons added 2 months ago
haroon amjad bd65d05e9e Merge branch 'master' into haroon_dev 2 months ago
haroon amjad a13d0cf0e4 updates 2 months 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 months 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 months ago
haroon amjad 6108a629a2 Merge branch 'master' into haroon_dev 2 months ago
haroon amjad 837a934d0d updates 2 months ago
Haroon6138 c324007e61 Merge pull request 'family file switch back issue fixed' (#203) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/203
2 months ago
aamir-csol 38471a773c family file switch back issue fixed 2 months ago
Sultan khan d3dfb2e2a5 doctor favorite in progress. 2 months ago
haroon amjad fbb2570d8e Vital sign updates 2 months ago
haroon amjad db89408185 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/generated/locale_keys.g.dart
2 months 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 months ago
haroon amjad 841fca027c updates 2 months 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 months ago
haroon amjad e29aba81da Updates 2 months ago
tahaalam a8138ba231 Merge remote-tracking branch 'origin/master' into reminer 2 months ago
tahaalam 8b829b9101 reminder start time added to the prescription 2 months ago
haroon amjad a45980162d Added location option in region selection bottom sheet 2 months ago
haroon amjad 444e7b562f Merge branch 'master' into haroon_dev 2 months ago
Haroon6138 88da9af44b Merge pull request 'Invoices Filter' (#200) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/200
2 months ago
haroon amjad 7611c1d58c Updates 2 months ago
aamir-csol f1555c76a3 Invoices Filter 2 months ago
haroon amjad dfc666673d Profile settings update 2 months ago
tahaalam 2babda2d63 Merge remote-tracking branch 'origin/master' into labs_graph_pdf 2 months ago
haroon amjad d4ed2b47bc updates 2 months ago
tahaalam 1d1c756412 graph values fix and comparision with the pdf 2 months ago
haroon amjad 1709b80e84 Updates 2 months ago
haroon amjad 4a3d66f01a Updates 2 months ago
haroon amjad 0ed6103b15 updates 2 months ago
haroon amjad d053f58b7d Updates 3 months ago
haroon amjad d703c382e5 Updates 3 months ago
haroon amjad 3d877ed28d Updates 3 months ago
Haroon Amjad 55b8bc162c Updates 3 months ago
haroon amjad 08928ddd28 Habib Wallet updates 3 months ago
tahaalam f84d5c6769 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	lib/splashPage.dart
3 months ago
Haroon Amjad 657f886391 Changes for AI Lab analysis 3 months ago
Haroon Amjad 30bdfac442 App update page updates 3 months ago
Haroon Amjad d194b5a45b updates 3 months ago
haroon amjad 1a68ffd500 Updates 3 months ago
tahaalam 50d78551c2 warning dialog displayed to user if the watch intented is not currently implemented 3 months ago
haroon amjad abbf016694 Merge branch 'master' into haroon_dev 3 months ago
haroon amjad 2c0d010bac updates 3 months ago
tahaalam dda4dbeba9 merge issue resolution some import were missing from master. 3 months 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
3 months ago
Sultan khan 4f303d8496 other country login done. 3 months 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
3 months ago
haroon amjad 47b50e35a1 updates 3 months ago
Sultan khan 80adf1bd2f 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 & fixes
  updates
  updates
  Dark mode persistence added in the app
  Dark mode enabled
  Updates & fixes
  updates
  updates
  updates
3 months ago
haroon amjad 29447cc9fa updates 3 months ago
haroon amjad 5b04a5a3ea lab test description update 3 months ago
haroon amjad 6e71aa7f13 updates & fixes 3 months ago
haroon amjad fdeeed10d6 updates 3 months ago
Haroon Amjad 8de8039096 updates 3 months ago
Haroon Amjad 040ff6a80d Dark mode persistence added in the app 3 months ago