a.binder 6 лет назад
Родитель
Сommit
46e69df36b

+ 83 - 10
SE/schema/WPS_Functions/get_wfs_recurse_xsl/get_wfs_recurse_xsl.xsl

@@ -756,6 +756,7 @@
                                          <xsl:with-param name="get_wfs_recurse_xsl:context.PRIMARYKEY" select="$get_wfs_recurse_xsl:context.PRIMARYKEY"/>
                                          <xsl:with-param name="debug.last_wfs_request" select="$request_string"/>
                                          <xsl:with-param name="resolveDepth.current" select="1"/>
+                                         <xsl:with-param name="feature_pos.path" select="'I_759_'"/>
                                      </xsl:apply-templates>
                                  </xsl:when>
                                  <xsl:otherwise>
@@ -766,6 +767,7 @@
                                              <xsl:with-param name="get_wfs_recurse_xsl:context.PRIMARYKEY" select="$get_wfs_recurse_xsl:context.PRIMARYKEY"/>
                                              <xsl:with-param name="debug.last_wfs_request" select="$request_string"/>
                                              <xsl:with-param name="resolveDepth.current" select="1"/>
+                                             <xsl:with-param name="feature_pos.path" select="'I_770_'"/>
                                          </xsl:apply-templates>
                                      </RelatedFeatureRoot>
                                  </xsl:otherwise>
@@ -846,6 +848,7 @@
                                          <xsl:with-param name="get_wfs_recurse_xsl:context.PRIMARYKEY" select="$get_wfs_recurse_xsl:context.PRIMARYKEY"/>
                                          <xsl:with-param name="debug.last_wfs_request" select="$request_string"/>
                                          <xsl:with-param name="resolveDepth.current" select="1"/>
+                                         <xsl:with-param name="feature_pos.path" select="'I_852_'"/>
                                      </xsl:apply-templates>
                                  </xsl:when>
                                  <xsl:otherwise>
@@ -856,6 +859,7 @@
                                              <xsl:with-param name="get_wfs_recurse_xsl:context.PRIMARYKEY" select="$get_wfs_recurse_xsl:context.PRIMARYKEY"/>
                                              <xsl:with-param name="debug.last_wfs_request" select="$request_string"/>
                                              <xsl:with-param name="resolveDepth.current" select="1"/>
+                                             <xsl:with-param name="feature_pos.path" select="'I_864_'"/>
                                          </xsl:apply-templates>
                                      </RelatedFeatureRoot>
                                  </xsl:otherwise>
@@ -1461,6 +1465,7 @@
         <xsl:param name="get_wfs_recurse_xsl:typeNameRealResource" select="@typeNameRealResource"/>
         <xsl:param name="input_obj_with_xpath" required="yes"/>
         <xsl:param name="resolveDepth.current" required="yes"/>
+        <xsl:param name="feature_pos.path" select="'I_1464_'"/>
         <xsl:message terminate="no">#1433 TESTING match="RelatedFeature[typeName|typeNameRealResource]" 
             typeName/=<xsl:copy-of select="typeName"/>
             
@@ -1509,6 +1514,7 @@
         <xsl:param name="get_wfs_recurse_xsl:typeNameRealResource" select="@typeNameRealResource"/>
         <xsl:param name="input_obj_with_xpath" required="yes"/>
         <xsl:param name="resolveDepth.current" required="yes"/>
+        <xsl:param name="feature_pos.path" select="'I1513__'"/>
         <!--<xsl:param name="xpath"  select="$xpath"/>-->
         <!--<xsl:param name="xpath_value"  select="$xpath_value"/>-->
         <!--<xsl:variable name="input_obj_with_xpath">
@@ -1607,6 +1613,7 @@
             
             <xsl:with-param name="get_wfs_recurse_xsl:wfs_response" select="$get_wfs_recurse_xsl:wfs_response"/>
             <xsl:with-param name="resolveDepth.current" select="$resolveDepth.current"/>
+            <xsl:with-param name="feature_pos.path" select="$feature_pos.path"/>
         </xsl:apply-templates>
         
     </xsl:template>
@@ -1619,6 +1626,7 @@
         <xsl:param name="xpath"  select="$xpath"/>
         <xsl:param name="xpath_value"  select="$xpath_value"/>
         <xsl:param name="resolveDepth.current" required="yes"/>
+        <xsl:param name="feature_pos.path" select="'I_1625_'"/>
         <!--<xsl:variable name="input_obj_with_xpath">
             <xsl:apply-templates mode="after_first_ant_assing_xpath" select="node()/*"/> <!-\- zeby nie wstawial do xpath nazwy feature - IN7_DZIENNIK_KORESP/ID itp -\->
         </xsl:variable>-->
@@ -1684,6 +1692,7 @@
         <xsl:apply-templates mode="after_first_ant_assing_vars" select="." >
             <xsl:with-param name="get_wfs_recurse_xsl:wfs_response" select="$get_wfs_recurse_xsl:wfs_response"/>
             <xsl:with-param name="resolveDepth.current" select="$resolveDepth.current"/>
+            <xsl:with-param name="feature_pos.path" select="$feature_pos.path"/>
         </xsl:apply-templates>
     </xsl:template>
     
@@ -1727,6 +1736,7 @@
           <xsl:param name="loop_xpath" />
           <xsl:param name="get_wfs_recurse_xsl:wfs_response"  required="yes"/>
           <xsl:param name="resolveDepth.current" required="yes"/>
+            <xsl:param name="feature_pos.path" required="yes"/><!-- select="'X1730-'" -->
         <!--<RelatedFeatureRoot>-->
             
         <!-- first assign xpath to features from  -->
@@ -1760,6 +1770,7 @@
                     <xsl:with-param name="feature_pos_parent" select="$feature_pos_parent"/> <!-- @2017-04 byly nadpisywane informacje - trzeba dorzucic jeszcze $feature_pos_parent w nazwie przetwarzania -->
                     <xsl:with-param name="input_obj_fid" select="$input_obj_fid"/>
                     <xsl:with-param name="resolveDepth.current" select="$resolveDepth.current"/>
+                    <xsl:with-param name="feature_pos.path" select="concat($feature_pos.path,'-',position())"/>
                 </xsl:apply-templates>
                 <!-- cache tasks ? -->
             </xsl:for-each>
@@ -1817,12 +1828,15 @@
                     <xsl:when test="contains(name(),'gml')">
                         <xsl:element name="{local-name()}">
                             <xsl:attribute name="xpath" select="$curr_xpath_tmpl"/>
-                            <xsl:for-each select="@*">
+                            <!--<xsl:for-each select="@*">
                                 <xsl:choose>
                                     <xsl:when test="name()='fid'"/>
                                     <xsl:otherwise><xsl:attribute name="{name()}"><xsl:value-of select="."/></xsl:attribute></xsl:otherwise>
                                 </xsl:choose>
-                            </xsl:for-each>
+                            </xsl:for-each>-->
+                            <xsl:apply-templates mode="#current" select="@*">
+                                <!--<xsl:with-param name="feature_pos" select="$feature_pos"/>-->
+                            </xsl:apply-templates>
                             <xsl:value-of select="text()"/>
                             <xsl:apply-templates mode="after_first_ant_assing_xpath">
                                 <xsl:with-param name="curr_xpath" select="$curr_xpath_tmpl"/>
@@ -1832,12 +1846,13 @@
                     <xsl:otherwise>
                         <xsl:copy>
                             <xsl:attribute name="xpath" select="$curr_xpath_tmpl"/>
-                            <xsl:for-each select="@*">
+                            <!--<xsl:for-each select="@*">
                                 <xsl:choose>
                                     <xsl:when test="name()='fid'"/>
                                     <xsl:otherwise><xsl:attribute name="{name()}"><xsl:value-of select="."/></xsl:attribute></xsl:otherwise>
                                 </xsl:choose>
-                            </xsl:for-each>
+                            </xsl:for-each>-->
+                            <xsl:apply-templates mode="#current" select="@*"/>
                             <xsl:value-of select="text()"/>
                             <xsl:apply-templates mode="after_first_ant_assing_xpath">
                                 <xsl:with-param name="curr_xpath" select="$curr_xpath_tmpl"/>
@@ -1874,6 +1889,7 @@
         <xsl:param name="feature_pos_parent"  required="yes"/>
         <xsl:param name="input_obj_fid" required="no"/>
         <xsl:param name="resolveDepth.current" required="yes"/>
+        <xsl:param name="feature_pos.path" select="concat($feature_pos,'_X1883-')"/>
         <xsl:for-each select=".">
             <xsl:choose>
               
@@ -1913,6 +1929,7 @@
                             <xsl:with-param name="feature_pos_parent" select="$feature_pos_parent"/>
                             <xsl:with-param name="input_obj_fid" select="$input_obj_fid"/>
                             <xsl:with-param name="resolveDepth.current" select="$resolveDepth.current"/>
+                            <xsl:with-param name="feature_pos.path" select="concat($feature_pos.path,'_X1923_')"/>
                         </xsl:apply-templates>
                         
                     </xsl:element>
@@ -1925,7 +1942,15 @@
                              <xsl:attribute name="fid" select="$input_obj_fid/@fid"/>
                         </xsl:if>-->
                         <!--<xsl:copy-of select="namespace::node()"/>-->
-                        <xsl:for-each select="@*">
+                        <xsl:apply-templates mode="#current" select="@*">
+                            <xsl:with-param name="feature_pos" select="$feature_pos"/>
+                            <xsl:with-param name="feature_pos_parent" select="$feature_pos_parent"/>
+                            <xsl:with-param name="input_obj_fid" select="$input_obj_fid"/>
+                            <xsl:with-param name="xml_id_parent" select="$xml_id_parent"/>
+                            <xsl:with-param name="loop_xpath" select="$loop_xpath"/>
+                            <xsl:with-param name="feature_pos.path" select="$feature_pos.path"/>
+                        </xsl:apply-templates>
+                        <!--<xsl:for-each select="@*">
                             <xsl:choose>
                                 <xsl:when test="name()='fid'"/>
                                 <xsl:when test="name()='xml_id'"/>
@@ -1933,14 +1958,14 @@
                                 <xsl:when test="name()='xpath_token_filter'"/>
                                 <xsl:when test="name()='xpath_token'"/>
                                 <xsl:when test="name()='xpath'">
