arkadiusz binder před 7 roky
rodič
revize
9940e671d1

+ 1 - 1
SE/schema/default_db_xml_cache.public/default_db/BI_audit_BENFORD/default_db__x3A__BI_audit_BENFORD.BI_audit_BENFORD.NWK3.xsl

@@ -66,7 +66,7 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:valueField" required="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:valueField" required="yes"/>
         <xsl:param name="context" required="yes"/>
         <xsl:param name="context" required="yes"/>
             <xsl:for-each-group select="$context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name()=string($groupField) ]] " group-by="*[local-name()=string($groupField) ]">
             <xsl:for-each-group select="$context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name()=string($groupField) ]] " group-by="*[local-name()=string($groupField) ]">
-                <xsl:sort select="count(current-group())" order="ascending" data-type="number"/>
+                <xsl:sort select="count(current-group())" order="descending" data-type="number"/>
                 <xsl:choose>
                 <xsl:choose>
                     <xsl:when test="position() &gt; $default_db__x3A__BI_audit_BENFORD:NWK3.max_examples.param"></xsl:when>
                     <xsl:when test="position() &gt; $default_db__x3A__BI_audit_BENFORD:NWK3.max_examples.param"></xsl:when>
                     <xsl:otherwise>
                     <xsl:otherwise>

+ 11 - 12
SE/schema/default_db_xml_cache.public/default_db/BI_audit_BENFORD/default_db__x3A__BI_audit_BENFORD.BI_audit_BENFORD.deal_analys.xsl

@@ -198,7 +198,7 @@
         </p>
         </p>
         
         
         <xsl:variable name="generate-id" select="concat($uuid,'BI_audit_BENFORD.deal_analys.contrast.uniques.topic_9_',$src.position,'_',$position,'_',position(),$context.dest,generate-id($current),'__',generate-id($context))"/>
         <xsl:variable name="generate-id" select="concat($uuid,'BI_audit_BENFORD.deal_analys.contrast.uniques.topic_9_',$src.position,'_',$position,'_',position(),$context.dest,generate-id($current),'__',generate-id($context))"/>
-        <simpletable frame="all"  id="BI_audit_BENFORD.deal_analys.contrast.uniques.topic_{$generate-id}{$context.dest}{generate-id()}" props="nograph" ><!-- system_cache__dita:width_cols="auto"  system_cache__dita:bypass_rows_with_zero="true" system_cache__dita:bypass_rows_empty="true" --> <!-- system_cache__dita:width_cols="10" system_cache__dita:bypass_rows_with_zero="true" system_cache__dita:bypass_rows_empty="true" -->
+        <simpletable frame="all"  id="BI_audit_BENFORD.deal_analys.contrast.uniques.topic_{$generate-id}{$context.dest}{generate-id()}" props="nograph font30" ><!-- system_cache__dita:width_cols="auto"  system_cache__dita:bypass_rows_with_zero="true" system_cache__dita:bypass_rows_empty="true" --> <!-- system_cache__dita:width_cols="10" system_cache__dita:bypass_rows_with_zero="true" system_cache__dita:bypass_rows_empty="true" -->
             
             
             <sthead props="dst_cnt">
             <sthead props="dst_cnt">
                 <stentry><xsl:value-of select="system_cache__dita:localname.translate($default_db__x3A__BI_audit_BENFORD:valueField)"/></stentry>
                 <stentry><xsl:value-of select="system_cache__dita:localname.translate($default_db__x3A__BI_audit_BENFORD:valueField)"/></stentry>
@@ -233,22 +233,21 @@
                              <xsl:value-of select="count(*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField])"/>
                              <xsl:value-of select="count(*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField])"/>
                         </xsl:for-each-group>-->
                         </xsl:for-each-group>-->
                     <xsl:variable name="simpletable"> 
                     <xsl:variable name="simpletable"> 
-                        <simpletable frame="all"  id="{$uuid}_AAta2ble_int{position()}.{$generate-id}.{generate-id($context[1]//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  [.=$current/*[ local-name()=$groupField]] ]][1])}">
+                        <simpletable frame="all"  id="{$uuid}_AAta2ble_int{position()}.{$generate-id}.{generate-id($context[1]//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  [.=$current/*[ local-name()=$groupField]] ]][1])}" props="font30 logscale">
                             <strow>
                             <strow>
