Browse Source

testing fixed todo

a.binder 7 years ago
parent
commit
d67cb15678
16 changed files with 828 additions and 78 deletions
  1. 1 1
      SE/schema/WPS_Functions/bocian-graph-to-html/bcgtht.tree_to_dita.xsl
  2. 9 9
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_BENFORD/default_db__x3A__BI_audit_BENFORD.BI_audit_BENFORD.overwiev_table.xsl
  3. 38 1
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_BENFORD/default_db__x3A__BI_audit_BENFORD.BI_audit_BENFORD.xsl
  4. 31 1
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.dita.xsd
  5. 22 0
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.xsl
  6. 126 27
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_4UA.xsl
  7. 17 2
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_context.path.xsl
  8. 2 2
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_operational_raport_note.xsl
  9. 1 1
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row.xsl
  10. 43 13
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_tree_to_dita.xsl
  11. 3 0
      SE/schema/default_db_xml_cache.public/default_db/dateTime.xsl
  12. 43 3
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.xsl
  13. 103 15
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics.xsl
  14. 50 3
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__detect.xsl
  15. 35 0
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__set.xsl
  16. 304 0
      se.oxygen.xpr

+ 1 - 1
SE/schema/WPS_Functions/bocian-graph-to-html/bcgtht.tree_to_dita.xsl

@@ -621,7 +621,7 @@ plot "<xsl:value-of select="$fileindex"/>.gnuplot.dat" using 2:xtic(1) with boxe
       </xsl:choose>
    </xsl:function>
    
-   <xsl:template match="relation_from|BI_audit_MSIG_person[preceding-sibling::* and following-sibling::*][preceding-sibling::* and following-sibling::*]|BI_audit_KRS_person[ preceding-sibling::* and following-sibling::* ]|BI_audit_MSIG_company|BI_audit_KRS_company|BI_audit_taxpayer|TERYT_adresy|BI_audit_MSIG_address" mode="bocian-graph-2-html.preprocess.names" priority="5"/>
+   <xsl:template match="relation_from|BI_audit_MSIG_person[preceding-sibling::* and following-sibling::*][preceding-sibling::* and following-sibling::*]|BI_audit_KRS_person[ preceding-sibling::* and following-sibling::* ]|BI_audit_MSIG_company|BI_audit_KRS_company|BI_audit_taxpayer|TERYT_adresy|BI_audit_MSIG_address|BI_audit_KRS_address" mode="bocian-graph-2-html.preprocess.names" priority="5"/>
    
    <xsl:template mode="bocian-graph-2-html.preprocess.names" match="ID|imiona|nazwisko|Pelna_nazwa_kontrahenta|nazwa"> <!-- |*[not(*)] -->
       <xsl:element name="default_db__x3A__{parent::*/local-name()}:{local-name()}" namespace="https://biuro.biall-net.pl/wfs/default_db/{local-name()}">

+ 9 - 9
SE/schema/default_db_xml_cache.public/default_db/BI_audit_BENFORD/default_db__x3A__BI_audit_BENFORD.BI_audit_BENFORD.overwiev_table.xsl

@@ -87,7 +87,7 @@
             <simpletable frame="all" relcolwidth="1* 1* 1* 1* 1* 1* 1* " props="nograph">
                 <sthead>
                     <stentry>Pierwsze cyfry</stentry>
-                    <stentry>Stopień analizy</stentry>
+                    <!--<stentry>Stopień analizy</stentry>-->
                     <stentry>Liczba wystąpień</stentry>
                     <stentry>Procent występowania</stentry>
                     <stentry>Norma %</stentry>
@@ -117,7 +117,7 @@
             <simpletable frame="all" relcolwidth="1* 1* 1* 1* 1* 1* 1* " props="nograph">
                 <sthead>
                     <stentry>Pierwsze cyfry</stentry>
-                    <stentry>Stopień analizy</stentry>
+                    <!--<stentry>Stopień analizy</stentry>-->
                     <stentry>Liczba wystąpień</stentry>
                     <stentry>Procent występowania</stentry>
                     <stentry>Norma %</stentry>
@@ -131,7 +131,7 @@
                 </xsl:for-each>
                 <strow>
                     <stentry/>
-                    <stentry/>
+                    <!--<stentry/>-->
                     <stentry/>
                     <stentry/>
                     <stentry/>
@@ -158,10 +158,10 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField"  tunnel="yes"/>
         <strow>
             <stentry><xsl:value-of select="@leadingNumber"/></stentry>
-            <stentry><xsl:value-of select="system_cache__dita:localname.translate(name())"/></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="value"/></stentry>
-            <stentry><xsl:value-of select="norm"/></stentry>
+            <stentry><xsl:value-of select="number(value)*100"/></stentry>
+            <stentry><xsl:value-of select="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>-->
@@ -177,10 +177,10 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField"  tunnel="yes"/>
         <strow>
             <stentry><xsl:value-of select="@leadingNumber"/></stentry>
-            <stentry><xsl:value-of select="system_cache__dita:localname.translate(name())"/></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="value"/></stentry>
-            <stentry><xsl:value-of select="norm"/></stentry>
+            <stentry><xsl:value-of select="number(value)*100"/></stentry>
+            <stentry><xsl:value-of select="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>-->

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

@@ -101,11 +101,48 @@
                 <xsl:when test="default_db__x3A__BI_audit_BENFORD:NameField"><xsl:value-of select="default_db__x3A__BI_audit_BENFORD:NameField"/>
                     <xsl:message>#57-102 input param default_db__x3A__BI_audit_BENFORD:NameField = <xsl:value-of select="default_db__x3A__BI_audit_BENFORD:NameField"/></xsl:message></xsl:when>
                 <xsl:when test="NameField"><xsl:value-of select="NameField"/></xsl:when>
-                <xsl:otherwise><xsl:text>nazwisko,imiona,nazwa</xsl:text><xsl:message>##57-104 set default param default_db__x3A__BI_audit_BENFORD:NameField</xsl:message></xsl:otherwise>
+                <xsl:otherwise><xsl:text>nazwisko,imiona,nazwa,Pelna_nazwa_kontrahenta</xsl:text><xsl:message>##57-104 set default param default_db__x3A__BI_audit_BENFORD:NameField</xsl:message></xsl:otherwise>
             </xsl:choose>
         </default_db__x3A__BI_audit_BENFORD:NameField>
     </xsl:template>
     
+    
+    
+    <xsl:template name="default_db__x3A__BI_audit_BENFORD:PeselField" >
+        <default_db__x3A__BI_audit_BENFORD:PeselField>
+            <xsl:choose>
+                <xsl:when test="default_db__x3A__BI_audit_BENFORD:PeselField"><xsl:value-of select="default_db__x3A__BI_audit_BENFORD:PeselField"/>
+                    <xsl:message>#57-102 input param default_db__x3A__BI_audit_BENFORD:PeselField = <xsl:value-of select="default_db__x3A__BI_audit_BENFORD:PeselField"/></xsl:message></xsl:when>
+                <xsl:when test="PeselField"><xsl:value-of select="PeselField"/></xsl:when>
+                <xsl:otherwise><xsl:text>PESEL,pesel</xsl:text><xsl:message>##57-117 set default param default_db__x3A__BI_audit_BENFORD:PeselField</xsl:message></xsl:otherwise>
+            </xsl:choose>
+        </default_db__x3A__BI_audit_BENFORD:PeselField>
+    </xsl:template>
+    
+    <xsl:template name="default_db__x3A__BI_audit_BENFORD:TaxIdField" >
+        <default_db__x3A__BI_audit_BENFORD:TaxIdField>
+            <xsl:choose>
+                <xsl:when test="default_db__x3A__BI_audit_BENFORD:TaxIdField"><xsl:value-of select="default_db__x3A__BI_audit_BENFORD:TaxIdField"/>
+                    <xsl:message>#57-126 input param default_db__x3A__BI_audit_BENFORD:TaxIdField = <xsl:value-of select="default_db__x3A__BI_audit_BENFORD:TaxIdField"/></xsl:message></xsl:when>
+                <xsl:when test="TaxIdField"><xsl:value-of select="TaxIdField"/></xsl:when>
+                <xsl:otherwise><xsl:text>nip,NIP,krs,KRS,regon,REGON</xsl:text><xsl:message>##57-128 set default param default_db__x3A__BI_audit_BENFORD:TaxIdField</xsl:message></xsl:otherwise>
+            </xsl:choose>
+        </default_db__x3A__BI_audit_BENFORD:TaxIdField>
+    </xsl:template>
+    
+    <xsl:template name="default_db__x3A__BI_audit_BENFORD:AddressField" >
+        <default_db__x3A__BI_audit_BENFORD:AddressField>
+            <xsl:choose>
+                <xsl:when test="default_db__x3A__BI_audit_BENFORD:AddressField"><xsl:value-of select="default_db__x3A__BI_audit_BENFORD:AddressField"/>
+                    <xsl:message>#57-126 input param default_db__x3A__BI_audit_BENFORD:AddressField = <xsl:value-of select="default_db__x3A__BI_audit_BENFORD:AddressField"/></xsl:message></xsl:when>
+                <xsl:when test="AddressField"><xsl:value-of select="AddressField"/></xsl:when>
+                <xsl:otherwise><xsl:text>S_kraj,Kraj,S_kraj,Kraj,S_wojewodztwo,S_miejscowosc,Miejscowosc,A_miejscowosc,A_kod,kodPocztowy,Ulica,A_ulica,nr,A_nrDomu,Numer_budynku,nrLokalu,Numer_mieszkania_lokalu,ulica,A_nrLokalu,TERYT_SYM,TERYT_SYM_UL</xsl:text><xsl:message>##57-128 set default param default_db__x3A__BI_audit_BENFORD:AddressField</xsl:message></xsl:otherwise>
+            </xsl:choose>
+        </default_db__x3A__BI_audit_BENFORD:AddressField>
+    </xsl:template>
+    
+    
+    
     <xsl:template mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD" match="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD">
         <topichead >
             <xsl:variable name="title" select="'BI_audit_BENFORD__53'"/>

