Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2 next: 2.12.0 #1172

Merged
merged 2 commits into from
Dec 11, 2024
Merged

V2 next: 2.12.0 #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94f5437
chore(deps): update all minor dependencies (#1165)
renovate[bot] Dec 11, 2024
1488607
feat: dynamic unit (#1155)
BulotF Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>fr.insee.eno</groupId>
<artifactId>eno-core</artifactId>
<version>2.11.0</version>
<version>2.12.0</version>
<packaging>jar</packaging>

<name>Eno – Questionnaire generator</name>
Expand Down Expand Up @@ -108,18 +108,18 @@
<eclipse.version>2.7.15</eclipse.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<fop.version>2.10</fop.version>
<commons-io.version>2.17.0</commons-io.version>
<commons-io.version>2.18.0</commons-io.version>
<guice.version>7.0.0</guice.version>
<!-- Logging API -->
<slf4j.version>2.0.16</slf4j.version>
<!-- Test dependencies -->
<junit.version>5.11.3</junit.version>
<xmlunit.version>2.10.0</xmlunit.version>
<apache-commons.version>3.17.0</apache-commons.version>
<log4j-slf4j2.version>2.24.1</log4j-slf4j2.version>
<log4j-slf4j2.version>2.24.2</log4j-slf4j2.version>
<!-- Build plugins -->
<source.plugin.version>3.3.1</source.plugin.version>
<javadoc.plugin.version>3.11.1</javadoc.plugin.version>
<javadoc.plugin.version>3.11.2</javadoc.plugin.version>
<!-- Sonar -->
<jacoco.version>0.8.12</jacoco.version>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
Expand Down
12 changes: 12 additions & 0 deletions src/main/resources/xslt/inputs/pogues-xml/functions.fods
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
32 changes: 32 additions & 0 deletions src/main/resources/xslt/inputs/pogues-xml/templates.fods
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 6 additions & 1 deletion src/main/resources/xslt/outputs/ddi/models.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
12 changes: 12 additions & 0 deletions src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading