Commit Graph

948 Commits (6d647d75beb1bf3eb10977aba0f4cc521cf58792)

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
21 hours ago
Sultan khan a5f7bd80b2 updates 21 hours ago
haroon amjad 708cbb138d Updates
# Conflicts:
#	lib/presentation/radiology/radiology_result_page.dart
22 hours ago
Haroon6138 126423d6a1 Merge branch 'master' into haroon_dev 22 hours ago
aamir-csol 2d7aa5d80d radiology ai lab analysis & lab ai analysis api end points updates. 22 hours 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.
23 hours ago
haroon amjad a2de3f1b14 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
23 hours 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 ,
23 hours ago
Sultan khan 712e835176 ui fixes 23 hours ago
haroon amjad fe1e0fdb40 Updates 23 hours ago
aamir-csol 10fa8c46cf radiology ai lab analysis & lab ai analysis api end points updates. 23 hours ago
haroon amjad 572c37785b updates 24 hours ago
haroon amjad 6939630ce0 Merge branch 'master' into haroon_dev 1 day ago
haroon amjad 5318437941 updates 1 day ago
Sultan khan 18331f077e 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: (41 commits)
  pull down to refresh in appointment queue implemented
  Pull to refresh implemented
  Updates & fixes
  updates
  Updates
  Updates
  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.
  Updates
  Font changes, Updates & fixes
  map type is added to the maps already present
  family switch parent child and child 2
  translation service changes
  Updates
  updates
  print statement removed
  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.
  family switch parent child and child 2
  updates
  remote localization files added
  Updates
  ...

# Conflicts:
#	android/app/build.gradle.kts
#	lib/presentation/rate_appointment/rate_appointment_doctor.dart
1 day ago
Sultan khan 287dcf3482 updates 1 day ago
aamir-csol 7fcee6a988 family switch parent child and child 2 , 1 day ago
haroon amjad 185f505ed9 pull down to refresh in appointment queue implemented 1 day ago
haroon amjad 991f9c7a9b Pull to refresh implemented 2 days ago
haroon amjad 71030c0fe9 Updates & fixes 2 days ago
haroon amjad 13a4c9e0f8 updates 2 days ago
haroon amjad e3f5bb69ac Updates 2 days 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 days ago
haroon amjad a9f46a39cc Updates 2 days ago
haroon amjad 92101d2b05 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/my_family/widget/family_cards.dart
2 days ago
Sultan khan b3fa4c9bdf Merge remote-tracking branch 'origin/master' into maptype 2 days 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 days ago
haroon amjad 89a1da4407 Updates 2 days ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 2 days ago
tahaalam c716490b0e map type is added to the maps already present 2 days ago
aamir-csol 351026e42c Merge branch 'master' into dev_aamir 2 days ago
aamir-csol be6d33e51b family switch parent child and child 2 2 days ago
haroon amjad fed6cf6784 translation service changes 2 days ago
haroon amjad 453cfc07e1 Updates 2 days ago
haroon amjad 9c51f53a4d Merge branch 'master' into haroon_dev 3 days ago
haroon amjad 1fa03fff5e updates 3 days ago
tahaalam 07bf971575 print statement removed 3 days 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.
3 days ago
aamir-csol e9ec23f506 family switch parent child and child 2 3 days ago
haroon amjad 21477f34dc updates 3 days ago
haroon amjad 0eb9ec11d3 remote localization files added 3 days ago
haroon amjad f929bd9017 Updates 3 days ago
haroon amjad 400e5daac0 Dr Search fixed 3 days ago
aamir-csol aa17688de6 Merge branch 'master' into dev_aamir 3 days ago
haroon amjad 3d39190c62 updates & fixes 4 days ago
haroon amjad 04cbb3db40 no message 4 days ago
haroon amjad 830086a5b9 Merge branch 'master' into haroon_dev 4 days ago
haroon amjad a8620c1f72 updates 4 days ago
haroon amjad 75531c2254 Merge branch 'master' into haroon_dev 4 days ago
haroon amjad 4959392f74 Updates 4 days ago