Merge pull request #13597 from Jayapraksh1234/Jayapraksh1234-patch-1

raulbob · web-flow · commit 21b4c013042f · 2025-11-10T10:12:20.000+01:00
Jayapraksh1234 patch 1
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/sample/components/SampleDashboardMapComponent.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/sample/components/SampleDashboardMapComponent.java
@@ -61,7 +61,7 @@ protected void addComponents() {
 		displayedHumanSamples =
 			new HashSet<>(Arrays.asList(SampleAssociationType.CASE, SampleAssociationType.CONTACT, SampleAssociationType.EVENT_PARTICIPANT));
 		if (UiUtil.permitted(FeatureType.ENVIRONMENT_MANAGEMENT, UserRight.ENVIRONMENT_SAMPLE_VIEW)) {
-			showEnvironmentalSamples = true;
+			showEnvironmentalSamples = false; // Changed to false: environment samples are OFF by default
 		}
 
 		super.addComponents();
@@ -243,14 +243,9 @@ protected void addLayerOptions(VerticalLayout layersLayout) {
 			CheckBox showEnvironmentSamplesCheckBox = new CheckBox();
 			showEnvironmentSamplesCheckBox.setId(Captions.sampleDashboardShowEnvironmentSamples);
 			showEnvironmentSamplesCheckBox.setCaption(I18nProperties.getCaption(Captions.sampleDashboardShowEnvironmentSamples));
-			showEnvironmentSamplesCheckBox.setValue(shouldShowEventParticipantSamples());
+			showEnvironmentSamplesCheckBox.setValue(showEnvironmentalSamples); // Use the correct state!
 			showEnvironmentSamplesCheckBox.addValueChangeListener(e -> {
-				if ((boolean) e.getProperty().getValue()) {
-					showEnvironmentalSamples = true;
-				} else {
-					showEnvironmentalSamples = false;
-				}
-
+				showEnvironmentalSamples = (boolean) e.getProperty().getValue();
 				refreshMap(true);
 			});
 			layersLayout.addComponent(showEnvironmentSamplesCheckBox);
