haroon amjad
|
3f22d69058
|
Merge branch 'dev_v3.13.6' into dev_3.13.6_CR5047_LiveCare_Enhancements
# Conflicts:
# lib/config/config.dart
# lib/main.dart
# lib/splashPage.dart
# lib/uitl/CalendarUtils.dart
# lib/uitl/translations_delegate_base.dart
|
1 year ago |
haroon amjad
|
e0de0768b6
|
CR 7241 changes, ProjectID added in radiology results if navigating from appointment details
|
1 year ago |
haroon amjad
|
ab33d06b91
|
Fix for VIDA4 Lab Special Result
|
1 year ago |
haroon amjad
|
d474eb9a24
|
Code commented for Lab result widget, ER Online CheckIn QR & location check-in & Patient occupation selection to publish laser clinic changes to store - VersionID 17.0
|
1 year ago |
haroon amjad
|
545cfcd6d9
|
updates
|
1 year ago |
haroon amjad
|
924c111771
|
Lab result widget fixes
|
1 year ago |
haroon amjad
|
cfcba179c4
|
CR 7241 Lab result enhancement code merged
|
1 year ago |
haroon amjad
|
b80e171d25
|
Merge branch 'dev_3.3_LabReportEnhancementCR' into dev_3.13.6_Development
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/model/labs/patient_lab_orders.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/widgets/charts/show_chart.dart
# lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
# lib/widgets/my_rich_text.dart
|
1 year ago |
haroon amjad
|
f58e07d789
|
Merge branch 'dev_v3.13.6' into dev_3.13.6_CR5047_LiveCare_Enhancements
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/conference/zoom/call_screen.dart
# lib/uitl/translations_delegate_base.dart
|
1 year ago |
haroon amjad
|
dc17576c26
|
Flutter version upgraded to 3.22.0
|
1 year ago |
haroon amjad
|
98389e3f68
|
LiveCare Call Type implemented
|
1 year ago |
haroon amjad
|
2b560840aa
|
lab special result fix
|
2 years ago |
Sultan khan
|
21e4bb5138
|
error code 699 fixes
|
2 years ago |
Sultan khan
|
08b4c8f86e
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
# lib/config/config.dart
# lib/core/viewModels/project_view_model.dart
# lib/main.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/landing/landing_page.dart
# lib/pages/livecare/widgets/LiveCareHistoryCard.dart
# lib/pages/medical/eye/ContactLensPage.dart
# lib/pages/medical/medical_profile_page_new.dart
# lib/uitl/LocalNotification.dart
# lib/uitl/gif_loader_dialog_utils.dart
# lib/widgets/Loader/gif_loader_container.dart
# lib/widgets/data_display/medical/time_line_new_widget.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
2 years ago |
haroon amjad
|
d6dacfb743
|
Load more added in appointments timeline.
|
2 years ago |
haroon amjad
|
5256d8873f
|
ToDo & Appo Timeline changes
|
2 years ago |
Aamir Muhammad
|
b6d222a7ea
|
JIRA Fixes
|
2 years ago |
Sultan khan
|
4338da513d
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/core/model/labs/patient_lab_orders.dart
# lib/core/model/labs/request_patient_lab_special_result.dart
# lib/core/model/labs/request_send_lab_report_email.dart
# lib/core/model/radiology/final_radiology.dart
# lib/core/model/radiology/request_send_rad_report_email.dart
# lib/core/model/rate/appoitment_rated.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/medical/labs_service.dart
# lib/core/service/medical/radiology_service.dart
# lib/core/viewModels/medical/labs_view_model.dart
# lib/core/viewModels/medical/radiology_view_model.dart
# lib/models/Authentication/check_activation_code_request.dart
# lib/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/pages/DrawerPages/notifications/notification_details_page.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/landing/landing_page.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/login/confirm-login.dart
# lib/pages/login/login.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/services/authentication/auth_provider.dart
# lib/splashPage.dart
# lib/uitl/push-notification-handler.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
2 years ago |
haroon amjad
|
faf3bbdd9e
|
Unit column position changed
|
2 years ago |
Aamir Muhammad
|
77651f9652
|
Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/project_view_model.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/pages/login/confirm-login.dart
# lib/pages/paymentService/payment_service.dart
# lib/uitl/push-notification-handler.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/uitl/utils_new.dart
# lib/widgets/avatar/large_avatar.dart
# lib/widgets/bottom_navigation/bottom_navigation_item.dart
# lib/widgets/bottom_options/BottomSheet.dart
# lib/widgets/data_display/medical/medical_profile_item.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
2 years ago |
Sultan khan
|
f2079d4bbd
|
payment fix
|
2 years ago |
Sultan khan
|
8c46d2577d
|
updated with assets
|
2 years ago |
Aamir Muhammad
|
b4bc99369f
|
Changes into Rating Bar
|
2 years ago |
Sultan khan
|
413535ef0b
|
null safety fixed.
|
2 years ago |
haroon amjad
|
7d2744d29c
|
Lab report CR implemented
|
2 years ago |
haroon amjad
|
a6a541b903
|
Lab Orders CR implementation contd.
|
2 years ago |
devamirsaleemahmad
|
8f591654a5
|
changes
|
2 years ago |
devamirsaleemahmad
|
cbc38940ea
|
changes
|
2 years ago |
devamirsaleemahmad
|
ed748a626b
|
changes
|
2 years ago |
devamirsaleemahmad
|
23b7d85911
|
changes
|
2 years ago |
devamirsaleemahmad
|
4231c85055
|
Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/core/model/labs/patient_lab_orders.dart
# lib/core/model/labs/request_patient_lab_special_result.dart
# lib/core/model/labs/request_send_lab_report_email.dart
# lib/core/model/privilege/VidaPlusProjectListModel.dart
# lib/core/model/radiology/final_radiology.dart
# lib/core/model/radiology/request_send_rad_report_email.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/medical/labs_service.dart
# lib/core/service/medical/radiology_service.dart
# lib/core/service/privilege_service.dart
# lib/core/viewModels/medical/labs_view_model.dart
# lib/core/viewModels/medical/radiology_view_model.dart
# lib/core/viewModels/project_view_model.dart
# lib/models/anicllary-orders/ancillary_order_list_model.dart
# lib/models/anicllary-orders/ancillary_orders_proc_list.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/Blood/confirm_payment_page.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/Covid-DriveThru/covid-payment-summary.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/pages/insurance/insurance_update_screen.dart
# lib/pages/login/login.dart
# lib/pages/medical/ask_doctor/doctor_response.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/pages/medical/balance/my_balance_page.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/pages/medical/radiology/radiology_home_page.dart
# lib/pages/paymentService/payment_service.dart
# lib/splashPage.dart
# lib/uitl/utils.dart
# lib/widgets/bottom_navigation/bottom_navigation_item.dart
# lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
# lib/widgets/data_display/medical/doctor_card.dart
# lib/widgets/data_display/medical/medical_profile_item.dart
# pubspec.yaml
|
2 years ago |
haroon amjad
|
13b2db47b5
|
HMC color change applied in my appointments
|
2 years ago |
haroon amjad
|
0a478e077a
|
QR Code checkin implemented
|
2 years ago |
devamirsaleemahmad
|
720c0ac6e9
|
changes & Deletion
|
2 years ago |
devamirsaleemahmad
|
1c19b36d2d
|
models updates -> 3.13.6
|
2 years ago |
Sultan khan
|
391331f508
|
code update in progress
|
2 years ago |
Sultan khan
|
04244675e1
|
code updated.
|
2 years ago |
Sultan khan
|
8bf5479f56
|
code updated.
|
2 years ago |
Sultan khan
|
b45cbbcf29
|
updates
|
2 years ago |
haroon amjad
|
7c804f77fb
|
updates & fixes
|
2 years ago |
haroon amjad
|
17e7886907
|
VidaPlus Project changes
|
3 years ago |
haroon amjad
|
906fd5fd6a
|
Inpatient services in dev
|
3 years ago |
haroon amjad
|
5a741bf270
|
Sickleave changes
|
3 years ago |
haroon amjad
|
670991eca4
|
Lab result fix
|
3 years ago |
haroon amjad
|
1eed379889
|
Lab result flowchart fix
|
3 years ago |
haroon amjad
|
aafdf3760d
|
added sick leave status text & color
|
3 years ago |
Zohaib Iqbal Kambrani
|
35b129fb68
|
migrated project to latest flutter sdk
|
3 years ago |
haroon amjad
|
dfa88b7de7
|
Updates, fixes & release VersionID 9.1
|
3 years ago |
haroon amjad
|
58a6dc6a6f
|
Tamara & Apple Pay Fixes + Other Updates
|
3 years ago |
Zohaib Iqbal Kambrani
|
99bdd25bd3
|
added more analytics logs
|
4 years ago |