Browse Source

refy + bocian reref do sprawdzenia przez bzyka

a.binder 8 years ago
parent
commit
733f223703

+ 6 - 1
SE/schema/ant-object/default_db.BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY.xsd

@@ -12,7 +12,8 @@
    xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
    xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
    targetNamespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_PRACOWNICY.xsd"
-   vc:minVersion="1.1">
+   vc:minVersion="1.1"
+   xmlns:default_db__x3A__BI_audit_CEIDG="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_CEIDG.xsd">
    <!--   <xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../Types/gml.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/IN7_DZIENNIK_KORESP.xsd"
       schemaLocation="../table/IN7_DZIENNIK_KORESP.xsd"/>
@@ -26,6 +27,8 @@
    <xs:import
       namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_PRACOWNICY_adresy.xsd"
       schemaLocation="../../default_db.BI_audit_ENERGA_PRACOWNICY_adresy/BI_audit_ENERGA_PRACOWNICY_adresy/BI_audit_ENERGA_PRACOWNICY_adresy.xsd"/>
+   <xs:import schemaLocation="../../default_db.BI_audit_CEIDG/BI_audit_CEIDG/BI_audit_CEIDG.xsd"
+      namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_CEIDG.xsd"/>
    <xs:simpleType name="A_STATUS_Type" id="_PRACOWNICY___d4e4796-1_A_STATUS_T">
       <xs:restriction base="xs:string">
          <xs:enumeration value="NORMAL"/>
@@ -159,6 +162,8 @@ Należy mieć na uwadze, że zjebie sie - TODO</xs:documentation>
                </xs:appinfo>
             </xs:annotation>-->
          </xs:element>
+         <xs:element maxOccurs="unbounded" minOccurs="0"
+            ref="default_db__x3A__BI_audit_CEIDG:BI_audit_CEIDG"/>
       </xs:sequence>
       <xs:attribute id="_PRACOWNICY___d5e75973-1_label" name="label"/>
       <xs:assert id="_PRACOWNICY___d6e76324-1"

+ 6 - 1
SE/schema/ant-object/default_db.BI_audit_KRS/BI_audit_KRS/BI_audit_KRS.xsd

@@ -11,7 +11,8 @@
    xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
    targetNamespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS.xsd"
    vc:minVersion="1.1"
-   xmlns:default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd">
+   xmlns:default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd"
+   xmlns:default_db__x3A__BI_audit_MSIG="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG.xsd">
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS_person.xsd"
       schemaLocation="../../default_db.BI_audit_KRS_person/BI_audit_KRS_person/BI_audit_KRS_person.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS_company.xsd"
@@ -25,6 +26,8 @@
    <xs:import
       schemaLocation="../../default_db.BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd"
       namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd"/>
+   <xs:import schemaLocation="../../default_db.BI_audit_MSIG/BI_audit_MSIG/BI_audit_MSIG.xsd"
+      namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG.xsd"/>
    <xs:complexType name="BI_audit_KRS" id="I_audit_KRS___d4e4493-1_BI_audit_K">
       <xs:annotation>
          <xs:documentation>Tabela z podmiotami z KRS</xs:documentation>
@@ -112,6 +115,8 @@
          </xs:element>
          <xs:element maxOccurs="unbounded" minOccurs="0"
             ref="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI:BI_audit_ENERGA_RUM_KONTRAHENCI"/>
+         <xs:element maxOccurs="unbounded" minOccurs="0"
+            ref="default_db__x3A__BI_audit_MSIG:BI_audit_MSIG"/>
       </xs:sequence>
       <xs:attribute ref="default_db__x3A__BI_audit_KRS:label" id="I_audit_KRS___d6e76972-1">
          <xs:annotation>

+ 7 - 1
SE/schema/ant-object/default_db.BI_audit_KRS_person/BI_audit_KRS_person/BI_audit_KRS_person.xsd

@@ -8,12 +8,16 @@
    targetNamespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS_person.xsd"
    vc:minVersion="1.1"
    xmlns:default_db__x3A__BI_audit_KRS="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS.xsd"
-   xmlns:default_db__x3A__BI_audit_ENERGA_PRACOWNICY="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_PRACOWNICY.xsd">
+   xmlns:default_db__x3A__BI_audit_ENERGA_PRACOWNICY="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_PRACOWNICY.xsd"
+   xmlns:default_db__x3A__BI_audit_MSIG_person="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG_person.xsd">
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS.xsd"
       schemaLocation="../../default_db.BI_audit_KRS/BI_audit_KRS/BI_audit_KRS.xsd"/>
    <xs:import
       schemaLocation="../../default_db.BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY.xsd"
       namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_PRACOWNICY.xsd"/>
