Commit Graph

124 Commits (lab-result-changes)

Author SHA1 Message Date
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 8 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
8 months ago
aamir-csol d256eec392 medical file changes 8 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
8 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
8 months ago
haroon amjad 36bf63dcde Incoming call updates 8 months ago
tahaalam e200479332 old calender util deleted 8 months ago
tahaalam e0e41d1900 calender reminder added on appointment and pescription 8 months ago
haroon amjad 5a1c58e6b2 Merge branch 'master' into haroon_dev 8 months ago
tahaalam fc0f98da1d calender reminder added 8 months ago
Sultan khan 9e0336687c virtual tour. 8 months ago
haroon amjad fee84a2928 Nearest appointment implemented 8 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
8 months ago
Sultan khan d8a9d8443a e-referral work done search-referral in progress. 8 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
8 months ago
faizatflutter da579dfd09 CMC Module Completed 8 months ago
tahaalam 31261092a8 rrt request creation and history listing 9 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 9 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
9 months ago
tahaalam fbe5d35013 merge issues resolve for the ambulance request. 9 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
9 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
9 months ago
tahaalam 5b0a8ad898 cancel and listing request added 9 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 9 months ago
haroon amjad 60bd9ee55a ER Online CheckIn implementation contd. 9 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 9 months ago
faizatflutter b698b74eb5 Design Updates 9 months ago
faizatflutter 8c956fc052 Design changes 9 months ago
faizatflutter 3e61df218b Some Minor design updated 10 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
10 months ago
faizatflutter 462f4eba14 Design Updates 10 months ago
faizatflutter eabfaf8182 Design Updates 10 months ago
tahaalam d480798053 location dennied forever handled and error builder added to the image network 10 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 10 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
10 months ago
aamir-csol d918b6e464 family screen & widgets 10 months ago
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 10 months ago
haroon amjad f1a60a9dfb updates 10 months ago
tahaalam 61007302c9 appointment date filter handled 10 months ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 10 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 10 months ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 10 months 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
10 months ago
haroon amjad 6b28b57307 empty state implementation contd. 10 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 10 months ago
haroon amjad a07369165d Updates 10 months ago
aamir-csol 45a1ce9254 Merge branch 'master' into dev_aamir 10 months ago
Sikander Saleem 604e503e52 flow improvement & translation added. 10 months ago
aamir-csol 192d617350 family screen & widgets 10 months ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
10 months ago