 haroon amjad
|
f886357bcd
|
updates
|
10 months ago |
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
|
10 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
|
10 months ago |
|
Fatimah.Alshammari
|
68f044de52
|
added monthly report
|
10 months ago |
faizatflutter
|
fd2abbbc7b
|
Water Intake Design completed
|
10 months ago |
|
haroon amjad
|
87fd9a42b7
|
Nearest Appointment selected
|
10 months ago |
|
faizatflutter
|
94668997aa
|
Updated design for HHC
|
10 months ago |
|
haroon amjad
|
d8c7503c56
|
QLine API implementation enhancements
|
10 months ago |
|
Fatimah.Alshammari
|
c9de23347a
|
fix error
|
10 months ago |
|
Fatimah.Alshammari
|
190492a191
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/routes/app_routes.dart
|
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 |
|
Fatimah.Alshammari
|
0b3fea230f
|
monthly report
|
10 months ago |
|
haroon amjad
|
d202aa8423
|
Smartwatch integration started
|
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 |
|
faizatflutter
|
6f72c99975
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
# lib/theme/colors.dart
|
10 months ago |
|
faizatflutter
|
fbe124f6ee
|
Complete UserInfo Selection Module
|
10 months ago |
|
haroon amjad
|
2f26e12fd3
|
update
|
10 months ago |
|
faizatflutter
|
cf26e71645
|
Complete USerInfo Selectoiun
|
10 months ago |
|
haroon amjad
|
796aeb03d3
|
Ancillary order fixes, QLine API integrated & other enhancements
|
10 months ago |
|
faizatflutter
|
c7c0a0ac09
|
Added user_info module IAP
|
10 months ago |
|
haroon amjad
|
7cdb30a364
|
Merge branch 'master' into haroon_dev
|
10 months ago |
|
haroon amjad
|
a83a35a284
|
Services Page Revamp
|
10 months ago |
 tahaalam