+   <xs:import
+      schemaLocation="../../default_db.BI_audit_MSIG_person/BI_audit_MSIG_person/BI_audit_MSIG_person.xsd"
+      namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG_person.xsd"/>
    <xs:complexType name="BI_audit_KRS_person" id="_KRS_person___d4e4621-1_BI_audit_K">
       <xs:annotation>
          <xs:documentation>Do dowiazania do BI_audit_KRS</xs:documentation>
@@ -36,6 +40,8 @@
          </xs:element>
          <xs:element maxOccurs="unbounded" minOccurs="0"
             ref="default_db__x3A__BI_audit_ENERGA_PRACOWNICY:BI_audit_ENERGA_PRACOWNICY"/>
+         <xs:element maxOccurs="unbounded" minOccurs="0"
+            ref="default_db__x3A__BI_audit_MSIG_person:BI_audit_MSIG_person"/>
       </xs:sequence>
       <xs:attribute id="_KRS_person___d5e80455-1_label" name="label" type="xs:string"/>
       <xs:attribute ref="default_db__x3A__BI_audit_KRS:label"/>

+ 8 - 3
SE/schema/ant-object/default_db.BI_audit_MSIG/BI_audit_MSIG/BI_audit_MSIG.xsd

@@ -18,7 +18,8 @@
    xmlns:default_db__x3A__BI_audit_MSIG_PKD="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG_PKD.xsd"
    xmlns:default_db__x3A__BI_audit_taxpayer="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_taxpayer.xsd"
    vc:minVersion="1.1"
-   xmlns:default_db__x3A__BI_audit_KRS="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS.xsd">
+   xmlns:default_db__x3A__BI_audit_KRS="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS.xsd"
+   xmlns:default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd">
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG_company.xsd"
       schemaLocation="../../default_db.BI_audit_MSIG_company/BI_audit_MSIG_company/BI_audit_MSIG_company.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG_person.xsd"
@@ -33,6 +34,9 @@
       schemaLocation="../../default_db.BI_audit_taxpayer/BI_audit_taxpayer/BI_audit_taxpayer.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS.xsd"
       schemaLocation="../../default_db.BI_audit_KRS/BI_audit_KRS/BI_audit_KRS.xsd"/>
+   <xs:import
+      schemaLocation="../../default_db.BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd"
+      namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd"/>
    <xs:complexType name="BI_audit_MSIG" id="_audit_MSIG___d5e6015-1_BI_audit_M">
       <xs:sequence id="_audit_MSIG___d5e6016-1">
          <xs:element name="ID" type="xs:integer" id="_audit_MSIG___d5e6017-1_ID"/>