+ 31 - 1
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.dita.xsd

@@ -5,7 +5,6 @@
     elementFormDefault="qualified"
     targetNamespace="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/dita.xsd"
     vc:minVersion="1.1" xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning">
-
     <xs:annotation>
         <xs:documentation>schema do raportu</xs:documentation>
     </xs:annotation>
@@ -181,12 +180,43 @@
                                     <xs:element name="wartosc_umow"/>
                                     <xs:element name="kryteria_kosztow"/>
                                     <xs:element name="liczba_benford"/>
+                                    <xs:sequence>
+                                        <xs:annotation>
+                                            <xs:documentation>(APU4-DPW) umowy pośrednio powiązane z obiektem</xs:documentation>
+                                        </xs:annotation>
+                                        <xs:element name="wartosc_umow"/>
+                                        <xs:element name="liczba_benford"/>
+                                        <xs:element name="czas_rok_miesiac">
+                                            <xs:annotation>
+                                                <xs:documentation>konieczny limit 24</xs:documentation>
+                                            </xs:annotation>
+                                        </xs:element>
+                                    </xs:sequence>
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
+            <xs:element name="wariant_begin">
+                <xs:annotation>
+                    <xs:documentation>generujemy raport dla wszystkich umow jakie wynikaja z kontekstu associated</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:attribute name="context.path.end.attrs"/>
+                    <xs:attribute fixed="" name="context.path.begin.attrs"/>
+                    <xs:attribute name="context.path.related.childs.attrs"/>
+                    <xs:attribute fixed="" name="context.path.childs.attrs"/>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="wariant_end">
+                <xs:complexType>
+                    <xs:attribute fixed="" name="context.path.end.attrs"/>
+                    <xs:attribute name="context.path.begin.attrs"/>
+                    <xs:attribute fixed="" name="context.path.related.childs.attrs"/>
+                    <xs:attribute name="context.path.childs.attrs"/>
+                </xs:complexType>
+            </xs:element>
         </xs:sequence>
     </xs:group>
 </xs:schema>

+ 22 - 0
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.xsl

@@ -161,6 +161,7 @@
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed//fixed[@generate-id=current()/@generate-id][1]"/>
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq//uniq[@generate-id=current()/@generate-id][1]"/>
                                                     <xsl:with-param name="interested_row" select="$interested_row"/>
+                                                    <xsl:with-param name="source" select="$source"/>
                                                 </xsl:apply-templates>
                                             </xsl:when>
                                             <xsl:when test="$mode = 'system_cache__dita:ANALIZA_UMOW_4UA_preprocess'">
@@ -177,8 +178,29 @@
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed//fixed[@generate-id=current()/@generate-id][1]"/>
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq//uniq[@generate-id=current()/@generate-id][1]"/>
                                                     <xsl:with-param name="interested_row" select="$interested_row"/>
+                                                    <xsl:with-param name="source" select="$source"/>
                                                 </xsl:apply-templates>
                                             </xsl:when>
+                                            
+                                            <xsl:when test="$mode = 'BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA'">
+                                                <topichead navtitle="found sth 186 cur gr:{current-grouping-key()}"></topichead>
+                                                <xsl:apply-templates mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA" select="." >
+                                                    <xsl:with-param name="group_name" select="$group_name"/>
+                                                    <xsl:with-param name="position" select="position()"/>
+                                                    <xsl:with-param name="resulset" select="$resulset"/>
+                                                    <xsl:with-param name="title" select="concat($title,$source)"/>
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:valueField"    select="$default_db__x3A__BI_audit_BENFORD:valueField" />
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField"     select="$default_db__x3A__BI_audit_BENFORD:groupField"/>
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField"   select="$default_db__x3A__BI_audit_BENFORD:timeField" />
+                                                    <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed"/>
+                                                    <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq"/>
+                                                    <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed//fixed[@generate-id=current()/@generate-id][1]"/>
+                                                    <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq//uniq[@generate-id=current()/@generate-id][1]"/>
+                                                    <xsl:with-param name="interested_row" select="$interested_row"/>
+                                                    <xsl:with-param name="source" select="$source"/>
+                                                </xsl:apply-templates>
+                                            </xsl:when>
+                                            
                                             <!--<xsl:when test="$mode = 'BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA'">
                                                 <xsl:apply-templates mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA" select="." >
                                                     <xsl:with-param name="group_name" select="$group_name"/>

+ 126 - 27
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_4UA.xsl

@@ -96,6 +96,7 @@
         <xsl:param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" required="yes"/>
         <xsl:param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq.current" required="yes"/>
         <xsl:param name="interested_row" required="yes"/>
+        <xsl:param name="source"/>
         <xsl:comment>#32 system_cache__dita:ANALIZA_UMOW_4UA</xsl:comment>
         <topicref  platform="{$position}" audience="{$title}" props="name {local-name()} {$default_db__x3A__BI_audit_BENFORD:valueField} {$default_db__x3A__BI_audit_BENFORD:timeField}"><!-- group_name="{$group_name}" -->
                 <!--<xsl:copy-of select="@*"/>-->
@@ -111,6 +112,14 @@
                         xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:topic.xsd">
                         <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.title" />
                         
+                        
+                        
+                        <!-- path var -->
+                        
+                        
+                        
+                        
+                        
                         <xsl:variable name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset">
                             <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs__x3A__to_nodeset">
                                 <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
@@ -157,9 +166,17 @@
                             
                             <foreign>
                                 <!--<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.related.childs.attrs.nodeset"/>-->
+                                <!--<xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.row.attrs"></xsl:copy-of>-->
+                                
+                                
+                                
+                                
                             </foreign>
                             
+                            
+                            
+                            
                             <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.graph">
                                 <xsl:with-param name="generate_id" select="@fid"/>                                                                           
                                 <xsl:with-param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset" select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset"/>
@@ -190,6 +207,52 @@
                         
                     </topic>
                 </xsl:result-document>
+            
+            <xsl:comment>#211 var declare</xsl:comment>
+            <!--<xsl:variable name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.row.attrs">
+                <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs__x3A__to_nodeset">
+                    <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
+                    <xsl:with-param name="system_cache__dita:interested_row.noattrrs__x3A__include" select="true()"/>
+                    <xsl:with-param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current/@default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.row.attrs"/><!-\- $system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq.current -\->
+                </xsl:call-template>
+            </xsl:variable>-->
+            
+            <xsl:comment>#211 var use </xsl:comment>
+            <!--<xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.row.attrs//BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row" 
+                group-by="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[last()]/*[ position() = 1]/@fid">
+                <xsl:sort select=" count(.)"/>
+                <xsl:variable name="group_name" select="system_cache__appinfo:truncate_special_and_do_uppercase(BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[position() = 1]/*[ position() = 1] /concat(imiona,'_',nazwisko,'_',nip))"/><!-\- XX1 TODO -\->
+                <xsl:variable name="title" select="concat('_1_',$source,'__x875__',@pos,'__',BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[position() = 1]/*[ position() = 1]/@fid,'___',BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[position() = last()]/*[ position() = 1]/@fid)"/>
+                <xsl:message>#875 $group_name=<xsl:value-of select="$group_name"/>;  @pos=<xsl:value-of select="@pos"/>; first/@fid=<xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[position() = 1]/*[ position() = 1]/@fid"/>; last/@fid=<xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[position() = last()]/*[ position() = 1]/@fid"/>; 
+                    $source="<xsl:value-of select="$source"/>"
+                    $title="<xsl:value-of select="$title"/>";
+                    applying BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA</xsl:message>
+                
+                <topichead navtitle="{BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[last()]/*/concat(imiona,' ',nazwisko,' ',nip,' ',nazwa,' ',Pelna_nazwa_kontrahenta)} powiązań ({ count( current-group())})  " props="BI1S_893" toc="no">
+                    <topicmeta>
+                        <xsl:call-template name="system_cache__dita:indexterm">
+                            <xsl:with-param name="indexterm" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[last()]/*[1]/concat(imiona,' ',nazwisko,' ',nip,' ',nazwa,' ',Pelna_nazwa_kontrahenta)"/>
+                            <xsl:with-param name="system_cache__dita:element">keywords</xsl:with-param>
+                            <xsl:with-param name="text"/>
+                        </xsl:call-template>
+                    </topicmeta>
+                    <xsl:apply-templates mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA" select=".">
+                        <xsl:with-param name="group_name" select="$group_name"/>
+                        <xsl:with-param name="position" select="position()"/>
+                        <xsl:with-param name="title" select="$title"/>
+                        <xsl:with-param name="current-grouping-key" select="current-grouping-key()"/>
+                        <xsl:with-param name="context" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[last()]"/>
+                        <xsl:with-param name="system_cache__dita:bocian-graph-2-html.read.group" select="'dst'"/>
+                    </xsl:apply-templates>
+                    <xsl:apply-templates mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row" select=".">
+                        <xsl:sort select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[position() =  last()]/*[ position() = 1]/ID"/>                                
+                        <!-\-<xsl:with-param name="group_name" select="$group_name"/>-\->
+                        <!-\-<xsl:with-param name="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA" select="$BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.pesel"/>-\->
+                        <xsl:with-param name="title" select="'1_pogr_do_kontrahentow_pos_1'"/>
+                    </xsl:apply-templates>
+                </topichead>
+            </xsl:for-each-group>-->
+            
             </topicref>
                 
                 
@@ -272,7 +335,7 @@
         </xsl:variable>
         <xsl:choose>
             <xsl:when test="$simpletable//stentry">
-                <p> (A3W) wykres </p>
+                <p> (APU4) powiązania wykres </p>
                 <foreign>
                     <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
                 </foreign>
@@ -296,7 +359,7 @@
         <xsl:param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset" required="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset" required="yes"/>
         <xsl:param name="title" required="yes"/>
-        <xsl:param name="default_db__x3A__BI_audit_BENFORD:FieldType" select="'default_db__x3A__BI_audit_BENFORD:leadingTimeYear-month'"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:FieldType" select="'default_db__x3A__BI_audit_BENFORD:leadingTimeYear-quarter'"/>
         <!--<strow>
             <xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset"/>
         </strow>-->
@@ -370,7 +433,7 @@
                         </xsl:for-each-group>
                     </strow>
                     <strow props="graph.fill.style">
-                        <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset//*" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
+                        <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 ]">
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
                             <stentry props="graph.notitle" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"/>
                             <!--<stentry current-grouping-key="{@default_db__x3A__BI_audit_BENFORD:leadingNumber}"/>-->
@@ -400,7 +463,7 @@
         </xsl:variable>
         <xsl:choose>
             <xsl:when test="$simpletable//stentry">
-                <p> (A3W) wykres </p>
+                <p> (APU4-DW) umowy obiektu wykres </p>
                 <foreign>
                     <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
                 </foreign>
@@ -423,24 +486,25 @@
         
         <xsl:param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset" required="yes"/>
         <xsl:param name="title" required="yes"/>
-        <xsl:param name="default_db__x3A__BI_audit_BENFORD:FieldType" select="'default_db__x3A__BI_audit_BENFORD:leadingTimeYear-month'"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:FieldType" select="'default_db__x3A__BI_audit_BENFORD:leadingTimeYear-quarter'"/>
         <!--<strow>
             <xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset"/>
         </strow>-->
         <xsl:variable name="SIMPLETABLE_WTITLE">
             <SIMPLETABLE_WTITLE>
                 <simpletable frame="all"
-                    id="ANALIZA_UMOW_4UA.graph.related.deals_table_2_5_{$generate_id}_{$title}"
-                    props="print__no graph.ylabel.ilosc graph.y2label.wartosc graph.style.histogram   "><!-- font15 -->
+                    id="ANALIZA_UMOW_4UA.DW.graph.related.deals_table_2_5_{$generate_id}_{$title}"
+                    props="print__no graph.ylabel.. graph.y2label.wartosc graph.style.histogram.rowstacked   "><!-- font15 -->
                     
                     <strow props="graph.headers">
                         <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset/*/*" group-by="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]">
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
                             <!--<stentry  current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" props="graph.xtic" audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>-->
-                            <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>
+                            <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>-->
                             <xsl:for-each-group select="current-group()" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
+                                <xsl:sort select="number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)" data-type="number" order="ascending"/>
                                 <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>
-                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>
+                                <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>-->
                             </xsl:for-each-group>
                         </xsl:for-each-group>
                     </strow>
@@ -449,10 +513,11 @@
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
                             <!--<stentry audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" ><xsl:value-of select="count(current-group())"/></stentry>-->
                             <xsl:variable name="current-group.parent.count" select="count(current-group())"/>
-                            <stentry audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" ><xsl:value-of select="sum(current-group()/*[@default_db__x3A__BI_audit_BENFORD:leadingNumber]/number())"/></stentry>
+                            <!--<stentry audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" ><xsl:value-of select="sum(current-group()/*[@default_db__x3A__BI_audit_BENFORD:leadingNumber]/number())"/></stentry>-->
                             <xsl:for-each-group select="current-group()" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
-                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="count(current-group()) div $current-group.parent.count"/></stentry>
-                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="sum(current-group()/*[@default_db__x3A__BI_audit_BENFORD:leadingNumber]/number())"/></stentry>
+                                <xsl:sort select="number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)" data-type="number" order="ascending"/>
+                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="count(current-group()) "/></stentry><!-- div $current-group.parent.count -->
+                                <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="sum(current-group()/*[@default_db__x3A__BI_audit_BENFORD:leadingNumber]/number())"/></stentry>-->
                             </xsl:for-each-group>
                         </xsl:for-each-group>
                         
@@ -461,10 +526,11 @@
                         <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset/*/*" group-by="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]">
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
                             <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" group="rozklad" audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">rozkład</stentry>-->
-                            <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" group="koszt" audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">koszt.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry><!--<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>-->
+                            <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" group="koszt" audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">koszt.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>--><!--<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>-->
                             <xsl:for-each-group select="current-group()" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
+                                <xsl:sort select="number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)" data-type="number" order="ascending"/>
                                 <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" group="iloscB.{@default_db__x3A__BI_audit_BENFORD:leadingNumber}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">ilość B.<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry><!--<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>-->
-                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" group="kosztB.{@default_db__x3A__BI_audit_BENFORD:leadingNumber}" audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">koszt B.<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry><!--<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>-->
+                                <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" group="kosztB.{@default_db__x3A__BI_audit_BENFORD:leadingNumber}" audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">koszt B.<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>--><!--<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>-->
                             </xsl:for-each-group>
                         </xsl:for-each-group>
                     </strow>
@@ -472,10 +538,39 @@
                         <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset/*/*" group-by="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]">
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
                             <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">blue</stentry>-->
-                            <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">brown</stentry>
+                            <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">brown</stentry>-->
                             <xsl:for-each-group select="current-group()" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
-                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>0<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>0FF</stentry>
-                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >red</stentry>
+                                <xsl:sort select="number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)" data-type="number" order="ascending"/>
+                                <xsl:choose>
+                                    <xsl:when test="1=2"/>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=1">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#0000FF</stentry></xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=2">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#0000AA</stentry></xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=3">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#000066</stentry></xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=4">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#000033</stentry></xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=5">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#003300</stentry></xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=6">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#006600</stentry>
+                                    </xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=7">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#009900</stentry>
+                                    </xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=8">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#00CC00</stentry>
+                                    </xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=9">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#00FF00</stentry>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#<xsl:value-of select="9-number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)"/>0<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>0<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>F</stentry>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                                
+                                <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >red</stentry>-->
                             </xsl:for-each-group>
                         </xsl:for-each-group>
                     </strow>
@@ -489,30 +584,34 @@
                         <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset/*/*" group-by="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]">
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
                             <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"/>-->
-                            <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">2</stentry>
+                            <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">2</stentry>-->
                             <xsl:for-each-group select="current-group()" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
+                                <xsl:sort select="number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)" data-type="number" order="ascending"/>
                                 <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  />
-                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >2</stentry>
+                                <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >2</stentry>-->
                             </xsl:for-each-group>
                         </xsl:for-each-group>
                     </strow>
                     <strow props="graph.fill.style">
-                        <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset//*" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
+                        <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset/*/*" group-by="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]">
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
-                            <stentry props="graph.notitle" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"/>
+                            <!--<stentry props="graph.notitle" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"> with boxes </stentry>-->
                             <!--<stentry current-grouping-key="{@default_db__x3A__BI_audit_BENFORD:leadingNumber}"/>-->
                             <xsl:for-each-group select="current-group()" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
-                                <stentry props="graph.notitle" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}_{@default_db__x3A__BI_audit_BENFORD:leadingNumber}"  />
-                                <stentry props="graph.notitle" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}_{@default_db__x3A__BI_audit_BENFORD:leadingNumber}"  />
+                                <xsl:sort select="number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)" data-type="number" order="ascending"/>
+                                <stentry props="graph.title.unique" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}_{@default_db__x3A__BI_audit_BENFORD:leadingNumber}"  />
+                                <!--<stentry props="graph.notitle" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}_{@default_db__x3A__BI_audit_BENFORD:leadingNumber}"  />-->
                             </xsl:for-each-group>
                         </xsl:for-each-group>
                     </strow>
                     <strow props="graph.newhistogram">
                         <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset/*/*" group-by="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]">
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
-                            <stentry audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"> analiza \n rozkładu</stentry>
+                            <!--<stentry audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><!-\- analiza \n rozkładu -\-><xsl:value-of select="replace(@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ],'-','\\n')"/></stentry>-->
                             <xsl:for-each-group select="current-group()" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
-                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"> analiza \n rozkładu</stentry>
+                                <xsl:sort select="number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)" data-type="number" order="ascending"/>
+                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"> analiza \n rozkładu <!--<xsl:value-of select="replace(@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ],'-','\\n')"/>--></stentry><!-- analiza \n rozkładu -->
+                                <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><!-\- analiza \n rozkładu -\-><xsl:value-of select="replace(@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ],'-','\\n')"/></stentry>--><!--  analiza \n rozkładu -->
                                 <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">an. <xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>-->
                             </xsl:for-each-group>
                         </xsl:for-each-group>
@@ -527,7 +626,7 @@
         </xsl:variable>
         <xsl:choose>
             <xsl:when test="$simpletable//stentry">
-                <p> (A3W) wykres </p>
+                <p> (APU4-DPW) umowy pośrednio powiązane z obiektem </p>
                 <foreign>
                     <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
                 </foreign>

+ 17 - 2
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_context.path.xsl

@@ -66,10 +66,13 @@
     <xsl:template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs__x3A__to_nodeset">
         <xsl:param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs" required="yes"/>
         <xsl:param name="system_cache__dita:interested_row"/>
+        <xsl:param name="system_cache__dita:interested_row.noattrrs__x3A__include"/>
         <xsl:for-each select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs">
             <default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs__x3A__to_nodeset default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs="{$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs}">
                 <xsl:for-each select="tokenize(current(),' ')">
-                    <xsl:apply-templates mode="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs__x3A__to_nodeset" select="$system_cache__dita:interested_row//*[@fid = current()]"/>
+                    <xsl:apply-templates mode="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs__x3A__to_nodeset" select="$system_cache__dita:interested_row//*[@fid = current()]">
+                        <xsl:with-param name="system_cache__dita:interested_row.noattrrs__x3A__include" select="$system_cache__dita:interested_row.noattrrs__x3A__include" tunnel="yes"/>
+                    </xsl:apply-templates>
                 </xsl:for-each>
             </default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs__x3A__to_nodeset>
         </xsl:for-each>
@@ -110,6 +113,7 @@
     
     
     <xsl:template mode="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs__x3A__to_nodeset" match="*[*]">
+        <xsl:param name="system_cache__dita:interested_row.noattrrs__x3A__include" tunnel="yes"/>
         <xsl:copy>
             <xsl:copy-of select="@*"/>
             <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs__x3A__to_nodeset.precedings.count"/>
@@ -117,11 +121,22 @@
         </xsl:copy>
     </xsl:template>
     
