aamir-csol
|
e113c4c1ee
|
updates & fixes & RRT Flow
|
3 months ago |
aamir-csol
|
8123981092
|
Merge branch 'master' 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
|
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
|
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
|
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 |
haroon amjad
|
e1ac77855c
|
Merge branch 'master' into haroon_dev
|
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
|
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
|
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 |
haroon amjad
|
415c0eb3c7
|
Dental appointment booking implementation contd.
|
3 months ago |
haroon amjad
|
8291e89ee7
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/book_appointment/select_clinic_page.dart
|
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
|
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 |
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
|
1d22e53f63
|
Merge branch 'master' into haroon_dev
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
# lib/presentation/medical_file/medical_file_page.dart
|
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 |
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
|
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
|
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
|
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 |
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 |
aamir-csol
|
9e8011c34c
|
family screen & widgets
|
4 months ago |
Sultan khan
|
3acd549de7
|
no message
|
4 months ago |
aamir-csol
|
47ce5022d3
|
family screen & widgets
|
4 months ago |
haroon amjad
|
a711d3a6dd
|
LiveCare shcedule implementation contd.
|
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 |
Sultan khan
|
6d85227f11
|
lab order by test
|
4 months ago |
taha.alam
|
7093a26cb8
|
selection region arabic handling
|
4 months ago |
aamir-csol
|
e5f4da4e16
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
4 months ago |
aamir-csol
|
1125437a56
|
family screen & widgets
|
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
|
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 |