-                                    <!--<xsl:attribute name="xpath_parsed" select="."/>-->
-                                    <!--1:<xsl:value-of select="$parent_obj//node()[@system_cache__appinfo:xpath=$xpath]/text()"/>-->
-                                    <!--<xsl:value-of select="$parent_obj//node()[local-name()=$xpath]/text()"/>-->
-                                    <!--V:<xsl:value-of select="$xpath"/>-->
+                                    <!-\-<xsl:attribute name="xpath_parsed" select="."/>-\->
+                                    <!-\-1:<xsl:value-of select="$parent_obj//node()[@system_cache__appinfo:xpath=$xpath]/text()"/>-\->
+                                    <!-\-<xsl:value-of select="$parent_obj//node()[local-name()=$xpath]/text()"/>-\->
+                                    <!-\-V:<xsl:value-of select="$xpath"/>-\->
                                 </xsl:when>
                                 <xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise>
                             </xsl:choose>
-                        </xsl:for-each>
+                        </xsl:for-each>-->
                         <xsl:choose>
                             <xsl:when test="@xpath">
                                 <!--<xsl:variable name="enter_to_ph">-->
@@ -2033,6 +2058,7 @@
                             <xsl:with-param name="feature_pos_parent" select="$feature_pos_parent"/>
                             <xsl:with-param name="input_obj_fid" select="$input_obj_fid"/>
                             <xsl:with-param name="resolveDepth.current" select="$resolveDepth.current"/>
+                            <xsl:with-param name="feature_pos.path" select="$feature_pos.path"/>
                         </xsl:apply-templates>
                     </xsl:element>
                 </xsl:otherwise>
@@ -2043,6 +2069,48 @@
         <xsl:if test="number($debug) &gt; 2"><xsl:message>#1638 ignored @maxOccurs=<xsl:value-of select="@system_cache__appinfo:maxOccurs"/>; @typeName=<xsl:value-of select="@typeName"/>; @xml_id=<xsl:value-of select="@xml_id"/>;  </xsl:message></xsl:if>
     </xsl:template> <!-- to disable ignored maxOccurs=0 -->
     
+    
+    <xsl:template mode="after_first_ant_assing_xpath" match="@*">
+        <xsl:copy-of select="."/>
+    </xsl:template>
+    
+    <xsl:template mode="after_first_ant_assing_xpath" match="@fid"/>
+    
+    <xsl:template mode="after_first_ant_assing_vars_childs" match="@*">
+        <xsl:copy-of select="."/>
+    </xsl:template>
+    
+    <xsl:template mode="after_first_ant_assing_vars_childs " match="@fid|@format|@xpath_token_filter|@xpath_token|@xpath"/>
+    
+    <xsl:template mode="after_first_ant_assing_vars_childs" match="@system_cache__appinfo:id__x3A__append__unique"/>
+    <xsl:template mode="after_first_ant_assing_vars_childs " match="@id[../@system_cache__appinfo:id__x3A__append__unique]">
+        <xsl:param name="feature_pos" required="yes"/>
+        <xsl:param name="input_obj_fid" required="yes"/>
+        <xsl:param name="feature_pos.path" required="yes"/>
+        <xsl:attribute name="{name()}"><xsl:value-of select="."/>-<xsl:value-of select="$feature_pos.path"/><!--<xsl:value-of select="$feature_pos"/>--><!--<xsl:value-of select="parent::*/generate-id()"/>--></xsl:attribute>
+    </xsl:template> 
+    
+    <xsl:template mode="after_first_ant_assing_xpath" match="@id[../@system_cache__appinfo:id__x3A__append__unique]">
+        <xsl:param name="feature_pos" required="yes"/>
+        <xsl:attribute name="{name()}"><xsl:value-of select="."/></xsl:attribute>
+    </xsl:template>
+    
+    <xsl:template mode="after_first_ant_assing_vars_childs" match="@conref[../@system_cache__appinfo:id__x3A__append__unique]">
+        <xsl:param name="feature_pos" required="yes"/>
+        <xsl:param name="feature_pos_parent" required="yes"/>
+        <xsl:param name="input_obj_fid" required="yes"/>
+        <xsl:param name="xml_id_parent" required="yes"/>
+        <xsl:param name="loop_xpath" required="yes"/>
+        <xsl:param name="feature_pos.path" required="yes"/>
+        <xsl:variable name="system_cache__appinfo:id__x3A__append__unique__x3A__parent.count" select="count(tokenize(../@system_cache__appinfo:id__x3A__append__unique,'/'))"/>
+        <xsl:variable name="system_cache__appinfo:id__x3A__append__unique__x3A__parent__x3A__stripped">
+            <xsl:for-each select="tokenize($feature_pos.path,'-')[  position() &lt;= ( last() - $system_cache__appinfo:id__x3A__append__unique__x3A__parent.count + 1)]">
+                <!--<xsl:if test="not(last())">--><xsl:text>-</xsl:text><!--</xsl:if>--><xsl:value-of select="."/>
+            </xsl:for-each>
+        </xsl:variable>
+        <xsl:attribute name="{name()}"><xsl:value-of select="."/><xsl:value-of select="$system_cache__appinfo:id__x3A__append__unique__x3A__parent__x3A__stripped"/></xsl:attribute>
+    </xsl:template>
+    
     <xsl:template  match="RelatedFeature[not(@system_cache__appinfo:maxOccurs='0') or not($ignore_maxOccurs_0)] | get_wfs_recurse_xsl.RelatedFeature:RelatedFeature[not(@system_cache__appinfo:maxOccurs='0') or not($ignore_maxOccurs_0)]" mode="after_first_ant_assing_vars_childs">
         <xsl:param name="input_obj_with_xpath" required="yes"/>
         <xsl:param name="xml_id_parent" required="yes"/>
@@ -2052,11 +2120,13 @@
         <xsl:param name="input_obj_fid" required="yes"/>
         <xsl:param name="xpath_query"/> <!-- + added test -->
         <xsl:param name="resolveDepth.current" required="yes"/>
+        <xsl:param name="feature_pos.path" select="'_I2104__'"/>
         <xsl:if test="number($debug) &gt; 2"><xsl:message>#411 $feature_pos=<xsl:value-of select="$feature_pos"/>; mode after_first_ant_assing_vars_childs bylo $loop_xpath=<xsl:value-of select="$loop_xpath"/>;</xsl:message></xsl:if>
         <!-- jest okazja do zrobienia bilda aby sciagnal rzeczy nizej -->
         <xsl:variable name="featureID_name" select="substring-after(@typeName,':')"/>
         <xsl:variable name="xml_id" select="@xml_id"/>
         <xsl:variable name="loop_xpath" select="concat($loop_xpath,'/',$xml_id,'.',$feature_pos)"/> <!-- loop path too long ,'.',$featureID_name -->
+        
         <!--<xsl:variable name="loop_xpath_save" select="concat($loop_xpath,'_x2f_.',$xml_id,'.',$featureID_name)"/>--> <!-- tutaj zapisal sie build z wezla z parent -->
         <!--<debug_358_RelatedFeature>
             <xsl:copy-of select="$input_obj_with_xpath"/>
@@ -2090,6 +2160,7 @@
                     <xsl:apply-templates mode="get_wfs_recurse_xsl:wfs_response_RelatedFeature" select=".">
                         <xsl:with-param name="input_obj_with_xpath" select="$input_obj_with_xpath"/>
                         <xsl:with-param name="resolveDepth.current" select="$resolveDepth.current"/>
+                        <xsl:with-param name="feature_pos.path" select="$feature_pos.path"/>
                     </xsl:apply-templates>
                 <!--</xsl:element>-->
             </xsl:when>
@@ -2118,6 +2189,7 @@
         <xsl:param name="input_obj_fid" required="yes"/>
         <xsl:param name="xpath_query"/> <!-- + added test -->
         <xsl:param name="resolveDepth.current" required="yes"/>
+        <xsl:param name="feature_pos.path" select="'I2173_'"/>
         <xsl:if test="number($debug) &gt; 2"><xsl:message>#411 $feature_pos=<xsl:value-of select="$feature_pos"/>; mode after_first_ant_assing_vars_childs bylo $loop_xpath=<xsl:value-of select="$loop_xpath"/>;</xsl:message></xsl:if>
         <!-- jest okazja do zrobienia bilda aby sciagnal rzeczy nizej -->
         <xsl:variable name="featureID_name" select="substring-after(@typeName,':')"/>
@@ -2162,6 +2234,7 @@
                         <xsl:with-param name="xpath" select="@xpath"/>
                         <xsl:with-param name="xpath_value" select="@xpath_value"/>
                         <xsl:with-param name="resolveDepth.current" select="$resolveDepth.current + 1"/>
+                        <xsl:with-param name="feature_pos.path" select="concat($feature_pos.path,'_a2218_')"/>
                     </xsl:apply-templates>
                 <!--</xsl:element>-->
             </xsl:when>

+ 160 - 20
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/IN7_MK_BAZA_DYSTRYBUCJI.dita

@@ -2,12 +2,13 @@
 <RelatedFeature xpath="ID"  typeName="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI" typeNameRealResource="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
   xmlns:ogc="http://www.opengis.net/ogc"
+  xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
   xsi:noNamespaceSchemaLocation="../../../default_db_xml_cache.public/topicProcesy5.xsd">
   <!-- oznacza to refa z w $var=ID_BILLING_OWNER jest FeatureID=BILLING_OWNER.$var do sciagniecia z p5_default_db:BILLING_OWNER -->
   <!--https://biuro.biall-net.pl/SE/version-git/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/out/null400667363.pdf-->
   
   <!-- @2017-03-02 bindar: development test blad zagniezdzania -->
-  <topic id="untitled4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  <topic id="IN7_DZIENNIK_KORESP" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:topic.xsd">
     <title><ph>Dane sprawy dla </ph><ph xpath="P_ID"/><ph>-</ph><ph xpath="ID"/>
     </title>
@@ -17,24 +18,93 @@
       <p><ph>Opis</ph><ph xpath="M_DIST_DESC"/></p>
       <p><ph>Firma</ph><ph xpath="M_DISTRIBUTOR"/></p>
       <p><ph>Notatki</ph><ph xpath="L_APPOITMENT_INFO"/><ph> </ph> <ph xpath="L_APPOITMENT_DATE"/></p>
-      <RelatedFeature xpath="ADM_ACCOUNT" xpath_value="../L_APPOITMENT_USER" typeName="p5_default_db:ADMIN_USERS" typeNameRealResource="p5_default_db:ADMIN_USERS"><!-- oznacza to refa z w $var=ID_BILLING_OWNER jest FeatureID=BILLING_OWNER.$var do sciagniecia z p5_default_db:BILLING_OWNER -->
-        <p><simpletable frame="all" relcolwidth="1.0* 1.0*" id="simpletable_b2r_ldr_cz_ref_spr">
-          <strow>
-            <stentry>Referent odpowiedzialny za sprawę</stentry>
-            <stentry xpath="ADM_NAME"/>
-          </strow>
-          <strow>
-            <stentry>Kontakty</stentry>
-            <stentry><ph xpath="EMAIL_LOCAL_ACCOUNT_ADDRESS" xpath_token_filter=" " xpath_token="1"/><ph> </ph><ph xpath="ADM_PHONE"/></stentry>
-          </strow>
-        </simpletable>
-        </p>
-      </RelatedFeature>
+      
+        <RelatedFeature xpath="ADM_ACCOUNT" xpath_value="../L_APPOITMENT_USER" typeName="p5_default_db:ADMIN_USERS" typeNameRealResource="p5_default_db:ADMIN_USERS"><!-- oznacza to refa z w $var=ID_BILLING_OWNER jest FeatureID=BILLING_OWNER.$var do sciagniecia z p5_default_db:BILLING_OWNER -->
+          <p><simpletable frame="all" relcolwidth="1.0* 1.0*" id="simpletable_b2r_ldr_cz_ref_spr" system_cache__appinfo:id__x3A__append__unique="true">
+            <strow>
+              <stentry>Referent odpowiedzialny za sprawę</stentry>
+              <stentry xpath="ADM_NAME"/>
+            </strow>
+            <strow>
+              <stentry>Kontakty</stentry>
+              <stentry><ph xpath="EMAIL_LOCAL_ACCOUNT_ADDRESS" xpath_token_filter=" " xpath_token="1"/><ph> </ph><ph xpath="ADM_PHONE"/></stentry>
+            </strow>
+          </simpletable>
+          </p>
+        </RelatedFeature>
+        <p>Pisma</p>
+      
+          <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:IN7_DZIENNIK_KORESP" typeNameRealResource="p5_default_db:IN7_DZIENNIK_KORESP"><!-- test sciagniecia powiazanych pism do sprawy -->
+            <p><simpletable id="simpletable_uym_ps1_zy" system_cache__appinfo:id__x3A__append__unique="true">
+              <strow>
+                <stentry>
+                  <p><ph>Pismo nr </ph><ph xpath="ID_PROJECT"/><ph>-</ph><ph xpath="ID"/>
+                    <ph>z dnia</ph>
+                    <ph xpath="K_DATA_OTRZYMANEJ_KORESP"/></p>
+                  <RelatedFeature xpath="ID" xpath_value="../ID_BILLING_OWNER" typeName="p5_default_db:BILLING_OWNER" typeNameRealResource="p5_default_db:BILLING_OWNER"><!-- oznacza to refa z w $var=ID_BILLING_OWNER jest FeatureID=BILLING_OWNER.$var do sciagniecia z p5_default_db:BILLING_OWNER -->
+                    
+                    <p>Nadawca:</p>
+                    <p xpath="name1"/>
+                    <p xpath="name2"/>
+                  </RelatedFeature></stentry>
+                <stentry>
+                  <p>Odbiorca: x</p><ph/>
+                  <p id="K_OD_KOGO" xpath="K_OD_KOGO" system_cache__appinfo:id__x3A__append__unique="."/><ph/>
+                  <p id="OD_KOGO_ADRES" xpath="OD_KOGO_ADRES" system_cache__appinfo:id__x3A__append__unique="."/><ph/>
+                  <RelatedFeature xpath="ID" xpath_value="../ID_BILLING_USERS" typeName="p5_default_db:COMPANIES" typeNameRealResource="p5_default_db:COMPANIES">
+                    <foreign>
+                      <p conref="#IN7_DZIENNIK_KORESP/K_OD_KOGO" conaction="pushreplace" system_cache__appinfo:id__x3A__append__unique="../.">
+                        <ph xpath="P_NAME"/> <ph> </ph>
+                        <ph xpath="P_NAME_SECOND"/> <ph> </ph>
+                        
+                        <div>
+                          
+                          <p><ph xpath="P_ADDRESS_POST_CODE"/><ph> </ph><ph xpath="P_ADDRESS_CITY"/><ph> ul.</ph><ph xpath="P_ADDRESS_STREET"/><ph> </ph><ph xpath="P_ADDRESS_HOUSE"/><ph xpath="P_ADDRESS_HOME" xpath.match.regex="[0-9a-zA-Z]">/</ph><ph xpath="P_ADDRESS_HOME"/></p>
+                          <p><ph xpath.match.regex="[0-9]" xpath="P_NIP">nip: </ph> <ph xpath="P_NIP"/><ph> </ph> <ph xpath.match.regex="[0-9]" xpath="P_KRS_NUMER">krs:</ph> <ph xpath="P_KRS_NUMER"/><ph xpath="P_PESEL"  xpath.match.regex="[0-9]" > pesel:</ph><ph xpath="P_PESEL"/><ph> </ph></p>
+                          <p id="P_ADRESS_KORESP_1282" 
+                            
+                            xpath.not.match.regex.text=" "
+                            xpath.match.regex="[a-zA-Z]" 
+                            xpath="P_ADRESS_KORESP_1282">Adres koresp. <ph xpath="P_ADRESS_KORESP_1282" /><!-- ^$ --><!-- ul. Al. Niepodległości 797/1, 81-810 Sopot -->
+                          </p>
+                          <!--<p xpath="P_PESEL" xpath.match.regex="(|\s+)" xpath.match.regex.conref="#IN7_DZIENNIK_KORESP/P_ADRESS_KORESP_1282" xpath.match.regex.conaction="pushreplace" xpath.match.regex.text="brak adresu"/>-->
+                          <p xpath.match.regex="[a-z]" xpath="user_mail_contact"><ph>email:</ph><ph xpath="user_mail_contact"/></p>
+                          <p xpath.match.regex="[0-9]" xpath="P_PHONE"><ph> tel:</ph><ph xpath="P_PHONE"/> </p>
+                          <p xpath.match.regex="[0-9]" xpath="nr_rach" xpath.match.regex.text=""><ph>nr r-ku:</ph><ph xpath="nr_rach"/></p>
+                        </div>
+                        
+                      </p>
+                      
+                      <p conref="#IN7_DZIENNIK_KORESP/OD_KOGO_ADRES" conaction="pushreplace" system_cache__appinfo:id__x3A__append__unique="../."/>
+                      
+                    </foreign>
+                    
+                    
+                    
+                    
+                    
+                    
+                  </RelatedFeature>
+                </stentry>
+              </strow>
+            </simpletable>
+            </p>
+            <p>Treść: </p>
+            <bodydiv xpath="K_ZAWARTOSC_HTML" format="enter_to_ph"/>
+          </RelatedFeature>
+        
+      
+      
       
       <p><b>podsprawy</b></p>
       <p>
         <table>
           <tgroup cols="5">
+            <colspec colname="c1" colnum="1"/>
+            <colspec colname="c2" colnum="2"/>
+            <colspec colname="c3" colnum="3"/>
+            <colspec colname="c4" colnum="4"/>
+            <colspec colname="c5" colnum="5"/>
             <thead>
               <row>
                 <entry>poz</entry>
@@ -52,6 +122,7 @@
                 <entry/>
                 <entry/>
               </row>
+              
               <RelatedFeature xpath="P_ID" xpath_value="../ID" typeName="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI" typeNameRealResource="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI">  <!-- test sciagniecia powiazanych pism do sprawy -->
                 <row>
                   <entry>---podsprawy</entry>
@@ -60,6 +131,75 @@
                   <entry xpath="M_DISTRIBUTOR"/>
                   <entry xpath="L_APPOITMENT_INFO"/>
                 </row>
+                
+                
+                <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:IN7_DZIENNIK_KORESP" typeNameRealResource="p5_default_db:IN7_DZIENNIK_KORESP"><!-- test sciagniecia powiazanych pism do sprawy -->
+                  <row>
+                    <entry namest="c1" nameend="c5">
+                      <p><simpletable id="simpletable_uym_ps1_zy3" system_cache__appinfo:id__x3A__append__unique=".">
+                        <strow>
+                          <stentry>
+                            <p><ph>Pismo nr </ph><ph xpath="ID_PROJECT"/><ph>-</ph><ph xpath="ID"/>
+                              <ph>z dnia</ph>
+                              <ph xpath="K_DATA_OTRZYMANEJ_KORESP"/></p>
+                            <RelatedFeature xpath="ID" xpath_value="../ID_BILLING_OWNER" typeName="p5_default_db:BILLING_OWNER" typeNameRealResource="p5_default_db:BILLING_OWNER"><!-- oznacza to refa z w $var=ID_BILLING_OWNER jest FeatureID=BILLING_OWNER.$var do sciagniecia z p5_default_db:BILLING_OWNER -->
+                              
+                              <p>Nadawca:</p>
+                              <p xpath="name1"/>
+                              <p xpath="name2"/>
+                            </RelatedFeature></stentry>
+                          <stentry>
+                            <p>Odbiorca: x</p><ph/>
+                            <p id="K_OD_KOGO" xpath="K_OD_KOGO" system_cache__appinfo:id__x3A__append__unique="."/><ph/>
+                            <p id="OD_KOGO_ADRES" xpath="OD_KOGO_ADRES" system_cache__appinfo:id__x3A__append__unique="."/><ph/>
+                            <RelatedFeature xpath="ID" xpath_value="../ID_BILLING_USERS" typeName="p5_default_db:COMPANIES" typeNameRealResource="p5_default_db:COMPANIES">
+                              <foreign>
+                                <p conref="#IN7_DZIENNIK_KORESP/K_OD_KOGO" conaction="pushreplace" system_cache__appinfo:id__x3A__append__unique="../.">
+                                  <ph xpath="P_NAME"/> <ph> </ph>
+                                  <ph xpath="P_NAME_SECOND"/> <ph> </ph>
+                                  
+                                  <div>
+                                    
+                                    <p><ph xpath="P_ADDRESS_POST_CODE"/><ph> </ph><ph xpath="P_ADDRESS_CITY"/><ph> ul.</ph><ph xpath="P_ADDRESS_STREET"/><ph> </ph><ph xpath="P_ADDRESS_HOUSE"/><ph xpath="P_ADDRESS_HOME" xpath.match.regex="[0-9a-zA-Z]">/</ph><ph xpath="P_ADDRESS_HOME"/></p>
+                                    <p><ph xpath.match.regex="[0-9]" xpath="P_NIP">nip: </ph> <ph xpath="P_NIP"/><ph> </ph> <ph xpath.match.regex="[0-9]" xpath="P_KRS_NUMER">krs:</ph> <ph xpath="P_KRS_NUMER"/><ph xpath="P_PESEL"  xpath.match.regex="[0-9]" > pesel:</ph><ph xpath="P_PESEL"/><ph> </ph></p>
+                                    <p id="P_ADRESS_KORESP_1282" 
+                                      
+                                      xpath.not.match.regex.text=" "
+                                      xpath.match.regex="[a-zA-Z]" 
+                                      xpath="P_ADRESS_KORESP_1282">Adres koresp. <ph xpath="P_ADRESS_KORESP_1282" /><!-- ^$ --><!-- ul. Al. Niepodległości 797/1, 81-810 Sopot -->
+                                    </p>
+                                    <!--<p xpath="P_PESEL" xpath.match.regex="(|\s+)" xpath.match.regex.conref="#IN7_DZIENNIK_KORESP/P_ADRESS_KORESP_1282" xpath.match.regex.conaction="pushreplace" xpath.match.regex.text="brak adresu"/>-->
+                                    <p xpath.match.regex="[a-z]" xpath="user_mail_contact"><ph>email:</ph><ph xpath="user_mail_contact"/></p>
+                                    <p xpath.match.regex="[0-9]" xpath="P_PHONE"><ph> tel:</ph><ph xpath="P_PHONE"/> </p>
+                                    <p xpath.match.regex="[0-9]" xpath="nr_rach" xpath.match.regex.text=""><ph>nr r-ku:</ph><ph xpath="nr_rach"/></p>
+                                  </div>
+                                  
+                                </p>
+                                
+                                <p conref="#IN7_DZIENNIK_KORESP/OD_KOGO_ADRES" conaction="pushreplace" system_cache__appinfo:id__x3A__append__unique="../."/>
+                                
+                              </foreign>
+                              
+                              
+                              
+                              
+                              
+                              
+                            </RelatedFeature>
+                          </stentry>
+                        </strow>
+                      </simpletable>
+                      </p>
+                      <p>Treść: </p>
+                      <bodydiv xpath="K_ZAWARTOSC_HTML" format="enter_to_ph"/>
+                    </entry>
+                  </row>
+                </RelatedFeature>
+                
+                
+                
+                
+                
                 <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:PROBLEMS" typeNameRealResource="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
                   <simpleTypeMakeOgcFilter name="PROBLEMS">
                     <ogc:Or>
@@ -111,15 +251,15 @@
                     <entry xpath="L_APPOITMENT_INFO"/>
                   </row>
                 </RelatedFeature>
-                <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:IN7_DZIENNIK_KORESP" typeNameRealResource="p5_default_db:IN7_DZIENNIK_KORESP"><!-- test sciagniecia powiazanych pism do sprawy -->
+                <!--<RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:IN7_DZIENNIK_KORESP" typeNameRealResource="p5_default_db:IN7_DZIENNIK_KORESP"><!-\- test sciagniecia powiazanych pism do sprawy -\->
                   <row>
-                    <entry>------pisma</entry>
+                    <entry>-\-\-\-\-\-pisma</entry>
                     <entry xpath="ID" />
                     <entry/>
                     <entry xpath="K_DATA_OTRZYMANEJ_KORESP"/>
                     <entry xpath="K_ZAWARTOS"/>
                   </row>
-                </RelatedFeature> 
+                </RelatedFeature>--> 
                 <RelatedFeature xpath="P_ID" xpath_value="../ID" typeName="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI" typeNameRealResource="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI" >  <!-- test sciagniecia powiazanych pism do sprawy -->
                   <row>
                     <entry>---sprawy</entry>
@@ -128,15 +268,15 @@
                     <entry xpath="M_DISTRIBUTOR"/>
                     <entry xpath="L_APPOITMENT_INFO"/>
                   </row>
-                  <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:IN7_DZIENNIK_KORESP" typeNameRealResource="p5_default_db:IN7_DZIENNIK_KORESP"><!-- test sciagniecia powiazanych pism do sprawy -->
+                  <!--<RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:IN7_DZIENNIK_KORESP" typeNameRealResource="p5_default_db:IN7_DZIENNIK_KORESP"><!-\- test sciagniecia powiazanych pism do sprawy -\->
                     <row>
-                      <entry>------pisma</entry>
+                      <entry>-\-\-\-\-\-pisma</entry>
                       <entry xpath="ID" />
                       <entry xpath="A_STATUS"/>
                       <entry xpath="K_DATA_OTRZYMANEJ_KORESP"/>
                       <entry xpath="K_ZAWARTOS"/>
                     </row>
-                  </RelatedFeature>
+                  </RelatedFeature>-->
                   <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:PROBLEMS" typeNameRealResource="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
                     <row>
                       <entry>-----zadania</entry>

+ 44 - 10
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.plot.Hi-Lo-Close.xsl

@@ -517,14 +517,14 @@
                             <xsl:with-param name="system_cache__dita__x3A__svg:plot" select="$system_cache__dita__x3A__svg:openHiLoClose__x3A__plot"/>
                         </xsl:call-template>
                     
-                    <xsl:copy-of select="$system_cache__dita__x3A__svg:openHiLoClose__x3A__plot"/>
+                    <!--<xsl:copy-of select="$system_cache__dita__x3A__svg:openHiLoClose__x3A__plot"/>-->
                     
                     <xsl:variable name="system_cache__dita__x3A__svg:transform.translate.sibling__x3A__range__x3A__associate">
                         <xsl:call-template name="system_cache__dita__x3A__svg:transform.translate.sibling__x3A__range__x3A__associate.root">
                             <xsl:with-param name="system_cache__dita__x3A__svg:plot" select="$system_cache__dita__x3A__svg:openHiLoClose__x3A__plot"/>
                         </xsl:call-template>
                     </xsl:variable>
-                    <xsl:copy-of select="$system_cache__dita__x3A__svg:transform.translate.sibling__x3A__range__x3A__associate"></xsl:copy-of>
+                    <!--<xsl:copy-of select="$system_cache__dita__x3A__svg:transform.translate.sibling__x3A__range__x3A__associate"></xsl:copy-of>-->
                     <xsl:apply-templates mode="system_cache__dita__x3A__svg:transform.translate.sibling__x3A__range__x3A__associate.position__x3A__candidate__x3A__plot" select="$system_cache__dita__x3A__svg:transform.translate.sibling__x3A__range__x3A__associate">
                         <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" tunnel="yes"/>
                         <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" tunnel="yes"/>
@@ -673,6 +673,9 @@
         <xsl:param name="system_cache__dita__x3A__svg:offsetY.maxY" required="yes" />
         
         <xsl:param name="offsetY-text" select="6"/>
+        <xsl:param name="font-size" tunnel="yes" select="6"/>
+        <xsl:param name="offsetX-text-margin" tunnel="yes" select="3"/>
+        <xsl:param name="text-anchor" select="'middle'" tunnel="yes"/>
         
         <xsl:param name="system_cache__dita__x3A__svg:data.x.name.value" required="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x.name" required="yes"/>
@@ -975,6 +978,35 @@
                 </xsl:call-template>
             </xsl:when>
             <xsl:otherwise>
+                <xsl:variable name="system_cache__dita__x3A__svg:x__x3A__read__x3A__preceding__x3A__translate.bounds__x3A__collision">
+                    <xsl:call-template name="system_cache__dita__x3A__svg:x__x3A__read__x3A__preceding__x3A__translate.bounds__x3A__collision">
+                        <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name.value" select="$system_cache__dita__x3A__svg:data.x.name.value"/>
+                        <xsl:with-param name="system_cache__dita__x3A__svg:data.x.name" select="$system_cache__dita__x3A__svg:data.x.name"/>
+                        <xsl:with-param name="system_cache__dita__x3A__svg:data.x.value" select="$system_cache__dita__x3A__svg:data.x.value"/>
+                        <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.x1.bounds.min.coordinate"/>
+                        <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.coordinate"/>
+                        <xsl:with-param name="system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate" select="$system_cache__dita__x3A__svg:data.y1.bounds.min.coordinate"/>
+                        <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.coordinate"/>
+                        
+                        <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.minX" select="$system_cache__dita__x3A__svg:offsetX.minX"/>
+                        <xsl:with-param name="system_cache__dita__x3A__svg:offsetX.maxX" select="$system_cache__dita__x3A__svg:offsetX.maxX"/>
+                        <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.minY" select="$system_cache__dita__x3A__svg:offsetY.minY"/>
+                        <xsl:with-param name="system_cache__dita__x3A__svg:offsetY.maxY" select="$system_cache__dita__x3A__svg:offsetY.maxY"/>
+                        <xsl:with-param name="system_cache__dita__x3A__svg:data.x2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.x2.bounds.max.length" />
+                        <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.length" />
+                        
+                        <!--<xsl:with-param name="xValue__x3A__context" select="$x2Value"/>-->
+                        <xsl:with-param name="yValue__x3A__context" select="$y1Value"/>
+                        
+                        <xsl:with-param name="offsetY-text" select="3"/><!-- $offsetY-text -->
+                        <xsl:with-param name="text-anchor" select="3"/>
+                        <xsl:with-param name="font-size" select="3"/>
+                        <xsl:with-param name="text-rotate" select="0"/>
+                        <xsl:with-param name="offsetX-text-margin" select="$offsetX-text-margin"/>
+                        <xsl:with-param name="system_cache__dita__x3A__svg:x.count__x3A__read" select="$system_cache__dita__x3A__svg:x1.count.leadingTimeDate"/>
+                    </xsl:call-template>
+                </xsl:variable>
+                
                 <svg:line   system_cache__dita__x3A__svg:debug="svgu:openHiLoClose.74_896 {@*/relation_DateRangeElements/name()} $system_cache__dita__x3A__svg:x1.count.leadingTimeDate={$system_cache__dita__x3A__svg:x1.count.leadingTimeDate} $system_cache__dita__x3A__svg:data.x2.bounds.max.length={$system_cache__dita__x3A__svg:data.x2.bounds.max.length} $xScale={$xScale}">
                     
                     <!--id="{$context}_highLow_{$pos}"-->
