Sultan khan
|
68e1b116f9
|
last rated updated.
|
10 months ago |
 haroon amjad
|
bee4aafc44
|
Merge branch 'master' into haroon_dev
|
10 months ago |
|
haroon amjad
|
3060c57201
|
updates
|
10 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
|
10 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
|
10 months ago |
|
haroon amjad
|
eff6cbbaad
|
updates & fixes
|
10 months ago |
|
haroon amjad
|
ff98262cf7
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
|
10 months ago |
|
Sultan khan
|
f28762a5c5
|
last appointment rated done.
|
10 months ago |
|
haroon amjad
|
796aeb03d3
|
Ancillary order fixes, QLine API integrated & other enhancements
|
11 months ago |
faizatflutter
|
c7c0a0ac09
|
Added user_info module IAP
|
11 months ago |
|
haroon amjad
|
e72e67d9bf
|
Appointment Queue implemented, Blood Donation implementation contd.
|
11 months ago |
|
faizatflutter
|
2ffd4cc1ae
|
Integrated the API for Symptoms Checker
|
11 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
|
11 months ago |
|
haroon amjad
|
581a4a5a74
|
WalkIn Appointment implementation done
|
11 months ago |
|
haroon amjad
|
36bf63dcde
|
Incoming call updates
|
11 months ago |
|
haroon amjad
|
5a1c58e6b2
|
Merge branch 'master' into haroon_dev
|
11 months ago |
|
haroon amjad
|
1e5744cf44
|
Updates & enhancements
|
11 months ago |
|
Fatimah.Alshammari
|
86a91ab383
|
Merge branch 'refs/heads/master' into fatima
|
11 months ago |
|
Sultan khan
|
9e0336687c
|
virtual tour.
|
11 months ago |
|
faizatflutter
|
757ace2ba1
|
Added Organ Selector
|
11 months ago |
|
haroon amjad
|
9fd7f71a34
|
prescription delivery implementation contd
|
11 months ago |
|
Fatimah.Alshammari
|
89ff10f506
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/theme/colors.dart
|
11 months ago |
|
haroon amjad
|
b13adde9d2
|
send feedback implementation done
|
11 months ago |
|
haroon amjad
|
938463aabc
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/utils/date_util.dart
|
11 months ago |
|
haroon amjad
|
9f845f1de8
|
Feedback page implementation contd.
|
11 months ago |
 tahaalam
|
31261092a8
|
rrt request creation and history listing
|
11 months ago |
|
Fatimah.Alshammari
|
8191852f4d
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
|
11 months ago |
Haroon Amjad
|
37a0692be4
|
Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
|
11 months ago |
|
haroon amjad
|
f9f17f3a76
|
LiveChat implemented
|
11 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
|
11 months ago |
|
Fatimah.Alshammari
|
eae16eec44
|
active medication
|
11 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
|
11 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
|
11 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
|
11 months ago |
|
tahaalam
|
1f852f63cf
|
penguin sdk added
|
11 months ago |
|
haroon amjad
|
2a6c7fc0a1
|
Find us implemented
|
11 months ago |
|
tahaalam
|
5b0a8ad898
|
cancel and listing request added
|
11 months ago |
|
haroon amjad
|
9a48421271
|
ER Online Check-In implemented
|
12 months ago |
|
faizatflutter
|
100d4bda9f
|
Completed Ancillary flow with CardPayments
|
12 months ago |
|
haroon amjad
|
f280d4a28a
|
todo page implementation started
|
12 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
|
12 months ago |
|
haroon amjad
|
8dcc8dfbe3
|
updates
|
12 months ago |
|
faizatflutter
|
f96f3e563c
|
Fixed App CustomChip
|
12 months ago |
|
faizatflutter
|
b698b74eb5
|
Design Updates
|
12 months ago |
|
faizatflutter
|
8c956fc052
|
Design changes
|
1 year 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
|
1 year ago |
|
Fatimah.Alshammari
|
de8c7bc605
|
active medication
|
1 year ago |
|
faizatflutter
|
3e61df218b
|
Some Minor design updated
|
1 year ago |
|
faizatflutter
|
eabfaf8182
|
Design Updates
|
1 year ago |
|
haroon amjad
|
d693850ef4
|
ER services implementation contd.
|
1 year ago |
|
Fatimah.Alshammari
|
cb56503622
|
Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
|
1 year ago |
|
Fatimah.Alshammari
|
e8319a0d3f
|
active medication
|
1 year 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
|
1 year ago |
|
haroon amjad
|
25fa1acc9e
|
Medical file widgets, Insurance approval implementation contd.
|
1 year ago |
aamir-csol
|
24362f67cb
|
family screen & widgets
|
1 year 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
|
1 year ago |
|
aamir-csol
|
d918b6e464
|
family screen & widgets
|
1 year 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
|
1 year ago |
|
tahaalam
|
6cf08c04d2
|
appointment filters added.
|
1 year ago |
|
haroon amjad
|
415c0eb3c7
|
Dental appointment booking implementation contd.
|
1 year ago |
|
haroon amjad
|
db979977ca
|
Tamara implementation & enhancements
|
1 year ago |
|
haroon amjad
|
5e000db556
|
updates
|
1 year ago |
|
haroon amjad
|
8a7f46441c
|
updates
|
1 year ago |
|
haroon amjad
|
3418480122
|
Immediate LiveCare implementation completed
|
1 year ago |
|
haroon amjad
|
1af2db5c09
|
patient profile settings page integration implementation contd.
|
1 year ago |
|
haroon amjad
|
5f43063f2d
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
|
1 year ago |
|
haroon amjad
|
6b28b57307
|
empty state implementation contd.
|
1 year ago |
|
tahaalam
|
512628fb8b
|
Lab result view along with the listing of items is added
|
1 year ago |
|
haroon amjad
|
a07369165d
|
Updates
|
1 year ago |
|
haroon amjad
|
a711d3a6dd
|
LiveCare shcedule implementation contd.
|
1 year 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
|
1 year ago |
|
Haroon Amjad
|
c9206f1ab8
|
Radiology report implemented
|
1 year ago |
|
haroon amjad
|
3b5d2d27a4
|
Updates
|
1 year ago |
 Sikander Saleem
