faizatflutter
|
fd2abbbc7b
|
Water Intake Design completed
|
3 weeks ago |
haroon amjad
|
b8ecb70aa2
|
Merge branch 'master' into haroon_dev
|
4 weeks ago |
aamir-csol
|
ada169f83f
|
Health calculators & converters
|
4 weeks 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
|
4 weeks ago |
aamir-csol
|
f509a09b34
|
Health calculators & converters
|
4 weeks ago |
haroon amjad
|
15f5eaf8e5
|
updates
|
4 weeks ago |
haroon amjad
|
87fd9a42b7
|
Nearest Appointment selected
|
4 weeks ago |
faizatflutter
|
94668997aa
|
Updated design for HHC
|
1 month ago |
haroon amjad
|
450f07d39d
|
updates & fixes
|
1 month ago |
haroon amjad
|
d8c7503c56
|
QLine API implementation enhancements
|
1 month ago |
haroon amjad
|
a80410d64b
|
LiveCare flow from clinic selection implemented
|
1 month ago |
Fatimah.Alshammari
|
c9de23347a
|
fix error
|
1 month ago |
Fatimah.Alshammari
|
190492a191
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/routes/app_routes.dart
|
1 month 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
|
1 month ago |
Sultan khan
|
68e1b116f9
|
last rated updated.
|
1 month ago |
haroon amjad
|
fe294ae8f6
|
updates
|
1 month ago |
haroon amjad
|
bee4aafc44
|
Merge branch 'master' into haroon_dev
|
1 month ago |
haroon amjad
|
3060c57201
|
updates
|
1 month 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
|
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 |
Fatimah.Alshammari
|
0b3fea230f
|
monthly report
|
1 month ago |
haroon amjad
|
f1004f39af
|
Merge branch 'master' into haroon_dev
|
1 month ago |
aamir-csol
|
7d71d994ea
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/core/app_assets.dart
# lib/core/enums.dart
# lib/core/utils/calender_utils_new.dart
# lib/main.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/hmg_services/services_view.dart
# lib/routes/app_routes.dart
|
1 month ago |
aamir-csol
|
335e6a6649
|
Health Calculators
|
1 month ago |
haroon amjad
|
eff6cbbaad
|
updates & fixes
|
1 month ago |
haroon amjad
|
d202aa8423
|
Smartwatch integration started
|
1 month ago |
Sultan khan
|
1d49308cc7
|
last appointment rated.
|
1 month ago |
haroon amjad
|
ff98262cf7
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
|
1 month ago |
Sultan khan
|
f28762a5c5
|
last appointment rated done.
|
1 month ago |
faizatflutter
|
449c338c46
|
refactor
|
1 month ago |
faizatflutter
|
5fd1905d8c
|
Complete UserInfo Selection Module
|
1 month ago |
faizatflutter
|
6f72c99975
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
# lib/theme/colors.dart
|
1 month ago |
faizatflutter
|
fbe124f6ee
|
Complete UserInfo Selection Module
|
1 month ago |
faizatflutter
|
cf26e71645
|
Complete USerInfo Selectoiun
|
1 month ago |
haroon amjad
|
796aeb03d3
|
Ancillary order fixes, QLine API integrated & other enhancements
|
1 month ago |
faizatflutter
|
c7c0a0ac09
|
Added user_info module IAP
|
1 month ago |
haroon amjad
|
c97a492244
|
Medical File page updates
|
1 month ago |
haroon amjad
|
818534e9f6
|
Master merged
|
1 month ago |
haroon amjad
|
7cdb30a364
|
Merge branch 'master' into haroon_dev
|
1 month ago |
haroon amjad
|
a83a35a284
|
Services Page Revamp
|
1 month ago |
tahaalam
|
2d2380851e
|
loading view added
|
1 month ago |
tahaalam
|
2125e30c23
|
Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
1 month ago |
tahaalam
|
95243c250f
|
graph shaded region added from horizontal spaces
|
1 month 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
|
1 month ago |
faizatflutter
|
9410ad9b60
|
Refactoring
|
1 month ago |
haroon amjad
|
e72e67d9bf
|
Appointment Queue implemented, Blood Donation implementation contd.
|
1 month ago |
faizatflutter
|
2ffd4cc1ae
|
Integrated the API for Symptoms Checker
|
1 month ago |
haroon amjad
|
634a138c7f
|
Queueing system screen implementation contd.
|
1 month ago |
haroon amjad
|
ca47315b2c
|
Merge branch 'master' into haroon_dev
|
1 month 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
|
1 month ago |
aamir-csol
|
d256eec392
|
medical file changes
|
1 month 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
|
1 month ago |
faizatflutter
|
2173d091ed
|
Added symptoms selector
|
1 month ago |
aamir-csol
|
19365375f6
|
medical file changes
|
1 month ago |
tahaalam
|
ac15ab26f5
|
graph changes for high and low
|
1 month ago |
haroon amjad
|
3185d1e9e7
|
Allergies list implemented
|
1 month 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
|
1 month 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
|
1 month ago |
haroon amjad
|
581a4a5a74
|
WalkIn Appointment implementation done
|
1 month 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
|
1 month ago |
haroon amjad
|
2b7379c1c3
|
Waiting appointment implementation in progress
|
1 month ago |
haroon amjad
|
36bf63dcde
|
Incoming call updates
|
1 month ago |
faizatflutter
|
ac84d268e9
|
triage design
|
1 month ago |
Sultan khan
|
ddac155a6a
|
silent login case handled.
|
2 months ago |
tahaalam
|
393eaad2c7
|
Merge remote-tracking branch 'origin/master'
|
2 months ago |
tahaalam
|
e200479332
|
old calender util deleted
|
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
|
2 months ago |
tahaalam
|
fc0f98da1d
|
calender reminder added
|
2 months ago |
Fatimah.Alshammari
|
86a91ab383
|
Merge branch 'refs/heads/master' into fatima
|
2 months ago |
Sultan khan
|
9e0336687c
|
virtual tour.
|
2 months ago |
faizatflutter
|
757ace2ba1
|
Added Organ Selector
|
2 months ago |
Sultan khan
|
2532b494f7
|
e-referral done.
|
2 months ago |
Sultan khan
|
a4d3bb3533
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
2 months ago |
Sultan khan
|
fb69723a65
|
e-referral done.
|
2 months ago |
haroon amjad
|
f142ff90be
|
updates
|
2 months ago |
haroon amjad
|
32adf754ce
|
prescription delivery implemented
|
2 months ago |
haroon amjad
|
9fd7f71a34
|
prescription delivery implementation contd
|
2 months ago |
faizatflutter
|
8068de70cb
|
Completed the HHC and CMC
|
2 months ago |
faizatflutter
|
5e437e42a9
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/features/location/location_view_model.dart
|
2 months ago |
faizatflutter
|
c84564dafd
|
minor changes
|
2 months ago |
Haroon Amjad
|
bad76059c0
|
prescription delivery implementation contd.
|
2 months ago |
haroon amjad
|
b90883a596
|
prescription order implementation contd.
|
2 months ago |
haroon amjad
|
1be430aa76
|
Merge branch 'master' into haroon_dev
|
2 months ago |
haroon amjad
|
fee84a2928
|
Nearest appointment implemented
|
2 months ago |
tahaalam
|
5983caf83a
|
single map screen added to the project for multiple place usage
|
2 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
|
2 months ago |
Sultan khan
|
d8a9d8443a
|
e-referral work done search-referral in progress.
|
2 months ago |
haroon amjad
|
eb9c38729b
|
Prescription delivery implementation contd.
|
2 months ago |
haroon amjad
|
07a3052b8e
|
appointment prescription implemented
|
2 months ago |
Fatimah.Alshammari
|
89ff10f506
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/theme/colors.dart
|
2 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
|
2 months ago |
faizatflutter
|
91e3e9387e
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/features/emergency_services/emergency_services_view_model.dart
|
2 months ago |
tahaalam
|
0e1a643c93
|
padding added to rrt screen
|
2 months ago |
haroon amjad
|
c03c84287c
|
Appointment details Lab & radiology integration implemented
|
2 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
|
2 months ago |
faizatflutter
|
fe00447483
|
HHC in Progress
|
2 months ago |
tahaalam
|
8f46dddbd6
|
terms and condition added to the rrt module.
|
2 months ago |
haroon amjad
|
ffca4317aa
|
updates
|
2 months ago |
faizatflutter
|
95bd2a2a7e
|
CMC Tweaks Completed
|
2 months ago |
tahaalam
|
f3676f5596
|
ui issues resolve for ambulance and rrt request
|
2 months ago |
haroon amjad
|
b13adde9d2
|
send feedback implementation done
|
2 months ago |
faizatflutter
|
da579dfd09
|
CMC Module Completed
|
2 months ago |
faizatflutter
|
3331edc10d
|
Comprehensive checkup Completed
|
2 months ago |
haroon amjad
|
a4e55cb6df
|
fixes
|
2 months ago |
haroon amjad
|
938463aabc
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/utils/date_util.dart
|
2 months ago |
haroon amjad
|
9f845f1de8
|
Feedback page implementation contd.
|
2 months ago |
tahaalam
|
31261092a8
|
rrt request creation and history listing
|
2 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
|
2 months ago |
Sultan khan
|
c43f96c619
|
e-referral work in progress
|
2 months ago |
faizatflutter
|
721bf95c1b
|
Comprehensive checkup in progress
|
2 months ago |
Fatimah.Alshammari
|
8191852f4d
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
|
2 months ago |
Fatimah.Alshammari
|
e17d3cde87
|
fix toggle
|
2 months ago |
Fatimah.Alshammari
|
77242825bb
|
fix toggle
|
2 months ago |
Haroon Amjad
|
73b05276f6
|
Feedback page implementation contd.
|
2 months ago |
Haroon Amjad
|
c88bff8cf2
|
todo update
|
2 months ago |
Haroon Amjad
|
37a0692be4
|
Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
|
2 months ago |
haroon amjad
|
f9f17f3a76
|
LiveChat implemented
|
2 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
|
2 months ago |
Sultan khan
|
171bd644d1
|
e-referral work in progress.
|
2 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
|
2 months ago |
Fatimah.Alshammari
|
eae16eec44
|
active medication
|
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 |
tahaalam
|
fbe5d35013
|
merge issues resolve for the ambulance request.
|
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 |
faizatflutter
|
16b5ff1b62
|
Ancillary Orders Flow Completed
|
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 |
tahaalam
|
1f852f63cf
|
penguin sdk added
|
2 months ago |
haroon amjad
|
096b2b7cbf
|
livechat implementation contd.
|
2 months ago |
haroon amjad
|
2a6c7fc0a1
|
Find us implemented
|
2 months ago |
tahaalam
|
5b0a8ad898
|
cancel and listing request added
|
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 |
haroon amjad
|
9a48421271
|
ER Online Check-In implemented
|
2 months ago |
faizatflutter
|
100d4bda9f
|
Completed Ancillary flow with CardPayments
|
2 months ago |
Haroon Amjad
|
cc1e073f6d
|
ER Online CheckIn implementation contd.
|
2 months ago |
haroon amjad
|
60bd9ee55a
|
ER Online CheckIn implementation contd.
|
2 months ago |
tahaalam
|
1ca39e1332
|
Ambulance order screens and geocoding request added
|
2 months ago |
Sultan khan
|
c701572dde
|
radiology search
|
2 months ago |
Sultan khan
|
028e03a97b
|
filter radiology
|
2 months ago |
haroon amjad
|
f280d4a28a
|
todo page implementation started
|
2 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
|
2 months ago |
haroon amjad
|
8dcc8dfbe3
|
updates
|
2 months ago |
faizatflutter
|
f96f3e563c
|
Fixed App CustomChip
|
2 months ago |
haroon amjad
|
8976f4db9d
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
# lib/presentation/medical_file/medical_file_page.dart
|
2 months ago |
haroon amjad
|
2160f87c59
|
updates
|
2 months ago |
faizatflutter
|
b698b74eb5
|
Design Updates
|
2 months ago |