Fatimah.Alshammari
|
f3674ba06f
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/hmg_services/services_page.dart
# lib/routes/app_routes.dart
|
2 months ago |
Sultan khan
|
40638cfec4
|
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:
collapsing_list_view improvement
Updated design for HHC
updates & fixes
QLine API implementation enhancements
LiveCare flow from clinic selection implemented
# Conflicts:
# lib/presentation/home/landing_page.dart
|
2 months ago |
Fatimah.Alshammari
|
68f044de52
|
added monthly report
|
2 months ago |
faizatflutter
|
fd2abbbc7b
|
Water Intake Design completed
|
2 months ago |
haroon amjad
|
87fd9a42b7
|
Nearest Appointment selected
|
2 months ago |
faizatflutter
|
94668997aa
|
Updated design for HHC
|
2 months ago |
haroon amjad
|
d8c7503c56
|
QLine API implementation enhancements
|
2 months ago |
Fatimah.Alshammari
|
c9de23347a
|
fix error
|
2 months ago |
Fatimah.Alshammari
|
190492a191
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/routes/app_routes.dart
|
2 months ago |
Fatimah.Alshammari
|
3d8daeb58d
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/app_assets.dart
# lib/core/dependencies.dart
# lib/core/utils/calendar_utils.dart
# lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart
# lib/main.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/hmg_services/services_view.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
# lib/theme/colors.dart
# pubspec.yaml
|
2 months 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
|
2 months ago |
Fatimah.Alshammari
|
0b3fea230f
|
monthly report
|
2 months ago |
haroon amjad
|
d202aa8423
|
Smartwatch integration started
|
2 months ago |
haroon amjad
|
ff98262cf7
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
|
2 months ago |
Sultan khan
|
f28762a5c5
|
last appointment rated done.
|
2 months ago |
faizatflutter
|
6f72c99975
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
# lib/theme/colors.dart
|
2 months ago |
faizatflutter
|
fbe124f6ee
|
Complete UserInfo Selection Module
|
2 months ago |
haroon amjad
|
2f26e12fd3
|
update
|
2 months ago |
faizatflutter
|
cf26e71645
|
Complete USerInfo Selectoiun
|
2 months ago |
haroon amjad
|
796aeb03d3
|
Ancillary order fixes, QLine API integrated & other enhancements
|
2 months ago |
faizatflutter
|
c7c0a0ac09
|
Added user_info module IAP
|
2 months ago |
haroon amjad
|
7cdb30a364
|
Merge branch 'master' into haroon_dev
|
2 months ago |
haroon amjad
|
a83a35a284
|
Services Page Revamp
|
2 months ago |
tahaalam
|
2125e30c23
|
Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
2 months ago |
tahaalam
|
95243c250f
|
graph shaded region added from horizontal spaces
|
2 months ago |
faizatflutter
|
34f4cd4f91
|
Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
# lib/widgets/appbar/collapsing_list_view.dart
|
2 months ago |
faizatflutter
|
9410ad9b60
|
Refactoring
|
2 months ago |
haroon amjad
|
e72e67d9bf
|
Appointment Queue implemented, Blood Donation implementation contd.
|
2 months ago |
faizatflutter
|
2ffd4cc1ae
|
Integrated the API for Symptoms Checker
|
2 months ago |
haroon amjad
|
ca47315b2c
|
Merge branch 'master' into haroon_dev
|
2 months ago |
aamir-csol
|
f91f8e63d7
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/medical_file/widgets/lab_rad_card.dart
|
2 months ago |
faizatflutter
|
e35fe9ac05
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/routes/app_routes.dart
# lib/widgets/appbar/collapsing_list_view.dart
|
2 months ago |
faizatflutter
|
2173d091ed
|
Added symptoms selector
|
2 months ago |
tahaalam
|
ac15ab26f5
|
graph changes for high and low
|
2 months ago |
haroon amjad
|
3185d1e9e7
|
Allergies list implemented
|
2 months ago |
haroon amjad
|
b37804d012
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/features/prescriptions/prescriptions_view_model.dart
# lib/presentation/appointments/appointment_details_page.dart
|
2 months ago |
Haroon6138
|
88039534e2
|
Merge pull request 'Calendar reminder added for both prescription and appointment.' (#105) from calender_reminder into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/105
|
2 months ago |
haroon amjad
|
581a4a5a74
|
WalkIn Appointment implementation done
|
2 months ago |
aamir-csol
|
0f17a655ed
|
Merge branch 'master' into dev_aamir
# Conflicts:
# ios/Runner/AppDelegate.swift
# lib/core/dependencies.dart
# lib/core/utils/utils.dart
# lib/features/emergency_services/emergency_services_view_model.dart
# lib/presentation/authentication/quick_login.dart
# lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
# lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
# lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
# lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
# lib/presentation/emergency_services/emergency_services_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/my_family/widget/family_cards.dart
# lib/widgets/appbar/collapsing_list_view.dart
# lib/widgets/common_bottom_sheet.dart
|
2 months ago |
haroon amjad
|
2b7379c1c3
|
Waiting appointment implementation in progress
|
2 months ago |
haroon amjad
|
36bf63dcde
|
Incoming call updates
|
2 months ago |
faizatflutter
|
ac84d268e9
|
triage design
|
2 months ago |
Sultan khan
|
ddac155a6a
|
silent login case handled.
|
2 months ago |
tahaalam
|
e0e41d1900
|
calender reminder added on appointment and pescription
|
2 months ago |
haroon amjad
|
5a1c58e6b2
|
Merge branch 'master' into haroon_dev
|
2 months ago |
haroon amjad
|
1e5744cf44
|
Updates & enhancements
|
2 months ago |
faizatflutter
|
acb6d31ff3
|
Added possible conditions screen
|
3 months ago |
Fatimah.Alshammari
|
86a91ab383
|
Merge branch 'refs/heads/master' into fatima
|
3 months ago |
Sultan khan
|
9e0336687c
|
virtual tour.
|
3 months ago |
faizatflutter
|
757ace2ba1
|
Added Organ Selector
|
3 months ago |
Sultan khan
|
a4d3bb3533
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
3 months ago |
Sultan khan
|
fb69723a65
|
e-referral done.
|
3 months ago |
haroon amjad
|
32adf754ce
|
prescription delivery implemented
|
3 months ago |
haroon amjad
|
9fd7f71a34
|
prescription delivery implementation contd
|
3 months ago |
Haroon Amjad
|
bad76059c0
|
prescription delivery implementation contd.
|
3 months ago |
haroon amjad
|
b90883a596
|
prescription order implementation contd.
|
3 months ago |
haroon amjad
|
1be430aa76
|
Merge branch 'master' into haroon_dev
|
3 months ago |
haroon amjad
|
fee84a2928
|
Nearest appointment implemented
|
3 months ago |
tahaalam
|
5983caf83a
|
single map screen added to the project for multiple place usage
|
3 months ago |
Sultan khan
|
5f047e1b6f
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/core/api_consts.dart
# lib/features/hmg_services/hmg_services_repo.dart
# lib/features/hmg_services/hmg_services_view_model.dart
# lib/presentation/emergency_services/call_ambulance/widgets/pickup_location.dart
|
3 months ago |
Sultan khan
|
d8a9d8443a
|
e-referral work done search-referral in progress.
|
3 months ago |
Fatimah.Alshammari
|
89ff10f506
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/theme/colors.dart
|
3 months ago |
haroon amjad
|
63d844a5e9
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/api/api_client.dart
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/features/radiology/radiology_view_model.dart
# lib/presentation/appointments/appointment_details_page.dart
# lib/presentation/emergency_services/history/widget/ambulance_history_item.dart
# lib/presentation/emergency_services/history/widget/rrt_item.dart
|
3 months ago |
faizatflutter
|
91e3e9387e
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/features/emergency_services/emergency_services_view_model.dart
|
3 months ago |
haroon amjad
|
c03c84287c
|
Appointment details Lab & radiology integration implemented
|
3 months ago |
faizatflutter
|
8ddfdeeac4
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/api/api_client.dart
# lib/core/app_assets.dart
# lib/core/utils/date_util.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
# lib/widgets/common_bottom_sheet.dart
|
3 months ago |
faizatflutter
|
fe00447483
|
HHC in Progress
|
3 months ago |
tahaalam
|
224463feb4
|
closing the login first dialog
|
3 months ago |
tahaalam
|
8f46dddbd6
|
terms and condition added to the rrt module.
|
3 months ago |
haroon amjad
|
ffca4317aa
|
updates
|
3 months ago |
faizatflutter
|
95bd2a2a7e
|
CMC Tweaks Completed
|
3 months ago |
tahaalam
|
f3676f5596
|
ui issues resolve for ambulance and rrt request
|
3 months ago |
haroon amjad
|
b13adde9d2
|
send feedback implementation done
|
3 months ago |
faizatflutter
|
da579dfd09
|
CMC Module Completed
|
3 months ago |
faizatflutter
|
3331edc10d
|
Comprehensive checkup Completed
|
3 months ago |
haroon amjad
|
938463aabc
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/utils/date_util.dart
|
3 months ago |
haroon amjad
|
9f845f1de8
|
Feedback page implementation contd.
|
3 months ago |
tahaalam
|
31261092a8
|
rrt request creation and history listing
|
3 months ago |
Sultan khan
|
9a04974db3
|
Merge branch 'faiz_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/core/api_consts.dart
|
3 months ago |
Sultan khan
|
c43f96c619
|
e-referral work in progress
|
3 months ago |
faizatflutter
|
721bf95c1b
|
Comprehensive checkup in progress
|
3 months ago |
Fatimah.Alshammari
|
8191852f4d
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
|
3 months ago |
Fatimah.Alshammari
|
77242825bb
|
fix toggle
|
3 months ago |
Haroon Amjad
|
73b05276f6
|
Feedback page implementation contd.
|
3 months ago |
Haroon Amjad
|
37a0692be4
|
Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
|
3 months ago |
haroon amjad
|
f9f17f3a76
|
LiveChat implemented
|
3 months ago |
Sultan khan
|
8e132e964f
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
# lib/presentation/profile_settings/profile_settings.dart
# lib/presentation/radiology/radiology_orders_page.dart
# lib/widgets/chip/app_custom_chip_widget.dart
|
3 months ago |
Sultan khan
|
171bd644d1
|
e-referral work in progress.
|
3 months ago |
Fatimah.Alshammari
|
eae16eec44
|
active medication
|
3 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
|
3 months ago |
tahaalam
|
fbe5d35013
|
merge issues resolve for the ambulance request.
|
3 months ago |
faizatflutter
|
7d64f78246
|
merge changes
|
3 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
|
3 months ago |
faizatflutter
|
16b5ff1b62
|
Ancillary Orders Flow Completed
|
3 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
|
3 months ago |
tahaalam
|
1f852f63cf
|
penguin sdk added
|
3 months ago |
haroon amjad
|
096b2b7cbf
|
livechat implementation contd.
|
3 months ago |
haroon amjad
|
2a6c7fc0a1
|
Find us implemented
|
3 months ago |
tahaalam
|
5b0a8ad898
|
cancel and listing request added
|
3 months ago |
haroon amjad
|
14f57027f4
|
Eye measurements done
|
3 months ago |
haroon amjad
|
c600b0ee7a
|
Ask doctor implemented
|
3 months ago |
haroon amjad
|
21b7b32013
|
Ask doctor implementation contd.
|
3 months ago |
haroon amjad
|
9a48421271
|
ER Online Check-In implemented
|
3 months ago |
faizatflutter
|
100d4bda9f
|
Completed Ancillary flow with CardPayments
|
3 months ago |
Haroon Amjad
|
cc1e073f6d
|
ER Online CheckIn implementation contd.
|
3 months ago |
haroon amjad
|
60bd9ee55a
|
ER Online CheckIn implementation contd.
|
3 months ago |
tahaalam
|
1ca39e1332
|
Ambulance order screens and geocoding request added
|
3 months ago |
Sultan khan
|
028e03a97b
|
filter radiology
|
3 months ago |
haroon amjad
|
8dcc8dfbe3
|
updates
|
3 months ago |
aamir-csol
|
e113c4c1ee
|
updates & fixes & RRT Flow
|
3 months ago |
Fatimah.Alshammari
|
3f123d12d6
|
Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
# Conflicts:
# lib/core/api_consts.dart
# lib/core/utils/utils.dart
# lib/main.dart
|
4 months ago |
Fatimah.Alshammari
|
de8c7bc605
|
active medication
|
4 months ago |
aamir-csol
|
8123981092
|
Merge branch 'master' into dev_aamir
|
4 months ago |
aamir-csol
|
02ae79c458
|
Merge branch 'refs/heads/master' into dev_aamir
|
4 months ago |
tahaalam
|
57056e67f3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/widgets/buttons/custom_button.dart
|
4 months ago |
tahaalam
|
90128a812b
|
call ambulance module design added.
|
4 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
|
4 months ago |
faizatflutter
|
462f4eba14
|
Design Updates
|
4 months ago |
haroon amjad
|
4b52862ba0
|
updates
|
4 months ago |
faizatflutter
|
eabfaf8182
|
Design Updates
|
4 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
|
4 months ago |
haroon amjad
|
1f7a941aa0
|
RRT Services implementation contd.
|
4 months ago |
tahaalam
|
47d158c1e2
|
Merge remote-tracking branch 'origin/master'
|
4 months ago |
tahaalam
|
c146747e5e
|
nearest er clinic repo viewmodel and view added
|
4 months ago |
tahaalam
|
d9796154dc
|
Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
# lib/presentation/book_appointment/select_clinic_page.dart
|
4 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
|
4 months ago |
haroon amjad
|
d693850ef4
|
ER services implementation contd.
|
4 months ago |
tahaalam
|
baf7cf0ea0
|
dental routing fixed and laser exception removed
|
4 months ago |
tahaalam
|
a7bd5f61cb
|
Merge remote-tracking branch 'origin/master' into feature/lab_result
|
4 months ago |
tahaalam
|
9e3035f02b
|
units added to lab result and it graph and unwanted values removed from graph
|
4 months ago |
aamir-csol
|
58e65e7a64
|
Merge branch 'master' into dev_aamir
|
4 months ago |
aamir-csol
|
cd81372fc6
|
family screen add fixes & remove & switch & widgets
|
4 months ago |
haroon amjad
|
7a35f0ded6
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
4 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
|
4 months ago |
haroon amjad
|
5e1a7652be
|
lab report download implemented
|
4 months ago |
haroon amjad
|
e1ac77855c
|
Merge branch 'master' into haroon_dev
|
4 months ago |
haroon amjad
|
1e08394ba1
|
Lab report PDF implementation contd.
|
4 months ago |
aamir-csol
|
bf8f98ffb1
|
family screen add fixes & remove & switch & widgets
|
4 months ago |
tahaalam
|
ea92a0c75c
|
laser appointment screen added
|
4 months ago |
haroon amjad
|
a2310e1447
|
prescription instructions PDF implemented
|
4 months ago |
haroon amjad
|
663eda0076
|
updates & fixes
|
4 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
|
4 months ago |
haroon amjad
|
25fa1acc9e
|
Medical file widgets, Insurance approval implementation contd.
|
4 months ago |
aamir-csol
|
24362f67cb
|
family screen & widgets
|
4 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
|
4 months ago |
aamir-csol
|
d918b6e464
|
family screen & widgets
|
4 months ago |
haroon amjad
|
9d48a00b21
|
Merge branch 'master' into haroon_dev
|
4 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
|
4 months ago |
haroon amjad
|
f1a60a9dfb
|
updates
|
4 months ago |
tahaalam
|
61007302c9
|
appointment date filter handled
|
4 months ago |