From 3434203a1fdbcfc2dc702ba105556a8d5b9b79a2 Mon Sep 17 00:00:00 2001 From: willvoo Date: Wed, 11 Feb 2026 17:28:29 +0100 Subject: [PATCH 1/3] AER-4192 maven.compiler.release has to be set for intellij --- source/imaer-shared/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/source/imaer-shared/pom.xml b/source/imaer-shared/pom.xml index 6b54dc3e..7ee8b086 100644 --- a/source/imaer-shared/pom.xml +++ b/source/imaer-shared/pom.xml @@ -32,6 +32,7 @@ 17 + ${java.version} From 3d80653138bab8e982d2f36c2a034ec67742666f Mon Sep 17 00:00:00 2001 From: willvoo Date: Wed, 11 Feb 2026 17:30:02 +0100 Subject: [PATCH 2/3] AER-4192 modified the CalculationJobType to optionally allow more than one off_site_reduction --- .../shared/domain/calculation/CalculationJobType.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/CalculationJobType.java b/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/CalculationJobType.java index 6f80d994..434dbf42 100644 --- a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/CalculationJobType.java +++ b/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/CalculationJobType.java @@ -45,23 +45,23 @@ public enum CalculationJobType { * Exactly 1 Project scenario * Optional: 1 off site reduction * Optional: 1 Reference - * NO other scenario types + * Optional: one or more off site reductions */ PROCESS_CONTRIBUTION( new HashSet<>(Arrays.asList(SituationType.PROPOSED)), new HashSet<>(Arrays.asList(SituationType.REFERENCE, SituationType.OFF_SITE_REDUCTION)), - new HashSet<>()), + new HashSet<>(Arrays.asList(SituationType.OFF_SITE_REDUCTION))), /** * At least one temporary scenario (checkboxes) * Optional: 1 off site reduction * Optional: 1 Reference - * NO other scenario types + * Optional: one or more off site reductions */ MAX_TEMPORARY_EFFECT( new HashSet<>(Arrays.asList(SituationType.TEMPORARY)), new HashSet<>(Arrays.asList(SituationType.REFERENCE, SituationType.OFF_SITE_REDUCTION)), - new HashSet<>(Arrays.asList(SituationType.TEMPORARY))), + new HashSet<>(Arrays.asList(SituationType.TEMPORARY, SituationType.OFF_SITE_REDUCTION))), /** * Exactly 1 Project scenario @@ -69,12 +69,13 @@ public enum CalculationJobType { * Optional: 1 Reference * Optional: one or more ‘In combination_project’ scenarios * Optional: one or more ‘in combination reference’ scenarios + * Optional: one or more off site reductions */ IN_COMBINATION_PROCESS_CONTRIBUTION( new HashSet<>(Arrays.asList(SituationType.PROPOSED)), new HashSet<>(Arrays.asList(SituationType.REFERENCE, SituationType.OFF_SITE_REDUCTION, SituationType.COMBINATION_REFERENCE, SituationType.COMBINATION_PROPOSED)), - new HashSet<>(Arrays.asList(SituationType.COMBINATION_PROPOSED, SituationType.COMBINATION_REFERENCE))), + new HashSet<>(Arrays.asList(SituationType.COMBINATION_PROPOSED, SituationType.COMBINATION_REFERENCE, SituationType.OFF_SITE_REDUCTION))), /** * Only 1 Reference scenario From 5ae9606f8a50257f4329ef25ba405a80c8882d22 Mon Sep 17 00:00:00 2001 From: willvoo Date: Fri, 13 Feb 2026 14:03:15 +0100 Subject: [PATCH 3/3] AER-4192 intellij needs a java version set on gwt else it reverts to java 6 --- source/imaer-shared/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/imaer-shared/pom.xml b/source/imaer-shared/pom.xml index 7ee8b086..71a1c4c4 100644 --- a/source/imaer-shared/pom.xml +++ b/source/imaer-shared/pom.xml @@ -32,7 +32,6 @@ 17 - ${java.version} @@ -113,6 +112,7 @@ gwt-maven-plugin true + ${java.version} true nl.overheid.aerius.ImaerShared