a.binder 6 lat temu
rodzic
commit
24d8fc7dd1

+ 136 - 79
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/umowa/IN7_DZIENNIK_KORESP.dita

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RelatedFeature xpath="ID"  typeName="p5_default_db:IN7_DZIENNIK_KORESP" typeNameRealResource="p5_default_db:IN7_DZIENNIK_KORESP"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:noNamespaceSchemaLocation="../../../default_db_xml_cache.public/topicProcesy5.xsd">
+  
+  doctype-public="-//OASIS//DTD DITA Topic//EN"
+  doctype-system="topic.dtd"
+  ><!--xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../default_db_xml_cache.public/topicProcesy5.xsd" -->
   <!-- Sample template to use with Procesy5 model-driven engine with Concurrent and Parallel processing   -->
   <!-- for more information see http://procesy5.pl/procesy5-wfs-api-doc/ or http://procesy5.pl/procesy5-wfs-api-doc/data_read_ant_example_with_filter.html  -->
   <!-- to be used inside Procesy5 system or separatelly in ant environment  together with following scripts:
@@ -12,83 +14,138 @@
   
   <!-- oznacza to refa z w $var=ID_BILLING_OWNER jest FeatureID=BILLING_OWNER.$var do sciagniecia z p5_default_db:BILLING_OWNER -->
   
-<topic id="untitled4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:topic.xsd">
-  <title><ph>Umowa nr </ph><ph xpath="ID_PROJECT"/><ph>-</ph><ph xpath="ID"/>
-    <ph>z dnia</ph>
-    <ph xpath="K_DATA_OTRZYMANEJ_KORESP"/></title>
-  <body>
-    <simpletable id="simpletable_uym_ps1_zy">
-      <strow>
-        <stentry>
-          <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>Zleceniodawca:</p><ph/>
-            <p xpath="name1"/><ph/>
-            <p xpath="name2"/><ph/>
-            <p><ph xpath="kod"/><ph> </ph><ph xpath="miasto"/><ph> ul.</ph><ph xpath="ulica"/><ph> </ph><ph xpath="numer_dom"/></p>
-            <p><ph>nip:</ph><ph xpath="nip"/><ph> regon:</ph><ph xpath="regon"/></p>
-            <p><ph>email:</ph><ph xpath="BILLING_OWNER_EMAIL"/> <ph> tel:</ph><ph xpath="tel"/> </p>
-            <p><ph>nr r-ku:</ph><ph xpath="nr_rach"/></p>
-            
-        </RelatedFeature></stentry>
-        <stentry>
-          <p>Zleceniobiorca:</p><ph/>
-          <p xpath="K_OD_KOGO"/><ph/>
-          <p xpath="OD_KOGO_ADRES"/><ph/>
-         
-          
-          <RelatedFeature xpath="ID" xpath_value="../ID_BILLING_USERS" typeName="p5_default_db:COMPANIES" typeNameRealResource="p5_default_db:COMPANIES">
-            
+  <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>Umowa nr </ph><ph xpath="ID_PROJECT"/><ph>-</ph><ph xpath="ID"/>
+      <ph>z dnia</ph>
+      <ph xpath="K_DATA_OTRZYMANEJ_KORESP"/></title>
+    <body>
+      <simpletable id="simpletable_uym_ps1_zy">
+        <strow>
+          <stentry>
+            <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>Zleceniodawca:</p><ph/>
+              <p xpath="name1"/><ph/>
+              <p xpath="name2"/><ph/>
+              <p><ph xpath="kod"/><ph> </ph><ph xpath="miasto"/><ph> ul.</ph><ph xpath="ulica"/><ph> </ph><ph xpath="numer_dom"/></p>
+              <p><ph>nip:</ph><ph xpath="nip"/><ph> regon:</ph><ph xpath="regon"/></p>
+              <p><ph>email:</ph><ph xpath="BILLING_OWNER_EMAIL"/> <ph> tel:</ph><ph xpath="tel"/> </p>
+              <p><ph>nr r-ku:</ph><ph xpath="nr_rach"/></p>
+              <svg-container xpath="BILLING_OWNER_LOGO_SVG" format="system_cache__appinfo:escaped_html_to_xml" />
+              
+              
+            </RelatedFeature></stentry>
+          <stentry>
+            <p>Zleceniobiorca:</p><ph/>
+            <p id="K_OD_KOGO" xpath="K_OD_KOGO"/><ph/>
+            <p id="OD_KOGO_ADRES" xpath="OD_KOGO_ADRES"/><ph/>
             
