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 |
Sultan khan
|
9e0336687c
|
virtual tour.
|
11 months ago |
|
Sultan khan
|
fb69723a65
|
e-referral done.
|
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 |
 haroon amjad
|
eb9c38729b
|
Prescription delivery implementation contd.
|
11 months ago |
|
haroon amjad
|
07a3052b8e
|
appointment prescription implemented
|
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 |
|
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 |
|
haroon amjad
|
ffca4317aa
|
updates
|
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 |
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 |
|
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 |
|
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 |
|
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 |
|
faizatflutter
|
100d4bda9f
|
Completed Ancillary flow with CardPayments
|
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 |
|
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
|
11 months ago |
|
faizatflutter
|
b698b74eb5
|
Design Updates
|
11 months ago |
|
aamir-csol
|
e113c4c1ee
|
updates & fixes & RRT Flow
|
11 months ago |
|
aamir-csol
|
3e5c3a3a27
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
12 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
|
12 months ago |
|
faizatflutter
|
8c956fc052
|
Design changes
|
12 months ago |
|
aamir-csol
|
8123981092
|
Merge branch 'master' into dev_aamir
|
12 months ago |
|
aamir-csol
|
987fe73128
|
family screen add fixes & remove & switch & widgets
|
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
|
3e61df218b
|
Some Minor design updated
|
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
|
12 months ago |
|
faizatflutter
|
462f4eba14
|
Design Updates
|
12 months ago |
|
haroon amjad
|
4b52862ba0
|
updates
|
12 months ago |