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
|
10 months ago |
 haroon amjad
|
e72e67d9bf
|
Appointment Queue implemented, Blood Donation implementation contd.
|
10 months ago |
|
faizatflutter
|
2ffd4cc1ae
|
Integrated the API for Symptoms Checker
|
10 months 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
|
10 months ago |
|
aamir-csol
|
d256eec392
|
medical file changes
|
10 months 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
|
10 months 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
|
10 months 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
|
10 months ago |
|
haroon amjad
|
36bf63dcde
|
Incoming call updates
|
10 months ago |
 tahaalam
|
e200479332
|
old calender util deleted
|
10 months ago |
|
tahaalam
|
e0e41d1900
|
calender reminder added on appointment and pescription
|
10 months ago |
|
haroon amjad
|
5a1c58e6b2
|
Merge branch 'master' into haroon_dev
|
10 months ago |
|
tahaalam
|
fc0f98da1d
|
calender reminder added
|
10 months ago |
Sultan khan
|
9e0336687c
|
virtual tour.
|
10 months ago |
|
faizatflutter
|
757ace2ba1
|
Added Organ Selector
|
10 months ago |
|
haroon amjad
|
fee84a2928
|
Nearest appointment implemented
|
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 |
|
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
|
da579dfd09
|
CMC Module Completed
|
11 months ago |
|
tahaalam
|
31261092a8
|
rrt request creation and history listing
|
11 months ago |
|
faizatflutter
|
721bf95c1b
|
Comprehensive checkup 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
|
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 |
|
tahaalam
|
5b0a8ad898
|
cancel and listing request added
|
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 |
|
faizatflutter
|
b698b74eb5
|
Design Updates
|
11 months ago |
|
faizatflutter
|
8c956fc052
|
Design changes
|
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 |
|
faizatflutter
|
eabfaf8182
|
Design Updates
|
12 months ago |
|
tahaalam
|
d480798053
|
location dennied forever handled and error builder added to the image network
|
12 months ago |
|
tahaalam
|
c146747e5e
|
nearest er clinic repo viewmodel and view added
|
12 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
|
1 year ago |
|
aamir-csol
|
d918b6e464
|
family screen & widgets
|
1 year ago |
|
haroon amjad
|
9d48a00b21
|
Merge branch 'master' into haroon_dev
|
1 year ago |
|
haroon amjad
|
f1a60a9dfb
|
updates
|
1 year ago |
|
tahaalam
|
61007302c9
|
appointment date filter handled
|
1 year ago |
|
haroon amjad
|
415c0eb3c7
|
Dental appointment booking implementation contd.
|
1 year ago |
|
haroon amjad
|
3418480122
|
Immediate LiveCare implementation completed
|
1 year ago |
|
haroon amjad
|
10b77206f6
|
Immediate LiveCare consultation implementation contd.
|
1 year ago |
|
aamir-csol
|
e5488299b8
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/presentation/my_family/widget/family_cards.dart
# lib/widgets/chip/app_custom_chip_widget.dart
# lib/widgets/common_bottom_sheet.dart
|
1 year ago |
|
haroon amjad
|
6b28b57307
|
empty state implementation contd.
|
1 year ago |
Haroon Amjad
|
62e82a7a31
|
Empty data state implementation contd.
|
1 year ago |
|
haroon amjad
|
a07369165d
|
Updates
|
1 year ago |