Haroon6138
|
ba211ea4c2
|
Merge pull request 'hospital_filter' (#141) from hospital_filter into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/141
|
2 weeks ago |
tahaalam
|
f19d06512a
|
filters changed in region selection bottom sheet
|
2 weeks ago |
Sultan khan
|
d62324044a
|
default appointment load fix
|
2 weeks ago |
aamir-csol
|
54f8391066
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
3 weeks ago |
aamir-csol
|
135b05e561
|
Health calculators & converters
|
3 weeks ago |
Sultan khan
|
366429f083
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
Health calculators & converters
Health calculators & converters
collapsing_list_view improvement
# Conflicts:
# lib/widgets/appbar/collapsing_list_view.dart
|
3 weeks ago |
haroon amjad
|
d8c7503c56
|
QLine API implementation enhancements
|
1 month ago |
Sultan khan
|
70d5b06987
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New: (45 commits)
Health Calculators
Smartwatch integration started
refactor
Complete UserInfo Selection Module
Complete UserInfo Selection Module
update
Complete USerInfo Selectoiun
Ancillary order fixes, QLine API integrated & other enhancements
Added user_info module IAP
Medical File page updates
Master merged
Services Page Revamp
loading view added
graph shaded region added from horizontal spaces
Refactoring
Appointment Queue implemented, Blood Donation implementation contd.
Integrated the API for Symptoms Checker
Queueing system screen implementation contd.
medical file changes
Added symptoms selector
...
# Conflicts:
# lib/features/authentication/authentication_repo.dart
# lib/features/my_appointments/my_appointments_repo.dart
# lib/features/my_appointments/my_appointments_view_model.dart
# lib/presentation/home/landing_page.dart
|
1 month ago |
Sultan khan
|
f28762a5c5
|
last appointment rated done.
|
1 month ago |
haroon amjad
|
2f26e12fd3
|
update
|
1 month ago |
haroon amjad
|
796aeb03d3
|
Ancillary order fixes, QLine API integrated & other enhancements
|
1 month ago |
haroon amjad
|
e72e67d9bf
|
Appointment Queue implemented, Blood Donation implementation contd.
|
1 month ago |
haroon amjad
|
581a4a5a74
|
WalkIn Appointment implementation done
|
1 month ago |
faizatflutter
|
95bd2a2a7e
|
CMC Tweaks Completed
|
2 months ago |
tahaalam
|
53be50b40c
|
Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
# lib/core/dependencies.dart
# lib/features/emergency_services/emergency_services_view_model.dart
# lib/presentation/appointments/widgets/appointment_doctor_card.dart
# lib/widgets/common_bottom_sheet.dart
|
2 months ago |
faizatflutter
|
617b68021a
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/api/api_client.dart
# lib/core/dependencies.dart
# lib/main.dart
# lib/presentation/appointments/appointment_payment_page.dart
|
2 months ago |
tahaalam
|
a669265076
|
Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
# lib/core/api/api_client.dart
# lib/core/dependencies.dart
# lib/features/emergency_services/emergency_services_repo.dart
# lib/features/emergency_services/emergency_services_view_model.dart
# lib/features/emergency_services/models/resp_model/EROnlineCheckInPaymentDetailsResponse.dart
# lib/main.dart
# lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
# lib/presentation/emergency_services/call_ambulance/widgets/HospitalBottomSheetBody.dart
# lib/presentation/emergency_services/call_ambulance/widgets/type_selection_widget.dart
# lib/presentation/emergency_services/emergency_services_page.dart
# lib/widgets/input_widget.dart
|
2 months ago |
haroon amjad
|
14f57027f4
|
Eye measurements done
|
2 months ago |
haroon amjad
|
c600b0ee7a
|
Ask doctor implemented
|
2 months ago |
haroon amjad
|
21b7b32013
|
Ask doctor implementation contd.
|
2 months ago |
faizatflutter
|
100d4bda9f
|
Completed Ancillary flow with CardPayments
|
2 months ago |
tahaalam
|
1ca39e1332
|
Ambulance order screens and geocoding request added
|
2 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 |
tahaalam
|
d9796154dc
|
Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
# lib/presentation/book_appointment/select_clinic_page.dart
|
3 months ago |
tahaalam
|
baf7cf0ea0
|
dental routing fixed and laser exception removed
|
3 months ago |
haroon amjad
|
e1ac77855c
|
Merge branch 'master' into haroon_dev
|
3 months ago |
tahaalam
|
ea92a0c75c
|
laser appointment screen added
|
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
|
9d48a00b21
|
Merge branch 'master' into haroon_dev
|
3 months ago |
haroon amjad
|
f1a60a9dfb
|
updates
|
3 months ago |
tahaalam
|
61007302c9
|
appointment date filter handled
|
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 |
tahaalam
|
6cf08c04d2
|
appointment filters added.
|
3 months ago |
haroon amjad
|
8291e89ee7
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/book_appointment/select_clinic_page.dart
|
3 months ago |
tahaalam
|
bbf83d4dc9
|
bottom handled when dental and laser clinic is selected from clinic page
|
3 months ago |
haroon amjad
|
db979977ca
|
Tamara implementation & enhancements
|
3 months ago |
Haroon Amjad
|
8bb0e495cc
|
request medical report implementation contd.
|
4 months ago |
Haroon Amjad
|
62e82a7a31
|
Empty data state implementation contd.
|
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 |
taha.alam
|
7093a26cb8
|
selection region arabic handling
|
4 months ago |
haroon amjad
|
3b5d2d27a4
|
Updates
|
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 |
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 |