diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index 6d105d0600b7dc3f2911652ba4fa662e615d31d9..e7ee7a89071990dc007a9a5c16bb45c32dd5229e 100644
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
@@ -1,3 +1,3 @@
#This file is generated by ADITO designer. Do NOT delete or modify!
-#Tue Apr 23 12:52:50 CEST 2019
+#Tue Apr 23 16:51:47 CEST 2019
version=5.1.12
diff --git a/.liquibase/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
index 83631681baec26337618c5f5a98b8aeb7fcf9618..5a1fbe81945d022fe8c35cee50a418abe92f43d0 100644
--- a/.liquibase/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
+++ b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
@@ -1,6 +1,549 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="s.listl" id="f1b149fb-bd9d-44b7-a334-8f6d77261b95">
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Vertrieb"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_TYPE" value="VOID "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Präsentation"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="bfc5c9d3-274e-49e9-b8ab-8a4c24987026"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Fachanforderung"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Vorteile"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="43a913ce-d73c-48a6-aa4b-ad050e1f1b26"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="flexibel"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="96fc2fe2-8424-4ff2-8eb5-0d054e26af9b"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Referenz"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="746bbd1d-344b-487e-adb5-d232aba57c0e"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Technologie"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Defizite"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="b8179c49-8ef0-4d8e-bcb2-762f9d05563b"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Technologie"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="4c71d1da-9fff-43fc-b6fd-6fc24696c4bf"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Referenz"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="3587a98c-03e4-4acc-af89-13b26ce4d956"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Nächste Schritte"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="ToDos"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="4bb88e18-f160-4bf3-b9b2-d1a413dcecf5"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Nachfassen (WV)"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="e144b3f5-3074-4d92-a645-2b7aa601564c"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Sonstiges (WV)"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Pers. Einschätzung"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="6"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Wertung"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="2d66c8b6-cf6e-44b2-b663-488f3f4d6647"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="30"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="620a0903-6fde-4751-aefa-c398d64c13cc"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="60"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="6e162c86-3b07-4817-8570-ef5598b4f455"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="90"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="ee8c2bff-92c9-456a-a665-c7ccc3960f8d"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Begründung"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Teilnehmer"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="7"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="bae6db6b-259a-4f36-9112-4516b7f8cfeb"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="eigene Firma"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="ffeeca2a-2349-40dc-9b0c-4a8b3447d3df"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Interessent"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="10d2cbd3-9c58-4e9d-9259-d556aba6cf6c"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Kunde"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="6537b5ae-9bfd-455e-8b48-183895b9b461"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Berater"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="f5e7449a-f61e-4022-aa93-6b3916ddbed7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Partner"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Akquise"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="61436f5e-b85a-477e-af8b-5369d12ad742"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Projekt geplant?"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="913457fc-361c-4af6-ab5a-85a0ad8640e5"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Kein Projekt geplant"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="eaa9aea2-73f3-48f4-909d-81de5e09a75f"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Planung Projekt offen"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="7a4282b8-8461-4486-9362-bc72ceb7b5df"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Nächster Kontakt?"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Erstkontakt"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Produktinteresse"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Warengruppe A"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="fb01b321-ec75-486b-a0ef-3adfe99a33b2"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Produkt A1"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="149c1c4c-3742-46b5-9a31-7afe22965df7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Produkt A2"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Warengruppe B"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="542ca620-3ad0-49cc-acf9-e31f4542f302"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Produkt B1"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="3eb8a90f-c17b-441e-9aa8-acde31e4544c"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Produkt B2"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="9d0949b5-7c87-4663-9229-897057e03192"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Allgemein"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="ToDo"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Informationen senden"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="ec874d78-6231-45d6-a4c2-193756587981"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Warengruppe A (WV)"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="6d4dd325-7f30-4098-a391-ebae4f27988e"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Warengruppe B (WV)"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="f8d8d58e-9381-4e44-aeae-284116ca3613"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Nachfassen (WV)"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Herkunft"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="956622a7-03b3-42a4-a7ef-f8936d92cff9"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="persönlich"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="f0f0b150-ea60-46e5-ba4f-727c78c993d0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Referenz-Kunde"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="c5f8b5f7-ddc0-4c88-bebd-be96fd37bb9c"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Website"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="262a8fbe-d6ef-4949-87ce-6202967136d7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Messe"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="67edd12f-93cc-45d4-b86a-b59d19936442"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Anruf"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Vertrag"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="9b2dd256-fe8e-4edd-9f1e-0a841103a41a"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Dienstleistungsvertrag"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="f001e3a8-b888-49a8-89e1-96ecc503e936"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Wartungsvertrag"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="9c64aefe-23c0-4e64-ada5-02db5f4bcb85"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Rahmenvertrag (WV)"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="c31d3ee4-3e08-4a3e-acdb-5f5d236e01de"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Verwahrungsvereinbarung"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="15810377-58c8-4e22-8dd1-ed341f7baf0a"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Datenschutzvereinbarung"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="3a0843a4-0d43-4b97-9fe5-4d4049ec79d3"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Abnahmeerklärung"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="6"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Bekannt durch"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="6"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="c2eb5976-39d0-4098-8e1f-1fff0c910faf"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Bestehender Kontakt"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="fd8cd4b8-a284-4e1d-accd-310b85577c98"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Empfehlung"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="941a02f8-577f-40a9-8e43-0ea4d695f254"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Printmedien"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="593bd38f-704a-480a-add3-22e0af9e2460"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Messe"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="ToDo"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="7"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="a559f36c-768b-4fc4-b4f2-7dfd25fadb4a"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Rückruf (WV)"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="5929874c-ab20-4d18-9d75-083e39f8d576"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Unterlagen senden (WV)"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="0adcd251-d3d1-4bed-a299-39373c098cad"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Angebot erstellen (WV)"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="786d0154-acec-4281-8ddc-52772d5ea1ea"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Broschüre zukommen lassen (WV)"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="4"/>
+</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
diff --git a/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
index ae2d23abf2da9b6232b34b24e86c8c13bd1b1205..e0c81c2dcf1939e780d8eb0a77cfa261780b7998 100644
--- a/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
+++ b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
@@ -1,6 +1,341 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="s.listl" id="33bfbf9d-e3b9-4dd0-94e5-f22c74bc3014">
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="48e9320b-b2b4-4523-bb34-e68749fe1465"/>
+ <column name="AB_ATTRIBUTE_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="b70e6047-c8d9-4be0-99a9-e8a6b4a07c9b"/>
+ <column name="AB_ATTRIBUTE_ID" value="bfc5c9d3-274e-49e9-b8ab-8a4c24987026"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="6fb3f5c0-177e-41ad-88c1-44d096ead1de"/>
+ <column name="AB_ATTRIBUTE_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="022f3b98-f716-47ca-aaa1-7db53f86b821"/>
+ <column name="AB_ATTRIBUTE_ID" value="43a913ce-d73c-48a6-aa4b-ad050e1f1b26"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="aeb00c8d-dbee-4657-b5da-4e7aaa494120"/>
+ <column name="AB_ATTRIBUTE_ID" value="96fc2fe2-8424-4ff2-8eb5-0d054e26af9b"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="3ea3348e-bffa-47d9-ac58-cfb9fb7c21e7"/>
+ <column name="AB_ATTRIBUTE_ID" value="746bbd1d-344b-487e-adb5-d232aba57c0e"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="570f695f-5fd1-4f5a-b21d-62ab721db1ef"/>
+ <column name="AB_ATTRIBUTE_ID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="c6bb63b2-afdb-4dde-a22a-0022926425d8"/>
+ <column name="AB_ATTRIBUTE_ID" value="b8179c49-8ef0-4d8e-bcb2-762f9d05563b"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="924782ab-fc54-432e-aa19-d04a986fb3da"/>
+ <column name="AB_ATTRIBUTE_ID" value="4c71d1da-9fff-43fc-b6fd-6fc24696c4bf"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="247a2d0b-dd07-4799-89fc-e85d3ef10947"/>
+ <column name="AB_ATTRIBUTE_ID" value="3587a98c-03e4-4acc-af89-13b26ce4d956"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="d890f5d6-0330-457a-8650-9261f494fe9c"/>
+ <column name="AB_ATTRIBUTE_ID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="440250fb-033a-4db2-84ec-1f05e90b5d1d"/>
+ <column name="AB_ATTRIBUTE_ID" value="4bb88e18-f160-4bf3-b9b2-d1a413dcecf5"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="b405df7f-07e3-43c6-b067-c29a083489db"/>
+ <column name="AB_ATTRIBUTE_ID" value="e144b3f5-3074-4d92-a645-2b7aa601564c"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="85d90ab9-8b2c-4759-b730-14bdc21bdf0c"/>
+ <column name="AB_ATTRIBUTE_ID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="d1c81512-9e0c-45ae-bf58-7fc025ecbe12"/>
+ <column name="AB_ATTRIBUTE_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="b327f51d-1d52-4db0-96e1-3b1a02af603d"/>
+ <column name="AB_ATTRIBUTE_ID" value="2d66c8b6-cf6e-44b2-b663-488f3f4d6647"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="745b9d55-4402-4b0d-95c1-60cc86d753c0"/>
+ <column name="AB_ATTRIBUTE_ID" value="620a0903-6fde-4751-aefa-c398d64c13cc"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="fb175158-9a11-49df-9d2d-c5149826db0f"/>
+ <column name="AB_ATTRIBUTE_ID" value="6e162c86-3b07-4817-8570-ef5598b4f455"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="a4c52b1c-2a9d-480f-9ed2-266ef94102f2"/>
+ <column name="AB_ATTRIBUTE_ID" value="ee8c2bff-92c9-456a-a665-c7ccc3960f8d"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="b358d1b5-e3be-4b81-8f68-8b8bfe6084c2"/>
+ <column name="AB_ATTRIBUTE_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="7aece23a-c0d2-432c-86da-f6b766752062"/>
+ <column name="AB_ATTRIBUTE_ID" value="bae6db6b-259a-4f36-9112-4516b7f8cfeb"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="0a32ee8c-3fc7-4412-ab4a-e17668396954"/>
+ <column name="AB_ATTRIBUTE_ID" value="ffeeca2a-2349-40dc-9b0c-4a8b3447d3df"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="79133e7e-fd63-4d71-90a2-96a487e5ab42"/>
+ <column name="AB_ATTRIBUTE_ID" value="10d2cbd3-9c58-4e9d-9259-d556aba6cf6c"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="fdd04439-6302-41ec-bbf1-5b63e2142cbc"/>
+ <column name="AB_ATTRIBUTE_ID" value="6537b5ae-9bfd-455e-8b48-183895b9b461"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="5f8563c1-5467-4655-a42f-72dcf43d184b"/>
+ <column name="AB_ATTRIBUTE_ID" value="f5e7449a-f61e-4022-aa93-6b3916ddbed7"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="24f74162-380a-4f9e-bf71-1e8a51275118"/>
+ <column name="AB_ATTRIBUTE_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="ddee95f8-21f9-4b6b-850f-79e9f12d3c4c"/>
+ <column name="AB_ATTRIBUTE_ID" value="61436f5e-b85a-477e-af8b-5369d12ad742"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="4704a3a1-7762-4863-8dca-6e3ce8b4ba9f"/>
+ <column name="AB_ATTRIBUTE_ID" value="913457fc-361c-4af6-ab5a-85a0ad8640e5"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="c37d0b13-468b-4018-802e-a290ccd239b7"/>
+ <column name="AB_ATTRIBUTE_ID" value="eaa9aea2-73f3-48f4-909d-81de5e09a75f"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="b1df815f-535f-46c6-9df5-0c43bbcc8c47"/>
+ <column name="AB_ATTRIBUTE_ID" value="7a4282b8-8461-4486-9362-bc72ceb7b5df"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="f049d2f7-bacf-4b57-b40a-779111a0b944"/>
+ <column name="AB_ATTRIBUTE_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="33b8e55d-227c-4a5c-8e92-89e429dc1157"/>
+ <column name="AB_ATTRIBUTE_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="2057fae3-bea6-4a90-8dcc-b795f677c7ac"/>
+ <column name="AB_ATTRIBUTE_ID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="c43230d6-984b-4b47-8c39-3fceb126641b"/>
+ <column name="AB_ATTRIBUTE_ID" value="fb01b321-ec75-486b-a0ef-3adfe99a33b2"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="b3f6e18e-8bdc-4679-aaa5-895c08430532"/>
+ <column name="AB_ATTRIBUTE_ID" value="149c1c4c-3742-46b5-9a31-7afe22965df7"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="b78f182a-bade-428a-9b12-fd40f52414a9"/>
+ <column name="AB_ATTRIBUTE_ID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="27a518a0-0456-4494-8d9e-a62afb70fd68"/>
+ <column name="AB_ATTRIBUTE_ID" value="542ca620-3ad0-49cc-acf9-e31f4542f302"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="3c0a29b2-e98f-4aae-902d-e5ae691537f5"/>
+ <column name="AB_ATTRIBUTE_ID" value="3eb8a90f-c17b-441e-9aa8-acde31e4544c"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="7593fe50-00be-42fc-9e75-8eae49fb2b25"/>
+ <column name="AB_ATTRIBUTE_ID" value="9d0949b5-7c87-4663-9229-897057e03192"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="202789a8-4d69-43b2-ab38-708938081d68"/>
+ <column name="AB_ATTRIBUTE_ID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="642ee10a-b516-4fa3-95fc-f402992a0158"/>
+ <column name="AB_ATTRIBUTE_ID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="6c6651b6-a8a5-4f89-82a1-3f1c22a8d9b6"/>
+ <column name="AB_ATTRIBUTE_ID" value="ec874d78-6231-45d6-a4c2-193756587981"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="b55dd353-cb6b-48a1-8cad-c3e90f63a8b0"/>
+ <column name="AB_ATTRIBUTE_ID" value="6d4dd325-7f30-4098-a391-ebae4f27988e"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="d546bc42-e452-4446-a85e-557f6c0bc88b"/>
+ <column name="AB_ATTRIBUTE_ID" value="f8d8d58e-9381-4e44-aeae-284116ca3613"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="504487e9-86f8-4ff1-91a2-b364829fa86b"/>
+ <column name="AB_ATTRIBUTE_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="33d64ce6-e8b4-4acf-ac75-0d99d0092c6c"/>
+ <column name="AB_ATTRIBUTE_ID" value="956622a7-03b3-42a4-a7ef-f8936d92cff9"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="07704049-9ae8-4d07-86e3-1042ed104035"/>
+ <column name="AB_ATTRIBUTE_ID" value="f0f0b150-ea60-46e5-ba4f-727c78c993d0"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="4757e926-3059-4969-b07a-f04479f6d723"/>
+ <column name="AB_ATTRIBUTE_ID" value="c5f8b5f7-ddc0-4c88-bebd-be96fd37bb9c"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="22a31ed9-be4d-45db-ad2a-5777e9a785bf"/>
+ <column name="AB_ATTRIBUTE_ID" value="262a8fbe-d6ef-4949-87ce-6202967136d7"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="d8352147-7866-40c2-8f1a-063ccc4b0c04"/>
+ <column name="AB_ATTRIBUTE_ID" value="67edd12f-93cc-45d4-b86a-b59d19936442"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="55879930-2f90-44ec-a9b6-fdfe2226a7b0"/>
+ <column name="AB_ATTRIBUTE_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="cc03ab69-248a-4ee0-9219-120fcc8c69da"/>
+ <column name="AB_ATTRIBUTE_ID" value="9b2dd256-fe8e-4edd-9f1e-0a841103a41a"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="925a2fe7-2d7d-425b-b55d-71c3d6cfe554"/>
+ <column name="AB_ATTRIBUTE_ID" value="f001e3a8-b888-49a8-89e1-96ecc503e936"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="55eed1d2-086c-4e25-a59e-ec3d1e8c3283"/>
+ <column name="AB_ATTRIBUTE_ID" value="9c64aefe-23c0-4e64-ada5-02db5f4bcb85"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="c0f1778b-595f-4e76-831e-0df4b323f711"/>
+ <column name="AB_ATTRIBUTE_ID" value="c31d3ee4-3e08-4a3e-acdb-5f5d236e01de"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="a22a9765-637e-4ca4-818a-e3acb8306776"/>
+ <column name="AB_ATTRIBUTE_ID" value="15810377-58c8-4e22-8dd1-ed341f7baf0a"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="7e5726f4-16f4-4b18-ae95-a6ad24e49d40"/>
+ <column name="AB_ATTRIBUTE_ID" value="3a0843a4-0d43-4b97-9fe5-4d4049ec79d3"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="1310d547-f5d2-4e30-8e30-0deeba7de746"/>
+ <column name="AB_ATTRIBUTE_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="6462a324-535a-4978-86f2-e439f581571a"/>
+ <column name="AB_ATTRIBUTE_ID" value="c2eb5976-39d0-4098-8e1f-1fff0c910faf"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="8c380566-bab2-4397-a7f7-a88f2c728388"/>
+ <column name="AB_ATTRIBUTE_ID" value="fd8cd4b8-a284-4e1d-accd-310b85577c98"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="f6d3a5f3-04bd-4cf1-8057-11a1af4352a4"/>
+ <column name="AB_ATTRIBUTE_ID" value="941a02f8-577f-40a9-8e43-0ea4d695f254"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="607b45dc-2a97-4005-9d38-488640665aa1"/>
+ <column name="AB_ATTRIBUTE_ID" value="593bd38f-704a-480a-add3-22e0af9e2460"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="63801bc2-a0a2-4a3c-a531-1949ff3041a6"/>
+ <column name="AB_ATTRIBUTE_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="5bdf8396-30bb-4fbc-bdbe-304fa7d73fb2"/>
+ <column name="AB_ATTRIBUTE_ID" value="a559f36c-768b-4fc4-b4f2-7dfd25fadb4a"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="f71f995d-0022-4144-95a9-88e33468b835"/>
+ <column name="AB_ATTRIBUTE_ID" value="5929874c-ab20-4d18-9d75-083e39f8d576"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="d6982ee5-616a-4eb9-adf9-e571658851ea"/>
+ <column name="AB_ATTRIBUTE_ID" value="0adcd251-d3d1-4bed-a299-39373c098cad"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="717abaf4-3ed3-4754-ba01-3192677ac399"/>
+ <column name="AB_ATTRIBUTE_ID" value="786d0154-acec-4281-8ddc-52772d5ea1ea"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="3234f4e2-0ee7-4782-9b10-c953b7b1be29"/>
<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js
index a9593f23e2ddc424480e55bfc8cc81ae03c7f766..3d5f6ab938f0bce2a12aa26736fbf4f24657e158 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js
@@ -30,7 +30,7 @@ switch (tableName)
break;
case "COMMUNICATION":
res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
- return db.array(db.COLUMN, ["select ADDRESS.CONTACT_ID from COMMUNICATION where COMMUNICATIONID = ?", [
+ return db.array(db.COLUMN, ["select COMMUNICATION.CONTACT_ID from COMMUNICATION where COMMUNICATIONID = ?", [
[id, SqlUtils.getSingleColumnType("COMMUNICATION", "COMMUNICATIONID")]
]]);
});
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js
index d8a51cd604e383035c7b1045fa73c24d1394267c..dcec7271b09b93af609f612ff8c3f69468ec2dc0 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js
@@ -33,7 +33,7 @@ switch (tableName)
break;
case "COMMUNICATION":
res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
- return db.array(db.COLUMN, ["select ADDRESS.CONTACT_ID from COMMUNICATION where COMMUNICATIONID = ?", [
+ return db.array(db.COLUMN, ["select COMMUNICATION.CONTACT_ID from COMMUNICATION where COMMUNICATIONID = ?", [
[id, SqlUtils.getSingleColumnType("COMMUNICATION", "COMMUNICATIONID")]
]]);
});
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index aea433f9b68a13b3051799c76ee403c0ae30c4e1..ed7f41f79ce2b5ec3267c56e0da9d45cee271ecc 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -397,7 +397,7 @@
</entityParameter>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attribute Tree</title>
+ <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index eca920a090f2fef7c1d5da443adfa46f7d6a0ea9..88ae4f57a7834d66fe2c8276150c2df00afb0d4d 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -17,12 +17,6 @@
<name>ZipValidaton</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
- <entityDependency>
- <name>1b2e3be5-b3be-42c5-a55f-b892fdfbf21f</name>
- <entityName>Communication_entity</entityName>
- <fieldName>AddressValidator</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>fcfcbebe-260a-4773-a874-9791b4887ae2</name>
<entityName>Address_entity</entityName>
@@ -96,6 +90,11 @@
</entityParameter>
</children>
</entityProvider>
+ <entityParameter>
+ <name>CurrentValue_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/AddressValidation_entity/entityfields/cityvalidation/children/type_param/valueProcess.js b/entity/AddressValidation_entity/entityfields/cityvalidation/children/type_param/valueProcess.js
index 605d65eb517e3f51c7d9a129c17c0d6e46b79452..1f9eec452781c6cf79d5ed9620ea1f6205fe91b3 100644
--- a/entity/AddressValidation_entity/entityfields/cityvalidation/children/type_param/valueProcess.js
+++ b/entity/AddressValidation_entity/entityfields/cityvalidation/children/type_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("AddressValidation_lib");
+import("WsValidation_lib");
import("system.result");
-result.string(AddressValidationType.get().TYPE_CITY.key);
\ No newline at end of file
+result.string(WsValidationType.get().TYPE_CITY.key);
\ No newline at end of file
diff --git a/entity/AddressValidation_entity/entityfields/cityvalidatior/children/type_param/valueProcess.js b/entity/AddressValidation_entity/entityfields/cityvalidatior/children/type_param/valueProcess.js
index 605d65eb517e3f51c7d9a129c17c0d6e46b79452..c930ba5500de6db2fd4c5be17e9a82eeaf0bbab8 100644
--- a/entity/AddressValidation_entity/entityfields/cityvalidatior/children/type_param/valueProcess.js
+++ b/entity/AddressValidation_entity/entityfields/cityvalidatior/children/type_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("AddressValidation_lib");
+import("WsValidation_lib");
import("system.result");
result.string(AddressValidationType.get().TYPE_CITY.key);
\ No newline at end of file
diff --git a/entity/AddressValidation_entity/entityfields/zipvalidaton/children/type_param/valueProcess.js b/entity/AddressValidation_entity/entityfields/zipvalidaton/children/type_param/valueProcess.js
index e980e6dd0b82b651a1025901c43d74fc6be1632d..c7eee1bb589766b9b53cf172226fed90a5da8087 100644
--- a/entity/AddressValidation_entity/entityfields/zipvalidaton/children/type_param/valueProcess.js
+++ b/entity/AddressValidation_entity/entityfields/zipvalidaton/children/type_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("AddressValidation_lib");
+import("WsValidation_lib");
import("system.result");
-result.string(AddressValidationType.get().TYPE_ZIP.key);
\ No newline at end of file
+result.string(WsValidationType.get().TYPE_ZIP.key);
\ No newline at end of file
diff --git a/entity/AddressValidation_entity/entityfields/zipvalidator/children/type_param/valueProcess.js b/entity/AddressValidation_entity/entityfields/zipvalidator/children/type_param/valueProcess.js
index e980e6dd0b82b651a1025901c43d74fc6be1632d..7b6b2602657cd575adc7421c172011c6199de1d0 100644
--- a/entity/AddressValidation_entity/entityfields/zipvalidator/children/type_param/valueProcess.js
+++ b/entity/AddressValidation_entity/entityfields/zipvalidator/children/type_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("AddressValidation_lib");
+import("WsValidation_lib");
import("system.result");
result.string(AddressValidationType.get().TYPE_ZIP.key);
\ No newline at end of file
diff --git a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
index b816f84362c53ed72404ba157b67b711b55c5283..5b14acb7d11aaa3a32733882bf40ee7e0f4ecb00 100644
--- a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
@@ -1,5 +1,5 @@
import("system.result");
-import("AddressValidation_lib");
+import("WsValidation_lib");
import("system.vars");
var type = "";
@@ -17,6 +17,9 @@ if(sysFilter.filter != null) {
filter = JSON.parse(sysFilter.filter).childs[0].value;
}
-var foundAddresses = AddressValidationUtils.validate(filter, type, country);
+if (!filter && vars.exists("$param.CurrentValue_param") && vars.get("$param.CurrentValue_param"))
+ filter = vars.get("$param.CurrentValue_param");
+
+var foundAddresses = WsValidationUtils.validate(filter, type, country);
result.object(foundAddresses);
\ No newline at end of file
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index dde778bd9208c0e367051f67f4a7e210a4892939..6d9770c1885149fa0c4a5aa85ec295b36eee439f 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -37,7 +37,6 @@
<entityField>
<name>CITY</name>
<title>City</title>
- <consumer>CityValidation</consumer>
<mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/city/mandatoryProcess.js</mandatoryProcess>
<displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/city/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Address_entity/entityfields/city/onValueChange.js</onValueChange>
@@ -74,7 +73,7 @@
<entityField>
<name>ZIP</name>
<title>postcode</title>
- <consumer>ZipValidation</consumer>
+ <consumer></consumer>
<mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess>
<displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/zip/displayValueProcess.js</displayValueProcess>
<onValidation>%aditoprj%/entity/Address_entity/entityfields/zip/onValidation.js</onValidation>
@@ -313,6 +312,10 @@
<name>Country_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/zipvalidation/children/country_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>CurrentValue_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/zipvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
@@ -323,6 +326,16 @@
<entityName>AddressValidation_entity</entityName>
<fieldName>CityValidation</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>CurrentValue_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/cityvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>Country_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
</entityFields>
<recordContainers>
diff --git a/entity/Address_entity/entityfields/city/onValueChange.js b/entity/Address_entity/entityfields/city/onValueChange.js
index 29bde9d486834bcd1fcd747d5ded932d2fe60196..5634474c9dabbfeec7a11ee3c23680b765030b4a 100644
--- a/entity/Address_entity/entityfields/city/onValueChange.js
+++ b/entity/Address_entity/entityfields/city/onValueChange.js
@@ -1,3 +1,3 @@
-import("AddressValidation_lib");
+import("WsValidation_lib");
-AddressValidationUtils.setFields();
\ No newline at end of file
+WsValidationUtils.setAddressFields();
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js b/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bece889b8e3ca6d6141ac5a750d0d068b23dc85a
--- /dev/null
+++ b/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.COUNTRY"))
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/cityvalidation/children/currentvalue_param/valueProcess.js b/entity/Address_entity/entityfields/cityvalidation/children/currentvalue_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..74c070329cde0f8edeabd0e80677b4105b3e256e
--- /dev/null
+++ b/entity/Address_entity/entityfields/cityvalidation/children/currentvalue_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CITY"))
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/zip/onValueChange.js b/entity/Address_entity/entityfields/zip/onValueChange.js
index 29bde9d486834bcd1fcd747d5ded932d2fe60196..5634474c9dabbfeec7a11ee3c23680b765030b4a 100644
--- a/entity/Address_entity/entityfields/zip/onValueChange.js
+++ b/entity/Address_entity/entityfields/zip/onValueChange.js
@@ -1,3 +1,3 @@
-import("AddressValidation_lib");
+import("WsValidation_lib");
-AddressValidationUtils.setFields();
\ No newline at end of file
+WsValidationUtils.setAddressFields();
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/zipvalidation/children/currentvalue_param/valueProcess.js b/entity/Address_entity/entityfields/zipvalidation/children/currentvalue_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d9e7983e6f2422f678b9a024ace857de80d1dc1c
--- /dev/null
+++ b/entity/Address_entity/entityfields/zipvalidation/children/currentvalue_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.ZIP"))
\ No newline at end of file
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 8c6b9a718f75e4de61ef048e2b35769bb5e19a7f..5f8717198f77a83891a85167fc6f39e63aff18b6 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -1,207 +1,207 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
- <name>Appointment_entity</name>
- <title>Termin</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
- <afterUiInit>%aditoprj%/entity/Appointment_entity/afterUiInit.js</afterUiInit>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityField>
- <name>SUMMARY</name>
- <title>Betreff</title>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/summary/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Appointment_entity/entityfields/summary/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>DESCRIPTION</name>
- </entityField>
- <entityField>
- <name>CLASSIFICATION</name>
- <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/dropDownProcess.js</dropDownProcess>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>BEGIN</name>
- <selectionMode>SINGLE</selectionMode>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>END</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
- </entityField>
- <entityFieldGroup>
- <name>STARTEND</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/startend/valueProcess.js</valueProcess>
- <description>FIELDGROUP</description>
- <fields>
- <element>BEGIN</element>
- <element>END</element>
- </fields>
- </entityFieldGroup>
- <entityField>
- <name>STATUS</name>
- <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/status/dropDownProcess.js</dropDownProcess>
- </entityField>
- <entityField>
- <name>LOCATION</name>
- </entityField>
- <entityField>
- <name>REMINDER_CHECK</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>REMINDER</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>CATEGORIES</name>
- <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/dropDownProcess.js</dropDownProcess>
- </entityField>
- <entityField>
- <name>ATTENDEES</name>
- <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/dropDownProcess.js</dropDownProcess>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>TRANSPARENCY</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/transparency/valueProcess.js</valueProcess>
- </entityField>
- <entityActionGroup>
- <name>PartStatActionGroup</name>
- <children>
- <entityActionField>
- <name>accept</name>
- <fieldType>ACTION</fieldType>
- <title>accept</title>
- <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js</onActionProcess>
- <actionOrder v="0" />
- <iconId>VAADIN:CHECK</iconId>
- </entityActionField>
- <entityActionField>
- <name>decline</name>
- <fieldType>ACTION</fieldType>
- <title>decline</title>
- <description></description>
- <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CLOSE</iconId>
- </entityActionField>
- <entityActionField>
- <name>tentative</name>
- <fieldType>ACTION</fieldType>
- <title>tentative</title>
- <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:QUESTION</iconId>
- </entityActionField>
- </children>
- </entityActionGroup>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>jdito</recordContainer>
- </entityProvider>
- <entityParameter>
- <name>MasterEntry_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>ORGANIZER</name>
- </entityField>
- <entityField>
- <name>RRULE</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/rrule/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>RECURRENCEID</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>SAFESCOPEFIELD</name>
- </entityField>
- <entityField>
- <name>MASTERBEGIN</name>
- </entityField>
- <entityField>
- <name>MASTEREND</name>
- </entityField>
- <entityField>
- <name>UID</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/uid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ATTENDEESLENGTH</name>
- </entityField>
- <entityField>
- <name>ICON</name>
- </entityField>
- <entityParameter>
- <name>Entry_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>AnyObjectRowid_param</name>
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>AnyObjectType_param</name>
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>AppointmentLinks</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>AppointmentLink_entity</entityName>
- <fieldName>Links</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AppointmentId_param</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <title>jdito</title>
- <description></description>
- <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>ATTENDEESLENGTH.value</element>
- <element>BEGIN.value</element>
- <element>END.value</element>
- <element>SUMMARY.value</element>
- <element>ORGANIZER.value</element>
- <element>ATTENDEES.value</element>
- <element>STATUS.value</element>
- <element>LINKS.value</element>
- <element>DESCRIPTION.value</element>
- <element>LOCATION.value</element>
- <element>ICON.value</element>
- <element>CLASSIFICATION.value</element>
- <element>TRANSPARENCY.value</element>
- <element>CATEGORIES.value</element>
- <element>REMINDER.value</element>
- <element>REMINDER_CHECK.value</element>
- <element>RRULE.value</element>
- <element>RECURRENCEID.value</element>
- <element>SAFESCOPEFIELD.value</element>
- <element>MASTERBEGIN.value</element>
- <element>MASTEREND.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+ <name>Appointment_entity</name>
+ <title>Termin</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
+ <afterUiInit>%aditoprj%/entity/Appointment_entity/afterUiInit.js</afterUiInit>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityField>
+ <name>SUMMARY</name>
+ <title>Betreff</title>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/summary/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Appointment_entity/entityfields/summary/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATION</name>
+ <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/dropDownProcess.js</dropDownProcess>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>BEGIN</name>
+ <selectionMode>SINGLE</selectionMode>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>END</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
+ </entityField>
+ <entityFieldGroup>
+ <name>STARTEND</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/startend/valueProcess.js</valueProcess>
+ <description>FIELDGROUP</description>
+ <fields>
+ <element>BEGIN</element>
+ <element>END</element>
+ </fields>
+ </entityFieldGroup>
+ <entityField>
+ <name>STATUS</name>
+ <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/status/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityField>
+ <name>LOCATION</name>
+ </entityField>
+ <entityField>
+ <name>REMINDER_CHECK</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>REMINDER</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>CATEGORIES</name>
+ <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityField>
+ <name>ATTENDEES</name>
+ <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/dropDownProcess.js</dropDownProcess>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TRANSPARENCY</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/transparency/valueProcess.js</valueProcess>
+ </entityField>
+ <entityActionGroup>
+ <name>PartStatActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>accept</name>
+ <fieldType>ACTION</fieldType>
+ <title>accept</title>
+ <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js</onActionProcess>
+ <actionOrder v="0" />
+ <iconId>VAADIN:CHECK</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>decline</name>
+ <fieldType>ACTION</fieldType>
+ <title>decline</title>
+ <description></description>
+ <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CLOSE</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>tentative</name>
+ <fieldType>ACTION</fieldType>
+ <title>tentative</title>
+ <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:QUESTION</iconId>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>jdito</recordContainer>
+ </entityProvider>
+ <entityParameter>
+ <name>MasterEntry_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>ORGANIZER</name>
+ </entityField>
+ <entityField>
+ <name>RRULE</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/rrule/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>RECURRENCEID</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SAFESCOPEFIELD</name>
+ </entityField>
+ <entityField>
+ <name>MASTERBEGIN</name>
+ </entityField>
+ <entityField>
+ <name>MASTEREND</name>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/uid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ATTENDEESLENGTH</name>
+ </entityField>
+ <entityField>
+ <name>ICON</name>
+ </entityField>
+ <entityParameter>
+ <name>Entry_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>AnyObjectRowid_param</name>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>AnyObjectType_param</name>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>AppointmentLinks</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AppointmentLink_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AppointmentId_param</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <title>jdito</title>
+ <description></description>
+ <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFields>
+ <element>UID.value</element>
+ <element>ATTENDEESLENGTH.value</element>
+ <element>BEGIN.value</element>
+ <element>END.value</element>
+ <element>SUMMARY.value</element>
+ <element>ORGANIZER.value</element>
+ <element>ATTENDEES.value</element>
+ <element>STATUS.value</element>
+ <element>LINKS.value</element>
+ <element>DESCRIPTION.value</element>
+ <element>LOCATION.value</element>
+ <element>ICON.value</element>
+ <element>CLASSIFICATION.value</element>
+ <element>TRANSPARENCY.value</element>
+ <element>CATEGORIES.value</element>
+ <element>REMINDER.value</element>
+ <element>REMINDER_CHECK.value</element>
+ <element>RRULE.value</element>
+ <element>RECURRENCEID.value</element>
+ <element>SAFESCOPEFIELD.value</element>
+ <element>MASTERBEGIN.value</element>
+ <element>MASTEREND.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod b/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
index 686cff6d7b685734b5f64af07833e6511109693b..0ec44e9eb92c6afa692b644fbbaacb5270166c64 100644
--- a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
+++ b/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
@@ -102,6 +102,18 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionGroup>
+ <name>alter</name>
+ <children>
+ <entityActionField>
+ <name>edit</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
+ <iconId>NEON:PENCIL</iconId>
+ <stateProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -118,7 +130,6 @@
<element>VALUE.displayValue</element>
<element>AB_ATTRIBUTE_ID.value</element>
<element>AB_ATTRIBUTE_ID.displayValue</element>
- <element>ATTRIBUTE_TYPE.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..968606f6bb55c1c682b4781e16f13114a0fc5b75
--- /dev/null
+++ b/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/onActionProcess.js
@@ -0,0 +1,13 @@
+import("ObjectRelation_lib");
+import("system.neon");
+import("system.vars");
+
+if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+{
+ var selectedRows = JSON.parse(vars.get("$sys.selection"));
+ var params = {
+ "ObjectType_param" : vars.get("$param.ObjectType_param"),
+ "ObjectRowId_param" : vars.get("$param.ObjectRowId_param")
+ };
+ neon.openContext("AttributeRelationTree", "AttributeRelationTreeEdit_view", [selectedRows[0]], neon.OPERATINGSTATE_EDIT, params);
+}
\ No newline at end of file
diff --git a/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/stateProcess.js b/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1600aca0c7b87edeec96b9ee5b8424eb9aa55d38
--- /dev/null
+++ b/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/stateProcess.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("Attribute_lib");
+
+var state = neon.COMPONENTSTATE_DISABLED;
+if (vars.exists("$local.rows"))
+{
+ var row = JSON.parse(vars.get("$local.rows"))[0];
+ if (row.AB_ATTRIBUTE_ID)
+ state = neon.COMPONENTSTATE_EDITABLE;
+}
+result.string(state);
\ No newline at end of file
diff --git a/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js b/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js
index fb2ce69024eef40394e9b3155c30bfffb8ed46e5..71b97a1051d5bd3a170845c52e8bfcd419f7355a 100644
--- a/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js
@@ -4,17 +4,30 @@ import("system.db");
import("Attribute_lib");
import("Sql_lib");
-var objectType = vars.get("$param.ObjectType_param");
-var rowId = vars.get("$param.ObjectRowId_param");
-var attributeObj = {};
+var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
+var rowId = vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param");
var allAttributes = [];
-var sqlSelect = "select AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, '', '', AB_ATTRIBUTEID, ATTRIBUTE_NAME, ATTRIBUTE_TYPE from AB_ATTRIBUTE";
+var attributeObj = {};
+var sqlSelect = "select AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, '', '', '', ATTRIBUTE_NAME from AB_ATTRIBUTE";
-var attrCond = SqlCondition.begin()
- .andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", rowId);
-if (objectType != null)
- attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", objectType);
+var attrCond = SqlCondition.begin();
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+{
+ var idVals = vars.get("$local.idvalues");
+ var idCond = SqlCondition.begin();
+ idVals.forEach(function (id)
+ {
+ idCond.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", id);
+ });
+ attrCond.andSqlCondition(idCond);
+}
+else if (rowId)
+{
+ attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", rowId);
+ if (objectType != null)
+ attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", objectType);
+}
var defaultFields = [
"AB_ATTRIBUTERELATIONID",
"AB_ATTRIBUTE.AB_ATTRIBUTEID",
@@ -41,13 +54,15 @@ var attributeValues = db.table(attributeSql).map(function (row)
else
viewValue = AttributeTypeUtil.getAttributeViewValue(row[3].trim(), value, row[5]);
- return [row[0], row[2], value, viewValue, attributeId, attributeName, row[3]];
+ return [row[0], row[2], value, viewValue, attributeId, attributeName];
});
_fetchAttributes(attributeValues.map(function (row) {return row[1]}));
allAttributes = _sortArrayForTree(allAttributes).concat(attributeValues);
+
+
result.object(allAttributes);
function _fetchAttributes (pAttributeIds)
diff --git a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onInsert.js b/entity/AttributeRelationTree_entity/recordcontainers/jdito/onInsert.js
index ba344ff704777c942370bfbe0731b2a80e69660a..966cc3043ec5a1db5f1e2c05fa1e7e92c83c1f04 100644
--- a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/AttributeRelationTree_entity/recordcontainers/jdito/onInsert.js
@@ -4,28 +4,27 @@ import("system.db");
import("system.vars");
import("Attribute_lib");
+var columns = [
+ "AB_ATTRIBUTERELATIONID",
+ "AB_ATTRIBUTE_ID",
+ "OBJECT_ROWID",
+ "OBJECT_TYPE",
+ "DATE_NEW",
+ "USER_NEW"
+];
+var values = [
+ util.getNewUUID(),
+ vars.get("$field.AB_ATTRIBUTE_ID"),
+ vars.get("$param.ObjectRowId_param"),
+ vars.get("$param.ObjectType_param"),
+ vars.get("$sys.date"),
+ vars.get("$sys.user")
+];
var type = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
var valueField = AttributeTypeUtil.getDatabaseField(type);
-
if (valueField)
{
- var columns = [
- "AB_ATTRIBUTERELATIONID",
- "AB_ATTRIBUTE_ID",
- "OBJECT_ROWID",
- "OBJECT_TYPE",
- "DATE_NEW",
- "USER_NEW",
- valueField
- ];
- var values = [
- util.getNewUUID(),
- vars.get("$field.AB_ATTRIBUTE_ID"),
- vars.get("$param.ObjectRowId_param"),
- vars.get("$param.ObjectType_param"),
- String(datetime.date()),
- vars.get("$sys.user"),
- vars.get("$field.VALUE")
- ];
- db.insertData("AB_ATTRIBUTERELATION", columns, null, values);
-}
\ No newline at end of file
+ columns.push(valueField);
+ values.push(vars.get("$field.VALUE"));
+}
+db.insertData("AB_ATTRIBUTERELATION", columns, null, values);
diff --git a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onUpdate.js b/entity/AttributeRelationTree_entity/recordcontainers/jdito/onUpdate.js
index ffe8298ae35f313e717bb0895c2ca41e3a84141e..6eb94014514b4a6aa7fc68f96c4666019ad2d78a 100644
--- a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/AttributeRelationTree_entity/recordcontainers/jdito/onUpdate.js
@@ -7,19 +7,23 @@ import("Attribute_lib");
var type = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
var columns = [
- "AB_ATTRIBUTE_ID"
+ "AB_ATTRIBUTE_ID",
+ "DATE_EDIT",
+ "USER_EDIT"
];
var values = [
- vars.get("$field.AB_ATTRIBUTE_ID")
+ vars.get("$field.AB_ATTRIBUTE_ID"),
+ vars.get("$sys.date"),
+ vars.get("$sys.user")
];
var dbFields = AttributeTypeUtil.getAllDatabaseFields();
dbFields.forEach(function (row)
{
columns.push(row);
- values.push("");
+ values.push(""); //set every field but the correct value field to null
});
-values[AttributeTypeUtil.getTypeColumnIndex(type) + 1] = vars.get("$field.VALUE");
+values[AttributeTypeUtil.getTypeColumnIndex(type) + 3] = vars.get("$field.VALUE");
db.updateData("AB_ATTRIBUTERELATION", columns, null, values,
- SqlCondition.begin().andPrepareVars("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", "$field.UID"));
\ No newline at end of file
+ SqlCondition.begin().andPrepareVars("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", "$field.UID").build("1=2"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index d637e6c685743f87e214bb16bd199cc7b2e8693a..687bb7a6d0d036983aabefb881c779fc33b56ceb 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -1,318 +1,319 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
- <name>Attribute_entity</name>
- <title>Attribute</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
- <afterUiInit>%aditoprj%/entity/Attribute_entity/afterUiInit.js</afterUiInit>
- <onValidation>%aditoprj%/entity/Attribute_entity/onValidation.js</onValidation>
- <iconId>VAADIN:TAG</iconId>
- <titleProcess>%aditoprj%/entity/Attribute_entity/titleProcess.js</titleProcess>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>ATTRIBUTE_NAME</name>
- <title>Name</title>
- <mandatory v="true" />
- <state>EDITABLE</state>
- </entityField>
- <entityField>
- <name>ATTRIBUTE_TYPE</name>
- <title>Type</title>
- <consumer>KeywordAttributeTypes</consumer>
- <mandatory v="true" />
- <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/onValueChange.js</onValueChange>
- </entityField>
- <entityField>
- <name>ATTRIBUTE_PARENT_ID</name>
- <title>Superordinate Attribute</title>
- <consumer>AttributeGroup</consumer>
- <linkedContext>Attribute</linkedContext>
- <searchable v="false" />
- <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js</displayValueProcess>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
- </entityField>
- <entityConsumer>
- <name>AttributeChildren</name>
- <title>Attributes</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>AttributeParent</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AttrParentId_param</name>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/valueProcess.js</valueProcess>
- <expose v="false" />
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>AttrParentType_param</name>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/valueProcess.js</valueProcess>
- <expose v="false" />
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityProvider>
- <name>AttributeParent</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>18bd148d-bed3-429f-ba54-c5eac76c5083</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>AttributeChildren</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>9fb3569c-7c75-48b1-9dc0-3f707940813a</name>
- <entityName>Employee_entity</entityName>
- <fieldName>Departments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>AttrParentType_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>AttrParentId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>AttrParentId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>AttributeUsages</name>
- <title>Usage</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeUsage_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AttributeId_param</name>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/valueProcess.js</valueProcess>
- <expose v="false" />
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>ATTRIBUTE_ACTIVE</name>
- <title>Active</title>
- <contentType>BOOLEAN</contentType>
- <dropDownProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/dropDownProcess.js</dropDownProcess>
- <groupable v="true" />
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/valueProcess.js</valueProcess>
- </entityField>
- <entityConsumer>
- <name>KeywordAttributeTypes</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>KEYWORD_CONTAINER</name>
- <title>Keyword</title>
- <dropDownProcess>%aditoprj%/entity/Attribute_entity/entityfields/keyword_container/dropDownProcess.js</dropDownProcess>
- <searchable v="false" />
- <state>AUTO</state>
- <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js</stateProcess>
- </entityField>
- <entityParameter>
- <name>AttrParentType_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>SpecificAttribute</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <lookupIdfield>UID</lookupIdfield>
- <dependencies>
- <entityDependency>
- <name>342e8ba6-db61-411b-9f79-e9271335b00f</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ba3b4d47-7385-49df-bf61-54c99f5b2c81</name>
- <entityName>AttributeRelationTree_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>FilteredAttributeIds_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>DisplaySimpleName_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>AttrParentId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>AttrParentType_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>GetGroups_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>FULL_ATTRIBUTE_NAME</name>
- <title>Name</title>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>FilteredAttributeIds_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityActionGroup>
- <name>AttributeActions</name>
- <children>
- <entityActionField>
- <name>newChildAttribute</name>
- <fieldType>ACTION</fieldType>
- <title>New attribute</title>
- <onActionProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="false" />
- <isSelectionAction v="true" />
- <iconId>VAADIN:FILE_TREE_SMALL</iconId>
- <tooltipProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
- <entityParameter>
- <name>GetGroups_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>DisplaySimpleName_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>USAGELIST</name>
- <title>Usage</title>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/usagelist/valueProcess.js</valueProcess>
- </entityField>
- <entityProvider>
- <name>AttributeGroups</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <children>
- <entityParameter>
- <name>GetGroups_param</name>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroups/children/getgroups_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>AttrParentId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityConsumer>
- <name>AttributeGroup</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>AttributeGroups</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AttrParentId_param</name>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroup/children/attrparentid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- </entityField>
- <entityField>
- <name>UID</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>SORTING</name>
- <title>Sorting</title>
- <searchable v="false" />
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>ATTRIBUTE_ACTIVE.value</element>
- <element>ATTRIBUTE_NAME.value</element>
- <element>ATTRIBUTE_PARENT_ID.value</element>
- <element>ATTRIBUTE_TYPE.value</element>
- <element>ATTRIBUTE_TYPE.displayValue</element>
- <element>KEYWORD_CONTAINER.value</element>
- <element>SORTING.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+ <name>Attribute_entity</name>
+ <title>Attribute</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
+ <afterUiInit>%aditoprj%/entity/Attribute_entity/afterUiInit.js</afterUiInit>
+ <onValidation>%aditoprj%/entity/Attribute_entity/onValidation.js</onValidation>
+ <iconId>VAADIN:TAG</iconId>
+ <titleProcess>%aditoprj%/entity/Attribute_entity/titleProcess.js</titleProcess>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>ATTRIBUTE_NAME</name>
+ <title>Name</title>
+ <mandatory v="true" />
+ <state>EDITABLE</state>
+ </entityField>
+ <entityField>
+ <name>ATTRIBUTE_TYPE</name>
+ <title>Type</title>
+ <consumer>KeywordAttributeTypes</consumer>
+ <mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/onValueChange.js</onValueChange>
+ </entityField>
+ <entityField>
+ <name>ATTRIBUTE_PARENT_ID</name>
+ <title>Superordinate Attribute</title>
+ <consumer>AttributeGroup</consumer>
+ <linkedContext>Attribute</linkedContext>
+ <searchable v="false" />
+ <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityConsumer>
+ <name>AttributeChildren</name>
+ <title>Attributes</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>AttributeParent</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AttrParentId_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttrParentType_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>AttributeParent</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>18bd148d-bed3-429f-ba54-c5eac76c5083</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>AttributeChildren</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>9fb3569c-7c75-48b1-9dc0-3f707940813a</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Departments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>AttrParentType_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttrParentId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>AttrParentId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>AttributeUsages</name>
+ <title>Usage</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeUsage_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AttributeId_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>ATTRIBUTE_ACTIVE</name>
+ <title>Active</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/dropDownProcess.js</dropDownProcess>
+ <groupable v="true" />
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordAttributeTypes</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>KEYWORD_CONTAINER</name>
+ <title>Keyword</title>
+ <dropDownProcess>%aditoprj%/entity/Attribute_entity/entityfields/keyword_container/dropDownProcess.js</dropDownProcess>
+ <searchable v="false" />
+ <state>AUTO</state>
+ <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js</stateProcess>
+ </entityField>
+ <entityParameter>
+ <name>AttrParentType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>SpecificAttribute</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <lookupIdfield>UID</lookupIdfield>
+ <dependencies>
+ <entityDependency>
+ <name>342e8ba6-db61-411b-9f79-e9271335b00f</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>ba3b4d47-7385-49df-bf61-54c99f5b2c81</name>
+ <entityName>AttributeRelationTree_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>FilteredAttributeIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>DisplaySimpleName_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttrParentId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttrParentType_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>GetGroups_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>FULL_ATTRIBUTE_NAME</name>
+ <title>Name</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>FilteredAttributeIds_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityActionGroup>
+ <name>AttributeActions</name>
+ <children>
+ <entityActionField>
+ <name>newChildAttribute</name>
+ <fieldType>ACTION</fieldType>
+ <title>New attribute</title>
+ <onActionProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <isSelectionAction v="true" />
+ <iconId>VAADIN:FILE_TREE_SMALL</iconId>
+ <tooltipProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityParameter>
+ <name>GetGroups_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>DisplaySimpleName_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>USAGELIST</name>
+ <title>Usage</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/usagelist/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>AttributeGroups</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <children>
+ <entityParameter>
+ <name>GetGroups_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroups/children/getgroups_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttrParentId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>AttributeGroup</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>AttributeGroups</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AttrParentId_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroup/children/attrparentid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>SORTING</name>
+ <title>Sorting</title>
+ <searchable v="false" />
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <isSortable v="true" />
+ <contentProcess>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFields>
+ <element>UID.value</element>
+ <element>ATTRIBUTE_ACTIVE.value</element>
+ <element>ATTRIBUTE_NAME.value</element>
+ <element>ATTRIBUTE_PARENT_ID.value</element>
+ <element>ATTRIBUTE_TYPE.value</element>
+ <element>ATTRIBUTE_TYPE.displayValue</element>
+ <element>KEYWORD_CONTAINER.value</element>
+ <element>SORTING.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js b/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
index 67de95ea15b0707ce1a44627ba5a60b92cb5e917..b72e57d775c59b92691cda3fa4bdf03454c8e77c 100644
--- a/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
@@ -4,7 +4,7 @@ import("system.result");
import("Attribute_lib");
var fieldState;
-if (vars.get("$field.ATTRIBUTE_TYPE").trim() == $AttributeTypes.KEYWORD && !AttributeUtil.hasRelations(vars.get("$field.AB_ATTRIBUTEID")))
+if (vars.get("$field.ATTRIBUTE_TYPE").trim() == $AttributeTypes.KEYWORD && !AttributeUtil.hasRelations(vars.get("$field.UID")))
fieldState = neon.COMPONENTSTATE_EDITABLE;
else
fieldState = neon.COMPONENTSTATE_READONLY;
diff --git a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
index db6a619a464b63ba118b82c8cf51e07f55a8ccea..925c8d353f8aade0cc25efe331689cb0bee7376a 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
@@ -63,7 +63,7 @@ else
if (vars.exists("$local.filter") && vars.get("$local.filter"))
{
var filter = vars.get("$local.filter");
- condition.andSqlCondition((JditoFilterUtils.getSqlCondition(filter, "AB_ATTRIBUTE")));
+ condition.andSqlCondition(JditoFilterUtils.getSqlCondition(filter, "AB_ATTRIBUTE"));
}
var attributes = db.table(condition.buildSql(sqlSelect, "1=1", sqlOrder));
diff --git a/entity/Attribute_entity/titleProcess.js b/entity/Attribute_entity/titleProcess.js
index e55588aa4fb9dea4ee26b065951ab47b1ad43256..0eb44535e0b26ca7b387f2ba0cd5634f519ce0c1 100644
--- a/entity/Attribute_entity/titleProcess.js
+++ b/entity/Attribute_entity/titleProcess.js
@@ -1,4 +1,5 @@
+import("Context_lib");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.FULL_ATTRIBUTE_NAME"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.FULL_ATTRIBUTE_NAME")));
\ No newline at end of file
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 4acb1df3e0e6ebeb8aa288079fe8495cbb82155c..0403fc04b9cae3305eed3203e139b26f2b3baeb5 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -208,15 +208,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/Communication_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
- <entityConsumer>
- <name>AddressValidator</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>AddressValidation_entity</entityName>
- <fieldName>ZipValidaton</fieldName>
- </dependency>
- </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Communication_entity/entityfields/addr/onValueChange.js b/entity/Communication_entity/entityfields/addr/onValueChange.js
index c6bc6676a2735c9892523a68b9719a4949cbf414..95fae13ee0276228a3a474b6fbd4ce0510da00af 100644
--- a/entity/Communication_entity/entityfields/addr/onValueChange.js
+++ b/entity/Communication_entity/entityfields/addr/onValueChange.js
@@ -1,10 +1,8 @@
-import("system.util");
-import("system.net");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
+import("WsValidation_lib");
import("system.neon");
-import("PostalAddress_lib");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.vars");
var addr = vars.get("$this.value");
@@ -17,20 +15,9 @@ if (addr)
switch (commCategory)
{
case "TELEPHONE": // Phone
- if(addr.length > 5) // https://services.aditosoftware.local/services/rest/ws_checkPhoneNumber?Number=017666862716&Country=DE
+ if(addr.length > 5)
{
- var url = "https://services.aditosoftware.local/services/rest/ws_checkPhoneNumber";
- var actionType = "GET";
-
- var ret = JSON.parse(net.callRestWebserviceBasicAuth(url, actionType, {Number:addr, Country:vars.get("$param.ContactsMainCountry_param")}, null, null, "text/plain", "text/plain", util.DATA_TEXT, util.DATA_TEXT, "Admin", "a", true));
- if (ret.hasHttpSuccessStatusCode)
- {
- neon.setFieldValue("$field.ADDR", ret.body);
- }
- else
- {
- // error handling
- }
+ neon.setFieldValue("$field.ADDR", WsValidationUtils.validate(addr, WsValidationType.get().TYPE_PHONE, vars.get("$param.ContactsMainCountry_param")));
}
break;
default:
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 47279e3e9047039685e03cb35436713de26e56ef..d70d8d0861ddb402b8eb3e22bedb8a9045f04bdf 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -2,6 +2,7 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
<name>Contact_entity</name>
<title>Contact</title>
+ <description></description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
<onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
@@ -27,7 +28,6 @@
<title>Company</title>
<consumer>Organisations</consumer>
<mandatory v="false" />
- <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
<onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValidation.js</onValidation>
</entityField>
<entityField>
@@ -299,10 +299,6 @@
<name>DATE_EDIT.value</name>
<recordfield>CONTACT.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORGANISATION_ID.displayValue</name>
- <recordfield>ORGANISATION.NAME</recordfield>
- </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js b/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js
deleted file mode 100644
index 460b39849d5d34bac95e4b987d28a665b732e860..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.db");
-import("system.vars");
-import("Contact_lib");
-
-var organisationId = vars.get("$field.ORGANISATION_ID");
-var res = OrganisationUtils.getNameByOrganisationId(organisationId);
-
-result.string(res);
\ No newline at end of file
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 44a014580a0ff0021dc0615d8563af6e6824f303..9b98cff5472e6ba4055a3df13cf89c01c73b2ce4 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -317,7 +317,7 @@
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attribute Tree</title>
+ <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Contract_entity/titleProcess.js b/entity/Contract_entity/titleProcess.js
index 46f60176775fe07563734ff5f62aa714afa71e45..3432c05f4a705f9e680c966699b8250a10f8fe53 100644
--- a/entity/Contract_entity/titleProcess.js
+++ b/entity/Contract_entity/titleProcess.js
@@ -1,4 +1,5 @@
+import("Context_lib");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.CONTRACTCODE_DISPLAY_fieldGroup"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.CONTRACTCODE_DISPLAY_fieldGroup")));
\ No newline at end of file
diff --git a/entity/Countries_Entity/titleProcess.js b/entity/Countries_Entity/titleProcess.js
index 6a1357835421f5c8fe5231388b03ee15dd29f58b..27c78a47f571add3d25469cb7eaa9b3662cb62b3 100644
--- a/entity/Countries_Entity/titleProcess.js
+++ b/entity/Countries_Entity/titleProcess.js
@@ -1,3 +1,4 @@
+import("Context_lib");
import("system.result");
import("system.vars");
-result.string(vars.get("$field.NAME_TRANSLATED"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.NAME_TRANSLATED")));
\ No newline at end of file
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index 764e26b15ee4467ef40e035d5325d3e69a448c8d..d98333d1732a46415ccb536481e1e2ed274cfc0d 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
- <name>EmployeeRole_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>UserTitle_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>EmployeeRoles</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
- <entityName>Employee_entity</entityName>
- <fieldName>EmployeeRoles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>UserTitle_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>ROLE</name>
- <title>Role</title>
- <dropDownProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/role/dropDownProcess.js</dropDownProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>ROLE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+ <name>EmployeeRole_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>EmployeeRoles</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>EmployeeRoles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>ROLE</name>
+ <title>Role</title>
+ <dropDownProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/role/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFields>
+ <element>UID.value</element>
+ <element>ROLE.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 7e0ba4a30d02e3ab85439f4d4da308f3210b875c..50241620f1d3c672ea4dbb57eeb370073f605b77 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -176,7 +176,7 @@
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attribute Tree</title>
+ <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Employee_entity/titleProcess.js b/entity/Employee_entity/titleProcess.js
index cfe8dbda0147ed4ce85bc5394e118459edb315d1..2c946bc446bdc882880d688ae373ebdf8561a225 100644
--- a/entity/Employee_entity/titleProcess.js
+++ b/entity/Employee_entity/titleProcess.js
@@ -1,4 +1,5 @@
+import("Context_lib");
import("system.vars");
import("system.result");
-result.string((vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME")).trim());
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle((vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME")).trim()));
\ No newline at end of file
diff --git a/entity/KeywordAttribute_entity/titleProcess.js b/entity/KeywordAttribute_entity/titleProcess.js
index 28fd67de270b497ba718dd4e91766bd22936f67e..53fee4be6adf0706c04c01952405a9792b65feb5 100644
--- a/entity/KeywordAttribute_entity/titleProcess.js
+++ b/entity/KeywordAttribute_entity/titleProcess.js
@@ -1,4 +1,5 @@
+import("Context_lib");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.NAME"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.NAME")));
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/titleProcess.js b/entity/KeywordEntry_entity/titleProcess.js
index a907335e8d11cf3ec8c18651257f5ab8d96a29b9..3a9950b109a01757e0892bf8cbbd3c8205514385 100644
--- a/entity/KeywordEntry_entity/titleProcess.js
+++ b/entity/KeywordEntry_entity/titleProcess.js
@@ -1,4 +1,5 @@
+import("Context_lib");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.TITLE_TRANSLATED"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.TITLE_TRANSLATED")));
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/titleProcess.js b/entity/ObjectRelationType_entity/titleProcess.js
index dbc0c500302fcbb7dfe706e35445f9f01952daa5..5f55a99abcb8803e2573f23cf9027f7da40370a6 100644
--- a/entity/ObjectRelationType_entity/titleProcess.js
+++ b/entity/ObjectRelationType_entity/titleProcess.js
@@ -1,12 +1,13 @@
+import("Context_lib");
import("system.translate");
import("system.vars");
import("system.result");
if (vars.exists("$param.OnlyFirstSide_param") && vars.get("$param.OnlyFirstSide_param") == "1" && vars.get("$field.DIRECTION") != "same")
{
- result.string(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE")));
+ result.string(ContextUtils.prefixWithCurrentContextTitle(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE"))));
}
else
{
- result.string(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")));
+ result.string(ContextUtils.prefixWithCurrentContextTitle(translate.text(vars.get("$field.SOURCE_RELATION_TITLE"))));
}
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index aa8c9536c0696b617a460c43786e8976eeef9366..32bcd06f2db48d231004a1dd344f8ce5cc85144b 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -240,17 +240,6 @@
<element>VERSNR</element>
</fields>
</entityFieldGroup>
- <entityFieldGroup>
- <name>Offer_OfferCode_VersNr_fieldgroup</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offer_offercode_versnr_fieldgroup/valueProcess.js</valueProcess>
- <title>Offer number</title>
- <description>"Offer " + OfferCode + VersNr</description>
- <state>READONLY</state>
- <fields>
- <element>OFFERCODE</element>
- <element>VERSNR</element>
- </fields>
- </entityFieldGroup>
<entityParameter>
<name>ContactId_param</name>
<expose v="true" />
@@ -659,7 +648,7 @@
</entityParameter>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attribute Tree</title>
+ <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Offer_entity/entityfields/offer_offercode_versnr_fieldgroup/valueProcess.js b/entity/Offer_entity/entityfields/offer_offercode_versnr_fieldgroup/valueProcess.js
deleted file mode 100644
index 6b1c8c5befc8421b5acd2fb8a5a3265d71202e4c..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/offer_offercode_versnr_fieldgroup/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-// TODO: Kern-Fix, VersNr wird bei indirektem Aufruf nicht geladen, wenn kein "$field.VERSNR" hier ist:
-"$field.VERSNR"
-
-result.string(translate.text("Offer") + " " + vars.get("$field.OfferCode_VersNr_fieldgroup"));
diff --git a/entity/Offer_entity/titleProcess.js b/entity/Offer_entity/titleProcess.js
index b5301f43f0d44e22f8ee928719b999098e446a51..7baf0cfba8e76a9744e1b9a3253f7f4f8ee97e86 100644
--- a/entity/Offer_entity/titleProcess.js
+++ b/entity/Offer_entity/titleProcess.js
@@ -1,4 +1,5 @@
+import("Context_lib");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.Offer_OfferCode_VersNr_fieldgroup"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.OfferCode_VersNr_fieldgroup")));
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 0afa28adacc332d4fabaca6ccb890838a0b1cd89..5276e8dd948989609f2ee8a23c7aedc95013c5ed 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -203,17 +203,6 @@
<element>VERSNR</element>
</fields>
</entityFieldGroup>
- <entityFieldGroup>
- <name>Order_OrderCode_VersNr_fieldgroup</name>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_ordercode_versnr_fieldgroup/valueProcess.js</valueProcess>
- <title>Receipt number</title>
- <description>"Receipt " + ReceiptCode + VersNr</description>
- <state>READONLY</state>
- <fields>
- <element>SALESORDERCODE</element>
- <element>VERSNR</element>
- </fields>
- </entityFieldGroup>
<entityParameter>
<name>ContactId_param</name>
<expose v="true" />
diff --git a/entity/Order_entity/entityfields/order_ordercode_versnr_fieldgroup/valueProcess.js b/entity/Order_entity/entityfields/order_ordercode_versnr_fieldgroup/valueProcess.js
deleted file mode 100644
index 777196873cb611d0ad72ee486c0ff35c964a3da8..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/order_ordercode_versnr_fieldgroup/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-// TODO: Kern-Fix, VersNr wird bei indirektem Aufruf nicht geladen, wenn kein "$field.VERSNR" hier ist:
-"$field.VERSNR"
-
-result.string(translate.text("Order") + " " + vars.get("$field.OrderCode_VersNr_fieldgroup"));
diff --git a/entity/Order_entity/titleProcess.js b/entity/Order_entity/titleProcess.js
index f9b8aea4a9a3b5f300dde8fc9cbf5863a59ec3e5..37977fc62e9742a3d34b3cea24de1cbabe06cfa1 100644
--- a/entity/Order_entity/titleProcess.js
+++ b/entity/Order_entity/titleProcess.js
@@ -1,5 +1,6 @@
+import("Context_lib");
import("system.translate");
import("system.vars");
import("system.result");
-result.string(translate.text("Receipt") + " " + vars.get("$field.OrderCode_VersNr_fieldgroup"));
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.OrderCode_VersNr_fieldgroup")));
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 5883488ecd9db9780253ac0020dbefef97442b92..4f8480dde6cb70b1226903dfcbd1902e249f19b0 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -708,7 +708,7 @@
</entityParameter>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attribute Tree</title>
+ <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Organisation_entity/titleProcess.js b/entity/Organisation_entity/titleProcess.js
index dffd0bd73b994f31efe37f60430ab35fe4150c02..5f2cd996da8492d6c6ce7a7df50a7a14e47c5796 100644
--- a/entity/Organisation_entity/titleProcess.js
+++ b/entity/Organisation_entity/titleProcess.js
@@ -1,4 +1,5 @@
+import("Context_lib");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.NAME"))
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.NAME")))
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 4d1e9b5b53405ae0551cb18d9752e4ccd9be118a..f4638b66ba074d976d30caa2f485273864d21490 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -696,16 +696,19 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>DEPARTMENT</name>
<title>Department</title>
<dropDownProcess>%aditoprj%/entity/Person_entity/entityfields/department/dropDownProcess.js</dropDownProcess>
+ <textInputAllowed v="true" />
</entityField>
<entityField>
<name>POSITION</name>
<title>Position</title>
<dropDownProcess>%aditoprj%/entity/Person_entity/entityfields/position/dropDownProcess.js</dropDownProcess>
+ <textInputAllowed v="true" />
</entityField>
<entityField>
<name>CONTACTROLE</name>
<title>Contactrole</title>
<dropDownProcess>%aditoprj%/entity/Person_entity/entityfields/contactrole/dropDownProcess.js</dropDownProcess>
+ <textInputAllowed v="true" />
</entityField>
<entityConsumer>
<name>OtherContacts</name>
@@ -795,7 +798,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityActionField>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attribute Tree</title>
+ <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Person_entity/titleProcess.js b/entity/Person_entity/titleProcess.js
index abaa3df1566528e8dc3e5aad91ac26ab26fe5418..5f2140b1f8870c878bfc8b06a633618471df0aa5 100644
--- a/entity/Person_entity/titleProcess.js
+++ b/entity/Person_entity/titleProcess.js
@@ -1,3 +1,4 @@
+import("Context_lib");
import("system.vars");
import("system.result");
import("Util_lib");
@@ -13,4 +14,4 @@ contact.lastname = vars.get("$field.LASTNAME");
contact.organisationName = vars.get("$field.ORGANISATION_NAME");
var renderer = new ContactTitleRenderer(contact, null);
-result.string(renderer.asString());
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(renderer.asString()));
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index fdd59612ca0fb4c50c12744d2bc2a70c3477f12a..010fc23042d719f2f9176c18e359c98791d0092e 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -415,7 +415,7 @@
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attribute Tree</title>
+ <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Product_entity/titleProcess.js b/entity/Product_entity/titleProcess.js
index 4f684f8c2a25b7c72fb953b045428c87e7271751..1df7a714a4dde816d9dded4520659233e3282e80 100644
--- a/entity/Product_entity/titleProcess.js
+++ b/entity/Product_entity/titleProcess.js
@@ -1,4 +1,5 @@
+import("Context_lib");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.PRODUCTNAME"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.PRODUCTNAME")));
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 2a4a101c97044df295f234220003729435a5439c..4bcf65351c33b6fdf2475b7d12f731588c1b6e38 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -91,7 +91,6 @@
<documentation>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/documentation.adoc</documentation>
<title>Price list</title>
<consumer>KeywordPricelists</consumer>
- <mandatoryProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/mandatoryProcess.js</mandatoryProcess>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/titleProcess.js</titleProcess>
diff --git a/entity/Productprice_entity/entityfields/pricelist/mandatoryProcess.js b/entity/Productprice_entity/entityfields/pricelist/mandatoryProcess.js
deleted file mode 100644
index a58e5c2bf7ea484c0a9038f0846ecec2f42be31b..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/entityfields/pricelist/mandatoryProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.CONTACT_ID") != "")
- result.string("false");
-else
- result.string("true");
-
-
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
index 2ecbfd1241b467c88b39b84850fff4f41f1dc8fb..706da95ed47ea12a7daeb2d3aeec0fd5574c0737 100644
--- a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
+++ b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
- <name>SalesprojectAnalyses_entity</name>
- <title>Salesproject Analyses</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/SalesprojectAnalyses_entity/documentation.adoc</documentation>
- <iconId>VAADIN:PIE_CHART</iconId>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityField>
- <name>SORTING</name>
- <title>Parent</title>
- </entityField>
- <entityField>
- <name>X_PHASE</name>
- <title>Phase</title>
- </entityField>
- <entityField>
- <name>Y_COUNT</name>
- <title>Count</title>
- </entityField>
- <entityField>
- <name>OVERALL_TURNOVER</name>
- <contentType>NUMBER</contentType>
- <state>READONLY</state>
- <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/titleProcess.js</titleProcess>
- <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OVERALL_FORECAST</name>
- <contentType>NUMBER</contentType>
- <state>READONLY</state>
- <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/titleProcess.js</titleProcess>
- <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>SENT_OFFERS</name>
- <title>Sent offers</title>
- <contentType>NUMBER</contentType>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OPEN_SALESPROJECTS</name>
- <title>Open salesprojects</title>
- <contentType>NUMBER</contentType>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js</valueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>X_PHASE.value</element>
- <element>Y_COUNT.value</element>
- <element>SORTING.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+ <name>SalesprojectAnalyses_entity</name>
+ <title>Salesproject Analyses</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/SalesprojectAnalyses_entity/documentation.adoc</documentation>
+ <iconId>VAADIN:PIE_CHART</iconId>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>SORTING</name>
+ <title>Parent</title>
+ </entityField>
+ <entityField>
+ <name>X_PHASE</name>
+ <title>Phase</title>
+ </entityField>
+ <entityField>
+ <name>Y_COUNT</name>
+ <title>Count</title>
+ </entityField>
+ <entityField>
+ <name>OVERALL_TURNOVER</name>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OVERALL_FORECAST</name>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SENT_OFFERS</name>
+ <title>Sent offers</title>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OPEN_SALESPROJECTS</name>
+ <title>Open salesprojects</title>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ <element>X_PHASE.value</element>
+ <element>Y_COUNT.value</element>
+ <element>SORTING.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index d7ab1d5e1965ff38886e17ee91e2b6afb68cea8a..3cce36f25a3003e6a3d2b4b65ffea5aa7d574b28 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -70,7 +70,7 @@
</entityProvider>
<entityField>
<name>CONTACT_ID</name>
- <title>Organisation</title>
+ <title>Company</title>
<consumer>Organisations</consumer>
<linkedContext>Organisation</linkedContext>
<mandatory v="true" />
diff --git a/entity/SalesprojectMilestone_entity/titleProcess.js b/entity/SalesprojectMilestone_entity/titleProcess.js
index 658e8105ef136f6e374f80363f1c1d0ace5fba7e..a5a099447859455db9fc077639edf59dc58e2105 100644
--- a/entity/SalesprojectMilestone_entity/titleProcess.js
+++ b/entity/SalesprojectMilestone_entity/titleProcess.js
@@ -1,10 +1,11 @@
+import("Context_lib");
import("system.vars");
import("system.translate");
import("system.result");
if (vars.exists("$field.TYPE") && vars.get("$field.TYPE"))
{
- result.string(translate.text("Milestones") + " " + translate.text(vars.get("$field.TYPE")));
+ result.string(ContextUtils.prefixWithCurrentContextTitle(translate.text("Milestones") + " " + translate.text(vars.get("$field.TYPE"))));
}
else
- result.string(translate.text("Milestones"));
\ No newline at end of file
+ result.string(ContextUtils.prefixWithCurrentContextTitle(translate.text("Milestones")));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/titleProcess.js b/entity/Salesproject_entity/titleProcess.js
index 96a0a030e216f22364464faa38814240f086e885..bcc2474490ec5415d723b0620ebb1458081b6b17 100644
--- a/entity/Salesproject_entity/titleProcess.js
+++ b/entity/Salesproject_entity/titleProcess.js
@@ -1,4 +1,5 @@
+import("Context_lib");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.PROJECTTITLE"));
\ No newline at end of file
+result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.PROJECTTITLE")));
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 17737fba9c8be7fd4b583c66dc21d5de41829164..32400b4e84b9d76db5d1f3f4a943cba2fade10f7 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -30,6 +30,7 @@
<entityField>
<name>STATUS</name>
<title>{$TASK_STATUS}</title>
+ <colorProcess>%aditoprj%/entity/Task_entity/entityfields/status/colorProcess.js</colorProcess>
<consumer>KeywordStates</consumer>
<mandatory v="true" />
<groupable v="true" />
@@ -401,6 +402,12 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityField>
+ <name>PRIORITY_ICON</name>
+ <colorProcess>%aditoprj%/entity/Task_entity/entityfields/priority_icon/colorProcess.js</colorProcess>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority_icon/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Task_entity/entityfields/priority_icon/colorProcess.js b/entity/Task_entity/entityfields/priority_icon/colorProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7908b6bec6d40dde4f4198ae7e71c9f704fe317e
--- /dev/null
+++ b/entity/Task_entity/entityfields/priority_icon/colorProcess.js
@@ -0,0 +1,20 @@
+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.result");
+
+switch(vars.getString("$field.PRIORITY"))
+{
+ case $KeywordRegistry.taskPriority$none():
+ result.string("$priority-none");
+ break;
+ case $KeywordRegistry.taskPriority$low():
+ result.string("$priority-low");
+ break;
+ case $KeywordRegistry.taskPriority$medium():
+ result.string("$priority-medium");
+ break;
+ case $KeywordRegistry.taskPriority$high():
+ result.string("$priority-high");
+ break;
+}
+
diff --git a/entity/Task_entity/entityfields/priority_icon/valueProcess.js b/entity/Task_entity/entityfields/priority_icon/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5b0877f532698524100e6621a47e0559c094f45e
--- /dev/null
+++ b/entity/Task_entity/entityfields/priority_icon/valueProcess.js
@@ -0,0 +1,20 @@
+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.result");
+
+switch(vars.getString("$field.STATUS"))
+{
+ case $KeywordRegistry.taskStatus$new():
+ result.string("NEON:STATUS_NOT_STARTED");
+ break;
+ case $KeywordRegistry.taskStatus$inProcess():
+ result.string("NEON:STATUS_IN_PROGRESS");
+ break;
+ case $KeywordRegistry.taskStatus$waiting():
+ result.string("NEON:STATUS_WAITING");
+ break;
+ case $KeywordRegistry.taskStatus$ended():
+ result.string("NEON:STATUS_DONE");
+ break;
+}
+
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 8a32c80741c101a0a3c09c68615201f02f46244f..f646a49566867e3216beb25ef3e19157a34ff712 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -3075,6 +3075,24 @@
<entry>
<key>Costs</key>
</entry>
+ <entry>
+ <key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
+ </entry>
+ <entry>
+ <key>file '%0' cannot be read</key>
+ </entry>
+ <entry>
+ <key>Importer</key>
+ </entry>
+ <entry>
+ <key>yyyy-MM-dd HH:mm:ss</key>
+ </entry>
+ <entry>
+ <key>file '%0' does not exist or you have got no permission on this file</key>
+ </entry>
+ <entry>
+ <key>Zip</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 8dd982524f36990bf74d1514e7e66e0126330b98..d62906560ff3b7d1b62b595a140b293caaaf7df4 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3922,6 +3922,25 @@
<key>Costs</key>
<value>Kosten</value>
</entry>
+ <entry>
+ <key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
+ <value>Webservice nicht erreichbar. URL: %0 %1</value>
+ </entry>
+ <entry>
+ <key>file '%0' cannot be read</key>
+ </entry>
+ <entry>
+ <key>Importer</key>
+ </entry>
+ <entry>
+ <key>yyyy-MM-dd HH:mm:ss</key>
+ </entry>
+ <entry>
+ <key>file '%0' does not exist or you have got no permission on this file</key>
+ </entry>
+ <entry>
+ <key>Zip</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 2456f97e58a00d79adfb970ac54654958412a83b..32179aedb6200906195ee6dc3d7682e1d3d98071 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -3108,6 +3108,25 @@
<entry>
<key>Costs</key>
</entry>
+ <entry>
+ <key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
+ <value>Webservice not available. URL: %0 %1</value>
+ </entry>
+ <entry>
+ <key>file '%0' cannot be read</key>
+ </entry>
+ <entry>
+ <key>Importer</key>
+ </entry>
+ <entry>
+ <key>yyyy-MM-dd HH:mm:ss</key>
+ </entry>
+ <entry>
+ <key>file '%0' does not exist or you have got no permission on this file</key>
+ </entry>
+ <entry>
+ <key>Zip</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/AttributeRelation/AttributeRelation.aod b/neonContext/AttributeRelation/AttributeRelation.aod
index 68cbc133a01e391032e99e6abf7378febe7f0d7d..f6365a27cf00e2c7f5ae99430228cd810cbd80a5 100644
--- a/neonContext/AttributeRelation/AttributeRelation.aod
+++ b/neonContext/AttributeRelation/AttributeRelation.aod
@@ -3,13 +3,8 @@
<name>AttributeRelation</name>
<title>Attributes</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>AttributeRelationFilter_view</filterview>
<entity>AttributeRelation_entity</entity>
<references>
- <neonViewReference>
- <name>d21d2e1b-db79-4013-a056-6e9ce35a5757</name>
- <view>AttributeRelationFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>d2970ead-0da7-4fad-9f82-0c02fe85fe2c</name>
<view>AttributeRelationEdit_view</view>
diff --git a/neonContext/AttributeRelationTree/AttributeRelationTree.aod b/neonContext/AttributeRelationTree/AttributeRelationTree.aod
index 9acb4ce97d8d3d086df679b67f01a23ac945eb63..73c73bdd8cef6f24e2de33935f66fd29e1201559 100644
--- a/neonContext/AttributeRelationTree/AttributeRelationTree.aod
+++ b/neonContext/AttributeRelationTree/AttributeRelationTree.aod
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
<name>AttributeRelationTree</name>
+ <title>Attributes</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <editview>AttributeRelationTreeEdit_view</editview>
<entity>AttributeRelationTree_entity</entity>
<references>
<neonViewReference>
diff --git a/neonView/ActivityEdit_view/ActivityEdit_view.aod b/neonView/ActivityEdit_view/ActivityEdit_view.aod
index 4a16fe2dd5f1e1ef88a07a1e8230ba5c1b62a17d..1a13f58ed9080d11516f1fa978b3c99aecda5eb0 100644
--- a/neonView/ActivityEdit_view/ActivityEdit_view.aod
+++ b/neonView/ActivityEdit_view/ActivityEdit_view.aod
@@ -21,7 +21,7 @@
<entityField>SUBJECT</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>1d34b348-3f43-4998-bdf9-538fb25d716f</name>
+ <name>b90a5d96-9d1f-4eeb-b42c-0debeb7cf260</name>
<entityField>INFO</entityField>
</entityFieldLink>
<entityFieldLink>
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index 78a81d68932c0bf91139e730cb800fc2b19df0a3..61c9ff0d3c3ba8a790d07508018003137662577f 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -91,12 +91,33 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <treeViewTemplate>
- <name>ActivitiesTreetable</name>
- <titleField>SUBJECT_DETAILS</titleField>
- <descriptionField>INFO</descriptionField>
- <iconField>#IMAGE</iconField>
+ <treeTableViewTemplate>
+ <name>ActivitiesTreeTable</name>
<entityField>#ENTITY</entityField>
- </treeViewTemplate>
+ <columns>
+ <neonTableColumn>
+ <name>4167708f-b5a4-42ed-848a-cf9bb604f083</name>
+ <entityField>ICON</entityField>
+ <width v="75" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ec8f0488-9a9f-4114-8123-1bc21b1d1f68</name>
+ <entityField>SUBJECT</entityField>
+ <width v="75" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c44d54b5-00b9-4faf-9934-687e3a417b73</name>
+ <entityField>ENTRYDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>f7137699-ae62-48e0-9cd6-e06d37f87f94</name>
+ <entityField>DIRECTION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>385231ab-204f-498a-8bf2-6fca3f59b7a5</name>
+ <entityField>CATEGORY</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
</children>
</neonView>
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index 57a928f08c54150ae14580797d167ace94c4aba2..42982d177130846b1e0191092b595131431be22e 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -29,11 +29,6 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>8ffd03a7-a841-4674-96bf-04689d46cf48</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>f57fb116-d356-47c7-8da6-ee64b4a01b46</name>
<entityField>AttributeTree</entityField>
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index 3ef2a83f526949e497254b822cdde3928d6023ae..74236c8433e8fa39c3666e2c1c8f074d1a2495f2 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -22,14 +22,6 @@
<name>dfaa01a1-0b11-4f92-aa18-89f12ebb2db5</name>
<entityField>COUNTRY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>4e5e6a4f-f43e-4861-a912-fb05e576f960</name>
- <entityField>ADDRESS</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>935bcecf-fdd9-4e82-a53f-3c3082c85340</name>
- <entityField>BUILDINGNO</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>0336ea99-c4a1-4f39-b5aa-a520a7dcbaab</name>
<entityField>ZIP</entityField>
@@ -38,10 +30,6 @@
<name>12727b21-0359-4430-a9c2-54eb48e2e864</name>
<entityField>CITY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>af515eed-da89-49dc-ba3a-30958bd4fedd</name>
- <entityField>DISTRICT</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>29dbb3f5-6f80-4100-aed3-334ac0b9cc48</name>
<entityField>REGION</entityField>
@@ -50,6 +38,14 @@
<name>aafc58cf-7dbb-42cb-b04c-d0869e58d09a</name>
<entityField>STATE</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>4e5e6a4f-f43e-4861-a912-fb05e576f960</name>
+ <entityField>ADDRESS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>935bcecf-fdd9-4e82-a53f-3c3082c85340</name>
+ <entityField>BUILDINGNO</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>6af52273-25bf-4286-83cc-217aea94ad09</name>
<entityField>ADDRIDENTIFIER</entityField>
diff --git a/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod b/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
index a0bf44af7ce2d5e9e872e1025e207d724ec1d3b6..faa59a3cf3f1d1e7cd72f5aa03a5562c6c2f1e06 100644
--- a/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
+++ b/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
@@ -24,10 +24,6 @@
<name>d32d92bf-db7d-443f-b911-6731ea89cf3b</name>
<entityField>COUNTRY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>4035d833-ece7-4562-8acf-51c7a01b8497</name>
- <entityField>DISTRICT</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>05bb9d3b-0e90-4a1a-bfe8-03b7dab6ed01</name>
<entityField>REGION</entityField>
diff --git a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
index 952afaabcfe9ba63036c4edaaf4fff95348d22ba..7ff9546ade23e1956af0503193b9300ee0168276 100644
--- a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
+++ b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
@@ -20,14 +20,6 @@
<name>435f10b8-b6ef-4187-bffc-fc6104a6130c</name>
<entityField>COUNTRY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>ac71d5eb-7ce7-41a0-91aa-5594f2238788</name>
- <entityField>ADDRESS</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>61261845-740e-4f4b-a1f8-5e6aeac2deba</name>
- <entityField>BUILDINGNO</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>c1372a93-cf83-4c55-90e6-3b6b352abebf</name>
<entityField>ZIP</entityField>
@@ -36,10 +28,6 @@
<name>2e7ba632-36ad-4852-bcca-d75bcf3f7de1</name>
<entityField>CITY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>e25f4140-0772-4417-85f0-41052b413c30</name>
- <entityField>DISTRICT</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>b62515bf-e89d-44a9-94ff-933766657fe5</name>
<entityField>REGION</entityField>
@@ -48,6 +36,14 @@
<name>66ae75ca-7a5c-4cf0-b768-6c2900f7b7c6</name>
<entityField>STATE</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>ac71d5eb-7ce7-41a0-91aa-5594f2238788</name>
+ <entityField>ADDRESS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>61261845-740e-4f4b-a1f8-5e6aeac2deba</name>
+ <entityField>BUILDINGNO</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>443b9d7d-dac2-40b2-bb2b-d5e0091877a9</name>
<entityField>ADDRIDENTIFIER</entityField>
diff --git a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
deleted file mode 100644
index c1ce0f20552076fc025129d8f4038c77fae5c629..0000000000000000000000000000000000000000
--- a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>AttributeRelationFilter_view</name>
- <title>Attributes</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>RelationsTable</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>b37d207a-6119-454a-8fc6-073e9d54b1d3</name>
- <entityField>AB_ATTRIBUTE_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>83a10d52-9eaf-4901-935e-2a7410831861</name>
- <entityField>valueProxy</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
index 1eee2f28de6b9b5b3cc9b459b211176b261aa5ef..9aca5c5e4f344b97bea11ba0994634ce74b547f8 100644
--- a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
+++ b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
@@ -11,6 +11,7 @@
<treeTableViewTemplate>
<name>TreeTable</name>
<parentField>PARENT_ID</parentField>
+ <favoriteActionGroup1>alter</favoriteActionGroup1>
<showChildrenCount v="false" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/EmployeeMain_view/EmployeeMain_view.aod b/neonView/EmployeeMain_view/EmployeeMain_view.aod
index 1cbb84296df85b58403b1279cf5f4a87241b3118..66afffaca47467e42f7fdd2a326c4d3996aa8240 100644
--- a/neonView/EmployeeMain_view/EmployeeMain_view.aod
+++ b/neonView/EmployeeMain_view/EmployeeMain_view.aod
@@ -19,11 +19,6 @@
<entityField>EmployeeRoles</entityField>
<view>EmployeeRoleFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>7164f8cd-3892-4694-92ad-fc45afac68f1</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>68e54801-e68f-4797-97d2-368b4b82a7e4</name>
<entityField>AttributeTree</entityField>
diff --git a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
index 80ba451c5ede8eaffae1986389fe751dea73ae1c..e638ae7abde4ea41370b881058de6ddf60251636 100644
--- a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
+++ b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
@@ -9,15 +9,23 @@
</groupLayout>
</layout>
<children>
- <treeViewTemplate>
- <name>EntriesTreetable</name>
- <titleField>TITLE</titleField>
- <descriptionField>KEYID</descriptionField>
+ <treeTableViewTemplate>
+ <name>EntriesTreeTable</name>
<defaultGroupFields>
<element>CONTAINER</element>
</defaultGroupFields>
<entityField>#ENTITY</entityField>
- </treeViewTemplate>
+ <columns>
+ <neonTableColumn>
+ <name>aa5612b4-997e-4f0f-8fb1-91e18e32051d</name>
+ <entityField>TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6100879d-dc6a-4c7e-b750-f5b7e627f48a</name>
+ <entityField>KEYID</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
<tableViewTemplate>
<name>EntriesTable</name>
<entityField>#ENTITY</entityField>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index 9b73e6cfe911f0906c5aed7bc0eb83f034975aca..a28c644d44eab76093e06b9f42354d5dfc181606 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -12,7 +12,7 @@
<cardViewTemplate>
<name>Header</name>
<iconField>IMAGE</iconField>
- <titleField>Offer_OfferCode_VersNr_fieldgroup</titleField>
+ <titleField>OfferCode_VersNr_fieldgroup</titleField>
<descriptionField>CONTACT_ID</descriptionField>
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
index 782aa68ca11efa22d05bcf1a3fba67d2720e4ac2..7071404ce53d0a5ace58c32883ec2581efc4dfc3 100644
--- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
@@ -9,48 +9,48 @@
</boxLayout>
</layout>
<children>
- <tableViewTemplate>
- <name>Offeritems</name>
- <autoNewRow v="true" />
+ <treeTableViewTemplate>
+ <name>OfferitemsTreeTable</name>
+ <parentField>ASSIGNEDTO</parentField>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>8c74810d-d127-4e64-8fbf-1b3db1835232</name>
+ <name>91e85f61-5e5d-48f8-aeb1-a5740ec07e25</name>
<entityField>ITEMPOSITION</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>545f79bf-2fee-4112-9541-0889d0e514eb</name>
+ <name>0d896874-cdb1-42bb-8a47-8ee61def6177</name>
<entityField>PRODUCT_ID</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>2a907da4-b48d-4933-bc17-a40e7d4556f9</name>
+ <name>0b493fd0-d94d-4bfa-8533-ff2ad4af7ffb</name>
<entityField>QUANTITY</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>a8dcb2bb-bb09-4a6e-b0f0-1b4d1111eb22</name>
+ <name>917406b8-f030-417d-a961-f391655526ec</name>
<entityField>UNIT</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>33ef0703-d4ea-4187-b555-648a1733ee99</name>
+ <name>14da5a9f-4fed-4977-aec0-823ab665e1cb</name>
<entityField>PRICE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>61a39c6b-f7dd-487c-bc5f-c2e95376ec37</name>
+ <name>25d9f682-eb5f-4d96-a040-c3f4522affe7</name>
<entityField>DISCOUNT</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>bfd34c94-1a5f-4caf-ae6e-2c09375c023c</name>
+ <name>9e2bcb7e-b042-4f13-946c-0a6422412975</name>
<entityField>VAT</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
+ <name>7a3b3ce6-a651-4a2a-acfa-0e990fb0b041</name>
<entityField>OPTIONAL</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>60a36c38-103f-4fdb-9e8a-b8fd6d441f14</name>
+ <name>e43213db-8867-495f-8305-3472a8906222</name>
<entityField>TotalPrice</entityField>
</neonTableColumn>
</columns>
- </tableViewTemplate>
+ </treeTableViewTemplate>
</children>
</neonView>
diff --git a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
index c93ad8c9ef329db4797b3726f77dafbf10044c28..23999712d4bdbc25fa2fb3171d39e082a6744284 100644
--- a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+++ b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
@@ -24,18 +24,38 @@
<name>3b207cf2-c621-4e7d-b7aa-32feace5fe04</name>
<entityField>INFO</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>9868560c-41c7-4641-b0f1-627a61b796b3</name>
- <entityField>TotalPrice</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>c0c04d1c-90a7-4c0b-9323-1f0783757987</name>
<entityField>GROUPCODEID</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>e792d720-187f-4aa1-917c-1c8065222b72</name>
+ <entityField>QUANTITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9e25804b-198d-4505-b276-62bf58482dc6</name>
+ <entityField>UNIT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>b503187b-db64-4d2f-839f-9e812ee5163e</name>
+ <entityField>PRICE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f8043352-f756-4854-9caa-a9aea073e4fe</name>
+ <entityField>DISCOUNT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>89b426b0-962f-4483-87c3-e6c0e0d0d651</name>
+ <entityField>VAT</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>e25386dc-a740-4f93-a1f0-32317cf5a36a</name>
<entityField>OPTIONAL</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>9868560c-41c7-4641-b0f1-627a61b796b3</name>
+ <entityField>TotalPrice</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index d9aa97ac59cc3bec65c625d8cc72bcb3fa7f37dd..224df4dc3dffd9d2668c7e5453be2c7dfb69507e 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -12,7 +12,7 @@
<cardViewTemplate>
<name>Header</name>
<iconField>IMAGE</iconField>
- <titleField>Order_OrderCode_VersNr_fieldgroup</titleField>
+ <titleField>OrderCode_VersNr_fieldgroup</titleField>
<descriptionField>CONTACT_ID</descriptionField>
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index af17888c14a947777afbc2d620121e72bba2695e..379f16e6021e69e9690f16baf62a95468a27c29d 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -50,11 +50,6 @@
<entityField>ObjectTrees</entityField>
<view>ObjectTreeFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>39c98ccb-7f77-4df0-818f-1f302f69fec4</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>ba50e069-06da-440e-b04a-5a686fcf5303</name>
<entityField>AttributeTree</entityField>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index 6720704e06d6404674dfcbb9408080701567e088..cf6a7e599ef4476efec0ca6ae8b110e64d24732c 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -39,11 +39,6 @@
<entityField>ObjectTrees</entityField>
<view>ObjectTreeFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>be48c6fe-1837-4c40-aef1-130fc1a5c544</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>cf989bf6-3e49-44fc-ba98-322aae377da3</name>
<entityField>AttributeTree</entityField>
diff --git a/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod b/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
index 9faf4b3a3b90ba6298f7590140950c7f2fd9c4d2..1af9aefe816e97e2b921af49e0877b5e844a14db 100644
--- a/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
+++ b/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
@@ -9,13 +9,29 @@
</boxLayout>
</layout>
<children>
- <treeViewTemplate>
- <name>Partlist</name>
+ <treeTableViewTemplate>
+ <name>PartlistTree</name>
<parentField>DEST_ID</parentField>
<favoriteActionGroup1>alter</favoriteActionGroup1>
- <titleField>PRODUCTCODE</titleField>
- <descriptionField>QUANTITY</descriptionField>
<entityField>#ENTITY</entityField>
- </treeViewTemplate>
+ <columns>
+ <neonTableColumn>
+ <name>43d3c9b0-21ab-4996-8d24-af74a5ee1e1a</name>
+ <entityField>PRODUCTCODE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4a80fcac-b962-4af6-93c4-d2f5626fb623</name>
+ <entityField>QUANTITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2382a57f-7bf9-4057-8c3c-51819a06620f</name>
+ <entityField>OPTIONAL</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>3ce55692-e3ff-4448-b7df-9cc121ca47dc</name>
+ <entityField>TAKEPRICE</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
</children>
</neonView>
diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod
index 9f143d1e45b165deb3f534fe5e73f94bd448bada..4ac236a7f2e11b1838d3b1cb44e173e0693fd858 100644
--- a/neonView/ProductMain_view/ProductMain_view.aod
+++ b/neonView/ProductMain_view/ProductMain_view.aod
@@ -44,11 +44,6 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>b069dbb1-fa32-41a7-a40c-918d3d50dd26</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>6ee1258f-b571-45c1-b833-f292361b5a04</name>
<entityField>AttributeTree</entityField>
diff --git a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
index b225f31a95b5abf6de65302cf84b5d1e777e836a..19a4436db74b4df7216d312685839c1b7bda5ec4 100644
--- a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
+++ b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
@@ -11,7 +11,6 @@
<children>
<tableViewTemplate>
<name>Prices</name>
- <autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod b/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
index 3f9f33250c400cb0f9b755e87e229f788ff579c8..9d9bef97dfc888c3202b6d6c207c3d3cbf4bf53c 100644
--- a/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
+++ b/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
@@ -10,45 +10,48 @@
<children>
<tableViewTemplate>
<name>PriceRelations</name>
- <autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>bc7ca35e-c454-4cc0-9b2e-0656e03f1f65</name>
+ <name>44311686-a24a-4cf0-87a0-6e354b3f457a</name>
<entityField>IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>9b809450-cbe5-40f3-8d64-b4a5bac5eb5b</name>
+ <name>695ce7be-d738-48a9-833d-e8815c6eff74</name>
<entityField>PRODUCT_ID</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>fd5ab54d-439c-4836-a761-3af16e437a0e</name>
+ <name>472a96ca-10ff-49c7-b2ae-6550e04c4e6f</name>
<entityField>VALID_FROM</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>da4728b2-d5fe-4df1-84e5-a77a653dc558</name>
+ <name>56b22986-0b94-4e7f-a0e8-c2a0a7281088</name>
<entityField>VALID_TO</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>4fd6845e-cb3a-4fe3-8900-3b58a86cb374</name>
- <entityField>FROMQUANTITY</entityField>
+ <name>56902ebb-b48b-42f9-b867-fb2b07527461</name>
+ <entityField>PRICE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>1cf65759-0c48-4d3d-8bd1-ddf0645ded43</name>
- <entityField>PRICELIST</entityField>
+ <name>8879e46d-fa53-4769-8bcf-15b65fdf9967</name>
+ <entityField>CURRENCY</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>3ed800e0-a630-42b4-9dda-288ab5eefc69</name>
- <entityField>PRICE</entityField>
+ <name>15a669d9-b089-4134-89a0-129de6e1e68c</name>
+ <entityField>BUYSELL</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>20efd64c-297d-4774-b020-437d3610e798</name>
- <entityField>CURRENCY</entityField>
+ <name>e27ad433-ca4f-4a54-8722-75c9055a202b</name>
+ <entityField>FROMQUANTITY</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>787d2cce-ddb0-4d7e-8df4-5675e0d96d76</name>
+ <name>981f29b1-b4c5-4591-8064-21a72f339179</name>
<entityField>VAT</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>51a923d8-3893-409b-869e-a4ad9704aa03</name>
+ <entityField>PRICELIST</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index 71b689354145bd3359f1dc80cfa43ca8ae4510f8..268c1b42d833821c2443c0d287c7ce8537c5f3c1 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -37,7 +37,7 @@
<dateField>MATURITY_DATE</dateField>
<titleField>SUBJECT_DETAILS</titleField>
<descriptionField>DESCRIPTION</descriptionField>
- <iconIdField>#ICON</iconIdField>
+ <iconIdField>PRIORITY_ICON</iconIdField>
<entityField>#ENTITY</entityField>
</timelineViewTemplate>
<tableViewTemplate>
@@ -47,7 +47,7 @@
<columns>
<neonTableColumn>
<name>3cd319ea-5a06-409c-a7ce-1c87beff62d2</name>
- <entityField>#ICON</entityField>
+ <entityField>PRIORITY_ICON</entityField>
</neonTableColumn>
<neonTableColumn>
<name>591cd079-a8e9-49aa-8a2d-afb643aef079</name>
@@ -68,12 +68,32 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <treeViewTemplate>
- <name>TasksTreetable</name>
- <titleField>SUBJECT_DETAILS</titleField>
- <descriptionField>DESCRIPTION</descriptionField>
- <iconField>#ICON</iconField>
+ <treeTableViewTemplate>
+ <name>TasksTreeTable</name>
<entityField>#ENTITY</entityField>
- </treeViewTemplate>
+ <columns>
+ <neonTableColumn>
+ <name>3cd319ea-5a06-409c-a7ce-1c87beff62d2</name>
+ <entityField>PRIORITY_ICON</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>591cd079-a8e9-49aa-8a2d-afb643aef079</name>
+ <entityField>SUBJECT</entityField>
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>5d11add4-d939-4c8e-9633-efd0c2991837</name>
+ <entityField>PRIORITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>abba0283-ace9-41f2-8b98-df149c2feaf9</name>
+ <entityField>MATURITY_DATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>b92dba41-58a2-4c95-aeb4-235c5eaffad7</name>
+ <entityField>STATUS</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
</children>
</neonView>
diff --git a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
index 2bf917aa3e1fa14e6ad7c540b0dbf7e3f50d124f..eabc0658f245ab06e0985c84158f627434bc73bf 100644
--- a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
+++ b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
@@ -10,7 +10,7 @@
<children>
<cardViewTemplate>
<name>Header</name>
- <iconField>#ICON</iconField>
+ <iconField>PRIORITY_ICON</iconField>
<titleField>SUBJECT</titleField>
<descriptionField>STATUS</descriptionField>
<favoriteAction1>newActivity</favoriteAction1>
diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod
index 8ebad251deea0138b7ca14dcd7cc2d9a1c69e3c0..3e7754748bd6046a93ef3a7e0dc0c29d5b9373ef 100644
--- a/neonView/TaskPreview_view/TaskPreview_view.aod
+++ b/neonView/TaskPreview_view/TaskPreview_view.aod
@@ -3,15 +3,14 @@
<name>TaskPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <headerFooterLayout>
+ <boxLayout>
<name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
+ </boxLayout>
</layout>
<children>
<cardViewTemplate>
<name>Header</name>
- <iconField>#ICON</iconField>
+ <iconField>PRIORITY_ICON</iconField>
<titleField>SUBJECT</titleField>
<descriptionField>STATUS</descriptionField>
<favoriteAction1>newActivity</favoriteAction1>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 918e08b8a4338f1a689095c669c22244125cab62..744c534f9d14337eecaaaa48194b806d3225b34c 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -33,4 +33,48 @@
<indexsearchIncrementingIndexerInterval v="1000" />
<indexsearchIncrementingIndexerBunchSize v="250" />
<indexsearchMaximumHits v="50000" />
+ <customProperties>
+ <customBooleanProperty>
+ <name>addressValidation.enable</name>
+ <property v="false" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>addressValidation.url</name>
+ <property>https://services.aditosoftware.local/services/rest/ws_checkAddress</property>
+ </customStringProperty>
+ <customStringProperty>
+ <name>addressValidation.user</name>
+ <property>Admin</property>
+ </customStringProperty>
+ <customStringProperty>
+ <name>addressValidation.pw</name>
+ <property>a</property>
+ </customStringProperty>
+ <customStringProperty>
+ <name>addressValidation.countryParamName</name>
+ <property>country</property>
+ </customStringProperty>
+ <customBooleanProperty>
+ <name>phoneValidation.enable</name>
+ <description></description>
+ <property v="false" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>phoneValidation.url</name>
+ <description></description>
+ <property>https://services.aditosoftware.local/services/rest/ws_checkPhoneNumber</property>
+ </customStringProperty>
+ <customStringProperty>
+ <name>phoneValidation.user</name>
+ <property>Admin</property>
+ </customStringProperty>
+ <customStringProperty>
+ <name>phoneValidation.pw</name>
+ <property>a</property>
+ </customStringProperty>
+ <customStringProperty>
+ <name>phoneValidation.countryParamName</name>
+ <property>Country</property>
+ </customStringProperty>
+ </customProperties>
</preferences>
diff --git a/process/AddressValidation_lib/process.js b/process/AddressValidation_lib/process.js
deleted file mode 100644
index 38e23ed26f06145485c267f0f5b10309b47668cd..0000000000000000000000000000000000000000
--- a/process/AddressValidation_lib/process.js
+++ /dev/null
@@ -1,140 +0,0 @@
-import("system.vars");
-import("system.neon");
-import("system.net");
-import("system.util");
-
-/**
- * Class used for the address validation types.
- * Do not create new instances anywhere else than inside of the get-function!
- * @param {String} pKey the key-name
- * @param {String} pParamName name used by the webservice
- */
-function AddressValidationType(pKey, pParamName)
-{
- this.key = pKey;
- this.paramName = pParamName;
-}
-
-/**
- * get all possible validation types or one specific
- * @param {String} [pKey=undefined] if provided, this function returns only the validation type with this key
- *
- * @return {Object|AddressValidationType} object containing all AddressValidationTypes or one specific AddressValidationType
- */
-AddressValidationType.get = function(pKey)
-{
- if (!this._cache)
- this._cache = {
- TYPE_ZIP: new AddressValidationType("TYPE_ZIP", "zip"),
- TYPE_CITY: new AddressValidationType("TYPE_CITY", "city")
- }
-
- if (pKey)
- return this._cache[pKey];
-
- return this._cache;
-}
-
-/**
- * Class containing utility functions for address validation
- * do not create an instance of this
- *
- * @class
- */
-function AddressValidationUtils() {}
-
-/**
- * validate the value with the webservice
- * @param {String} pValue to search for
- * @param {AddressValidationType|String} pType type used for the search. Can be an AddressValidationType or the key of the AddressValidationType
- * @param {String} pCountry needed by the webservice e.g. "DE"
- *
- * @return {String[][]} [UID,
- * displayName,
- * zip,
- * city,
- * country,
- * district,
- * region,
- * state,
- * value (the result. e.g. if pType was ZIP, the value is the found zip)
- */
-AddressValidationUtils.validate = function(pValue, pType, pCountry)
-{
- // TODO: Options for url, user, pw
- var userName = "Admin";
- var pw = "a";
- var url = "https://services.aditosoftware.local/services/rest/ws_checkAddress";
- var actionType = "GET";
-
- // get AddressValidationType-Object if it is only the key
- if (typeof pType == "string")
- pType = AddressValidationType.get(pType);
-
- if (pValue && pType)
- {
- // fill params
- var parameters = {};
- if (pCountry)
- {
- parameters.country = pCountry;
- }
- parameters[pType.paramName] = pValue;
-
- // call webservice
- var ret = JSON.parse(net.callRestWebserviceBasicAuth(url, actionType, parameters, null, null, "text/plain", "text/plain", util.DATA_TEXT, util.DATA_TEXT, userName, pw, true));
-
- if (ret.hasHttpSuccessStatusCode)
- {
- // add default result consisting of pValue
- var defaultResult = [[{}, pValue]];
- defaultResult[0][0][pType.paramName] = pValue;
-
- return JSON.parse(ret.body)
- .concat(defaultResult)
- .map(function(pAddress)
- {
- var data = pAddress[0];
- return [
- JSON.stringify(data),
- pAddress[1],
- data.zip,
- data.city,
- data.country,
- data.district,
- data.region,
- data.state,
- data[pType.paramName]
- ]
- });
- }
- else
- {
-
- // error handling
- }
- }
-
- return [];
-}
-
-/**
- * set all address-fields by the value of $this.value, which should contain an object of all values as JSON
- */
-AddressValidationUtils.setFields = function()
-{
- var data = JSON.parse(vars.get("$this.value"));
-
- _setField("$field.ZIP", data.zip);
- _setField("$field.COUNTRY", data.country);
- _setField("$field.CITY", data.city);
- _setField("$field.DISTRICT", data.district);
- _setField("$field.REGION", data.region);
- _setField("$field.STATE", data.state);
-
- function _setField(pField, pValue)
- {
- if (pValue)
- neon.setFieldValue(pField, pValue);
- }
-}
\ No newline at end of file
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index a5dc1d48142c32188b217cc22ab06b5b907873b6..e7007a1a0d6df39c40565250f87f9f2f603f8775 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -467,8 +467,8 @@ AttributeTypeUtil.getAttributeViewValue = function (pAttributeType, pValue, pKey
AttributeTypeUtil._initTypeColumnData = function ()
{
- columns = [];
- typeColumnMap = {};
+ var columns = [];
+ var typeColumnMap = {};
for (let type in $AttributeTypes)
{
type = $AttributeTypes[type];
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 59b73f68c2d941b49c16e821da95d5089a5f8628..0890b12f0f1561015d6a9076f40f53cfd90e780d 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -26,6 +26,21 @@ ContextUtils.getCurrentContextId = function()
return vars.getString("$sys.currentcontextname");
}
+/**
+ * Get the title of the current context
+ * Note: The variable contexttitle is not always available.
+ * In this case this function returns ""
+ *
+ * @return {String} Title of the current context
+ */
+ContextUtils.getCurrentContextTitle = function()
+{
+ if (vars.exists("$sys.currentcontexttitle") && vars.get("$sys.currentcontexttitle"))
+ return vars.get("$sys.currentcontexttitle");
+
+ return "";
+}
+
/**
* TODO: use System function. Currently the Name is also the id.
* Returns the Name of a context by the Id
@@ -100,6 +115,21 @@ ContextUtils.getContext = function(pContextId)
return ContextUtils._contextDataMapping(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, pContextId));
}
+/**
+ * Prefix the given title with the current context title. (only if the title is available)
+ * @param {String} pTitle
+ *
+ * @return {String} e.g.: Kontakt - Herr Tim Admin
+ */
+ContextUtils.prefixWithCurrentContextTitle = function(pTitle)
+{
+ var titlePrefix = ContextUtils.getCurrentContextTitle();
+ if (titlePrefix)
+ return titlePrefix + " - " + pTitle;
+
+ return pTitle;
+}
+
/**
* map the contextData from the system.project-lib to [contextId, contextName, contextTitle]
*
diff --git a/process/JditoFilter_lib/process.js b/process/JditoFilter_lib/process.js
index 4f27dfaec8b3cfe738feae91f9e1cea90f6b8320..b4a2be8f420efa8a9453ca8c26f966381000601d 100644
--- a/process/JditoFilter_lib/process.js
+++ b/process/JditoFilter_lib/process.js
@@ -117,7 +117,7 @@ JditoFilterUtils.filterRecords = function (pColumns, pRecords, pFilter)
*
* @param {String|Object} pFilter the filter as JSON
* @param {String} pTable the database table
- * @param {Object} pColumnMap custom mapping for the fields to the DB columns, this is necessary
+ * @param {Object} [pColumnMap=null] custom mapping for the fields to the DB columns, this is necessary
* if the fields are from different tables
*
* @example
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 759ddb72f8d1b650b89efe369806e7fb0655fece..e0e5880779af76669a56eaf4274a3a8f009a977e 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -37,6 +37,10 @@ $KeywordRegistry.organisationType = function(){return "OrganisationType";};
$KeywordRegistry.personGender = function(){return "PersonGender";};
$KeywordRegistry.taskStatus = function(){return "TaskStatus";};
$KeywordRegistry.taskStatus$new = function(){return "21bc4d20-1a87-4247-8f7c-8d3a09631850";};
+$KeywordRegistry.taskStatus$inProcess = function(){return "b1fd456f-f5d2-459e-b467-76e2914c8169";};
+$KeywordRegistry.taskStatus$waiting = function(){return "00595a73-22e2-4c3b-a21c-06bdec262d20";};
+$KeywordRegistry.taskStatus$ended = function(){return "7c9d6681-6cf5-4395-b276-3941b6fd0d57";};
+
$KeywordRegistry.taskType = function(){return "TaskType";};
$KeywordRegistry.taskType$Task = function(){return "4dee8727-8299-422e-ae41-6cdf9de2dfd7";};
@@ -60,7 +64,10 @@ $KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght"
$KeywordRegistry.salesprojectState = function(){return "SalesprojectState";};
$KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase";};
$KeywordRegistry.taskPriority = function(){return "TaskPriority";};
+$KeywordRegistry.taskPriority$none = function(){return "f587f53a-72cc-4b76-9e39-276a26cab2e0";};
$KeywordRegistry.taskPriority$low = function(){return "09072b59-d12f-469b-acbd-18a28232ff70";};
+$KeywordRegistry.taskPriority$medium = function(){return "4467b33c-3a68-4c8b-ba4a-1eb666a6c774";};
+$KeywordRegistry.taskPriority$high = function(){return "1e42f183-fb97-415f-9917-b43ca159fde4";};
$KeywordRegistry.taskProgress = function(){return "TaskProgress";};
$KeywordRegistry.taskProgress$0 = function(){return "ec92271b-eac2-4ec2-be24-ab4abde7e939";};
$KeywordRegistry.salesprojectCompetitionState = function(){return "SalesprojectCompetitionState";};
diff --git a/process/AddressValidation_lib/AddressValidation_lib.aod b/process/WsValidation_lib/WsValidation_lib.aod
similarity index 76%
rename from process/AddressValidation_lib/AddressValidation_lib.aod
rename to process/WsValidation_lib/WsValidation_lib.aod
index d9b312c9ea010874d7543ac38a170160ad71c158..521ca5a4571a2b608f148315da4cb4a1efd6f892 100644
--- a/process/AddressValidation_lib/AddressValidation_lib.aod
+++ b/process/WsValidation_lib/WsValidation_lib.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
- <name>AddressValidation_lib</name>
+ <name>WsValidation_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/AddressValidation_lib/process.js</process>
+ <process>%aditoprj%/process/WsValidation_lib/process.js</process>
<variants>
<element>LIBRARY</element>
</variants>
diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..f2c51eca730b86beb9ebd73fc1f6faad430b19b1
--- /dev/null
+++ b/process/WsValidation_lib/process.js
@@ -0,0 +1,224 @@
+import("system.translate");
+import("system.logging");
+import("system.project");
+import("system.vars");
+import("system.neon");
+import("system.net");
+import("system.util");
+
+/**
+ * Class used for the webservice validation types.
+ *
+ * Do not create new instances anywhere else than inside of the get-function!
+ *
+ * @param {String} pKey the key-name
+ * @param {String} pParamName name used by the webservice
+ * @param {String} pWebserviceName name of the webservice. Used to find the correct webservice configuraation
+ * @param {Function} pProcessResultCallback function for processing Webservice-result to the return value
+ */
+function WsValidationType(pKey, pParamName, pWebserviceName, pProcessResultCallback)
+{
+ this.key = pKey;
+ this.paramName = pParamName;
+ this.processResultCallback = pProcessResultCallback;
+ this.webserviceName = pWebserviceName;
+}
+
+/**
+ * get all possible validation types or one specific
+ * @param {String} [pKey=undefined] if provided, this function returns only the validation type with this key
+ *
+ * @return {Object|WsValidationType} object containing all WsValidationTypes or one specific WsValidationType
+ */
+WsValidationType.get = function(pKey)
+{
+ if (!this._cache)
+ this._cache = {
+ // Address lookups
+ TYPE_ZIP: new WsValidationType("TYPE_ZIP", "zip", "addressValidation", _processAddressLookup),
+ TYPE_CITY: new WsValidationType("TYPE_CITY", "city", "addressValidation", _processAddressLookup),
+
+ // Communication validation
+ TYPE_PHONE: new WsValidationType("TYPE_PHONE", "Number", "phoneValidation", _processCommunicationValidation)
+ }
+
+ if (pKey)
+ return this._cache[pKey];
+
+ return this._cache;
+
+ function _processAddressLookup(pWsResult, pValue)
+ {
+
+
+ // add default result consisting of pValue
+ var defaultResult = [[{}, pValue]];
+ defaultResult[0][0][this.paramName] = pValue;
+
+ var resultAddresses = [];
+
+ // if error, only add the default value else parse the body
+ if (!WsValidationUtils._isError(pWsResult))
+ {
+ resultAddresses = JSON.parse(pWsResult.body);
+ }
+
+ resultAddresses = resultAddresses.concat(defaultResult);
+
+ return resultAddresses.map(function(pAddress)
+ {
+ var data = pAddress[0];
+ return [
+ JSON.stringify(data),
+ pAddress[1],
+ data.zip,
+ data.city,
+ data.country,
+ data.district,
+ data.region,
+ data.state,
+ data[this.paramName]]
+ }, this);
+ }
+
+ function _processCommunicationValidation(pWsResult, pValue)
+ {
+ if (!WsValidationUtils._isError(pWsResult))
+ {
+ return pWsResult.body;
+ }
+ else
+ {
+ return pValue;
+ }
+ }
+}
+
+/**
+ * Class containing utility functions for validation webservices
+ * It can be used for lookups (like AddressValidation-entity) or onValueChange-formatting/validation like the Communication.ADDR-field.
+ * do not create an instance of this
+ *
+ * @class
+ */
+function WsValidationUtils() {}
+
+/**
+ * validate the value with the webservice
+ * @param {String} pValue to search for
+ * @param {WsValidationType|String} pType type used for the search. Can be an WsValidationType or the key of the WsValidationType
+ * @param {String} pCountry needed by the webservice e.g. "DE"
+ *
+ * @return {String[][]} [UID,
+ * displayName,
+ * zip,
+ * city,
+ * country,
+ * district,
+ * region,
+ * state,
+ * value (the result. e.g. if pType was ZIP, the value is the found zip)
+ */
+WsValidationUtils.validate = function(pValue, pType, pCountry)
+{
+ // get WsValidationType-Object if it is only the key
+ if (typeof pType == "string")
+ pType = WsValidationType.get(pType);
+
+ if (WsValidationUtils.isWsEnabled(pType))
+ {
+
+ var userName = project.getPreferenceValue("custom." + pType.webserviceName + ".user");
+ var pw = project.getPreferenceValue("custom." + pType.webserviceName + ".pw");
+ var url = project.getPreferenceValue("custom." + pType.webserviceName + ".url");
+ var countryParamName = project.getPreferenceValue("custom." + pType.webserviceName + ".countryParamName");
+
+ var actionType = "GET";
+
+ if (pValue && pType)
+ {
+ // fill params
+ var parameters = {};
+ if (pCountry)
+ {
+ parameters[countryParamName] = pCountry;
+ }
+ parameters[pType.paramName] = pValue;
+
+ // call webservice
+ var ret = JSON.parse(net.callRestWebserviceBasicAuth(url, actionType, parameters, null, null, "text/plain", "text/plain", util.DATA_TEXT, util.DATA_TEXT, userName, pw, true));
+
+ // if error, log the error. But also process the result and let the callback generate the correct default value
+ if (WsValidationUtils._isError(ret))
+ {
+ logging.log(translate.withArguments("${WEBSERVICE_ERROR} url:%0 status:%1", [url, (ret.hasHttpSuccessStatusCode ? " StatusCode: " + ret.httpStatusCode : "")]));
+ logging.log("Params: " + parameters.toSource());
+ }
+
+ // different handling of the result per type
+ return pType.processResultCallback(ret, pValue);
+ }
+ }
+
+ return pType.processResultCallback(null, pValue);
+}
+
+/**
+ * set all address-fields by the value of $this.value, which should contain an object of all values as JSON
+ */
+WsValidationUtils.setAddressFields = function()
+{
+ try
+ {
+ var data = JSON.parse(vars.get("$this.value"));
+ } catch (exception) {
+ // if no valid json, it is a direct user input and not a uuid.
+ // ignore error
+ return
+ }
+
+ _setField("$field.ZIP", data.zip);
+ _setField("$field.COUNTRY", data.country);
+ _setField("$field.CITY", data.city);
+ //_setField("$field.DISTRICT", data.district); not needed currently
+ _setField("$field.REGION", data.region);
+ _setField("$field.STATE", data.state);
+
+ function _setField(pField, pValue)
+ {
+ if (pValue)
+ neon.setFieldValue(pField, pValue);
+ }
+}
+
+/**
+ * check if the Webservice is enabled in the project preferences
+ * @param {Object} pType
+ *
+ * @return {boolean}
+ */
+WsValidationUtils.isWsEnabled = function(pType)
+{
+ // get WsValidationType-Object if it is only the key
+ if (typeof pType == "string")
+ pType = WsValidationType.get(pType);
+
+ // get configurations for this type
+ try
+ {
+ return JSON.parse(project.getPreferenceValue("custom." + pType.webserviceName + ".enable"));
+ } catch (exception) {
+ return false;
+ }
+}
+
+/**
+ * check if the Webservice-result is valid or an error
+ * @param {Object} pWsReturn
+ *
+ * @return {boolean}
+ */
+WsValidationUtils._isError = function(pWsReturn)
+{
+ return pWsReturn == null || !pWsReturn.hasHttpSuccessStatusCode || pWsReturn.httpStatusCode != 200;
+}
\ No newline at end of file