Commit Graph

978 Commits (86fa198afc4d263453fbb64e2f02eb89b206c310)

Author SHA1 Message Date
haroon amjad 0441d072fa Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart
8 months ago
haroon amjad d693850ef4 ER services implementation contd. 8 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 8 months ago
tahaalam a7bd5f61cb Merge remote-tracking branch 'origin/master' into feature/lab_result 8 months ago
tahaalam 9e3035f02b units added to lab result and it graph and unwanted values removed from graph 8 months ago
aamir-csol 58e65e7a64 Merge branch 'master' into dev_aamir 8 months ago
aamir-csol cd81372fc6 family screen add fixes & remove & switch & widgets 8 months ago
haroon amjad 7a35f0ded6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
8 months ago
Haroon6138 5227fa6b58 Merge pull request 'family screen add fixes & remove & switch & widgets' (#79) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/79
8 months ago
haroon amjad 5e1a7652be lab report download implemented 8 months ago
tahaalam 773cc9229b Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
8 months ago
tahaalam cc458b2ec7 files and packages renamed 8 months ago
tahaalam 81a6c7d034 files and packages renamed 8 months ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 8 months ago
Haroon6138 51d225e206 Merge pull request 'laser appointment screen added' (#78) from laser_appointment into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/78
8 months ago
Haroon6138 084efb7d32 Merge pull request 'lab severity values handled and size of lab description fixed' (#80) from feature/lab_result into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/80
8 months ago
tahaalam ab74a61969 lab severity values handled and size of lab description fixed 8 months ago
haroon amjad 1e08394ba1 Lab report PDF implementation contd. 8 months ago
aamir-csol bf8f98ffb1 family screen add fixes & remove & switch & widgets 8 months ago
tahaalam ea92a0c75c laser appointment screen added 8 months ago
haroon amjad a2310e1447 prescription instructions PDF implemented 8 months ago
haroon amjad 663eda0076 updates & fixes 8 months ago
Fatimah.Alshammari cb56503622 Merge remote-tracking branch 'refs/remotes/origin/master' into fatima 8 months ago
Fatimah.Alshammari e8319a0d3f active medication 8 months ago
haroon amjad fe5b6c35ac insurance approval implementation done 8 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
8 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 8 months ago
aamir-csol 24362f67cb family screen & widgets 8 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
8 months ago
aamir-csol d918b6e464 family screen & widgets 8 months ago
haroon amjad 8ff5566f0b dependencies update 8 months ago
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 8 months ago
Haroon6138 3bbc014251 Merge pull request 'appointment date filter handled' (#74) from appointment_filter into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/74
8 months ago
haroon amjad f1a60a9dfb updates 8 months ago
tahaalam 61007302c9 appointment date filter handled 8 months ago
tahaalam e5dcabacce lab prescription details are added andgraph visibility added to the graph page for result that are IRR 8 months ago
haroon amjad d220be7283 Tamara payment flow done 8 months ago
haroon amjad 30eb8bf5de dental booking flow implemented 8 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
8 months ago
haroon amjad b05e4e2a15 Dental appointment booking flow implementation contd. 8 months ago
haroon amjad 2b21086cc1 Dental appointment booking flow implementation contd. 8 months ago
tahaalam 483a1571d9 Merge remote-tracking branch 'origin/master' into appointment_filter
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
8 months ago
tahaalam 6cf08c04d2 appointment filters added. 8 months ago
Haroon6138 156d7b4834 Merge pull request 'id selection from the appropiate list' (#70) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/70
8 months ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 8 months ago
tahaalam 35e145ddf9 id selection from the appropiate list 8 months ago
haroon amjad 8291e89ee7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
8 months ago
haroon amjad 903248133e Lab order & results enhancements 8 months ago
Haroon6138 7e92cad55b Merge pull request 'bottom handled when dental and laser clinic is selected from clinic page' (#69) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/69
8 months ago
tahaalam bbf83d4dc9 bottom handled when dental and laser clinic is selected from clinic page 8 months ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 8 months ago
haroon amjad db979977ca Tamara implementation & enhancements 8 months ago
tahaalam 641df8b51b logs removed 8 months ago
tahaalam 36bf229787 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/api/api_client.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
8 months ago
tahaalam 42abf9ca1b login bypass removed 8 months ago
tahaalam 2e9a462a1c listing resizing if the data is in small numbers. 8 months ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
8 months ago
haroon amjad 5e000db556 updates 8 months ago
tahaalam 786aa05b19 doctor list handled to be cleared when going back 8 months ago
tahaalam a4a32cca44 doctor filter icon removed from the doctor listing from clininc 8 months ago
haroon amjad 1d22e53f63 Merge branch 'master' into haroon_dev
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/presentation/medical_file/medical_file_page.dart
8 months ago
haroon amjad 8a7f46441c updates 8 months ago
tahaalam 6ef9ae813d doctors search filter added 8 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 8 months ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 8 months ago
tahaalam da89c41925 lab result by hospital and translations are added 8 months ago
haroon amjad 2f4d6f5553 immediate livecare consultation implementation contd. 9 months ago
haroon amjad 093e645f60 request medical report implementation completed. 9 months ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 9 months ago
haroon amjad 2de02102c2 profile settings update 9 months ago
aamir-csol e5488299b8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
#	lib/widgets/common_bottom_sheet.dart
9 months ago
aamir-csol 1335d3a7c8 family screen & widgets 9 months ago
faizatflutter 4cc4a7b0d9 merged main 9 months ago
faizatflutter 23942dc7bc Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
9 months ago
haroon amjad 6565ba719d Merge branch 'master' into haroon_dev 9 months ago
haroon amjad 1af2db5c09 patient profile settings page integration implementation contd. 9 months ago
tahaalam 51a4f83347 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_results/lab_result_details.dart
9 months ago
tahaalam 048f0bb459 graph design change 9 months ago
aamir-csol 060e7a8d68 Merge branch 'master' into dev_aamir 9 months ago
aamir-csol 288a0018ce family screen & widgets 9 months ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
9 months ago
haroon amjad 6b28b57307 empty state implementation contd. 9 months ago
tahaalam b05b03a6f6 divider changed 9 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 9 months ago
aamir-csol 36193d349c Merge remote-tracking branch 'origin/dev_sultan' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/medical_file/medical_file_view_model.dart
9 months ago
aamir-csol 02433e1bef family screen & widgets 9 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 9 months ago
Sultan khan e2188b5a69 switch family member with super user 9 months ago
faizatflutter dc16a684c5 Merge branch 'master' into faiz_dev 9 months ago
faizatflutter 94313b8870 Improved Error Handling 9 months ago
haroon amjad 918eb18b5f Region flow in select clinic implemented 9 months ago
haroon amjad a07369165d Updates 9 months ago
Sultan khan 318441c77f Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
aamir-csol 45a1ce9254 Merge branch 'master' into dev_aamir 9 months ago
haroon amjad f7e26da6f4 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad 344ecaba18 LiveCare Schedule implementation done 9 months ago
Sultan khan 3642523fdf Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/medical_file/medical_file_view_model.dart
9 months ago
Sikander Saleem 7c90d966c1 improvement 9 months ago
Sikander Saleem 604e503e52 flow improvement & translation added. 9 months ago
aamir-csol 9e8011c34c family screen & widgets 9 months ago
Sultan khan 3acd549de7 no message 9 months ago
aamir-csol 9b33745a57 Merge branch 'master' into dev_aamir 9 months ago
aamir-csol 47ce5022d3 family screen & widgets 9 months ago
haroon amjad b1af9e1779 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad a711d3a6dd LiveCare shcedule implementation contd. 9 months ago
Sikander Saleem c553876c8a Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem 96cc15a441 improvements. 9 months ago
Sikander Saleem c35c38aeb1 onboarding screen added. 9 months ago
aamir-csol 1b652f877d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
9 months ago
Sultan khan d5bd99f525 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
9 months ago
Haroon6138 938d95cb06 Merge pull request 'feature/search_by_region' (#55) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/55
9 months ago
aamir-csol 192d617350 family screen & widgets 9 months ago
aamir-csol e48e98d61b Merge branch 'master' into dev_aamir 9 months ago
Sultan khan 12447cdafb no message 9 months ago
Sultan khan 32c7608c83 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan 6d85227f11 lab order by test 9 months ago
taha.alam 8621a525a2 Merge remote-tracking branch 'origin/master' into feature/search_by_region 9 months ago
taha.alam 7093a26cb8 selection region arabic handling 9 months ago
taha.alam 27a0632d6d directional padding and alignment 9 months ago
taha.alam 92c3033087 Merge remote-tracking branch 'origin/master' into functionality/graph 9 months ago
taha.alam 5151997c7f custom linear added with parameters to customize the properties of graph 9 months ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
9 months ago
Sikander Saleem 005157fe5e Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/recharge_wallet_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/splashPage.dart
9 months ago
aamir-csol 1125437a56 family screen & widgets 9 months ago
Sikander Saleem 12cef74f16 splash animation added. 9 months ago
Sultan khan 3d1d78ba48 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan 8f8c4c7f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
9 months ago
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
aamir-csol f9bfc131a8 family screen & widgets 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 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 9 months ago
haroon amjad 3a649bca35 Merge branch 'master' into haroon_dev 9 months ago
aamir-csol 6f011880bd Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/authentication/authentication_view_model.dart
9 months ago
haroon amjad 9fbb8c3418 updates 9 months ago
aamir-csol 70810fa14c signup completed 9 months ago
aamir-csol 2b18e08e64 signup completed 9 months ago
aamir-csol 8c55064158 signup completed 9 months ago
haroon amjad 41ca0e27d9 updates 9 months ago
haroon amjad 1de551e799 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart
9 months ago
haroon amjad 28da6e0a2c updates 9 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
9 months ago
Sultan khan 301348518d Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan a5f64798e0 login fixes 9 months ago
Sikander Saleem c6a5b49af8 Merge branch 'refs/heads/master' into dev_sikander 9 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
9 months ago
haroon amjad 4269e99be9 updates 9 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
9 months ago
Sikander Saleem f9859036ef ui improvements. 9 months ago
Sikander Saleem 118c6717b1 report and logout actions button added. 9 months ago
Sultan khan 138862b115 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan 299c0b0e29 login flow complete 9 months ago
haroon amjad 8df38ea6d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/extensions/widget_extensions.dart
9 months ago
haroon amjad 01b6ab0e4b habib wallet implementation contd. 9 months ago
haroon amjad ccd29f0cf9 updates 9 months ago
Sikander Saleem 09e92b8649 Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem 50c3a8e595 collapsing list view added in lab results, search lab results, and shimmer skeleton added for loading 9 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
9 months ago
Sultan khan 1466b6b71a no message 9 months ago
aamir-csol 7dcc827721 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
9 months ago
aamir-csol cd48d83c07 signup 9 months ago
Haroon Amjad 6b2ec5aa2c updates, fixes & service privileges 9 months ago
Haroon Amjad 255b3c1565 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
9 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
9 months ago
Sultan khan 2a081e30b5 saved login done. 9 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 9 months ago
haroon amjad 851bd569b4 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/prescriptions/prescription_detail_page.dart
9 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 9 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
9 months ago
aamir-csol c129eb2c2f Merge branch 'master' into dev_aamir 9 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
9 months ago
aamir-csol ffb399c704 fixes for signup 9 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
9 months ago
Sultan khan a199ca040b quick login inprogress 9 months ago
aamir-csol 9b063ba764 fixes for signup 9 months ago
Sikander Saleem 7cc12bd1cf prescription calender reminder added. 9 months ago
Sikander Saleem 60fe32131e Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem dfe02917fc Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem d464721733 merge conflict fixed. 9 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 9 months ago
Haroon Amjad 003a161b52 custom chips implemented 9 months ago
haroon amjad f8be788a60 updates & fixes 9 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
9 months ago
Sikander Saleem cb4601050c prescription reminder bottom sheet added. 9 months ago
haroon amjad 542de41a82 updates & fixes 9 months ago
haroon amjad 2d0fc11f05 updates 9 months ago
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
9 months ago
aamir-csol 484ab56a8e fixes for signup 9 months ago
Sultan khan 7d5b941df3 merged conflict 9 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
9 months ago
Sultan khan ba2c8327fe login flow inprogress 9 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 9 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 9 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 9 months ago
Sultan khan 61d10068ca Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
aamir-csol 4e1912048d login flow completion 9 months ago
aamir-csol 52fddc5323 login flow completion 9 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
9 months ago
Sultan khan ac17202b7a search lab order updated. 9 months ago
Haroon Amjad 43fa08b8b6 insurance update update 9 months ago
haroon amjad d794787459 updates 9 months ago
faizatflutter b15ddd1713 completed till otp receiving 9 months ago
faizatflutter 36c41d40f8 Merge branch 'master' into faiz_dev 9 months ago
haroon amjad bafeb68950 medical file changes 9 months ago
faizatflutter 26f0ffda2c completed till otp receiving 9 months ago
faizatflutter 702c504d4e Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
#	pubspec.yaml
9 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
9 months ago
haroon amjad 2d5f2b1deb updates 9 months ago
Sikander Saleem 0db18c789c Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem d385d0362f merge changes 9 months ago
faizatflutter 923f7d7781 completed till otp receiving 9 months ago
faizatflutter 84804a59a7 completed till otp receiving 9 months ago
Sultan khan 3cafc16d50 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
9 months ago
Sikander Saleem 6473ccecb5 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
9 months ago
Haroon6138 24b98626d2 Merge pull request 'dev_aamir' (#8) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/8
9 months ago
aamir-csol c27d7301d9 calender & signup fixes. 9 months ago
Sultan khan 29aae34726 lab search added 9 months ago
haroon amjad 2f9fbaef7a insurance update implementation contd. 9 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
9 months ago
aamir-csol 3855ba276f calender & signup fixes. 9 months ago
haroon amjad 333b813f90 bottom sheet fixes 9 months ago
haroon amjad cce7c7166d Merge branch 'dev_sultan'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
9 months ago
haroon amjad e8cc6407b6 Insurance update implementation contd. 9 months ago
Sultan khan 2f2a8f3f8f search lab result screen added 9 months ago
Sikander Saleem ac0b7bec44 custom tab bar added in medical file section. 9 months ago
Sikander Saleem 85bb00a8fc Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem 38d37fd407 custom tab bar added. 9 months ago
haroon amjad efb22aec4e prescription details page implemented 9 months ago
aamir-csol e41ffd583d changes 9 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
9 months ago
aamir-csol 0309299f44 changes 9 months ago
faizatflutter 6e05ca15cf adding the login function 9 months ago
Haroon Amjad e8f8f6074c prescription details updates 9 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
9 months ago
aamir-csol 85fac13314 changes 9 months ago
Haroon Amjad cd61d08d49 Merge branch 'dev_sultan' 9 months ago
haroon amjad 712e11c69a prescription details page implementation contd. 9 months ago
Sultan khan 886825a4b9 bottom navigation updated. 9 months ago
faizatflutter 32fadb8ad9 completed login function 9 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 9 months ago
haroon amjad 6f07bc7c2c Radiology Orders implemented 9 months ago
haroon amjad 4c241b0dac Lab orders implemented 9 months ago
Sultan khan 0de09dd72c no message 9 months ago
Sultan khan 39c284d036 Merge remote-tracking branch 'origin/master' into dev_sultan
# Conflicts:
#	lib/presentation/home/landing_page.dart
9 months ago
Sultan khan f55d82ddb3 bottom navigation 9 months ago
Haroon Amjad 36c6f0d541 Landing page updates 9 months ago
Haroon Amjad 2b22e17743 android fixes 9 months ago
aamir-csol 7321da67e3 register step 2 & fixes 9 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
9 months ago
Haroon Amjad f5e655fd35 Lab order API implemented 9 months ago
Haroon Amjad a77fc49c68 lab result changes 9 months ago
haroon amjad e044fc8c5e lab implementation contd. 9 months ago
haroon amjad 89456bc2aa Medical File Insurance tab content done 9 months ago
faizatflutter 488636a13f Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
9 months ago
faizatflutter a0e5aeda05 Merge branch 'master' into faiz_dev1 9 months ago
faizatflutter 572fcef0f1 checkUserAuth 9 months ago
aamir-csol d1e1154bdb changes 9 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
9 months ago
aamir-csol 67e580447e changes 9 months ago
haroon amjad 9b1c3fe920 medical file updates 9 months ago
faizatflutter c6a95fe7d7 latest push after master merged 9 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
9 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 9 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 9 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 9 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 9 months ago
aamir-csol 5e292544d7 Merge remote-tracking branch 'origin/faiz_dev1' into dev_aamir
# Conflicts:
#	lib/main.dart
#	lib/presentation/authentication/register.dart
#	lib/providers/authentication_view_model.dart
9 months ago
faizatflutter 89e9323d9e merged master and updated structure 9 months ago
faizatflutter e2b0930dd1 Merge branch 'master' into faiz_dev1
# Conflicts:
#	ios/Podfile.lock
#	lib/core/app_state.dart
#	lib/main.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/home/landing_page.dart
#	pubspec.yaml
9 months ago
faizatflutter c1221e4970 pushed device api 9 months ago
aamir-csol 6f98690929 register & changes 9 months ago
Sultan khan 4e010bb2cf initial commit 9 months ago
aamir-csol 9c52a6122f 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
#	lib/presentation/authantication/login.dart
9 months ago
aamir-csol a4da9db6c3 register & changes 9 months ago
Haroon Amjad 0a39a00df5 Landing page updates 9 months ago
Sultan khan d3aff9f93d updating structure 9 months ago
aamir-csol 8ed8637108 Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	lib/presentation/authantication/login.dart
9 months ago
aamir-csol ea15bd9152 bottom sheet 9 months ago
Haroon Amjad 30fd99d122 android fixes 9 months ago
Sultan khan cbfb381615 Merge branch 'faiz_dev' into faiz_dev1
# Conflicts:
#	ios/Podfile.lock
#	lib/main.dart
#	lib/routes/app_routes.dart
#	pubspec.lock
9 months ago
faizatflutter 45e868adba pushed new API 9 months ago
aamir-csol 4d76b34608 app bar & chip 9 months ago
Faiz Hashmi 357cf4392e Updated architecture 9 months ago
aamir-csol 255d189ce1 widgets & fixes 9 months ago
aamir-csol 4e3ba99280 widgets & fixes 9 months ago
Faiz Hashmi d65dc4ea89 initial commit 10 months ago
Haroon Amjad 4fcaea2993 updates 10 months ago
Haroon Amjad c65d44ae4d updates 10 months ago
Haroon Amjad 2293db00ea updates 10 months ago
Haroon Amjad b6766654e0 initial commit 10 months ago