Commit Graph

250 Commits (3fdd17ccaab2ef2ef430943703d2c358e3cf7ee8)
 

Author SHA1 Message Date
taha.alam 3fdd17ccaa code added to get the location for gms hms and iphone. fallback added if the last known location is null. 1 month ago
Haroon6138 05500e4cd1 Merge pull request 'drilled the lat and lng parameter form viewmodel to the mapper' (#44) from feature/search_by_region into master
Reviewed-on: #44
1 month ago
taha.alam 265d979b48 drilled the lat and lng parameter form viewmodel to the mapper 1 month ago
Haroon6138 625c73f057 Merge pull request 'updates' (#43) from haroon_dev into master
Reviewed-on: #43
1 month ago
haroon amjad c191fd0be1 updates 1 month ago
Haroon6138 64818c082e Merge pull request 'WD: feature/search_by_region' (#42) from feature/search_by_region into master
Reviewed-on: #42
1 month ago
taha.alam 55c51f5742 Merge remote-tracking branch 'origin/master' into feature/search_by_region 1 month ago
taha.alam 033ae12499 api handling for clinic and doctor parameters and state management 1 month ago
Haroon6138 cffd60825b Merge pull request 'dev_sultan' (#41) from dev_sultan into master
Reviewed-on: #41
1 month ago
Sultan khan cd5da116f9 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/authentication/widgets/otp_verification_screen.dart
1 month ago
Sultan khan fe36c2a1c1 auto sms 1 month ago
aamir-csol 28a95959e0 Merge branch 'master' into dev_aamir 1 month ago
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 1 month ago
haroon amjad 3ab2546d10 merge fixes 1 month ago
haroon amjad 05cf451181 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New
# Conflicts:
#	lib/features/my_appointments/my_appointments_view_model.dart
1 month ago
haroon amjad 5de5fc8be9 updates 1 month ago
Haroon6138 2ced674311 Merge pull request 'data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo' (#40) from feature/search_by_region into master
Reviewed-on: #40
1 month ago
taha.alam de6e0e3704 data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo 1 month ago
aamir-csol b9b0dfd1fa Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
1 month ago
aamir-csol 15c07cb4e2 otp screen & register Uae & resend Activation Code. 1 month ago
Haroon6138 88f56885ff Merge pull request 'haroon_dev' (#39) from haroon_dev into master
Reviewed-on: #39
1 month ago
haroon amjad 71a07eed8e Merge branch 'master' into haroon_dev 1 month ago
Haroon6138 6a4650d658 Merge pull request 'feature/search_by_region' (#38) from feature/search_by_region into master
Reviewed-on: #38
1 month ago
taha.alam ea2d2bf40f retaining the old data. 1 month ago
taha.alam 788887a7f1 Merge remote-tracking branch 'origin/master' into feature/search_by_region
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/book_appointment_page.dart
#	lib/presentation/home/navigation_screen.dart
1 month ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 1 month ago
taha.alam 9c2dd721b4 bottom sheets added of region facitlity and hospital. 1 month ago
haroon amjad f9e7c8988a updates 2 months ago
Haroon6138 9d852aa281 Merge pull request 'no message' (#37) from dev_sultan into master
Reviewed-on: #37
2 months ago
Sultan khan b78c78ed8b no message 2 months ago
Haroon6138 a2f60aead1 Merge pull request 'dev_sultan' (#36) from dev_sultan into master
Reviewed-on: #36
2 months ago
Sultan khan 6b766e558d Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/navigation_screen.dart
2 months ago
Sultan khan 286dfaa376 no message 2 months ago
Haroon6138 2cc331c1c8 Merge pull request 'dev_aamir' (#35) from dev_aamir into master
Reviewed-on: #35
2 months ago
aamir-csol fbd6ef0cf8 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/en-US.json
#	lib/features/authentication/widgets/otp_verification_screen.dart
#	lib/widgets/input_widget.dart
2 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 2 months ago
Haroon6138 62b103e233 Merge pull request 'haroon_dev' (#34) from haroon_dev into master
Reviewed-on: #34
2 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 2 months ago
Sultan khan 009fa1859e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 2 months ago
Sultan khan fdd5d4cf6d fixes 2 months ago
aamir-csol 21a9cc8c89 otp screen & register Uae & resend Activation Code. 2 months ago
Haroon Amjad 2aa84e0334 book appointment implementation contd. 2 months ago
haroon amjad 6f745f3666 calendar implementation contd. 2 months ago
aamir-csol 87830e17ab otp screen 2 months ago
haroon amjad 73f8baa77e Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/extensions/string_extensions.dart
#	lib/widgets/input_widget.dart
2 months ago
Haroon6138 f15018b0e8 Merge pull request 'validations & otp widget & focus & auto fill' (#32) from dev_aamir into master
Reviewed-on: #32
2 months ago
haroon amjad 7476c8e55a book appo implementation contd. 2 months ago
Haroon6138 e5b3704863 Merge pull request 'dev_sikander' (#31) from dev_sikander into master
Reviewed-on: #31
2 months ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 2 months ago
Sikander Saleem a25f42a43d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	pubspec.yaml
2 months ago