arkadiusz binder 7 лет назад
Родитель
Сommit
ba075841f5

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

@@ -62,7 +62,7 @@
             
             <xsl:when test="local-name()='valueField'">
                 <xsl:element name="{$system_cache__dita:element.next}">
-                    Wartość brana z pola <xsl:value-of select="text()"/> oraz analizowane po polu  <xsl:value-of select="parent::*/default_db__x3A__BI_audit_BENFORD:groupField"/>
+                    Wartość brana z pola <xsl:value-of select="text()"/> oraz analizowane po polu  <xsl:value-of select="replace(parent::*/default_db__x3A__BI_audit_BENFORD:groupField,',',', ')"/>
                 </xsl:element>
             </xsl:when>
             

+ 313 - 96
SE/schema/default_db_xml_cache.public/default_db/BI_audit_BENFORD/default_db__x3A__BI_audit_BENFORD.BI_audit_BENFORD.deal_analys.xsl

@@ -17,13 +17,17 @@
     <xsl:output indent="yes"/>
     <xsl:strip-space elements="*"/>
     
+    <xsl:param name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.table.width.param"  select="8"/>
     
     
-    <xsl:param name="default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY__x3A__benford__copares">Data_utworzenia_sprawy,Wprowadzajacy_wniosek___nazwisko_i_imie,Data_zawarcia,Wartosc_kosztowa_przedmiotu_umowy_netto_w_walucie__aktualna_</xsl:param>
+    <!--<xsl:param name="default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY__x3A__benford__copares">Data_utworzenia_sprawy,Wprowadzajacy_wniosek___nazwisko_i_imie,Data_zawarcia,Wartosc_kosztowa_przedmiotu_umowy_netto_w_walucie__aktualna_</xsl:param>-->
     <xsl:param name="default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY__x3A__benford__describe">Tytul_dokumentu,Strony_umowy,Data_zawarcia</xsl:param><!-- ,Osoba_merytoryczna___nazwisko_i_imie,Koordynator_segmentu_spolki_glownej___login,Koordynator_spolki_glownej___login,Strony_umowy, -->
    
     <xsl:template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys">
         <xsl:param name="title" select="'BI_audit_BENFORD.deal_analys'"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:valueField" required="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField" required="yes"/>
+        <xsl:message>#29 RUN default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys - should be once</xsl:message>
         <xsl:copy-of select="system_cache__dita:files.context.title.keydef(.,'map',$title)" copy-namespaces="no"/>
         <topicref props="BI_audit_BENFORD.deal_analys">
             <xsl:copy-of select="system_cache__dita:files.key.title.context.href(current(),'map',$title)" copy-namespaces="no"/>
@@ -40,7 +44,11 @@
                     <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.overwiev_table_1.graph"/>-->
                         
                      
-                        <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast"/>
+                        <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast">
+                            <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="debug" select="'#49 std call analys'"/>
+                        </xsl:call-template>
                         
                     </body>
                     <!--<xsl:variable name="BI_audit_ENERGA_RUM_KONTRAHENCI.BI_audit_ENERGA_FAKTURY_vs_BI_audit_ENERGA_RUM_UMOWY">
@@ -66,28 +74,49 @@
     
     
     <xsl:template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast">
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField" required="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:valueField" required="yes"/>
+        <xsl:param name="debug"/>
         <xsl:variable name="context" select="."/>
-        <xsl:for-each select="tokenize($default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY__x3A__benford__copares,',')">
-            <xsl:variable name="context.source" select="."/>
-            <xsl:variable name="context.source.pos" select="position()"/>
-            <xsl:for-each select="tokenize($default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY__x3A__benford__copares,',')">
-                <xsl:choose>
-                    <xsl:when test="$context.source = ."/>
-                    <xsl:when test="$context.source.pos &gt; position()"/>
-                    <xsl:otherwise>
-                        <xsl:variable name="context.dest" select="."/>
-                        <xsl:message>#76 will contrast $context.source=<xsl:value-of select="$context.source"/> to <xsl:value-of select="$context.dest"/></xsl:message>
-                        <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques">
-                            <xsl:with-param name="context.source" select="$context.source"/>
-                            <xsl:with-param name="context.dest" select="$context.dest"/>
-                            <xsl:with-param name="context" select="$context"/>
-                            
-                        </xsl:call-template>
-                    </xsl:otherwise>
-                </xsl:choose>
-            </xsl:for-each>
+        <xsl:message>#77 context is name =<xsl:value-of select="$context/name()"/>; $debug=<xsl:value-of select="$debug"/>;</xsl:message>
+        <xsl:for-each select="tokenize($default_db__x3A__BI_audit_BENFORD:valueField,',')">
+            <xsl:choose>
+                <xsl:when test="string-length(.)=0"><xsl:message>#83 was erroer strl=0</xsl:message></xsl:when>
+                <xsl:otherwise>
+                    <xsl:variable name="context.source" select="."/>
+                    <xsl:variable name="context.source.pos" select="position()"/>
+                    <xsl:for-each select="tokenize($default_db__x3A__BI_audit_BENFORD:groupField,',')">
+                        <xsl:choose>
+                            <!--<xsl:when test="$context.source = ."><xsl:message>#83 ignore pos<xsl:value-of select="position()"/>; for V="<xsl:value-of select="."/>";</xsl:message></xsl:when>-->
+                            <!--<xsl:when test="$context.source.pos &gt; position()"/>-->
+                            <xsl:when test="1=2"/>
+                            <xsl:when test="string-length(.) = 0"><xsl:message>#86BYPASS string0</xsl:message></xsl:when>
+                            <xsl:otherwise>
+                                <xsl:variable name="context.dest" select="."/>
+                                <xsl:message>#76 will contrast $context.source=<xsl:value-of select="$context.source"/> to <xsl:value-of select="$context.dest"/></xsl:message>
+                                <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques">
+                                    <xsl:with-param name="context.source" select="$context.source"/>
+                                    <xsl:with-param name="context.dest" select="$context.dest"/>
+                                    <xsl:with-param name="context" select="$context"/>
+                                    <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:call-template>
+                                <!--<xsl:result-document href="/tmp/testout">
+                                    <DEBUG_COPY>
+                                        <xsl:copy-of select="$context"/>
+                                    </DEBUG_COPY>  
+                                </xsl:result-document>-->
+                                <!--<xsl:message terminate="yes"></xsl:message>-->
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:for-each>
+                </xsl:otherwise>
+            </xsl:choose>
+            
+            
+            
         </xsl:for-each>
-        
+        <xsl:message>#121 CONTRAST EOF for now</xsl:message>
     </xsl:template>
     
     
@@ -95,78 +124,107 @@
         <xsl:param name="context.source" required="yes"/>
         <xsl:param name="context.dest" required="yes"/>
         <xsl:param name="context" required="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:valueField" required="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField" required="yes"/>
         <xsl:message>#96 default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques - $context.source=<xsl:value-of select="$context.source"/> to $context.dest =<xsl:value-of select="$context.dest"/>; </xsl:message>
-        <xsl:for-each-group select="$context/descendant-or-self::default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY" group-by="*[local-name()=$context.source]/text()">
-            <xsl:message>#98 cnt = <xsl:value-of select="count(current-group())"/>/<xsl:value-of select="last()"/></xsl:message>
-            <xsl:apply-templates mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques" select=".">
-                <xsl:with-param name="context.source" select="$context.source"/>
-                <xsl:with-param name="context.source.val" select="current-grouping-key()"/>
-                <xsl:with-param name="context.dest" select="$context.dest"/>
-                <xsl:with-param name="context" select="$context"/>
-            </xsl:apply-templates>
+        <xsl:for-each-group select="$context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY" group-by="*[local-name()=$context.source]/text()">
+            <xsl:variable name="context.source.group" select="current-group()"/>
+            <xsl:variable name="source.remote.join.val" select="*[local-name()=$context.dest]"/>
+            <xsl:variable name="src.position" select="position()"/>
+            <xsl:message>#98 $source.remote.join.val=<xsl:value-of select="$source.remote.join.val"/>; cnt = <xsl:value-of select="count(current-group())"/>/<xsl:value-of select="last()"/>; *join=<xsl:value-of select="*[local-name()=$context.dest]/text()"/>; *join=<xsl:value-of select="*[local-name()=$context.source]/text()"/> for current-grouping-key = <xsl:value-of select="current-grouping-key()"/>; name=<xsl:value-of select="name()"/>; $context.source=<xsl:value-of select="$context.source"/> to $context.dest =<xsl:value-of select="$context.dest"/>;</xsl:message>
+            
+            <xsl:for-each-group select="$context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $context.dest and  text()=$source.remote.join.val ]  ]" group-by="concat($source.remote.join.val,*[local-name()=$context.dest]/text())">
+                <xsl:message>#129 current <xsl:value-of select="name()"/>; count=<xsl:value-of select="count(current-group())"/>; *join=<xsl:value-of select="*[local-name()=$context.dest]/text()"/>; *join=<xsl:value-of select="*[local-name()=$context.source]/text()"/></xsl:message>
+                <xsl:apply-templates mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques" select=".">
+                    <xsl:with-param name="context.source" select="$context.source"/>
+                    <xsl:with-param name="context.source.val" select="current-grouping-key()"/>
+                    <xsl:with-param name="context.dest" select="$context.dest"/>
+                    <xsl:with-param name="context" select="$context"/>
+                    <xsl:with-param name="current" select="."/>
+                    <xsl:with-param name="position" select="position()"/>
+                    <xsl:with-param name="context.source.group" select="$context.source.group"/>
+                    <xsl:with-param name="src.position" select="$src.position"/>
+                    <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:apply-templates>
+            </xsl:for-each-group>
+            
         </xsl:for-each-group>
+        
     </xsl:template>
     
     
     <xsl:template mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques" match="text()|comment()"/>
     
-    <xsl:template mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques" match="default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY">
+    <!--<xsl:template mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques" match="default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY">
         <xsl:param name="context.source" required="yes"/>
         <xsl:param name="context.source.val" required="yes"/>
         <xsl:param name="context.dest" required="yes"/>
         <xsl:param name="context" required="yes"/>
         <xsl:variable name="current"  select="."/>
-        <xsl:variable name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber">
+        <!-\-<xsl:variable name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber">
             <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber">
                 <xsl:with-param name="context" select="."/>
             </xsl:call-template>
-        </xsl:variable>
-        <xsl:message>#109X match <xsl:value-of select="local-name()"/> for S: <xsl:value-of select="$context.source"/> D: <xsl:value-of select="$context.dest"/>; associated @LD=<xsl:value-of select="$default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber"/> </xsl:message>
-        <xsl:for-each select="current-group()" ><!-- group-by="*[local-name()=$context.dest]/text()" -->
-            <xsl:message>#109XY match  dest count = /<xsl:value-of select="last()"/>; S=<xsl:value-of select="$context.source"/>; D=<xsl:value-of select="$context.dest"/> @LCcount="<xsl:value-of select="count($default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber)"/>"</xsl:message>
+        </xsl:variable>-\->
+        <xsl:message>#109X match <xsl:value-of select="local-name()"/> for S: <xsl:value-of select="$context.source"/> D: <xsl:value-of select="$context.dest"/>; associated @LD=<!-\-<xsl:value-of select="$default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber"/>-\-> </xsl:message>
+        <xsl:for-each select="." ><!-\- group-by="*[local-name()=$context.dest]/text()" -\->
+            <xsl:message>#109XY match  dest count = /<xsl:value-of select="last()"/>; S=<xsl:value-of select="$context.source"/>; D=<xsl:value-of select="$context.dest"/> @LCcount="<!-\-<xsl:value-of select="count($default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber)"/>-\->"</xsl:message>
             <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.topic" >
                 <xsl:with-param name="context.source" select="$context.source"/>
                 <xsl:with-param name="context.source.val" select="$context.source.val"/>
                 <xsl:with-param name="context.dest" select="$context.dest"/>
-                <!--<xsl:with-param name="context.dest.val" select="current-group()[*[local-name()=$context.dest]]"/>-->
+                <!-\-<xsl:with-param name="context.dest.val" select="current-group()[*[local-name()=$context.dest]]"/>-\->
                 <xsl:with-param name="context" select="$context"/>
                 <xsl:with-param name="current" select="$current"/>
-                <xsl:with-param name="context.dest.val.group" select="current-group()"/>
-                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber" select="$default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber"/>
+                <xsl:with-param name="context.dest.val.group" select="."/>
+                <!-\-<xsl:with-param name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber" select="$default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber"/>-\->
             </xsl:call-template>
         </xsl:for-each>
-    </xsl:template>
+    </xsl:template>-->
     
     
     
-    <xsl:template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.topic">
+    <xsl:template mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques" match="default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY">
         <xsl:param name="context.source" required="yes"/>
         <xsl:param name="context.source.val" required="yes"/>
         <xsl:param name="context.dest" required="yes"/>
         <!--<xsl:param name="context.dest.val" required="yes"/>-->
-        <xsl:param name="context.dest.val.group" required="yes"/>
+        <!--<xsl:param name="context.dest.val.group" required="yes"/>-->
         <xsl:param name="context" required="yes"/>
         <xsl:param name="current" required="yes"/>
-        <xsl:param name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber" required="yes"/>
+        <xsl:param name="context.source.group" required="yes"/>
+        <xsl:param name="position" required="yes"/>
+        <xsl:param name="src.position" required="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:valueField" required="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField" required="yes"/>
+        <!--<xsl:param name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber" required="yes"/>-->
         
         
         <p>
             <menucascade>
-                <uicontrol>from</uicontrol>
-                <uicontrol><varname><xsl:value-of select="$context.source"/></varname></uicontrol>
+                <uicontrol>od</uicontrol>
+                <uicontrol><varname><xsl:value-of select="system_cache__dita:localname.translate($context.source)"/></varname></uicontrol>
+                <uicontrol>wart.</uicontrol>
+                <uicontrol><varname><xsl:value-of select="$context.source.group[1]/*[local-name()=$context.source][1]/text()"/></varname></uicontrol>
                 <uicontrol>ilość</uicontrol>
-                <uicontrol><varname><xsl:value-of select="$current/count(current-group())"/></varname></uicontrol>
+                <uicontrol><varname><xsl:value-of select="count($context.source.group/current-group())"/></varname></uicontrol>
             </menucascade>
             
             <menucascade>
-                <uicontrol>to</uicontrol>
-                <uicontrol><varname><xsl:value-of select="$context.dest"/></varname></uicontrol>
+                <uicontrol>do</uicontrol>
+                <uicontrol><varname><xsl:value-of select="system_cache__dita:localname.translate($context.dest)"/></varname></uicontrol>
+                <uicontrol>wart.</uicontrol>
+                <uicontrol><varname><xsl:value-of select="$current[1]/*[local-name()=$context.dest]/text()"/></varname></uicontrol>
                 <uicontrol>ilość</uicontrol>
-                <uicontrol><varname><xsl:value-of select="$current/count(current-group())"/></varname></uicontrol>
+                <uicontrol><varname><xsl:value-of select="count($current)"/></varname></uicontrol>
             </menucascade>
 
         </p>
-        <simpletable frame="all"  id="BI_audit_BENFORD.deal_analys.contrast.uniques.topic_{generate-id()}" ><!-- system_cache__dita:width_cols="auto"  system_cache__dita:bypass_rows_with_zero="true" system_cache__dita:bypass_rows_empty="true" --> <!-- system_cache__dita:width_cols="10" system_cache__dita:bypass_rows_with_zero="true" system_cache__dita:bypass_rows_empty="true" -->
+        <!--<DEBUG>
+            <xsl:copy-of select="$default_db__x3A__BI_audit_BENFORD:valueField"/>
+        </DEBUG>-->
+        <simpletable frame="all"  id="BI_audit_BENFORD.deal_analys.contrast.uniques.topic_{$context.dest}{generate-id()}" props="nograph" ><!-- system_cache__dita:width_cols="auto"  system_cache__dita:bypass_rows_with_zero="true" system_cache__dita:bypass_rows_empty="true" --> <!-- system_cache__dita:width_cols="10" system_cache__dita:bypass_rows_with_zero="true" system_cache__dita:bypass_rows_empty="true" -->
             
             <!--<sthead>
                 <!-\-<stentry>
@@ -177,59 +235,215 @@
                 </xsl:for-each>-\->  
                 <stentry><xsl:value-of select="$context.source.val"/></stentry>
             </sthead>-->
