a

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

@@ -1,6 +1,6 @@
 <?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:ogc="http://www.opengis.net/ogc"
   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" -->
@@ -46,38 +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>-->
@@ -109,6 +78,41 @@
         </stentry>
       </strow>
     </simpletable>
+    <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>
+      
+      
+      <!--<p>
+        
+      
+        <dl>
+          <dlhead>
+            <dthd>Sprawa</dthd>
+            <ddhd></ddhd>
+          </dlhead>
+          <dlentry>
+            <dt>Numer</dt>
+            <dd ></dd>
+          </dlentry>
+          <dlentry>
+            <dt>Opis</dt>
+            <dd ></dd>
+          </dlentry>
+        </dl>
+      
+      </p>-->
+    </RelatedFeature>
+      
+      
     
     <p><b>Tytuł umowy: <ph/><ph xpath="K_ZAWARTOS"/></b></p>
   
@@ -116,7 +120,74 @@
     <p>Tresc: </p>
     <bodydiv xpath="K_ZAWARTOSC_HTML" format="enter_to_ph"/>
     
-    
+    <dl>
+      <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID_PROJECT" typeName="p5_default_db:PROBLEMS" typeNameRealResource="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
+                <simpleTypeMakeOgcFilter name="PROBLEMS">
+                  <ogc:Or>
+                    <ogc:PropertyIsEqualTo>
+                      <ogc:PropertyName>A_STATUS</ogc:PropertyName>
+                      <ogc:Literal>WAITING</ogc:Literal>
+                    </ogc:PropertyIsEqualTo>
+                  </ogc:Or>
+                </simpleTypeMakeOgcFilter>
+                <dlentry>
+                  
+                  <dt>Zadanie otwarte </dt>
+                  <dd>Nr <b xpath="ID"/></dd>
+                  <dd>
+                    
+                    <ph xpath="A_PROBLEM_INFO"/>
+                    <ph xpath="A_PROBLEM_DESC_HTML"/>
+                    <ph xpath="L_APPOITMENT_INFO"/>
+                  </dd>
+                 
+                </dlentry>
+              </RelatedFeature>
+      <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID_PROJECT" typeName="p5_default_db:PROBLEMS" typeNameRealResource="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
+                <simpleTypeMakeOgcFilter name="PROBLEMS">
+                  <ogc:Or>
+                    <ogc:PropertyIsEqualTo>
+                      <ogc:PropertyName>A_STATUS</ogc:PropertyName>
+                      <ogc:Literal>NORMAL</ogc:Literal>
+                    </ogc:PropertyIsEqualTo>
+                  </ogc:Or>
+                </simpleTypeMakeOgcFilter>
+                <dlentry>
+                  
+                  <dt>Zadanie w toku </dt>
+                  <dd>Nr <b xpath="ID"/></dd>
+                  <dd>
+                    
+                    <ph xpath="A_PROBLEM_INFO"/>
+                    <ph xpath="A_PROBLEM_DESC_HTML"/>
+                    <ph xpath="L_APPOITMENT_INFO"/>
+                  </dd>
+                  
+                </dlentry>
+              </RelatedFeature>
+      <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID_PROJECT" typeName="p5_default_db:PROBLEMS" typeNameRealResource="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
+                <simpleTypeMakeOgcFilter name="PROBLEMS">
+                  <ogc:Or>
+                    <ogc:PropertyIsEqualTo>
+                      <ogc:PropertyName>A_STATUS</ogc:PropertyName>
+                      <ogc:Literal>OFF_HARD</ogc:Literal>
+                    </ogc:PropertyIsEqualTo>
+                  </ogc:Or>
+                </simpleTypeMakeOgcFilter>
+                <dlentry>
+                  
+                  <dt>Zadanie zakończone </dt>
+                  <dd>Nr <b xpath="ID"/></dd>
+                  <dd>
+                    
+                    <ph xpath="A_PROBLEM_INFO"/>
+                    <ph xpath="A_PROBLEM_DESC_HTML"/>
+                    <ph xpath="L_APPOITMENT_INFO"/>
+                  </dd>
+                  
+                </dlentry>
+              </RelatedFeature>
+    </dl>
     <p> Miejsca na podpisy<simpletable frame="all" relcolwidth="1.0* 1.0*"
       id="simpletable_ejm_j2r_cz">
       <strow>