Commit Graph

99 Commits (79beaf6fb704cbb99a0f7e8829f8feb36d02e0e7)

Author SHA1 Message Date
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
1 month ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 1 month ago
faizatflutter 2ffd4cc1ae Integrated the API for Symptoms Checker 1 month ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 1 month 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
1 month 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
1 month ago
haroon amjad 36bf63dcde Incoming call updates 1 month ago
tahaalam e200479332 old calender util deleted 2 months ago
tahaalam e0e41d1900 calender reminder added on appointment and pescription 2 months ago
haroon amjad 1e5744cf44 Updates & enhancements 2 months ago
tahaalam fc0f98da1d calender reminder added 2 months ago
faizatflutter 757ace2ba1 Added Organ Selector 2 months ago
haroon amjad 9fd7f71a34 prescription delivery implementation contd 2 months ago
faizatflutter 8068de70cb Completed the HHC and CMC 2 months ago
haroon amjad 07a3052b8e appointment prescription implemented 2 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
2 months ago
haroon amjad c03c84287c Appointment details Lab & radiology integration implemented 2 months ago
haroon amjad ffca4317aa updates 2 months ago
haroon amjad b13adde9d2 send feedback implementation done 2 months ago
faizatflutter 3331edc10d Comprehensive checkup Completed 2 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 2 months ago
Haroon Amjad 37a0692be4 Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev 2 months ago
haroon amjad f9f17f3a76 LiveChat implemented 2 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
2 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
2 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
2 months ago
tahaalam 5b0a8ad898 cancel and listing request added 2 months ago
haroon amjad 14f57027f4 Eye measurements done 2 months ago
haroon amjad c600b0ee7a Ask doctor implemented 2 months ago
haroon amjad 21b7b32013 Ask doctor implementation contd. 2 months ago
haroon amjad 9a48421271 ER Online Check-In implemented 2 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 2 months ago
Haroon Amjad cc1e073f6d ER Online CheckIn implementation contd. 2 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 2 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
2 months ago
haroon amjad 8dcc8dfbe3 updates 2 months ago
faizatflutter f96f3e563c Fixed App CustomChip 2 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
2 months ago
faizatflutter b698b74eb5 Design Updates 2 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
3 months ago
faizatflutter 8c956fc052 Design changes 3 months ago
haroon amjad 65220270c2 Size utils & fixes 3 months ago
faizatflutter 72d765e508 Design Updates 3 months ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 3 months ago
tahaalam ea92a0c75c laser appointment screen added 3 months ago
haroon amjad 663eda0076 updates & fixes 3 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 3 months ago
haroon amjad f1a60a9dfb updates 3 months ago
haroon amjad d220be7283 Tamara payment flow done 3 months ago
haroon amjad 30eb8bf5de dental booking flow implemented 3 months ago