-            <sthead props="dst_val">
-                <!--<stentry>
-                    cel
-                </stentry>-->
-                
-                <xsl:choose>
-                    <xsl:when test="$context.dest.val.group/current-group()/*[local-name()=$context.dest]">
-                        <xsl:for-each-group select="$context.dest.val.group/current-group()/*[local-name()=$context.dest]" group-by="text()">
-                            <xsl:sort select="text()"  order="ascending" data-type="number"/>
-                            <stentry> <xsl:value-of select="text()"/></stentry>
-                        </xsl:for-each-group>
-                    </xsl:when>
-                    <xsl:otherwise><strow/></xsl:otherwise>
-                </xsl:choose>
-                <!--<stentry><xsl:value-of select="$context.dest"/></stentry>-->
-                <!--<stentry><xsl:value-of select="$context.dest.val"/></stentry>-->
+            <sthead props="dst_cnt">
+                <stentry><xsl:value-of select="system_cache__dita:localname.translate($default_db__x3A__BI_audit_BENFORD:valueField)"/></stentry>
+                <xsl:for-each select="tokenize($default_db__x3A__BI_audit_BENFORD:groupField,',')">
+                    <xsl:variable name="groupField" select="."/>
+                    <stentry><xsl:value-of select="system_cache__dita:localname.translate($groupField)"/></stentry>
+                </xsl:for-each>
             </sthead>
-            <strow props="dst_cnt">
-                <xsl:for-each-group select="$context.dest.val.group/current-group()/*[local-name()=$context.dest]" group-by="text()">
-                    <xsl:sort select="text()"  order="ascending" data-type="number"/>
-                    <stentry> <xsl:value-of select="count(current-group())"/></stentry>
-                </xsl:for-each-group>
+            
+            <strow props="dst_val1">
+                <stentry><xsl:value-of select="system_cache__dita:localname.translate($default_db__x3A__BI_audit_BENFORD:valueField)"/></stentry>
+                <xsl:for-each select="tokenize($default_db__x3A__BI_audit_BENFORD:groupField,',')">
+                    <xsl:variable name="groupField" select="."/>
+                    <!--<xsl:for-each select="$context//default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD[*[local-name() = $groupField] [ text()=$current/*[ local-name()=$groupField]/text() ]]" >-->
+                       <!-- <xsl:choose>
+                            <xsl:when test="position() &gt; number($default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.table.width.param)"/>
+                            <xsl:otherwise>-->
+                    <stentry> <xsl:value-of select="$current/*[local-name()=$groupField]/text()"/></stentry>
+                            <!--</xsl:otherwise>
+                        </xsl:choose>-->
+                    <!--</xsl:for-each>-->
+                </xsl:for-each>
             </strow>
-            <strow props="leading_src">
-                <stentry>
-                <xsl:for-each select="$default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber//*[@leadingNumber]">
-                     <!--<xsl:value-of select="@leadingNumber"/>--><xsl:text> </xsl:text>
-                    <xsl:apply-templates mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber"/>
+            <xsl:variable name="generate-id" select="concat($uuid,'BI_audit_BENFORD.deal_analys.contrast.uniques.topic_4_',$src.position,'_',$position,'_',position(),$context.dest,generate-id($current),'__',generate-id($context))"/>
+            <strow props="dst_val2">
+                <stentry><xsl:value-of select="system_cache__dita:localname.translate($default_db__x3A__BI_audit_BENFORD:valueField)"/></stentry>
+                <xsl:for-each select="tokenize($default_db__x3A__BI_audit_BENFORD:groupField,',')">
+                    <xsl:variable name="groupField" select="."/>
+                    <!--<stentry> <xsl:value-of select="count($context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  and text()=$current/*[ local-name()=$groupField]] ]/*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField])"/> ;  </stentry>-->
+                
+                    <stentry>
+                    <xsl:variable name="simpletable"> 
+                        <simpletable frame="all"  id="{$uuid}_ta2ble_int{position()}.{$generate-id}.{generate-id($context[1]//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  [.=$current/*[ local-name()=$groupField]] ]][1])}">
+                            <strow>
+                                <stentry>
+                                    0
+                                </stentry>
+                                <xsl:for-each-group select="$context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  and text()=$current/*[ local-name()=$groupField]] ]" group-by="*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField]">
+                                    <xsl:sort select="current-grouping-key()" order="ascending" data-type="number"/>
+                                    <stentry>
+                                        <xsl:value-of select="current-grouping-key()"/> il.il.<xsl:value-of select="count(*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField])"/>
+                                    </stentry>
+                                </xsl:for-each-group>
+                            </strow>
+                            <strow>
+                                <stentry>
+                                    0
+                                </stentry>
+                                <xsl:for-each-group select="$context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  and text()=$current/*[ local-name()=$groupField]] ]" group-by="*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField]">
+                                    <xsl:sort select="@leadingNumber" order="ascending" data-type="number"/>
+                                    <stentry>
+                                        <xsl:value-of select="sum(number(*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField]))"/>
+                                    </stentry>
+                                </xsl:for-each-group>
+                            </strow>
+                        </simpletable>   
+                    </xsl:variable>
+                        <xsl:choose>
+                            <xsl:when test="$simpletable//stentry ">
+                                <foreign props="exclude">
+                                    <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
+                                </foreign>
+                                <xsl:apply-templates mode="system_cache__dita:graph__read" select="$simpletable">
+                                    <xsl:with-param name="fileindex" select="$simpletable/simpletable/@id"/>
+                                    <xsl:with-param name="width" select="100"/>
+                                    <xsl:with-param name="path.prefix">../</xsl:with-param>
+                                </xsl:apply-templates>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:message>#319 problem with internakl table </xsl:message>
+                            </xsl:otherwise>
+                        </xsl:choose>   
+                    </stentry>
+                
+                
                 </xsl:for-each>
-                </stentry>
+                <!--  -->
+                
+                <!--  -->
+                
+                
                 
             </strow>
-            <!-- ben dst -->
-            <xsl:variable name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber.dst">
-                <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber">
-                    <xsl:with-param name="context" select="$context.dest.val.group/current-group()"/>
-                </xsl:call-template>
-            </xsl:variable>
-            <strow props="leading_dst">
-                <stentry>
-                    <xsl:for-each select="$default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber.dst//*[@leadingNumber]">
-                        <!--<xsl:value-of select="@leadingNumber"/><xsl:text> </xsl:text>-->
-                        <xsl:apply-templates mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber"/>
-                    </xsl:for-each>
-                </stentry>
+            <xsl:variable name="generate-id" select="concat($uuid,'BI_audit_BENFORD.deal_analys.contrast.uniques.topic_3_',$src.position,'_',$position,'_',position(),$context.dest,generate-id($current),'__',generate-id($context))"/>
+            <strow props="dst_val3">
                 
+                <stentry><xsl:value-of select="system_cache__dita:localname.translate($default_db__x3A__BI_audit_BENFORD:valueField)"/></stentry>
+                <xsl:for-each select="tokenize($default_db__x3A__BI_audit_BENFORD:groupField,',')">
+                    <xsl:variable name="groupField" select="."/>
+                    
+                    <stentry>
+                        <xsl:variable name="simpletable"> 
+                        <simpletable frame="all"  id="{$uuid}_table_int{position()}.{$generate-id}.{generate-id($context[1]//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  [.=$current/*[ local-name()=$groupField]] ]][1])}">
+                            <strow>
+                                <xsl:for-each-group select="$context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  and text()=$current/*[ local-name()=$groupField]] ]" group-by="*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField]">
+                                    <xsl:sort select="ancestor-or-self::*[@leadingNumber][1]" order="ascending" data-type="number"/>
+                                    <stentry>$<xsl:value-of select="ancestor-or-self::*[@leadingNumber][1]/@leadingNumber"/></stentry>
+                                    <stentry>
+                                        <xsl:value-of select="current-grouping-key()"/>
+                                    </stentry>
+                                </xsl:for-each-group>
+                            </strow>
+                            <strow>
+                                <xsl:for-each-group select="$context//default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY[*[local-name() = $groupField  and text()=$current/*[ local-name()=$groupField]] ]" group-by="*[local-name()=$default_db__x3A__BI_audit_BENFORD:valueField]">
+                                    <xsl:sort select="ancestor-or-self::*[@leadingNumber][1]" order="ascending" data-type="number"/>
+                                    <stentry>
+                                        <xsl:value-of select="ancestor-or-self::*[@leadingNumber][1]/norm"/>
+                                    </stentry>
+                                    <stentry>
+                                        <xsl:value-of select="ancestor-or-self::*[@leadingNumber][1]/value"/>
+                                    </stentry>
+                                </xsl:for-each-group>
+                            </strow>
+                        </simpletable>   
+                        </xsl:variable>
+                        <xsl:choose>
+                            <xsl:when test="$simpletable//stentry ">
+                                <p>
+                                <foreign>
+                                    <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
+                                </foreign>
+                                </p>
+                                  <xsl:apply-templates mode="system_cache__dita:graph__read" select="$simpletable">
+                                    <xsl:with-param name="fileindex" select="$simpletable/simpletable/@id"/>
+                                    <xsl:with-param name="width" select="100"/>
+                                    <xsl:with-param name="path.prefix">../</xsl:with-param>
+                                </xsl:apply-templates>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:message>#319 problem with internakl table </xsl:message>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </stentry>
+                    
+                </xsl:for-each>
             </strow>
-            <!--<cnt abc="asd"><xsl:value-of select="$context.dest.val.group/current-group()/name()"/></cnt>-->
-            <!--<xsl:for-each-group select="current-group()/*[local-name()=$context.dest]" group-by="text()">
-                <xsl:sort select="text()"  order="ascending" data-type="number"/>
-                <stentry> <xsl:value-of select="count(current-group())"/></stentry>
-            </xsl:for-each-group>-->
         </simpletable>
