Skip to content

RC 2.20.0 #1329

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

Merged
laurentC35 merged 3 commits into from
Sep 16, 2025
Merged

RC 2.20.0 #1329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1a1984
feat(xforms): allow to add data into stromae/perso (#1321)
BulotF Sep 3, 2025
b38af72
Merge branch 'v2-main' into rc-2-20-0
laurentC35 Sep 16, 2025
0473583
bump: 2.20.0
laurentC35 Sep 16, 2025
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
2 changes: 1 addition & 1 deletion 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.19.0</version>
<version>2.20.0</version>
<packaging>jar</packaging>

<name>Eno – Questionnaire generator</name>
Expand Down
34 changes: 34 additions & 0 deletions src/main/resources/xslt/post-processing/xforms/insee-pattern.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,40 @@
</xsl:copy>
<perso />
</xsl:template>

<!-- Filling the <perso> tag of stromae at every save -->
<xsl:template match="xf:action[@ev:event='page-change-done']/xf:toggle">
<xsl:variable name="donnees-pilotage-content">
<Pilotage>
<Element label="DateRetourSouhaitee" address=""/>
<Element label="Logo" address=""/>
<Element label="Nom" address="Contact/"/>
<Element label="Mel" address="Contact/"/>
<Element label="Telephone" address="Contact/"/>
<Element label="LibellePays" address="Contact/Adresse/"/>
<Element label="ComplementAdresse" address="Contact/Adresse/"/>
<Element label="MentionSpeciale" address="Contact/Adresse/"/>
<Element label="InformationsVoie" address="Contact/Adresse/"/>
<Element label="Ville" address="Contact/Adresse/"/>
<Element label="Identifiant" address="UniteEnquetee/"/>
<Element label="Siren" address="UniteEnquetee/"/>
<Element label="RaisonSociale" address="UniteEnquetee/"/>
<Element label="LabelUniteEnquetee" address="UniteEnquetee/"/>
</Pilotage>
</xsl:variable>
<xsl:variable name="apos"><xsl:text>'</xsl:text></xsl:variable>
<xsl:variable name="insert-content">
<xsl:for-each select="$donnees-pilotage-content//Element">
<xsl:value-of select="concat(' ',$apos,'µ',@label,'µ',$apos,',instance(',$apos,'donnees-pilotage',$apos,')//',@address,@label,'/text(),')"/>
</xsl:for-each>
</xsl:variable>
<xf:setvalue ref="instance('fr-form-instance')/stromae/perso">
<xsl:attribute name="value" select="concat('concat(',$apos,substring($insert-content,4,string-length($insert-content) -4),' )')"/>
</xf:setvalue>
<xsl:copy>
<xsl:apply-templates select="node() | @*"/>
</xsl:copy>
</xsl:template>

<!-- Overloads the registration resource for both submissions used in eno-core. -->
<xsl:template match="xf:submission[@id='save' or @id='submit']">
Expand Down
2 changes: 2 additions & 0 deletions src/test/resources/params/in-to-out/business/form.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,6 +1253,8 @@
value="count(instance('fr-form-util')/Pages/*[following-sibling::*[name()=instance('fr-form-instance')/stromae/util/nomSectionCourante]]) +1"/>
<xf:setvalue ref="instance('fr-form-instance')/stromae/util/dateHeure"
value="fn:format-dateTime(fn:current-dateTime(),'[D01]-[M01]-[Y0001] à [H01]:[m01]')"/>
<xf:setvalue ref="instance('fr-form-instance')/stromae/perso"
value="concat('DateRetourSouhaiteeµ',instance('donnees-pilotage')//DateRetourSouhaitee/text(), 'µLogoµ',instance('donnees-pilotage')//Logo/text(), 'µNomµ',instance('donnees-pilotage')//Contact/Nom/text(), 'µMelµ',instance('donnees-pilotage')//Contact/Mel/text(), 'µTelephoneµ',instance('donnees-pilotage')//Contact/Telephone/text(), 'µLibellePaysµ',instance('donnees-pilotage')//Contact/Adresse/LibellePays/text(), 'µComplementAdresseµ',instance('donnees-pilotage')//Contact/Adresse/ComplementAdresse/text(), 'µMentionSpecialeµ',instance('donnees-pilotage')//Contact/Adresse/MentionSpeciale/text(), 'µInformationsVoieµ',instance('donnees-pilotage')//Contact/Adresse/InformationsVoie/text(), 'µVilleµ',instance('donnees-pilotage')//Contact/Adresse/Ville/text(), 'µIdentifiantµ',instance('donnees-pilotage')//UniteEnquetee/Identifiant/text(), 'µSirenµ',instance('donnees-pilotage')//UniteEnquetee/Siren/text(), 'µRaisonSocialeµ',instance('donnees-pilotage')//UniteEnquetee/RaisonSociale/text(), 'µLabelUniteEnqueteeµ',instance('donnees-pilotage')//UniteEnquetee/LabelUniteEnquetee/text() )"/>
<xf:toggle case="{instance('fr-form-instance')/stromae/util/sectionCourante}"/>
<xf:send submission="enregistrer"/>
<xf:setfocus control="page-top-control"/>
Expand Down
2 changes: 2 additions & 0 deletions src/test/resources/params/in-to-out/household/form.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6165,6 +6165,8 @@
value="count(instance('fr-form-util')/Pages/*[following-sibling::*[name()=instance('fr-form-instance')/stromae/util/nomSectionCourante]]) +1"/>
<xf:setvalue ref="instance('fr-form-instance')/stromae/util/dateHeure"
value="fn:format-dateTime(fn:current-dateTime(),'[D01]-[M01]-[Y0001] à [H01]:[m01]')"/>
<xf:setvalue ref="instance('fr-form-instance')/stromae/perso"
value="concat('DateRetourSouhaiteeµ',instance('donnees-pilotage')//DateRetourSouhaitee/text(), 'µLogoµ',instance('donnees-pilotage')//Logo/text(), 'µNomµ',instance('donnees-pilotage')//Contact/Nom/text(), 'µMelµ',instance('donnees-pilotage')//Contact/Mel/text(), 'µTelephoneµ',instance('donnees-pilotage')//Contact/Telephone/text(), 'µLibellePaysµ',instance('donnees-pilotage')//Contact/Adresse/LibellePays/text(), 'µComplementAdresseµ',instance('donnees-pilotage')//Contact/Adresse/ComplementAdresse/text(), 'µMentionSpecialeµ',instance('donnees-pilotage')//Contact/Adresse/MentionSpeciale/text(), 'µInformationsVoieµ',instance('donnees-pilotage')//Contact/Adresse/InformationsVoie/text(), 'µVilleµ',instance('donnees-pilotage')//Contact/Adresse/Ville/text(), 'µIdentifiantµ',instance('donnees-pilotage')//UniteEnquetee/Identifiant/text(), 'µSirenµ',instance('donnees-pilotage')//UniteEnquetee/Siren/text(), 'µRaisonSocialeµ',instance('donnees-pilotage')//UniteEnquetee/RaisonSociale/text(), 'µLabelUniteEnqueteeµ',instance('donnees-pilotage')//UniteEnquetee/LabelUniteEnquetee/text() )"/>
<xf:toggle case="{instance('fr-form-instance')/stromae/util/sectionCourante}"/>
<xf:send submission="enregistrer"/>
<xf:setfocus control="page-top-control"/>
Expand Down