From 7d1f15f2adb44fa8c091f061fa453b36abe5a705 Mon Sep 17 00:00:00 2001 From: Stefan Kapferer Date: Thu, 22 Aug 2024 15:48:33 +0200 Subject: [PATCH] Introduce UNDEFINED value in Core-7000-value list --- .../samples/freemarker/csv-files/value-registers.csv.ftl | 2 +- .../src/org/contextmapper/dsl/ContextMappingDSL.xtext | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.contextmapper.dsl.ui/samples/freemarker/csv-files/value-registers.csv.ftl b/org.contextmapper.dsl.ui/samples/freemarker/csv-files/value-registers.csv.ftl index a6c75dde..1cfb495b 100644 --- a/org.contextmapper.dsl.ui/samples/freemarker/csv-files/value-registers.csv.ftl +++ b/org.contextmapper.dsl.ui/samples/freemarker/csv-files/value-registers.csv.ftl @@ -2,7 +2,7 @@ Value Register,Context,Value Cluster,Core Value,Demonstrators,Related Values,Opp <#list valueRegisters as valueRegister> <#if valueRegister.context?has_content><#assign valueRegisterContext = valueRegister.context.name!""><#else><#assign valueRegisterContext = ""> <#list valueRegister.valueClusters as valueCluster> -<#if valueCluster.coreValue7000?has_content><#assign valueClusterCoreValue = valueCluster.coreValue7000!""><#else><#assign valueClusterCoreValue = valueCluster.coreValue!""> +<#if valueCluster.coreValue7000?has_content && valueCluster.coreValue7000 != "UNDEFINED"><#assign valueClusterCoreValue = valueCluster.coreValue7000><#else><#assign valueClusterCoreValue = valueCluster.coreValue!"UNDEFINED"> <#if valueCluster.demonstrators?has_content><#assign valueClusterDemonstrators = valueCluster.demonstrators?join("; ")><#else><#assign valueClusterDemonstrators = ""> <#if valueCluster.relatedValues?has_content><#assign valueClusterRelatedValues = valueCluster.relatedValues?join("; ")><#else><#assign valueClusterRelatedValues = ""> <#if valueCluster.opposingValues?has_content><#assign valueClusterOpposingValues = valueCluster.opposingValues?join("; ")><#else><#assign valueClusterOpposingValues = ""> diff --git a/org.contextmapper.dsl/src/org/contextmapper/dsl/ContextMappingDSL.xtext b/org.contextmapper.dsl/src/org/contextmapper/dsl/ContextMappingDSL.xtext index 3800465d..28786cb6 100644 --- a/org.contextmapper.dsl/src/org/contextmapper/dsl/ContextMappingDSL.xtext +++ b/org.contextmapper.dsl/src/org/contextmapper/dsl/ContextMappingDSL.xtext @@ -548,7 +548,7 @@ enum IMPACT: ; enum CoreValue: - AUTONOMY | CARE | CONTROL | FAIRNESS | INCLUSIVENESS | INNOVATION | PERFECTION | PRIVACY | RESPECT | SUSTAINABILITY | TRANSPARENCY | TRUST + UNDEFINED | AUTONOMY | CARE | CONTROL | FAIRNESS | INCLUSIVENESS | INNOVATION | PERFECTION | PRIVACY | RESPECT | SUSTAINABILITY | TRANSPARENCY | TRUST ; // define terminals