From e1a1984b76c57f0f23dc2e475acb10aaaf018e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Bulot?= <f_bulot@hotmail.com>
Date: Wed, 3 Sep 2025 10:26:39 +0200
Subject: [PATCH 1/2] feat(xforms): allow to add data into stromae/perso
 (#1321)

---
 pom.xml                                       |  2 +-
 .../post-processing/xforms/insee-pattern.xsl  | 34 +++++++++++++++++++
 .../params/in-to-out/business/form.xhtml      |  2 ++
 .../params/in-to-out/household/form.xhtml     |  2 ++
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 437d1883f..ab64214d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>fr.insee.eno</groupId>
 	<artifactId>eno-core</artifactId>
-	<version>2.19.0-SNAPSHOT</version>
+	<version>2.20.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Eno – Questionnaire generator</name>
diff --git a/src/main/resources/xslt/post-processing/xforms/insee-pattern.xsl b/src/main/resources/xslt/post-processing/xforms/insee-pattern.xsl
index 941a2a059..f594ba18f 100644
--- a/src/main/resources/xslt/post-processing/xforms/insee-pattern.xsl
+++ b/src/main/resources/xslt/post-processing/xforms/insee-pattern.xsl
@@ -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']">
diff --git a/src/test/resources/params/in-to-out/business/form.xhtml b/src/test/resources/params/in-to-out/business/form.xhtml
index abe8d01b1..6a95f5adc 100644
--- a/src/test/resources/params/in-to-out/business/form.xhtml
+++ b/src/test/resources/params/in-to-out/business/form.xhtml
@@ -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"/>
diff --git a/src/test/resources/params/in-to-out/household/form.xhtml b/src/test/resources/params/in-to-out/household/form.xhtml
index 4ef444d93..2bb1d252e 100644
--- a/src/test/resources/params/in-to-out/household/form.xhtml
+++ b/src/test/resources/params/in-to-out/household/form.xhtml
@@ -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"/>

From 04735833403a1f80ad3e6b45ea62bcf2d31723e9 Mon Sep 17 00:00:00 2001
From: Laurent Caouissin <38245508+laurentC35@users.noreply.github.com>
Date: Tue, 16 Sep 2025 17:50:46 +0200
Subject: [PATCH 2/2] bump: 2.20.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ab64214d8..6bb4d8999 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>fr.insee.eno</groupId>
 	<artifactId>eno-core</artifactId>
-	<version>2.20.0-SNAPSHOT</version>
+	<version>2.20.0</version>
 	<packaging>jar</packaging>
 
 	<name>Eno – Questionnaire generator</name>