a.binder 6 år sedan
förälder
incheckning
b83cb40c24

+ 51 - 10
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pelnomocnictwo/IN7_DZIENNIK_KORESP.dita

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RelatedFeature xpath="ID"  typeName="p5_default_db:IN7_DZIENNIK_KORESP"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:noNamespaceSchemaLocation="../../../default_db_xml_cache.public/topicProcesy5.xsd">
+  xmlns:ogc="http://www.opengis.net/ogc"
+  doctype-public="-//OASIS//DTD DITA Topic//EN"
+  doctype-system="topic.dtd"
+  >
   <!-- 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:
@@ -9,7 +12,7 @@
        Documentation ref - TODO TO BE DOCUMENTED
     -->
   <!-- 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"
+  <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>Pełnomocnictwo nr </ph><ph xpath="ID_PROJECT"/><ph>-</ph><ph xpath="ID"/>
     <ph>z dnia</ph>
@@ -29,18 +32,56 @@
         </RelatedFeature></stentry>
         <stentry>
           <p>Odbiorca:</p><ph/>
-          <p xpath="K_OD_KOGO"/><ph/>
-          <p xpath="OD_KOGO_ADRES"/><ph/>
-          <p xpath="K_NR_OTRZYM_KORESP"/><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="#IN7_DZIENNIK_KORESP/K_OD_KOGO" conaction="pushreplace">
+                <ph xpath="P_NAME"/> <ph> </ph>
+                <ph xpath="P_NAME_SECOND"/> <ph> </ph>
+                
+                <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_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 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>
+                </div>
+                
+              </p>
+              
+              <p conref="#IN7_DZIENNIK_KORESP/OD_KOGO_ADRES" conaction="pushreplace"/>
+              
+            </foreign>
+            
+            
+            
+            
+            
+            
+          </RelatedFeature>
         </stentry>
       </strow>
     </simpletable>
     
-    <RelatedFeature xpath="ID" xpath_value="../ID_PROJECT" typeName="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI">
-        <p>
-          Nazwa Sprawy:
-        </p>
-      <bodydiv xpath="M_DIST_DESC" format="enter_to_ph"/>
+    <RelatedFeature xpath="ID" xpath_value="../ID_PROJECT" typeName="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI" typeNameRealResource="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI">
+      <simpletable relcolwidth="1.0* 5*">
+        <strow>
+          <stentry>Sprawa numer</stentry>
+          <stentry><ph xpath="P_ID"/><ph xpath.match.regex="[1-9]" xpath="P_ID">-</ph><ph xpath="ID"/></stentry>
+        </strow>
+        <strow>
+          <stentry>Opis</stentry>
+          <stentry><ph xpath="M_DIST_DESC"/></stentry>
+        </strow>
+      </simpletable>
+      
     </RelatedFeature>
     
     <p><b>Temat: <ph/><ph xpath="K_ZAWARTOS"/></b></p>

+ 1 - 38
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/umowa/IN7_DZIENNIK_KORESP.dita

@@ -46,41 +46,7 @@
                 <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_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>
@@ -103,9 +69,6 @@
               
               
               
-              
-              
-              
             </RelatedFeature>
           </stentry>
         </strow>