Commit Graph

176 Commits (4473145c0045ec8d4d6c0fe308482121c15e5472)

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
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 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 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 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
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
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
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
haroon amjad 151351c0bf medical file updates 5 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 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
haroon amjad 9fbb8c3418 updates 5 months ago
aamir-csol 2b18e08e64 signup completed 5 months ago
aamir-csol 8c55064158 signup completed 5 months ago
haroon amjad 41ca0e27d9 updates 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
Sikander Saleem c6a5b49af8 Merge branch 'refs/heads/master' into dev_sikander 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
haroon amjad 4269e99be9 updates 5 months ago
Haroon6138 4cdcf495ea Merge pull request 'dev_sultan' (#24) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/24
5 months ago