testing...

SE/schema/default_db_xml_cache.public/default_db/BI_audit_BENFORD/default_db__x3A__BI_audit_BENFORD.BI_audit_BENFORD.overwiev_table.xsl

@@ -160,8 +160,8 @@
             <stentry><xsl:value-of select="@leadingNumber"/></stentry>
             <!--<stentry><xsl:value-of select="system_cache__dita:localname.translate(name())"/></stentry>-->
             <stentry><xsl:value-of select="count"/></stentry>
-            <stentry><xsl:value-of select="number(value)*100"/></stentry>
-            <stentry><xsl:value-of select="number(norm)*100"/></stentry>
+            <stentry><xsl:value-of select="format-number(number(value)*100,'##.##')"/></stentry>
+            <stentry><xsl:value-of select="format-number(number(norm)*100,'##.##')"/></stentry>
             <stentry><xsl:value-of select="deviation"/></stentry>
             <stentry><xsl:value-of select="system_cache__dita:localname.translate('correct',correct)"/></stentry>
             <!--<stentry></stentry>-->
@@ -179,8 +179,8 @@
             <stentry><xsl:value-of select="@leadingNumber"/></stentry>
             <!--<stentry><xsl:value-of select="system_cache__dita:localname.translate(name())"/></stentry>-->
             <stentry><xsl:value-of select="count"/></stentry>
-            <stentry><xsl:value-of select="number(value)*100"/></stentry>
-            <stentry><xsl:value-of select="number(norm)*100"/></stentry>
+            <stentry><xsl:value-of select="format-number(number(value)*100,'##.##')"/></stentry>
+            <stentry><xsl:value-of select="format-number(number(norm)*100,'##.##')"/></stentry>
             <stentry><xsl:value-of select="deviation"/></stentry>
             <stentry><xsl:value-of select="system_cache__dita:localname.translate('correct',correct)"/></stentry>
             <!--<stentry></stentry>-->

SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_4UA.xsl

@@ -168,7 +168,7 @@
                                 <!--<xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset"/>-->
                                 <!--<xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset"/>-->
                                 <!--<xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.row.attrs"></xsl:copy-of>-->
-                                
+                                <xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset"/>
                                 
                                 
                                 
@@ -275,12 +275,12 @@
             <SIMPLETABLE_WTITLE>
             <simpletable frame="all"
                 id="ANALIZA_UMOW_4UA.graph_table_2_5_{$generate_id}_{$title}"
-                props="print__no graph.ylabel.ilosc graph.y2label.dlugosc graph.style.histogram  "><!-- font15 -->
+                props="graph.ylabel.ilosc graph.y2label.dlugosc graph.style.histogram  "><!-- font15 --><!-- print__no  -->
                 
                 <strow props="graph.headers">
                     <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset//*" group-by="@fid">
-                        <stentry current-grouping-key="{@fid}" props="graph.xtic" audience="powiazania"><xsl:value-of select="position()"/><xsl:copy-of select="string-join(*[@default_db__x3A__BI_audit_BENFORD:NameField]/text(),' ')"></xsl:copy-of></stentry>
-                        <stentry current-grouping-key="{@fid}" props="graph.xtic" audience="powiazania"><xsl:value-of select="position()"/><xsl:copy-of select="string-join(*[@default_db__x3A__BI_audit_BENFORD:NameField]/text(),' ')"></xsl:copy-of><xsl:value-of select="nazwa"/></stentry>
+                        <stentry current-grouping-key="{@fid}" props="graph.xtic" audience="powiazania"><xsl:copy-of select="string-join(*[@default_db__x3A__BI_audit_BENFORD:NameField]/text(),' ')"></xsl:copy-of></stentry><!--<xsl:value-of select="position()"/>-->
+                        <stentry current-grouping-key="{@fid}" props="graph.xtic" audience="powiazania"><xsl:copy-of select="string-join(*[@default_db__x3A__BI_audit_BENFORD:NameField]/text(),' ')"></xsl:copy-of><xsl:value-of select="nazwa"/></stentry><!--<xsl:value-of select="position()"/>--> 
                     </xsl:for-each-group>
                 </strow>
                 <strow props="graph.data">
@@ -335,6 +335,10 @@
         </xsl:variable>
         <xsl:choose>
             <xsl:when test="$simpletable//stentry">
+                <xsl:call-template name="p5gnuplot:simpletable__x3A__from_rows">
+                    <xsl:with-param name="simpletable" select="$simpletable"/>
+                    <xsl:with-param name="title"> (APU4-T) powiązania tabela </xsl:with-param>
+                </xsl:call-template>
                 <p> (APU4) powiązania wykres </p>
                 <foreign>
                     <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
