Просмотр исходного кода

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

Piotr Labudda 8 лет назад
Родитель
Сommit
1240c91689

+ 53 - 28
SE/schema/ant-object/default_db.BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.xsd

@@ -11,10 +11,7 @@
    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_RUM_KONTRAHENCI_POWIAZANIA.xsd"
    vc:maxVersion="1.1" vc:minVersion="1.0">
-   <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessGroup.xsd"
-      schemaLocation="../../../SystemObjects/AccessGroup.xsd"/>
-   <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessOwner.xsd"
-      schemaLocation="../../../SystemObjects/AccessOwner.xsd"/>
+   
    <xs:import
       namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_PRACOWNICY.xsd"
       schemaLocation="../../default_db.BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY.xsd"/>
@@ -27,7 +24,12 @@
    <xs:import
       namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row.xsd"
       schemaLocation="../../default_db.BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row.xsd"/>
-   <xs:simpleType name="A_STATUS_Type">
+
+<xs:import
+      namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_operational_raport_note.xsd"
+      schemaLocation="../../default_db.BI_audit_operational_raport_note/BI_audit_operational_raport_note.xsd"/>
+
+   <xs:simpleType name="A_STATUS_Type" id="_POWIAZANIA___d5e8186-1_A_STATUS_T">
       <xs:restriction base="xs:string">
          <xs:enumeration value="NORMAL"/>
          <xs:enumeration value="WAITING"/>
@@ -38,7 +40,7 @@
          <xs:enumeration value="OFF_HARD"/>
       </xs:restriction>
    </xs:simpleType>
-   <xs:simpleType name="FILE_STATUS_Type">
+   <xs:simpleType name="FILE_STATUS_Type" id="_POWIAZANIA___d5e8195-1_FILE_STATU">
       <xs:restriction base="xs:string">
          <xs:enumeration value="NONE"/>
          <xs:enumeration value="TO_GENERATE"/>
@@ -47,29 +49,33 @@
          <xs:enumeration value="ERROR"/>
       </xs:restriction>
    </xs:simpleType>
-   <xs:simpleType name="BI_analiza_reloadCache_Type">
+   <xs:simpleType name="BI_analiza_reloadCache_Type"
+                  id="_POWIAZANIA___d5e5126-1_BI_analiza">
       <xs:restriction base="xs:string">
          <xs:enumeration value="Full"/>
          <xs:enumeration value="Part"/>
          <xs:enumeration value="No"/>
       </xs:restriction>
    </xs:simpleType>
-   <xs:simpleType name="BI_analiza_onlyTargets">
+   <xs:simpleType name="BI_analiza_reloadCache_Type" id="_POWIAZANIA___d5e8202-1_BI_analiza">
       <xs:restriction base="xs:string">
          <xs:enumeration value="Y"/>
          <xs:enumeration value="N"/>
       </xs:restriction>
    </xs:simpleType>
-   <xs:complexType name="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA">
+   <xs:complexType name="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA"
+      id="_POWIAZANIA___d5e8206-1_BI_audit_E">
       <xs:annotation>
          <xs:documentation>Zadania szukania powiązań</xs:documentation>
       </xs:annotation>
-      <xs:sequence>
-         <xs:element name="ID" type="xs:int"/>
+      <xs:sequence id="_POWIAZANIA___d5e8210-1">
+         <xs:element name="ID" type="xs:int" id="_POWIAZANIA___d5e8211-1_ID"/>
          <xs:element name="A_STATUS"
-            type="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:A_STATUS_Type"/>
-         <xs:element name="A_STATUS_INFO" type="xs:string"/>
-         <xs:element name="L_APPOITMENT_USER" type="xs:string"/>
+            type="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:A_STATUS_Type"
+            id="_POWIAZANIA___d5e8212-1_A_STATUS"/>
+         <xs:element name="A_STATUS_INFO" type="xs:string" id="_POWIAZANIA___d5e8213-1_A_STATUS_I"/>
+         <xs:element name="L_APPOITMENT_USER" type="xs:string"
+            id="_POWIAZANIA___d5e8214-1_L_APPOITME"/>
          <!--         <xs:element ref="SystemObjects__x3A__AccessOwner:L_APPOITMENT_USER">
             <xs:annotation>
                <xs:appinfo>
