Commit Graph

300 Commits (5a1bd6a5b816e2ac34b90c50519f4b1e0bcbebae)

Author SHA1 Message Date
haroon amjad 836a72ec22 App directionality changes 9 months ago
haroon amjad 97038f1a25 advance payment implementation done for self & other file number 9 months ago
haroon amjad 3e95999bf3 Merge branch 'master' into haroon_dev 9 months ago
Haroon Amjad 1c2564a1e2 updates 9 months ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 9 months ago
aamir-csol a79dcad221 family screen & widgets 9 months ago
Sultan khan 4d52987c83 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/medical_file/medical_file_page.dart
9 months ago
Sultan khan 5ce7548656 family file work-in-progress 9 months ago
aamir-csol 8240d3e78d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/authentication/register_step2.dart
9 months ago
Haroon Amjad a4854bbe4a Habib Wallet updates 9 months ago
Haroon6138 25f0b9d415 Merge pull request 'haroon_dev' (#49) from haroon_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/49
9 months ago
Haroon Amjad bdde6c224d Merge branch 'master' into haroon_dev 9 months ago
Haroon6138 2c405aa0c3 Merge pull request 'ui improvement.' (#47) from dev_sikander into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/47
9 months ago
Haroon6138 5e82e02323 Merge pull request 'Location functionality' (#48) from functionality/location into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/48
9 months ago
Haroon Amjad c9206f1ab8 Radiology report implemented 9 months ago
haroon amjad 3b5d2d27a4 Updates 9 months ago
Sultan khan 467f10e952 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan 0a653a61f2 family file bottomsheet added 9 months ago
taha.alam 4473145c00 on success block added to the hms location block 9 months ago
taha.alam 3fdd17ccaa code added to get the location for gms hms and iphone. fallback added if the last known location is null. 9 months ago
aamir-csol 17c47d093c otp screen & register Uae & resend Activation Code. 9 months ago
Sikander Saleem 2584e6cc6e route animation improvement. 9 months ago
Sikander Saleem 99e1036043 ui improvement. 9 months ago
haroon amjad 4f4bef9d6f Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
9 months ago
haroon amjad 2961583414 update 9 months ago
Sikander Saleem bb0ac4a0fe Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem c96081d07c reverse animation time changed to 500ms. 9 months ago
Sultan khan 030c2a1b8a Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan eafb52ab86 family file work in-progress 9 months ago
haroon amjad 928a056cbc Merge branch 'master' into haroon_dev 9 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
9 months ago
haroon amjad 5e81ba1ed8 updates 9 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
9 months ago
Sikander Saleem 3267317457 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/landing_page.dart
9 months ago
Sikander Saleem 57827549b8 language switch added in drawer, and ui improvements 9 months ago
aamir-csol 2b7656d83a otp screen & register Uae & resend Activation Code. 9 months ago
taha.alam 265d979b48 drilled the lat and lng parameter form viewmodel to the mapper 9 months ago
aamir-csol 3ddd7781cd Merge branch 'master' into dev_aamir 9 months ago
haroon amjad c191fd0be1 updates 9 months ago
Sikander Saleem f04f3bcd9c Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem c00e69ef0c profile wallet linked with view model. 9 months ago
taha.alam 55c51f5742 Merge remote-tracking branch 'origin/master' into feature/search_by_region 9 months ago
taha.alam 033ae12499 api handling for clinic and doctor parameters and state management 9 months ago
aamir-csol 3b1b51ef6f otp screen & register Uae & resend Activation Code. 9 months ago
Sikander Saleem c83754fc4a user profile welcome widget improvement. 9 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
9 months ago
Sikander Saleem 8f0e910e4f profile and settings ui completed. 9 months ago
Sultan khan fe36c2a1c1 auto sms 9 months ago
aamir-csol 28a95959e0 Merge branch 'master' into dev_aamir 9 months ago
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 9 months ago
haroon amjad 3ab2546d10 merge fixes 9 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
9 months ago
haroon amjad 5de5fc8be9 updates 9 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
9 months ago
taha.alam de6e0e3704 data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo 9 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
9 months ago
aamir-csol 15c07cb4e2 otp screen & register Uae & resend Activation Code. 9 months ago
haroon amjad 71a07eed8e Merge branch 'master' into haroon_dev 9 months ago
taha.alam ea2d2bf40f retaining the old data. 9 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
9 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 9 months ago
taha.alam 9c2dd721b4 bottom sheets added of region facitlity and hospital. 9 months ago
haroon amjad f9e7c8988a updates 9 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
9 months ago
Sultan khan 286dfaa376 no message 9 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
9 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 9 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 9 months ago
Sultan khan 009fa1859e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan fdd5d4cf6d fixes 9 months ago
aamir-csol 21a9cc8c89 otp screen & register Uae & resend Activation Code. 9 months ago
Haroon Amjad 2aa84e0334 book appointment implementation contd. 9 months ago
haroon amjad 6f745f3666 calendar implementation contd. 9 months ago
aamir-csol 87830e17ab otp screen 9 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
9 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
9 months ago
haroon amjad 7476c8e55a book appo implementation contd. 9 months ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 9 months ago
Sikander Saleem a25f42a43d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	pubspec.yaml
9 months ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 9 months ago
haroon amjad 3066bc8ea3 Book appointment implementation contd. 9 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 9 months ago
Haroon Amjad 14725616c6 medical report implementation contd. 9 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 9 months ago
Haroon Amjad b240293064 medical file implementation contd. 9 months ago
haroon amjad 1c39b26fcc Merge branch 'master' into haroon_dev 10 months ago
haroon amjad 151351c0bf medical file updates 10 months ago
aamir-csol 7c8d7b67a9 signup finalize 10 months ago
aamir-csol b7e19a0af8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
10 months ago
aamir-csol 0c58c22ea5 sign 10 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 10 months ago
haroon amjad d87562caf5 updates 10 months ago
haroon amjad 3a649bca35 Merge branch 'master' into haroon_dev 10 months ago
aamir-csol 6f011880bd Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/authentication/authentication_view_model.dart
10 months ago
haroon amjad 9fbb8c3418 updates 10 months ago
aamir-csol 70810fa14c signup completed 10 months ago
aamir-csol 2b18e08e64 signup completed 10 months ago
aamir-csol 8c55064158 signup completed 10 months ago
haroon amjad 41ca0e27d9 updates 10 months ago
haroon amjad 1de551e799 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart
10 months ago