SORMAS-Foundation#4125 - Enable CQ/CT value field in sample creation window (SORMAS-Foundation#4155)

* SORMAS-Foundation#4125 - Enable CQ/CT value field in sample creation window

* SORMAS-Foundation#4125 - Extracted the sequence which sets up the visibility of CQ field into its own method

* SORMAS-Foundation#4125 - Save CQ value

Author: alexcaruntu-vita

sormas-ui/src/main/java/de/symeda/sormas/ui/samples/SampleController.java

@@ -174,6 +174,7 @@ private void saveSample(SampleCreateForm createForm) {
 			pathogenTest.setTestedDisease((Disease) (createForm.getField(PathogenTestDto.TESTED_DISEASE)).getValue());
 			pathogenTest.setTestDateTime((Date) (createForm.getField(PathogenTestDto.TEST_DATE_TIME)).getValue());
 			pathogenTest.setTestResultText((String) (createForm.getField(PathogenTestDto.TEST_RESULT_TEXT)).getValue());
+			pathogenTest.setCqValue(Float.parseFloat((String) createForm.getField(PathogenTestDto.CQ_VALUE).getValue()));
 			FacadeProvider.getSampleFacade().saveSample(newSample);
 			FacadeProvider.getPathogenTestFacade().savePathogenTest(pathogenTest);
 			final EventParticipantReferenceDto eventParticipantRef = newSample.getAssociatedEventParticipant();

sormas-ui/src/main/java/de/symeda/sormas/ui/samples/SampleCreateForm.java

@@ -9,6 +9,7 @@
 import com.vaadin.v7.ui.CheckBox;
 import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
 
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.i18n.Captions;
@@ -32,6 +33,7 @@ public class SampleCreateForm extends AbstractSampleForm {
 		+ fluidRowLocs(Captions.sampleIncludeTestOnCreation)
 		+ fluidRowLocs(PathogenTestDto.TEST_RESULT, PathogenTestDto.TEST_RESULT_VERIFIED)
 		+ fluidRowLocs(PathogenTestDto.TEST_TYPE, PathogenTestDto.TESTED_DISEASE)
+		+ fluidRowLocs(6, PathogenTestDto.CQ_VALUE)
 		+ fluidRowLocs(PathogenTestDto.TEST_DATE_TIME, PathogenTestDto.TEST_RESULT_TEXT);
 
 	public SampleCreateForm() {
@@ -49,6 +51,7 @@ protected void addFields() {
 		NullableOptionGroup testVerifiedField = addCustomField(PathogenTestDto.TEST_RESULT_VERIFIED, Boolean.class, NullableOptionGroup.class);
 		ComboBox testTypeField = addCustomField(PathogenTestDto.TEST_TYPE, PathogenTestType.class, ComboBox.class);
 		ComboBox testDiseaseField = addCustomField(PathogenTestDto.TESTED_DISEASE, Disease.class, ComboBox.class);
+		TextField cqValueField = addCustomField(PathogenTestDto.CQ_VALUE, Float.class, TextField.class);
 		DateTimeField testDateField = addCustomField(
 			PathogenTestDto.TEST_DATE_TIME,
 			I18nProperties.getPrefixCaption(PathogenTestDto.I18N_PREFIX, PathogenTestDto.TEST_DATE_TIME),
@@ -62,6 +65,8 @@ protected void addFields() {
 
 		setVisibilities();
 
+		cqValueField.setVisible(false);
+
 		FieldHelper.setVisibleWhen(
 			includeTestField,
 			Arrays.asList(pathogenTestResultField, testVerifiedField, testTypeField, testDiseaseField, testDateField, testDetailsField),
@@ -90,6 +95,18 @@ protected void addFields() {
 				false,
 				I18nProperties.getValidationError(Validations.afterDate, testDateField.getCaption(), sampleDateField.getCaption())));
 
+		pathogenTestResultField.addValueChangeListener(e -> {
+			PathogenTestResultType testResult = (PathogenTestResultType) e.getProperty().getValue();
+			PathogenTestType testType = (PathogenTestType) testTypeField.getValue();
+			showCqValueField(cqValueField, testType, testResult);
+		});
+
+		testTypeField.addValueChangeListener(e -> {
+			PathogenTestType testType = (PathogenTestType) e.getProperty().getValue();
+			PathogenTestResultType testResult = (PathogenTestResultType) pathogenTestResultField.getValue();
+			showCqValueField(cqValueField, testType, testResult);
+		});
+
 		includeTestField.addValueChangeListener(e -> {
 			final Boolean includeTest = (Boolean) e.getProperty().getValue();
 			if (includeTest) {
@@ -109,6 +126,16 @@ protected void addFields() {
 		});
 	}
 
+	private void showCqValueField(TextField cqValueField, PathogenTestType testType, PathogenTestResultType testResult) {
+		if ((testType == PathogenTestType.PCR_RT_PCR && testResult == PathogenTestResultType.POSITIVE)
+			|| testType == PathogenTestType.CQ_VALUE_DETECTION) {
+			cqValueField.setVisible(true);
+		} else {
+			cqValueField.setVisible(false);
+			cqValueField.clear();
+		}
+	}
+
 	@Override
 	protected String createHtmlLayout() {
 		return HTML_LAYOUT;
@@ -120,13 +147,15 @@ private void setPathogenTestFieldCaptions() {
 		final NullableOptionGroup testResultVerified = (NullableOptionGroup) getField(PathogenTestDto.TEST_RESULT_VERIFIED);
 		final ComboBox testTypeField = (ComboBox) getField(PathogenTestDto.TEST_TYPE);
 		final ComboBox testedDiseaseField = (ComboBox) getField(PathogenTestDto.TESTED_DISEASE);
+		final TextField cqValueField = (TextField) getField(PathogenTestDto.CQ_VALUE);
 		final DateTimeField testDateField = (DateTimeField) getField(PathogenTestDto.TEST_DATE_TIME);
 		final TextArea testTextField = (TextArea) getField(PathogenTestDto.TEST_RESULT_TEXT);
 
 		testResult.setCaption(getPrefixCaption(PathogenTestDto.I18N_PREFIX, PathogenTestDto.TEST_RESULT));
 		testResultVerified.setCaption(getPrefixCaption(PathogenTestDto.I18N_PREFIX, PathogenTestDto.TEST_RESULT_VERIFIED));
 		testTypeField.setCaption(getPrefixCaption(PathogenTestDto.I18N_PREFIX, PathogenTestDto.TEST_TYPE));
 		testedDiseaseField.setCaption(getPrefixCaption(PathogenTestDto.I18N_PREFIX, PathogenTestDto.TESTED_DISEASE));
+		cqValueField.setCaption(getPrefixCaption(PathogenTestDto.I18N_PREFIX, PathogenTestDto.CQ_VALUE));
 		testDateField.setCaption(getPrefixCaption(PathogenTestDto.I18N_PREFIX, PathogenTestDto.TEST_DATE_TIME));
 		testTextField.setCaption(getPrefixCaption(PathogenTestDto.I18N_PREFIX, PathogenTestDto.TEST_RESULT_TEXT));
 	}