|
99e1036043
|
ui improvement.
|
1 year ago |
|
haroon amjad
|
4f4bef9d6f
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
|
1 year ago |
|
haroon amjad
|
5e81ba1ed8
|
updates
|
1 year ago |
|
Sikander Saleem
|
3267317457
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# lib/presentation/home/landing_page.dart
|
1 year ago |
|
Sikander Saleem
|
57827549b8
|
language switch added in drawer, and ui improvements
|
1 year ago |
|
haroon amjad
|
c191fd0be1
|
updates
|
1 year ago |
|
Sikander Saleem
|
c00e69ef0c
|
profile wallet linked with view model.
|
1 year ago |
|
Sikander Saleem
|
c83754fc4a
|
user profile welcome widget improvement.
|
1 year 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
|
1 year ago |
|
haroon amjad
|
9f95150a94
|
book appointment implementation completed.
|
1 year ago |
|
Sultan khan
|
fdd5d4cf6d
|
fixes
|
1 year ago |
|
haroon amjad
|
3066bc8ea3
|
Book appointment implementation contd.
|
1 year ago |
|
Haroon Amjad
|
7b94199d58
|
Medical report implementation done, Book Appointment implementation contd.
|
1 year ago |
|
Haroon Amjad
|
b240293064
|
medical file implementation contd.
|
1 year ago |
|
Haroon Amjad
|
5620cc4442
|
medical file implementation contd.
|
1 year 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
|
1 year ago |
|
haroon amjad
|
4269e99be9
|
updates
|
1 year ago |
|
Sultan khan
|
299c0b0e29
|
login flow complete
|
1 year ago |
|
haroon amjad
|
ccd29f0cf9
|
updates
|
1 year ago |
|
Sultan khan
|
58d33e2dae
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
# lib/presentation/home/landing_page.dart
|
1 year ago |
|
Sultan khan
|
1466b6b71a
|
no message
|
1 year ago |
|
Haroon Amjad
|
6b2ec5aa2c
|
updates, fixes & service privileges
|
1 year ago |
|
Sultan khan
|
2a081e30b5
|
saved login done.
|
1 year ago |
|
Sultan khan
|
b4667f5c94
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
1 year ago |
|
Sultan khan
|
075578602e
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/features/authentication/authentication_repo.dart
# lib/features/authentication/authentication_view_model.dart
|
1 year ago |
|
Sultan khan
|
a199ca040b
|
quick login inprogress
|
1 year ago |
|
aamir-csol
|
9b063ba764
|
fixes for signup
|
1 year ago |
|
haroon amjad
|
f8be788a60
|
updates & fixes
|
1 year ago |
|
haroon amjad
|
542de41a82
|
updates & fixes
|
1 year ago |
|
Sultan khan
|
384ac814f8
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/core/app_assets.dart
# lib/core/dependencies.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/widgets/common_bottom_sheet.dart
|
1 year ago |
|
Sultan khan
|
ba2c8327fe
|
login flow inprogress
|
1 year ago |
|
haroon amjad
|
a0bdc34685
|
My appointments implementation contd.
|
1 year ago |
|
Haroon Amjad
|
43fa08b8b6
|
insurance update update
|
1 year ago |
|
haroon amjad
|
d794787459
|
updates
|
1 year ago |
|
faizatflutter
|
702c504d4e
|
Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
# pubspec.yaml
|
1 year ago |
|
faizatflutter
|
db50bd8f23
|
Merge branch 'master' into faiz_dev1
# Conflicts:
# lib/core/api_consts.dart
# lib/core/app_state.dart
# lib/features/authentication/authentication_view_model.dart
# lib/presentation/authentication/login.dart
# lib/presentation/authentication/register.dart
# lib/widgets/bottomsheet/generic_bottom_sheet.dart
# lib/widgets/input_widget.dart
|
1 year ago |
|
faizatflutter
|
84804a59a7
|
completed till otp receiving
|
1 year ago |
|
Sikander Saleem
|
6473ccecb5
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# lib/core/app_assets.dart
|
1 year ago |
|
aamir-csol
|
da035650c0
|
Merge branch 'master' into dev_aamir
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/generated/locale_keys.g.dart
|
1 year ago |
|
haroon amjad
|
e8cc6407b6
|
Insurance update implementation contd.
|
1 year ago |
|
Sikander Saleem
|
ac0b7bec44
|
custom tab bar added in medical file section.
|
1 year ago |
|
Sikander Saleem
|
85bb00a8fc
|
Merge branch 'refs/heads/master' into dev_sikander
|
1 year ago |
|
Sikander Saleem
|
38d37fd407
|
custom tab bar added.
|
1 year ago |
|
faizatflutter
|
3e50a3c89d
|
Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
# lib/core/enums.dart
# lib/features/authentication/authentication_view_model.dart
# lib/presentation/authentication/register.dart
# lib/presentation/home/landing_page.dart
|
1 year ago |
|
faizatflutter
|
6e05ca15cf
|
adding the login function
|
1 year ago |
|
aamir-csol
|
cf1908b44a
|
Merge branch 'master' into dev_aamir
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/theme/colors.dart
|
1 year ago |
|
aamir-csol
|
85fac13314
|
changes
|
1 year ago |
|
Sultan khan
|
886825a4b9
|
bottom navigation updated.
|
1 year ago |
|
faizatflutter
|
32fadb8ad9
|
completed login function
|
1 year ago |
|
haroon amjad
|
8bc49929d4
|
prescription orders list page implemented
|
1 year ago |
|
haroon amjad
|
6f07bc7c2c
|
Radiology Orders implemented
|
1 year ago |
|
Sultan khan
|
0de09dd72c
|
no message
|
1 year ago |
|
aamir-csol
|
7321da67e3
|
register step 2 & fixes
|
1 year ago |
|
aamir-csol
|
ed24365eff
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/home/landing_page.dart
# lib/theme/colors.dart
|
1 year ago |
|
Haroon Amjad
|
a77fc49c68
|
lab result changes
|
1 year ago |
|
haroon amjad
|
e044fc8c5e
|
lab implementation contd.
|
1 year ago |
|
faizatflutter
|
488636a13f
|
Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
1 year ago |
|
faizatflutter
|
572fcef0f1
|
checkUserAuth
|
1 year ago |
|
aamir-csol
|
d1e1154bdb
|
changes
|
1 year ago |
|
aamir-csol
|
23a4035117
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/main.dart
# lib/presentation/home/landing_page.dart
# lib/theme/colors.dart
# lib/widgets/buttons/custom_button.dart
|
1 year ago |
|
faizatflutter
|
c6a95fe7d7
|
latest push after master merged
|
1 year ago |
|
faizatflutter
|
1af571705a
|
Merge branch 'master' into faiz_dev1
# Conflicts:
# lib/core/utils/utils.dart
# lib/presentation/home/landing_page.dart
|
1 year ago |
|
haroon amjad
|
4ecbcb9332
|
Homepage & medical implementation contd.
|
1 year ago |
|
faizatflutter
|
6bc7af00bc
|
completed the deviceapi with new architecture
|
1 year ago |
|
aamir-csol
|
8f1e4500cc
|
register & Exception bottom sheet, country dropdown.
|
1 year ago |
|
faizatflutter
|
89e9323d9e
|
merged master and updated structure
|
1 year ago |
|
Haroon Amjad
|
0a39a00df5
|
Landing page updates
|
1 year ago |
|
Haroon Amjad
|
4fcaea2993
|
updates
|
1 year ago |
|
Haroon Amjad
|
c65d44ae4d
|
updates
|
1 year ago |
|
Haroon Amjad
|
2293db00ea
|
updates
|
1 year ago |
|
Haroon Amjad
|
b6766654e0
|
initial commit
|
1 year ago |