From e83073f32160f7fdb044caf24e5e0e80325dddb5 Mon Sep 17 00:00:00 2001 From: Flava177 Date: Mon, 14 Oct 2024 17:05:58 +0000 Subject: [PATCH] Resolved conflicts after merging from IDSR branch --- .../de/symeda/sormas/app/DiseaseFieldConfigurations.java | 2 +- .../app/backend/hospitalization/Hospitalization.java | 7 ------- .../de/symeda/sormas/app/caze/edit/CaseEditFragment.java | 8 ++++++++ .../de/symeda/sormas/app/caze/edit/CaseNewFragment.java | 3 +++ .../sormas/app/component/dialog/AbstractDialog.java | 1 + .../src/main/res/layout/fragment_person_edit_layout.xml | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/DiseaseFieldConfigurations.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/DiseaseFieldConfigurations.java index 5abfff43c61..4ca54cae363 100644 --- a/sormas-app/app/src/main/java/de/symeda/sormas/app/DiseaseFieldConfigurations.java +++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/DiseaseFieldConfigurations.java @@ -24,7 +24,7 @@ public class DiseaseFieldConfigurations { diseaseFieldConfigurations.put(new DiseaseFormTypeKey(Disease.YELLOW_FEVER, FormType.CASE_EDIT), Arrays.asList( - R.id.case_uuid_investigationStatus_fields_layout, R.id.caseData_reportDate, R.id.caseData_reportingUser, R.id.classifying_fields_layout, R.id.caseData_caseClassification,R.id.caseData_epidNumber, R.id.caseData_disease, R.id.caseData_caseOrigin, R.id.caseData_headingCaseResponsibleJurisidction, R.id.region_district_fields_layout, R.id.caseData_responsibleCommunity, R.id.caseData_healthFacility, R.id.caseData_healthFacilityDetails, R.id.caseData_medicalInformationHeading, R.id.caseData_vaccinationStatus, R.id.caseData_vaccinationType, R.id.caseData_numberOfDoses, R.id.caseData_reportingOfficerTitle, R.id.caseData_functionOfReportingOfficer, R.id.caseData_reportingOfficerContactPhone, R.id.caseData_reportingOfficerEmail + R.id.case_uuid_investigationStatus_fields_layout, R.id.caseData_reportDate, R.id.caseData_reportingUser, R.id.classifying_fields_layout, R.id.caseData_caseClassification,R.id.caseData_epidNumber, R.id.caseData_disease, R.id.caseData_caseOrigin, R.id.caseData_headingCaseResponsibleJurisidction, R.id.region_district_fields_layout, R.id.caseData_responsibleCommunity, R.id.caseData_healthFacility, R.id.caseData_healthFacilityDetails, R.id.caseData_headingAdditionalMedicalInformation, R.id.caseData_vaccinationStatus, R.id.caseData_vaccinationType, R.id.caseData_numberOfDoses, R.id.caseData_reportingOfficerTitle, R.id.caseData_functionOfReportingOfficer, R.id.caseData_reportingOfficerContactPhone, R.id.caseData_reportingOfficerEmail ) ); diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/hospitalization/Hospitalization.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/hospitalization/Hospitalization.java index e2793609f0f..2871174c92c 100644 --- a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/hospitalization/Hospitalization.java +++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/hospitalization/Hospitalization.java @@ -193,13 +193,6 @@ public void setNotifyDistrictDate(Date notifyDistrictDate) { this.notifyDistrictDate = notifyDistrictDate; } - public Date getDateFormSentToDistrict() { - return dateFormSentToDistrict; - } - - public void setDateFormSentToDistrict(Date dateFormSentToDistrict) { - this.dateFormSentToDistrict = dateFormSentToDistrict; - } public void setDateFirstSeen(Date dateFirstSeen) { this.dateFirstSeen = dateFirstSeen; } diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditFragment.java index a9079ace772..f64f2c5139b 100644 --- a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditFragment.java +++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditFragment.java @@ -479,6 +479,7 @@ public void onChange(ControlPropertyField field) { } } }); + contentBinding.caseDataDisease.setEnabled(false); if (record.getDisease() != null) { super.hideFieldsForDisease(record.getDisease(), contentBinding.mainContent, FormType.CASE_EDIT); @@ -808,6 +809,8 @@ public void onAfterLayoutBinding(final FragmentCaseEditLayoutBinding contentBind switch (record.getDisease()){ case YELLOW_FEVER: handleYellowFever(); + case IMMEDIATE_CASE_BASED_FORM_OTHER_CONDITIONS: + handleIDSR(); } } @@ -865,4 +868,9 @@ private void handleYellowFever() { } + + private void handleIDSR() { + getContentBinding().caseDataNumberOfDoses.setVisibility(VISIBLE); + getContentBinding().caseDataVaccinationDate.setVisibility(VISIBLE); + } } diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseNewFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseNewFragment.java index c7c9557219f..1fed093932e 100644 --- a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseNewFragment.java +++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseNewFragment.java @@ -40,6 +40,7 @@ import de.symeda.sormas.api.infrastructure.facility.FacilityTypeGroup; import de.symeda.sormas.api.person.PresentCondition; import de.symeda.sormas.api.person.Sex; +import de.symeda.sormas.api.sample.PosNegEq; import de.symeda.sormas.api.user.JurisdictionLevel; import de.symeda.sormas.api.utils.DateHelper; import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; @@ -131,6 +132,8 @@ record = getActivityRootData(); monthList = DataUtils.getMonthItems(true); sexList = DataUtils.getEnumItems(Sex.class, true); + sexList.remove(new Item<>(Sex.OTHER.toString(), Sex.OTHER)); + sexList.remove(new Item<>(Sex.UNKNOWN.toString(), Sex.UNKNOWN)); presentConditionList = DataUtils.getEnumItems(PresentCondition.class, true); caseTransmissionClassificationsList = DataUtils.getEnumItems(TransmissionClassification.class, true); diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/component/dialog/AbstractDialog.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/component/dialog/AbstractDialog.java index e0245421be0..ce3904e407f 100644 --- a/sormas-app/app/src/main/java/de/symeda/sormas/app/component/dialog/AbstractDialog.java +++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/component/dialog/AbstractDialog.java @@ -34,6 +34,7 @@ import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.FormType; +//import de.symeda.sormas.app.BR; import de.symeda.sormas.app.BR; import de.symeda.sormas.app.R; import de.symeda.sormas.app.component.controls.ControlButton; diff --git a/sormas-app/app/src/main/res/layout/fragment_person_edit_layout.xml b/sormas-app/app/src/main/res/layout/fragment_person_edit_layout.xml index 7256ce5887b..40cf42dcac0 100644 --- a/sormas-app/app/src/main/res/layout/fragment_person_edit_layout.xml +++ b/sormas-app/app/src/main/res/layout/fragment_person_edit_layout.xml @@ -371,7 +371,7 @@ - +