@@ -1024,10 +1056,11 @@
                             <!--<xsl:with-param name="context" select="$context"/>-->
                             <xsl:with-param name="color">red</xsl:with-param>
                             <!--<xsl:with-param name="stroke" select="5 div abs($yScale)"/>-->
-                            <xsl:with-param name="stroke__x3A__initial" select="5"/>
-                            <xsl:with-param name="yScale" select="$yScale"/>
+                            <xsl:with-param name="stroke__x3A__initial" select="3"/>
+                            <xsl:with-param name="vector-effect__x3A__non-scaling-stroke" select="true()"/>
+                            <!--<xsl:with-param name="yScale" select="$yScale"/>
                             <xsl:with-param name="system_cache__dita__x3A__svg:x1.count.leadingTimeDate" select="$system_cache__dita__x3A__svg:x1.count.leadingTimeDate"/>
-                            <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.length"/>
+                            <xsl:with-param name="system_cache__dita__x3A__svg:data.y2.bounds.max.length" select="$system_cache__dita__x3A__svg:data.y2.bounds.max.length"/>-->
                         </xsl:call-template>
                     </xsl:attribute>      
                     <!--<xsl:attribute name="transform.validate.y.1.{$y1Value}">
@@ -1053,7 +1086,7 @@
                         </xsl:call-template>
                         
                     </xsl:attribute>-->
-                    
+                    <xsl:copy-of select="$system_cache__dita__x3A__svg:x__x3A__read__x3A__preceding__x3A__translate.bounds__x3A__collision"/>
                     
                     
                     <xsl:comment>#debug 277
@@ -1181,7 +1214,7 @@
         
         
         
-        <xsl:comment>#460
+        <!--<xsl:comment>#460
         TEST IF CONSTEXT
                  <xsl:value-of select="name()"/>
                 TEST CONTEXT <xsl:for-each select="descendant-or-self::*">
@@ -1193,7 +1226,7 @@
                     n:/<xsl:value-of select="name()"/>
                 </xsl:for-each>
             
-        </xsl:comment>
+        </xsl:comment>-->
         <xsl:comment>REM scg:text 450</xsl:comment>
         <!--<svg:text system_cache__dita__x3A__svg:debug="460_do_move">
             
@@ -1630,12 +1663,13 @@
                     </xsl:choose>
                 </xsl:when>
                 <xsl:otherwise>
-                    <xsl:value-of select="1"/>
+                    <xsl:value-of select="$stroke__x3A__initial"/>
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:param>
+        <xsl:param name="vector-effect__x3A__non-scaling-stroke" />
         <xsl:text>stroke: </xsl:text><xsl:value-of select="$color"/><xsl:text>; stroke-width: </xsl:text><xsl:value-of select="$stroke"/><xsl:text>; </xsl:text><!-- vector-effect:non-scaling-stroke ;  -->
-        <xsl:if test="$stroke-dasharray">stroke-dasharray:<xsl:value-of select="$stroke-dasharray"/>;</xsl:if>
+        <xsl:if test="$stroke-dasharray">stroke-dasharray:<xsl:value-of select="$stroke-dasharray"/>;</xsl:if><xsl:text> vector-effect:</xsl:text><xsl:if test="$vector-effect__x3A__non-scaling-stroke">non-scaling-stroke</xsl:if><xsl:text>;</xsl:text>
     </xsl:template>
     
     <xsl:template name="svgu:openCloseBarStyle">

Разница между файлами не показана из-за своего большого размера
+ 544 - 127037
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.plot.complex.test.svg


+ 4 - 4
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.plot.complex.test.xsl

@@ -743,12 +743,12 @@
                                     
                                     <!--<xsl:comment>#174 applying for powiazania rows lower</xsl:comment>-->  
                                     <xsl:variable name="system_cache__dita__x3A__svg:data__x3A__assign">
-                                        <xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign" select="doc('file:/opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-209_000001/interested_row.xml')">
-                                            <xsl:with-param name="system_cache__dita__x3A__svg:cursor" select="$system_cache__dita__x3A__svg:cursor"/>
-                                        </xsl:apply-templates>
-                                        <!--<xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign" select="doc('file:/opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-1415_000001/interested_row.xml')">
+                                        <!--<xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign" select="doc('file:/opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-209_000001/interested_row.xml')">
                                             <xsl:with-param name="system_cache__dita__x3A__svg:cursor" select="$system_cache__dita__x3A__svg:cursor"/>
                                         </xsl:apply-templates>-->
+                                        <xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign" select="doc('file:/opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-1415_000001/interested_row.xml')">
+                                            <xsl:with-param name="system_cache__dita__x3A__svg:cursor" select="$system_cache__dita__x3A__svg:cursor"/>
+                                        </xsl:apply-templates>
                                     </xsl:variable>
                                     
                                     <xsl:call-template name="system_cache__dita__x3A__svg:cursor.region.plot">

+ 157 - 140
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.utils.data.xsl

@@ -36,98 +36,108 @@
         </xsl:copy>
     </xsl:template>
     
+    
+    
+    
+    
+    
+    
     <xsl:template mode="system_cache__dita__x3A__svg:data__x3A__assign" match="interested_row[BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row]">
         <xsl:param name="system_cache__dita__x3A__svg:cursor"/>
+        
+        <!-- MINX MAXX -->
+        <xsl:variable name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X">
+            <system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X>
+                <xsl:for-each-group select="descendant-or-self::*" group-by="@fid">
+                    
+                    <xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X" select=".">
+                        
+                    </xsl:apply-templates>
+                </xsl:for-each-group>
+            </system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X>
+        </xsl:variable>
+        
+        <xsl:variable name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min" select="min($system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/*/@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value)"/>
+        <xsl:variable name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max" select="max($system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/*/@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value)"/>
+        <xsl:variable name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max.label" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/*[@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value = $system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max]/@system_cache__dita__x3A__svg:data.y.leadingTimeYear-month.bounds.X.label"/>
+        <!-- Again to fix date to -->
+        
+        
         <system_cache__dita__x3A__svg:data.current-group>