@@ -367,7 +371,7 @@
             <SIMPLETABLE_WTITLE>
                 <simpletable frame="all"
                     id="ANALIZA_UMOW_4UA.graph.deals_table_2_5_{$generate_id}_{$title}"
-                    props="print__no graph.ylabel.ilosc graph.y2label.wartosc graph.style.histogram   "><!-- font15 -->
+                    props="graph.ylabel.ilosc graph.y2label.wartosc graph.style.histogram   "><!-- font15 --><!-- print__no  -->
                     
                     <strow props="graph.headers">
                         <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset/*/*" group-by="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]">
@@ -463,6 +467,11 @@
         </xsl:variable>
         <xsl:choose>
             <xsl:when test="$simpletable//stentry">
+                <!--<xsl:call-template name="p5gnuplot:simpletable__x3A__from_rows">
+                    <xsl:with-param name="simpletable" select="$simpletable"/>
+                    <xsl:with-param name="title"> (APU4-DT) umowy obiektu tabela </xsl:with-param>
+                </xsl:call-template>-->
+                
                 <p> (APU4-DW) umowy obiektu wykres </p>
                 <foreign>
                     <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
@@ -646,7 +655,7 @@
     
     
     <xsl:template name="system_cache__dita:ANALIZA_UMOW_4UA.title">
-        <title>APU4 kontekst <xsl:value-of select="system_cache__dita:localname.translate(name())"/> [il.<xsl:value-of select="count(*)"/>]
+        <title>APU4 kontekst <xsl:value-of select="system_cache__dita:localname.translate(name())"/> [il.<xsl:value-of select="count(current-group())"/>]
             <!--<xsl:apply-templates mode="system_cache__dita:ANALIZA_UMOW_4UA.title" select="."/>-->
         </title>
     </xsl:template>

SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row.xsl

@@ -338,16 +338,17 @@
                                                         <!-\-<xsl:with-param name="context" select="$context"/>-\->
                                                     </xsl:call-template>-->
                                                     <div><b>APT-P(rejestr
-                                                        <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.title" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = 1 ]">
+                                                        <xsl:value-of select="system_cache__dita:localname.translate(BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = 1 ]/local-name())"/>
+                                                        <!--<xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.title" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = 1 ]">
                                                             <xsl:with-param name="title">Ścieżka pomiędzy do </xsl:with-param>
-                                                        </xsl:apply-templates> - od 
-                                                        <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.title" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = 1 ]/*">
+                                                        </xsl:apply-templates>--> - od <xsl:value-of select="system_cache__dita:localname.translate(BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = 1 ]/*/local-name())"/>
+                                                        <!--<xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.title" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = 1 ]/*">
                                                             <xsl:with-param name="title">Ścieżka pomiędzy do </xsl:with-param>
-                                                        </xsl:apply-templates>
-                                                        - do 
-                                                        <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.title" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = last() ]/*">
+                                                        </xsl:apply-templates>-->
+                                                        - do <xsl:value-of select="system_cache__dita:localname.translate(BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = last() ]/*/local-name())"/>
+                                                        <!--<xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.title" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = last() ]/*">
                                                             <xsl:with-param name="title">Ścieżka pomiędzy do </xsl:with-param>
-                                                        </xsl:apply-templates>
+                                                        </xsl:apply-templates>-->
                                                         )
                                                         </b>
                                                     </div>

SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.xsl

@@ -118,6 +118,8 @@
     <xsl:include href="graph_gnuplotdat.row__x3A__from__ytics.xsl"/>
     <xsl:include href="graph_gnuplotdat.row__x3A__from__xtics.xsl"/>
     
+    <xsl:include href="graph_gnuplot.simpletable__x3A__from_rows.xsl"/>
+    
     <xsl:template name="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable">
         <xsl:param name="simpletable" required="yes"/>
         <xsl:apply-templates mode="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable" select="$simpletable"/>
@@ -323,7 +325,7 @@
         
     </xsl:function>
     
-    <xsl:template mode="system_cache__dita:graph__write_dita_preprocess" match="simpletable">
+    <xsl:template mode="system_cache__dita:graph__write_dita_preprocess" match="simpletable[not(contains(@props,'nograph'))]">
         <xsl:param name="p5gnuplot:font__x3A__size" select="'9'"/>
         <xsl:param name="title"/>
         <xsl:param name="ylabel"/>
@@ -621,7 +623,7 @@ set style fill solid border -1
 set bmargin 8
 
 set yrange [0:*]