-    <xsl:template mode="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs__x3A__to_nodeset" match="*[not(*) and not(@*)]"/>
+    <xsl:template mode="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs__x3A__to_nodeset" match="*[not(*) and not(@*)]">
+        <xsl:param name="system_cache__dita:interested_row.noattrrs__x3A__include" tunnel="yes"/>
+        <xsl:choose>
+            <xsl:when test="$system_cache__dita:interested_row.noattrrs__x3A__include">
+                <xsl:copy>
+                    <xsl:copy-of select="@*"/>
+                    <xsl:apply-templates mode="#current"/>
+                </xsl:copy>
+            </xsl:when>
+        </xsl:choose>
+    </xsl:template>
         
     
     
     <xsl:template mode="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.attrs__x3A__to_nodeset" match="*[@* and not(*)]">
+        <xsl:param name="system_cache__dita:interested_row.noattrrs__x3A__include" tunnel="yes"/>
         <xsl:copy>
             <xsl:copy-of select="@*"/>
             <xsl:apply-templates mode="#current"/>

+ 2 - 2
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_operational_raport_note.xsl

@@ -74,11 +74,11 @@
             </xsl:result-document>
             
             <xsl:variable name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.star" select="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed($interested_row,$sources,'*')"/>
-            <xsl:result-document href="{$temp}/{$uuid}/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.star.xml">
+            <xsl:result-document href="{$temp}/{$uuid}/BI_audit_operational_raport_note.BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.star.xml">
                 <xsl:copy-of select="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed($interested_row,$sources,'*')"/>
             </xsl:result-document>
             
-            <xsl:result-document href="{$temp}/{$uuid}/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq.star.xml">
+            <xsl:result-document href="{$temp}/{$uuid}/BI_audit_operational_raport_note.BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq.star.xml">
                 <xsl:copy-of select="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq($system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.star,$sources)"/>
             </xsl:result-document>
             

+ 1 - 1
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row.xsl

@@ -28,7 +28,7 @@
     
     <xsl:template mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row" match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row">
         <!--<xsl:param name="group_name" required="yes"/>-->
-        <xsl:param name="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA" required="yes"/>
+        <xsl:param name="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA" required="no"/>
         <xsl:param name="limit_same_entry_side" select="'source'"/>
         <xsl:param name="limit" select="10"/>
         <xsl:param name="title" required="yes"/>

+ 43 - 13
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_tree_to_dita.xsl

@@ -123,6 +123,9 @@
         <xsl:variable name="default_db__x3A__BI_audit_BENFORD:NameField">
             <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:NameField"/>
         </xsl:variable>
+        
+        
+        
         <xsl:variable name="dita">
             <xsl:apply-templates select="." mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_statystyka_pracownik.dita">
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:valueField" select="$default_db__x3A__BI_audit_BENFORD:valueField" />
@@ -848,19 +851,46 @@
                     </xsl:call-template>
                     
                 </topichead>-->
-                
-                <topichead navtitle="Powiązania do wybranych podmiotów/kontrahentów (4UA)" >
-                    <xsl:variable name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.UMOWY">
-                        <xsl:call-template name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed">
-                            <xsl:with-param name="sources" select="$sources"/>
-                            <xsl:with-param name="interested_row" select="$interested_row"/>
-                            <xsl:with-param name="system_cache__dita:groupset.mode.BI_audit_ENERGA_RUM_KONTRAHENCI_UMOWY.path" select="true()"/><!-- system_cache__dita:groupset.mode.BI_audit_ENERGA_RUM_KONTRAHENCI_UMOWY.path -->
-                            <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:valueField"    select="$default_db__x3A__BI_audit_BENFORD:valueField"  />
-                            <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField"     select="$default_db__x3A__BI_audit_BENFORD:groupField"/>
-                            <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField"   select="$default_db__x3A__BI_audit_BENFORD:timeField" />
-                            <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
-                        </xsl:call-template>
-                    </xsl:variable>
+                <xsl:variable name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.UMOWY">
+                    <xsl:call-template name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed">
+                        <xsl:with-param name="sources" select="$sources"/>
+                        <xsl:with-param name="interested_row" select="$interested_row"/>
+                        <xsl:with-param name="system_cache__dita:groupset.mode.BI_audit_ENERGA_RUM_KONTRAHENCI_UMOWY.path" select="true()"/><!-- system_cache__dita:groupset.mode.BI_audit_ENERGA_RUM_KONTRAHENCI_UMOWY.path -->
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:valueField"    select="$default_db__x3A__BI_audit_BENFORD:valueField"  />
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField"     select="$default_db__x3A__BI_audit_BENFORD:groupField"/>
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField"   select="$default_db__x3A__BI_audit_BENFORD:timeField" />
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                    </xsl:call-template>
+                </xsl:variable>
+                <topichead navtitle="Powiązania znalezione trasy (APT)" >
+                    
+                    
+                    
+                    <xsl:attribute name="props">APT</xsl:attribute>
+                    <xsl:attribute name="toc">no</xsl:attribute>
+                    <!--<xsl:attribute name="processing-role">resource-only</xsl:attribute>-->
+                    
+                    <xsl:call-template name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal">
+                        <xsl:with-param name="navtitle">Analiza powiązań dotycząca umów (APT) </xsl:with-param>
+                        <xsl:with-param name="keys">_element_gwiazdka__mode_BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA</xsl:with-param>
+                        <xsl:with-param name="mode">BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA</xsl:with-param>
+                        <!--<xsl:with-param name="processing-role">resource-only</xsl:with-param>-->
+                        <xsl:with-param name="element">*</xsl:with-param>
+                        <xsl:with-param name="interested_row" select="$interested_row"/>
+                        <xsl:with-param name="sources" select="$sources"/>
+                        <xsl:with-param name="resulset" select="$resulset"/>
+                        <xsl:with-param name="title" select="'APT_trasy'"/>
+                        <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.UMOWY"/>
+                        <!--<xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq"/>-->
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:valueField" select="$default_db__x3A__BI_audit_BENFORD:valueField" tunnel="yes"/>
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" tunnel="yes"/>
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField" tunnel="yes"/>
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField" tunnel="yes"/>
+                    </xsl:call-template>
+                    
+                </topichead>
+                <topichead navtitle="Powiązania do wybranych podmiotów/kontrahentów (APU4)" >
+                    
                     
                     
                     <xsl:attribute name="props">APU4</xsl:attribute>

+ 3 - 0
SE/schema/default_db_xml_cache.public/default_db/dateTime.xsl

@@ -30,6 +30,7 @@
                 <xsl:value-of select="tokenize($date,'\.')[3]"/>
             </xsl:when>
             <xsl:otherwise>
+                <xsl:value-of select="'NaN'"/>
                 <xsl:message terminate="no">#28 ERROR ERROR in date format for value "<xsl:value-of select="$date"/>"! </xsl:message>
             </xsl:otherwise>
             
@@ -56,6 +57,7 @@
                 <xsl:value-of select="tokenize($date,'\.')[2]"/>
             </xsl:when>
             <xsl:otherwise>
+                <xsl:value-of select="'NaN'"/>
                 <xsl:message terminate="no">#28-B ERROR ERROR in date format for value "<xsl:value-of select="$date"/>"! </xsl:message>
             </xsl:otherwise>
             
@@ -82,6 +84,7 @@
                 <xsl:value-of select="round(number(tokenize($date,'\.')[2]) div 3)"/>
             </xsl:when>
             <xsl:otherwise>
+                <xsl:value-of select="'NaN'"/>
                 <xsl:message terminate="no">#28-C ERROR ERROR in date format for value "<xsl:value-of select="$date"/>"! </xsl:message>
             </xsl:otherwise>
             

+ 43 - 3
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.xsl

@@ -437,6 +437,7 @@ unset xtics</xsl:text></xsl:when>
         <xsl:call-template name="system_cache__dita:graph.axis__x3A__validate">
             <xsl:with-param name="graph.headers" select="$graph.headers"/>
             <xsl:with-param name="graph.title" select="$graph.title"/>
+            <xsl:with-param name="graph.fill.style" select="$graph.fill.style"/>
         </xsl:call-template>
         
         <xsl:apply-templates mode="system_cache__dita:graph__write" select=".">
@@ -453,6 +454,13 @@ unset xtics</xsl:text></xsl:when>
             </xsl:call-template>
         </xsl:variable>
         
+        <xsl:variable name="system_cache__dita:graph.ytics_detect_row">
+            <xsl:call-template name="system_cache__dita:graph.ytics_detect_row">
+                <xsl:with-param name="ytics" select="$ytics"/>
+                <!--<xsl:with-param name="xtics" select="$xtics"/>-->
+            </xsl:call-template>
+        </xsl:variable>
+        
         <xsl:variable name="xtics">
             <xsl:call-template name="system_cache__dita:graph.xtics">
                 <xsl:with-param name="system_cache__dita:graph.title" select="$system_cache__dita:graph.title"/>
@@ -469,6 +477,8 @@ unset xtics</xsl:text></xsl:when>
                 <xsl:with-param name="graph.headers" select="$graph.headers"/>
                 <xsl:with-param name="graph.title" select="$graph.title"/>
                 <xsl:with-param name="ytics" select="$ytics"/>
+                <xsl:with-param name="system_cache__dita:graph.ytics_detect_row" select="$system_cache__dita:graph.ytics_detect_row" tunnel="yes"/>
+                <xsl:with-param name="simpletable.props" select="@props" tunnel="yes"/>
             </xsl:call-template>
         </xsl:variable>
         
@@ -481,16 +491,46 @@ unset xtics</xsl:text></xsl:when>
                 <xsl:with-param name="ytics" select="$ytics"/>
             </xsl:call-template>
         </xsl:variable>
-        
         <xsl:result-document href="{$ditadir}/graph_to_image/{$fileindex}.gnuplot.debug.xml" >
             <p5gnuplot:DEBUG xmlns:p5gnuplot="http://biuro.biall-net.pl/WPS_Functions/graph_gnuplot">
-                        <!--<xsl:copy-of select="$xtics.cols"/>-->
+                <!--<xsl:copy-of select="$xtics.cols"/>-->
                 <xsl:copy-of select="current()"/>
+                <xsl:copy-of select="//namespace-uri()"/>
+            </p5gnuplot:DEBUG>
+        </xsl:result-document>
+        <xsl:result-document href="{$ditadir}/graph_to_image/{$fileindex}.gnuplot.debug.xtics.xml" >
+            <p5gnuplot:xtics xmlns:p5gnuplot="http://biuro.biall-net.pl/WPS_Functions/graph_gnuplot">
+                        <!--<xsl:copy-of select="$xtics.cols"/>-->
+                <xsl:copy-of select="namespace-uri()"/>
+                <xsl:copy-of select="//namespace-uri()"/>
                 <xsl:copy-of select="$xtics"/>
+            </p5gnuplot:xtics>
+        </xsl:result-document>
+        
+        <xsl:result-document href="{$ditadir}/graph_to_image/{$fileindex}.gnuplot.debug.graph.ytics_detect_row.xml" >
+            <p5gnuplot:graph.ytics_detect_row xmlns:p5gnuplot="http://biuro.biall-net.pl/WPS_Functions/graph_gnuplot">
+                <xsl:copy-of select="namespace-uri()"/>
+                <xsl:copy-of select="//namespace-uri()"/>
+                <xsl:copy-of select="$system_cache__dita:graph.ytics_detect_row"/>
+            </p5gnuplot:graph.ytics_detect_row>
+        </xsl:result-document>
+        
+        <xsl:result-document href="{$ditadir}/graph_to_image/{$fileindex}.gnuplot.debug.ytics.xml" >
+            <p5gnuplot:graph.ytics xmlns:p5gnuplot="http://biuro.biall-net.pl/WPS_Functions/graph_gnuplot">
+                <!--<xsl:copy-of select="$xtics.cols"/>-->
+                <xsl:copy-of select="namespace-uri()"/>
+                <xsl:copy-of select="//namespace-uri()"/>
                 <xsl:copy-of select="$ytics"/>
+            </p5gnuplot:graph.ytics>
+        </xsl:result-document>
+        <xsl:result-document href="{$ditadir}/graph_to_image/{$fileindex}.gnuplot.debug.title.xml" >
+            <p5gnuplot:graph.ytics_detect_row xmlns:p5gnuplot="http://biuro.biall-net.pl/WPS_Functions/graph_gnuplot">
+                <xsl:copy-of select="namespace-uri()"/>
+                <xsl:copy-of select="//namespace-uri()"/>
                 <xsl:copy-of select="$system_cache__dita:graph.title"/>
-            </p5gnuplot:DEBUG>
+            </p5gnuplot:graph.ytics_detect_row>
         </xsl:result-document>
+        
         <xsl:result-document href="{$ditadir}/graph_to_image/{$fileindex}.gnuplot" omit-xml-declaration="yes">
             <xsl:choose>
                 <xsl:when test="string-length($set.style.histogram) &gt;0 and not($system_cache__dita:graph.title//*) ">

+ 103 - 15
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics.xsl

@@ -56,6 +56,8 @@
         <xsl:param name="graph.headers" required="yes"/>
         <xsl:param name="graph.title" required="yes"/>
         <xsl:param name="ytics" required="yes"/>
+        <xsl:param name="system_cache__dita:graph.ytics_detect_row" required="yes" tunnel="yes"/>
+        <xsl:param name="simpletable.props" required="yes" tunnel="yes"/>
         <xtics fileindex="{$fileindex}">
             <xsl:variable name="xtics">
                 <xtics>
@@ -66,8 +68,9 @@
                             <xsl:copy-of select="@col"/>
                             <xsl:copy-of select="@current-grouping-key"/>
                             
-                            <xsl:attribute name="group" select="@group"/>
+                            <xsl:attribute name="group" select="$ytics/ytics/ytics.row/stentry[@col=current()/@col]/@group"/><!-- @group -->
                             <xsl:attribute name="current-grouping-key.list" select="current-group()/@current-grouping-key"/>
+                            <xsl:attribute name="current-grouping-col.list" select="current-group()/@col"/>
                             <xsl:copy-of select="parent::strow/@strow.pos"/>
                                 <xsl:for-each select="current-group()/@current-grouping-key">
                                     <current-grouping-key pos="{position()}" col="{../@col}">
@@ -108,18 +111,20 @@
                                 <xsl:otherwise>
                                     <xsl:message>#53 xtics.col__x3A__not_aviable for <xsl:value-of select="$graph.newhistogram.text"/></xsl:message>
                                     <xsl:attribute name="xtics.col__x3A__not_aviable">error</xsl:attribute>
+                                    <xsl:attribute name="xtics.col__x3A__not_aviable.debug">for = $xtics//text[@pos=<xsl:value-of select="$graph.newhistogram.position"/>] </xsl:attribute>
                                 </xsl:otherwise>
                             </xsl:choose>
-                            
+                            <xsl:attribute name="debug.116">foreach group @group by [@audience=<xsl:value-of select="@audience"/>]</xsl:attribute>
                             <xsl:for-each-group select="current-group()"  group-by="@audience">
-                                <audience audience="{current-grouping-key()}" >
+                                <audience audience="{current-grouping-key()}" current-grouping-key.list="{@current-grouping-key.list}">
+                                    <xsl:attribute name="current-grouping-key.foreign" select="false()"/>
                                     <xsl:for-each select="$xtics//text[@audience = current()/@audience]" >
                                         <!--<xsl:attribute name="xtics.current-group.count" select="last()"/>-->
                                         <!--<xsl:attribute name="xtics.current-group.count.debug" select="@current-grouping-key"/>-->
                                         <!--<xsl:attribute name="xtics.audience.count.debug" select="@audience"/>-->
                                         <xsl:copy-of select="@current-grouping-key.list"/>
                                         <xsl:variable name="current-grouping-key.test" select="@current-grouping-key"/>
-                                        <xsl:attribute name="current-grouping-key.foreign" select="false()"/>
+                                        
                                         <xsl:for-each select="tokenize(@current-grouping-key.list,' ')">
                                             <xsl:choose>
                                                 <xsl:when test="current() = $current-grouping-key.test"/>
@@ -132,28 +137,34 @@
                                     <xsl:for-each select="tokenize(current-grouping-key(),' ')">
                                         <!--<xsl:text>[[[</xsl:text><xsl:value-of select="."/><xsl:text>]]]</xsl:text>-->
                                         <xsl:for-each-group select="$system_cache__dita:graph.title//stentry[contains(@audience,current())]" group-by="text()">
-                                            <current-grouping-key col="{@col}" audience="{@audience}" current-grouping-key="{@current-grouping-key}">
+                                            <current-grouping-key col="{@col}" audience="{@audience}" current-grouping-key="{@current-grouping-key}" system_cache__dita:graph.ytics_detect_row="{system_cache__dita:graph.ytics_detect_row($system_cache__dita:graph.ytics_detect_row,@col)}">
+                                                <xsl:attribute name="debug.149.cols" select="current-group()/@col"/>
                                                 <xsl:attribute name="xtics.pos__x3A__old_debug_to_off" select="$xtics//text[@col = current()/@col]/@pos"/>
+                                                <xsl:attribute name="group" select="$ytics/ytics/ytics.row/stentry[@col = current()/@col]/@group"/>
                                                 <xsl:attribute name="xtics.pos" select="system_cache__dita:graph.yaxis.pos($graph.title,$ytics,@current-grouping-key,@col)"/>
                                                 <xsl:choose>
                                                     <!--<xsl:when test="$xtics//text[@col = current()/@col]"/>-->
                                                     
-                                                    <xsl:when test="system_cache__dita:graph.yaxis.header.row__x3A_validate($ytics,@col)">
-                                                        <xsl:attribute name="xtics.col__x3A__not_aviable.debug">#163-A validate by  system_cache__dita:graph.yaxis.header.row__x3A_validate [@col =__<xsl:value-of select="@col"/>__ ]; </xsl:attribute>
+                                                    <xsl:when test="system_cache__dita:graph.yaxis.header.row__x3A_validate($system_cache__dita:graph.ytics_detect_row,@col)">
+                                                        <xsl:attribute name="xtics.col__x3A__not_aviable.debug">#163-A OK validate by  system_cache__dita:graph.yaxis.header.row__x3A_validate [@col =__<xsl:value-of select="@col"/>__ ]; </xsl:attribute>
                                                     </xsl:when>
+                                                    <!--<xsl:when test="system_cache__dita:graph.col__x3A__if_not_empty($graph.data,$ytics,system_cache__dita:graph.yaxis.pos($graph.title,$ytics,@current-grouping-key,@col))">
+                                                        <xsl:attribute name="xtics.col__x3A__not_aviable.debug">#163-X TODO group unique axis records during next  validate by  system_cache__dita:graph.col__x3A__if_not_empty [@col =__<xsl:value-of select="@col"/>__ ]; </xsl:attribute>
+                                                    </xsl:when>-->
                                                     <!--<xsl:when test="system_cache__dita:graph.yaxis__x3A_validate__group($xtics,@current-grouping-key,@col)">
                                                         <xsl:attribute name="xtics.col__x3A__not_aviable.debug">#163-B validate by  system_cache__dita:graph.yaxis__x3A_validate__group [@col =__<xsl:value-of select="@col"/>__ ]; </xsl:attribute>
                                                     </xsl:when>-->
                                                     <xsl:otherwise>
                                                         <xsl:attribute name="xtics.col__x3A__not_aviable">error</xsl:attribute>
-                                                        <xsl:attribute name="xtics.col__x3A__not_aviable.debug">#163-Bnot aviable for $xtics//text[@col =__<xsl:value-of select="@col"/>__ ]; </xsl:attribute>
+                                                        <xsl:attribute name="xtics.col__x3A__not_aviable.debug">#163-B NOT AVIABLE for $xtics//text[@col =__<xsl:value-of select="@col"/>__ ]; </xsl:attribute>
                                                     </xsl:otherwise>
                                                 </xsl:choose>
                                                 <xsl:call-template name="system_cache__dita:graph.ytics.color">
                                                     <xsl:with-param name="graph.color.variable" select="$graph.color.variable"/>
                                                     <xsl:with-param name="col" select="current()/@col"/>
                                                 </xsl:call-template>
-                                                <xsl:value-of select="@current-grouping-key"/></current-grouping-key>
+                                                <xsl:value-of select="@current-grouping-key"/>
+                                            </current-grouping-key>
                                         </xsl:for-each-group>
                                     </xsl:for-each>
                                 </audience>
@@ -177,6 +188,7 @@
                 <xsl:with-param name="graph.data" select="$graph.data" tunnel="yes"/>
                 <xsl:with-param name="ytics" select="$ytics" tunnel="yes"/>
                 <xsl:with-param name="graph.newhistogram" select="$graph.newhistogram" tunnel="yes"/>
+                <xsl:with-param name="simpletable.props" select="$simpletable.props" tunnel="yes"/>
             </xsl:apply-templates>
                 
         </xtics>
@@ -201,8 +213,11 @@
         <xsl:param name="graph.data" required="yes" tunnel="yes"/>
         <xsl:param name="ytics" required="yes" tunnel="yes"/>
         <xsl:param name="graph.newhistogram" required="yes" tunnel="yes"/>
+        <xsl:param name="simpletable.props" required="yes" tunnel="yes"/>
         <p5gnuplot:graph.newhistogram>
+            <xsl:call-template name="p5gnuplot:set.graph.style.histogram.rowstacked"/>
             <xsl:call-template name="p5gnuplot:set.xtics.rotate"/>
+            <xsl:call-template name="p5gnuplot:set.xtics.unset"/>
             <xsl:call-template name="p5gnuplot:set.key"/>
             <xsl:call-template name="p5gnuplot:set.bmargin"/>
             <xsl:call-template name="p5gnuplot:set.yrange"/>
@@ -234,15 +249,70 @@
         <xsl:param name="graph.data" required="yes" tunnel="yes"/>
         <xsl:param name="ytics" required="yes" tunnel="yes"/>
         <xsl:param name="graph.newhistogram" required="yes" tunnel="yes"/>
+        <xsl:param name="simpletable.props" required="yes" tunnel="yes"/>
         <xsl:comment>#72 @pos=<xsl:value-of select="@pos"/></xsl:comment>
         <p5gnuplot:plot p5gnuplot:text.join=" ">
+            <xsl:variable name="current.current-grouping-key">
+                <current.current-grouping-key>
+                    <xsl:for-each-group select="audience/current-grouping-key" group-by="@audience">
+                        <xsl:sort select="@audience"/>
+                        <xsl:copy>
+                            <xsl:copy-of select="@audience"/>
+                        </xsl:copy>
+                    </xsl:for-each-group>
+                </current.current-grouping-key>
+            </xsl:variable>
+            
+            <xsl:variable name="following.current-grouping-key">
+                <following.current-grouping-key>
+                    <xsl:for-each-group select="following-sibling::graph.newhistogram[1]/audience/current-grouping-key" group-by="@audience">
+                        <xsl:sort select="@audience"/>
+                        <xsl:copy>
+                            <xsl:copy-of select="@audience"/>
+                        </xsl:copy>
+                    </xsl:for-each-group>
+                </following.current-grouping-key>
+            </xsl:variable>
+            <xsl:variable name="test.following.current-grouping-key_x3A__different">
+                <xsl:for-each select="$current.current-grouping-key//current-grouping-key">
+                    <xsl:choose>
+                        <xsl:when test="$following.current-grouping-key//current-grouping-key[@audience = current()/@audience]">
+                            <!--<xsl:attribute name="debug.274A">same for <xsl:value-of select="@audience"/></xsl:attribute>-->
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="@audience"/>
+                            <!--<xsl:attribute name="debug.274">differ for <xsl:value-of select="@audience"/></xsl:attribute>-->
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:for-each>
+                <xsl:for-each select="$following.current-grouping-key//current-grouping-key">
+                    <xsl:choose>
+                        <xsl:when test="$current.current-grouping-key//current-grouping-key[@audience = current()/@audience]">
+                            <!--<xsl:attribute name="debug.274A">same for <xsl:value-of select="@audience"/></xsl:attribute>-->
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="@audience"/>
+                            <!--<xsl:attribute name="debug.274">differ for <xsl:value-of select="@audience"/></xsl:attribute>-->
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:for-each>
+            </xsl:variable>
+            <xsl:attribute name="test.following.current-grouping-key_x3A__different" select="$test.following.current-grouping-key_x3A__different"/>
             <xsl:choose>
-                <xsl:when test="1=1 and audience[@current-grouping-key.foreign='false'] and @pos='1'">
+                <!--<xsl:when test="1=1 and audience[@current-grouping-key.foreign='false'] and @pos='1'">
+                    <xsl:variable name="newhistogram.text"><xsl:value-of select="@graph.newhistogram.text"/><xsl:text> </xsl:text><xsl:for-each select="following-sibling::graph.newhistogram"> oraz: <xsl:value-of select="@graph.newhistogram.text"/></xsl:for-each></xsl:variable>
+                    <!-\-<xsl:attribute name="p5gnuplot:text"> newhistogram "<xsl:value-of select="@graph.newhistogram.text"/> <xsl:for-each select="following-sibling::graph.newhistogram"> oraz: <xsl:value-of select="@graph.newhistogram.text"/></xsl:for-each>" </xsl:attribute>-\->
+                    <xsl:attribute name="p5gnuplot:text"> newhistogram <xsl:value-of select="system_cache__dita:graph.lingstring__x3A__break(p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names($newhistogram.text,45),$system_cache__dita:graph.lingstring__x3A__break.size)"/> </xsl:attribute>
+                </xsl:when>-->
+                <xsl:when test="1=1 and audience[@current-grouping-key.foreign='false'] and string-length($test.following.current-grouping-key_x3A__different)=0 and @pos='1'">
                     <xsl:variable name="newhistogram.text"><xsl:value-of select="@graph.newhistogram.text"/><xsl:text> </xsl:text><xsl:for-each select="following-sibling::graph.newhistogram"> oraz: <xsl:value-of select="@graph.newhistogram.text"/></xsl:for-each></xsl:variable>
                     <!--<xsl:attribute name="p5gnuplot:text"> newhistogram "<xsl:value-of select="@graph.newhistogram.text"/> <xsl:for-each select="following-sibling::graph.newhistogram"> oraz: <xsl:value-of select="@graph.newhistogram.text"/></xsl:for-each>" </xsl:attribute>-->
                     <xsl:attribute name="p5gnuplot:text"> newhistogram <xsl:value-of select="system_cache__dita:graph.lingstring__x3A__break(p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names($newhistogram.text,45),$system_cache__dita:graph.lingstring__x3A__break.size)"/> </xsl:attribute>
                 </xsl:when>
-                <xsl:when test="1=1 and audience[@current-grouping-key.foreign='false']">
+                <!--<xsl:when test="1=1 and audience[@current-grouping-key.foreign='false']">
+                    <xsl:comment>#146 bypassed  histograms</xsl:comment>
+                </xsl:when>-->
+                <xsl:when test="1=1 and audience[@current-grouping-key.foreign='false'] and string-length($test.following.current-grouping-key_x3A__different)=0 ">
                     <xsl:comment>#146 bypassed  histograms</xsl:comment>
                 </xsl:when>
                 <xsl:otherwise>
@@ -273,6 +343,7 @@
         <xsl:param name="ytics" required="yes" tunnel="yes"/>
         <xsl:param name="graph.newhistogram" required="yes" tunnel="yes"/>
         <xsl:param name="xtics.data.column__x3A__offset" select="p5gnuplot:xtics.data.column__x3A__offset()" tunnel="yes" />
+        <xsl:param name="simpletable.props" required="yes" tunnel="yes"/>
         <p5gnuplot:newhistogram  p5gnuplot:text.join=" " debug="#281 matched: {name()}">
             <!--<xsl:choose>
                 <xsl:when test="preceding::audience">-->
@@ -296,12 +367,13 @@
         <xsl:param name="graph.data" required="yes" tunnel="yes"/>
         <xsl:param name="ytics" required="yes" tunnel="yes"/>
         <xsl:param name="graph.newhistogram" required="yes" tunnel="yes"/>
+        <xsl:param name="simpletable.props" required="yes" tunnel="yes"/>
         <p5gnuplot:plot_arg p5gnuplot:text.join=" " debug="#303 matched: {name()}">
             <!--<xsl:if test="preceding::current-grouping-key">
             <xsl:attribute name="p5gnuplot:text.join"> , </xsl:attribute>
             </xsl:if>-->
             
-            <p5gnuplot:file p5gnuplot:text.join=" , " p5gnuplot:text="&quot;{$fileindex}{$p5gnuplot:graph.gnuplot.dat__x3A__suffix}&quot;" debug="file is used; input @col={@col}; @xtics.pos={@xtics.pos}; "/>
+            <p5gnuplot:file p5gnuplot:text.join=" , " p5gnuplot:text="&quot;{$fileindex}{$p5gnuplot:graph.gnuplot.dat__x3A__suffix}&quot;" debug="file is used; input @col={@col}; @xtics.pos={@xtics.pos}; @system_cache__dita:graph.ytics_detect_row={@system_cache__dita:graph.ytics_detect_row}; "/>
             
             
             <p5gnuplot:file.row.y.using p5gnuplot:text.join=" " p5gnuplot:text="using " debug="which row is used for data"/>
@@ -321,7 +393,7 @@
                 </xsl:when>
             </xsl:choose>
             
-            <p5gnuplot:file.row.y  p5gnuplot:text="{number(@xtics.pos)}" debug="cond color columns"/><!-- $xtics.data.column__x3A__offset -->
+            <p5gnuplot:file.row.y  p5gnuplot:text="{number(@system_cache__dita:graph.ytics_detect_row)}" p5gnuplot:value="{@system_cache__dita:graph.ytics_detect_row}" debug="cond color columns"/><!-- $xtics.data.column__x3A__offset -->
             <xsl:choose>
                 <xsl:when test="number(@graph.color.variable) &gt;0">
                     <p5gnuplot:file.row.y.color.column  p5gnuplot:text=":(column(-{system_cache__dita:graph.xtics.color.column($xtics)}))" debug="which row is used for color and unless todo graph.fill.style/text()  col={@col}">