-            <p xpath="P_NAME"/><ph/>
-            <p xpath="P_NAME_SECOND"/><ph/>
-            <p>nip: <ph xpath="P_NIP"/><ph> </ph> krs:<ph xpath="P_KRS_NUMER"/><ph> pesel:</ph><ph xpath="P_PESEL"/><ph> </ph></p>
-            <p><ph xpath="P_ADDRESS_POST_CODE"/><ph> </ph><ph xpath="P_ADDRESS_POST_CITY"/><ph> ul.</ph><ph xpath="P_ADDRESS_STREET"/><ph> </ph><ph xpath="P_ADDRESS_HOUSE"/><ph> </ph><ph xpath="P_ADDRESS_HOME"/></p>
-            <p>Adres koresp. <ph xpath="P_ADRESS_KORESP_1282"/></p>
-            <p><ph>email:</ph><ph xpath="user_mail_contact"/> <ph> tel:</ph><ph xpath="P_PHONE"/> </p>
             
-            
-          </RelatedFeature>
-        </stentry>
-      </strow>
-    </simpletable>
-    
-    <p><b>Tytuł umowy: <ph/><ph xpath="K_ZAWARTOS"/></b></p>
-  
- 
-    <p>Tresc: </p>
-    <bodydiv xpath="K_ZAWARTOSC_HTML" format="enter_to_ph"/>
-    
-    
-    <p> Miejsca na podpisy<simpletable frame="all" relcolwidth="1.0* 1.0*"
-      id="simpletable_ejm_j2r_cz">
-      <strow>
-        <stentry>Zleceniodawca:</stentry> 
-        <stentry>Zleceniobiorca:</stentry>
-      </strow>
-      <strow>
-        <stentry>
-          <codeblock>
-|            
-|            
-|            
-|                       
-          </codeblock>
-        </stentry>
-        <stentry>
-          <codeblock>
-|            
-|            
-|            
-|                       
-          </codeblock>
-        </stentry>
-      </strow>
-    </simpletable>
-    </p>
-    <p/>
-    <p/>
-    <p><sup>wygenerowano przez procesy5.pl</sup></p>
-  </body>
-</topic>
+            <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">
+                  <ph xpath="P_NAME"/> <ph> </ph>
+                  <ph xpath="P_NAME_SECOND"/> <ph> </ph>
+                  <!--<dl>
+                <dlentry>
+                  <dt>nip:</dt>
+                  <dd xpath="P_NIP"/>
+                </dlentry>
+                <dlentry>
+                  <dt>krs:</dt>
+                  <dd xpath="P_KRS_NUMER"/>
+                </dlentry>
+                <dlentry>
+                  <dt>pesel:</dt>
+                  <dd xpath="P_PESEL"/>
+                </dlentry>
+                <dlentry>
+                  <dt>adres:</dt>
+                  <dd xpath="P_ADDRESS_POST_CODE"/>
+                  <dd xpath="P_ADDRESS_STREET"/>
+                  <dd xpath="P_ADDRESS_HOUSE"/>
+                  <dd xpath="P_ADDRESS_POST_CODE"/>
+                  <dd xpath="P_ADDRESS_HOME"/>
+                </dlentry>
+                <dlentry>
+                  <dt>Adres koresp:</dt>
+                  <dd xpath="P_ADRESS_KORESP_1282"/>
+                 
+                </dlentry>
+                <dlentry>
+                  <dt>kontakt:</dt>
+                  <dd xpath="user_mail_contact"/>
+                  <dd xpath="P_PHONE"/>
+                </dlentry>
+              </dl>-->
+                  <!--<p><ph xpath="P_ADDRESS_POST_CODE"/><ph> </ph><ph xpath="P_ADDRESS_POST_CITY"/><ph> ul.</ph><ph xpath="P_ADDRESS_STREET"/><ph> </ph><ph xpath="P_ADDRESS_HOUSE"/><ph> </ph><ph xpath="P_ADDRESS_HOME"/></p>-->
+                  <!--<p>Adres koresp. <ph xpath="P_ADRESS_KORESP_1282"/></p>-->
+                  <!--<p><ph>email:</ph><ph xpath="user_mail_contact"/> <ph> tel:</ph><ph xpath="P_PHONE"/> </p>-->
+                  <div>
+                    <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><ph xpath="P_ADDRESS_POST_CODE"/><ph> </ph><ph xpath="P_ADDRESS_POST_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 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><ph>email:</ph><ph xpath="user_mail_contact"/> <ph> tel:</ph><ph xpath="P_PHONE"/> </p>
+                  </div>
+                  
+                </p>
+                
+                <p conref="#IN7_DZIENNIK_KORESP/OD_KOGO_ADRES" conaction="pushreplace"/>
+                
+              </foreign>
+              
+              
+              
+              
+              
+              
+            </RelatedFeature>
+          </stentry>
+        </strow>
+      </simpletable>
+      
+      <p><b>Tytuł umowy: <ph/><ph xpath="K_ZAWARTOS"/></b></p>
+      
+      
+      <p>Tresc: </p>
+      <bodydiv xpath="K_ZAWARTOSC_HTML" format="enter_to_ph"/>
+      
+      
+      <p> Miejsca na podpisy<simpletable frame="all" relcolwidth="1.0* 1.0*"
+        id="simpletable_ejm_j2r_cz">
+        <strow>
+          <stentry>Zleceniodawca:</stentry> 
+          <stentry>Zleceniobiorca:</stentry>
+        </strow>
+        <strow>
+          <stentry>
+            <codeblock>
+              |            
+              |            
+              |            
+              |                       
+            </codeblock>
+          </stentry>
+          <stentry>
+            <codeblock>
+              |            
+              |            
+              |            
+              |                       
+            </codeblock>
+          </stentry>
+        </strow>
+      </simpletable>
+      </p>
+      <p/>
+      <p/>
+      <p><sup>wygenerowano przez procesy5.pl</sup></p>
+    </body>
+  </topic>
 </RelatedFeature>