+        
+        
+        
+        <!--  -->
+        <xsl:variable name="simpletable"> 
+            <simpletable frame="all" id="{$uuid}BI_audit_BENFORD.deal_analys.contrast.uniques.topic_2_{$src.position}_{$position}_{position()}{$context.dest}{generate-id($current)}__{generate-id($context)}" props="print__no">
+                <strow props="graph_fld">
+                    <xsl:for-each-group select="current-group()/*[local-name()=$context.dest]" group-by="text()"><!-- $context.dest.val.group/ -->
+                        <xsl:sort select="text()"  order="ascending" data-type="number"/>
+                        <stentry>$</stentry>
+                        <stentry>
+                            <xsl:variable name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber.dst">
+                                <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber">
+                                    <xsl:with-param name="context" select="."/>
+                                </xsl:call-template>
+                            </xsl:variable>
+                            <xsl:for-each select="$default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber.dst//firstStep[ @leadingNumber][1]">
+                                <xsl:value-of select="@leadingNumber"/>
+                                <!--<xsl:value-of select="@leadingNumber"/>--><!--<xsl:text> -\-\- </xsl:text>-->
+                                <!--<xsl:apply-templates mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber"/>-->
+                                <!--<xsl:apply-templates mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber" select="@*"/>-->
+                            </xsl:for-each>
+                        </stentry>
+                    </xsl:for-each-group>
+                </strow>
+                <strow props="graph_vals">
+                    
+                    
+                    <xsl:for-each-group select="current-group()/*[local-name()=$context.dest]" group-by="text()"><!-- $context.dest.val.group/ -->
+                        <xsl:sort select="text()"  order="ascending" data-type="number"/>
+                        <xsl:variable name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber.dst">
+                            <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber">
+                                <xsl:with-param name="context" select="."/>
+                            </xsl:call-template>
+                        </xsl:variable>
+                        <stentry>
+                            <xsl:for-each select="$default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber.dst//firstStep[ @leadingNumber][1]">
+                                <xsl:value-of select="norm"/>
+                            </xsl:for-each>
+                        </stentry>
+                        <stentry>
+                            <xsl:for-each select="$default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber.dst//firstStep[ @leadingNumber][1]">
+                                    <xsl:value-of select="value"/>
+                            </xsl:for-each>
+                        </stentry>
+                    </xsl:for-each-group>
+                </strow>
+            </simpletable>
+        </xsl:variable>
+        <xsl:choose>
+            <xsl:when test="$simpletable//stentry">
+                <xsl:message>#288-A OKno table  @id=<xsl:value-of select="@id"/>; @fid=<xsl:value-of select="@fid"/>;</xsl:message>
+                <!--<p> statystyka <sub>(prawidłowe wartości w połowie wysokości środku wykresu)</sub> </p>-->
+                <p>
+                <foreign props="exclude" >
+                    <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
+                </foreign>
+                </p>
+                <p> 
+                    <xsl:apply-templates mode="system_cache__dita:graph__read" select="$simpletable">
+                    <xsl:with-param name="fileindex" select="$simpletable/simpletable/@id"/>
+                    <xsl:with-param name="width" select="150"/>
+                    <xsl:with-param name="path.prefix">../</xsl:with-param>
+                    </xsl:apply-templates>
+                </p>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:message>#288-B no table error</xsl:message>
+                <p props="gr287">
+                    
+                </p>
+            </xsl:otherwise>
+        </xsl:choose>
         <!--<context><xsl:copy-of select="$context"></xsl:copy-of></context>-->
         <!--<current><xsl:copy-of select="$current"></xsl:copy-of></current>-->
     </xsl:template>
@@ -462,10 +676,13 @@
         </topic>
     </xsl:template>
     
+    <xsl:template mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber" match="@leadingNumber">
+        <sub><xsl:value-of select="."/></sub>
+    </xsl:template>
     <xsl:template mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber" match="text()|comment()"/>
     
     <xsl:template mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast.uniques.leadingNumber" match="firstStep|count|value|norm|deviation|correct">
-        <p><xsl:value-of select="system_cache__dita:localname.translate(local-name())"/> = <xsl:value-of select="system_cache__dita:localname.translate(local-name(),text())"/></p>
+        <p><xsl:value-of select="system_cache__dita:localname.translate(local-name())"/> = <xsl:value-of select="system_cache__dita:localname.translate(local-name(),.)"/></p>
     </xsl:template>
     
 </xsl:stylesheet>

+ 27 - 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

@@ -119,8 +119,22 @@
             <!--<xsl:apply-templates select="." mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_statystyka_pracownik.dita"/>-->
             <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.overwiev_table_1.graph"/>
             <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.overwiev_table_2.graph"/>
+            
+            <xsl:variable name="default_db__x3A__BI_audit_BENFORD:valueField">
+                <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:valueField"/>
+            </xsl:variable>
+            <xsl:variable name="default_db__x3A__BI_audit_BENFORD:groupField">
+                <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:groupField"/>
+            </xsl:variable>
+            <xsl:message>#129 will call parms=<xsl:value-of select="$default_db__x3A__BI_audit_BENFORD:valueField//text()"/> </xsl:message>
+            <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys.contrast">
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:valueField" select="$default_db__x3A__BI_audit_BENFORD:valueField//text()" />
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField//text()" />
+                <xsl:with-param name="debug" select="'#131 preprocess_root_BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA'"/>
+            </xsl:call-template>
+            
         </xsl:variable>
-        <xsl:for-each select="$dita//simpletable">
+        <xsl:for-each select="$dita//simpletable[not(@props='nograph')]">
             <xsl:apply-templates select="." mode="system_cache__dita:graph__write_dita_preprocess">
                 <xsl:with-param name="fileindex" select="@id"/>
             </xsl:apply-templates>
@@ -139,21 +153,23 @@
         <xsl:variable name="simpletable"> 
             <simpletable frame="all" id="{$uuid}BI_audit_BENFORD.overwiev_table_1" props="print__no">
                 <strow>
-                    <stentry><xsl:value-of select="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names('skala 0')"/></stentry>
+                    <!--<stentry><xsl:value-of select="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names('skala 0')"/></stentry>-->
                     <xsl:for-each select="1 to 10">
                         <xsl:choose>
                             <xsl:when test="$context/firstStep[@leadingNumber = string(current())]">
+                                <stentry>$</stentry>
                                 <stentry><xsl:value-of select="$context/firstStep[@leadingNumber = string(current())]/@leadingNumber"/></stentry>
                             </xsl:when>
                         </xsl:choose>
                     </xsl:for-each>
                 </strow>
                 <strow>
-                    <stentry>0</stentry>
+                    <!--<stentry>0</stentry>-->
                     <xsl:for-each select="1 to 10">
                         <xsl:choose>
                             <xsl:when test="$context/firstStep[@leadingNumber = string(current())]">
-                                <stentry><xsl:value-of select="$context/firstStep[@leadingNumber = string(current())]/default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.table__x3A__offset(value,norm)"/></stentry>
+                                <stentry><xsl:value-of select="$context/firstStep[@leadingNumber = string(current())]/norm"/></stentry>
+                                <stentry><xsl:value-of select="$context/firstStep[@leadingNumber = string(current())]/value"/></stentry>
                             </xsl:when>
                         </xsl:choose>
                     </xsl:for-each>
