Commit Graph

195 Commits (b05e4e2a159f1b91d3d24a5e19bc02034c78608d)

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. 5 months ago
aamir-csol 17c47d093c otp screen & register Uae & resend Activation Code. 5 months ago
Sultan khan 030c2a1b8a Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 5 months ago
Sultan khan eafb52ab86 family file work in-progress 5 months ago
Haroon6138 bfdc9752ae Merge pull request 'dev_aamir' (#45) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/45
5 months 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: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/44
5 months ago
aamir-csol 2b7656d83a otp screen & register Uae & resend Activation Code. 5 months ago
taha.alam 265d979b48 drilled the lat and lng parameter form viewmodel to the mapper 5 months ago
aamir-csol 3ddd7781cd Merge branch 'master' into dev_aamir 5 months ago
haroon amjad c191fd0be1 updates 5 months ago
taha.alam 55c51f5742 Merge remote-tracking branch 'origin/master' into feature/search_by_region 5 months ago
taha.alam 033ae12499 api handling for clinic and doctor parameters and state management 5 months ago
aamir-csol 3b1b51ef6f otp screen & register Uae & resend Activation Code. 5 months 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
5 months ago
Sultan khan fe36c2a1c1 auto sms 5 months ago
aamir-csol 28a95959e0 Merge branch 'master' into dev_aamir 5 months ago
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 5 months ago
haroon amjad 3ab2546d10 merge fixes 5 months 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
5 months ago
haroon amjad 5de5fc8be9 updates 5 months 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: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/40
5 months ago
taha.alam de6e0e3704 data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo 5 months 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
5 months ago
aamir-csol 15c07cb4e2 otp screen & register Uae & resend Activation Code. 5 months ago
haroon amjad 71a07eed8e Merge branch 'master' into haroon_dev 5 months ago
taha.alam ea2d2bf40f retaining the old data. 5 months 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
5 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 5 months ago
taha.alam 9c2dd721b4 bottom sheets added of region facitlity and hospital. 5 months ago
haroon amjad f9e7c8988a updates 5 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
5 months ago
Sultan khan 286dfaa376 no message 5 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
5 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 5 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 5 months ago
Sultan khan 009fa1859e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 5 months ago
Sultan khan fdd5d4cf6d fixes 5 months ago
aamir-csol 21a9cc8c89 otp screen & register Uae & resend Activation Code. 5 months ago
Haroon Amjad 2aa84e0334 book appointment implementation contd. 5 months ago
haroon amjad 6f745f3666 calendar implementation contd. 5 months ago
aamir-csol 87830e17ab otp screen 5 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
5 months ago
Haroon6138 f15018b0e8 Merge pull request 'validations & otp widget & focus & auto fill' (#32) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/32
5 months ago
haroon amjad 7476c8e55a book appo implementation contd. 5 months ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 5 months ago
Sikander Saleem a25f42a43d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	pubspec.yaml
5 months ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 5 months ago
haroon amjad 3066bc8ea3 Book appointment implementation contd. 5 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 5 months ago
Haroon Amjad 14725616c6 medical report implementation contd. 5 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 5 months ago
Haroon Amjad b240293064 medical file implementation contd. 5 months ago
aamir-csol 7c8d7b67a9 signup finalize 5 months ago
aamir-csol b7e19a0af8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
5 months ago
aamir-csol 0c58c22ea5 sign 5 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 5 months ago
haroon amjad d87562caf5 updates 5 months ago
haroon amjad 3a649bca35 Merge branch 'master' into haroon_dev 5 months ago
aamir-csol 6f011880bd Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/authentication/authentication_view_model.dart
5 months ago
aamir-csol 70810fa14c signup completed 5 months ago
aamir-csol 8c55064158 signup completed 5 months ago
haroon amjad 1de551e799 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart
5 months ago
haroon amjad 28da6e0a2c updates 5 months ago
Sultan khan a5f64798e0 login fixes 5 months ago
haroon amjad f812dac059 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
5 months ago
Sultan khan 299c0b0e29 login flow complete 5 months ago
haroon amjad ccd29f0cf9 updates 5 months ago
Sultan khan 58d33e2dae Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/home/landing_page.dart
5 months ago
Sultan khan 1466b6b71a no message 5 months ago
aamir-csol 7dcc827721 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
5 months ago
aamir-csol cd48d83c07 signup 5 months ago
Haroon Amjad 6b2ec5aa2c updates, fixes & service privileges 5 months ago
Haroon Amjad 255b3c1565 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
5 months ago
Haroon6138 0e76e95636 Merge pull request 'dev_sultan' (#20) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/20
5 months ago
Sultan khan 2a081e30b5 saved login done. 5 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 5 months ago
haroon amjad 851bd569b4 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/prescriptions/prescription_detail_page.dart
5 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 5 months ago
Sultan khan 9f0fb27baf 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
5 months ago
aamir-csol c129eb2c2f Merge branch 'master' into dev_aamir 5 months ago
Sultan khan b4667f5c94 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
5 months ago
aamir-csol ffb399c704 fixes for signup 5 months ago
Sultan khan 075578602e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
5 months ago
Sultan khan a199ca040b quick login inprogress 5 months ago
aamir-csol 9b063ba764 fixes for signup 5 months ago
Sikander Saleem 7cc12bd1cf prescription calender reminder added. 5 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 5 months ago
Haroon Amjad 003a161b52 custom chips implemented 5 months ago
haroon amjad f8be788a60 updates & fixes 5 months ago
haroon amjad 542de41a82 updates & fixes 5 months ago
haroon amjad 2d0fc11f05 updates 5 months ago
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
5 months ago
aamir-csol 484ab56a8e fixes for signup 5 months ago
Sultan khan 384ac814f8 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/common_bottom_sheet.dart
5 months ago
Sultan khan ba2c8327fe login flow inprogress 5 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 5 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 5 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 5 months ago
Sultan khan 61d10068ca Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 5 months ago
aamir-csol 4e1912048d login flow completion 5 months ago