@@ -70,8 +74,7 @@
             <xs:annotation>
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
-                     <system_cache__appinfo:source system_cache__appinfo:name="nip" system_cache__appinfo:ref_engine="view" 
-                        system_cache__appinfo:xpath="default_db__x3A__BI_audit_taxpayer:BI_audit_taxpayer/nip"/>
+                     <system_cache__appinfo:source system_cache__appinfo:name="nip" system_cache__appinfo:ref_engine="view" system_cache__appinfo:xpath="default_db__x3A__BI_audit_taxpayer:BI_audit_taxpayer/nip"/>
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
                <!--<xs:documentation>Informacja o aktualnym płatniku VAT w tabeli referencyjnej (relacja
@@ -96,6 +99,8 @@
                <xs:documentation>Domyślne powiązanie dla podmiotów pomiędzy KRS a MSIG</xs:documentation>
             </xs:annotation>
          </xs:element>
+         <xs:element maxOccurs="unbounded" minOccurs="0"
+            ref="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI:BI_audit_ENERGA_RUM_KONTRAHENCI"/>
       </xs:sequence>
       <xs:attribute name="label" type="xs:string"/>
       <xs:assert test="@label = substring(nazwa, 1, 20)"/>

+ 18 - 1
SE/schema/ant-object/default_db.BI_audit_MSIG_address/BI_audit_MSIG_address/BI_audit_MSIG_address.xsd

@@ -12,7 +12,11 @@
    xmlns:default_db__x3A__BI_audit_MSIG_address="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG_address.xsd"
    targetNamespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG_address.xsd"
    vc:minVersion="1.1"
-   xmlns:default_db__x3A__BI_audit_KRS_address="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS_address.xsd">
+   xmlns:default_db__x3A__BI_audit_KRS_address="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS_address.xsd"
+   xmlns:default_db__x3A__BI_audit_MSIG="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG.xsd"
+   xmlns:default_db__x3A__BI_audit_ENERGA_PRACOWNICY_adresy="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_PRACOWNICY_adresy.xsd"
+   xmlns:default_db__x3A__BI_audit_CEIDG="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_CEIDG.xsd"
+   xmlns:default_db__x3A__BI_audit_CEIDG_powiazania="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_CEIDG_powiazania.xsd">
    <!--  <xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../Types/gml.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/IN7_DZIENNIK_KORESP.xsd"
       schemaLocation="../table/IN7_DZIENNIK_KORESP.xsd"/>
@@ -25,6 +29,13 @@
       schemaLocation="../SystemObjects/AccessOwner.xsd"/>-->
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS_address.xsd"
       schemaLocation="../../default_db.BI_audit_KRS_address/BI_audit_KRS_address/BI_audit_KRS_address.xsd"/>
+   <xs:import schemaLocation="../../default_db.BI_audit_MSIG/BI_audit_MSIG/BI_audit_MSIG.xsd"
+      namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG.xsd"/>
+   <xs:import
+      schemaLocation="../../default_db.BI_audit_ENERGA_PRACOWNICY_adresy/BI_audit_ENERGA_PRACOWNICY_adresy/BI_audit_ENERGA_PRACOWNICY_adresy.xsd"
+      namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_PRACOWNICY_adresy.xsd"/>
+   <xs:import schemaLocation="../../default_db.BI_audit_CEIDG/BI_audit_CEIDG/BI_audit_CEIDG.xsd"
+      namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_CEIDG.xsd"/>
    <xs:complexType name="BI_audit_MSIG_address">
       <xs:sequence>
          <xs:element name="ID" type="xs:integer"/>
@@ -50,6 +61,12 @@
          </xs:element>
          <xs:element maxOccurs="unbounded" minOccurs="0"
             ref="default_db__x3A__BI_audit_KRS_address:BI_audit_KRS_address"/>
+         <xs:element maxOccurs="unbounded" minOccurs="0"
+            ref="default_db__x3A__BI_audit_MSIG_address:BI_audit_MSIG_address"/>
+         <xs:element maxOccurs="unbounded" minOccurs="0"
+            ref="default_db__x3A__BI_audit_ENERGA_PRACOWNICY_adresy:BI_audit_ENERGA_PRACOWNICY_adresy"/>
+         <xs:element maxOccurs="unbounded" minOccurs="0"
+            ref="default_db__x3A__BI_audit_CEIDG:BI_audit_CEIDG"/>
       </xs:sequence>
       <xs:attribute name="label" type="xs:string"/>
       <xs:assert test="@label = substring(S_miejscowosc, 1, 20)"/>

+ 2 - 1
SE/schema/ant-object/default_db.BI_audit_MSIG_company/BI_audit_MSIG_company/BI_audit_MSIG_company.xsd

@@ -19,7 +19,8 @@
          <xs:element name="nazwa" type="xs:string" id="KRS_company___d4e4600-1_nazwa"/>
          <xs:element name="regon" type="xs:string" id="KRS_company___d4e4602-1_regon"/>
          <xs:element name="krs" type="xs:string" id="KRS_company___d4e4603-1_krs"/>
-         <xs:element ref="default_db__x3A__BI_audit_MSIG:BI_audit_MSIG">
+         <xs:element ref="default_db__x3A__BI_audit_MSIG:BI_audit_MSIG" maxOccurs="unbounded"
+            minOccurs="0">
             <xs:annotation>
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache system_cache__appinfo:backref_evaluate="true">

+ 11 - 2
SE/schema/ant-object/default_db.BI_audit_MSIG_person/BI_audit_MSIG_person/BI_audit_MSIG_person.xsd

@@ -7,11 +7,16 @@
    targetNamespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG_person.xsd"
    vc:minVersion="1.1"
    xmlns:default_db__x3A__BI_audit_MSIG="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG.xsd"
-   xmlns:default_db__x3A__BI_audit_KRS_person="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS_person.xsd">
+   xmlns:default_db__x3A__BI_audit_KRS_person="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS_person.xsd"
+   xmlns:default_db__x3A__BI_audit_CEIDG="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_CEIDG.xsd"
+   xmlns:default_db__x3A__BI_audit_ENERGA_PRACOWNICY="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_PRACOWNICY.xsd">
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG.xsd"
       schemaLocation="../../default_db.BI_audit_MSIG/BI_audit_MSIG/BI_audit_MSIG.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS_person.xsd"
       schemaLocation="../../default_db.BI_audit_KRS_person/BI_audit_KRS_person/BI_audit_KRS_person.xsd"/>
+   <xs:import schemaLocation="../../default_db.BI_audit_CEIDG/BI_audit_CEIDG/BI_audit_CEIDG.xsd"/>
+   <xs:import
+      schemaLocation="../../default_db.BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY.xsd"/>
    <xs:complexType name="BI_audit_MSIG_person" id="_MSIG_person___d4e4621-1_BI_audit_K">
       <xs:annotation>
          <xs:documentation>Do dowiazania do BI_audit_MSIG</xs:documentation>
@@ -21,7 +26,7 @@
          <xs:element name="nazwisko" type="xs:string" id="_MSIG_person___d4e4651-1_nazwisko"/>
          <xs:element name="imiona" type="xs:string" id="_MSIG_person___d4e4653-1_imiona"/>
          <xs:element name="pesel" type="xs:NMTOKEN" id="_MSIG_person___d4e4654-1_pesel"/>
-         <xs:element ref="default_db__x3A__BI_audit_MSIG:BI_audit_MSIG">
+         <xs:element ref="default_db__x3A__BI_audit_MSIG:BI_audit_MSIG" maxOccurs="unbounded">
             <xs:annotation>
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache system_cache__appinfo:backref_evaluate="true">
@@ -33,6 +38,10 @@
          <xs:element name="cached" id="_MSIG_person___d5e5635-1_cached" type="xs:int"> </xs:element>
          <xs:element maxOccurs="unbounded" minOccurs="0"
             ref="default_db__x3A__BI_audit_KRS_person:BI_audit_KRS_person"/>
+         <xs:element maxOccurs="unbounded" minOccurs="0"
+            ref="default_db__x3A__BI_audit_CEIDG:BI_audit_CEIDG"/>
+         <xs:element maxOccurs="unbounded" minOccurs="0"
+            ref="default_db__x3A__BI_audit_ENERGA_PRACOWNICY:BI_audit_ENERGA_PRACOWNICY"/>
       </xs:sequence>
       <xs:attribute name="label" type="xs:string"/>
       <xs:assert test="label = nazwisko"/>

+ 31 - 3
SE/se-lib/Route/UrlAction/BiAuditGenerate.php

@@ -1765,19 +1765,47 @@ SQL;
 		$RefExtraTables = [
 								'BI_audit_MSIG_person' => [
 										'refTablesTo' => [
-												'BI_audit_KRS_person',
+												'BI_audit_KRS_person','BI_audit_MSIG','BI_audit_CEIDG','BI_audit_ENERGA_PRACOWNICY',
 														 ],
 								],					
 								'BI_audit_MSIG' => [
 											'refTablesTo' => [
-												'BI_audit_KRS',
+												'BI_audit_KRS','BI_audit_ENERGA_RUM_KONTRAHENCI',
 											],
 								],
 								'BI_audit_MSIG_address' => [
 									'refTablesTo' => [
-										'BI_audit_KRS_address',
+										'BI_audit_KRS_address', 'BI_audit_CEIDG', 'BI_audit_ENERGA_PRACOWNICY_adresy','BI_audit_MSIG_address',
 										],
 								],	
+
+								'BI_audit_MSIG_person' => [
+									'refTablesTo' => [
+										'BI_audit_MSIG',
+										],
+								],	
+								'BI_audit_KRS_person' => [
+									'refTablesTo' => [
+										'BI_audit_KRS','BI_audit_ENERGA_PRACOWNICY','BI_audit_MSIG_person',
+										],
+								],	
+								'BI_audit_MSIG_company' => [
+									'refTablesTo' => [
+										'BI_audit_MSIG',
+										],
+								],	
+								'BI_audit_KRS' => [
+									'refTablesTo' => [
+										'BI_audit_MSIG', 'BI_audit_ENERGA_RUM_KONTRAHENCI',
+										],
+								],	
+								'BI_audit_CEIDG' => [
+									'refTablesTo' => [
+										'BI_audit_ENERGA_PRACOWNICY', 'BI_audit_ENERGA_RUM_KONTRAHENCI',
+										],
+								],	
+								
+								
 							];
 		
 		$sourceTables = ['BI_audit_ENERGA_PRACOWNICY'];