Merge pull request #13302 from SORMAS-Foundation/feature-13267-add-vectors-to-environment-media-and-samples-in-environments-module

KarnaiahPesula · web-flow · commit bfee2e22b5b3 · 2025-03-11T16:21:29.000+01:00
vectortypes added
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/environment/EnvironmentDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/environment/EnvironmentDto.java
@@ -46,6 +46,7 @@ public class EnvironmentDto extends PseudonymizableDto {
 	public static final String LOCATION = "location";
 	public static final String DELETION_REASON = "deletionReason";
 	public static final String OTHER_DELETION_REASON = "otherDeletionReason";
+	public static final String VECTOR_TYPE = "vectorType";
 
 	@NotNull(message = Validations.validReportDateTime)
 	private Date reportDate;
@@ -81,6 +82,7 @@ public class EnvironmentDto extends PseudonymizableDto {
 	private DeletionReason deletionReason;
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
 	private String otherDeletionReason;
+	private VectorType vectorType;
 
 	public static EnvironmentDto build() {
 		final EnvironmentDto environment = new EnvironmentDto();
@@ -248,4 +250,12 @@ public void setOtherDeletionReason(String otherDeletionReason) {
 	public EnvironmentReferenceDto toReference() {
 		return new EnvironmentReferenceDto(getUuid(), getEnvironmentName());
 	}
+
+	public VectorType getVectorType() {
+		return vectorType;
+	}
+
+	public void setVectorType(VectorType vectorType) {
+		this.vectorType = vectorType;
+	}
 }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/environment/EnvironmentMedia.java b/sormas-api/src/main/java/de/symeda/sormas/api/environment/EnvironmentMedia.java
@@ -7,7 +7,8 @@ public enum EnvironmentMedia {
 	WATER,
 	SOIL_ROCK,
 	AIR,
-	BIOTA;
+	BIOTA,
+	VECTORS;
 
 	@Override
 	public String toString() {
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/environment/VectorType.java b/sormas-api/src/main/java/de/symeda/sormas/api/environment/VectorType.java
@@ -0,0 +1,13 @@
+package de.symeda.sormas.api.environment;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum VectorType {
+    MOSQUITOS,
+    TICKS;
+
+    @Override
+    public String toString() {
+        return I18nProperties.getEnumCaption(this);
+    }
+}
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/environment/environmentsample/EnvironmentSampleDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/environment/environmentsample/EnvironmentSampleDto.java
@@ -28,6 +28,7 @@
 
 import de.symeda.sormas.api.common.DeletionReason;
 import de.symeda.sormas.api.environment.EnvironmentReferenceDto;
+import de.symeda.sormas.api.environment.VectorType;
 import de.symeda.sormas.api.feature.FeatureType;
 import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.api.infrastructure.facility.FacilityReferenceDto;
@@ -80,6 +81,7 @@ public class EnvironmentSampleDto extends PseudonymizableDto {
 	public static final String DELETION_REASON = "deletionReason";
 	public static final String OTHER_DELETION_REASON = "otherDeletionReason";
 	public static final String REPORTING_USER = "reportingUser";
+	public static final String VECTOR_TYPE = "vectorType";
 
 	@NotNull
 	private EnvironmentReferenceDto environment;
@@ -141,6 +143,7 @@ public class EnvironmentSampleDto extends PseudonymizableDto {
 	private DeletionReason deletionReason;
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
 	private String otherDeletionReason;
+	private VectorType vectorType;
 
 	public static EnvironmentSampleDto build(EnvironmentReferenceDto environment, UserReferenceDto reportingUser) {
 		EnvironmentSampleDto sample = new EnvironmentSampleDto();
@@ -399,4 +402,12 @@ public void setOtherDeletionReason(String otherDeletionReason) {
 	public EnvironmentSampleReferenceDto toReference() {
 		return new EnvironmentSampleReferenceDto(getUuid());
 	}
+
+	public VectorType getVectorType() {
+		return vectorType;
+	}
+
+	public void setVectorType(VectorType vectorType) {
+		this.vectorType = vectorType;
+	}
 }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java
@@ -1457,6 +1457,7 @@ public interface Captions {
 	String Environment_reportingUser = "Environment.reportingUser";
 	String Environment_responsibleUser = "Environment.responsibleUser";
 	String Environment_uuid = "Environment.uuid";
+	String Environment_vectorType = "Environment.vectorType";
 	String Environment_waterType = "Environment.waterType";
 	String Environment_waterUse = "Environment.waterUse";
 	String environmentActiveEnvironments = "environmentActiveEnvironments";
@@ -1495,6 +1496,7 @@ public interface Captions {
 	String EnvironmentSample_specimenCondition = "EnvironmentSample.specimenCondition";
 	String EnvironmentSample_turbidity = "EnvironmentSample.turbidity";
 	String EnvironmentSample_uuid = "EnvironmentSample.uuid";
+	String EnvironmentSample_vectorType = "EnvironmentSample.vectorType";
 	String EnvironmentSample_weatherConditions = "EnvironmentSample.weatherConditions";
 	String environmentSampleActiveSamples = "environmentSampleActiveSamples";
 	String environmentSampleAllActiveAndArchivedSamples = "environmentSampleAllActiveAndArchivedSamples";
diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties
@@ -1192,6 +1192,7 @@ Environment.otherInfrastructureDetails=Other infrastructure details
 Environment.waterUse=Water use
 Environment.otherWaterUse=Other water use
 Environment.location=Location
+Environment.vectorType=Vector Type
 
 environmentActiveEnvironments=Active environments
 environmentArchivedEnvironments = Archived environments
@@ -1232,6 +1233,7 @@ EnvironmentSample.generalComment = General comment
 EnvironmentSample.positivePathogenTests = Positive pathogen tests
 EnvironmentSample.latestPathogenTest = Latest pathogen test
 EnvironmentSample.numberOfTests = Number of tests
+EnvironmentSample.vectorType=Vector Type
 
 # Event
 eventActiveEvents=Active events
diff --git a/sormas-api/src/main/resources/enum.properties b/sormas-api/src/main/resources/enum.properties
@@ -633,6 +633,7 @@ EnvironmentMedia.WATER = Water
 EnvironmentMedia.SOIL_ROCK = Soil or rock
 EnvironmentMedia.AIR = Air
 EnvironmentMedia.BIOTA = Biota
+EnvironmentMedia.VECTORS = Vectors
 
 # EpiCurveGrouping
 EpiCurveGrouping.DAY = Day
@@ -1930,6 +1931,11 @@ VisitStatus.Short.UNCOOPERATIVE = Uncooperative
 VisitOrigin.USER = Created by user
 VisitOrigin.EXTERNAL_JOURNAL = External symptom journal
 
+#  VectorType
+
+VectorType.MOSQUITOS = Mosquitos
+VectorType.TICKS = Ticks
+
 # WaterSource
 WaterSource.COMMUNITY_BOREHOLE_WELL = Community borehole/well
 WaterSource.OTHER = Other
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/environment/Environment.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/environment/Environment.java
@@ -26,6 +26,7 @@
 import de.symeda.sormas.api.caze.InvestigationStatus;
 import de.symeda.sormas.api.environment.EnvironmentInfrastructureDetails;
 import de.symeda.sormas.api.environment.EnvironmentMedia;
+import de.symeda.sormas.api.environment.VectorType;
 import de.symeda.sormas.api.environment.WaterType;
 import de.symeda.sormas.api.environment.WaterUse;
 import de.symeda.sormas.backend.common.CoreAdo;
@@ -56,6 +57,7 @@ public class Environment extends CoreAdo {
 	public static final String OTHER_WATER_USE = "otherWaterUse";
 	public static final String LOCATION = "location";
 	public static final String ENVIRONMENT_SAMPLES = "environmentSamples";
+	public static final String VECTOR_TYPE = "vectorType";
 
 	private Date reportDate;
 	private User reportingUser;
@@ -73,6 +75,7 @@ public class Environment extends CoreAdo {
 	private String otherWaterUse;
 	private Location location;
 	private Set<EnvironmentSample> environmentSamples = new HashSet<>();
+	private VectorType vectorType;
 
 	@Temporal(TemporalType.TIMESTAMP)
 	@Column(nullable = false)
@@ -225,4 +228,13 @@ public Set<EnvironmentSample> getEnvironmentSamples() {
 	public void setEnvironmentSamples(Set<EnvironmentSample> environmentSamples) {
 		this.environmentSamples = environmentSamples;
 	}
+
+	@Enumerated(EnumType.STRING)
+	public VectorType getVectorType() {
+		return vectorType;
+	}
+
+	public void setVectorType(VectorType vectorType) {
+		this.vectorType = vectorType;
+	}
 }
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/environment/EnvironmentFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/environment/EnvironmentFacadeEjb.java
@@ -312,6 +312,7 @@ protected Environment fillOrBuildEntity(EnvironmentDto source, Environment targe
 		target.setResponsibleUser(userService.getByReferenceDto(source.getResponsibleUser()));
 		target.setWaterType(source.getWaterType());
 		target.setWaterUse(source.getWaterUse());
+		target.setVectorType(EnvironmentMedia.VECTORS.equals(source.getEnvironmentMedia()) ? source.getVectorType() : null);
 
 		target.setDeleted(source.isDeleted());
 		target.setDeletionReason(source.getDeletionReason());
@@ -343,6 +344,7 @@ protected EnvironmentDto toDto(Environment source) {
 		target.setResponsibleUser(UserFacadeEjb.toReferenceDto(source.getResponsibleUser()));
 		target.setWaterType(source.getWaterType());
 		target.setWaterUse(source.getWaterUse());
+		target.setVectorType(source.getVectorType());
 
 		target.setDeleted(source.isDeleted());
 		target.setDeletionReason(source.getDeletionReason());
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/environment/environmentsample/EnvironmentSample.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/environment/environmentsample/EnvironmentSample.java
@@ -34,6 +34,7 @@
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 
+import de.symeda.sormas.api.environment.VectorType;
 import org.hibernate.annotations.Type;
 
 import de.symeda.sormas.api.environment.environmentsample.EnvironmentSampleMaterial;
@@ -68,6 +69,7 @@ public class EnvironmentSample extends DeletableAdo {
 	public static final String OTHER_SAMPLE_MATERIAL = "otherSampleMaterial";
 	public static final String FIELD_SAMPLE_ID = "fieldSampleId";
 	public static final String PATHOGEN_TESTS = "pathogenTests";
+	public static final String VECTOR_TYPE = "vectorType";
 
 	private static final long serialVersionUID = 7237701234186874155L;
 
@@ -99,6 +101,7 @@ public class EnvironmentSample extends DeletableAdo {
 	private SpecimenCondition specimenCondition;
 	private Location location;
 	private String generalComment;
+	private VectorType vectorType;
 
 	private List<PathogenTest> pathogenTests;
 
@@ -372,4 +375,13 @@ public List<PathogenTest> getPathogenTests() {
 	public void setPathogenTests(List<PathogenTest> pathogenTests) {
 		this.pathogenTests = pathogenTests;
 	}
+
+	@Enumerated(EnumType.STRING)
+	public VectorType getVectorType() {
+		return vectorType;
+	}
+
+	public void setVectorType(VectorType vectorType) {
+		this.vectorType = vectorType;
+	}
 }
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/environment/environmentsample/EnvironmentSampleFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/environment/environmentsample/EnvironmentSampleFacadeEjb.java
@@ -43,6 +43,7 @@
 import javax.validation.constraints.NotNull;
 
 import de.symeda.sormas.api.disease.PathogenConverter;
+import de.symeda.sormas.api.environment.environmentsample.EnvironmentSampleMaterial;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -569,6 +570,7 @@ protected EnvironmentSample fillOrBuildEntity(EnvironmentSampleDto source, Envir
 		target.setDeleted(source.isDeleted());
 		target.setDeletionReason(source.getDeletionReason());
 		target.setOtherDeletionReason(source.getOtherDeletionReason());
+		target.setVectorType(EnvironmentSampleMaterial.VECTORS.equals(source.getSampleMaterial()) ? source.getVectorType() : null);
 
 		return target;
 	}
@@ -611,6 +613,7 @@ protected EnvironmentSampleDto toDto(EnvironmentSample source) {
 		target.setDeleted(source.isDeleted());
 		target.setDeletionReason(source.getDeletionReason());
 		target.setOtherDeletionReason(source.getOtherDeletionReason());
+		target.setVectorType(source.getVectorType());
 
 		return target;
 	}
diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql
@@ -13827,4 +13827,13 @@ ALTER TABLE surveytokens ADD COLUMN responsereceiveddate timestamp;
 ALTER TABLE surveytokens_history ADD COLUMN responsereceiveddate timestamp;
 
 INSERT INTO schema_version (version_number, comment) VALUES (560, 'Create survey tokens pages #13253');
+
+-- 2025-03-11 added new column as vectortype for environment and environment sample #13267
+ALTER TABLE environments ADD column IF NOT EXISTS vectortype varchar(255);
+ALTER TABLE environmentsamples ADD column IF NOT EXISTS  vectortype varchar(255);
+
+ALTER TABLE environments_history ADD COLUMN vectortype varchar(255);
+ALTER TABLE environmentsamples_history ADD COLUMN vectortype varchar(255);
+
+INSERT INTO schema_version (version_number, comment) VALUES (561, 'Added vectors to the environment #13267');
 -- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. ***
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/environment/EnvironmentCreateForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/environment/EnvironmentCreateForm.java
@@ -15,6 +15,7 @@
 
 import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.environment.EnvironmentDto;
+import de.symeda.sormas.api.environment.EnvironmentMedia;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
 import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto;
@@ -35,7 +36,8 @@ public class EnvironmentCreateForm extends AbstractEditForm<EnvironmentDto> {
 
 	//@formatter:off
     private static final String HTML_LAYOUT = fluidRowLocs(EnvironmentDto.REPORT_DATE, EnvironmentDto.EXTERNAL_ID)
-            + fluidRowLocs(EnvironmentDto.ENVIRONMENT_MEDIA, "") + fluidRowLocs(EnvironmentDto.ENVIRONMENT_NAME, "")+
+            + fluidRowLocs(EnvironmentDto.ENVIRONMENT_MEDIA, "") + fluidRowLocs(EnvironmentDto.ENVIRONMENT_NAME, "") +
+            fluidRowLocs(EnvironmentDto.VECTOR_TYPE, "") +
             loc(LOCATION_HEADING_LOC) +
             fluidRowLocs(EnvironmentDto.LOCATION) +
             fluidRowLocs("", EnvironmentDto.RESPONSIBLE_USER);
@@ -63,7 +65,9 @@ protected void addFields() {
 		TextField externalIdField = addField(EnvironmentDto.EXTERNAL_ID, TextField.class);
 		style(externalIdField, ERROR_COLOR_PRIMARY);
 
-		addField(EnvironmentDto.ENVIRONMENT_MEDIA, ComboBox.class);
+		ComboBox environmentMedia = addField(EnvironmentDto.ENVIRONMENT_MEDIA, ComboBox.class);
+		ComboBox vectorType = addField(EnvironmentDto.VECTOR_TYPE, ComboBox.class);
+		vectorType.setVisible(false);
 		addField(EnvironmentDto.ENVIRONMENT_NAME, TextField.class);
 
 		Label locationHeadingLabel = new Label(I18nProperties.getString(Strings.headingLocation));
@@ -84,6 +88,14 @@ protected void addFields() {
 			.getUserRefsByInfrastructure(null, JurisdictionLevel.NATION, JurisdictionLevel.NATION, null, UserRight.ENVIRONMENT_EDIT);
 		FieldHelper.updateItems(responsibleUserField, responsibleUsers);
 
+		environmentMedia.addValueChangeListener(valueChangeEvent -> {
+			if (EnvironmentMedia.VECTORS.equals(valueChangeEvent.getProperty().getValue())) {
+				vectorType.setVisible(true);
+			} else {
+				vectorType.setVisible(false);
+			}
+		});
+
 		regionField.addValueChangeListener(e -> {
 			List<UserReferenceDto> filteredResponsibleUsers;
 			RegionReferenceDto region = (RegionReferenceDto) e.getProperty().getValue();
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/environment/EnvironmentDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/environment/EnvironmentDataForm.java
@@ -52,6 +52,7 @@ public class EnvironmentDataForm extends AbstractEditForm<EnvironmentDto> {
 			fluidRowLocs(EnvironmentDto.ENVIRONMENT_MEDIA, "") +
 			fluidRowLocs(EnvironmentDto.WATER_TYPE, EnvironmentDto.OTHER_WATER_TYPE) +
 			fluidRowLocs(EnvironmentDto.INFRASTUCTURE_DETAILS, EnvironmentDto.OTHER_INFRASTRUCTUIRE_DETAILS) +
+			fluidRowLocs(EnvironmentDto.VECTOR_TYPE, "") +
 			fluidRowLocs(WATER_USE_HEADING_LOC) +
 			fluidRowLocs(EnvironmentDto.WATER_USE) +
 			fluidRowLocs(EnvironmentDto.OTHER_WATER_USE) +
@@ -102,6 +103,8 @@ protected void addFields() {
 		TextField otherWaterType = addField(EnvironmentDto.OTHER_WATER_TYPE, TextField.class);
 		otherWaterType.setInputPrompt(I18nProperties.getString(Strings.pleaseSpecify));
 
+		ComboBox vectorType = addField(EnvironmentDto.VECTOR_TYPE, ComboBox.class);
+
 		ComboBox infrastructureDetails = addField(EnvironmentDto.INFRASTUCTURE_DETAILS, ComboBox.class);
 		TextField otherInfrastructureDetails = addField(EnvironmentDto.OTHER_INFRASTRUCTUIRE_DETAILS, TextField.class);
 		otherInfrastructureDetails.setInputPrompt(I18nProperties.getString(Strings.pleaseSpecify));
@@ -199,21 +202,26 @@ protected void addFields() {
 
 		environmentMedia.addValueChangeListener(valueChangeEvent -> {
 			if (EnvironmentMedia.WATER.equals(valueChangeEvent.getProperty().getValue())) {
-				waterType.setVisible(true);
-				infrastructureDetails.setVisible(true);
-				waterUseCheckBoxTree.setVisible(true);
-				useOfWaterHeading.setVisible(true);
+				vectorType.setVisible(false);
+				setVisible(true, infrastructureDetails, waterUseCheckBoxTree, otherWaterUse);
+			} else if (EnvironmentMedia.VECTORS.equals(valueChangeEvent.getProperty().getValue())) {
+				useOfWaterHeading.setVisible(false);
+				setVisible(false, waterType, infrastructureDetails, waterUseCheckBoxTree, otherWaterUse);
+				vectorType.setVisible(true);
+				waterType.clear();
+				infrastructureDetails.clear();
+				waterUseCheckBoxTree.clear();
+				waterUseCheckBoxTree.clear();
+				otherWaterUse.clear();
 			} else {
 				useOfWaterHeading.setVisible(false);
-				waterType.setVisible(false);
-				infrastructureDetails.setVisible(false);
-				waterUseCheckBoxTree.setVisible(false);
-				otherWaterUse.setVisible(false);
+				setVisible(false, waterType, infrastructureDetails, waterUseCheckBoxTree, otherWaterUse, vectorType);
 				waterType.clear();
 				infrastructureDetails.clear();
 				waterUseCheckBoxTree.clear();
 				waterUseCheckBoxTree.clear();
 				otherWaterUse.clear();
+				vectorType.clear();
 			}
 		});
 
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/environmentsample/EnvironmentSampleEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/environmentsample/EnvironmentSampleEditForm.java
