Changeset 8894

Timestamp:

03/06/07 17:12:35 (5 years ago)

Author:

anp

Message:

WTable : récupération du style des colonnes qd OD fusionne les déclarations de colonnes identiques coté génération

File:

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

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

@@ -158 +158 @@
                 <xsl0:variable name="vCurrentPosCol_num"><xsl0:value-of select="java:hIncreaseOne($pPosCol)"/></xsl0:variable>
                 <xsl0:variable name="vCurrentPosCol"><xsl0:number value="$vCurrentPosCol_num" format="A"/></xsl0:variable>
-                <table:table-column table:style-name="{si($vTableDom, $vTableDom/table:table-column[number($vCurrentPosCol_num)]/@table:style-name, concat($vDefaultStyle_table, '.', $vCurrentPosCol))}"/>
+                <xsl0:choose>
+                        <xsl0:when test="$vTableDom"><!-- le style existe dans l'odStyle -->
+                                <xsl0:variable name="vColStyle"><!-- gestion des colonnes fusionnées par OO -->
+                                        <xsl0:variable name="vColDom">
+                                                <xsl0:variable name="vTmpColCount" select="java:com.scenari.s.fw.utils.HDouble.new()"/>
+                                                <xsl0:for-each select="$vTableDom/table:table-column">
+                                                        <xsl0:variable name="vNbColRepeated" select="si(@table:number-columns-repeated, @table:number-columns-repeated - 1, 0)"/>
+                                                        <col style="{@table:style-name}">
+                                                                <xsl0:attribute name="min"><xsl0:value-of select="java:hIncreaseOne($vTmpColCount)"/></xsl0:attribute>
+                                                                <xsl0:value-of select="java:hSet($vTmpColCount, java:hGet($vTmpColCount)+$vNbColRepeated)"/>
+                                                                <xsl0:attribute name="max"><xsl0:value-of select="java:hGet($vTmpColCount)"/></xsl0:attribute>
+                                                        </col>
+                                                </xsl0:for-each>
+                                        </xsl0:variable>
+                                        <xsl0:value-of select="xalan:nodeset($vColDom)/*/col[$vCurrentPosCol&gt;=@min and $vCurrentPosCol&lt;=@max]"/>
+                                        <!-- $vTableDom/table:table-column[number($vCurrentPosCol_num)]/@table:style-name -->
+                                </xsl0:variable>
+                                <table:table-column table:style-name="{normalize-space($vColStyle)}"/>
+                        </xsl0:when>
+                        <xsl0:otherwise>
+                                <table:table-column table:style-name="{concat($vDefaultStyle_table, '.', $vCurrentPosCol)}"/>
+                        </xsl0:otherwise>
+                </xsl0:choose>
         </xsl0:template>