feat: dynamic unit (#1155)

- feat(dynamic unit): add ControlledVocabularyName='personalizedUnit' for dynamic Unit
- fix: get-unit for dynamic Unit (forgotten in previous branch's commit)
- chore: bump version

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>fr.insee.eno</groupId>
 	<artifactId>eno-core</artifactId>
-	<version>2.11.1</version>
+	<version>2.12.0</version>
 	<packaging>jar</packaging>
 
 	<name>Eno – Questionnaire generator</name>

src/main/resources/xslt/inputs/pogues-xml/functions.fods

@@ -1152,6 +1152,18 @@
      </table:table-cell>
      <table:table-cell table:number-columns-repeated="3"/>
     </table:table-row>
+    <table:table-row table:style-name="ro1">
+     <table:table-cell office:value-type="string" calcext:value-type="string">
+      <text:p>enopogues:is-dynamic-unit</text:p>
+     </table:table-cell>
+     <table:table-cell/>
+     <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string">
+      <text:p>xs:boolean</text:p>
+     </table:table-cell>
+     <table:table-cell office:value-type="string" calcext:value-type="string">
+      <text:p>Returns if a unit is dynamic</text:p>
+     </table:table-cell>
+    </table:table-row>
     <table:table-row table:style-name="ro1">
      <table:table-cell office:value-type="string" calcext:value-type="string">
       <text:p>enopogues:get-value</text:p>

src/main/resources/xslt/inputs/pogues-xml/templates.fods

@@ -1954,6 +1954,38 @@
       <text:p>Non dynamic Unit : returns the value corresponding to the Uri</text:p>
      </table:table-cell>
     </table:table-row>
+    <table:table-row table:style-name="ro2">
+     <table:table-cell office:value-type="string" calcext:value-type="string">
+      <text:p>pogues:Unit[../pogues:IsDynamicUnit=&apos;true&apos;]</text:p>
+     </table:table-cell>
+     <table:table-cell office:value-type="string" calcext:value-type="string">
+      <text:p>enopogues:get-unit</text:p>
+     </table:table-cell>
+     <table:table-cell office:value-type="string" calcext:value-type="string">
+      <text:p>.</text:p>
+     </table:table-cell>
+     <table:table-cell office:value-type="string" calcext:value-type="string">
+      <text:p>id-variable</text:p>
+     </table:table-cell>
+     <table:table-cell office:value-type="string" calcext:value-type="string">
+      <text:p>Dynamic unit : returns the value, transformed with-tag</text:p>
+     </table:table-cell>
+    </table:table-row>
+    <table:table-row table:style-name="ro2">
+     <table:table-cell office:value-type="string" calcext:value-type="string">
+      <text:p>pogues:Unit</text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="ce1" office:value-type="string" calcext:value-type="string">
+      <text:p>enopogues:is-dynamic-unit</text:p>
+     </table:table-cell>
+     <table:table-cell office:value-type="string" calcext:value-type="string">
+      <text:p>../pogues:IsDynamicUnit=&apos;true&apos;</text:p>
+     </table:table-cell>
+     <table:table-cell/>
+     <table:table-cell table:style-name="ce1" office:value-type="string" calcext:value-type="string">
+      <text:p>Returns if a unit is dynamic</text:p>
+     </table:table-cell>
+    </table:table-row>
     <table:table-row table:style-name="ro2">
      <table:table-cell office:value-type="string" calcext:value-type="string">
       <text:p>*</text:p>

src/main/resources/xslt/outputs/ddi/models.xsl

@@ -456,7 +456,12 @@
         <xsl:param name="source-context" as="item()" tunnel="yes"/>
         <xsl:variable name="unit" select="enoddi33:get-unit($source-context)"/>
         <xsl:if test="not(normalize-space($unit) = ('',' '))">
-            <r:MeasurementUnit><xsl:value-of select="$unit"/></r:MeasurementUnit>
+            <r:MeasurementUnit>
+                <xsl:if test="enoddi33:is-dynamic-unit($source-context)">
+                    <xsl:attribute name="ControlledVocabularyName">personalizedUnit</xsl:attribute>    
+                </xsl:if>
+                <xsl:value-of select="$unit"/>
+            </r:MeasurementUnit>
         </xsl:if>
     </xsl:template>
 

src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods

@@ -1258,6 +1258,18 @@
      </table:table-cell>
      <table:table-cell/>
     </table:table-row>
+    <table:table-row table:style-name="ro1">
+     <table:table-cell table:style-name="ce1" office:value-type="string" calcext:value-type="string">
+      <text:p>enoddi33:is-dynamic-unit</text:p>
+     </table:table-cell>
+     <table:table-cell/>
+     <table:table-cell table:style-name="ce1" office:value-type="string" calcext:value-type="string">
+      <text:p>enopogues:is-dynamic-unit</text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="ce1" office:value-type="string" calcext:value-type="string">
+      <text:p>Returns if a unit is dynamic</text:p>
+     </table:table-cell>
+    </table:table-row>
     <table:table-row table:style-name="ro1">
      <table:table-cell office:value-type="string" calcext:value-type="string">
       <text:p>enoddi33:get-value</text:p>