Commit Graph

240 Commits (db880760c3ef6da96b91a31e6b5fbfcec353c4b2)

Author SHA1 Message Date
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 9 months ago
haroon amjad 151351c0bf medical file updates 9 months ago
aamir-csol 7c8d7b67a9 signup finalize 9 months ago
aamir-csol b7e19a0af8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
9 months ago
aamir-csol 0c58c22ea5 sign 9 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 9 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
haroon amjad 28da6e0a2c updates 10 months ago
Haroon6138 1df5b3abd9 Merge pull request 'dev_sultan' (#26) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/26
10 months ago
Sultan khan 301348518d Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 10 months ago
Sultan khan a5f64798e0 login fixes 10 months ago
Sikander Saleem c6a5b49af8 Merge branch 'refs/heads/master' into dev_sikander 10 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
10 months ago
haroon amjad 4269e99be9 updates 10 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
10 months ago
Sikander Saleem f9859036ef ui improvements. 10 months ago
Sikander Saleem 118c6717b1 report and logout actions button added. 10 months ago
Sultan khan 138862b115 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 10 months ago
Sultan khan 299c0b0e29 login flow complete 10 months ago
haroon amjad 8df38ea6d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/extensions/widget_extensions.dart
10 months ago
haroon amjad 01b6ab0e4b habib wallet implementation contd. 10 months ago
haroon amjad ccd29f0cf9 updates 10 months ago
Sikander Saleem 09e92b8649 Merge branch 'refs/heads/master' into dev_sikander 10 months ago
Sikander Saleem 50c3a8e595 collapsing list view added in lab results, search lab results, and shimmer skeleton added for loading 10 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
10 months ago
Sultan khan 1466b6b71a no message 10 months ago
aamir-csol 7dcc827721 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
10 months ago
aamir-csol cd48d83c07 signup 10 months ago
Haroon Amjad 6b2ec5aa2c updates, fixes & service privileges 10 months ago
Haroon Amjad 255b3c1565 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
10 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
10 months ago
Sultan khan 2a081e30b5 saved login done. 10 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 10 months ago
haroon amjad 851bd569b4 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/prescriptions/prescription_detail_page.dart
10 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 10 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
10 months ago
aamir-csol c129eb2c2f Merge branch 'master' into dev_aamir 10 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
10 months ago
aamir-csol ffb399c704 fixes for signup 10 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
10 months ago
Sultan khan a199ca040b quick login inprogress 10 months ago
aamir-csol 9b063ba764 fixes for signup 10 months ago
Sikander Saleem 7cc12bd1cf prescription calender reminder added. 10 months ago
Sikander Saleem 60fe32131e Merge branch 'refs/heads/master' into dev_sikander 10 months ago
Sikander Saleem dfe02917fc Merge branch 'refs/heads/master' into dev_sikander 10 months ago
Sikander Saleem d464721733 merge conflict fixed. 10 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 10 months ago
Haroon Amjad 003a161b52 custom chips implemented 10 months ago
haroon amjad f8be788a60 updates & fixes 10 months ago
Sikander Saleem 0ce43fde5f Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	assets/images/svg/bell.svg
#	lib/widgets/common_bottom_sheet.dart
10 months ago
Sikander Saleem cb4601050c prescription reminder bottom sheet added. 10 months ago
haroon amjad 542de41a82 updates & fixes 10 months ago
haroon amjad 2d0fc11f05 updates 10 months ago
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
10 months ago
aamir-csol 484ab56a8e fixes for signup 10 months ago
Sultan khan 7d5b941df3 merged conflict 10 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
10 months ago
Sultan khan ba2c8327fe login flow inprogress 10 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 10 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 10 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 10 months ago
Sultan khan 61d10068ca Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 10 months ago
aamir-csol 4e1912048d login flow completion 10 months ago
aamir-csol 52fddc5323 login flow completion 10 months ago
Sultan khan 7919d40f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/insurance/insurance_home_page.dart
10 months ago
Sultan khan ac17202b7a search lab order updated. 10 months ago
Haroon Amjad 43fa08b8b6 insurance update update 10 months ago