@@ -79,7 +85,7 @@
                </xs:appinfo>
             </xs:annotation>
          </xs:element>-->
-         <xs:element name="A_CLASSIFIED" type="xs:string"/>
+         <xs:element name="A_CLASSIFIED" type="xs:string" id="_POWIAZANIA___d5e8216-1_A_CLASSIFI"/>
          <!--         <xs:element ref="SystemObjects__x3A__AccessGroup:A_CLASSIFIED">
             <xs:annotation>
                <xs:appinfo>
@@ -89,7 +95,7 @@
                </xs:appinfo>
             </xs:annotation>
          </xs:element>-->
-         <xs:element name="A_ADM_COMPANY" type="xs:string"/>
+         <xs:element name="A_ADM_COMPANY" type="xs:string" id="_POWIAZANIA___d5e8218-1_A_ADM_COMP"/>
          <!--         <xs:element ref="SystemObjects__x3A__AccessGroup:A_ADM_COMPANY">
             <xs:annotation>
                <xs:appinfo>
@@ -100,16 +106,27 @@
             </xs:annotation>
          </xs:element>-->
          <xs:element name="FILE_STATUS"
-            type="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:FILE_STATUS_Type"/>
-         <xs:element name="FILE_STATUS_info" type="xs:string"/>
-         <xs:element name="BI_analiza_minDepth" type="xs:int"/>
-         <xs:element name="BI_analiza_maxDepth" type="xs:int"/>
+                     type="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:FILE_STATUS_Type"
+                     id="_POWIAZANIA___d5e5150-1_FILE_STATU"/>
+         <xs:element name="FILE_STATUS_info"
+                     type="xs:string"
+                     id="_POWIAZANIA___d5e5151-1_FILE_STATU"/>
+         <xs:element name="BI_analiza_minDepth"
+                     type="xs:int"
+                     id="_POWIAZANIA___d5e5153-1_BI_analiza"/>
+         <xs:element name="BI_analiza_maxDepth"
+                     type="xs:int"
+                     id="_POWIAZANIA___d5e5154-1_BI_analiza"/>
          <xs:element name="BI_analiza_onlyTargets"
-            type="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:BI_analiza_onlyTargets"/>
+                     type="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:BI_analiza_onlyTargets"
+                     id="_POWIAZANIA___d5e5155-1_BI_analiza"/>
          <xs:element name="BI_analiza_reloadCache"
-            type="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:BI_analiza_reloadCache_Type"/>
+                     type="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:BI_analiza_reloadCache_Type"
+                     id="_POWIAZANIA___d5e5156-1_BI_analiza"/>
          <xs:element ref="default_db__x3A__BI_audit_ENERGA_PRACOWNICY:BI_audit_ENERGA_PRACOWNICY"
-            maxOccurs="unbounded" minOccurs="0">
+                     maxOccurs="unbounded"
+                     minOccurs="0"
+                     id="_POWIAZANIA___d5e5157-1">
             <xs:annotation>
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
@@ -123,7 +140,7 @@
          </xs:element>
          <xs:element
             ref="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI:BI_audit_ENERGA_RUM_KONTRAHENCI"
-            maxOccurs="unbounded" minOccurs="0">
+            maxOccurs="unbounded" minOccurs="0" id="_POWIAZANIA___d5e8232-1">
             <xs:annotation>
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
@@ -137,7 +154,7 @@
          </xs:element>
          <xs:element
             ref="default_db__x3A__BI_audit_KW_requested_person:BI_audit_KW_requested_person"
-            maxOccurs="unbounded" minOccurs="0">
+            maxOccurs="unbounded" minOccurs="0" id="_POWIAZANIA___d5e8239-1">
             <xs:annotation>
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
@@ -151,7 +168,7 @@
          </xs:element>
          <xs:element
             ref="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row"
-            maxOccurs="unbounded" minOccurs="0">
+            maxOccurs="unbounded" minOccurs="0" id="_POWIAZANIA___d5e8246-1">
             <xs:annotation>
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
@@ -164,9 +181,17 @@
                   BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row</xs:documentation>
             </xs:annotation>
          </xs:element>
-      </xs:sequence>
+         <xs:element maxOccurs="unbounded"
+                     minOccurs="0"
+                     ref="default_db__x3A__BI_audit_operational_raport_note:BI_audit_operational_raport_note"
+                     id="_POWIAZANIA___d5e5185-1"/>
+        </xs:sequence>
    </xs:complexType>
    <xs:element name="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA"
       type="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA"
