Commit Graph

606 Commits (76006dcb73eafd1da8fd41de0128730cf4d0ec21)

Author SHA1 Message Date
Sultan khan 6d647d75be 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
  radiology ai lab analysis & lab ai analysis api end points updates.
  Updates
  updates
  updates

# Conflicts:
#	lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
2 months ago
Haroon6138 126423d6a1 Merge branch 'master' into haroon_dev 2 months ago
aamir-csol 2d7aa5d80d radiology ai lab analysis & lab ai analysis api end points updates. 2 months ago
Sultan khan acff5d220c 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:
  radiology ai lab analysis & lab ai analysis api end points updates.
2 months ago
haroon amjad a2de3f1b14 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
2 months ago
Sultan khan cc9ac07923 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:
  family switch parent child and child 2 ,
2 months ago
Sultan khan 712e835176 ui fixes 2 months ago
haroon amjad fe1e0fdb40 Updates 2 months ago
aamir-csol 10fa8c46cf radiology ai lab analysis & lab ai analysis api end points updates. 2 months ago
haroon amjad 572c37785b updates 2 months ago
aamir-csol 7fcee6a988 family switch parent child and child 2 , 2 months ago
haroon amjad 185f505ed9 pull down to refresh in appointment queue implemented 2 months ago
haroon amjad 71030c0fe9 Updates & fixes 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 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
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
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 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 830086a5b9 Merge branch 'master' into haroon_dev 2 months ago
haroon amjad 4959392f74 Updates 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
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 ac8189fa17 Updates 2 months ago
haroon amjad 7e73741d08 Bookmark icons added 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