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 |
aamir-csol
|
c921228ad9
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/book_appointment/select_clinic_page.dart
# lib/presentation/health_calculators/health_calculator_result.dart
|
2 months ago |
aamir-csol
|
f509a09b34
|
Health calculators & converters
|
2 months ago |
haroon amjad
|
450f07d39d
|
updates & fixes
|
2 months ago |
haroon amjad
|
d8c7503c56
|
QLine API implementation enhancements
|
2 months ago |
Fatimah.Alshammari
|
190492a191
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/routes/app_routes.dart
|
2 months ago |
Sultan khan
|
d28c94606b
|
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:
updates
updates
updates & fixes
|
2 months ago |
Sultan khan
|
68e1b116f9
|
last rated updated.
|
2 months ago |
haroon amjad
|
bee4aafc44
|
Merge branch 'master' into haroon_dev
|
2 months ago |
haroon amjad
|
3060c57201
|
updates
|
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 |
haroon amjad
|
eff6cbbaad
|
updates & fixes
|
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 |
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
|
e72e67d9bf
|
Appointment Queue implemented, Blood Donation implementation contd.
|
2 months ago |
faizatflutter
|
2ffd4cc1ae
|
Integrated the API for Symptoms Checker
|
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 |
haroon amjad
|
581a4a5a74
|
WalkIn Appointment implementation done
|
3 months ago |
haroon amjad
|
36bf63dcde
|
Incoming call updates
|
3 months ago |
haroon amjad
|
5a1c58e6b2
|
Merge branch 'master' into haroon_dev
|
3 months ago |
haroon amjad
|
1e5744cf44
|
Updates & enhancements
|
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 |
haroon amjad
|
9fd7f71a34
|
prescription delivery implementation contd
|
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
|
b13adde9d2
|
send feedback implementation done
|
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 |
Fatimah.Alshammari
|
8191852f4d
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
|
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 |
Fatimah.Alshammari
|
27ad4e0764
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/utils/utils.dart
# lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
# lib/presentation/home/landing_page.dart
|
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 |
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 |
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
|
2a6c7fc0a1
|
Find us implemented
|
3 months ago |
tahaalam
|
5b0a8ad898
|
cancel and listing request added
|
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
|
f280d4a28a
|
todo page implementation started
|
4 months ago |
haroon amjad
|
d3a8d545b2
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/my_family/widget/family_cards.dart
|
4 months ago |
haroon amjad
|
8dcc8dfbe3
|
updates
|
4 months ago |
faizatflutter
|
f96f3e563c
|
Fixed App CustomChip
|
4 months ago |
faizatflutter
|
b698b74eb5
|
Design Updates
|
4 months ago |
faizatflutter
|
8c956fc052
|
Design changes
|
4 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 |
faizatflutter
|
3e61df218b
|
Some Minor design updated
|
4 months ago |
faizatflutter
|
eabfaf8182
|
Design Updates
|
4 months ago |
haroon amjad
|
d693850ef4
|
ER services implementation contd.
|
4 months ago |
Fatimah.Alshammari
|
cb56503622
|
Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
|
5 months ago |
Fatimah.Alshammari
|
e8319a0d3f
|
active medication
|
5 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
|
5 months ago |
haroon amjad
|
25fa1acc9e
|
Medical file widgets, Insurance approval implementation contd.
|
5 months ago |
aamir-csol
|
24362f67cb
|
family screen & widgets
|
5 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
|
5 months ago |
aamir-csol
|
d918b6e464
|
family screen & widgets
|
5 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
|
5 months ago |
tahaalam
|
6cf08c04d2
|
appointment filters added.
|
5 months ago |
haroon amjad
|
415c0eb3c7
|
Dental appointment booking implementation contd.
|
5 months ago |
haroon amjad
|
db979977ca
|
Tamara implementation & enhancements
|
5 months ago |
haroon amjad
|
5e000db556
|
updates
|
5 months ago |
haroon amjad
|
8a7f46441c
|
updates
|
5 months ago |
haroon amjad
|
3418480122
|
Immediate LiveCare implementation completed
|
5 months ago |
haroon amjad
|
1af2db5c09
|
patient profile settings page integration implementation contd.
|
5 months ago |
haroon amjad
|
5f43063f2d
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
|
5 months ago |
haroon amjad
|
6b28b57307
|
empty state implementation contd.
|
5 months ago |
tahaalam
|
512628fb8b
|
Lab result view along with the listing of items is added
|
5 months ago |
haroon amjad
|
a07369165d
|
Updates
|
5 months ago |
haroon amjad
|
a711d3a6dd
|
LiveCare shcedule implementation contd.
|
5 months ago |
Haroon6138
|
25f0b9d415
|
Merge pull request 'haroon_dev' (#49) from haroon_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/49
|
5 months ago |
Haroon Amjad
|
c9206f1ab8
|
Radiology report implemented
|
5 months ago |
haroon amjad
|
3b5d2d27a4
|
Updates
|
5 months ago |
Sikander Saleem
|
99e1036043
|
ui improvement.
|
5 months ago |
haroon amjad
|
4f4bef9d6f
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
|
5 months ago |
haroon amjad
|
5e81ba1ed8
|
updates
|
5 months ago |
Sikander Saleem
|
3267317457
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# lib/presentation/home/landing_page.dart
|
5 months ago |
Sikander Saleem
|
57827549b8
|
language switch added in drawer, and ui improvements
|
5 months ago |
haroon amjad
|
c191fd0be1
|
updates
|
5 months ago |
Sikander Saleem
|
c00e69ef0c
|
profile wallet linked with view model.
|
5 months ago |
Sikander Saleem
|
c83754fc4a
|
user profile welcome widget improvement.
|
5 months ago |
Sultan khan
|
6b766e558d
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/app_assets.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/home/navigation_screen.dart
|
5 months ago |
haroon amjad
|
9f95150a94
|
book appointment implementation completed.
|
5 months ago |
Sultan khan
|
fdd5d4cf6d
|
fixes
|
5 months ago |
haroon amjad
|
3066bc8ea3
|
Book appointment implementation contd.
|
5 months ago |
Haroon Amjad
|
7b94199d58
|
Medical report implementation done, Book Appointment implementation contd.
|
5 months ago |
Haroon Amjad
|
b240293064
|
medical file implementation contd.
|
5 months ago |
Haroon Amjad
|
5620cc4442
|
medical file implementation contd.
|
5 months ago |
haroon amjad
|
f812dac059
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/lab/lab_orders_page.dart
|
5 months ago |
haroon amjad
|
4269e99be9
|
updates
|
5 months ago |
Sultan khan
|
299c0b0e29
|
login flow complete
|
5 months ago |
haroon amjad
|
ccd29f0cf9
|
updates
|
5 months ago |