feat: SORMAS-Foundation#13 solved issue of test result.

meajt · Dec 20, 2023 · fcf74c1 · fcf74c1
1 parent 04c7609
commit fcf74c1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java
@@ -23,18 +23,13 @@
 import static de.symeda.sormas.ui.utils.LayoutUtil.fluidRowLocs;
 import static de.symeda.sormas.ui.utils.LayoutUtil.loc;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
-import de.symeda.sormas.api.sample.multiplexpathogentest.InfluenzaAPathogenTestResult;
-import de.symeda.sormas.api.sample.multiplexpathogentest.InfluenzaBPathogenTestResult;
-import de.symeda.sormas.ui.samples.multiplexpathogentest.MultiplexPathogenTestDiseaseForm;
-import de.symeda.sormas.ui.samples.multiplexpathogentest.MultiplexPathogenTestForm;
 import org.apache.commons.collections.CollectionUtils;
 
 import com.vaadin.ui.Label;
@@ -46,7 +41,6 @@
 import com.vaadin.v7.ui.DateField;
 import com.vaadin.v7.ui.TextArea;
 import com.vaadin.v7.ui.TextField;
-import com.vaadin.v7.ui.VerticalLayout;
 
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.FacadeProvider;
@@ -61,10 +55,13 @@
 import de.symeda.sormas.api.sample.PathogenTestType;
 import de.symeda.sormas.api.sample.SampleDto;
 import de.symeda.sormas.api.sample.SamplePurpose;
+import de.symeda.sormas.api.sample.multiplexpathogentest.InfluenzaAPathogenTestResult;
+import de.symeda.sormas.api.sample.multiplexpathogentest.InfluenzaBPathogenTestResult;
 import de.symeda.sormas.api.sample.multiplexpathogentest.MultiplexPathogenTestDiseaseDto;
 import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers;
 import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
 import de.symeda.sormas.ui.UserProvider;
+import de.symeda.sormas.ui.samples.multiplexpathogentest.MultiplexPathogenTestForm;
 import de.symeda.sormas.ui.utils.AbstractEditForm;
 import de.symeda.sormas.ui.utils.CssStyles;
 import de.symeda.sormas.ui.utils.DateComparisonValidator;
@@ -327,17 +324,13 @@ protected void addFields() {
 			PathogenTestType testType = (PathogenTestType) e.getProperty().getValue();
 			if (testType == PathogenTestType.MULTIPLEX_RT_PCR) {
 				multiplexPathogenTestForm.setVisible(true);
-				diseaseField.setVisible(false);
-				diseaseField.setRequired(false);
-				testResultField.setVisible(false);
-				testResultField.setRequired(false);
+				setVisible(false, PathogenTestDto.TESTED_DISEASE, PathogenTestDto.TEST_RESULT);
+				setRequired(false, PathogenTestDto.TESTED_DISEASE, PathogenTestDto.TEST_RESULT);
 				multiplexPathogenTestForm.addMultiplexRow();
 			} else {
 				multiplexPathogenTestForm.setVisible(false);
-				diseaseField.setVisible(true);
-				diseaseField.setRequired(true);
-				testResultField.setVisible(true);
-				testResultField.setRequired(true);
+				setVisible(true, PathogenTestDto.TESTED_DISEASE, PathogenTestDto.TEST_RESULT);
+				setRequired(true, PathogenTestDto.TESTED_DISEASE, PathogenTestDto.TEST_RESULT);
 			}
 
 			if ((testType == PathogenTestType.PCR_RT_PCR && testResultField.getValue() == PathogenTestResultType.POSITIVE)

diff --git a/...ain/java/de/symeda/sormas/ui/samples/multiplexpathogentest/MultiplexPathogenTestForm.java b/...ain/java/de/symeda/sormas/ui/samples/multiplexpathogentest/MultiplexPathogenTestForm.java
@@ -1,22 +1,20 @@
 package de.symeda.sormas.ui.samples.multiplexpathogentest;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.vaadin.v7.data.Validator;
 import com.vaadin.v7.ui.VerticalLayout;
+
 import de.symeda.sormas.api.Disease;
-import de.symeda.sormas.api.sample.PathogenTestType;
 import de.symeda.sormas.api.sample.multiplexpathogentest.MultiplexPathogenTestDiseaseDto;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public  class MultiplexPathogenTestForm extends VerticalLayout {
     public MultiplexPathogenTestForm() {
 
     }
 
     public void addMultiplexRow() {
-        removeAllComponents();
-
         var infAForm = new MultiplexPathogenTestDiseaseForm(Disease.INFLUENZA_A);
         infAForm.setValue(buildMultiplexPathogenTest(Disease.INFLUENZA_A));
         addComponent(infAForm);
@@ -44,6 +42,12 @@ public void validate() throws Validator.InvalidValueException {
         }
     }
 
+    @Override
+    public void setVisible(boolean visible) {
+        removeAllComponents();
+        super.setVisible(visible);
+    }
+
     public List<MultiplexPathogenTestDiseaseDto> multiplexValues() {
         List<MultiplexPathogenTestDiseaseDto> result = new ArrayList<>();
         var totalChild = getComponentCount();