Syed Taha Alam
2824abcc87
WD: lab result changed.
...
* value to show graph is changed and from type to resultID if it is null or 6 then it will not be visible.
* list reversed for showing the graph and lab results.
* actual value is being displayed on the spots clicked.
7 months ago
Syed Taha Alam
5461d78a1b
Wd: graph added with the threshold
7 months ago
Syed Taha Alam
e79c521ea9
Wd: Result type id 5 is toggle the visibility of the graph of the lab result screen.
8 months ago
haroon amjad
dbfe9663a5
Merge branch 'dev_v3.13.6' into dev_v3.13.6_CR_7211_Lab_report_changes
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
# pubspec.yaml
9 months ago
haroon amjad
1ee86d0813
PDF report implemented for Lab, Rad, Prescription, SickLeave & Medical Report.
10 months ago
taha.alam
5dbd97aa46
WD: hospital name selection change
11 months ago
taha.alam
ca965a6d06
WD:String value change and context changes
11 months ago
taha.alam
e6fcb1fddf
WD:select hospital by region changes
11 months ago
taha.alam
eafb7f5f7b
WD: lab report changes along with the cross added to the FlowChartPage.dart
1 year ago
taha.alam
636a67b720
WD: lab result changes of IRR.
1 year ago
taha.alam
9047ebf723
Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_CR_7211_Lab_report_changes
...
# Conflicts:
# android/app/build.gradle
# android/app/src/main/AndroidManifest.xml
# android/build.gradle
# android/gradle.properties
# android/settings.gradle
# lib/config/localized_values.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/data_display/medical/LabResult/Lab_Result_details_wideget.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
# pubspec.yaml
1 year ago
taha.alam
3d27fbdea8
WD: lab report changes
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
c58cbae99c
InPatient prescription send email issue fixed
1 year ago
Sultan khan
c9be715436
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/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/Blood/blood_donation.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/medical/balance/confirm_payment_page.dart
2 years ago
haroon amjad
69e64fd5fb
Blood Donation CR merged into dev_3.3
2 years ago
Sultan khan
6983e309e0
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# android/build.gradle
# android/gradle.properties
# ios/Runner.xcodeproj/project.pbxproj
# lib/config/config.dart
# lib/core/model/prescriptions/prescription_report_inp.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/DentalComplaints.dart
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/components/DocAvailableAppointments.dart
# lib/pages/BookAppointment/widgets/DoctorView.dart
# lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/services/clinic_services/get_clinic_service.dart
# pubspec.yaml
2 years ago
Sultan khan
90dc8e5e05
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
# lib/main.dart
# lib/models/LiveCare/ApplePayInsertRequest.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/gif_loader_dialog_utils.dart
# lib/uitl/location_util.dart
# pubspec.yaml
2 years ago
haroon amjad
e28805f70f
updates
2 years ago
Sultan khan
30c14c2167
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
# ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
# lib/core/model/reports/Reports.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/medical/ask_doctor_view_model.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/PrescriptionReport.dart
# lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/medical/eye/EyeHomePage.dart
# lib/pages/medical/reports/report_list_widget.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/location_util.dart
# lib/uitl/utils.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
2 years ago
haroon amjad
b39357a497
Medical report changes, Loading added in Location Check-In
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
c6c4f933b2
Invoice Type param added in Labs & Rad
2 years ago
haroon amjad
421bae2037
updates
2 years ago
haroon amjad
beb3453ff5
updates
2 years ago
devamirsaleemahmad
2def9f3744
Merges From 3.3
2 years ago
devamirsaleemahmad
d73cc13100
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/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/splashPage.dart
# lib/uitl/utils.dart
2 years ago
haroon amjad
245716119e
Location based Check In implemented
2 years ago
Sultan khan
c96c151f44
null safety issue fixed.
2 years ago
haroon amjad
a6a541b903
Lab Orders CR implementation contd.
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
devamirsaleemahmad
3f1ba19c64
changes & Null to Dynamic
2 years ago
haroon amjad
13b2db47b5
HMC color change applied in my appointments
2 years ago
Sultan khan
40656a65d8
update in progress
2 years ago
devamirsaleemahmad
1c19b36d2d
models updates -> 3.13.6
2 years ago
Sultan khan
391331f508
code update in progress
2 years ago
devamirsaleemahmad
971bab465c
models updates -> 3.13.6
2 years ago
devamirsaleemahmad
cb56750e6b
models updates -> 3.13.6
2 years ago
devamirsaleemahmad
511c9788da
models updates -> 3.13.6
2 years ago
devamirsaleemahmad
2a4059fd66
models updates -> 3.13.6
2 years ago
devamirsaleemahmad
3523daa9fa
updates -> 3.13.6
2 years ago
devamirsaleemahmad
6ff864c4cd
updates -> 3.13.6
2 years ago
devamirsaleemahmad
e8e7a726f5
updates -> 3.13.6
2 years ago
Sultan khan
b45cbbcf29
updates
2 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
2 years ago
haroon amjad
14928ad833
CR 6204
2 years ago
haroon amjad
34d3cf2945
CR 6204 Lab reports enhancements in progress
2 years ago
haroon amjad
0f863cd259
Updates & fixes
3 years ago
haroon amjad
a17b941c63
InPatient Medical Report continued
3 years ago