@@ -342,7 +414,7 @@
             <!--<p5gnuplot:fill.boxes p5gnuplot:text.join=" with boxes " />-->  
             <xsl:call-template name="p5gnuplot:file.row.style">
                 <xsl:with-param name="col" select="@col"/>
-                <xsl:with-param name="xtics.pos" select="number(@xtics.pos)"/>
+                <xsl:with-param name="xtics.pos" select="number(@system_cache__dita:graph.ytics_detect_row)"/><!-- @xtics.pos -->
                 <xsl:with-param name="xtics" select="$xtics"/>
                 <!--<xsl:with-param name="xtics.data.column__x3A__offset" select="$xtics.data.column__x3A__offset"/>-->
             </xsl:call-template>
@@ -352,7 +424,7 @@
             </xsl:call-template>
             <xsl:call-template name="p5gnuplot:file.row.yaxis">
                 <xsl:with-param name="col" select="@col"/><!-- @xtics.pos -->
-                <xsl:with-param name="system_cache__dita:graph.col__x3A__if_not_empty" select="system_cache__dita:graph.col__x3A__if_not_empty($graph.data,$ytics,@xtics.pos)"/>
+                <xsl:with-param name="system_cache__dita:graph.col__x3A__if_not_empty" select="system_cache__dita:graph.col__x3A__if_not_empty($graph.data,$ytics,@system_cache__dita:graph.ytics_detect_row)"/>
             </xsl:call-template>
             
             
@@ -392,6 +464,22 @@
                     <xsl:attribute name="p5gnuplot:text">noti col</xsl:attribute>
                     <xsl:attribute name="p5gnuplot:value">no</xsl:attribute>
                 </xsl:when>
+                <xsl:when test="$graph.fill.style//stentry[ @col = $col]/contains(@props,'graph.title.unique')">
+                    <xsl:choose>
+                        <xsl:when test="preceding::audience/current-grouping-key[@group=current()/@group]">
+                            <xsl:attribute name="p5gnuplot:text.join" select="' '"/>
+                            <xsl:attribute name="p5gnuplot:text">noti col</xsl:attribute>
+                            <xsl:attribute name="p5gnuplot:value">no</xsl:attribute>
+                            <xsl:attribute name="debug">#477-A YES found preceding::current-grouping-key[@group(<xsl:value-of select="@group"/>)=current/@group used graph.title.unique</xsl:attribute>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:attribute name="p5gnuplot:text.join" select="' '"/> 
+                            <xsl:attribute name="p5gnuplot:text">ti col</xsl:attribute>
+                            <xsl:attribute name="p5gnuplot:value">yes</xsl:attribute>
+                            <xsl:attribute name="debug">#477-B YES found  preceding::current-grouping-key[@group(<xsl:value-of select="@group"/>)=current/@group  used graph.title.unique </xsl:attribute>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:when>
                 <xsl:otherwise>
                     <xsl:attribute name="p5gnuplot:text.join" select="' '"/> 
                     <xsl:attribute name="p5gnuplot:text">ti col</xsl:attribute>

+ 50 - 3
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__detect.xsl

@@ -25,6 +25,9 @@
     </xsl:function>
     
     
+    
+    
+    
     <xsl:template name="p5gnuplot:detect.histogram">
         <xsl:param name="fileindex" tunnel="yes" required="yes"/>
         <xsl:param name="graph.fill.style" required="yes" tunnel="yes"/>
@@ -45,6 +48,7 @@
                 <xsl:text> anchestors:[</xsl:text><xsl:for-each select="ancestor-or-self::*"> <xsl:value-of select="name()"/><xsl:text> </xsl:text></xsl:for-each><xsl:text>]</xsl:text>
                 <xsl:text> @p5gnuplot:detect.histogram.groups__x3A__count:[</xsl:text><xsl:value-of select="p5gnuplot:detect.histogram.groups__x3A__count($graph.newhistogram)"/><xsl:text>]</xsl:text>
             </xsl:attribute>
+            <!--<xsl:attribute name="p5gnuplot:detect.histogram.groups__x3A__count" select=""/>-->
             <!-- graph.newhistogram[@xtics.col__x3A__not_aviable]|current-grouping-key[@xtics.col__x3A__not_aviable] -->
         </p5gnuplot:detect.histogram>
     </xsl:template>
@@ -64,12 +68,42 @@
     </xsl:function>
     
     
-    <xsl:function name="system_cache__dita:graph.yaxis.header.row__x3A_validate">
+    <xsl:template name="system_cache__dita:graph.ytics_detect_row">
         <xsl:param name="ytics" required="yes"/>
+        <system_cache__dita:graph.ytics_detect_row>
+        <xsl:for-each-group select="$ytics/ytics[1]/ytics.row/stentry" group-by="text()">
+            <!--<xsl:sort select="stentry/number(@col)" order="ascending" data-type="number"/>-->
+            <xtics.pos position="{position()}">
+                <xsl:copy-of select="@*"/>
+                <xsl:for-each select="current-group()">
+                    <current-group.rows current-group.rows.pos="{position()}">
+                        <xsl:copy-of select="@*"/>
+                    </current-group.rows>
+                </xsl:for-each>
+                <xsl:value-of select="text()"/>
+            </xtics.pos>
+        </xsl:for-each-group>
+        </system_cache__dita:graph.ytics_detect_row>
+    </xsl:template>
+    
+    
+    <xsl:function name="system_cache__dita:graph.ytics_detect_row">
+        <xsl:param name="system_cache__dita:graph.ytics_detect_row" required="yes"/>
+        <xsl:param name="col" required="yes"/>
+        <xsl:choose>
+            <xsl:when test="$system_cache__dita:graph.ytics_detect_row//xtics.pos[@col=$col]">
+                <xsl:value-of select="$system_cache__dita:graph.ytics_detect_row//xtics.pos[@col=$col]/number(@position)+1"/>
+            </xsl:when>
+        </xsl:choose>
+        
+    </xsl:function>
+    
+    <xsl:function name="system_cache__dita:graph.yaxis.header.row__x3A_validate">
+        <xsl:param name="system_cache__dita:graph.ytics_detect_row" required="yes"/>
         <xsl:param name="col" required="yes"/>
         <!--<xsl:param name="xtics.pos" required="yes"/>-->
         <xsl:choose>
-            <xsl:when test="$ytics/ytics/ytics.row[@pos='1']/stentry[@col=$col ]">
+            <xsl:when test="$system_cache__dita:graph.ytics_detect_row//xtics.pos[@col=$col ]">
                 <xsl:value-of select="true()"/>
             </xsl:when>
             
@@ -95,9 +129,10 @@
     <xsl:template name="system_cache__dita:graph.axis__x3A__validate">
         <xsl:param name="graph.headers"/>
         <xsl:param name="graph.title"/>
+        <xsl:param name="graph.fill.style"/>
         <xsl:choose>
             <xsl:when test="count($graph.headers//stentry) = count($graph.title//stentry)">
-                <xsl:message>#33 [ V A L I D A T E ]  [ C O U N T ]  - [ OK ] (system_cache__dita:graph.axis__x3A__validate count($graph.headers//stentry) = count($graph.title//stentry))</xsl:message></xsl:when>
+                <xsl:message>#33-A [ V A L I D A T E ]  [ C O U N T ]  - [ OK ] (system_cache__dita:graph.axis__x3A__validate count($graph.headers//stentry) = count($graph.title//stentry))</xsl:message></xsl:when>
             <xsl:otherwise>
                 <xsl:message terminate="yes">#33 [ V A L I D A T E ]  [ C O U N T ]  - [ FAIL ] (system_cache__dita:graph.axis__x3A__validate count($graph.headers//stentry) = count($graph.title//stentry))
                     @id = <xsl:value-of select="@id"/>
@@ -106,6 +141,18 @@
                 </xsl:message>
             </xsl:otherwise>
         </xsl:choose>
+        <xsl:choose>
+            <xsl:when test="not($graph.fill.style//stentry)"/>
+            <xsl:when test="count($graph.headers//stentry) = count($graph.fill.style//stentry)">
+                <xsl:message>#33-B [ V A L I D A T E ]  [ C O U N T ]  - [ OK ] (system_cache__dita:graph.axis__x3A__validate count($graph.headers//stentry) = count($graph.title//stentry))</xsl:message></xsl:when>
+            <xsl:otherwise>
+                <xsl:message terminate="yes">#33-B [ V A L I D A T E ]  [ C O U N T ]  - [ FAIL ] (system_cache__dita:graph.axis__x3A__validate count($graph.headers//stentry) = count($graph.fill.style//stentry))
+                    @id = <xsl:value-of select="@id"/>
+                    c/$graph.headers = <xsl:value-of select="count($graph.headers//stentry)"/>
+                    c/$graph.fill.style = <xsl:value-of select="count($graph.fill.style//stentry)"/>
+                </xsl:message>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
     
 </xsl:stylesheet>

+ 35 - 0
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__set.xsl

@@ -20,8 +20,14 @@
     
 <xsl:template name="p5gnuplot:set.xtics.rotate">
 <xsl:param name="xtics" tunnel="yes"/>
+    <xsl:param name="graph.newhistogram" tunnel="yes" required="yes"/>
 <p5gnuplot:set.xtics.rotate>
     <xsl:choose>
+        <xsl:when test="p5gnuplot:detect.histogram.groups__x3A__count($graph.newhistogram) &gt;1">
+            <xsl:attribute name="p5gnuplot:text.join"><xsl:text>
+</xsl:text></xsl:attribute>
+            <xsl:attribute name="p5gnuplot:text">#set xtics rotate</xsl:attribute>
+        </xsl:when>
         <xsl:when test="system_cache__dita:graph.xtics.color.column($xtics)=3 or count(descendant::audience)=1 or count(descendant::p5gnuplot:plot[@p5gnuplot:text]) &lt;= 1">
             <xsl:attribute name="p5gnuplot:text.join"><xsl:text>
 </xsl:text></xsl:attribute>
