Fixed call order to updateDrugSusceptibilityFields and modified DrugSusceptibilityForm

- for DrugSusceptibilityForm, added a conditional exit to prevent enabling susceptility contents if country is not Luxembourg
- In PathogenTestForm, moved the call to updateDrugSusceptibilityFields to the end of the listener chain

Author: raulbob

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

@@ -1175,11 +1175,14 @@ protected void addFields() {
 
 			if (RESULT_FIELD_DECISION_MAP.containsKey(disease) && RESULT_FIELD_DECISION_MAP.get(disease).contains(testType)) {
 				testResultField.setValue(PathogenTestResultType.POSITIVE);
-				testResultField.setReadOnly(testResultFieldReadOnly);
+				testResultField.setEnabled(false);
 			} else {
 				testResultField.clear();
 				testResultField.setEnabled(true);
 			}
+
+			testResultField.setReadOnly(testResultFieldReadOnly);
+			updateDrugSusceptibilityFieldSpecifications(testType, (Disease) diseaseField.getValue());
 		};
 
 		testTypeField.addValueChangeListener(e -> {
@@ -1193,8 +1196,6 @@ protected void addFields() {
 					fourFoldIncrease.setEnabled(false);
 				}
 
-				updateDrugSusceptibilityFieldSpecifications(testType, (Disease) diseaseField.getValue());
-
 				if (diseaseField.getValue() == null || !List.of(Disease.TUBERCULOSIS).contains((Disease) diseaseField.getValue())) {
 					setVisibleClear(
 						PathogenTestType.PCR_RT_PCR == testType,

sormas-ui/src/main/java/de/symeda/sormas/ui/therapy/DrugSusceptibilityForm.java

@@ -31,7 +31,9 @@
 import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.v7.ui.TextField;
 
+import de.symeda.sormas.api.CountryHelper;
 import de.symeda.sormas.api.Disease;
+import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
 import de.symeda.sormas.api.sample.PathogenTestType;
@@ -297,6 +299,12 @@ private void forceUpdateDrugSusceptibilityMicField(String fieldId, Optional<Floa
 
 	public void updateFieldsVisibility(Disease disease, PathogenTestType pathogenTestType) {
 		FieldHelper.hideFieldsNotInList(getFieldGroup(), List.of(), true);
+		formHeadingLabel.setVisible(false);
+
+		// Drug susceptibility fields are hidden for other countries than Luxembourg
+		if(!FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) {
+			return;
+		}
 
 		if (disease != null && pathogenTestType != null) {
 			List<String> applicableFieldIds =