|
2125e30c23
|
Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
10 months ago |
|
tahaalam
|
95243c250f
|
graph shaded region added from horizontal spaces
|
10 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
|
10 months ago |
|
faizatflutter
|
9410ad9b60
|
Refactoring
|
10 months ago |
|
haroon amjad
|
e72e67d9bf
|
Appointment Queue implemented, Blood Donation implementation contd.
|
10 months ago |
|
faizatflutter
|
2ffd4cc1ae
|
Integrated the API for Symptoms Checker
|
10 months ago |
|
haroon amjad
|
ca47315b2c
|
Merge branch 'master' into haroon_dev
|
10 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
|
10 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
|
10 months ago |
|
faizatflutter
|
2173d091ed
|
Added symptoms selector
|
10 months ago |
|
tahaalam
|
ac15ab26f5
|
graph changes for high and low
|
10 months ago |
|
haroon amjad
|
3185d1e9e7
|
Allergies list implemented
|
10 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
|
10 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
|
10 months ago |
|
haroon amjad
|
581a4a5a74
|
WalkIn Appointment implementation done
|
10 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
|
10 months ago |
|
haroon amjad
|
2b7379c1c3
|
Waiting appointment implementation in progress
|
10 months ago |
|
haroon amjad
|
36bf63dcde
|
Incoming call updates
|
10 months ago |
|
faizatflutter
|
ac84d268e9
|
triage design
|
10 months ago |
|
Sultan khan
|
ddac155a6a
|
silent login case handled.
|
10 months ago |
|
tahaalam
|
e0e41d1900
|
calender reminder added on appointment and pescription
|
11 months ago |
|
haroon amjad
|
5a1c58e6b2
|
Merge branch 'master' into haroon_dev
|
11 months ago |
|
haroon amjad
|
1e5744cf44
|
Updates & enhancements
|
11 months ago |
|
faizatflutter
|
acb6d31ff3
|
Added possible conditions screen
|
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 |
|
Sultan khan
|
a4d3bb3533
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
11 months ago |
|
Sultan khan
|
fb69723a65
|
e-referral done.
|
11 months ago |
|
haroon amjad
|
32adf754ce
|
prescription delivery implemented
|
11 months ago |
|
haroon amjad
|
9fd7f71a34
|
prescription delivery implementation contd
|
11 months ago |
Haroon Amjad
|
bad76059c0
|
prescription delivery implementation contd.
|
11 months ago |
|
haroon amjad
|
b90883a596
|
prescription order implementation contd.
|
11 months ago |
|
haroon amjad
|
1be430aa76
|
Merge branch 'master' into haroon_dev
|
11 months ago |
|
haroon amjad
|
fee84a2928
|
Nearest appointment implemented
|
11 months ago |
|
tahaalam
|
5983caf83a
|
single map screen added to the project for multiple place usage
|
11 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
|
11 months ago |
|
Sultan khan
|
d8a9d8443a
|
e-referral work done search-referral in progress.
|
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
|
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
|
11 months ago |
|
faizatflutter
|
91e3e9387e
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/features/emergency_services/emergency_services_view_model.dart
|
11 months ago |
|
haroon amjad
|
c03c84287c
|
Appointment details Lab & radiology integration implemented
|
11 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
|
11 months ago |
|
faizatflutter
|
fe00447483
|
HHC in Progress
|
11 months ago |
|
tahaalam
|
224463feb4
|
closing the login first dialog
|
11 months ago |
|
tahaalam
|
8f46dddbd6
|
terms and condition added to the rrt module.
|
11 months ago |
|
haroon amjad
|
ffca4317aa
|
updates
|
11 months ago |
|
faizatflutter
|
95bd2a2a7e
|
CMC Tweaks Completed
|
11 months ago |
|
tahaalam
|
f3676f5596
|
ui issues resolve for ambulance and rrt request
|
11 months ago |
|
haroon amjad
|
b13adde9d2
|
send feedback implementation done
|
11 months ago |
|
faizatflutter
|
da579dfd09
|
CMC Module Completed
|
11 months ago |
|
faizatflutter
|
3331edc10d
|
Comprehensive checkup Completed
|
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 |
|
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
|
11 months ago |
|
Sultan khan
|
c43f96c619
|
e-referral work in progress
|
11 months ago |
|
faizatflutter
|
721bf95c1b
|
Comprehensive checkup in progress
|
11 months ago |
|
Fatimah.Alshammari
|
8191852f4d
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
|
11 months ago |
|
Fatimah.Alshammari
|
77242825bb
|
fix toggle
|
11 months ago |
|
Haroon Amjad
|
73b05276f6
|
Feedback page implementation contd.
|
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 |
|
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
|
11 months ago |
|
Sultan khan
|
171bd644d1
|
e-referral work in progress.
|
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 |
|
tahaalam
|
fbe5d35013
|
merge issues resolve for the ambulance request.
|
11 months ago |
|
faizatflutter
|
7d64f78246
|
merge changes
|
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 |
|
faizatflutter
|
16b5ff1b62
|
Ancillary Orders Flow Completed
|
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
|
096b2b7cbf
|
livechat implementation contd.
|
11 months ago |
|
haroon amjad
|
2a6c7fc0a1
|
Find us implemented
|
11 months ago |
|
tahaalam
|
5b0a8ad898
|
cancel and listing request added
|
11 months ago |
|
haroon amjad
|
14f57027f4
|
Eye measurements done
|
11 months ago |
|
haroon amjad
|
c600b0ee7a
|
Ask doctor implemented
|
11 months ago |
|
haroon amjad
|
21b7b32013
|
Ask doctor implementation contd.
|
11 months ago |
|
haroon amjad
|
9a48421271
|
ER Online Check-In implemented
|
11 months ago |
|
faizatflutter
|
100d4bda9f
|
Completed Ancillary flow with CardPayments
|
11 months ago |
|
Haroon Amjad
|
cc1e073f6d
|
ER Online CheckIn implementation contd.
|
11 months ago |
|
haroon amjad
|
60bd9ee55a
|
ER Online CheckIn implementation contd.
|
11 months ago |
|
tahaalam
|
1ca39e1332
|
Ambulance order screens and geocoding request added
|
11 months ago |
|
Sultan khan
|
028e03a97b
|
filter radiology
|
11 months ago |
|
haroon amjad
|
8dcc8dfbe3
|
updates
|
11 months ago |
|
aamir-csol
|
e113c4c1ee
|
updates & fixes & RRT Flow
|
11 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
|
12 months ago |
|
Fatimah.Alshammari
|
de8c7bc605
|
active medication
|
12 months ago |
|
aamir-csol
|
8123981092
|
Merge branch 'master' into dev_aamir
|
12 months ago |
|
aamir-csol
|
02ae79c458
|
Merge branch 'refs/heads/master' into dev_aamir
|
12 months ago |
|
tahaalam
|
57056e67f3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/widgets/buttons/custom_button.dart
|
12 months ago |
|
tahaalam
|
90128a812b
|
call ambulance module design added.
|
12 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
|
1 year ago |
|
faizatflutter
|
462f4eba14
|
Design Updates
|
1 year ago |
|
haroon amjad
|
4b52862ba0
|
updates
|
1 year ago |
|
faizatflutter
|
eabfaf8182
|
Design Updates
|
1 year 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
|
1 year ago |
|
haroon amjad
|
1f7a941aa0
|
RRT Services implementation contd.
|
1 year ago |
|
tahaalam
|
47d158c1e2
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
tahaalam
|
c146747e5e
|
nearest er clinic repo viewmodel and view added
|
1 year ago |
|
tahaalam
|
d9796154dc
|
Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
# lib/presentation/book_appointment/select_clinic_page.dart
|
1 year 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
|
1 year ago |
|
haroon amjad
|
d693850ef4
|
ER services implementation contd.
|
1 year ago |
|
tahaalam
|
baf7cf0ea0
|
dental routing fixed and laser exception removed
|
1 year ago |
|
tahaalam
|
a7bd5f61cb
|
Merge remote-tracking branch 'origin/master' into feature/lab_result
|
1 year ago |
|
tahaalam
|
9e3035f02b
|
units added to lab result and it graph and unwanted values removed from graph
|
1 year ago |
|
aamir-csol
|
58e65e7a64
|
Merge branch 'master' into dev_aamir
|
1 year ago |
|
aamir-csol
|
cd81372fc6
|
family screen add fixes & remove & switch & widgets
|
1 year ago |
|
haroon amjad
|
7a35f0ded6
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
1 year 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
|
1 year ago |
|
haroon amjad
|
5e1a7652be
|
lab report download implemented
|
1 year ago |
|
haroon amjad
|
e1ac77855c
|
Merge branch 'master' into haroon_dev
|
1 year ago |
|
haroon amjad
|
1e08394ba1
|
Lab report PDF implementation contd.
|
1 year ago |
|
aamir-csol
|
bf8f98ffb1
|
family screen add fixes & remove & switch & widgets
|
1 year ago |
|
tahaalam
|
ea92a0c75c
|
laser appointment screen added
|
1 year ago |
|
haroon amjad
|
a2310e1447
|
prescription instructions PDF implemented
|
1 year ago |
|
haroon amjad
|
663eda0076
|
updates & fixes
|
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
|
9d48a00b21
|
Merge branch 'master' into haroon_dev
|
1 year 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
|
1 year ago |
|
haroon amjad
|
f1a60a9dfb
|
updates
|
1 year ago |
|
tahaalam
|
61007302c9
|
appointment date filter handled
|
1 year ago |
|
tahaalam
|
e5dcabacce
|
lab prescription details are added andgraph visibility added to the graph page for result that are IRR
|
1 year ago |
|
haroon amjad
|
d220be7283
|
Tamara payment flow done
|
1 year ago |
|
haroon amjad
|
30eb8bf5de
|
dental booking flow implemented
|
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 |
|
haroon amjad
|
b05e4e2a15
|
Dental appointment booking flow implementation contd.
|
1 year ago |
|
haroon amjad
|
2b21086cc1
|
Dental appointment booking flow implementation contd.
|
1 year 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
|
1 year ago |
|
tahaalam
|
6cf08c04d2
|
appointment filters added.
|
1 year ago |
|
haroon amjad
|
415c0eb3c7
|
Dental appointment booking implementation contd.
|
1 year ago |
|
haroon amjad
|
8291e89ee7
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/book_appointment/select_clinic_page.dart
|
1 year ago |
|
Haroon6138
|
7e92cad55b
|
Merge pull request 'bottom handled when dental and laser clinic is selected from clinic page' (#69) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/69
|
1 year ago |
|
tahaalam
|
bbf83d4dc9
|
bottom handled when dental and laser clinic is selected from clinic page
|
1 year ago |
|
haroon amjad
|
3d64ddf78b
|
Merge branch 'master' into haroon_dev
|
1 year ago |
|
haroon amjad
|
db979977ca
|
Tamara implementation & enhancements
|
1 year 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
|
1 year ago |
|
haroon amjad
|
8166369f85
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
# lib/widgets/input_widget.dart
|
1 year ago |
|
haroon amjad
|
1d22e53f63
|
Merge branch 'master' into haroon_dev
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
# lib/presentation/medical_file/medical_file_page.dart
|
1 year ago |
|
tahaalam
|
6ef9ae813d
|
doctors search filter added
|
1 year ago |
|
haroon amjad
|
3418480122
|
Immediate LiveCare implementation completed
|
1 year ago |
|
haroon amjad
|
10b77206f6
|
Immediate LiveCare consultation implementation contd.
|
1 year ago |
|
tahaalam
|
da89c41925
|
lab result by hospital and translations are added
|
1 year ago |
|
haroon amjad
|
2f4d6f5553
|
immediate livecare consultation implementation contd.
|
1 year ago |
|
haroon amjad
|
093e645f60
|
request medical report implementation completed.
|
1 year ago |
|
Haroon Amjad
|
8bb0e495cc
|
request medical report implementation contd.
|
1 year 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
|
1 year ago |
|
aamir-csol
|
1335d3a7c8
|
family screen & widgets
|
1 year ago |
|
faizatflutter
|
23942dc7bc
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/api/api_client.dart
|
1 year ago |
|
haroon amjad
|
6565ba719d
|
Merge branch 'master' into haroon_dev
|
1 year ago |
|
haroon amjad
|
1af2db5c09
|
patient profile settings page integration implementation contd.
|
1 year ago |
|
tahaalam
|
51a4f83347
|
Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
# lib/presentation/lab/lab_results/lab_result_details.dart
|
1 year ago |
|
tahaalam
|
048f0bb459
|
graph design change
|
1 year ago |
|
aamir-csol
|
060e7a8d68
|
Merge branch 'master' into dev_aamir
|
1 year ago |
|
aamir-csol
|
288a0018ce
|
family screen & widgets
|
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 |
|
aamir-csol
|
36193d349c
|
Merge remote-tracking branch 'origin/dev_sultan' into dev_aamir
# Conflicts:
# lib/features/authentication/authentication_repo.dart
# lib/features/authentication/authentication_view_model.dart
# lib/features/medical_file/medical_file_view_model.dart
|
1 year ago |
|
aamir-csol
|
02433e1bef
|
family screen & widgets
|
1 year ago |
|
Haroon Amjad
|
62e82a7a31
|
Empty data state implementation contd.
|
1 year ago |
|
Sultan khan
|
e2188b5a69
|
switch family member with super user
|
1 year ago |
|
faizatflutter
|
94313b8870
|
Improved Error Handling
|
1 year ago |
|
haroon amjad
|
918eb18b5f
|
Region flow in select clinic implemented
|
1 year ago |
|
haroon amjad
|
a07369165d
|
Updates
|
1 year ago |
|
haroon amjad
|
344ecaba18
|
LiveCare Schedule implementation done
|
1 year ago |
|
Sultan khan
|
3642523fdf
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/features/medical_file/medical_file_view_model.dart
|
1 year ago |
|
aamir-csol
|
9e8011c34c
|
family screen & widgets
|
1 year ago |
|
Sultan khan
|
3acd549de7
|
no message
|
1 year ago |
|
aamir-csol
|
47ce5022d3
|
family screen & widgets
|
1 year ago |
|
haroon amjad
|
a711d3a6dd
|
LiveCare shcedule implementation contd.
|
1 year ago |
|
aamir-csol
|
1b652f877d
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
# lib/widgets/chip/app_custom_chip_widget.dart
|
1 year ago |
|
Sultan khan
|
d5bd99f525
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
1 year ago |
|
Haroon6138
|
938d95cb06
|
Merge pull request 'feature/search_by_region' (#55) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/55
|
1 year ago |
|
aamir-csol
|
192d617350
|
family screen & widgets
|
1 year ago |
|
Sultan khan
|
6d85227f11
|
lab order by test
|
1 year ago |
taha.alam
|
7093a26cb8
|
selection region arabic handling
|
1 year ago |
|
aamir-csol
|
e5f4da4e16
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
1 year ago |
|
aamir-csol
|
1125437a56
|
family screen & widgets
|
1 year ago |
|
Sultan khan
|
3d1d78ba48
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 year ago |
|
Sultan khan
|
8f8c4c7f65
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
1 year ago |
|
haroon amjad
|
97038f1a25
|
advance payment implementation done for self & other file number
|
1 year ago |
|
haroon amjad
|
3e95999bf3
|
Merge branch 'master' into haroon_dev
|
1 year ago |
|
aamir-csol
|
f9bfc131a8
|
family screen & widgets
|
1 year ago |
|
haroon amjad
|
6048b3b5f1
|
Advance payment module implementation contd.
|
1 year ago |
|
aamir-csol
|
a79dcad221
|
family screen & widgets
|
1 year ago |
|
Sultan khan
|
4d52987c83
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/core/api_consts.dart
# lib/presentation/medical_file/medical_file_page.dart
|
1 year ago |
|
Sultan khan
|
5ce7548656
|
family file work-in-progress
|
1 year ago |
|
aamir-csol
|
8240d3e78d
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/authentication/register_step2.dart
|
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
|
bdde6c224d
|
Merge branch 'master' into haroon_dev
|
1 year ago |
|
Haroon6138
|
5e82e02323
|
Merge pull request 'Location functionality' (#48) from functionality/location into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/48
|
1 year ago |
|
Haroon Amjad
|
c9206f1ab8
|
Radiology report implemented
|
1 year ago |
|
haroon amjad
|
3b5d2d27a4
|
Updates
|
1 year ago |
|
Sultan khan
|
0a653a61f2
|
family file bottomsheet added
|
1 year ago |
|
taha.alam
|
3fdd17ccaa
|
code added to get the location for gms hms and iphone. fallback added if the last known location is null.
|
1 year ago |
|
aamir-csol
|
17c47d093c
|
otp screen & register Uae & resend Activation Code.
|
1 year ago |
|
Sultan khan
|
030c2a1b8a
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 year ago |
|
Sultan khan
|
eafb52ab86
|
family file work in-progress
|
1 year ago |
|
Haroon6138
|
bfdc9752ae
|
Merge pull request 'dev_aamir' (#45) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/45
|
1 year ago |
|
Haroon6138
|
05500e4cd1
|
Merge pull request 'drilled the lat and lng parameter form viewmodel to the mapper' (#44) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/44
|
1 year ago |
|
aamir-csol
|
2b7656d83a
|
otp screen & register Uae & resend Activation Code.
|
1 year ago |
|
taha.alam
|
265d979b48
|
drilled the lat and lng parameter form viewmodel to the mapper
|
1 year ago |
|
aamir-csol
|
3ddd7781cd
|
Merge branch 'master' into dev_aamir
|
1 year ago |
|
haroon amjad
|
c191fd0be1
|
updates
|
1 year ago |
|
taha.alam
|
55c51f5742
|
Merge remote-tracking branch 'origin/master' into feature/search_by_region
|
1 year ago |
|
taha.alam
|
033ae12499
|
api handling for clinic and doctor parameters and state management
|
1 year ago |
|
aamir-csol
|
3b1b51ef6f
|
otp screen & register Uae & resend Activation Code.
|
1 year ago |
|
Sultan khan
|
cd5da116f9
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
# lib/features/authentication/widgets/otp_verification_screen.dart
|
1 year ago |
|
Sultan khan
|
fe36c2a1c1
|
auto sms
|
1 year ago |
|
aamir-csol
|
28a95959e0
|
Merge branch 'master' into dev_aamir
|
1 year ago |
|
aamir-csol
|
5de8314f3f
|
otp screen & register Uae & resend Activation Code.
|
1 year ago |
|
haroon amjad
|
3ab2546d10
|
merge fixes
|
1 year 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
|
1 year ago |
|
haroon amjad
|
5de5fc8be9
|
updates
|
1 year ago |
|
Haroon6138
|
2ced674311
|
Merge pull request 'data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo' (#40) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/40
|
1 year ago |
|
taha.alam
|
de6e0e3704
|
data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo
|
1 year ago |
|
aamir-csol
|
b9b0dfd1fa
|
Merge branch 'master' into dev_aamir
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
|
1 year ago |
|
aamir-csol
|
15c07cb4e2
|
otp screen & register Uae & resend Activation Code.
|
1 year ago |
|
haroon amjad
|
71a07eed8e
|
Merge branch 'master' into haroon_dev
|
1 year ago |
|
taha.alam
|
ea2d2bf40f
|
retaining the old data.
|
1 year ago |
|
taha.alam
|
788887a7f1
|
Merge remote-tracking branch 'origin/master' into feature/search_by_region
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/app_assets.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/book_appointment/book_appointment_page.dart
# lib/presentation/home/navigation_screen.dart
|
1 year ago |
|
taha.alam
|
2174e0e292
|
viewmodel and repo updated for the appointment by region selection.
|
1 year ago |
|
taha.alam
|
9c2dd721b4
|
bottom sheets added of region facitlity and hospital.
|
1 year ago |
|
haroon amjad
|
f9e7c8988a
|
updates
|
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 |
|
Sultan khan
|
286dfaa376
|
no message
|
1 year ago |
|
aamir-csol
|
fbd6ef0cf8
|
Merge branch 'master' into dev_aamir
# Conflicts:
# assets/langs/en-US.json
# lib/features/authentication/widgets/otp_verification_screen.dart
# lib/widgets/input_widget.dart
|
1 year ago |
|
aamir-csol
|
4e17ff9c82
|
otp screen & register Uae & resend Activation Code.
|
1 year ago |
|
haroon amjad
|
9f95150a94
|
book appointment implementation completed.
|
1 year ago |
|
Sultan khan
|
009fa1859e
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 year ago |
|
Sultan khan
|
fdd5d4cf6d
|
fixes
|
1 year ago |
|
aamir-csol
|
21a9cc8c89
|
otp screen & register Uae & resend Activation Code.
|
1 year ago |
|
Haroon Amjad
|
2aa84e0334
|
book appointment implementation contd.
|
1 year ago |
|
haroon amjad
|
6f745f3666
|
calendar implementation contd.
|
1 year ago |
|
aamir-csol
|
87830e17ab
|
otp screen
|
1 year ago |
|
haroon amjad
|
73f8baa77e
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/dependencies.dart
# lib/extensions/string_extensions.dart
# lib/widgets/input_widget.dart
|
1 year ago |
|
Haroon6138
|
f15018b0e8
|
Merge pull request 'validations & otp widget & focus & auto fill' (#32) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/32
|
1 year ago |
|
haroon amjad
|
7476c8e55a
|
book appo implementation contd.
|
1 year ago |
|
aamir-csol
|
6a09c2ec07
|
validations & otp widget & focus & auto fill
|
1 year ago |
 Sikander Saleem
|
a25f42a43d
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# pubspec.yaml
|
1 year ago |
|
Sikander Saleem
|
e17d207ce5
|
swiper carousal view added in profile settings
|
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
|
14725616c6
|
medical report implementation contd.
|
1 year ago |
|
Haroon Amjad
|
de717edfe8
|
Sickleave implementation done.
|
1 year ago |
|
Haroon Amjad
|
b240293064
|
medical file implementation contd.
|
1 year ago |
|
aamir-csol
|
7c8d7b67a9
|
signup finalize
|
1 year ago |
|
aamir-csol
|
b7e19a0af8
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
1 year ago |
|
aamir-csol
|
0c58c22ea5
|
sign
|
1 year ago |
|
Haroon Amjad
|
5620cc4442
|
medical file implementation contd.
|
1 year ago |
|
haroon amjad
|
d87562caf5
|
updates
|
1 year ago |
|
haroon amjad
|
3a649bca35
|
Merge branch 'master' into haroon_dev
|
1 year ago |
|
aamir-csol
|
6f011880bd
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/core/api_consts.dart
# lib/features/authentication/authentication_view_model.dart
|
1 year ago |
|
aamir-csol
|
70810fa14c
|
signup completed
|
1 year ago |
|
aamir-csol
|
8c55064158
|
signup completed
|
1 year ago |
|
haroon amjad
|
1de551e799
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
# lib/features/authentication/authentication_view_model.dart
|
1 year ago |
|
haroon amjad
|
28da6e0a2c
|
updates
|
1 year ago |
|
Sultan khan
|
a5f64798e0
|
login fixes
|
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 |
|
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 |
|
aamir-csol
|
7dcc827721
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
1 year ago |
|
aamir-csol
|
cd48d83c07
|
signup
|
1 year ago |
|
Haroon Amjad
|
6b2ec5aa2c
|
updates, fixes & service privileges
|
1 year ago |
|
Haroon Amjad
|
255b3c1565
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
1 year ago |
|
Haroon6138
|
0e76e95636
|
Merge pull request 'dev_sultan' (#20) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/20
|
1 year ago |
|
Sultan khan
|
2a081e30b5
|
saved login done.
|
1 year ago |
|
haroon amjad
|
b10523dac3
|
Online CheckIn implementation contd.
|
1 year ago |