 haroon amjad
|
581a4a5a74
|
WalkIn Appointment implementation done
|
8 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
|
8 months ago |
|
haroon amjad
|
2b7379c1c3
|
Waiting appointment implementation in progress
|
8 months ago |
|
haroon amjad
|
36bf63dcde
|
Incoming call updates
|
9 months ago |
faizatflutter
|
ac84d268e9
|
triage design
|
9 months ago |
Sultan khan
|
ddac155a6a
|
silent login case handled.
|
9 months ago |
 tahaalam
|
393eaad2c7
|
Merge remote-tracking branch 'origin/master'
|
9 months ago |
|
tahaalam
|
e200479332
|
old calender util deleted
|
9 months ago |
|
tahaalam
|
e0e41d1900
|
calender reminder added on appointment and pescription
|
9 months ago |
|
haroon amjad
|
5a1c58e6b2
|
Merge branch 'master' into haroon_dev
|
9 months ago |
|
haroon amjad
|
1e5744cf44
|
Updates & enhancements
|
9 months ago |
|
faizatflutter
|
acb6d31ff3
|
Added possible conditions screen
|
9 months ago |
|
tahaalam
|
fc0f98da1d
|
calender reminder added
|
9 months ago |
|
Sultan khan
|
9e0336687c
|
virtual tour.
|
9 months ago |
|
faizatflutter
|
757ace2ba1
|
Added Organ Selector
|
9 months ago |
|
Sultan khan
|
2532b494f7
|
e-referral done.
|
9 months ago |
|
Sultan khan
|
a4d3bb3533
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
9 months ago |
|
Sultan khan
|
fb69723a65
|
e-referral done.
|
9 months ago |
|
haroon amjad
|
f142ff90be
|
updates
|
9 months ago |
|
haroon amjad
|
32adf754ce
|
prescription delivery implemented
|
9 months ago |
|
haroon amjad
|
9fd7f71a34
|
prescription delivery implementation contd
|
9 months ago |
|
faizatflutter
|
8068de70cb
|
Completed the HHC and CMC
|
9 months ago |
|
faizatflutter
|
5e437e42a9
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/features/location/location_view_model.dart
|
9 months ago |
|
faizatflutter
|
c84564dafd
|
minor changes
|
9 months ago |
Haroon Amjad
|
bad76059c0
|
prescription delivery implementation contd.
|
9 months ago |
|
haroon amjad
|
b90883a596
|
prescription order implementation contd.
|
9 months ago |
|
haroon amjad
|
1be430aa76
|
Merge branch 'master' into haroon_dev
|
9 months ago |
|
haroon amjad
|
fee84a2928
|
Nearest appointment implemented
|
9 months ago |
|
tahaalam
|
5983caf83a
|
single map screen added to the project for multiple place usage
|
9 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
|
9 months ago |
|
Sultan khan
|
d8a9d8443a
|
e-referral work done search-referral in progress.
|
9 months ago |
|
haroon amjad
|
eb9c38729b
|
Prescription delivery implementation contd.
|
9 months ago |
|
haroon amjad
|
07a3052b8e
|
appointment prescription implemented
|
9 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
|
9 months ago |
|
faizatflutter
|
91e3e9387e
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/features/emergency_services/emergency_services_view_model.dart
|
9 months ago |
|
tahaalam
|
0e1a643c93
|
padding added to rrt screen
|
9 months ago |
|
haroon amjad
|
c03c84287c
|
Appointment details Lab & radiology integration implemented
|
9 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
|
9 months ago |
|
faizatflutter
|
fe00447483
|
HHC in Progress
|
9 months ago |
|
tahaalam
|
8f46dddbd6
|
terms and condition added to the rrt module.
|
9 months ago |
|
haroon amjad
|
ffca4317aa
|
updates
|
9 months ago |
|
faizatflutter
|
95bd2a2a7e
|
CMC Tweaks Completed
|
9 months ago |
|
tahaalam
|
f3676f5596
|
ui issues resolve for ambulance and rrt request
|
9 months ago |
|
haroon amjad
|
b13adde9d2
|
send feedback implementation done
|
9 months ago |
|
faizatflutter
|
da579dfd09
|
CMC Module Completed
|
9 months ago |
|
faizatflutter
|
3331edc10d
|
Comprehensive checkup Completed
|
9 months ago |
|
haroon amjad
|
a4e55cb6df
|
fixes
|
9 months ago |
|
haroon amjad
|
938463aabc
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/utils/date_util.dart
|
9 months ago |
|
haroon amjad
|
9f845f1de8
|
Feedback page implementation contd.
|
9 months ago |
|
tahaalam
|
31261092a8
|
rrt request creation and history listing
|
9 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
|
9 months ago |
|
Sultan khan
|
c43f96c619
|
e-referral work in progress
|
9 months ago |
|
faizatflutter
|
721bf95c1b
|
Comprehensive checkup in progress
|
9 months ago |
|
Haroon Amjad
|
73b05276f6
|
Feedback page implementation contd.
|
9 months ago |
|
Haroon Amjad
|
c88bff8cf2
|
todo update
|
9 months ago |
|
Haroon Amjad
|
37a0692be4
|
Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
|
9 months ago |
|
haroon amjad
|
f9f17f3a76
|
LiveChat implemented
|
9 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
|
9 months ago |
|
Sultan khan
|
171bd644d1
|
e-referral work in progress.
|
9 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
|
9 months ago |
|
tahaalam
|
fbe5d35013
|
merge issues resolve for the ambulance request.
|
9 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
|
9 months ago |
|
faizatflutter
|
16b5ff1b62
|
Ancillary Orders Flow Completed
|
9 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
|
9 months ago |
|
tahaalam
|
1f852f63cf
|
penguin sdk added
|
9 months ago |
|
haroon amjad
|
096b2b7cbf
|
livechat implementation contd.
|
9 months ago |
|
haroon amjad
|
2a6c7fc0a1
|
Find us implemented
|
9 months ago |
|
tahaalam
|
5b0a8ad898
|
cancel and listing request added
|
9 months ago |
|
haroon amjad
|
14f57027f4
|
Eye measurements done
|
9 months ago |
|
haroon amjad
|
c600b0ee7a
|
Ask doctor implemented
|
9 months ago |
|
haroon amjad
|
21b7b32013
|
Ask doctor implementation contd.
|
9 months ago |
|
haroon amjad
|
9a48421271
|
ER Online Check-In implemented
|
9 months ago |
|
faizatflutter
|
100d4bda9f
|
Completed Ancillary flow with CardPayments
|
9 months ago |
|
Haroon Amjad
|
cc1e073f6d
|
ER Online CheckIn implementation contd.
|
9 months ago |
|
haroon amjad
|
60bd9ee55a
|
ER Online CheckIn implementation contd.
|
9 months ago |
|
tahaalam
|
1ca39e1332
|
Ambulance order screens and geocoding request added
|
9 months ago |
|
Sultan khan
|
c701572dde
|
radiology search
|
9 months ago |
|
Sultan khan
|
028e03a97b
|
filter radiology
|
10 months ago |
|
haroon amjad
|
f280d4a28a
|
todo page implementation started
|
10 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
|
10 months ago |
|
haroon amjad
|
8dcc8dfbe3
|
updates
|
10 months ago |
|
faizatflutter
|
f96f3e563c
|
Fixed App CustomChip
|
10 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
|
10 months ago |
|
haroon amjad
|
2160f87c59
|
updates
|
10 months ago |
|
faizatflutter
|
b698b74eb5
|
Design Updates
|
10 months ago |
|
aamir-csol
|
e113c4c1ee
|
updates & fixes & RRT Flow
|
10 months ago |
|
Haroon Amjad
|
2e16622cc3
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/utils/size_utils.dart
# lib/presentation/home/widgets/large_service_card.dart
|
10 months ago |
|
faizatflutter
|
dc5eba7d12
|
refactored code
|
10 months ago |
|
faizatflutter
|
28f8aec60f
|
resolved fSize issue
|
10 months ago |
|
aamir-csol
|
3e5c3a3a27
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
10 months ago |
|
Haroon6138
|
622851a1a0
|
Merge pull request 'Design Fixes for Responsiveness (faiz_dev)' (#88) from faiz_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/88
|
10 months ago |
|
faizatflutter
|
8c956fc052
|
Design changes
|
10 months ago |
|
aamir-csol
|
8123981092
|
Merge branch 'master' into dev_aamir
|
10 months ago |
|
aamir-csol
|
987fe73128
|
family screen add fixes & remove & switch & widgets
|
10 months ago |
|
haroon amjad
|
487b29fec3
|
Merge branch 'master' into haroon_dev
|
10 months ago |
|
aamir-csol
|
6f01f92dd0
|
Merge remote-tracking branch 'origin/faiz_dev' into dev_aamir
|
10 months ago |
|
aamir-csol
|
02ae79c458
|
Merge branch 'refs/heads/master' into dev_aamir
|
10 months ago |
|
tahaalam
|
57056e67f3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/widgets/buttons/custom_button.dart
|
10 months ago |
|
tahaalam
|
90128a812b
|
call ambulance module design added.
|
10 months ago |
|
faizatflutter
|
3e61df218b
|
Some Minor design updated
|
10 months ago |
|
haroon amjad
|
65220270c2
|
Size utils & fixes
|
10 months ago |
|
haroon amjad
|
3c81cffa75
|
Merge branch 'master' into haroon_dev
|
10 months ago |
|
haroon amjad
|
8a6f94cc1d
|
updates
|
10 months ago |
|
faizatflutter
|
72d765e508
|
Design Updates
|
10 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
|
10 months ago |
|
faizatflutter
|
462f4eba14
|
Design Updates
|
10 months ago |
|
faizatflutter
|
eabfaf8182
|
Design Updates
|
10 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
|
10 months ago |
|
haroon amjad
|
1f7a941aa0
|
RRT Services implementation contd.
|
10 months ago |
|
tahaalam
|
47d158c1e2
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
tahaalam
|
c146747e5e
|
nearest er clinic repo viewmodel and view added
|
10 months ago |
|
tahaalam
|
d9796154dc
|
Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
# lib/presentation/book_appointment/select_clinic_page.dart
|
10 months ago |
|
haroon amjad
|
d755eb0df8
|
contd.
|
10 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
|
10 months ago |
|
haroon amjad
|
d693850ef4
|
ER services implementation contd.
|
10 months ago |
|
tahaalam
|
baf7cf0ea0
|
dental routing fixed and laser exception removed
|
10 months ago |
|
tahaalam
|
a7bd5f61cb
|
Merge remote-tracking branch 'origin/master' into feature/lab_result
|
10 months ago |
|
tahaalam
|
9e3035f02b
|
units added to lab result and it graph and unwanted values removed from graph
|
10 months ago |
|
aamir-csol
|
58e65e7a64
|
Merge branch 'master' into dev_aamir
|
10 months ago |
|
aamir-csol
|
cd81372fc6
|
family screen add fixes & remove & switch & widgets
|
10 months ago |
|
haroon amjad
|
7a35f0ded6
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
10 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
|
10 months ago |
|
haroon amjad
|
5e1a7652be
|
lab report download implemented
|
10 months ago |
|
tahaalam
|
773cc9229b
|
Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
10 months ago |
|
tahaalam
|
cc458b2ec7
|
files and packages renamed
|
10 months ago |
|
tahaalam
|
81a6c7d034
|
files and packages renamed
|
10 months ago |
|
haroon amjad
|
e1ac77855c
|
Merge branch 'master' into haroon_dev
|
10 months ago |
|
Haroon6138
|
51d225e206
|
Merge pull request 'laser appointment screen added' (#78) from laser_appointment into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/78
|
10 months ago |
|
Haroon6138
|
084efb7d32
|
Merge pull request 'lab severity values handled and size of lab description fixed' (#80) from feature/lab_result into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/80
|
10 months ago |
|
tahaalam
|
ab74a61969
|
lab severity values handled and size of lab description fixed
|
10 months ago |
|
haroon amjad
|
1e08394ba1
|
Lab report PDF implementation contd.
|
10 months ago |
|
aamir-csol
|
bf8f98ffb1
|
family screen add fixes & remove & switch & widgets
|
10 months ago |
|
tahaalam
|
ea92a0c75c
|
laser appointment screen added
|
10 months ago |
|
haroon amjad
|
a2310e1447
|
prescription instructions PDF implemented
|
10 months ago |
|
haroon amjad
|
663eda0076
|
updates & fixes
|
10 months ago |
|
haroon amjad
|
fe5b6c35ac
|
insurance approval implementation done
|
10 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
|
10 months ago |
|
haroon amjad
|
25fa1acc9e
|
Medical file widgets, Insurance approval implementation contd.
|
10 months ago |
|
aamir-csol
|
24362f67cb
|
family screen & widgets
|
10 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
|
11 months ago |
|
aamir-csol
|
d918b6e464
|
family screen & widgets
|
11 months ago |
|
haroon amjad
|
9d48a00b21
|
Merge branch 'master' into haroon_dev
|
11 months ago |
|
haroon amjad
|
f1a60a9dfb
|
updates
|
11 months ago |
|
tahaalam
|
e5dcabacce
|
lab prescription details are added andgraph visibility added to the graph page for result that are IRR
|
11 months ago |
|
haroon amjad
|
d220be7283
|
Tamara payment flow done
|
11 months ago |
|
haroon amjad
|
30eb8bf5de
|
dental booking flow implemented
|
11 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
|
11 months ago |
|
haroon amjad
|
b05e4e2a15
|
Dental appointment booking flow implementation contd.
|
11 months ago |
|
haroon amjad
|
2b21086cc1
|
Dental appointment booking flow implementation contd.
|
11 months 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
|
11 months ago |