devamirsaleemahmad
|
0e8c1a8b2f
|
Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/book_reminder_page.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/ToDoList/widgets/paymentDialog.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# pubspec.yaml
|
3 years ago |
devamirsaleemahmad
|
cbc38940ea
|
changes
|
3 years ago |
devamirsaleemahmad
|
ed748a626b
|
changes
|
3 years ago |
devamirsaleemahmad
|
23b7d85911
|
changes
|
3 years ago |
haroon amjad
|
81de6f9848
|
updated app to stores Version ID 11.0
|
3 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
|
3 years ago |
devamirsaleemahmad
|
49d3df8c87
|
changes
|
3 years ago |
Sultan khan
|
b45cbbcf29
|
updates
|
3 years ago |
haroon amjad
|
d11b12ac9a
|
no message
|
3 years ago |
haroon amjad
|
f0a4bd6925
|
Commented the CRs code
|
3 years ago |
haroon amjad
|
3f6c05825d
|
updates
|
3 years ago |
haroon amjad
|
4e962bda07
|
Merge branch 'development_v3.3' into PatientApp_VIDA_Plus_3.3
# Conflicts:
# lib/config/config.dart
# lib/core/model/labs/request_send_lab_report_email.dart
# lib/core/service/medical/ask_doctor_services.dart
# lib/core/service/medical/labs_service.dart
# lib/core/viewModels/medical/labs_view_model.dart
# lib/pages/conference/web_rtc/call_home_page_.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# lib/pages/medical/patient_sick_leave_page.dart
# lib/pages/webRTC/call_page.dart
# lib/pages/webRTC/signaling.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/LocalNotification.dart
# lib/uitl/SignalRUtil.dart
# lib/uitl/utils.dart
# lib/widgets/others/floating_button_search.dart
|
3 years ago |
haroon amjad
|
b2f390c19d
|
CR 6204 implemented
|
3 years ago |
haroon amjad
|
14928ad833
|
CR 6204
|
3 years ago |
haroon amjad
|
34d3cf2945
|
CR 6204 Lab reports enhancements in progress
|
3 years ago |
haroon amjad
|
df610690d5
|
updates
|
3 years ago |
haroon amjad
|
7bc105c6c7
|
updates
|
3 years ago |
haroon amjad
|
17e7886907
|
VidaPlus Project changes
|
3 years ago |
haroon amjad
|
670991eca4
|
Lab result fix
|
3 years ago |
haroon amjad
|
833818e6e3
|
Rad & Lab email issues fixes
|
4 years ago |
haroon amjad
|
0acc134e6e
|
Updates & fixes
|
5 years ago |
haroon amjad
|
7467da7409
|
Imports organized
|
5 years ago |
Sikander Saleem
|
bb20d65b40
|
lab result detail screen.
|
5 years ago |
Sikander Saleem
|
3a1af590ff
|
lab result detail screen (cont.)
|
5 years ago |
Mohammad Aljammal
|
de1e352e98
|
fix charts and vital sign
|
6 years ago |
Mohammad Aljammal
|
4d203c8a5b
|
fix LabResult
|
6 years ago |
haroon amjad
|
7edb0c8009
|
Doctor rating dialog revamped
|
6 years ago |
Mohammad Aljammal
|
fe66ee5993
|
fix lab result issues
|
6 years ago |
Mohammad Aljammal
|
1bbbd18373
|
labs services
|
6 years ago |