Commit Graph

597 Commits (e9dd2f064890734d62c8c777fa03f06f83e5725f)

Author SHA1 Message Date
haroon amjad 487b29fec3 Merge branch 'master' into haroon_dev 3 months ago
aamir-csol 6f01f92dd0 Merge remote-tracking branch 'origin/faiz_dev' into dev_aamir 3 months ago
aamir-csol 02ae79c458 Merge branch 'refs/heads/master' into dev_aamir 3 months ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
3 months ago
tahaalam 90128a812b call ambulance module design added. 3 months ago
faizatflutter 3e61df218b Some Minor design updated 3 months ago
haroon amjad 65220270c2 Size utils & fixes 3 months ago
haroon amjad 3c81cffa75 Merge branch 'master' into haroon_dev 3 months ago
haroon amjad 8a6f94cc1d updates 3 months ago
faizatflutter 72d765e508 Design Updates 3 months ago
faizatflutter 21be3a2d06 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
#	lib/widgets/buttons/custom_button.dart
#	lib/widgets/common_bottom_sheet.dart
#	lib/widgets/input_widget.dart
3 months ago
faizatflutter 462f4eba14 Design Updates 3 months ago
haroon amjad 4b52862ba0 updates 3 months ago
faizatflutter eabfaf8182 Design Updates 3 months ago
haroon amjad 1c3ed8f2e1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
3 months ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 3 months ago
tahaalam d480798053 location dennied forever handled and error builder added to the image network 3 months ago
tahaalam 47d158c1e2 Merge remote-tracking branch 'origin/master' 3 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 3 months ago
tahaalam d9796154dc Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
3 months ago
haroon amjad d755eb0df8 contd. 3 months ago
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
3 months ago
haroon amjad d693850ef4 ER services implementation contd. 3 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 3 months ago
tahaalam a7bd5f61cb Merge remote-tracking branch 'origin/master' into feature/lab_result 3 months ago
tahaalam 9e3035f02b units added to lab result and it graph and unwanted values removed from graph 3 months ago
aamir-csol 58e65e7a64 Merge branch 'master' into dev_aamir 3 months ago
aamir-csol cd81372fc6 family screen add fixes & remove & switch & widgets 3 months ago
haroon amjad 7a35f0ded6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
3 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
3 months ago
haroon amjad 5e1a7652be lab report download implemented 3 months ago
tahaalam 773cc9229b Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
3 months ago
tahaalam cc458b2ec7 files and packages renamed 3 months ago
tahaalam 81a6c7d034 files and packages renamed 3 months ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 3 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
3 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
3 months ago
tahaalam ab74a61969 lab severity values handled and size of lab description fixed 3 months ago
haroon amjad 1e08394ba1 Lab report PDF implementation contd. 3 months ago
aamir-csol bf8f98ffb1 family screen add fixes & remove & switch & widgets 3 months ago
tahaalam ea92a0c75c laser appointment screen added 3 months ago
haroon amjad a2310e1447 prescription instructions PDF implemented 3 months ago
haroon amjad 663eda0076 updates & fixes 3 months ago
haroon amjad fe5b6c35ac insurance approval implementation done 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 8ff5566f0b dependencies update 3 months ago
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 3 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
3 months ago
haroon amjad f1a60a9dfb updates 3 months ago
tahaalam 61007302c9 appointment date filter handled 3 months ago
tahaalam e5dcabacce lab prescription details are added andgraph visibility added to the graph page for result that are IRR 3 months ago
haroon amjad d220be7283 Tamara payment flow done 3 months ago
haroon amjad 30eb8bf5de dental booking flow implemented 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
haroon amjad b05e4e2a15 Dental appointment booking flow implementation contd. 3 months ago
haroon amjad 2b21086cc1 Dental appointment booking flow implementation contd. 3 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
3 months ago
tahaalam 6cf08c04d2 appointment filters added. 3 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
3 months ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 3 months ago
tahaalam 35e145ddf9 id selection from the appropiate list 3 months ago
haroon amjad 8291e89ee7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
3 months ago
haroon amjad 903248133e Lab order & results enhancements 3 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
3 months ago
tahaalam bbf83d4dc9 bottom handled when dental and laser clinic is selected from clinic page 3 months ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 3 months ago
haroon amjad db979977ca Tamara implementation & enhancements 3 months ago
tahaalam 641df8b51b logs removed 3 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
3 months ago
tahaalam 42abf9ca1b login bypass removed 3 months ago
tahaalam 2e9a462a1c listing resizing if the data is in small numbers. 3 months ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
3 months ago
haroon amjad 5e000db556 updates 3 months ago
tahaalam 786aa05b19 doctor list handled to be cleared when going back 4 months ago
tahaalam a4a32cca44 doctor filter icon removed from the doctor listing from clininc 4 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
4 months ago
haroon amjad 8a7f46441c updates 4 months ago
tahaalam 6ef9ae813d doctors search filter added 4 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 4 months ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 4 months ago
tahaalam da89c41925 lab result by hospital and translations are added 4 months ago
haroon amjad 2f4d6f5553 immediate livecare consultation implementation contd. 4 months ago
haroon amjad 093e645f60 request medical report implementation completed. 4 months ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 4 months ago
haroon amjad 2de02102c2 profile settings update 4 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
4 months ago
aamir-csol 1335d3a7c8 family screen & widgets 4 months ago
faizatflutter 4cc4a7b0d9 merged main 4 months ago
faizatflutter 23942dc7bc Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
4 months ago
haroon amjad 6565ba719d Merge branch 'master' into haroon_dev 4 months ago
haroon amjad 1af2db5c09 patient profile settings page integration implementation contd. 4 months ago
tahaalam 51a4f83347 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_results/lab_result_details.dart
4 months ago
tahaalam 048f0bb459 graph design change 4 months ago
aamir-csol 060e7a8d68 Merge branch 'master' into dev_aamir 4 months ago
aamir-csol 288a0018ce family screen & widgets 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 b05b03a6f6 divider changed 4 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 4 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
4 months ago
aamir-csol 02433e1bef family screen & widgets 4 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 4 months ago
Sultan khan e2188b5a69 switch family member with super user 4 months ago
faizatflutter dc16a684c5 Merge branch 'master' into faiz_dev 4 months ago
faizatflutter 94313b8870 Improved Error Handling 4 months ago
haroon amjad 918eb18b5f Region flow in select clinic implemented 4 months ago
haroon amjad a07369165d Updates 4 months ago
Sultan khan 318441c77f Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
aamir-csol 45a1ce9254 Merge branch 'master' into dev_aamir 4 months ago
haroon amjad f7e26da6f4 Merge branch 'master' into haroon_dev 4 months ago
haroon amjad 344ecaba18 LiveCare Schedule implementation done 4 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
4 months ago
Sikander Saleem 7c90d966c1 improvement 4 months ago
Sikander Saleem 604e503e52 flow improvement & translation added. 4 months ago
aamir-csol 9e8011c34c family screen & widgets 4 months ago
Sultan khan 3acd549de7 no message 4 months ago
aamir-csol 9b33745a57 Merge branch 'master' into dev_aamir 4 months ago
aamir-csol 47ce5022d3 family screen & widgets 4 months ago
haroon amjad b1af9e1779 Merge branch 'master' into haroon_dev 4 months ago
haroon amjad a711d3a6dd LiveCare shcedule implementation contd. 4 months ago
Sikander Saleem c553876c8a Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem 96cc15a441 improvements. 4 months ago
Sikander Saleem c35c38aeb1 onboarding screen added. 4 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
4 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
4 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
4 months ago
aamir-csol 192d617350 family screen & widgets 4 months ago
aamir-csol e48e98d61b Merge branch 'master' into dev_aamir 4 months ago
Sultan khan 12447cdafb no message 4 months ago
Sultan khan 32c7608c83 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan 6d85227f11 lab order by test 4 months ago
taha.alam 8621a525a2 Merge remote-tracking branch 'origin/master' into feature/search_by_region 4 months ago
taha.alam 7093a26cb8 selection region arabic handling 4 months ago
taha.alam 27a0632d6d directional padding and alignment 4 months ago
taha.alam 92c3033087 Merge remote-tracking branch 'origin/master' into functionality/graph 4 months ago
taha.alam 5151997c7f custom linear added with parameters to customize the properties of graph 4 months ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
4 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
4 months ago
aamir-csol 1125437a56 family screen & widgets 4 months ago
Sikander Saleem 12cef74f16 splash animation added. 4 months ago
Sultan khan 3d1d78ba48 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 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
4 months ago
haroon amjad 836a72ec22 App directionality changes 4 months ago
haroon amjad 97038f1a25 advance payment implementation done for self & other file number 4 months ago
haroon amjad 3e95999bf3 Merge branch 'master' into haroon_dev 4 months ago
aamir-csol f9bfc131a8 family screen & widgets 4 months ago
Haroon Amjad 1c2564a1e2 updates 4 months ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 4 months ago
aamir-csol a79dcad221 family screen & widgets 4 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
4 months ago
Sultan khan 5ce7548656 family file work-in-progress 4 months ago
aamir-csol 8240d3e78d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/authentication/register_step2.dart
4 months ago
Haroon Amjad a4854bbe4a Habib Wallet updates 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 bdde6c224d Merge branch 'master' into haroon_dev 4 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
4 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
4 months ago
Haroon Amjad c9206f1ab8 Radiology report implemented 4 months ago
haroon amjad 3b5d2d27a4 Updates 4 months ago
Sultan khan 467f10e952 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan 0a653a61f2 family file bottomsheet added 4 months ago
taha.alam 4473145c00 on success block added to the hms location block 4 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. 4 months ago
aamir-csol 17c47d093c otp screen & register Uae & resend Activation Code. 4 months ago
Sikander Saleem 2584e6cc6e route animation improvement. 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 2961583414 update 4 months ago
Sikander Saleem bb0ac4a0fe Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem c96081d07c reverse animation time changed to 500ms. 4 months ago
Sultan khan 030c2a1b8a Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan eafb52ab86 family file work in-progress 4 months ago
haroon amjad 928a056cbc Merge branch 'master' into haroon_dev 4 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
4 months ago
haroon amjad 5e81ba1ed8 updates 4 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
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
aamir-csol 2b7656d83a otp screen & register Uae & resend Activation Code. 4 months ago
taha.alam 265d979b48 drilled the lat and lng parameter form viewmodel to the mapper 4 months ago
aamir-csol 3ddd7781cd Merge branch 'master' into dev_aamir 4 months ago
haroon amjad c191fd0be1 updates 4 months ago
Sikander Saleem f04f3bcd9c Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem c00e69ef0c profile wallet linked with view model. 4 months ago
taha.alam 55c51f5742 Merge remote-tracking branch 'origin/master' into feature/search_by_region 4 months ago
taha.alam 033ae12499 api handling for clinic and doctor parameters and state management 4 months ago
aamir-csol 3b1b51ef6f otp screen & register Uae & resend Activation Code. 4 months ago
Sikander Saleem c83754fc4a user profile welcome widget improvement. 4 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
4 months ago
Sikander Saleem 8f0e910e4f profile and settings ui completed. 4 months ago
Sultan khan fe36c2a1c1 auto sms 4 months ago
aamir-csol 28a95959e0 Merge branch 'master' into dev_aamir 4 months ago
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 4 months ago
haroon amjad 3ab2546d10 merge fixes 4 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
4 months ago
haroon amjad 5de5fc8be9 updates 4 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
4 months ago
taha.alam de6e0e3704 data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo 4 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
4 months ago
aamir-csol 15c07cb4e2 otp screen & register Uae & resend Activation Code. 4 months ago
haroon amjad 71a07eed8e Merge branch 'master' into haroon_dev 4 months ago
taha.alam ea2d2bf40f retaining the old data. 4 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
4 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 4 months ago
taha.alam 9c2dd721b4 bottom sheets added of region facitlity and hospital. 4 months ago
haroon amjad f9e7c8988a updates 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
Sultan khan 286dfaa376 no message 4 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
4 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 4 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 4 months ago
Sultan khan 009fa1859e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan fdd5d4cf6d fixes 4 months ago
aamir-csol 21a9cc8c89 otp screen & register Uae & resend Activation Code. 4 months ago
Haroon Amjad 2aa84e0334 book appointment implementation contd. 4 months ago
haroon amjad 6f745f3666 calendar implementation contd. 4 months ago
aamir-csol 87830e17ab otp screen 4 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
4 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
4 months ago
haroon amjad 7476c8e55a book appo implementation contd. 4 months ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 4 months ago
Sikander Saleem a25f42a43d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	pubspec.yaml
4 months ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 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 14725616c6 medical report implementation contd. 4 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 4 months ago
Haroon Amjad b240293064 medical file implementation contd. 4 months ago
haroon amjad 1c39b26fcc Merge branch 'master' into haroon_dev 4 months ago
haroon amjad 151351c0bf medical file updates 4 months ago
aamir-csol 7c8d7b67a9 signup finalize 4 months ago
aamir-csol b7e19a0af8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
4 months ago
aamir-csol 0c58c22ea5 sign 4 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 4 months ago
haroon amjad d87562caf5 updates 4 months ago
haroon amjad 3a649bca35 Merge branch 'master' into haroon_dev 4 months ago
aamir-csol 6f011880bd Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/authentication/authentication_view_model.dart
4 months ago
haroon amjad 9fbb8c3418 updates 4 months ago
aamir-csol 70810fa14c signup completed 4 months ago
aamir-csol 2b18e08e64 signup completed 4 months ago
aamir-csol 8c55064158 signup completed 4 months ago
haroon amjad 41ca0e27d9 updates 4 months ago
haroon amjad 1de551e799 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart
4 months ago
haroon amjad 28da6e0a2c updates 4 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
4 months ago
Sultan khan 301348518d Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago