Minar code reviews

Author: KarnaiahPesula

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -14578,7 +14578,7 @@ alter table contact add column IF NOT EXISTS vaccination_dose1_date timestamp;
 alter table contact add column IF NOT EXISTS vaccination_dose2_date timestamp;
 alter table contact add column IF NOT EXISTS vaccinationProposed boolean default false;
 alter table contact add column IF NOT EXISTS immuneGlobulinProposed boolean default false;
-alter table testreport add column genoTypeResult varchar(255);
+alter table testreport add column IF NOT EXISTS genoTypeResult varchar(255);
 
 alter table symptoms_history add column if not exists skinRashOnsetDate timestamp;
 alter table symptoms_history add column if not exists acuteencephalitis varchar(255);
@@ -14591,7 +14591,7 @@ alter table contact_history add column IF NOT EXISTS vaccination_dose1_date time
 alter table contact_history add column IF NOT EXISTS vaccination_dose2_date timestamp;
 alter table contact_history add column IF NOT EXISTS vaccinationProposed boolean default false;
 alter table contact_history add column IF NOT EXISTS immuneGlobulinProposed boolean default false;
-alter table testreport_history add column genoTypeResult varchar(255);
+alter table testreport_history add column IF NOT EXISTS genoTypeResult varchar(255);
 
 INSERT INTO schema_version (version_number, comment) VALUES (589, 'Customized Measles for Lux #13365');
 

sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java

@@ -542,20 +542,13 @@ public String getFormattedHtmlMessage() {
 
 		asymptomaticNOG.addValueChangeListener(e -> {
 			if (isConfiguredServer(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) {
-				if (SymptomState.YES.equals(asymptomaticNOG.getNullableValue())) {
+				boolean isSymptamatic = !SymptomState.YES.equals(asymptomaticNOG.getNullableValue());
 					editableAllowedFields().stream().filter(field -> !field.getId().equals(ASYMPTOMATIC)).forEach(field -> {
 						field.clear();
-						field.setEnabled(false);
-						onsetSymptom.setEnabled(false);
-						onsetDateField.setEnabled(false);
+						field.setEnabled(isSymptamatic);
+						onsetSymptom.setEnabled(isSymptamatic);
+						onsetDateField.setEnabled(isSymptamatic);
 					});
-				} else {
-					editableAllowedFields().stream().filter(field -> !field.getId().equals(ASYMPTOMATIC)).forEach(field -> {
-						field.setEnabled(true);
-						onsetSymptom.setEnabled(true);
-						onsetDateField.setEnabled(true);
-					});
-				}
 			}
 		});
 
@@ -587,16 +580,9 @@ public String getFormattedHtmlMessage() {
 		getField(SKIN_RASH).addValueChangeListener(e -> {
 			// Show skin rash onset date field only if skin rash is set to YES
 			if (isConfiguredServer(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) {
-				Set<Object> value1 = (Set<Object>) e.getProperty().getValue();
-				value1.stream().filter(value -> value instanceof SymptomState).findFirst().ifPresent(value -> {
-					if (value == SymptomState.YES) {
-						skinRashDateLabel.setVisible(true);
-						skinRashOnsetDate.setVisible(true);
-					} else {
-						skinRashDateLabel.setVisible(false);
-						skinRashOnsetDate.setVisible(false);
-					}
-				});
+				Object v = FieldHelper.getNullableSourceFieldValue((Field) e.getProperty());
+				boolean isVisible = v == SymptomState.YES || (v instanceof java.util.Set && ((java.util.Set<?>) v).contains(SymptomState.YES));
+				skinRashDateLabel.setVisible(isVisible);
 			}
 		});