a

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

@@ -91,7 +91,8 @@
                       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>
+                    <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>
@@ -109,13 +110,93 @@
           </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>
+        
+      </RelatedFeature>
       <p><b>Tytuł umowy: <ph/><ph xpath="K_ZAWARTOS"/></b></p>
       
       
       <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">

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

@@ -60,7 +60,8 @@
                   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>
+                <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>