@@ -34,6 +40,21 @@
 </p5gnuplot:set.xtics.rotate>
 </xsl:template> 
     
+    
+    <xsl:template name="p5gnuplot:set.xtics.unset">
+        <xsl:param name="xtics" tunnel="yes"/>
+        <xsl:param name="graph.newhistogram" tunnel="yes" required="yes"/>
+        <p5gnuplot:set.xtics.rotate>
+            <xsl:choose>
+                <xsl:when test="p5gnuplot:detect.histogram.groups__x3A__count($graph.newhistogram) &gt;1">
+                    <xsl:attribute name="p5gnuplot:text.join"><xsl:text>
+</xsl:text></xsl:attribute>
+                    <xsl:attribute name="p5gnuplot:text">unset xtics</xsl:attribute>
+                </xsl:when>
+            </xsl:choose>
+        </p5gnuplot:set.xtics.rotate>
+    </xsl:template>
+    
     <xsl:template name="p5gnuplot:set.key">
         <xsl:param name="xtics" tunnel="yes"/>
         <p5gnuplot:set.key>
@@ -108,5 +129,19 @@
     </xsl:template>
     
     
+    <xsl:template name="p5gnuplot:set.graph.style.histogram.rowstacked">
+        <xsl:param name="simpletable.props" tunnel="yes" required="yes"/>
+        <p5gnuplot:set.graph.style.histogram.rowstacked>
+            <xsl:choose>
+                <xsl:when test="contains($simpletable.props,'graph.style.histogram.rowstacked')">
+                    <xsl:attribute name="p5gnuplot:text.join"><xsl:text>
+</xsl:text></xsl:attribute>
+                    <xsl:attribute name="p5gnuplot:text">set style histogram rowstacked title offset -2,-2
+</xsl:attribute>
+                </xsl:when>
+            </xsl:choose>
+        </p5gnuplot:set.graph.style.histogram.rowstacked>
+    </xsl:template>
+    
     
 </xsl:stylesheet>

+ 304 - 0
se.oxygen.xpr

@@ -16,6 +16,51 @@
                     <entry>
                         <String>scenario.associations</String>
                         <scenarioAssociation-array>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>../../procesy5-dita-templates-druki/6872-bocian-energa-oferta-system-req.git/raport.powiazan/bocian_raport_powi_za.ditamap</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>DITA Map PDF - based on XSL-FO - Copy</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>DITAMAP</String>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>../../../../opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-136_000006_/relations-136_000006_.ditamap</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>DITA Map PDF - based on XSL-FO - Copy</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>DITAMAP</String>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>../../../../opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/BI_audit_BENFORD_24/BI_audit_BENFORD_24.ditamap</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>DITA Map PDF - based on XSL-FO - Copy</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>DITAMAP</String>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
                                     <String>SE/schema/WPS_Functions/render-vis-js-in-electron--v0.0.1/p5.nodeCoords__x3A__tree_to_dita.xsl</String>
@@ -36,6 +81,204 @@
                     <entry>
                         <String>scenarios</String>
                         <scenario-array>
+                            <ditaScenario>
+                                <field name="useXEP">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="useAntennaHouse">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="baseDir">
+                                    <String>${cfd}</String>
+                                </field>
+                                <field name="outputDir">
+                                    <String>/Users/a.binder/Downloads/${cfn}/out</String>
+                                </field>
+                                <field name="tempDir">
+                                    <String>/Users/a.binder/Downloads/${cfn}/temp</String>
+                                </field>
+                                <field name="transtype">
+                                    <String>pdf2</String>
+                                </field>
+                                <field name="filters">
+                                    <ditavalFilters>
+                                        <field name="useDitavalFilePath">
+                                            <Boolean>false</Boolean>
+                                        </field>
+                                        <field name="useAppliedConditionSet">
+                                            <Boolean>true</Boolean>
+                                        </field>
+                                        <field name="appliedConditionSet">
+                                            <null/>
+                                        </field>
+                                        <field name="ditavalFilePath">
+                                            <null/>
+                                        </field>
+                                        <field name="simpleFiltersList">
+                                            <list/>
+                                        </field>
+                                    </ditavalFilters>
+                                </field>
+                                <field name="addOxygenJars">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="skinCssFile">
+                                    <null/>
+                                </field>
+                                <field name="lastCustomSkinCssPath">
+                                    <null/>
+                                </field>
+                                <field name="webhelpResponsiveTemplate">
+                                    <null/>
+                                </field>
+                                <field name="publishingTemplateDataPO">
+                                    <null/>
+                                </field>
+                                <field name="additionalAntArgs">
+                                    <String></String>
+                                </field>
+                                <field name="buildTarget">
+                                    <String></String>
+                                </field>
+                                <field name="buildFilePath">
+                                    <String></String>
+                                </field>
+                                <field name="ditaParams">
+                                    <list>
+                                        <ditaParameter>
+                                            <field name="name">
+                                                <String>xep.failOnError</String>
+                                            </field>
+                                            <field name="description">
+                                                <null/>
+                                            </field>
+                                            <field name="value">
+                                                <String>true</String>
+                                            </field>
+                                            <field name="defaultValue">
+                                                <null/>
+                                            </field>
+                                            <field name="type">
+                                                <Integer>4</Integer>
+                                            </field>
+                                            <field name="possibleValues">
+                                                <String-array>
+                                                    <null/>
+                                                    <String>true</String>
+                                                </String-array>
+                                            </field>
+                                            <field name="possibleValuesDescriptions">
+                                                <null/>
+                                            </field>
+                                        </ditaParameter>
+                                    </list>
+                                </field>
+                                <field name="jvmArgs">
+                                    <String>-Xmx1384m</String>
+                                </field>
+                                <field name="useCustomJavaHome">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="customJavaHomeDir">
+                                    <String></String>
+                                </field>
+                                <field name="useCustomANTHome">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="customANTHomeDir">
+                                    <String></String>
+                                </field>
+                                <field name="workingDir">
+                                    <null/>
+                                </field>
+                                <field name="showConsoleAlways">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="advancedOptionsMap">
+                                    <null/>
+                                </field>
+                                <field name="name">
+                                    <String>DITA Map PDF - based on XSL-FO - Copy</String>
+                                </field>
+                                <field name="baseURL">
+                                    <null/>
+                                </field>
+                                <field name="footerURL">
+                                    <null/>
+                                </field>
+                                <field name="fOPMethod">
+                                    <null/>
+                                </field>
+                                <field name="fOProcessorName">
+                                    <null/>
+                                </field>
+                                <field name="headerURL">
+                                    <null/>
+                                </field>
+                                <field name="inputXSLURL">
+                                    <null/>
+                                </field>
+                                <field name="inputXMLURL">
+                                    <null/>
+                                </field>
+                                <field name="defaultScenario">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="isFOPPerforming">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="type">
+                                    <String>DITAMAP</String>
+                                </field>
+                                <field name="saveAs">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="openInBrowser">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="outputFile">
+                                    <null/>
+                                </field>
+                                <field name="outputResource">
+                                    <null/>
+                                </field>
+                                <field name="openOtherLocationInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="locationToOpenInBrowserURL">
+                                    <String></String>
+                                </field>
+                                <field name="openInEditor">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInHTMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInXMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInSVGPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInResultSetPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="useXSLTInput">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="xsltParams">
+                                    <list/>
+                                </field>
+                                <field name="cascadingStylesheets">
+                                    <String-array/>
+                                </field>
+                                <field name="xslTransformer">
+                                    <String>DITA-OT</String>
+                                </field>
+                                <field name="extensionURLs">
+                                    <String-array/>
+                                </field>
+                            </ditaScenario>
                             <scenario>
                                 <field name="advancedOptionsMap">
                                     <serializableOrderedMap>
@@ -181,6 +424,67 @@
                             </scenario>
                         </scenario-array>
                     </entry>
+                    <entry>
+                        <String>validation.scenarios</String>
+                        <validationScenario-array>
+                            <validationScenario>
+                                <field name="pairs">
+                                    <list>
+                                        <validationUnit>
+                                            <field name="validationType">
+                                                <validationUnitType>
+                                                    <field name="validationInputType">
+                                                        <String>text/xml</String>
+                                                    </field>
+                                                </validationUnitType>
+                                            </field>
+                                            <field name="url">
+                                                <String>${currentFileURL}</String>
+                                            </field>
+                                            <field name="validationEngine">
+                                                <validationEngine>
+                                                    <field name="engineType">
+                                                        <String>&lt;Default engine></String>
+                                                    </field>
+                                                    <field name="allowsAutomaticValidation">
+                                                        <Boolean>true</Boolean>
+                                                    </field>
+                                                </validationEngine>
+                                            </field>
+                                            <field name="allowAutomaticValidation">
+                                                <Boolean>true</Boolean>
+                                            </field>
+                                            <field name="extensions">
+                                                <null/>
+                                            </field>
+                                            <field name="validationSchema">
+                                                <validationUnitSchema>
+                                                    <field name="dtdSchemaPublicID">
+                                                        <null/>
+                                                    </field>
+                                                    <field name="schematronPhase">
+                                                        <null/>
+                                                    </field>
+                                                    <field name="type">
+                                                        <Integer>2</Integer>
+                                                    </field>
+                                                    <field name="uri">
+                                                        <String>file:/Users/a.binder/Documents/se/SE/schema/WPS_Functions/graph_gnuplot/p5gnuplot.xsd</String>
+                                                    </field>
+                                                </validationUnitSchema>
+                                            </field>
+                                        </validationUnit>
+                                    </list>
+                                </field>
+                                <field name="type">
+                                    <String>Validation_scenario</String>
+                                </field>
+                                <field name="name">
+                                    <String>BI_audit_BENFORD_24BI_audit_BENFORD debug table</String>
+                                </field>
+                            </validationScenario>
+                        </validationScenario-array>
+                    </entry>
                 </serializableOrderedMap>
             </serialized>
         </options>