-   />
+      id="_POWIAZANIA___d5e8253-1_BI_audit_E">
+      <xs:annotation>
+         <xs:documentation>Zadania szukania powiązań zawierające raport powiązań.</xs:documentation>
+      </xs:annotation>
+   </xs:element>
 </xs:schema>

+ 35 - 5
SE/schema/ant-object/default_db.BI_audit_KRS/BI_audit_KRS/BI_audit_KRS.xsd

@@ -55,9 +55,27 @@
       <xs:sequence id="I_audit_KRS___d4e4497-1">
          <xs:element name="ID" type="xs:int" id="I_audit_KRS___d4e4498-1_ID"/>
          <xs:element name="dataDokumentu" type="xs:string" id="I_audit_KRS___d4e4519-1_dataDokume"/>
-         <xs:element name="krs" type="xs:string" id="I_audit_KRS___d4e4520-1_krs"/>
-         <xs:element name="nip" type="xs:string" id="I_audit_KRS___d4e4522-1_nip"/>
-         <xs:element name="regon" type="xs:string" id="I_audit_KRS___d4e4523-1_regon"/>
+         <xs:element name="krs" id="I_audit_KRS___d4e4520-1_krs">
+            <xs:simpleType>
+               <xs:restriction base="xs:string">
+                  <xs:maxLength value="10"/>
+         </xs:restriction>
+            </xs:simpleType>
+         </xs:element>
+         <xs:element name="nip" id="I_audit_KRS___d4e4522-1_nip">
+            <xs:simpleType>
+               <xs:restriction base="xs:int">
+                  <xs:totalDigits value="10"/>
+         </xs:restriction>
+            </xs:simpleType>
+         </xs:element>
+         <xs:element name="regon" id="I_audit_KRS___d4e4523-1_regon">
+            <xs:simpleType>
+               <xs:restriction base="xs:int">
+                  <xs:totalDigits value="14"/>
+               </xs:restriction>
+            </xs:simpleType>
+         </xs:element>
          <xs:element name="nazwa" type="xs:string" id="I_audit_KRS___d4e4524-1_nazwa"/>
          <xs:element name="S_miejscowosc" type="xs:string" id="I_audit_KRS___d4e4525-1_S_miejscow"/>
          <xs:element name="S_gmina" type="xs:string" id="I_audit_KRS___d4e4526-1_S_gmina"/>
@@ -124,8 +142,20 @@
                   (relacja nip do default_db__x3A__BI_audit_taxpayer:BI_audit_taxpayer/nip)</xs:documentation>
             </xs:annotation>
          </xs:element>
-         <xs:element name="TERYT_SYM" type="xs:integer" id="I_audit_KRS___d4e5219-1_TERYT_SYM"/>
-         <xs:element name="TERYT_SYM_UL" type="xs:integer" id="I_audit_KRS___d4e5220-1_TERYT_SYM_"/>
+         <xs:element name="TERYT_SYM" id="I_audit_KRS___d4e5219-1_TERYT_SYM">
+            <xs:simpleType>
+               <xs:restriction base="xs:integer">
+                  <xs:totalDigits value="11"/>
+         </xs:restriction>
+            </xs:simpleType>
+         </xs:element>
+         <xs:element name="TERYT_SYM_UL" id="I_audit_KRS___d4e5220-1_TERYT_SYM_">
+            <xs:simpleType>
+               <xs:restriction base="xs:integer">
+                  <xs:totalDigits value="11"/>
+               </xs:restriction>
+            </xs:simpleType>
+         </xs:element>
       </xs:sequence>
    </xs:complexType>
    <xs:element name="BI_audit_KRS" type="default_db__x3A__BI_audit_KRS:BI_audit_KRS"

+ 8 - 7
SE/schema/ant-object/default_db.BI_audit_KRS_company/BI_audit_KRS_company/BI_audit_KRS_company.xsd

@@ -5,17 +5,18 @@
    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_company.xsd"
    vc:maxVersion="1.1" vc:minVersion="1.0">