@@ -163,7 +179,7 @@
         
         <xsl:choose>
             <xsl:when test="$simpletable//stentry">
-                <p> statystyka </p>
+                <p> statystyka <sub>(prawidłowe wartości w nieparzyste słupki)</sub> </p>
                 <foreign>
                     <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
                 </foreign>
@@ -188,21 +204,23 @@
         <xsl:variable name="simpletable"> 
             <simpletable frame="all" id="{$uuid}BI_audit_BENFORD.overwiev_table_2" props="print__no">
                 <strow>
-                    <stentry><xsl:value-of select="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names('skala 0')"/></stentry>
+                    <!--<stentry><xsl:value-of select="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names('skala 0')"/></stentry>-->
                     <xsl:for-each select="11 to 99">
                         <xsl:choose>
                             <xsl:when test="$context//secondStep[@leadingNumber = string(current())]">
+                                <stentry>$</stentry>
                                 <stentry><xsl:value-of select="$context//secondStep[@leadingNumber = string(current())]/@leadingNumber"/></stentry>
                             </xsl:when>
                         </xsl:choose>
                     </xsl:for-each>
                 </strow>
                 <strow>
-                    <stentry>0</stentry>
+                    <!--<stentry>0</stentry>-->
                     <xsl:for-each select="11 to 99">
                         <xsl:choose>
                             <xsl:when test="$context//secondStep[@leadingNumber = string(current())]">
-                                <stentry><xsl:value-of select="$context//secondStep[@leadingNumber = string(current())]/default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.table__x3A__offset(value,norm)"/></stentry>
+                                <stentry><xsl:value-of select="$context//secondStep[@leadingNumber = string(current())]/norm"/></stentry>
+                                <stentry><xsl:value-of select="$context//secondStep[@leadingNumber = string(current())]/value"/></stentry>
                             </xsl:when>
                         </xsl:choose>
                     </xsl:for-each>
@@ -212,7 +230,7 @@
         
         <xsl:choose>
             <xsl:when test="$simpletable//stentry">
-                <p> statystyka </p>
+                <p> statystyka <sub>(prawidłowe wartości w nieparzyste słupki)</sub></p>
                 <foreign>
                     <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
                 </foreign>

+ 2 - 6
SE/schema/default_db_xml_cache.public/default_db/BI_audit_BENFORD/default_db__x3A__BI_audit_BENFORD.BI_audit_BENFORD.podglad_analizy_liczb.xsl

@@ -16,7 +16,7 @@
    
     <xsl:template mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.podglad_analizy_liczb" match="firstStep|secondStep">
             
-            <topicref>
+            <topicref props="podglad_analizy_liczb_19" print="no">
                 <xsl:copy-of select="system_cache__dita:files.key.href.map.title.context(.,'podglad_analizy_liczb')"/>
                 <xsl:result-document href="{system_cache__dita:files.key.href.write.topic.title.context(.,'podglad_analizy_liczb')}">
                     <topic>
@@ -79,11 +79,7 @@
                 <xsl:apply-templates mode="#current"/>
             </topicref>
         
-            
-        
-            
-            
-        
+          
                         
         </xsl:template>
     

+ 42 - 5
SE/schema/default_db_xml_cache.public/default_db/BI_audit_BENFORD/default_db__x3A__BI_audit_BENFORD.BI_audit_BENFORD.xsl

@@ -31,7 +31,6 @@
             xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:map.xsd">
             
             <xsl:call-template name="system_cache__dita:map.title"/>
-            
             <!--<title>raport BI_audit_BENFORD-->
             <!--<xsl:choose>
                 <xsl:when test="L_APPOITMENT_INFO"><xsl:value-of select="L_APPOITMENT_INFO/text()"/></xsl:when>
@@ -54,13 +53,40 @@
     
     
     
+    <xsl:template name="default_db__x3A__BI_audit_BENFORD:valueField" >
+        <default_db__x3A__BI_audit_BENFORD:valueField>
+            <xsl:choose>
+                <xsl:when test="default_db__x3A__BI_audit_BENFORD:valueField"><xsl:value-of select="default_db__x3A__BI_audit_BENFORD:valueField"/>
+                    <xsl:message>%57 input param default_db__x3A__BI_audit_BENFORD:groupField = <xsl:value-of select="default_db__x3A__BI_audit_BENFORD:valueField"/></xsl:message></xsl:when>
+                <xsl:otherwise>Data_utworzenia_sprawy,Wprowadzajacy_wniosek___nazwisko_i_imie,Data_zawarcia,Wartosc_kosztowa_przedmiotu_umowy_netto_w_walucie__aktualna_</xsl:otherwise>
+            </xsl:choose>
+        </default_db__x3A__BI_audit_BENFORD:valueField>
+    </xsl:template>
+    
+    
+    
+    
+    <xsl:template name="default_db__x3A__BI_audit_BENFORD:groupField" >
+        <default_db__x3A__BI_audit_BENFORD:groupField>
+            <xsl:choose>
+                <xsl:when test="default_db__x3A__BI_audit_BENFORD:groupField"><xsl:value-of select="default_db__x3A__BI_audit_BENFORD:groupField"/>
+                    <xsl:message>%57 input param default_db__x3A__BI_audit_BENFORD:groupField = <xsl:value-of select="default_db__x3A__BI_audit_BENFORD:groupField"/></xsl:message></xsl:when>
+                <xsl:otherwise>Data_utworzenia_sprawy,Wprowadzajacy_wniosek___nazwisko_i_imie,Data_zawarcia,Wartosc_kosztowa_przedmiotu_umowy_netto_w_walucie__aktualna_</xsl:otherwise>
+            </xsl:choose>
+        </default_db__x3A__BI_audit_BENFORD:groupField>
+    </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'"/>
             <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.navtitle.attr"/>
