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
|
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 |
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
|
224463feb4
|
closing the login first dialog
|
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
|
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 |
Haroon Amjad
|
73b05276f6
|
Feedback page implementation contd.
|
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 |
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
|
7d64f78246
|
merge changes
|
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 |
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
|
028e03a97b
|
filter radiology
|
2 months ago |
haroon amjad
|
8dcc8dfbe3
|
updates
|
2 months ago |
aamir-csol
|
e113c4c1ee
|
updates & fixes & RRT Flow
|
3 months ago |
aamir-csol
|
8123981092
|
Merge branch 'master' into dev_aamir
|
3 months ago |
aamir-csol
|
02ae79c458
|
Merge branch 'refs/heads/master' into dev_aamir
|
3 months ago |
tahaalam
|
57056e67f3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/widgets/buttons/custom_button.dart
|
3 months ago |
tahaalam
|
90128a812b
|
call ambulance module design added.
|
3 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
|
3 months ago |
faizatflutter
|
462f4eba14
|
Design Updates
|
3 months ago |
haroon amjad
|
4b52862ba0
|
updates
|
3 months ago |
faizatflutter
|
eabfaf8182
|
Design Updates
|
3 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
|
3 months ago |
haroon amjad
|
1f7a941aa0
|
RRT Services implementation contd.
|
3 months ago |
tahaalam
|
47d158c1e2
|
Merge remote-tracking branch 'origin/master'
|
3 months ago |
tahaalam
|
c146747e5e
|
nearest er clinic repo viewmodel and view added
|
3 months ago |
tahaalam
|
d9796154dc
|
Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
# lib/presentation/book_appointment/select_clinic_page.dart
|
3 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
|
3 months ago |
haroon amjad
|
d693850ef4
|
ER services implementation contd.
|
3 months ago |
tahaalam
|
baf7cf0ea0
|
dental routing fixed and laser exception removed
|
3 months ago |
tahaalam
|
a7bd5f61cb
|
Merge remote-tracking branch 'origin/master' into feature/lab_result
|
3 months ago |
tahaalam
|
9e3035f02b
|
units added to lab result and it graph and unwanted values removed from graph
|
3 months ago |
aamir-csol
|
58e65e7a64
|
Merge branch 'master' into dev_aamir
|
3 months ago |
aamir-csol
|
cd81372fc6
|
family screen add fixes & remove & switch & widgets
|
3 months ago |
haroon amjad
|
7a35f0ded6
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
3 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
|
3 months ago |
haroon amjad
|
5e1a7652be
|
lab report download implemented
|
3 months ago |
haroon amjad
|
e1ac77855c
|
Merge branch 'master' into haroon_dev
|
3 months ago |
haroon amjad
|
1e08394ba1
|
Lab report PDF implementation contd.
|
3 months ago |
aamir-csol
|
bf8f98ffb1
|
family screen add fixes & remove & switch & widgets
|
3 months ago |
tahaalam
|
ea92a0c75c
|
laser appointment screen added
|
3 months ago |
haroon amjad
|
a2310e1447
|
prescription instructions PDF implemented
|
3 months ago |
haroon amjad
|
663eda0076
|
updates & fixes
|
3 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
|
3 months ago |
haroon amjad
|
25fa1acc9e
|
Medical file widgets, Insurance approval implementation contd.
|
3 months ago |
aamir-csol
|
24362f67cb
|
family screen & widgets
|
3 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
|
3 months ago |
aamir-csol
|
d918b6e464
|
family screen & widgets
|
3 months ago |
haroon amjad
|
9d48a00b21
|
Merge branch 'master' into haroon_dev
|
3 months 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
|
3 months ago |
haroon amjad
|
f1a60a9dfb
|
updates
|
3 months ago |
tahaalam
|
61007302c9
|
appointment date filter handled
|
3 months ago |
tahaalam
|
e5dcabacce
|
lab prescription details are added andgraph visibility added to the graph page for result that are IRR
|
3 months ago |
haroon amjad
|
d220be7283
|
Tamara payment flow done
|
3 months ago |
haroon amjad
|
30eb8bf5de
|
dental booking flow implemented
|
3 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
|
3 months ago |
haroon amjad
|
b05e4e2a15
|
Dental appointment booking flow implementation contd.
|
3 months ago |
haroon amjad
|
2b21086cc1
|
Dental appointment booking flow implementation contd.
|
3 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
|
3 months ago |
tahaalam
|
6cf08c04d2
|
appointment filters added.
|
3 months ago |
haroon amjad
|
415c0eb3c7
|
Dental appointment booking implementation contd.
|
3 months ago |
haroon amjad
|
8291e89ee7
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/book_appointment/select_clinic_page.dart
|
3 months 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
|
3 months ago |
tahaalam
|
bbf83d4dc9
|
bottom handled when dental and laser clinic is selected from clinic page
|
3 months ago |
haroon amjad
|
3d64ddf78b
|
Merge branch 'master' into haroon_dev
|
3 months ago |
haroon amjad
|
db979977ca
|
Tamara implementation & enhancements
|
3 months 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
|
3 months ago |