-   <xs:complexType name="BI_audit_KRS_company">
+   <xs:complexType name="BI_audit_KRS_company" id="KRS_company___d4e4570-1_BI_audit_K">
       <xs:annotation>
          <xs:documentation>Do dowiazania do BI_audit_KRS</xs:documentation>
       </xs:annotation>
-      <xs:sequence>
-         <xs:element name="ID" type="xs:int"/>
-         <xs:element name="nazwa" type="xs:string"/>
-         <xs:element name="regon" type="xs:long"/>
-         <xs:element name="krs" type="xs:int"/>
+      <xs:sequence id="KRS_company___d4e4574-1">
+         <xs:element name="ID" type="xs:int" id="KRS_company___d4e4575-1_ID"/>
+         <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:sequence>
    </xs:complexType>
    <xs:element name="BI_audit_KRS_company"
-      type="default_db__x3A__BI_audit_KRS_company:BI_audit_KRS_company"/>
+      type="default_db__x3A__BI_audit_KRS_company:BI_audit_KRS_company"
+      id="KRS_company___d4e4604-1_BI_audit_K"/>
 </xs:schema>

+ 17 - 8
SE/schema/ant-object/default_db.BI_audit_KRS_person/BI_audit_KRS_person/BI_audit_KRS_person.xsd

@@ -1,21 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2"
+   xmlns:Types__x3A__default_Default="https://biuro.biall-net.pl/wfs/default_db/Types/Default.xsd"
    xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+   xmlns:default_db__x3A__IN7_DZIENNIK_KORESP="https://biuro.biall-net.pl/wfs/default_db/table/IN7_DZIENNIK_KORESP.xsd"
+   xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty"
+   xmlns:default_db__x3A__ADMIN_USERS="https://biuro.biall-net.pl/wfs/default_db/table/ADMIN_USERS.xsd"
+   xmlns:default_db__x3A__IN7_MK_BAZA_DYSTRYBUCJI="https://biuro.biall-net.pl/wfs/default_db/table/IN7_MK_BAZA_DYSTRYBUCJI.xsd"
+   xmlns:SystemObjects__x3A__AccessGroup="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessGroup.xsd"
+   xmlns:SystemObjects__x3A__AccessOwner="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessOwner.xsd"
    xmlns:default_db__x3A__BI_audit_KRS_person="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS_person.xsd"
    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_person.xsd"
    vc:maxVersion="1.1" vc:minVersion="1.0">
-   <xs:complexType name="BI_audit_KRS_person">
+   <xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../Types/gml.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>
       </xs:annotation>
-      <xs:sequence>
-         <xs:element name="ID" type="xs:int"/>
-         <xs:element name="nazwisko" type="xs:string"/>
-         <xs:element name="imiona" type="xs:string"/>
-         <xs:element name="pesel" type="xs:long"/>
+      <xs:sequence id="_KRS_person___d4e4625-1">
+         <xs:element name="ID" type="xs:int" id="_KRS_person___d4e4626-1_ID"/>
+         <xs:element name="nazwisko" type="xs:string" id="_KRS_person___d4e4651-1_nazwisko"/>
+         <xs:element name="imiona" type="xs:string" id="_KRS_person___d4e4653-1_imiona"/>
+         <xs:element name="pesel" type="xs:NMTOKEN" id="_KRS_person___d4e4654-1_pesel"/>
       </xs:sequence>
    </xs:complexType>
    <xs:element name="BI_audit_KRS_person"
-      type="default_db__x3A__BI_audit_KRS_person:BI_audit_KRS_person"/>
+      type="default_db__x3A__BI_audit_KRS_person:BI_audit_KRS_person"
+      id="_KRS_person___d4e4655-1_BI_audit_K"/>
 </xs:schema>