-            <topicref props="BI_audit_BENFORD__53 mode__x3A__will__default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.info">
-                <xsl:copy-of select="system_cache__dita:files.key.href.map.context(.)"/>
+            <topicref props="BI_audit_BENFORD__53 mode__x3A__will__default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.info" >
+                <xsl:copy-of select="system_cache__dita:files.key.href.map.context(.)" />
                 <xsl:copy-of select="system_cache__dita:files.context.title.keys(.,$title)" copy-namespaces="no"/>
                 <!--<xsl:copy-of select="system_cache__dita:files.context.title.keydef(.,'map',$title)" copy-namespaces="no"/>-->
                 <xsl:result-document href="{system_cache__dita:files.key.href.write.topic.context(.)}"> 
@@ -85,12 +111,23 @@
                 <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.overwiev_table"/>
                 <xsl:apply-templates mode="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.podglad_analizy_liczb" />
             </topicref>
-            <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys"/>
+            
+            <xsl:variable name="default_db__x3A__BI_audit_BENFORD:valueField">
+                <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:valueField"/>
+            </xsl:variable>
+            <xsl:variable name="default_db__x3A__BI_audit_BENFORD:groupField">
+                <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:groupField"/>
+            </xsl:variable>
+            
+            <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.deal_analys">
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:valueField" select="$default_db__x3A__BI_audit_BENFORD:valueField//text()" />
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField//text()" />
+            </xsl:call-template>
         <xsl:choose>
             <xsl:when test=".//*[@fid]">
                 <xsl:variable name="system_cache__dita:files.key.title.context.href.all_table" select="system_cache__dita:files.key.title.context.href(.,'topic','podglad_analizy_liczb__records__all_table')"/>
                 
-                <topicref props="BI_audit_BENFORD__82 mode__x3A__will__default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.podglad_analizy_liczb.records.all">
+                <topicref props="BI_audit_BENFORD__82 mode__x3A__will__default_db__x3A__BI_audit_BENFORD:BI_audit_BENFORD.podglad_analizy_liczb.records.all" print="no">
                     <xsl:variable name="system_cache__dita:topic_name" select="'podglad_analizy_liczb__records__all'"/>
                     <xsl:copy-of select="system_cache__dita:files.key.href.map.title.context(.,$system_cache__dita:topic_name)"/>
                     <xsl:copy-of select="system_cache__dita:files.context.title.keys(.,$system_cache__dita:topic_name)" copy-namespaces="no"/>

+ 9 - 0
SE/schema/default_db_xml_cache.public/default_db/tree_to_dita.localname.translate.xsl

@@ -4,6 +4,7 @@
     exclude-result-prefixes="xs"
     xmlns:get_wfs="http://biuro.biall-net.pl/WPS_Functions/get_wfs/get_wfs.xsd"
     xmlns:system_cache__dita="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/dita.xsd"
+    xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     version="2.0">
     
@@ -72,15 +73,23 @@
             
             
             <xsl:when test="$localname='PERNR'"> PERNR <!--<xsl:comment>DEBUG</xsl:comment>--> </xsl:when>
+            <xsl:when test="$localname='deviation' and $text"> odchylenie <xsl:value-of select="$text"/> <!--<xsl:comment>DEBUG</xsl:comment>--> </xsl:when>
             <xsl:when test="$localname='deviation'"> odchylenie <!--<xsl:comment>DEBUG</xsl:comment>--> </xsl:when>
+            <xsl:when test="$localname='count' and $text"> ilość <xsl:value-of select="$text"/> <!--<xsl:comment>DEBUG</xsl:comment>--> </xsl:when>
             <xsl:when test="$localname='count'"> ilość <!--<xsl:comment>DEBUG</xsl:comment>--> </xsl:when>
+            <xsl:when test="$localname='value' and $text"> wartość <xsl:value-of select="$text"/> <!--<xsl:comment>DEBUG</xsl:comment>--> </xsl:when>
             <xsl:when test="$localname='value'"> wartość <!--<xsl:comment>DEBUG</xsl:comment>--> </xsl:when>
             
             
             <xsl:when test="$localname='correct' and $text='true'"> prawda </xsl:when>
             <xsl:when test="$localname='correct' and $text='false'"> fałsz </xsl:when>
             <xsl:when test="$localname='correct'"> prawidłowość <!--<xsl:comment>DEBUG</xsl:comment>--> </xsl:when>
+            <xsl:when test="$localname='norm' and $text"> norma <xsl:value-of select="$text"/> <!--<xsl:comment>DEBUG</xsl:comment>--> </xsl:when>
             <xsl:when test="$localname='norm'"> norma <!--<xsl:comment>DEBUG</xsl:comment>--> </xsl:when>
+            <xsl:when test="$localname='Koordynator_segmentu_spolki_glownej___login'"> koord sp. gł.  </xsl:when>
+            <xsl:when test="$localname='Akceptujacy_merytorycznie___nazwisko_i_imie'"> akcept. mer. </xsl:when>
+            <xsl:when test="$localname='Osoba_merytoryczna___nazwisko_i_imie'"> osoba mer. </xsl:when>
+            <xsl:when test="$localname='Spolka_glowna'"> sp. gł. </xsl:when>
             <xsl:when test="contains($localname,'BI_audit_')">
                 <xsl:value-of select="replace($localname,'BI_audit_','')"/>
                 <xsl:message>#18 TODO define pleasent localname for <xsl:value-of select="$localname"/> !! </xsl:message>