-                                <stentry>0</stentry>
-                                <xsl:for-each-group select="$context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  and text()=$current/*[ local-name()=$groupField]] ]" group-by="*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField]">
-                                    <xsl:sort select="current-grouping-key()" order="ascending" data-type="number"/>
-                                    <stentry><xsl:value-of select="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names( concat('$', sum(current-group()/*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField]/number(text())),' il',count(current-group()) )  )"/></stentry>
+                                <!--<stentry>0</stentry>-->
+                                <xsl:for-each-group select="$context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  and text()=$current/*[ local-name()=$groupField]] ]" group-by="ancestor-or-self::*[@leadingNumber][1]/@leadingNumber"><!-- *[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField] -->
+                                    <xsl:sort select="ancestor-or-self::*[@leadingNumber][1]" order="ascending" data-type="number"/>
+                                    <stentry><xsl:value-of select="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names(string(system_cache__dita:big_values_format(sum(*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField]))))"/></stentry>
                                 </xsl:for-each-group>
                                 </xsl:for-each-group>
                             </strow>
                             </strow>
                             <strow>
                             <strow>
-                                <stentry>0</stentry>
-                                <xsl:for-each-group select="$context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  and text()=$current/*[ local-name()=$groupField]] ]" group-by="*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField]">
-                                    <xsl:sort select="@leadingNumber" order="ascending" data-type="number"/>
+                                <!--<stentry>0</stentry>-->
+                                <xsl:for-each-group select="$context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  and text()=$current/*[ local-name()=$groupField]] ]" group-by="ancestor-or-self::*[@leadingNumber][1]/@leadingNumber">
+                                    <xsl:sort select="ancestor-or-self::*[@leadingNumber][1]" order="ascending" data-type="number"/>
                                     <stentry>
                                     <stentry>
-                                        <xsl:value-of select="sum(*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField]/number(text()))"/>
+                                        <xsl:value-of select="round(sum(*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField]/number(text())))"/>
                                     </stentry>
                                     </stentry>
-                                    
                                 </xsl:for-each-group>
                                 </xsl:for-each-group>
                             </strow>
                             </strow>
                         </simpletable>   
                         </simpletable>   
@@ -285,7 +284,7 @@
                     <stentry>
                     <stentry>
                         
                         
                         <xsl:variable name="simpletable"> 
                         <xsl:variable name="simpletable"> 
-                        <simpletable frame="all"  id="{$uuid}_BBBtable_int{position()}.{$generate-id}.{generate-id($context[1]//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  [.=$current/*[ local-name()=$groupField]] ]][1])}" props="font15">
+                        <simpletable frame="all"  id="{$uuid}_BBBtable_int{position()}.{$generate-id}.{generate-id($context[1]//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  [.=$current/*[ local-name()=$groupField]] ]][1])}" props="font30">
                             <strow>
                             <strow>
                                 <xsl:for-each-group select="$context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  and text()=$current/*[ local-name()=$groupField]] ]" group-by="ancestor-or-self::*[@leadingNumber][1]/@leadingNumber"><!-- *[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField] -->
                                 <xsl:for-each-group select="$context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  and text()=$current/*[ local-name()=$groupField]] ]" group-by="ancestor-or-self::*[@leadingNumber][1]/@leadingNumber"><!-- *[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField] -->
                                     <xsl:sort select="ancestor-or-self::*[@leadingNumber][1]" order="ascending" data-type="number"/>
                                     <xsl:sort select="ancestor-or-self::*[@leadingNumber][1]" order="ascending" data-type="number"/>

+ 14 - 11
SE/schema/default_db_xml_cache.public/default_db/big_values_format.xsl

@@ -7,16 +7,19 @@
     
     
     <xsl:function name="system_cache__dita:big_values_format">
     <xsl:function name="system_cache__dita:big_values_format">
         <xsl:param name="value"/>
         <xsl:param name="value"/>
-        <xsl:choose>
-            <xsl:when test="$value &lt; 1000">
-                <xsl:value-of select='format-number($value, "#.0")'/>
-            </xsl:when>
-            <xsl:when test="$value &lt; 1000000">
-                <xsl:value-of select='format-number($value div 1000, "#.0")'/> k
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select='format-number($value div 100000, "#.0")'/> m
-            </xsl:otherwise>
-        </xsl:choose>
+        <xsl:variable name="out">
+            <xsl:choose>
+                <xsl:when test="$value &lt; 1000">
+                    <xsl:value-of select='format-number($value, "#.0")'/>
+                </xsl:when>
+                <xsl:when test="$value &lt; 1000000">
+                    <xsl:value-of select='format-number($value div 1000, "#.0")'/><xsl:text> k </xsl:text>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select='format-number($value div 100000, "#.0")'/><xsl:text> m </xsl:text>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:value-of select="$out"/>
     </xsl:function>
     </xsl:function>
 </xsl:stylesheet>
 </xsl:stylesheet>

+ 10 - 1
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.xsl

