#12856 - Fix sync dialog counts for environments

SORMAS-Foundation · Jan 10, 2024 · 516c8a6 · 516c8a6
1 parent e2d6f47
commit 516c8a6
Showing 1 changed file with 30 additions and 30 deletions.
diff --git a/...as-app/app/src/main/java/de/symeda/sormas/app/component/dialog/SynchronizationDialog.java b/...as-app/app/src/main/java/de/symeda/sormas/app/component/dialog/SynchronizationDialog.java
@@ -369,6 +369,16 @@ private void showPushNewProgressItems() {
 			Strings.entityEventParticipants,
 			allowedEntities,
 			DtoFeatureConfigHelper.isFeatureConfigForEventParticipantsEnabled());
+		addEntityIfEditAllowed(
+			EnvironmentDto.class,
+			Strings.entityEnvironments,
+			allowedEntities,
+			DtoFeatureConfigHelper.isFeatureConfigForEnvironmentEnabled());
+		addEntityIfEditAllowed(
+			EnvironmentSampleDto.class,
+			Strings.entityEnvironmentSamples,
+			allowedEntities,
+			DtoFeatureConfigHelper.isFeatureConfigForEnvironmentSamplesEnabled());
 		addEntityIfEditAllowed(SampleDto.class, Strings.entitySamples, allowedEntities, DtoFeatureConfigHelper.isFeatureConfigForSampleEnabled());
 		addEntityIfEditAllowed(
 			PathogenTestDto.class,
@@ -380,16 +390,6 @@ private void showPushNewProgressItems() {
 			Strings.entityAdditionalTests,
 			allowedEntities,
 			DtoFeatureConfigHelper.isFeatureConfigForAdditionalTestsEnabled());
-		addEntityIfEditAllowed(
-			EnvironmentDto.class,
-			Strings.entityEnvironments,
-			allowedEntities,
-			DtoFeatureConfigHelper.isFeatureConfigForEnvironmentEnabled());
-		addEntityIfEditAllowed(
-			EnvironmentSampleDto.class,
-			Strings.entityEnvironmentSamples,
-			allowedEntities,
-			DtoFeatureConfigHelper.isFeatureConfigForEnvironmentSamplesEnabled());
 		addEntityIfEditAllowed(ContactDto.class, Strings.entityContacts, allowedEntities, DtoFeatureConfigHelper.isFeatureConfigForContactsEnabled());
 		addEntityIfEditAllowedWithFeatureDependencies(
 			VisitDto.class,
@@ -530,6 +530,16 @@ private void showSynchronizeProgressItems() {
 			Strings.entityEventParticipants,
 			allowedEntities,
 			DtoFeatureConfigHelper.isFeatureConfigForEventParticipantsEnabled());
+		addEntityIfViewOrEditAllowed(
+			EnvironmentDto.class,
+			Strings.entityEnvironments,
+			allowedEntities,
+			DtoFeatureConfigHelper.isFeatureConfigForEnvironmentEnabled());
+		addEntityIfViewOrEditAllowed(
+			EnvironmentSampleDto.class,
+			Strings.entityEnvironmentSamples,
+			allowedEntities,
+			DtoFeatureConfigHelper.isFeatureConfigForEnvironmentSamplesEnabled());
 		addEntityIfViewOrEditAllowed(
 			SampleDto.class,
 			Strings.entitySamples,
@@ -545,16 +555,6 @@ private void showSynchronizeProgressItems() {
 			Strings.entityAdditionalTests,
 			allowedEntities,
 			DtoFeatureConfigHelper.isFeatureConfigForAdditionalTestsEnabled());
-		addEntityIfViewOrEditAllowed(
-			EnvironmentDto.class,
-			Strings.entityEnvironments,
-			allowedEntities,
-			DtoFeatureConfigHelper.isFeatureConfigForEnvironmentEnabled());
-		addEntityIfViewOrEditAllowed(
-			EnvironmentSampleDto.class,
-			Strings.entityEnvironmentSamples,
-			allowedEntities,
-			DtoFeatureConfigHelper.isFeatureConfigForEnvironmentSamplesEnabled());
 		addEntityIfViewOrEditAllowed(
 			ContactDto.class,
 			Strings.entityContacts,
@@ -611,6 +611,16 @@ private void showPullModifiedProgressItems() {
 			Strings.entityEventParticipants,
 			allowedEntities,
 			DtoFeatureConfigHelper.isFeatureConfigForEventParticipantsEnabled());
+		addEntityIfViewAllowed(
+			EnvironmentDto.class,
+			Strings.entityEnvironments,
+			allowedEntities,
+			DtoFeatureConfigHelper.isFeatureConfigForEnvironmentEnabled());
+		addEntityIfViewAllowed(
+			EnvironmentSampleDto.class,
+			Strings.entityEnvironmentSamples,
+			allowedEntities,
+			DtoFeatureConfigHelper.isFeatureConfigForEnvironmentSamplesEnabled());
 		addEntityIfViewAllowed(SampleDto.class, Strings.entitySamples, allowedEntities, DtoFeatureConfigHelper.isFeatureConfigForSampleEnabled());
 		addEntityIfViewAllowed(
 			PathogenTestDto.class,
@@ -622,16 +632,6 @@ private void showPullModifiedProgressItems() {
 			Strings.entityAdditionalTests,
 			allowedEntities,
 			DtoFeatureConfigHelper.isFeatureConfigForAdditionalTestsEnabled());
-		addEntityIfViewAllowed(
-			EnvironmentDto.class,
-			Strings.entityEnvironments,
-			allowedEntities,
-			DtoFeatureConfigHelper.isFeatureConfigForEnvironmentEnabled());
-		addEntityIfViewAllowed(
-			EnvironmentSampleDto.class,
-			Strings.entityEnvironmentSamples,
-			allowedEntities,
-			DtoFeatureConfigHelper.isFeatureConfigForEnvironmentSamplesEnabled());
 		addEntityIfViewAllowed(ContactDto.class, Strings.entityContacts, allowedEntities, DtoFeatureConfigHelper.isFeatureConfigForContactsEnabled());
 		addEntityIfViewAllowedWithFeatureDependencies(
 			VisitDto.class,