+ 107 - 0
SE/schema/ant-object/default_db.BI_audit_operational_raport_note/BI_audit_operational_raport_note/BI_audit_operational_raport_note.xsd

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:gml="http://www.opengis.net/gml/3.2"
+           xmlns:Types__x3A__default_Default="https://biuro.biall-net.pl/wfs/default_db/Types/Default.xsd"
+           xmlns:default_db__x3A__IN7_DZIENNIK_KORESP="https://biuro.biall-net.pl/wfs/default_db/table/IN7_DZIENNIK_KORESP.xsd"
+           xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty"
+           xmlns:default_db__x3A__ADMIN_USERS="https://biuro.biall-net.pl/wfs/default_db/table/ADMIN_USERS.xsd"
+           xmlns:default_db__x3A__IN7_MK_BAZA_DYSTRYBUCJI="https://biuro.biall-net.pl/wfs/default_db/table/IN7_MK_BAZA_DYSTRYBUCJI.xsd"
+           xmlns:SystemObjects__x3A__AccessGroup="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessGroup.xsd"
+           xmlns:SystemObjects__x3A__AccessOwner="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessOwner.xsd"
+           xmlns:default_db__x3A__BI_audit_operational_raport_note="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_operational_raport_note.xsd"
+           xmlns:default_db__x3A__BI_audit_ENERGA_FAKTURY="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_FAKTURY.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_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_KRS="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS.xsd"
+           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_operational_raport_note.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/BI_audit_ENERGA_PRACOWNICY.xsd"
+              schemaLocation="../../default_db.BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY.xsd"/>
+   <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_FAKTURY.xsd"
+              schemaLocation=" ../../default_db.BI_audit_ENERGA_FAKTURY/BI_audit_ENERGA_FAKTURY/BI_audit_ENERGA_FAKTURY.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.xsd"
+              schemaLocation="../../default_db.BI_audit_KRS/BI_audit_KRS/BI_audit_KRS.xsd"/>
+   <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_CEIDG.xsd"
+              schemaLocation="../../default_db.BI_audit_CEIDG/BI_audit_CEIDG/BI_audit_CEIDG.xsd"/>
+   <xs:simpleType name="A_STATUS_Type" id="raport_note___d5e6216-1_A_STATUS_T">
+      <xs:restriction base="xs:string">
+         <xs:enumeration value="NORMAL"/>
+         <xs:enumeration value="WAITING"/>
+         <xs:enumeration value="MONITOR"/>
+         <xs:enumeration value="DELETED"/>
+         <xs:enumeration value="WARNING"/>
+         <xs:enumeration value="OFF_SOFT"/>
+         <xs:enumeration value="OFF_HARD"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:complexType name="BI_audit_operational_raport_note"
+                   id="raport_note___d5e6225-1_BI_audit_o">
+      <xs:annotation>
+         <xs:documentation>Baza operacyjnych notatek umożliwiająca ignorowanie obiektu lub wskazywanie w raporcie informacji powiązanych dla obiektu w specjalny sposób.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence id="raport_note___d5e6229-1">
+         <xs:element name="ID" type="xs:integer" id="raport_note___d5e6230-1_ID"/>
+         <xs:element name="note" type="xs:string" id="raport_note___d5e6231-1_note">
+            <xs:annotation>
+               <xs:documentation>Opis/notatka kontekstu danego obiektu (Pracownik, KRS, Osoba) z jakimś zdarzeniem/podejrzeniem, z powodu którego należy dany rekord ignorować lub dodatkowo raportować w specjalny widoczny sposób w raporcie.</xs:documentation>
+            </xs:annotation>
+         </xs:element>
+         <xs:element name="long_note"
+                     type="xs:string"
+                     id="raport_note___d5e6235-1_long_note">
+            <xs:annotation>
+               <xs:documentation>W przypadku długich opisów w notatce, należy w tym polu wprowadzić informacje, przekraczające 255 znaków.</xs:documentation>
+            </xs:annotation>
+         </xs:element>
+         <xs:element name="action" type="xs:string" id="raport_note___d5e6239-1_action">
+            <xs:annotation>
+               <xs:documentation>W przypadku chęci wyłączania jakiegoś obiektu z raportów, należy wybrać akcję na IGNORE. W przypadku posiadania jakiegoś podejrzenia dla pracownika/osoby z KRS/firmy, należy wybrać opcję REPORT, aby była ona raportowana.</xs:documentation>
+            </xs:annotation>
+         </xs:element>
+         <xs:element name="A_STATUS"
+                     type="default_db__x3A__BI_audit_operational_raport_note:A_STATUS_Type"
+                     id="raport_note___d5e6243-1_A_STATUS"/>
+         <xs:element name="A_STATUS_INFO"
+                     type="xs:string"
+                     id="raport_note___d5e6244-1_A_STATUS_I"/>
+         <xs:element name="L_APPOITMENT_USER"
+                     type="xs:string"
+                     id="raport_note___d5e6245-1_L_APPOITME"/>
+         <xs:element name="A_CLASSIFIED"
+                     type="xs:string"
+                     id="raport_note___d5e6246-1_A_CLASSIFI"/>
+         <xs:element name="A_ADM_COMPANY"
+                     type="xs:string"
+                     id="raport_note___d5e6247-1_A_ADM_COMP"/>
+         <xs:element ref="default_db__x3A__BI_audit_ENERGA_PRACOWNICY:BI_audit_ENERGA_PRACOWNICY"
+                     maxOccurs="unbounded"
+                     minOccurs="0"
+                     id="raport_note___d5e6243-1"/>
+         <xs:element ref="default_db__x3A__BI_audit_ENERGA_FAKTURY:BI_audit_ENERGA_FAKTURY"
+                     maxOccurs="unbounded"
+                     minOccurs="0"
+                     id="raport_note___d5e6244-1"/>
+         <xs:element ref="default_db__x3A__BI_audit_KRS_person:BI_audit_KRS_person"
+                     maxOccurs="unbounded"
+                     minOccurs="0"
+                     id="raport_note___d5e6246-1"/>
+         <xs:element maxOccurs="unbounded"
+                     minOccurs="0"
+                     ref="default_db__x3A__BI_audit_KRS:BI_audit_KRS"
+                     id="raport_note___d5e6247-1"/>
+         <xs:element maxOccurs="unbounded"
+                     minOccurs="0"
+                     ref="default_db__x3A__BI_audit_CEIDG:BI_audit_CEIDG"
+                     id="raport_note___d5e6248-1"/>
+      </xs:sequence>
+   </xs:complexType>
+   <xs:element name="BI_audit_operational_raport_note"
+               type="default_db__x3A__BI_audit_operational_raport_note:BI_audit_operational_raport_note"
+               id="raport_note___d5e6248-1_BI_audit_o"/>
+</xs:schema>