@@ -51,10 +51,18 @@
         <xsl:param name="p5gnuplot:font__x3A__size" select="'9'"/>
         <xsl:param name="p5gnuplot:font__x3A__size" select="'9'"/>
         <xsl:variable name="p5gnuplot:font__x3A__size">
         <xsl:variable name="p5gnuplot:font__x3A__size">
             <xsl:choose>
             <xsl:choose>
-                <xsl:when test="contains(@prop,'font15')"><xsl:value-of select="15"/></xsl:when>
+                <xsl:when test="contains(@props,'font30')"><xsl:value-of select="30"/><xsl:message>#54-A p5gnuplot:font__x3A__size 30</xsl:message></xsl:when>
+                <xsl:when test="contains(@props,'font15')"><xsl:value-of select="15"/><xsl:message>#54-B p5gnuplot:font__x3A__size 15</xsl:message></xsl:when>
                 <xsl:otherwise><xsl:value-of select="$p5gnuplot:font__x3A__size"/></xsl:otherwise>
                 <xsl:otherwise><xsl:value-of select="$p5gnuplot:font__x3A__size"/></xsl:otherwise>
             </xsl:choose>
             </xsl:choose>
         </xsl:variable>
         </xsl:variable>
+        <xsl:variable name="p5gnuplot:logscale">
+            <xsl:choose>
+<xsl:when test="contains(@props,'logscale')"><xsl:text>set logscale y
+</xsl:text><xsl:message>#54-C p5gnuplot:logscale</xsl:message></xsl:when>
+                <xsl:otherwise/>
+            </xsl:choose>
+        </xsl:variable>
         <!-- do stworzenia grafu na bazie tabeli simpletable w dita -->
         <!-- do stworzenia grafu na bazie tabeli simpletable w dita -->
         <xsl:variable name="fileindex" select="@id"/>
         <xsl:variable name="fileindex" select="@id"/>
         <xsl:apply-templates mode="system_cache__dita:graph__write" select=".">
         <xsl:apply-templates mode="system_cache__dita:graph__write" select=".">
@@ -68,6 +76,7 @@ set boxwidth 0.75
 set style fill solid
 set style fill solid
 set title "Wykres"
 set title "Wykres"
 set xtics rotate
 set xtics rotate
+<xsl:value-of select="$p5gnuplot:logscale"/>
 plot "<xsl:value-of select="$fileindex"/>.gnuplot.dat" using 0:2:3:xtic(1) with boxes  lc variable
 plot "<xsl:value-of select="$fileindex"/>.gnuplot.dat" using 0:2:3:xtic(1) with boxes  lc variable
         </xsl:result-document>
         </xsl:result-document>
         <xsl:result-document href="{$ditadir}/graph_to_image/{$fileindex}.gnuplot.dat" omit-xml-declaration="yes">
         <xsl:result-document href="{$ditadir}/graph_to_image/{$fileindex}.gnuplot.dat" omit-xml-declaration="yes">

+ 1 - 0
se.oxygen.xpr

@@ -259,6 +259,7 @@
             <file name="SE/schema/WPS_Functions/dita-ot/dita-ot-2.3.3/plugins/com.sophos.tocjs/xsl/frameset.xsl"/>
             <file name="SE/schema/WPS_Functions/dita-ot/dita-ot-2.3.3/plugins/com.sophos.tocjs/xsl/frameset.xsl"/>
             <file name="SE/schema/default_db_xml_cache.public/get_wfs_recurse_xsl.xsl"/>
             <file name="SE/schema/default_db_xml_cache.public/get_wfs_recurse_xsl.xsl"/>
             <file name="SE/schema/WPS_Functions/get_wfs_recurse_xsl/get_wfs_recurse_xsl.xsl"/>
             <file name="SE/schema/WPS_Functions/get_wfs_recurse_xsl/get_wfs_recurse_xsl.xsl"/>
+            <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.xsl"/>
             <file name="SE/schema/WPS_Functions/graph_tree_TODO_PROJ6806/graph_tree_yed.xsl"/>
             <file name="SE/schema/WPS_Functions/graph_tree_TODO_PROJ6806/graph_tree_yed.xsl"/>
             <file name="SE/schema/WPS_Functions/dita-ot/dita-ot-2.3.3/plugins/org.dita.pdf2/xsl/fo/i18n-postprocess.xsl"/>
             <file name="SE/schema/WPS_Functions/dita-ot/dita-ot-2.3.3/plugins/org.dita.pdf2/xsl/fo/i18n-postprocess.xsl"/>
             <file name="SE/schema/WPS_Functions/dita-ot/dita-ot-2.3.3/plugins/org.dita.pdf2/xsl/fo/i18n-postprocess_template.xsl"/>
             <file name="SE/schema/WPS_Functions/dita-ot/dita-ot-2.3.3/plugins/org.dita.pdf2/xsl/fo/i18n-postprocess_template.xsl"/>