 tahaalam
|
57056e67f3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/widgets/buttons/custom_button.dart
|
10 months ago |
|
tahaalam
|
90128a812b
|
call ambulance module design added.
|
10 months ago |
faizatflutter
|
72d765e508
|
Design Updates
|
10 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
|
10 months ago |
|
faizatflutter
|
462f4eba14
|
Design Updates
|
10 months ago |
 haroon amjad
|
4b52862ba0
|
updates
|
10 months ago |
|
faizatflutter
|
eabfaf8182
|
Design Updates
|
10 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
|
10 months ago |
|
haroon amjad
|
1f7a941aa0
|
RRT Services implementation contd.
|
10 months ago |
|
tahaalam
|
47d158c1e2
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
tahaalam
|
c146747e5e
|
nearest er clinic repo viewmodel and view added
|
10 months ago |
|
tahaalam
|
d9796154dc
|
Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
# lib/presentation/book_appointment/select_clinic_page.dart
|
10 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
|
10 months ago |
|
haroon amjad
|
d693850ef4
|
ER services implementation contd.
|
10 months ago |
|
tahaalam
|
baf7cf0ea0
|
dental routing fixed and laser exception removed
|
10 months ago |
|
tahaalam
|
9e3035f02b
|
units added to lab result and it graph and unwanted values removed from graph
|
10 months ago |
|
haroon amjad
|
e1ac77855c
|
Merge branch 'master' into haroon_dev
|
10 months ago |
|
tahaalam
|
ea92a0c75c
|
laser appointment screen added
|
10 months ago |
|
haroon amjad
|
663eda0076
|
updates & fixes
|
10 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
|
10 months ago |
|
haroon amjad
|
25fa1acc9e
|
Medical file widgets, Insurance approval implementation contd.
|
10 months ago |
aamir-csol
|
24362f67cb
|
family screen & widgets
|
10 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
|
11 months ago |
|
aamir-csol
|
d918b6e464
|
family screen & widgets
|
11 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
|
11 months ago |
|
tahaalam
|
61007302c9
|
appointment date filter handled
|
11 months ago |
|
tahaalam
|
e5dcabacce
|
lab prescription details are added andgraph visibility added to the graph page for result that are IRR
|
11 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
|
11 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
|
11 months ago |
|
tahaalam
|
6cf08c04d2
|
appointment filters added.
|
11 months ago |
|
haroon amjad
|
3d64ddf78b
|
Merge branch 'master' into haroon_dev
|
11 months ago |
|
haroon amjad
|
db979977ca
|
Tamara implementation & enhancements
|
11 months ago |
|
tahaalam
|
641df8b51b
|
logs removed
|
11 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
|
11 months ago |
|
haroon amjad
|
8166369f85
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
# lib/widgets/input_widget.dart
|
11 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
|
11 months ago |
|
tahaalam
|
6ef9ae813d
|
doctors search filter added
|
11 months ago |
|
haroon amjad
|
10b77206f6
|
Immediate LiveCare consultation implementation contd.
|
11 months ago |
|
tahaalam
|
da89c41925
|
lab result by hospital and translations are added
|
11 months ago |
|
haroon amjad
|
093e645f60
|
request medical report implementation completed.
|
11 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
|
11 months ago |
|
faizatflutter
|
23942dc7bc
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/api/api_client.dart
|
11 months ago |
|
tahaalam
|
51a4f83347
|
Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
# lib/presentation/lab/lab_results/lab_result_details.dart
|
11 months ago |
|
tahaalam
|
048f0bb459
|
graph design change
|
11 months ago |
|
aamir-csol
|
060e7a8d68
|
Merge branch 'master' into dev_aamir
|
11 months ago |
|
haroon amjad
|
5f43063f2d
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
|
11 months ago |
|
tahaalam
|
512628fb8b
|
Lab result view along with the listing of items is added
|
11 months ago |
Haroon Amjad
|
62e82a7a31
|
Empty data state implementation contd.
|
11 months ago |
|
faizatflutter
|
dc16a684c5
|
Merge branch 'master' into faiz_dev
|
11 months ago |
|
faizatflutter
|
94313b8870
|
Improved Error Handling
|
11 months ago |