+ 8 - 8
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/umowa_zleceniobiorca/IN7_DZIENNIK_KORESP.dita

@@ -14,7 +14,7 @@
   
   <!-- oznacza to refa z w $var=ID_BILLING_OWNER jest FeatureID=BILLING_OWNER.$var do sciagniecia z p5_default_db:BILLING_OWNER -->
   
-<topic id="umowa_zleceniobiorca" 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>Umowa nr </ph><ph xpath="ID_PROJECT"/><ph>-</ph><ph xpath="ID"/>
     <ph>z dnia</ph>
@@ -24,7 +24,7 @@
       <strow>
         <stentry>
           <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>Zleceniodawca:</p><ph/>
+            <p>Zleceniobiorca:</p><ph/>
             <p xpath="name1"/><ph/>
             <p xpath="name2"/><ph/>
             <p><ph xpath="kod"/><ph> </ph><ph xpath="miasto"/><ph> ul.</ph><ph xpath="ulica"/><ph> </ph><ph xpath="numer_dom"/></p>
@@ -36,14 +36,14 @@
             
         </RelatedFeature></stentry>
         <stentry>
-          <p>Zleceniobiorca:</p><ph/>
+          <p>Zleceniodawca:</p><ph/>
           <p id="K_OD_KOGO" xpath="K_OD_KOGO"/><ph/>
           <p id="OD_KOGO_ADRES" xpath="OD_KOGO_ADRES"/><ph/>
          
           
           <RelatedFeature xpath="ID" xpath_value="../ID_BILLING_USERS" typeName="p5_default_db:COMPANIES" typeNameRealResource="p5_default_db:COMPANIES">
             <foreign>
-            <p conref="#umowa_zleceniobiorca/K_OD_KOGO" conaction="pushreplace">
+              <p conref="#IN7_DZIENNIK_KORESP/K_OD_KOGO" conaction="pushreplace">
               <ph xpath="P_NAME"/> <ph> </ph>
               <ph xpath="P_NAME_SECOND"/> <ph> </ph>
               <!--<dl>
@@ -90,13 +90,13 @@
                   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="#umowa_zleceniobiorca/P_ADRESS_KORESP_1282" xpath.match.regex.conaction="pushreplace" xpath.match.regex.text="brak adresu"/>-->
+                <!--<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><ph>email:</ph><ph xpath="user_mail_contact"/> <ph> tel:</ph><ph xpath="P_PHONE"/> </p>
               </div>
               
             </p>
               
-              <p conref="#umowa_zleceniobiorca/OD_KOGO_ADRES" conaction="pushreplace"/>
+              <p conref="#IN7_DZIENNIK_KORESP/OD_KOGO_ADRES" conaction="pushreplace"/>
               
             </foreign>
             
@@ -120,8 +120,8 @@
     <p> Miejsca na podpisy<simpletable frame="all" relcolwidth="1.0* 1.0*"
       id="simpletable_ejm_j2r_cz">
       <strow>
-        <stentry>Zleceniodawca:</stentry> 
-        <stentry>Zleceniobiorca:</stentry>
+        <stentry>Zleceniobiorca:</stentry> 
+        <stentry>Zleceniodawca:</stentry>
       </strow>
       <strow>
         <stentry>