 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 |
|
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 |
|
faizatflutter
|
95bd2a2a7e
|
CMC Tweaks Completed
|
11 months ago |
 tahaalam
|
f3676f5596
|
ui issues resolve for ambulance and rrt request
|
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 |
|
faizatflutter
|
721bf95c1b
|
Comprehensive checkup in progress
|
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 |
|
tahaalam
|
525504265c
|
issue resolution
|
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 |
|
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 |
|
haroon amjad
|
2a6c7fc0a1
|
Find us implemented
|
11 months ago |
|
tahaalam
|
5b0a8ad898
|
cancel and listing request added
|
11 months ago |
|
faizatflutter
|
100d4bda9f
|
Completed Ancillary flow with CardPayments
|
11 months ago |
|
tahaalam
|
1ca39e1332
|
Ambulance order screens and geocoding request added
|
11 months ago |
|
Sultan khan
|
c701572dde
|
radiology search
|
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 |
|
haroon amjad
|
8dcc8dfbe3
|
updates
|
11 months ago |
|
faizatflutter
|
f96f3e563c
|
Fixed App CustomChip
|
11 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
|
11 months ago |
|
faizatflutter
|
b698b74eb5
|
Design Updates
|
11 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
|
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 |
|
haroon amjad
|
487b29fec3
|
Merge branch 'master' into haroon_dev
|
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 |
|
haroon amjad
|
65220270c2
|
Size utils & fixes
|
12 months ago |
|
faizatflutter
|
72d765e508
|
Design Updates
|
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 |
|
faizatflutter
|
eabfaf8182
|
Design Updates
|
12 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
|
12 months ago |
|
haroon amjad
|
1f7a941aa0
|
RRT Services implementation contd.
|
12 months ago |
|
tahaalam
|
47d158c1e2
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
tahaalam
|
c146747e5e
|
nearest er clinic repo viewmodel and view added
|
12 months 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 |