 Haroon6138
|
97959f7f28
|
Merge pull request 'haroon_dev' (#83) from haroon_dev into master
Reviewed-on: #83
|
3 weeks ago |
|
haroon amjad
|
d755eb0df8
|
contd.
|
3 weeks 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 weeks ago |
|
haroon amjad
|
d693850ef4
|
ER services implementation contd.
|
3 weeks ago |
|
Haroon6138
|
080b2327ef
|
Merge pull request 'files and packages renamed' (#81) from feature/lab_result into master
Reviewed-on: #81
|
3 weeks ago |
 tahaalam
|
a7bd5f61cb
|
Merge remote-tracking branch 'origin/master' into feature/lab_result
|
3 weeks ago |
|
tahaalam
|
9e3035f02b
|
units added to lab result and it graph and unwanted values removed from graph
|
3 weeks ago |
|
haroon amjad
|
7a35f0ded6
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
3 weeks ago |
|
Haroon6138
|
5227fa6b58
|
Merge pull request 'family screen add fixes & remove & switch & widgets' (#79) from dev_aamir into master
Reviewed-on: #79
|
3 weeks ago |
|
haroon amjad
|
5e1a7652be
|
lab report download implemented
|
3 weeks ago |
|
tahaalam
|
773cc9229b
|
Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
3 weeks ago |
|
tahaalam
|
cc458b2ec7
|
files and packages renamed
|
3 weeks ago |
|
tahaalam
|
81a6c7d034
|
files and packages renamed
|
3 weeks ago |
|
haroon amjad
|
e1ac77855c
|
Merge branch 'master' into haroon_dev
|
3 weeks ago |
|
Haroon6138
|
51d225e206
|
Merge pull request 'laser appointment screen added' (#78) from laser_appointment into master
Reviewed-on: #78
|
3 weeks 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: #80
|
3 weeks ago |
|
tahaalam
|
ab74a61969
|
lab severity values handled and size of lab description fixed
|
3 weeks ago |
|
haroon amjad
|
1e08394ba1
|
Lab report PDF implementation contd.
|
3 weeks ago |
aamir-csol
|
bf8f98ffb1
|
family screen add fixes & remove & switch & widgets
|
3 weeks ago |
|
tahaalam
|
ea92a0c75c
|
laser appointment screen added
|
3 weeks ago |
|
haroon amjad
|
a2310e1447
|
prescription instructions PDF implemented
|
3 weeks ago |
|
haroon amjad
|
663eda0076
|
updates & fixes
|
3 weeks ago |
|
haroon amjad
|
fe5b6c35ac
|
insurance approval implementation done
|
3 weeks ago |
|
Haroon6138
|
c1b88a958f
|
Merge pull request 'haroon_dev' (#77) from haroon_dev into master
Reviewed-on: #77
|
3 weeks 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 weeks ago |
|
Haroon6138
|
215f3f3335
|
Merge pull request 'dev_aamir' (#76) from dev_aamir into master
Reviewed-on: #76
|
3 weeks ago |
|
haroon amjad
|
25fa1acc9e
|
Medical file widgets, Insurance approval implementation contd.
|
3 weeks ago |
|
aamir-csol
|
24362f67cb
|
family screen & widgets
|
3 weeks ago |
|
haroon amjad
|
77b4f28291
|
Merge branch 'master' into haroon_dev
|
4 weeks 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
|
4 weeks ago |
|
aamir-csol
|
d918b6e464
|
family screen & widgets
|
4 weeks ago |
|
haroon amjad
|
8ff5566f0b
|
dependencies update
|
4 weeks ago |
|
Haroon6138
|
0eaa50dcb3
|
Merge pull request 'haroon_dev' (#75) from haroon_dev into master
Reviewed-on: #75
|
4 weeks ago |
|
haroon amjad
|
9d48a00b21
|
Merge branch 'master' into haroon_dev
|
4 weeks ago |
|
Haroon6138
|
3bbc014251
|
Merge pull request 'appointment date filter handled' (#74) from appointment_filter into master
Reviewed-on: #74
|
4 weeks ago |
|
Haroon6138
|
a4dc0648e8
|
Merge pull request 'lab prescription details are added andgraph visibility added to the graph page for result that are IRR' (#73) from feature/lab_result into master
Reviewed-on: #73
|
4 weeks ago |
|
haroon amjad
|
f1a60a9dfb
|
updates
|
4 weeks ago |
|
tahaalam
|
61007302c9
|
appointment date filter handled
|
4 weeks ago |
|
tahaalam
|
e5dcabacce
|
lab prescription details are added andgraph visibility added to the graph page for result that are IRR
|
4 weeks ago |
|
haroon amjad
|
d220be7283
|
Tamara payment flow done
|
4 weeks ago |
|
haroon amjad
|
30eb8bf5de
|
dental booking flow implemented
|
4 weeks ago |
|
Haroon6138
|
a661448d27
|
Merge pull request 'haroon_dev' (#72) from haroon_dev into master
Reviewed-on: #72
|
4 weeks 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
|
4 weeks ago |
|
Haroon6138
|
6e24698031
|
Merge pull request 'appointment filters added.' (#71) from appointment_filter into master
Reviewed-on: #71
|
4 weeks ago |
|
haroon amjad
|
b05e4e2a15
|
Dental appointment booking flow implementation contd.
|
4 weeks ago |
|
haroon amjad
|
2b21086cc1
|
Dental appointment booking flow implementation contd.
|
4 weeks 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
|
4 weeks ago |
|
tahaalam
|
6cf08c04d2
|
appointment filters added.
|
4 weeks ago |
|
Haroon6138
|
156d7b4834
|
Merge pull request 'id selection from the appropiate list' (#70) from feature/search_by_region into master
Reviewed-on: #70
|
4 weeks ago |
|
haroon amjad
|
415c0eb3c7
|
Dental appointment booking implementation contd.
|
4 weeks ago |