-            <xsl:attribute name="system_cache__dita__x3A__svg:data.name">relation_DateRangeElements</xsl:attribute>
-            <xsl:for-each-group select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements[@*[name()='leadingTimeDate-From' and not(.='')] and @*[name()='leadingTimeDate-To' and not(.='')]] and not(BI_audit_ENERGA_RUM_KONTRAHENCI)]" group-by="relation_DateRangeElements/concat(@leadingTimeDate-From,'-',@leadingTimeDate-To,'-',ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[1]/*[1]/@fid)"><!-- descendant-or-self::BI_audit_ENERGA_PRACOWNICY[not(preceding-sibling::*)] -->
-            
-            <!--<xsl:copy>
-                                <xsl:copy-of select="@fid"/>
-                            </xsl:copy>-->
-            
-            <!--<xsl:call-template name="system_cache__dita__x3A__svg:data__x3A__assign">
-                <xsl:with-param name="system_cache__dita__x3A__svg:data.class">system_cache__dita__x3A__svg:data.current-group</xsl:with-param>
-                <xsl:with-param name="system_cache__dita__x3A__svg:data.for-each-group.context" select="current-group()/ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row[1]/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements[@*[name()='leadingTimeDate-From' or name()='leadingTimeDate-To']]]"/>
-                <xsl:with-param name="system_cache__dita__x3A__svg:cursor" select="$system_cache__dita__x3A__svg:cursor"/>
-            </xsl:call-template>-->
-            <xsl:comment>#51 Rum Powiazania pos: <xsl:value-of select="position()"/>; </xsl:comment>
-            <xsl:variable name="system_cache__dita__x3A__svg:data.position" select="position()"/>
-            <!--<xsl:for-each-group select="current-group()/ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row[1]/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements[@*[name()='leadingTimeDate-From' or name()='leadingTimeDate-To']]]" group-by="concat(@leadingTimeDate-From,'-',@leadingTimeDate-To)">-->
-            <xsl:for-each-group select="current-group()" group-by="*[1]/@fid">
-                <xsl:call-template name="system_cache__dita__x3A__svg:data__x3A__assign">
-                    <xsl:with-param name="system_cache__dita__x3A__svg:data.class">system_cache__dita__x3A__svg:leadingTimeDate</xsl:with-param>
-                    <xsl:with-param name="system_cache__dita__x3A__svg:data.for-each-group.context" select="*"/>
-                    <xsl:with-param name="system_cache__dita__x3A__svg:cursor" select="$system_cache__dita__x3A__svg:cursor"/>
-                    <xsl:with-param name="system_cache__dita__x3A__svg:data.position" select="$system_cache__dita__x3A__svg:data.position"/>
-                </xsl:call-template>  
-                <!--<xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign" select=".">
-                    <xsl:with-param name="system_cache__dita__x3A__svg:data.position" select="position()" tunnel="yes"/>
-                </xsl:apply-templates>-->
-            </xsl:for-each-group>
-            <!--</xsl:for-each-group>-->
-            
-            
-            
-            <!--<system_cache__dita__x3A__svg:data.current-group>
-                                <xsl:attribute name="system_cache__dita__x3A__svg:data.name" select="name()"/>
-                                <xsl:attribute name="system_cache__dita__x3A__svg:data.id" select="@fid"/>
-                                <xsl:attribute name="system_cache__dita__x3A__svg:data.position" select="position()"/>
-                                
-                                <!-\-<xsl:variable name="system_cache__dita__x3A__svg:cursor">
-                                    <xsl:call-template name="system_cache__dita__x3A__svg:cursor.commit">
-                                        <xsl:with-param name="id" select="@fid"/>
-                                        <xsl:with-param name="system_cache__dita__x3A__svg:cursor" select="$system_cache__dita__x3A__svg:cursor"/>
-                                        <xsl:with-param name="system_cache__dita__x3A__svg:height__x3A__limit__x3A__validate" select="$system_cache__dita__x3A__svg:height" tunnel="yes"/>
-                                    </xsl:call-template>
-                                </xsl:variable>-\->
-                                
-                                
-                                <!-\-<xsl:for-each select="current-group()/ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row[1]/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements[@*[name()='leadingTimeDate-From' or name()='leadingTimeDate-To']]]">
-                                    <system_cache__dita__x3A__svg:leadingTimeDate>
-                                       
-                                        <xsl:attribute name="system_cache__dita__x3A__svg:data.name" select="relation_DateRangeElements/name()"/><!-\\- kontekst danych pojedynczego powiazania - parent group dotyczy jednego pracownika - jako grupa - title -\\->
-                                        <xsl:attribute name="system_cache__dita__x3A__svg:data.x.name" select="*[1]/name()"/>
-                                        <xsl:attribute name="system_cache__dita__x3A__svg:data.x.id" select="*[1]/@fid"/>
-                                        <xsl:attribute name="system_cache__dita__x3A__svg:data.y1.name" select="relation_DateRangeElements/@leadingTimeDate-From/name()"/>
-                                        <xsl:attribute name="system_cache__dita__x3A__svg:data.y1.value" select="relation_DateRangeElements/@leadingTimeDate-From/system_cache__dita:year-timestamp-day(.)"/>
-                                        <xsl:attribute name="system_cache__dita__x3A__svg:data.y1.label" select="relation_DateRangeElements/@leadingTimeDate-From"/>
-                                        <xsl:attribute name="system_cache__dita__x3A__svg:data.y2.name" select="relation_DateRangeElements/@leadingTimeDate-To/name()"/>
-                                        <xsl:attribute name="system_cache__dita__x3A__svg:data.y2.value" select="relation_DateRangeElements/@leadingTimeDate-To/system_cache__dita:year-timestamp-day(.)"/>
-                                        <xsl:attribute name="system_cache__dita__x3A__svg:data.y2.label" select="relation_DateRangeElements/@leadingTimeDate-To"/>
-                                        <!-\\-<xsl:choose>
-                                            <xsl:when test="max(relation_DateRangeElements[@*[name()='leadingTimeDate-From' or name()='leadingTimeDate-To']])/system_cache__dita:year-timestamp-day(.)">
-                                                <system_cache__dita__x3A__svg:maxY>
-                                                    <xsl:value-of select="max(relation_DateRangeElements/@*[name()='leadingTimeDate-From' or name()='leadingTimeDate-To'])/system_cache__dita:year-timestamp-day(.)"/>
-                                                </system_cache__dita__x3A__svg:maxY>
-                                            </xsl:when>
-                                        </xsl:choose>-\\->
-                                        <!-\\-<xsl:variable name="minX" select="0"/>-\\->
-                                            <!-\\-<xsl:variable name="maxX" select="count(current-group())"/>-\\->
-                                            
-                                            <!-\\-<xsl:variable name="minY" select="min((current-group()/ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row[1]/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object/relation_DateRangeElements/@*[name()='leadingTimeDate-From' or name()='leadingTimeDate-To'])/system_cache__dita:year-timestamp-day(.))"/><!-\\\\- time string -\\\\->-\\->
-                                            <!-\\-<xsl:variable name="minY.test" select="current-group()/ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row[1]/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object/relation_DateRangeElements/@*[name()='leadingTimeDate-From' or name()='leadingTimeDate-To']"/><!-\\\\-  BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object/relation_DateRangeElements @*[name()='leadingTimeDate-From' or name()='leadingTimeDate-To'] -\\\\->-\\->
-                                            <!-\\-<xsl:variable name="maxY" select="max((current-group()/ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row[1]/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object/relation_DateRangeElements/@*[name()='leadingTimeDate-From' or name()='leadingTimeDate-To'])/system_cache__dita:year-timestamp-day(.))"/>-\\->
-                                            <!-\\-<xsl:comment>#181 
-                                                minY <!-\\\\-<xsl:copy-of select="$minY"/>-\\\\->
-                                                
-                                                $minY.test =<!-\\\\- <xsl:copy-of select="$minY.test"></xsl:copy-of>-\\\\->
-                                                
-                                                maxY <!-\\\\-<xsl:copy-of select="$maxY"/>-\\\\->
-                                             </xsl:comment>-\\->
-                                    </system_cache__dita__x3A__svg:leadingTimeDate>
-                                </xsl:for-each>-\->
-                            </system_cache__dita__x3A__svg:data.current-group>-->
-            <!--<svg:text system_cache__dita__x3A__svg:debug="svgu:kontr_row_test"
-                                x="-18"
-                                y="292.6"
-                                transform=" translate(0,-18)  translate(-18,292.6)  scale(1,-1.4630000000000003)  translate(18,-292.6) "
-                                style="text-anchor:end;font-size:9;baseline-shift:-50%"
-                                transform.validate.y="537.2136000000003">292.6</svg:text>-->
+            <xsl:variable name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X">
+                <system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X>
+                    <xsl:for-each-group select="descendant-or-self::*" group-by="@fid">
+                        <xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X" select=".">
+                            <xsl:with-param name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max" tunnel="yes"/>
+                            <xsl:with-param name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max.label" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max.label" tunnel="yes"/>
+                        </xsl:apply-templates>
+                    </xsl:for-each-group>
+                </system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X>
+            </xsl:variable>
+            <xsl:attribute name="system_cache__dita__x3A__svg:data.name">system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X</xsl:attribute>
+           
+            <xsl:attribute name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min"/>
+            <xsl:attribute name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max"/>
+            <xsl:choose>
+                <xsl:when test="xs:string($system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min) = 'NaN' or xs:string($system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max) = 'NsN'">
+                    
+                    <xsl:message>#195 ERROR xs:string($min) = 'NaN' or xs:string($max) = 'NsN' count <xsl:value-of select="count($system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X//*)"/>; $min=<xsl:value-of select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min"/>; $max=<xsl:value-of select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max"/>;</xsl:message>
+                    
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:message>#195-TEST ERROR  count <xsl:value-of select="count($system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X//*)"/>; 
+                        $min=<xsl:value-of select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min"/>; 
+                        $max=<xsl:value-of select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max"/>;
+                        count_empty_err: <xsl:value-of select="count($system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/*[@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value[.=''] ])"/>
+                        <xsl:value-of select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/*[@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value[.=''] ]/name()"/>
+                    </xsl:message>
+                    <xsl:for-each-group select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/*"  group-by="concat(@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value = $system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min, @system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value = $system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max,@system_cache__dita__x3A__svg:data.y.leadingTimeYear-month.bounds.X.label)"><!-- @system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value -->
+                        <xsl:sort select="@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value" order="ascending" data-type="number"/>
+                        <xsl:copy-of select="."/>
+                    </xsl:for-each-group>
+                    <!--<xsl:copy-of select="descendant-or-self::*"></xsl:copy-of>-->
+                </xsl:otherwise>
+            </xsl:choose>
             
-        </xsl:for-each-group>
         </system_cache__dita__x3A__svg:data.current-group>
         
+        
+        
+        <xsl:variable name="system_cache__dita__x3A__svg:data.current-group">
+            <system_cache__dita__x3A__svg:data.current-group>
+                <xsl:attribute name="system_cache__dita__x3A__svg:data.name">relation_DateRangeElements</xsl:attribute>
+                    <xsl:for-each-group select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements[@*[name()='leadingTimeDate-From' and not(.='')] and @*[name()='leadingTimeDate-To' ]] and not(BI_audit_ENERGA_RUM_KONTRAHENCI)]" group-by="relation_DateRangeElements/concat(@leadingTimeDate-From,'-',@leadingTimeDate-To,'-',ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[1]/*[1]/@fid)"><!-- descendant-or-self::BI_audit_ENERGA_PRACOWNICY[not(preceding-sibling::*)] -->
+                        
+                    <!--<xsl:copy>
+                                        <xsl:copy-of select="@fid"/>
+                                    </xsl:copy>-->
+                    
+                    <!--<xsl:call-template name="system_cache__dita__x3A__svg:data__x3A__assign">
+                        <xsl:with-param name="system_cache__dita__x3A__svg:data.class">system_cache__dita__x3A__svg:data.current-group</xsl:with-param>
+                        <xsl:with-param name="system_cache__dita__x3A__svg:data.for-each-group.context" select="current-group()/ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row[1]/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements[@*[name()='leadingTimeDate-From' or name()='leadingTimeDate-To']]]"/>
+                        <xsl:with-param name="system_cache__dita__x3A__svg:cursor" select="$system_cache__dita__x3A__svg:cursor"/>
+                    </xsl:call-template>-->
+                    <xsl:comment>#51 Rum Powiazania pos: <xsl:value-of select="position()"/>; </xsl:comment>
+                    <xsl:variable name="system_cache__dita__x3A__svg:data.position" select="position()"/>
+                    <!--<xsl:for-each-group select="current-group()/ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row[1]/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements[@*[name()='leadingTimeDate-From' or name()='leadingTimeDate-To']]]" group-by="concat(@leadingTimeDate-From,'-',@leadingTimeDate-To)">-->
+                    <xsl:for-each-group select="current-group()" group-by="*[1]/@fid">
+                        <xsl:call-template name="system_cache__dita__x3A__svg:data__x3A__assign">
+                            <xsl:with-param name="system_cache__dita__x3A__svg:data.class">system_cache__dita__x3A__svg:leadingTimeDate</xsl:with-param>
+                            <xsl:with-param name="system_cache__dita__x3A__svg:data.for-each-group.context" select="*"/>
+                            <xsl:with-param name="system_cache__dita__x3A__svg:cursor" select="$system_cache__dita__x3A__svg:cursor"/>
+                            <xsl:with-param name="system_cache__dita__x3A__svg:data.position" select="$system_cache__dita__x3A__svg:data.position"/>
+                            <xsl:with-param name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min" tunnel="yes"/>
+                            <xsl:with-param name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min" tunnel="yes"/>
+                        </xsl:call-template>  
+                        <!--<xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign" select=".">
+                            <xsl:with-param name="system_cache__dita__x3A__svg:data.position" select="position()" tunnel="yes"/>
+                        </xsl:apply-templates>-->
+                    </xsl:for-each-group>
+                    <!--</xsl:for-each-group>-->
+                </xsl:for-each-group>
+            </system_cache__dita__x3A__svg:data.current-group>
+        </xsl:variable>
+        <xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign__x3A__sort" select="$system_cache__dita__x3A__svg:data.current-group"/>
         <xsl:comment>#199 lower kontrahenci</xsl:comment>
         <xsl:message terminate="no">#199 lower kontrahenci</xsl:message>
         <!--<debug.130.umowy></debug.130.umowy>-->
@@ -144,7 +154,8 @@
             <xsl:for-each-group select="$BI_audit_ENERGA_RUM_UMOWY/BI_audit_ENERGA_RUM_UMOWY/*" group-by="@default_db__x3A__BI_audit_BENFORD:leadingTimeYear-quarter">
                     <!--<xsl:copy>-->
                         <xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign" select=".">
-                            
+                            <xsl:with-param name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min" tunnel="yes"/>
+                            <xsl:with-param name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min" tunnel="yes"/>
                         </xsl:apply-templates>
                     <!--</xsl:copy>-->
                         <!--<xsl:call-template name="system_cache__dita__x3A__svg:data__x3A__assign">
@@ -171,65 +182,32 @@
             <xsl:for-each-group select="$BI_audit_ENERGA_FAKTURY/BI_audit_ENERGA_FAKTURY/*" group-by="@default_db__x3A__BI_audit_BENFORD:leadingTimeYear-quarter">
                     
                     <xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign" select=".">
-                        
-                    </xsl:apply-templates>
-                </xsl:for-each-group>
-        </system_cache__dita__x3A__svg:data.current-group>
-        
-        <!-- MINX MAXX -->
-        <xsl:variable name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X">
-            <system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X>
-                <xsl:for-each-group select="descendant-or-self::*" group-by="@fid">
-                    
-                    <xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X" select=".">
-                        
+                        <xsl:with-param name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min" tunnel="yes"/>
+                        <xsl:with-param name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min" tunnel="yes"/>
                     </xsl:apply-templates>
                 </xsl:for-each-group>
-            </system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X>
-        </xsl:variable>
-        <system_cache__dita__x3A__svg:data.current-group>
-            <xsl:attribute name="system_cache__dita__x3A__svg:data.name">system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X</xsl:attribute>
-            <xsl:variable name="min" select="min($system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/*/@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value)"/>
-            <xsl:variable name="max" select="max($system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/*/@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value)"/>
-            <xsl:attribute name="min" select="$min"/>
-            <xsl:attribute name="max" select="$max"/>
-            <xsl:choose>
-                <xsl:when test="xs:string($min) = 'NaN' or xs:string($max) = 'NsN'">
-                    
-                    <xsl:message>#195 ERROR xs:string($min) = 'NaN' or xs:string($max) = 'NsN' count <xsl:value-of select="count($system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X//*)"/>; $min=<xsl:value-of select="$min"/>; $max=<xsl:value-of select="$max"/>;</xsl:message>
-                    
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:for-each-group select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/*"  group-by="concat(@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value = $min, @system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value = $max,@system_cache__dita__x3A__svg:data.y.leadingTimeYear-month.bounds.X.label)"><!-- @system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value -->
-                        <xsl:sort select="@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value" order="ascending" data-type="number"/>
-                        <xsl:copy-of select="."/>
-                    </xsl:for-each-group>
-                </xsl:otherwise>
-            </xsl:choose>
-            
         </system_cache__dita__x3A__svg:data.current-group>
         
-        
-        
+          
         
     </xsl:template>
 
     <xsl:template mode="system_cache__dita__x3A__svg:data__x3A__assign" match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA">
         <xsl:param name="system_cache__dita__x3A__svg:cursor"/>
         <debug.144_UNKNOWN></debug.144_UNKNOWN>
-        <xsl:for-each-group select="descendant-or-self::BI_audit_ENERGA_PRACOWNICY[not(preceding-sibling::*)]" group-by="@fid">
-            <!--<xsl:copy>
+        <!--<xsl:for-each-group select="descendant-or-self::BI_audit_ENERGA_PRACOWNICY[not(preceding-sibling::*)]" group-by="@fid">
+            <!-\-<xsl:copy>
                                 <xsl:copy-of select="@fid"/>
-                            </xsl:copy>-->
+                            </xsl:copy>-\->
             
-            <!--<xsl:call-template name="system_cache__dita__x3A__svg:data__x3A__assign">
+            <!-\-<xsl:call-template name="system_cache__dita__x3A__svg:data__x3A__assign">
                 <xsl:with-param name="system_cache__dita__x3A__svg:data.class">system_cache__dita__x3A__svg:data.current-group</xsl:with-param>
                 <xsl:with-param name="system_cache__dita__x3A__svg:data.for-each-group.context" select="current-group()/ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row[1]/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements[@*[name()='leadingTimeDate-From' or name()='leadingTimeDate-To']]]"/>
                 <xsl:with-param name="system_cache__dita__x3A__svg:cursor" select="$system_cache__dita__x3A__svg:cursor"/>
-            </xsl:call-template>-->
+            </xsl:call-template>-\->
             
             
-        </xsl:for-each-group>
+        </xsl:for-each-group>-->
       
     </xsl:template>
     
@@ -308,7 +286,7 @@
     </xsl:template>
     
     
-    <xsl:template mode="system_cache__dita__x3A__svg:data__x3A__assign" match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements[@*[name()='leadingTimeDate-From' and not(.='') ] and @*[name()='leadingTimeDate-To' and not(.='') ]]]">
+    <xsl:template mode="system_cache__dita__x3A__svg:data__x3A__assign" match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements[@*[name()='leadingTimeDate-From' and not(.='') ] and @*[name()='leadingTimeDate-To'  ]]]">
         <xsl:param name="system_cache__dita__x3A__svg:cursor"/>
         
         <xsl:call-template name="system_cache__dita__x3A__svg:data__x3A__assign">
@@ -326,14 +304,14 @@
         
     </xsl:template>-->
     
-    <xsl:template mode="system_cache__dita__x3A__svg:data__x3A__assign" match="relation_DateRangeElements[@*[name()='leadingTimeDate-From' and not(.='') ] and @*[name()='leadingTimeDate-To' and not(.='') ]]">
+    <xsl:template mode="system_cache__dita__x3A__svg:data__x3A__assign" match="relation_DateRangeElements[@*[name()='leadingTimeDate-From' and not(.='') ] and @*[name()='leadingTimeDate-To' ]]">
         <xsl:copy>
-            <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.x(),system_cache__dita__x3A__svg:resolution.coordinate.index(),system_cache__dita__x3A__svg:resolution.coordinate.preceding-sibling.fid())}" select="ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[1]/preceding-sibling::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[1]/*[1]/@fid"/>
-            <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.x(),system_cache__dita__x3A__svg:resolution.coordinate.index(),system_cache__dita__x3A__svg:resolution.coordinate.following-sibling.fid())}" select="ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[1]/following-sibling::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[1]/*[1]/@fid"/>
+            <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.x(),system_cache__dita__x3A__svg:resolution.coordinate.index(),system_cache__dita__x3A__svg:resolution.coordinate.preceding-sibling.fid())}" select="ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[1]/preceding-sibling::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements][1]/*[1]/@fid"/>
+            <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.x(),system_cache__dita__x3A__svg:resolution.coordinate.index(),system_cache__dita__x3A__svg:resolution.coordinate.following-sibling.fid())}" select="ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[1]/following-sibling::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements][1]/*[1]/@fid"/>
             <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.x(),system_cache__dita__x3A__svg:resolution.coordinate.index(),system_cache__dita__x3A__svg:resolution.coordinate.self.fid())}" select="ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[1]/*[1]/@fid"/>
             
         <xsl:apply-templates mode="#current" select="@*"/>
-            <xsl:apply-templates mode="system_cache__dita__x3A__svg:resolution.related.following-sibling" select="ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[1]/following-sibling::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[1]/relation_DateRangeElements">
+            <xsl:apply-templates mode="system_cache__dita__x3A__svg:resolution.related.following-sibling" select="ancestor-or-self::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[1]/following-sibling::BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements][1]/relation_DateRangeElements">
                 <xsl:with-param name="system_cache__dita__x3A__svg:resolution__x3A__markup.preceding-silbing" select="."/>
             </xsl:apply-templates><!-- to associate silbing @leadingTimeDate-To/From and Mark it -->
         </xsl:copy>
@@ -353,12 +331,15 @@
         </xsl:copy>
     </xsl:template>
     
-    <xsl:template mode="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X" match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements[@*[name()='leadingTimeDate-From' and string-length(.) &gt;0 ]  and @*[name()='leadingTimeDate-To' and string-length(.) &gt;0   ] ]]">
+    <xsl:template mode="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X" match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[relation_DateRangeElements[@*[name()='leadingTimeDate-From' and not(.='') ]  and @*[name()='leadingTimeDate-To'  ] ]]">
         <xsl:apply-templates mode="#current"/>
         
     </xsl:template>
     
-    <xsl:template mode="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X" match="relation_DateRangeElements[@*[name()='leadingTimeDate-From' and not(.='') ]  and @*[name()='leadingTimeDate-To' and not(.='')   ] ]">
+    <xsl:template mode="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X" match="relation_DateRangeElements[@*[name()='leadingTimeDate-From' and not(.='') ]  and @*[name()='leadingTimeDate-To'    ] ]">
+        <xsl:param name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max" tunnel="yes"/>
+        <xsl:param name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max.label" tunnel="yes"/>
+        
         <xsl:copy>
             <xsl:copy-of select="parent::*/@fid"/>
             <xsl:attribute name="leadingTimeDate-From.test" select="system_cache__dita:year-timestamp-day(relation_DateRangeElements/@leadingTimeDate-From)"/>