+ 0 - 0
SE/schema/ant-object/default_db.BI_audit_operational_raport_note/BI_audit_operational_raport_note/build.xml


+ 193 - 0
SE/se-lib/Route/UrlAction/VoIPAmsImport.php

@@ -0,0 +1,193 @@
+<?php
+
+Lib::loadClass('RouteBase');
+Lib::loadClass('ProcesHelper');
+
+class Route_UrlAction_VoIPAmsImport extends RouteBase {
+
+	private $fields = [
+		"Data początkowa" => [
+			"name" => "date",
+			"regex" => "/^[[:digit:]]{4}(-[[:digit:]]{2}){2} [[:digit:]]{2}(:[[:digit:]]{2}){2}$/",
+			"sqlType" => "datetime",
+		],
+		"Numer abonenta" => [
+			"name" => "number",
+			"regex" => "/^[[:digit:]]{11}$/",
+			"sqlType" => "varchar(11)",
+		],
+		"Koszt netto" => [
+			"name" => "cost",
+			"regex" => "/^[[:digit:]]+,[[:digit:]]{2}$/",
+			"sqlType" => "decimal(10,2)",
+			"replace" => [
+				"from" => ",",
+				"to" => ".",
+			],
+		],
+	];
+
+	public function handleAuth() {
+		if (!User::logged()) {
+			throw new HttpException('Unauthorized', 401);
+		}
+	}
+
+	private function parseCsv($file) {
+		if (!file_exists($file)) Throw new Exception("CSV file error #1 - File not found.");
+		$csv = array_map(function ($line) {
+			return str_getcsv(trim($line), ";");
+		}, file($file));
+
+		array_walk($csv, function(&$a) use ($csv) {
+			if (count($csv[0]) != count($a)) throw new Exception("CSV file error #2 - Wrong fields count.");
+			$a = array_combine($csv[0], $a);
+		});
+		array_shift($csv);
+
+		$csv = array_filter($csv, function($a) {
+			if ($a['TG wych.'] != '27') return false;
+			if ($a['Koszt netto'] == '0,00') return false;
+			return true;
+		});
+
+		array_walk($csv, function(&$a) {
+			$result = [];
+			foreach ($this->fields as $k => $v) {
+				if (!isset($a[$k])) throw new Exception("CSV file error #3 - Field \"{$k}\" not found.");
+				if (!preg_match($v["regex"], $a[$k])) throw new Exception("CSV file error #4 - Bad value of \"{$k}\" ({$a[$k]}).");
+				if (isset($v["replace"])) $result[$v["name"]] = str_replace($v["replace"]["from"], $v["replace"]["to"], $a[$k]);
+				else $result[$v["name"]] = $a[$k];
+			}
+			$a = $result;
+		});
+
+		return array_values($csv);
+	}
+
+	private function importCsv() {
+		if (!isset($_FILES['csv'])) throw new Exception("Błąd formularza");
+		if ($_FILES['csv']['type'] != "text/csv") throw new Exception("Błędny plik CSV");
+		$csv = $this->parseCsv($_FILES['csv']['tmp_name']);
+		$csvPost = base64_encode(gzcompress(json_encode($csv)));
+		$_SESSION['VoIPAmsImportReady'] = true;
+?>
+<div class="container" style="margin-top:20px">
+  <form class="form-horizontal" method="post" enctype="multipart/form-data">
+    <legend>
+      Znalezione rekordy billingowe do zafakurowania
+    </legend>
+    <div class="col-sm-offset-2 col-sm-8">
+       <div style="text-align:center;">
+         <input type="hidden" name="csv" value="<?=$csvPost?>"/>
+         <button type="submit" class="btn btn-primary" name="action" value="doImportCsv">Importuj</button>
+       </div>
+       <hr/>
+       <table class="table table-bordered table-hover table-striped">
+         <thead>
+            <tr style="text-align:center; background-color:lightgray"><td width="19%">Lp.</td><td>Data połączenia</td><td>Numer klienta</td><td>Koszt netto połączenia</td></tr>
+         </thead>
+         <tbody>
+<?php
+		foreach ($csv as $i => $v) {
+			echo "<tr><td>" . ($i + 1) . "</td>";
+			foreach ($this->fields as $field) echo "<td> " . $v[$field["name"]] . "</td>";
+			echo "</tr>\n";
+		}
+?>
+        </tbody>
+      </table>
+    </div>
+  </form>
+</div>
+<?php
+	}
+
+	private function doQuery($query) {
+		try {
+			return DB::getPDO()->query($query);
+		} catch (Exception $e) {
+			throw new Exception("Wystąpił problem z zapytaniem SQL: {$query}<br/>{$e->getMessage()}");
+		}
+	}
+
+	private function doImportCsv() {
+		if (!isset($_SESSION['VoIPAmsImportReady'])) throw new Exception("Błąd formularza");
+		unset($_SESSION['VoIPAmsImportReady']);
+
+		$csv = json_decode(gzuncompress(base64_decode(V::get('csv','',$_POST))), true);
+		if (!$csv) throw new Exception("Błąd formularza");
+
+		$createColumns = []; $keys = []; $columns = [];
+		foreach ($this->fields as $field) {
+			$createColumns[] = "`{$field['name']}` {$field['sqlType']} NOT NULL";
+			$keys[] = "KEY `{$field['name']}` (`{$field['name']}`)";
+			$columns[] = $field['name'];
+		}
+
+		$queries = [];
+		$queries[] = "create temporary table `tmp_VoIPAmsImport` (" . implode(", ", array_merge($createColumns, $keys)) . ")";
+		foreach ($csv as $v) {
+			$values = [];
+			foreach ($this->fields as $field) $values["`{$field['name']}`"] = "'{$v[$field['name']]}'";
+			$queries[] = "insert into `tmp_VoIPAmsImport` (" . implode(", ", array_keys($values)) . ") values (" . implode(", ", $values) . ")";
+		}
+		$queries[] = <<<EOT
+create temporary table `tmp_VoIPAmsImport2`
+select sesa.ID_SERVICES, sesa.ID_BILLING_USERS, '16' as TYPE, DATE_FORMAT(tmp.`date`,'%Y-%m') as VALUE1, sum(round(tmp.`cost`,2)) as VALUE2,
+	'1' as NODE_ID, NULL as EXTERNAL_ID,'0' as TAB_UPDATE_STAT, 'ZAIMPORTOWANO PRZEZ VoIPAmsImport' as TAB_UPDATE_INFO
+from `tmp_VoIPAmsImport` tmp left join SES_VOIP_A sesa on sesa.S_ALIAS=tmp.number
+where sesa.ID_SERVICES IS NOT NULL
+group by sesa.ID_SERVICES, VALUE1
+having VALUE2>0
+EOT;
+
+		foreach ($queries as $query) $this->doQuery($query);
+		$result = DB::getPDO()->fetchFirst("select count(*) as `count`, sum(VALUE2) as `sum` from `tmp_VoIPAmsImport2`");
+
+		$query = <<<EOT
+insert into SES_VOIP_C (ID_SERVICES, ID_BILLING_USERS, TYPE, VALUE1, VALUE2, NODE_ID, EXTERNAL_ID, TAB_UPDATE_STAT, TAB_UPDATE_INFO)
+select * from `tmp_VoIPAmsImport2`
+EOT;
+		$this->doQuery($query);
+
+		SE_Layout::alert('success', "Z powodzeniem zaimportowano " . count($csv) . " rekordów billingowych ({$result['count']} pozycji do faktur na łączną kwotę {$result['sum']} zł netto)");
+		$this->form();
+	}
+
+	private function form() {
+?>
+<div class="container" style="margin-top:20px">
+  <form class="form-horizontal" method="post" enctype="multipart/form-data">
+    <legend>
+      Importowanie danych billingowych połączeń telefonicznych z platformy AMS
+    </legend>
+      <label class="col-sm-2 control-label">Wgraj plik</label>
+      <div class="col-sm-10" style="margin-top:3px;">
+        <input type="hidden" name="action" value="importCsv"/>
+        <input type="file" name="csv" onchange="javascript:this.form.submit();"/>
+      </div>
+    </div>
+  </form>
+</div>
+<?php
+	}
+
+	public function defaultAction() {
+		SE_Layout::gora();
+		SE_Layout::menu();
+		try {
+			$action = V::get('action','',$_POST);
+			$actions = [
+				"importCsv",
+				"doImportCsv"
+			];
+			if (in_array($action, $actions)) $this->$action();
+			else $this->form();
+		} catch (Exception $e) {
+			SE_Layout::alert('danger',$e->getMessage());
+			$this->form();
+		}
+		SE_Layout::dol();
+	}
+}

