Changeset 6473 for trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_dataFormOdTransf/bs.xml.xsl

Timestamp:

09/07/06 17:51:15 (6 years ago)

Author:

anp

Message:

correction bug avec liste de choix

File:

• trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_dataFormOdTransf/bs.xml.xsl (modified) (1 diff)

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_dataFormOdTransf/bs.xml.xsl

@@ -156 +156 @@
                                 <xsl0:choose>
                                         <xsl0:when test="name()='sm:fieldValueEnum'">
-                                                <xsl0:variable name="vFieldValueEnum" select="."/>
-                                                <xsl:choose>
-                                                        <xsl0:for-each select="$vPrimSource//sm:field[@code=current()/@refCode]/sm:enum/sm:option">
-                                                                <xsl0:variable name="vOverideLabel" select="$vFieldValueEnum/sm:option[@key=current()/@key]"/>
-                                                                <!-- WARNING caractère " interdit dans la key ? -->
-                                                                <xsl:when test="text()=&quot;{@key}&quot;"><xsl0:value-of select="si(count($vOverideLabel)&gt;0, $vOverideLabel/@label, @name)"/></xsl:when>
-                                                        </xsl0:for-each>
-                                                        <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
-                                                </xsl:choose>
+                                                <xsl0:variable name="vCodeLabel">
+                                                        <xsl0:variable name="vFieldValueEnum" select="."/>
+                                                        <xsl:choose>
+                                                                <xsl0:for-each select="$vPrimSource//sm:field[@code=current()/@refCode]/sm:enum/sm:option">
+                                                                        <xsl0:variable name="vOverideLabel" select="$vFieldValueEnum/sm:option[@key=current()/@key]"/>
+                                                                        <!-- WARNING caractère " interdit dans la key ? -->
+                                                                        <xsl:when test="text()=&quot;{@key}&quot;"><xsl0:value-of select="si(count($vOverideLabel)&gt;0, $vOverideLabel/@label, @name)"/></xsl:when>
+                                                                </xsl0:for-each>
+                                                                <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+                                                        </xsl:choose>
+                                                </xsl0:variable>
+                                                <xsl0:choose>
+                                                        <xsl0:when test="@format='label'"><xsl0:copy-of select="$vCodeLabel"/></xsl0:when>
+                                                        <xsl0:when test="@format='key (label)'"><xsl:value-of select="."/> (<xsl0:copy-of select="$vCodeLabel"/>)</xsl0:when>
+                                                        <xsl0:when test="@format='label (key)'"><xsl0:copy-of select="$vCodeLabel"/> (<xsl:value-of select="."/>)</xsl0:when>
+                                                </xsl0:choose>
                                         </xsl0:when>
                                         <xsl0:otherwise><xsl:value-of select="sp:{@refCode}"/></xsl0:otherwise>