@@ -373,10 +354,25 @@
         <xsl:copy>
             <xsl:copy-of select="parent::*/@fid"/>
             <xsl:copy-of select="@leadingTimeDate-To"/>
-            <!--<xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.x(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.id')}" select="@fid"/>-->
-            <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.x(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.value')}" select="system_cache__dita:year-timestamp-day(@leadingTimeDate-To)"/>
-            <!--<xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.y(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.count')}" select="count(current-group())"/>-->
-            <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.y(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.label')}" select="system_cache__dita:year-quarter(@leadingTimeDate-To)"/>
+            <xsl:choose>
+                <xsl:when test="not(@leadingTimeDate-To[.=''])">
+                    <!--<xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.x(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.id')}" select="@fid"/>-->
+                    <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.x(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.value')}" select="system_cache__dita:year-timestamp-day(@leadingTimeDate-To)"/>
+                    <!--<xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.y(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.count')}" select="count(current-group())"/>-->
+                    <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.y(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.label')}" select="system_cache__dita:year-quarter(@leadingTimeDate-To)"/>
+                    <xsl:attribute name="debug.TimeTo">#300</xsl:attribute>
+                </xsl:when>
+                <xsl:when test="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max">
+                    <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.x(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.value')}" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max"/>
+                    <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.y(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.label')}" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max.label"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <!--<xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.x(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.value')}" select="system_cache__dita:year-timestamp-day('1970-01-01')"/>-->
+                    <!--<xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.y(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.label')}" select="system_cache__dita:year-quarter('1970-01-01')"/>-->
+                    <xsl:attribute name="leadingTimeDate-To__x3A__error">#405 should be template called again to fix</xsl:attribute>
+                </xsl:otherwise>
+            </xsl:choose>
+           
             <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.y(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.data.name')}" select="'leadingTimeYear-month.bounds.X'"/>
         </xsl:copy>
         
@@ -436,5 +432,26 @@
     </xsl:template>
     
     <xsl:template mode="system_cache__dita__x3A__svg:data__x3A__assign" match="text()|comment()"/>
+    
+    <xsl:template mode="system_cache__dita__x3A__svg:data__x3A__assign__x3A__sort" match="text()|comment()">
+        <xsl:copy-of select="."/>
+    </xsl:template>
+    
+    <xsl:template mode="system_cache__dita__x3A__svg:data__x3A__assign__x3A__sort" match="system_cache__dita__x3A__svg:data.current-group">
+        <xsl:copy>
+            <xsl:copy-of select="@*"/>
+            <xsl:apply-templates mode="#current">
+                <xsl:sort select="count(following-sibling::system_cache__dita__x3A__svg:leadingTimeDate)" data-type="number" order="ascending"/>
+            </xsl:apply-templates>
+        </xsl:copy>
+    </xsl:template>
+    
+    
+    <xsl:template mode="system_cache__dita__x3A__svg:data__x3A__assign__x3A__sort" match="*">
+        <xsl:copy>
+            <xsl:copy-of select="@*"/>
+            <xsl:apply-templates mode="#current"/>
+        </xsl:copy>
+    </xsl:template>
   
 </xsl:stylesheet>

+ 24 - 2
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.utils.translate.xsl

@@ -882,7 +882,7 @@
             
             <xsl:variable name="system_cache__dita__x3A__svg:line__x3A__style">
             <xsl:apply-templates mode="system_cache__dita__x3A__svg:line__x3A__style" select="$system_cache__dita__x3A__svg:resolution.coordinate__x3A__calculations">
-                <xsl:with-param name="stroke__x3A__initial" select="0.5"/>
+                <xsl:with-param name="stroke__x3A__initial" select="3"/>
             </xsl:apply-templates>
             </xsl:variable>
             <xsl:copy-of select="$system_cache__dita__x3A__svg:line__x3A__style//@style"></xsl:copy-of>
@@ -895,9 +895,11 @@
     <xsl:template mode="system_cache__dita__x3A__svg:line__x3A__style" match="*|text()|comment()"/>
     <xsl:template mode="system_cache__dita__x3A__svg:line__x3A__style" match="system_cache__dita__x3A__svg:resolution.coordinate__x3A__calculations">
         <xsl:param name="stroke__x3A__initial"/>
+        <xsl:param name="vector-effect__x3A__non-scaling-stroke" select="true()"/>
+        <xsl:param name="stroke-color" select="'green'"/>
         <system_cache__dita__x3A__svg:line__x3A__style>
         <xsl:attribute name="style">
-            <xsl:text>stroke: green; vector-effect:non-scaling-stroke ; stroke-width:</xsl:text>5<!--<xsl:value-of select="@system_cache__dita__x3A__svg:resolution.coordinate__x3A__calculations.y.to.x.ratio div @xScale  + @system_cache__dita__x3A__svg:resolution.coordinate__x3A__calculations.y.scale.ratio * @xScale"/>--><!--  + @yScale * @system_cache__dita__x3A__svg:resolution.coordinate__x3A__calculations.x.scale.ratio<xsl:value-of select="@yScale * @system_cache__dita__x3A__svg:resolution.coordinate__x3A__calculations.y.scale.ratio"/>--><xsl:text>;</xsl:text>
+            <xsl:text>stroke: </xsl:text><xsl:value-of select="$stroke-color"/><xsl:text>; vector-effect:</xsl:text><xsl:if test="$vector-effect__x3A__non-scaling-stroke">non-scaling-stroke</xsl:if><xsl:text>; stroke-width:</xsl:text><xsl:value-of select="$stroke__x3A__initial"/><!--<xsl:value-of select="@system_cache__dita__x3A__svg:resolution.coordinate__x3A__calculations.y.to.x.ratio div @xScale  + @system_cache__dita__x3A__svg:resolution.coordinate__x3A__calculations.y.scale.ratio * @xScale"/>--><!--  + @yScale * @system_cache__dita__x3A__svg:resolution.coordinate__x3A__calculations.x.scale.ratio<xsl:value-of select="@yScale * @system_cache__dita__x3A__svg:resolution.coordinate__x3A__calculations.y.scale.ratio"/>--><xsl:text>;</xsl:text>
         </xsl:attribute>
         </system_cache__dita__x3A__svg:line__x3A__style>
     </xsl:template>
@@ -961,6 +963,8 @@
         </system_cache__dita__x3A__svg:resolution.coordinate__x3A__calculations>
     </xsl:template>
     
+    <!-- before -->
+    
     <xsl:template mode="system_cache__dita__x3A__svg:line" match="system_cache__dita__x3A__svg:transform.translate__x3A__extract__coords[following-sibling::system_cache__dita__x3A__svg:transform.translate__x3A__extract__coords and parent::*/@system_cache__dita__x3A__svg:transform.translate.sibling__x3A__range__x3A__associate.before]">
         <xsl:apply-templates mode="system_cache__dita__x3A__svg:line__x3A__range__x3A__associate.after" select="@*">
             <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.index" select="system_cache__dita__x3A__svg:resolution.coordinate.index.2()"/>
@@ -973,6 +977,7 @@
         </xsl:apply-templates>
     </xsl:template>
     
+    <!-- include -->
     
     <xsl:template mode="system_cache__dita__x3A__svg:line" match="system_cache__dita__x3A__svg:transform.translate__x3A__extract__coords[following-sibling::system_cache__dita__x3A__svg:transform.translate__x3A__extract__coords and parent::*/@system_cache__dita__x3A__svg:transform.translate.sibling__x3A__range__x3A__associate.include]">
         <xsl:apply-templates mode="system_cache__dita__x3A__svg:line__x3A__range__x3A__associate.after" select="@*">
@@ -987,6 +992,23 @@
         </xsl:apply-templates>
     </xsl:template>
     
+    <!-- after -->    
+    
+    <xsl:template mode="system_cache__dita__x3A__svg:line" match="system_cache__dita__x3A__svg:transform.translate__x3A__extract__coords[following-sibling::system_cache__dita__x3A__svg:transform.translate__x3A__extract__coords and parent::*/@system_cache__dita__x3A__svg:transform.translate.sibling__x3A__range__x3A__associate.after]">
+        <xsl:apply-templates mode="system_cache__dita__x3A__svg:line__x3A__range__x3A__associate.before" select="@*">
+            <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.index" select="system_cache__dita__x3A__svg:resolution.coordinate.index.2()"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template mode="system_cache__dita__x3A__svg:line" match="system_cache__dita__x3A__svg:transform.translate__x3A__extract__coords[preceding-sibling::system_cache__dita__x3A__svg:transform.translate__x3A__extract__coords and parent::*/@system_cache__dita__x3A__svg:transform.translate.sibling__x3A__range__x3A__associate.after]">
+        <xsl:copy-of select="parent::*/@system_cache__dita__x3A__svg:transform.translate.sibling__x3A__range__x3A__associate.include"/>
+        <xsl:apply-templates mode="system_cache__dita__x3A__svg:line__x3A__range__x3A__associate.after" select="@*">
+            <xsl:with-param name="system_cache__dita__x3A__svg:resolution.coordinate.index" select="system_cache__dita__x3A__svg:resolution.coordinate.index.1()"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    
+    
     <xsl:template mode="system_cache__dita__x3A__svg:line" match="system_cache__dita__x3A__svg:transform.translate__x3A__extract__style[following-sibling::system_cache__dita__x3A__svg:transform.translate__x3A__extract__style]">
         <!--<xsl:apply-templates mode="#current" select="@*"/>-->
     </xsl:template>

+ 45 - 0
se.oxygen.xpr

@@ -2000,6 +2000,51 @@
                     <entry>
                         <String>scenario.associations</String>
                         <scenarioAssociation-array>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>SE/schema/WPS_Functions/default_db/recurse_ant/out/2019-10-18-00_46_194f3b2a.out_task.dita.final_with_RelatedFeatureLoop.xml</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/default_db/recurse_ant/out/2019-10-17-22_39_07ab223e.out_task.dita.final_with_RelatedFeatureLoop.xml</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/default_db/recurse_ant/out/2019-10-17-10_38_39aba482.out_task.dita.final_with_RelatedFeatureLoop.xml</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-1415_000001/BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI.77545____APU4_umowy.dita</String>

Некоторые файлы не были показаны из-за большого количества измененных файлов