+ 4 - 4
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -2342,9 +2342,9 @@ function MakeCommand($command_id,$command,$installer_tmp,$installer_dir) {
 	return $ins_sh;
 }
 
-function encodePhpFiles($installer_dir, $domains = [], $domainEncodePhpFiles = []) {
+function encodePhpFiles($installer_dir, $domains = "", $domainEncodePhpFiles = []) {
     if (empty($installer_dir)) throw new Exception("Install path not found");
-    if ($domainEncodePhpFiles and empty($domains)) throw new Exception("Domains not definied");
+    if ($domainEncodePhpFiles and (!$domains)) throw new Exception("Domains not definied");
 
     $phpVersionsForSgencoder = '--phpversion 5.5 --phpversion 5.6';// encode for PHP 5.x (currently supported PHP 5.0-5.6)
 
@@ -2374,12 +2374,12 @@ function encodePhpFiles($installer_dir, $domains = [], $domainEncodePhpFiles = [
 //    if (empty($freeEncodePhpFiles)) throw new Exception("No php files to encode");
 
     $cmdTempl = "cd {$installer_dir} && /Applications/SourceGuardian.app/Contents/MacOS/sgencoder {$phpVersionsForSgencoder} -b- ";
-    $cmdDomainEncodeDomainsTempl = " --domain " . implode(" --domain ", array_merge($domains, ['localhost']));
+//    $cmdDomainEncodeDomainsTempl = " --domain " . implode(" --domain ", array_merge($domains, ['localhost']));
     $cmdDomainEncodeFilesTempl = " " . implode(" ", $domainEncodePhpFiles);
     $cmdFreeEncodeFilesTempl = " " . implode(" ", $freeEncodePhpFiles);
 
     $cmds = [];
-    if ($domainEncodePhpFiles) $cmds['domainEncodePhpFiles'] = $cmdTempl . $cmdDomainEncodeDomainsTempl . $cmdDomainEncodeFilesTempl;
+    if ($domainEncodePhpFiles) $cmds['domainEncodePhpFiles'] = $cmdTempl . $domains . $cmdDomainEncodeFilesTempl;
     if ($freeEncodePhpFiles) $cmds['freeEncodePhpFiles'] = $cmdTempl . $cmdFreeEncodeFilesTempl;
 
     $returnValues = [];