Commit Graph

153 Commits (ff2bcbae3f5e54623c74e5da80a0da25c0146a6c)

Author SHA1 Message Date
haroon amjad 9a48421271 ER Online Check-In implemented 2 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 2 months ago
haroon amjad f280d4a28a todo page implementation started 2 months ago
haroon amjad d3a8d545b2 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
2 months ago
haroon amjad 8dcc8dfbe3 updates 2 months ago
faizatflutter f96f3e563c Fixed App CustomChip 2 months ago
faizatflutter b698b74eb5 Design Updates 2 months ago
faizatflutter 8c956fc052 Design changes 3 months ago
faizatflutter 3e61df218b Some Minor design updated 3 months ago
faizatflutter eabfaf8182 Design Updates 3 months ago
haroon amjad d693850ef4 ER services implementation contd. 3 months ago
haroon amjad b27e3268b1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
3 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 3 months ago
aamir-csol 24362f67cb family screen & widgets 3 months ago
aamir-csol aaa8222b1a Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/features/medical_file/medical_file_repo.dart
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
3 months ago
aamir-csol d918b6e464 family screen & widgets 3 months ago
haroon amjad c0606fb530 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/my_appointments/my_appointments_view_model.dart
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/lab/lab_orders_page.dart
3 months ago
tahaalam 6cf08c04d2 appointment filters added. 3 months ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 3 months ago
haroon amjad db979977ca Tamara implementation & enhancements 3 months ago
haroon amjad 5e000db556 updates 3 months ago
haroon amjad 8a7f46441c updates 4 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 4 months ago
haroon amjad 1af2db5c09 patient profile settings page integration implementation contd. 4 months ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
4 months ago
haroon amjad 6b28b57307 empty state implementation contd. 4 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 4 months ago
haroon amjad a07369165d Updates 4 months ago
haroon amjad a711d3a6dd LiveCare shcedule implementation contd. 4 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
4 months ago
Haroon Amjad c9206f1ab8 Radiology report implemented 4 months ago
haroon amjad 3b5d2d27a4 Updates 4 months ago
Sikander Saleem 99e1036043 ui improvement. 4 months ago
haroon amjad 4f4bef9d6f Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
4 months ago
haroon amjad 5e81ba1ed8 updates 4 months ago
Sikander Saleem 3267317457 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/landing_page.dart
4 months ago
Sikander Saleem 57827549b8 language switch added in drawer, and ui improvements 4 months ago
haroon amjad c191fd0be1 updates 4 months ago
Sikander Saleem c00e69ef0c profile wallet linked with view model. 4 months ago
Sikander Saleem c83754fc4a user profile welcome widget improvement. 4 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
4 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 4 months ago
Sultan khan fdd5d4cf6d fixes 4 months ago
haroon amjad 3066bc8ea3 Book appointment implementation contd. 4 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 4 months ago
Haroon Amjad b240293064 medical file implementation contd. 4 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 4 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
4 months ago
haroon amjad 4269e99be9 updates 4 months ago
Sultan khan 299c0b0e29 login flow complete 4 months ago
haroon amjad ccd29f0cf9 updates 4 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
4 months ago
Sultan khan 1466b6b71a no message 4 months ago
Haroon Amjad 6b2ec5aa2c updates, fixes & service privileges 4 months ago
Sultan khan 2a081e30b5 saved login done. 4 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
4 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
4 months ago
Sultan khan a199ca040b quick login inprogress 4 months ago
aamir-csol 9b063ba764 fixes for signup 4 months ago
haroon amjad f8be788a60 updates & fixes 4 months ago
haroon amjad 542de41a82 updates & fixes 4 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
4 months ago
Sultan khan ba2c8327fe login flow inprogress 4 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 4 months ago
Haroon Amjad 43fa08b8b6 insurance update update 4 months ago
haroon amjad d794787459 updates 4 months ago
faizatflutter 702c504d4e Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
#	pubspec.yaml
4 months ago
faizatflutter db50bd8f23 Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/app_state.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/authentication/register.dart
#	lib/widgets/bottomsheet/generic_bottom_sheet.dart
#	lib/widgets/input_widget.dart
4 months ago
faizatflutter 84804a59a7 completed till otp receiving 4 months ago
Sikander Saleem 6473ccecb5 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
4 months ago
aamir-csol da035650c0 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
4 months ago
haroon amjad e8cc6407b6 Insurance update implementation contd. 4 months ago
Sikander Saleem ac0b7bec44 custom tab bar added in medical file section. 4 months ago
Sikander Saleem 85bb00a8fc Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem 38d37fd407 custom tab bar added. 4 months ago
faizatflutter 3e50a3c89d Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/core/enums.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/register.dart
#	lib/presentation/home/landing_page.dart
4 months ago
faizatflutter 6e05ca15cf adding the login function 4 months ago
aamir-csol cf1908b44a Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
4 months ago
aamir-csol 85fac13314 changes 4 months ago
Sultan khan 886825a4b9 bottom navigation updated. 4 months ago
faizatflutter 32fadb8ad9 completed login function 4 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 4 months ago
haroon amjad 6f07bc7c2c Radiology Orders implemented 4 months ago
Sultan khan 0de09dd72c no message 4 months ago
aamir-csol 7321da67e3 register step 2 & fixes 4 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
4 months ago
Haroon Amjad a77fc49c68 lab result changes 5 months ago
haroon amjad e044fc8c5e lab implementation contd. 5 months ago
faizatflutter 488636a13f Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
5 months ago
faizatflutter 572fcef0f1 checkUserAuth 5 months ago
aamir-csol d1e1154bdb changes 5 months ago
aamir-csol 23a4035117 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
#	lib/widgets/buttons/custom_button.dart
5 months ago
faizatflutter c6a95fe7d7 latest push after master merged 5 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
5 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 5 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 5 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 5 months ago
faizatflutter 89e9323d9e merged master and updated structure 5 months ago
Haroon Amjad 0a39a00df5 Landing page updates 5 months ago
Haroon Amjad 4fcaea2993 updates 5 months ago