Commit Graph

541 Commits (3d8daeb58dd73ae0d256da54fd7dd8c3feba1301)

Author SHA1 Message Date
Sultan khan 9e0336687c virtual tour. 11 months ago
faizatflutter 757ace2ba1 Added Organ Selector 11 months ago
Sultan khan 2532b494f7 e-referral done. 11 months ago
Sultan khan a4d3bb3533 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 11 months ago
Sultan khan fb69723a65 e-referral done. 11 months ago
haroon amjad f142ff90be updates 11 months ago
haroon amjad 32adf754ce prescription delivery implemented 11 months ago
haroon amjad 9fd7f71a34 prescription delivery implementation contd 11 months ago
faizatflutter 8068de70cb Completed the HHC and CMC 11 months ago
faizatflutter 5e437e42a9 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/location/location_view_model.dart
11 months ago
faizatflutter c84564dafd minor changes 11 months ago
Haroon Amjad bad76059c0 prescription delivery implementation contd. 11 months ago
haroon amjad b90883a596 prescription order implementation contd. 11 months ago
haroon amjad 1be430aa76 Merge branch 'master' into haroon_dev 11 months ago
haroon amjad fee84a2928 Nearest appointment implemented 11 months ago
tahaalam cbaea9d5e6 screen documentation added. 11 months ago
tahaalam 5983caf83a single map screen added to the project for multiple place usage 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
Fatimah.Alshammari 89ff10f506 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/theme/colors.dart
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
faizatflutter 91e3e9387e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/emergency_services/emergency_services_view_model.dart
11 months ago
tahaalam 0e1a643c93 padding added to rrt screen 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
tahaalam 224463feb4 closing the login first dialog 11 months ago
tahaalam 8f46dddbd6 terms and condition added to the rrt module. 11 months ago
haroon amjad ffca4317aa updates 11 months ago
faizatflutter 95bd2a2a7e CMC Tweaks Completed 11 months ago
tahaalam f3676f5596 ui issues resolve for ambulance and rrt request 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 a4e55cb6df fixes 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
Fatimah.Alshammari 8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
11 months ago
Fatimah.Alshammari e17d3cde87 fix toggle 11 months ago
Fatimah.Alshammari 77242825bb fix toggle 11 months ago
Haroon Amjad 73b05276f6 Feedback page implementation contd. 11 months ago
Haroon Amjad c88bff8cf2 todo update 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
Fatimah.Alshammari 27ad4e0764 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/home/landing_page.dart
11 months ago
Fatimah.Alshammari eae16eec44 active medication 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
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
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 096b2b7cbf livechat implementation contd. 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
haroon amjad c600b0ee7a Ask doctor implemented 11 months ago
haroon amjad 21b7b32013 Ask doctor implementation contd. 12 months ago
haroon amjad 9a48421271 ER Online Check-In implemented 12 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 12 months ago
Haroon Amjad cc1e073f6d ER Online CheckIn implementation contd. 12 months ago
haroon amjad 60bd9ee55a ER Online CheckIn implementation contd. 12 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 12 months ago
Sultan khan c701572dde radiology search 12 months ago
Sultan khan 028e03a97b filter radiology 12 months ago
haroon amjad f280d4a28a todo page implementation started 12 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
12 months ago
haroon amjad 8dcc8dfbe3 updates 12 months ago
faizatflutter f96f3e563c Fixed App CustomChip 12 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
12 months ago
haroon amjad 2160f87c59 updates 12 months ago
faizatflutter b698b74eb5 Design Updates 12 months ago
aamir-csol e113c4c1ee updates & fixes & RRT Flow 12 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
1 year ago
faizatflutter dc5eba7d12 refactored code 1 year ago
faizatflutter 28f8aec60f resolved fSize issue 1 year ago
aamir-csol 3e5c3a3a27 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 year 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
1 year ago
faizatflutter 8c956fc052 Design changes 1 year ago
Fatimah.Alshammari 3f123d12d6 Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/utils/utils.dart
#	lib/main.dart
1 year ago
Fatimah.Alshammari de8c7bc605 active medication 1 year ago
aamir-csol 8123981092 Merge branch 'master' into dev_aamir 1 year ago
aamir-csol 987fe73128 family screen add fixes & remove & switch & widgets 1 year ago
haroon amjad 487b29fec3 Merge branch 'master' into haroon_dev 1 year ago
aamir-csol 6f01f92dd0 Merge remote-tracking branch 'origin/faiz_dev' into dev_aamir 1 year ago
aamir-csol 02ae79c458 Merge branch 'refs/heads/master' into dev_aamir 1 year ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
1 year ago
tahaalam 90128a812b call ambulance module design added. 1 year ago
faizatflutter 3e61df218b Some Minor design updated 1 year ago
haroon amjad 65220270c2 Size utils & fixes 1 year ago
haroon amjad 3c81cffa75 Merge branch 'master' into haroon_dev 1 year ago