Переглянути джерело

Merge branch 'master' of bn.git:plabudda/se

Piotr Labudda 8 роки тому
батько
коміт
40933a1275

+ 23 - 3
SE/schema/ant-object/default_db.BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY.xsd

@@ -19,7 +19,8 @@
    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_MSIG_address="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG_address.xsd"
    xmlns:default_db__x3A__BI_audit_MSIG_company="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG_company.xsd"
-   xmlns:default_db__x3A__BI_audit_MSIG_person="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG_person.xsd">
+   xmlns:default_db__x3A__BI_audit_MSIG_person="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_MSIG_person.xsd"
+   xmlns:default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object.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"/>
@@ -60,6 +61,9 @@
       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"
       schemaLocation="../../default_db.BI_audit_MSIG_person/BI_audit_MSIG_person/BI_audit_MSIG_person.xsd"/>
+   <xs:import
+      namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object.xsd"
+      schemaLocation="../../default_db.BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object.xsd"/>
    <xs:simpleType name="A_STATUS_Type" id="_PRACOWNICY___d4e4796-1_A_STATUS_T">
       <xs:restriction base="xs:string">
          <xs:enumeration value="NORMAL"/>
@@ -75,8 +79,14 @@
       <xs:annotation>
          <xs:appinfo>
             <system_cache__appinfo:heritage>
-               <system_cache__appinfo:exherit_all system_cache__appinfo:heritage_acl="true"
-                  system_cache__appinfo:heritage_sort="true"/>
+               <system_cache__appinfo:inherit system_cache__appinfo:inherit_ref="default_db:BI_audit_ENERGA_PRACOWNICY"
+                  system_cache__appinfo:heritage_acl="true">
+                  <system_cache__appinfo:acl_rule_inherit_to_all_same_name_elements_and_refs/>
+                  <acl_rule_inherit_to_all_refs_by_primary/>
+                  <acl_rule_inherit_to_all_refs_by_local_element system_cache__appinfo:acl_rule_inherit_local_element_name="A_STATUS"/>
+               </system_cache__appinfo:inherit>
+               <system_cache__appinfo:exherit_all 
+                  system_cache__appinfo:heritage_acl="true" system_cache__appinfo:heritage_sort="true"/>
             </system_cache__appinfo:heritage>
          </xs:appinfo>
       </xs:annotation>
@@ -220,6 +230,16 @@
             ref="default_db__x3A__BI_audit_MSIG_company:BI_audit_MSIG_company"/>
          <xs:element maxOccurs="unbounded" minOccurs="0"
             ref="default_db__x3A__BI_audit_MSIG_person:BI_audit_MSIG_person"/>
+         <xs:element
+            ref="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object">
+            <xs:annotation>
+               <xs:appinfo>
+                  <system_cache__appinfo:flat_relation_cache system_cache__appinfo:backref_evaluate="true">
+                     <system_cache__appinfo:source system_cache__appinfo:ref_engine="view"/>
+                  </system_cache__appinfo:flat_relation_cache>
+               </xs:appinfo>
+            </xs:annotation>
+         </xs:element>
       </xs:sequence>
       <xs:attribute id="_PRACOWNICY___d5e75973-1_label" name="label"/>
       <xs:assert id="_PRACOWNICY___d6e76324-1"

+ 9 - 1
SE/schema/ant-object/default_db.BI_audit_ENERGA_PRACOWNICY_adresy/BI_audit_ENERGA_PRACOWNICY_adresy/BI_audit_ENERGA_PRACOWNICY_adresy.xsd

@@ -49,7 +49,6 @@
       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"
       schemaLocation="../../default_db.BI_audit_MSIG_person/BI_audit_MSIG_person/BI_audit_MSIG_person.xsd"/>
-
    <!--<xs:simpleType name="A_STATUS_Type" id="NICY_adresy___d4e4846-1_A_STATUS_T">
       <xs:restriction base="xs:string">
          <xs:enumeration value="NORMAL"/>
@@ -62,6 +61,15 @@
       </xs:restriction>
    </xs:simpleType>-->
    <xs:complexType name="BI_audit_ENERGA_PRACOWNICY_adresy" id="NICY_adresy___d4e4855-1_BI_audit_E">
+      <xs:annotation>
+         <xs:appinfo>
+            <system_cache__appinfo:heritage>
+               <system_cache__appinfo:inherit  system_cache__appinfo:heritage_acl="true" system_cache__appinfo:inherit_ref="default_db__x3A__BI_audit_ENERGA_PRACOWNICY:BI_audit_ENERGA_PRACOWNICY">
+                  <system_cache__appinfo:acl_rule_inherit_to_all_elements_and_refs_by_primary/>
+               </system_cache__appinfo:inherit>
+            </system_cache__appinfo:heritage>
+         </xs:appinfo>
+      </xs:annotation>
       <xs:sequence id="NICY_adresy___d4e4856-1">
          <xs:element name="ID" type="xs:integer" id="NICY_adresy___d4e4881-1_ID"/>
          <!--<xs:element name="the_geom" type="gml:AbstractFeatureType"

+ 4 - 4
SE/schema/ant-object/default_db.BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd

@@ -146,13 +146,13 @@
          <xs:element maxOccurs="1" minOccurs="0" ref="default_db__x3A__TERYT_adresy:TERYT_adresy"/>
          <xs:element ref="default_db__x3A__BI_audit_ENERGA_RUM_UMOWY:BI_audit_ENERGA_RUM_UMOWY"
             id="KONTRAHENCI___d5ess5122-1" maxOccurs="unbounded" minOccurs="0">
-            <xs:annotation>
-               <!--<xs:appinfo>
+            <!--<xs:annotation>
+               <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache system_cache__appinfo:backref_evaluate="true">
                      <system_cache__appinfo:source system_cache__appinfo:ref_engine="view"/>
                   </system_cache__appinfo:flat_relation_cache>
-               </xs:appinfo>-->
-            </xs:annotation>
+               </xs:appinfo>
+            </xs:annotation>-->
          </xs:element>
          <xs:element ref="default_db__x3A__BI_audit_taxpayer:BI_audit_taxpayer" minOccurs="0"
             id="KONTRAHENCI___d5ess5taxp">

+ 2 - 2
SE/schema/ant-object/default_db.IN7_MK_BAZA_DYSTRYBUCJI/IN7_MK_BAZA_DYSTRYBUCJI/IN7_MK_BAZA_DYSTRYBUCJI.xsd

@@ -36,7 +36,7 @@
    <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="IN7_DZIENNIK_KORESP.xsd"/>
+              schemaLocation="../../default_db.IN7_DZIENNIK_KORESP/IN7_DZIENNIK_KORESP/IN7_DZIENNIK_KORESP.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/Rozdzielcza_Kabel_Swiatlowodowy_wsg84.xsd"
               schemaLocation="Rozdzielcza_Kabel_Swiatlowodowy_wsg84.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/SALES_PLAN.xsd"
@@ -60,7 +60,7 @@
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/CRM_LISTA_ZASOBOW_OFFERS.xsd"
               schemaLocation="CRM_LISTA_ZASOBOW_OFFERS.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/Rozdzielcza_rurociag_wsg84.xsd"
-              schemaLocation="Rozdzielcza_rurociag_wsg84.xsd"/>
+              schemaLocation="../../default_db.Rozdzielcza_rurociag_wsg84/Rozdzielcza_rurociag_wsg84/Rozdzielcza_rurociag_wsg84.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/Rozdzielcza_rura_oslonowa_magistralna.xsd"
               schemaLocation="Rozdzielcza_rura_oslonowa_magistralna.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BADANIA_W_TERENIE.xsd"

+ 4 - 4
SE/schema/ant-object/default_db.Rozdzielcza_rurociag_wsg84/Rozdzielcza_rurociag_wsg84/Rozdzielcza_rurociag_wsg84.xsd

@@ -9,10 +9,10 @@
            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/Rozdzielcza_rurociag_wsg84.xsd">
    <xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../Types/gml.xsd"/>
-   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/IN7_DZIENNIK_KORESP.xsd" schemaLocation="../table/IN7_DZIENNIK_KORESP.xsd"/>
-   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessGroup.xsd" schemaLocation="../SystemObjects/AccessGroup.xsd"/>
-   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessOwner.xsd" schemaLocation="../SystemObjects/AccessOwner.xsd"/>
-   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/CRM_LISTA_ZASOBOW.xsd" schemaLocation="../table/CRM_LISTA_ZASOBOW.xsd"/>
+   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/IN7_DZIENNIK_KORESP.xsd" schemaLocation="../../default_db.IN7_DZIENNIK_KORESP/IN7_DZIENNIK_KORESP/IN7_DZIENNIK_KORESP.xsd"/>
+   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessGroup.xsd" schemaLocation="../../../SystemObjects/AccessGroup.xsd"/>
+   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessOwner.xsd" schemaLocation="../../../SystemObjects/AccessOwner.xsd"/>
+   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/CRM_LISTA_ZASOBOW.xsd" schemaLocation="../../default_db.CRM_LISTA_ZASOBOW/CRM_LISTA_ZASOBOW/CRM_LISTA_ZASOBOW.xsd"/>
    <xsd:simpleType name="ID_KORESP" id="ociag_wsg84___d4e22855-1_ID_KORESP">
       <xsd:restriction base="xsd:int"/>
    </xsd:simpleType>

+ 4 - 4
SE/schema/ant-object/default_db.Rozdzielcza_rurociag_wsg84/Rozdzielcza_rurociag_wsg84_DRAFT/Rozdzielcza_rurociag_wsg84_DRAFT.xsd

@@ -9,10 +9,10 @@
            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/Rozdzielcza_rurociag_wsg84.xsd">
    <xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../Types/gml.xsd"/>
-   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/IN7_DZIENNIK_KORESP.xsd" schemaLocation="../table/IN7_DZIENNIK_KORESP.xsd"/>
-   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessGroup.xsd" schemaLocation="../SystemObjects/AccessGroup.xsd"/>
-   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessOwner.xsd" schemaLocation="../SystemObjects/AccessOwner.xsd"/>
-   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/CRM_LISTA_ZASOBOW.xsd" schemaLocation="../table/CRM_LISTA_ZASOBOW.xsd"/>
+   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/IN7_DZIENNIK_KORESP.xsd" schemaLocation="../../default_db.IN7_DZIENNIK_KORESP/IN7_DZIENNIK_KORESP/IN7_DZIENNIK_KORESP.xsd"/>
+   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessGroup.xsd" schemaLocation="../../../SystemObjects/AccessGroup.xsd"/>
+   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessOwner.xsd" schemaLocation="../../../SystemObjects/AccessOwner.xsd"/>
+   <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/CRM_LISTA_ZASOBOW.xsd" schemaLocation="../../default_db.CRM_LISTA_ZASOBOW/CRM_LISTA_ZASOBOW/CRM_LISTA_ZASOBOW.xsd"/>
    <xsd:simpleType name="ID_KORESP" id="ociag_wsg84___d4e22855-1_ID_KORESP">
       <xsd:restriction base="xsd:int"/>
    </xsd:simpleType>