-set y2range [0:*]
+set y2range [*:*]
 
 set grid  y y2
 
@@ -954,10 +956,17 @@ plot "</xsl:text><xsl:value-of select="$fileindex"/><xsl:text>.gnuplot.dat" usin
         
     </xsl:template>
     
+    <xsl:function name="system_cache__dita:graph.lingstring__x3A__break">
+        <xsl:param name="text"/>
+        <xsl:param name="size"/>
+        <xsl:variable name="break.character">\n</xsl:variable>
+        <xsl:copy-of select="system_cache__dita:graph.lingstring__x3A__break($text,$size,$break.character)"/>
+    </xsl:function>
     
     <xsl:function name="system_cache__dita:graph.lingstring__x3A__break">
         <xsl:param name="text"/>
         <xsl:param name="size"/>
+        <xsl:param name="break.character"/>
         <xsl:variable name="text" select="normalize-space($text)"/>
         <xsl:variable name="size" select="number($size)"/>
         <xsl:variable name="out">
@@ -972,7 +981,7 @@ plot "</xsl:text><xsl:value-of select="$fileindex"/><xsl:text>.gnuplot.dat" usin
                         <xsl:when test="count(tokenize(substring($text,(current()*$size),$size),' ')) &gt;1">
                             <xsl:for-each select="tokenize(substring($text,(current()*$size),$size),' ')">
                                 <xsl:choose>
-                                    <xsl:when test="round(last() div 2) = position() and not($pos.root.current&gt;=$pos.root.last) and not(string-length(substring($text,(($pos.root.current+1)*$size),$size))&lt;2)"><xsl:value-of select="current()"/><xsl:text> \n</xsl:text></xsl:when>
+                                    <xsl:when test="round(last() div 2) = position() and not($pos.root.current&gt;=$pos.root.last) and not(string-length(substring($text,(($pos.root.current+1)*$size),$size))&lt;2)"><xsl:value-of select="current()"/><xsl:text> </xsl:text><xsl:value-of select="$break.character"/></xsl:when>
                                     <!--<xsl:when test="position()=last() and string-length(normalize-space(current()))&gt;1"><xsl:value-of select="."/>iii</xsl:when>-->
                                     <xsl:when test="string-length(normalize-space(current()))&gt;0 and not(position()=last())"><xsl:value-of select="current()"/><xsl:text> </xsl:text><!--<xsl:value-of select="concat($pos.root.last,'/',$pos.root.current,'p',position(),'l',last())"/>--></xsl:when>
                                     <xsl:otherwise><xsl:value-of select="."/><xsl:text></xsl:text></xsl:otherwise>
@@ -1003,6 +1012,11 @@ plot "</xsl:text><xsl:value-of select="$fileindex"/><xsl:text>.gnuplot.dat" usin
         <!-- to return all with minuses -->
     </xsl:function>
     
+    
+    <xsl:template match="simpletable[contains(@props,'nograph')]" mode="system_cache__dita:graph__write_dita_preprocess">
+        <xsl:message terminate="no"> #71-A disabled simpletable[contains(@props,'print__no')] element <xsl:value-of select="name()"/> /  <xsl:value-of select="."/></xsl:message>
+    </xsl:template>
+    
     <xsl:template match="*|text()" mode="system_cache__dita:graph__write_dita_preprocess">
         <xsl:message terminate="yes"> #71 unknown element <xsl:value-of select="name()"/> /  <xsl:value-of select="."/></xsl:message>
     </xsl:template>

SE/schema/default_db_xml_cache.public/default_db/tree_to_dita.localname.translate.xsl

@@ -81,8 +81,8 @@
             <xsl:when test="$localname='value'"> wartość <!--<xsl:comment>DEBUG</xsl:comment>--> </xsl:when>
             
             
-            <xsl:when test="$localname='correct' and $text='true'"> prawda </xsl:when>
-            <xsl:when test="$localname='correct' and $text='false'"> fałsz </xsl:when>
+            <xsl:when test="$localname='correct' and $text='true'"> Tak </xsl:when>
+            <xsl:when test="$localname='correct' and $text='false'"> Nie </xsl:when>
             <xsl:when test="$localname='correct'"> prawidłowość <!--<xsl:comment>DEBUG</xsl:comment>--> </xsl:when>
             <xsl:when test="$localname='norm' and $text"> norma <xsl:value-of select="$text"/> <!--<xsl:comment>DEBUG</xsl:comment>--> </xsl:when>
             <xsl:when test="$localname='norm'"> norma <!--<xsl:comment>DEBUG</xsl:comment>--> </xsl:when>