diff --git a/.liquibase/Data_alias/basic/2019.2/AttributeKeyword.xml b/.liquibase/Data_alias/basic/2019.2/AttributeKeyword.xml
index 49dee3ca55dc85a16e91e58b830c601be7f83572..d924ad24ca2252b9d37a5cd90f35c45b66c18b7d 100644
--- a/.liquibase/Data_alias/basic/2019.2/AttributeKeyword.xml
+++ b/.liquibase/Data_alias/basic/2019.2/AttributeKeyword.xml
@@ -1,23 +1,23 @@
-<?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="f527a5cc-f1e5-497f-a069-33aee944d421">
- <addColumn tableName="AB_ATTRIBUTE">
- <column name="KEYWORD_CONTAINER" type="VARCHAR(80)"/>
- <column name="ATTRIBUTE_INFO" type="NCLOB"/>
- <column name="SORTING" type="INTEGER"/>
- </addColumn>
- <addColumn tableName="AB_ATTRIBUTERELATION">
- <column name="INT_VALUE" type="INTEGER"/>
- </addColumn>
- <dropColumn tableName="AB_ATTRIBUTERELATION">
- <column name="BOOL_VALUE"/>
- </dropColumn>
- <dropColumn tableName="AB_ATTRIBUTE">
- <column name="ATTRIBUTE_LEVEL"/>
- </dropColumn>
- <modifyDataType tableName="AB_ATTRIBUTERELATION" columnName="CHAR_VALUE" newDataType="NVARCHAR(512)"/>
- <createIndex indexName="IDX_ATTRPARENT" tableName="AB_ATTRIBUTE">
- <column name="ATTRIBUTE_PARENT_ID"/>
- </createIndex>
- </changeSet>
+<?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="f527a5cc-f1e5-497f-a069-33aee944d421">
+ <addColumn tableName="AB_ATTRIBUTE">
+ <column name="KEYWORD_CONTAINER" type="VARCHAR(80)"/>
+ <column name="ATTRIBUTE_INFO" type="NCLOB"/>
+ <column name="SORTING" type="INTEGER"/>
+ </addColumn>
+ <addColumn tableName="AB_ATTRIBUTERELATION">
+ <column name="INT_VALUE" type="INTEGER"/>
+ </addColumn>
+ <dropColumn tableName="AB_ATTRIBUTERELATION">
+ <column name="BOOL_VALUE"/>
+ </dropColumn>
+ <dropColumn tableName="AB_ATTRIBUTE">
+ <column name="ATTRIBUTE_LEVEL"/>
+ </dropColumn>
+ <modifyDataType tableName="AB_ATTRIBUTERELATION" columnName="CHAR_VALUE" newDataType="NVARCHAR(512)"/>
+ <createIndex indexName="IDX_ATTRPARENT" tableName="AB_ATTRIBUTE">
+ <column name="ATTRIBUTE_PARENT_ID"/>
+ </createIndex>
+ </changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
index ba0b7f7bfadae3e6bea8e11ba7e80f4755d71b63..ae7c8396d0783d5859f7481d8fb841754128f36b 100644
--- a/.liquibase/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -145,9 +145,15 @@
<include relativeToChangelogFile="true" file="AditoBasic/create_ab_loghistory.xml"/>
<include relativeToChangelogFile="true" file="activity_rename_Creator_to_Responsible.xml" />
+
+ <include relativeToChangelogFile="true" file="create_documenttemplate.xml" />
+ <include relativeToChangelogFile="true" file="create_documenttemplatelink.xml" />
+ <include relativeToChangelogFile="true" file="data/init_DocumentTemplateType.xml" />
+ <include relativeToChangelogFile="true" file="data/init_DocumentTemplateTypeCategory.xml" />
<include relativeToChangelogFile="true" file="miscellaneous/Contact_additionalColumns.xml" />
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaign.xml"/>
+ <include relativeToChangelogFile="true" file="data/init_DocumentTemplateTypeCategory.xml" />
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaignStep.xml"/>
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaignParticipant.xml"/>
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaignParticipantLog.xml"/>
diff --git a/.liquibase/Data_alias/basic/2019.2/create_documenttemplate.xml b/.liquibase/Data_alias/basic/2019.2/create_documenttemplate.xml
new file mode 100644
index 0000000000000000000000000000000000000000..385f93d9d62f07219383c3178aed1b3af13b173c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/create_documenttemplate.xml
@@ -0,0 +1,23 @@
+<?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="d.lechner" id="documenttemplate-1">
+ <createTable tableName="DOCUMENTTEMPLATE">
+ <column name="DOCUMENTTEMPLATEID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_DOCUMENTTEMPLATE_DOCUMENTTEMPLATEID"/>
+ </column>
+ <column name="NAME" type="NVARCHAR(50)"/>
+ <column name="TYPE" type="CHAR(36)"/>
+ <column name="CLASSIFICATION" type="CHAR(36)"/>
+ <column name="LANGUAGE" type="CHAR(3)"/>
+ <column name="DESCRIPTION" type="NVARCHAR(500)"/>
+ <column name="USER_NEW" type="NVARCHAR(50)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="DATE_NEW" type="DATE">
+ <constraints nullable="false"/>
+ </column>
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATE" />
+ </createTable>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/create_documenttemplatelink.xml b/.liquibase/Data_alias/basic/2019.2/create_documenttemplatelink.xml
new file mode 100644
index 0000000000000000000000000000000000000000..56241ea4fef88b46608e36d9889a8a47e9e5245c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/create_documenttemplatelink.xml
@@ -0,0 +1,20 @@
+<?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="d.lechner" id="documenttemplate-2">
+ <createTable tableName="DOCUMENTTEMPLATELINK">
+ <column name="DOCUMENTTEMPLATELINKID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_DOCUMENTTEMPLATELINK_DOCUMENTTEMPLATELINKID"/>
+ </column>
+ <column name="DOCUMENTTEMPLATE_ID_PARENT" type="CHAR(36)"/>
+ <column name="DOCUMENTTEMPLATE_ID_CHILD" type="CHAR(36)"/>
+ <column name="USER_NEW" type="NVARCHAR(50)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="DATE_NEW" type="DATE">
+ <constraints nullable="false"/>
+ </column>
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATE" />
+ </createTable>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml b/.liquibase/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
index 0ab7bfdba630f23532fd1413518d700251d296cb..e9a0ce04943fdc463a68127bbe377aa382e64091 100644
--- a/.liquibase/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
+++ b/.liquibase/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
@@ -32,4 +32,4 @@
<column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
</insert>
</changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
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 2de20c7371737c9e63d9328dec98a22efbd74568..3d1f4c3b29c7cd36cdb58c30f8f06eb4bc4b0cea 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
@@ -761,6 +761,36 @@
<column name="AB_ATTRIBUTE_ID" value="3f119858-9d69-4903-a572-d286be151f73"/>
<column name="OBJECT_TYPE" value="Employee"/>
</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="7889748c-8a13-49d9-b996-b828146bdac8"/>
+ <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+ <column name="OBJECT_TYPE" value="DocumentTemplate"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="cae53196-4987-4f53-a45c-babca1997a48"/>
+ <column name="AB_ATTRIBUTE_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+ <column name="OBJECT_TYPE" value="DocumentTemplate"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="59d93c4b-e338-497c-9da2-47b4c45444c9"/>
+ <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+ <column name="OBJECT_TYPE" value="DocumentTemplate"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="0498ae18-bae6-44e4-8944-1e756e9d4a8e"/>
+ <column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
+ <column name="OBJECT_TYPE" value="DocumentTemplate"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="90618350-89e6-4e13-8f28-d22de81fea45"/>
+ <column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
+ <column name="OBJECT_TYPE" value="DocumentTemplate"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="b6b323a2-9c8c-49c0-89c1-08ca1bb06c29"/>
+ <column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
+ <column name="OBJECT_TYPE" value="DocumentTemplate"/>
+</insert>
<rollback>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
diff --git a/.liquibase/Data_alias/basic/2019.2/data/init_DocumentTemplateType.xml b/.liquibase/Data_alias/basic/2019.2/data/init_DocumentTemplateType.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fda245a0ac774d96467b1ffc51330cf34f8eebdd
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/data/init_DocumentTemplateType.xml
@@ -0,0 +1,41 @@
+<?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="d.lechner" id="documentTemplateType-1">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="c564719a-18ef-423e-b130-dp88b2b518ad"/>
+ <column name="KEYID" value="LET"/>
+ <column name="TITLE" value="Letter"/>
+ <column name="CONTAINER" value="DocumentTemplateType"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="6f4c6e49-36ca-4b98-ba83-c507203wawal"/>
+ <column name="KEYID" value="MAI"/>
+ <column name="TITLE" value="Mail"/>
+ <column name="CONTAINER" value="DocumentTemplateType"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="bb386131-ee36-9771-b458-6751f137a941"/>
+ <column name="KEYID" value="ATT"/>
+ <column name="TITLE" value="Attachment"/>
+ <column name="CONTAINER" value="DocumentTemplateType"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="bb38aa51-ee36-9771-b458-6751f137a941"/>
+ <column name="KEYID" value="TEX"/>
+ <column name="TITLE" value="Text Modular"/>
+ <column name="CONTAINER" value="DocumentTemplateType"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.2/data/init_DocumentTemplateTypeCategory.xml b/.liquibase/Data_alias/basic/2019.2/data/init_DocumentTemplateTypeCategory.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6d75abdd21c241eeafbece321f7774bec687a11e
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/data/init_DocumentTemplateTypeCategory.xml
@@ -0,0 +1,101 @@
+<?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="d.lechner" id="documentTemplateTypeCategory-1">
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="14c2d515-a42f-4618-b534-7a23369d2001"/>
+ <column name="NAME" value="LET"/>
+ <column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
+ <column name="TYPE" value="BOOL_VALUE"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="14c2d515-a42f-4618-b534-7a23369d2002"/>
+ <column name="NAME" value="MAI"/>
+ <column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
+ <column name="TYPE" value="BOOL_VALUE"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="14c2d515-a42f-4618-b534-7a23369d2003"/>
+ <column name="NAME" value="ATT"/>
+ <column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
+ <column name="TYPE" value="BOOL_VALUE"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="14c2d515-a42f-4618-b534-7a23369d2004"/>
+ <column name="NAME" value="TEX"/>
+ <column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
+ <column name="TYPE" value="BOOL_VALUE"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="c564719a-18ef-423e-b130-dp88b2b51123"/>
+ <column name="KEYID" value="1"/>
+ <column name="TITLE" value="Single"/>
+ <column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="63110456-3d8a-4756-9a72-9f94dda182f8"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="c564719a-18ef-423e-b130-dp88b2b51123"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="14c2d515-a42f-4618-b534-7a23369d2001"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="bb38aa51-ee36-9771-b458-6751f137a999"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="c564719a-18ef-423e-b130-dp88b2b51123"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="14c2d515-a42f-4618-b534-7a23369d2002"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="6f4c6e49-36ca-4b98-ba83-c507203wa456"/>
+ <column name="KEYID" value="2"/>
+ <column name="TITLE" value="Serial"/>
+ <column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="58334e95-7a89-4255-bf84-0234c386a69f"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="6f4c6e49-36ca-4b98-ba83-c507203wa456"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="14c2d515-a42f-4618-b534-7a23369d2001"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="850d17ae-b9f4-464f-ba16-9e22f3d8716c"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="6f4c6e49-36ca-4b98-ba83-c507203wa456"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="14c2d515-a42f-4618-b534-7a23369d2002"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="bb386131-ee36-9771-b458-6751f137a789"/>
+ <column name="KEYID" value="3"/>
+ <column name="TITLE" value="Offer Header Text"/>
+ <column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="5f3352cf-38aa-403a-8d8e-9f1ca40a5dca"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="bb386131-ee36-9771-b458-6751f137a789"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="14c2d515-a42f-4618-b534-7a23369d2004"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="bb38aa51-ee36-9771-b458-6751f137a999"/>
+ <column name="KEYID" value="4"/>
+ <column name="TITLE" value="Offer Footer Text"/>
+ <column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="f8df9595-5932-4e60-ac50-b903dc739e48"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="bb38aa51-ee36-9771-b458-6751f137a999"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="14c2d515-a42f-4618-b534-7a23369d2004"/>
+ <column name="BOOL_VALUE" valueNumeric="1"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml
index d045c99388757f245242ffd31e52d3fabcab6a9c..b5195dab42f4d8f2218f945cf10e69a1139b7d06 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml
@@ -7,7 +7,7 @@
</column>
<column name="BACKPACK" type="CLOB"/>
<column name="CAPTION" type="VARCHAR(512)"/>
- <column name="CREATIONDATE" type="BIGINT"/>
+ <column name="CREATIONDATE" type="TIMESTAMP"/>
<column name="DESCRIPTION" type="VARCHAR(1023)"/>
<column name="FORCEDPRIORITY" type="VARCHAR(15)"/>
<column name="ICON_INFO" type="VARCHAR(1023)"/>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 3a15dc43ae202353202a8248a703c425427a9c1e..16125dbb1e92aece3bb37ac760d7d463213a5866 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -103,6 +103,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>OrganisationType</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -291,6 +296,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
</customProperties>
<dependencies>
<entityDependency>
@@ -341,7 +351,7 @@
<customBooleanProperty>
<name>log</name>
<global v="false" />
- <property v="true" />
+ <property v="false" />
</customBooleanProperty>
</customProperties>
</entityFieldDb>
@@ -361,7 +371,7 @@
<customBooleanProperty>
<name>log</name>
<global v="false" />
- <property v="true" />
+ <property v="false" />
</customBooleanProperty>
</customProperties>
</entityFieldDb>
@@ -696,6 +706,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>PersonGender</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -872,6 +887,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>AddressType</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -1048,7 +1068,7 @@
<customBooleanProperty>
<name>log</name>
<global v="false" />
- <property v="true" />
+ <property v="false" />
</customBooleanProperty>
<customStringProperty>
<name>tableRef</name>
@@ -2683,7 +2703,7 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title>Offer date</title>
+ <title>Date</title>
<description></description>
<customProperties>
<customBooleanProperty>
@@ -2769,6 +2789,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>OfferProbability</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -2856,7 +2881,7 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title>Cover Letter</title>
+ <title>Cover letter</title>
<description></description>
<customProperties>
<customBooleanProperty>
@@ -2948,6 +2973,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>PaymentTerm</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -2969,6 +2999,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>DeliveryTerm</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -3498,6 +3533,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>SalesprojectPhase</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -3597,6 +3637,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>SalesprojectProbability</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -3618,6 +3663,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>SalesprojectState</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -3639,6 +3689,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/reasons/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
</customProperties>
</entityFieldDb>
</entityFields>
@@ -3693,6 +3748,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>SalesprojectSource</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -3706,7 +3766,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title>Entry date</title>
+ <title>Date</title>
<description></description>
<customProperties>
<customBooleanProperty>
@@ -3754,7 +3814,7 @@
<customBooleanProperty>
<name>log</name>
<global v="false" />
- <property v="true" />
+ <property v="false" />
</customBooleanProperty>
<customStringProperty>
<name>tableRef</name>
@@ -3807,7 +3867,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title>Product</title>
+ <title>Commodity group</title>
<description></description>
<customProperties>
<customBooleanProperty>
@@ -3815,6 +3875,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>ProductGroupcode</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -3849,7 +3914,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title>Date start</title>
+ <title>Planned</title>
<description></description>
<customProperties>
<customBooleanProperty>
@@ -3897,7 +3962,7 @@
<customBooleanProperty>
<name>log</name>
<global v="false" />
- <property v="true" />
+ <property v="false" />
</customBooleanProperty>
<customStringProperty>
<name>tableRef</name>
@@ -4089,6 +4154,10 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ </customJDitoProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -4190,6 +4259,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>SalesprojectMemberRole</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -4209,7 +4283,7 @@
<customBooleanProperty>
<name>log</name>
<global v="false" />
- <property v="true" />
+ <property v="false" />
</customBooleanProperty>
<customStringProperty>
<name>tableRef</name>
@@ -4831,6 +4905,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/language/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -4844,7 +4923,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title>Version number</title>
+ <title>Vers. no.</title>
<description></description>
<customProperties>
<customBooleanProperty>
@@ -4928,7 +5007,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title>Salesorder code</title>
+ <title>Receipt number</title>
<description></description>
<customProperties>
<customBooleanProperty>
@@ -4949,7 +5028,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title>Salesproject Id</title>
+ <title>Salesproject</title>
<description></description>
<customProperties>
<customBooleanProperty>
@@ -4957,6 +5036,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/salesproject_id/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -4996,7 +5080,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title>Salesorder date</title>
+ <title>Date</title>
<description></description>
<customProperties>
<customBooleanProperty>
@@ -5046,6 +5130,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -5163,6 +5252,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>QuantityUnit</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -5176,7 +5270,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title>Unit Price</title>
+ <title>Unit price</title>
<description></description>
<customProperties>
<customBooleanProperty>
@@ -5247,6 +5341,10 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ </customJDitoProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -5310,6 +5408,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customBooleanProperty>
+ <name>autoMapTrueFalse4Log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -5331,6 +5434,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>ProductGroupcode</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -5350,7 +5458,7 @@
<customBooleanProperty>
<name>log</name>
<global v="false" />
- <property v="true" />
+ <property v="false" />
</customBooleanProperty>
</customProperties>
</entityFieldDb>
@@ -5371,8 +5479,13 @@
<customBooleanProperty>
<name>log</name>
<global v="false" />
- <property v="true" />
+ <property v="false" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>tableRef</name>
+ <global v="false" />
+ <property>SALESORDER</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -5490,6 +5603,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>TaskPriority</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -5532,6 +5650,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -5588,6 +5711,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>TaskStatus</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -5630,6 +5758,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -5664,7 +5797,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title>Protection level</title>
+ <title>Protected</title>
<description></description>
<customProperties>
<customBooleanProperty>
@@ -5672,6 +5805,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customBooleanProperty>
+ <name>autoMapTrueFalse4Log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -5685,7 +5823,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title>Start date</title>
+ <title>Begin</title>
<description></description>
<customProperties>
<customBooleanProperty>
@@ -5712,8 +5850,13 @@
<customBooleanProperty>
<name>log</name>
<global v="false" />
- <property v="true" />
+ <property v="false" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>TaskType</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -5777,6 +5920,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>TaskProgress</property>
+ </customStringProperty>
</customProperties>
</entityFieldDb>
</entityFields>
@@ -8463,9 +8611,9 @@
</entityFields>
</entityDb>
<entityDb>
- <name>CAMPAIGN</name>
+ <name>DOCUMENTTEMPLATE</name>
<dbName></dbName>
- <idColumn>CAMPAIGNID</idColumn>
+ <idColumn>DOCUMENTTEMPLATEID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
@@ -8480,6 +8628,20 @@
<syncIds></syncIds>
</auditSyncConfig>
<entityFields>
+ <entityFieldDb>
+ <name>LANGUAGE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="3" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
@@ -8509,13 +8671,27 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>EMPLOYEE_CONTACT_ID</name>
+ <name>DOCUMENTTEMPLATEID</name>
<dbName></dbName>
- <primaryKey v="false" />
+ <primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CLASSIFICATION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -8551,14 +8727,14 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>CAMPAIGNID</name>
+ <name>TYPE</name>
<dbName></dbName>
- <primaryKey v="true" />
+ <primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
+ <notNull v="false" />
+ <isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
@@ -8585,21 +8761,7 @@
<columnType v="12" />
<size v="50" />
<scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>STATE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
+ <notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -8609,9 +8771,9 @@
</entityFields>
</entityDb>
<entityDb>
- <name>CAMPAIGNSTEP</name>
+ <name>DOCUMENTTEMPLATELINK</name>
<dbName></dbName>
- <idColumn>CAMPAIGNSTEPID</idColumn>
+ <idColumn>DOCUMENTTEMPLATELINKID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
@@ -8627,13 +8789,13 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>CAMPAIGN_ID</name>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="91" />
+ <size v="10" />
<scale v="0" />
- <notNull v="true" />
+ <notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -8641,11 +8803,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>DATE_EDIT</name>
+ <name>DOCUMENTTEMPLATE_ID_PARENT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -8655,7 +8817,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>DATE_START</name>
+ <name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="91" />
@@ -8669,11 +8831,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>EMPLOYEE_CONTACT_ID</name>
+ <name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="12" />
+ <size v="50" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -8683,27 +8845,27 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>STATE</name>
+ <name>DOCUMENTTEMPLATELINKID</name>
<dbName></dbName>
- <primaryKey v="false" />
+ <primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
- <isUnique v="false" />
+ <isUnique v="true" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>SORTING</name>
+ <name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="12" />
+ <size v="50" />
<scale v="0" />
- <notNull v="true" />
+ <notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -8711,22 +8873,98 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>CAMPAIGNSTEPID</name>
+ <name>DOCUMENTTEMPLATE_ID_CHILD</name>
<dbName></dbName>
- <primaryKey v="true" />
+ <primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
+ <notNull v="false" />
+ <isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>DATE_NEW</name>
- <dbName></dbName>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>CAMPAIGN</name>
+ <dbName></dbName>
+ <idColumn>CAMPAIGNID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DESCRIPTION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="500" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>EMPLOYEE_CONTACT_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>STATE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
<primaryKey v="false" />
<columnType v="91" />
<size v="10" />
@@ -8753,12 +8991,102 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>DATE_END</name>
+ <name>CAMPAIGNID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>NAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>CAMPAIGNSTEP</name>
+ <dbName></dbName>
+ <idColumn>CAMPAIGNSTEPID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>CAMPAIGN_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="91" />
<size v="10" />
<scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>STATE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -8766,6 +9094,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CAMPAIGNSTEPID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
<entityFieldDb>
<name>USER_EDIT</name>
<dbName></dbName>
@@ -8795,7 +9137,49 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>MAXPARTICIPANTS</name>
+ <name>DESCRIPTION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="500" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_START</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>EMPLOYEE_CONTACT_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SORTING</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
@@ -8809,13 +9193,55 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>DESCRIPTION</name>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="500" />
+ <size v="50" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>MAXPARTICIPANTS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_END</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -8870,6 +9296,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CAMPAIGNPARTICIPANT_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
<entityFieldDb>
<name>DATE_NEW</name>
<dbName></dbName>
@@ -8940,20 +9380,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>CAMPAIGNPARTICIPANT_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..013c797ac6b08eb3d113c1bb045c0e12cbc51558
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js
@@ -0,0 +1,8 @@
+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
+result.string(res);
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..f35d37ab09f059046b3b6f3d672cf01c66fe58c4
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js
@@ -0,0 +1,7 @@
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
+result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/language/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/language/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..51a8cec57a7a635681f7c183f2fe3c369db8f692
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/language/customproperties/translate4log/property.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("Loghistory_lib");
+import("Keyword_lib");
+
+var params = Translate4LogParams.load();
+var res = LanguageKeywordUtils.getViewValue(params.value, params.locale);
+result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/salesproject_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/salesproject_id/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..bbd18ac96b9ab2e4fea6d490e56490432f36b8ac
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/salesproject_id/customproperties/translate4log/property.js
@@ -0,0 +1,8 @@
+import("Loghistory_lib");
+import("system.vars");
+import("system.result");
+import("Salesproject_lib");
+
+var params = Translate4LogParams.load();
+var id = params.value;
+result.string(Salesproject.getSalesProjectTitleById(id));
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/reasons/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/reasons/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..a7737018152259c0bba392dc328acf5db34ef5b1
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/reasons/customproperties/translate4log/property.js
@@ -0,0 +1,30 @@
+import("system.result");
+import("Keyword_lib");
+import("system.text");
+import("Loghistory_lib");
+import("KeywordRegistry_basic")
+
+var params = Translate4LogParams.load();
+var reasons = params.value;
+if (reasons)
+{
+ reasons = text.decodeMS(reasons);
+ if (reasons.length)
+ {
+ var keywordMap = {};
+ KeywordUtils.getEntryNamesAndIdsByContainer(
+ $KeywordRegistry.salesprojectWonLost(),
+ params.locale
+ ).forEach(function (keyword)
+ {
+ this[keyword[0]] = keyword[1];
+ }, keywordMap);
+ reasons = reasons.map(function (reasonId)
+ {
+ return this[reasonId];
+ }, keywordMap).join(", ");
+ }
+ else
+ reasons = "";
+}
+result.string(reasons);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..f35d37ab09f059046b3b6f3d672cf01c66fe58c4
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js
@@ -0,0 +1,7 @@
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
+result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..f35d37ab09f059046b3b6f3d672cf01c66fe58c4
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js
@@ -0,0 +1,7 @@
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
+result.string(res);
\ No newline at end of file
diff --git a/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod b/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
index 28c9a9453c27cceded1f23add454689b79b8d54f..628a839e5fbb735dcc9481caa60e7ce37bb2f14d 100644
--- a/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
+++ b/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
- <name>_____SYSTEM_APPLICATION</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entityNode name="_____SYSTEM_COMPANY" kind="200" />
- <company>
- <name>company</name>
- <backgroundColor v="0xff83cbd8" />
- </company>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
+ <name>_____SYSTEM_APPLICATION</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entityNode name="_____SYSTEM_COMPANY" kind="200" />
+ <company>
+ <name>company</name>
+ <backgroundColor v="0xff83cbd8" />
+ </company>
+</application>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 0737745e3dea53481ecc16cf6c385f09692501c6..eba6a0902171df7e8d2780f911da2290bb745f5c 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -38,9 +38,10 @@
<node name="Group3" kind="123" title="">
<node name="Notification" kind="10077" />
<node name="Attribute" kind="10077" />
+ <node name="DocumentTemplate" kind="10077" />
+ <node name="Employee" kind="10077" />
<node name="KeywordEntry" kind="10077" />
<node name="KeywordAttribute" kind="10077" />
- <node name="Employee" kind="10077" />
<node name="ObjectRelationType" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
diff --git a/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod b/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
index 42fef1c4124cc59559c680d1fe53f8b8b91ace0a..6d333cf4cd3b9aee342d350544b30ec55525ae90 100644
--- a/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
+++ b/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
- <name>_____SYSTEM_CALENDAR_RIBBON</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entityNode name="_____SYSTEM_COMPANY" kind="200" />
- <calendarRibbon>
- <name>calendarRibbon</name>
- <ribbonTasks>
- <ribbonTask>
- <name>TASK_CALENDAR</name>
- </ribbonTask>
- </ribbonTasks>
- </calendarRibbon>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
+ <name>_____SYSTEM_CALENDAR_RIBBON</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entityNode name="_____SYSTEM_COMPANY" kind="200" />
+ <calendarRibbon>
+ <name>calendarRibbon</name>
+ <ribbonTasks>
+ <ribbonTask>
+ <name>TASK_CALENDAR</name>
+ </ribbonTask>
+ </ribbonTasks>
+ </calendarRibbon>
+</application>
diff --git a/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod b/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod
index e453d3efffad2a0658db7a002fcfdec4eba0d9f4..4fcea10c0e846904f456e1b056498f7470b3ca15 100644
--- a/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod
+++ b/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
- <name>_____SYSTEM_CALENDAR_RIBBON_NEON</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entityNode name="_____SYSTEM_COMPANY" kind="200" />
- <neonCalendarRibbon>
- <name>neonCalendarRibbon</name>
- <entity>
- <name>entity</name>
- </entity>
- </neonCalendarRibbon>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
+ <name>_____SYSTEM_CALENDAR_RIBBON_NEON</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entityNode name="_____SYSTEM_COMPANY" kind="200" />
+ <neonCalendarRibbon>
+ <name>neonCalendarRibbon</name>
+ <entity>
+ <name>entity</name>
+ </entity>
+ </neonCalendarRibbon>
+</application>
diff --git a/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod b/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
index 114ee28146d6509474675e0905da9d217b0fc329..0dc789214fb90fd1cc60f2d8e83b7c6862ed7e7e 100644
--- a/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
+++ b/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
- <name>_____SYSTEM_INDEXSEARCH_RIBBON</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entityNode name="_____SYSTEM_COMPANY" kind="200" />
- <indexSearchRibbon>
- <name>indexSearchRibbon</name>
- <ribbonTasks>
- <ribbonTask>
- <name>TASK_INDEXSEARCH</name>
- </ribbonTask>
- </ribbonTasks>
- </indexSearchRibbon>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
+ <name>_____SYSTEM_INDEXSEARCH_RIBBON</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entityNode name="_____SYSTEM_COMPANY" kind="200" />
+ <indexSearchRibbon>
+ <name>indexSearchRibbon</name>
+ <ribbonTasks>
+ <ribbonTask>
+ <name>TASK_INDEXSEARCH</name>
+ </ribbonTask>
+ </ribbonTasks>
+ </indexSearchRibbon>
+</application>
diff --git a/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod b/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod
index 31b4562eb6745c36ddba6aaeb17c3e438841c717..3af3e141c0620c42cc92bee49e58870fcb1bf5c8 100644
--- a/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod
+++ b/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
- <name>_____SYSTEM_INDEXSEARCH_RIBBON_NEON</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entityNode name="_____SYSTEM_COMPANY" kind="200" />
- <neonIndexSearchRibbon>
- <name>neonIndexSearchRibbon</name>
- </neonIndexSearchRibbon>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
+ <name>_____SYSTEM_INDEXSEARCH_RIBBON_NEON</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entityNode name="_____SYSTEM_COMPANY" kind="200" />
+ <neonIndexSearchRibbon>
+ <name>neonIndexSearchRibbon</name>
+ </neonIndexSearchRibbon>
+</application>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 35035c1d01686cbebea05cb3aaf866e4ad11054e..97cdc499fb89380aefa75d745a6dbc37ec5394ee 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -5,7 +5,7 @@
<documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
<title>Activity</title>
<afterUiInit>%aditoprj%/entity/Activity_entity/afterUiInit.js</afterUiInit>
- <iconId>NEON:HISTORY</iconId>
+ <iconId>NEON:ACTIVITY</iconId>
<image>VAADIN:SHOP</image>
<imageProcess>%aditoprj%/entity/Activity_entity/imageProcess.js</imageProcess>
<titlePlural>Activities</titlePlural>
@@ -230,6 +230,18 @@
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>9b416661-628d-4f8d-b8dc-9543cf5bbb1c</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>Activities</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>4869a849-8717-48ec-9dbd-73df96992042</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>Activities</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Activity_entity/entityfields/newmail/onActionProcess.js b/entity/Activity_entity/entityfields/newmail/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7cb92215131675b593322198cd6fdb3c50481cee
--- /dev/null
+++ b/entity/Activity_entity/entityfields/newmail/onActionProcess.js
@@ -0,0 +1,15 @@
+import("system.logging");
+import("system.db");
+import("system.vars");
+import("system.neon");
+import("KeywordRegistry_basic");
+
+
+var params = {
+ "DocumentTemplateType_param" : $KeywordRegistry.documentTemplateType$mail()
+}
+
+//neon.openContext("DocumentTemplate", "DocumentTemplateFilterSmall_view", null, neon.OPERATINGSTATE_SEARCH, params);
+//neon.openContext("DocumentTemplate", "DocumentTemplateFilterSmall_view", null, null, null, params);
+neon.openContext("DocumentTemplate", null, null, neon.OPERATINGSTATE_SEARCH, params);
+
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index a64fc0449a59c31d783e2f0003b08f18a31199c1..0efcba8a073db1ae4afc80c4fa3e70c78be5ce6d 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -3,8 +3,9 @@
<name>Address_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
- <title>Addresses</title>
+ <title>Address</title>
<contentTitleProcess>%aditoprj%/entity/Address_entity/contentTitleProcess.js</contentTitleProcess>
+ <titlePlural>Addresses</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
diff --git a/entity/Analyses_entity/entityfields/imminent_appointments/valueProcess.js b/entity/Analyses_entity/entityfields/imminent_appointments/valueProcess.js
index 47a1fc47f439997182d48840a09062d6777baad9..b27b3c5856e78c3d382a89f5c1ef99589f6a0c96 100644
--- a/entity/Analyses_entity/entityfields/imminent_appointments/valueProcess.js
+++ b/entity/Analyses_entity/entityfields/imminent_appointments/valueProcess.js
@@ -52,4 +52,4 @@ entries = calendars.getEntries(conditions);
logging.log("entries: " + entries.toSource());
-result.string(entries.length);
\ No newline at end of file
+result.string(entries.length);
diff --git a/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js b/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
index 497dffdbfa7ef331b91e5568df2ac738bc09477c..cda2d8086a36d27c39b5a0550114ddc79523b719 100644
--- a/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
+++ b/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
@@ -8,4 +8,4 @@ import("system.SQLTYPES")
var opentask = db.cell("select count(STATUS) from TASK join AB_KEYWORD_ENTRY on KEYID = STATUS and CONTAINER = 'TaskStatus' and TITLE = 'new' group by KEYID, AB_KEYWORD_ENTRY.TITLE");
-result.string(opentask);
\ No newline at end of file
+result.string(opentask);
diff --git a/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js b/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
index 9708434347425c22451c1cf149c8e22e2c6034d2..8c1ab91266ef07d23e924b31ff4e0d21aa363cc8 100644
--- a/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
+++ b/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
@@ -11,5 +11,3 @@ var overduetask = db.cell(SqlCondition.begin()
.buildSql("select count(TASKID) from TASK", "1=2"));
result.string(overduetask);
-
-
diff --git a/entity/Appointment_entity/afterUiInit.js b/entity/Appointment_entity/afterUiInit.js
index 4e420da40299a338582d21fb1974cb19ca6cc29e..2220671b527a0b337028b7a149eab8aaca70f0c1 100644
--- a/entity/Appointment_entity/afterUiInit.js
+++ b/entity/Appointment_entity/afterUiInit.js
@@ -12,7 +12,7 @@ if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
if(entry["AppLinkContext"] && entry["AppLinkId"])
{
- neon.addRecord(null, "AppointmentLinks",
+ neon.addRecord("AppointmentLinks",
{
"AB_APPOINTMENTLINKID" : util.getNewUUID(),
"OBJECTID" : entry["AppLinkId"],
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index af31672dba1ba87218dc4487e0e379d5dd731dee..3e9dabab897dc5d0358fddb66031f33b3ec7333c 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -1,87 +1,87 @@
-import("system.result");
-import("system.vars");
-import("system.calendars");
-import("system.datetime");
-import("system.eMath");
-import("system.util");
-import("system.neon");
-
-if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
-{
-
- var entry = JSON.parse(vars.getString("$param.Entry_param"));
-
- var masterEntry = null;
- if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
- masterEntry = JSON.parse(vars.get("$param.MasterEntry_param"));
- }
-
- var uid = entry[calendars.ID];
- var summary = entry[calendars.SUMMARY];
- var attendees = entry[calendars.AFFECTEDUSERS];
- var startdate = entry[calendars.DTSTART];
- var enddate = entry[calendars.DTEND];
- var links = entry[calendars.LINKS];
- var description = entry[calendars.DESCRIPTION];
- if(entry[calendars.ORGANIZER2] != undefined)
- var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
- var status = entry[calendars.STATUS];
- var location = entry[calendars.LOCATION];
- var reminder = entry[calendars.REMINDER_DURATION];
- var remindercheck = entry[calendars.HASREMINDER]
- var classification = entry[calendars.CLASSIFICATION];
- var transparency = entry[calendars.TRANSPARENCY];
- var categories = entry[calendars.CATEGORIES];
-
- var masterBegin = masterEntry != null ? masterEntry[calendars.DTSTART] : null
- var masterEnd = masterEntry != null ? masterEntry[calendars.DTEND] : null
-
- // Recurrence
- var recurrenceID = entry[calendars.RECURRENCEID];
- var rrule = null;
- if (masterEntry != null) { // Entry is a recurrence exception, therefore get rrule from master
- rrule = masterEntry[calendars.RRULE] != null ? masterEntry[calendars.RRULE][0] : null;
- } else {
- rrule = entry[calendars.RRULE] != null ? entry[calendars.RRULE][0] : null;
- }
-
-// if(entry["AppLinkContext"] && entry["AppLinkId"])
-// {
-// logging.log("hier geht lohos... " + uid + " id");
-// neon.addRecord(null, "AppointmentLinks",
-// {
-// "AB_APPOINTMENTLINKID" : util.getNewUUID(),
-// "APPOINTMENT_ID" : vars.get("$field.UID"),
-// "OBJECTID" : entry["AppLinkId"],
-// "OBJECTTYPE" : entry["AppLinkContext"]
-// });
-// }
-
- //@TODO Icon
- result.object([
- [
- uid,
- attendees.length,
- startdate,
- enddate,
- summary,
- organizer,
- attendees,
- status,
- links,
- description,
- location,
- '',
- classification,
- transparency,
- categories,
- reminder,
- remindercheck,
- rrule,
- recurrenceID,
- null,
- masterBegin,
- masterEnd
- ]
- ]);
-}
+import("system.result");
+import("system.vars");
+import("system.calendars");
+import("system.datetime");
+import("system.eMath");
+import("system.util");
+import("system.neon");
+
+if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+{
+
+ var entry = JSON.parse(vars.getString("$param.Entry_param"));
+
+ var masterEntry = null;
+ if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
+ masterEntry = JSON.parse(vars.get("$param.MasterEntry_param"));
+ }
+
+ var uid = entry[calendars.ID];
+ var summary = entry[calendars.SUMMARY];
+ var attendees = entry[calendars.AFFECTEDUSERS];
+ var startdate = entry[calendars.DTSTART];
+ var enddate = entry[calendars.DTEND];
+ var links = entry[calendars.LINKS];
+ var description = entry[calendars.DESCRIPTION];
+ if(entry[calendars.ORGANIZER2] != undefined)
+ var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
+ var status = entry[calendars.STATUS];
+ var location = entry[calendars.LOCATION];
+ var reminder = entry[calendars.REMINDER_DURATION];
+ var remindercheck = entry[calendars.HASREMINDER]
+ var classification = entry[calendars.CLASSIFICATION];
+ var transparency = entry[calendars.TRANSPARENCY];
+ var categories = entry[calendars.CATEGORIES];
+
+ var masterBegin = masterEntry != null ? masterEntry[calendars.DTSTART] : null
+ var masterEnd = masterEntry != null ? masterEntry[calendars.DTEND] : null
+
+ // Recurrence
+ var recurrenceID = entry[calendars.RECURRENCEID];
+ var rrule = null;
+ if (masterEntry != null) { // Entry is a recurrence exception, therefore get rrule from master
+ rrule = masterEntry[calendars.RRULE] != null ? masterEntry[calendars.RRULE][0] : null;
+ } else {
+ rrule = entry[calendars.RRULE] != null ? entry[calendars.RRULE][0] : null;
+ }
+
+// if(entry["AppLinkContext"] && entry["AppLinkId"])
+// {
+// logging.log("hier geht lohos... " + uid + " id");
+// neon.addRecord("AppointmentLinks",
+// {
+// "AB_APPOINTMENTLINKID" : util.getNewUUID(),
+// "APPOINTMENT_ID" : vars.get("$field.UID"),
+// "OBJECTID" : entry["AppLinkId"],
+// "OBJECTTYPE" : entry["AppLinkContext"]
+// });
+// }
+
+ //@TODO Icon
+ result.object([
+ [
+ uid,
+ attendees.length,
+ startdate,
+ enddate,
+ summary,
+ organizer,
+ attendees,
+ status,
+ links,
+ description,
+ location,
+ '',
+ classification,
+ transparency,
+ categories,
+ reminder,
+ remindercheck,
+ rrule,
+ recurrenceID,
+ null,
+ masterBegin,
+ masterEnd
+ ]
+ ]);
+}
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 170faced7b52435b3091309bd4a5bf31c7113e77..3e759ee766e32941875082eec13f678f45a5857a 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -53,12 +53,6 @@
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>d6d5f9aa-4582-4ec5-9381-394a38a726e8</name>
- <entityName>Offer_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>b728166d-a74f-4ca1-8ce7-7e57032f2a7d</name>
<entityName>Contract_entity</entityName>
diff --git a/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
index 968606f6bb55c1c682b4781e16f13114a0fc5b75..7409382ca9647cea62c56bf84e883a0bbe9618ff 100644
--- a/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
@@ -9,5 +9,5 @@ if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
"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);
+ neon.openContext("AttributeRelation", "AttributeRelationTreeEdit_view", [selectedRows[0]], neon.OPERATINGSTATE_EDIT, params);
}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/uid/valueProcess.js b/entity/AttributeRelation_entity/entityfields/uid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..056f5c94f173d94976edc1ce66ca20d57ecfb0ea
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/uid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("system.util");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
index b60dafb2bd2b68fcd7ea719b0bf906db9036f5be..c08170cc86f3d8f14447ac5b8bd1bf51c9ee007e 100644
--- a/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("system.vars");
import("system.result");
import("system.db");
@@ -56,7 +57,7 @@ var defaultFields = [
var valueFields = AttributeTypeUtil.getAllDatabaseFields();
var attributeSql = attrCond.buildSql("select " + defaultFields.join(", ") + ", " + valueFields.join(", ")
+ " from AB_ATTRIBUTERELATION join AB_ATTRIBUTE on AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID"
- + " left join AB_ATTRIBUTE COMBOVAL on " + $AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID");
+ + " left join AB_ATTRIBUTE COMBOVAL on " + $AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID", "1=2");
var attributeNameMap = {};
var attributeValues = db.table(attributeSql).map(function (row)
@@ -81,7 +82,7 @@ var attributeValues = db.table(attributeSql).map(function (row)
if (getTree)
_fetchAttributes(attributeValues.map(function (row) {return row[1]}));
-allAttributes = _sortArrayForTree(allAttributes).concat(attributeValues);
+allAttributes = TreeUtils.sortArrayForTree(allAttributes, 0, 1).concat(attributeValues);
result.object(allAttributes);
@@ -106,33 +107,4 @@ function _fetchAttributes (pAttributeIds)
}, attributeObj);
if (nextIds.length)
_fetchAttributes(nextIds);
-}
-
-function _sortArrayForTree (pArray)
-{
- if (pArray.length <= 1)
- return pArray;
- var rows = {};
- var allIds = {};
- var idIndex = 0;
- var parentIdIndex = 1;
-
- pArray.forEach(function (row) {allIds[row[idIndex]] = true;});
- var index = 0;
-
- do {
- var oldIndex = index;
- pArray.forEach(function (row)
- {
- if (!(row[idIndex] in this) && (row[parentIdIndex] in this || !allIds[row[parentIdIndex]]))
- this[row[idIndex]] = {
- data : row,
- index : index++
- };
- }, rows);
- } while (oldIndex != index);
- var sortedArray = new Array(index);
- for (let i in rows)
- sortedArray[rows[i].index] = rows[i].data;
- return sortedArray;
}
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js b/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js
index 5a8e7eb9fe21be6d537ba769a61622d42f95087b..0b23d14d86d35c1064ce5d3ebad9212800e1a849 100644
--- a/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js
+++ b/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js
@@ -9,5 +9,7 @@ result.object([
"Offer",
"Order",
"Employee",
- "Salesproject"
+ "Salesproject",
+ "Campaign",
+ "DocumentTemplate"
]);
\ No newline at end of file
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 03767a7d2e59bd703069ab2f72b3eb970a8b5033..58a42e262be6739a7c8fd2d5820d92b52630745e 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -181,7 +181,7 @@
<dependencies>
<entityDependency>
<name>ba3b4d47-7385-49df-bf61-54c99f5b2c81</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>SpecificAttribute</fieldName>
<isConsumer v="false" />
</entityDependency>
@@ -297,6 +297,7 @@
</entityConsumer>
<entityField>
<name>ICON</name>
+ <colorProcess>%aditoprj%/entity/Attribute_entity/entityfields/icon/colorProcess.js</colorProcess>
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
diff --git a/entity/Attribute_entity/afterUiInit.js b/entity/Attribute_entity/afterUiInit.js
index 4bfd7805a27d3e9e0b27292222ffc1f4a101cd9b..cf6d710fbaf2fcc77edb6d68976ae12c2dc4fe0f 100644
--- a/entity/Attribute_entity/afterUiInit.js
+++ b/entity/Attribute_entity/afterUiInit.js
@@ -20,7 +20,7 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
//preset the usages with the ones from the parent
usages.forEach(function (usage)
{
- neon.addRecord(null, "AttributeUsages", {
+ neon.addRecord("AttributeUsages", {
"OBJECT_TYPE" : usage
});
});
diff --git a/entity/Attribute_entity/entityfields/icon/colorProcess.js b/entity/Attribute_entity/entityfields/icon/colorProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e5e77fb84866001bdc0e880f4da08f62daa7ef10
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/icon/colorProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.getString("$field.ATTRIBUTE_ACTIVE") != "1")
+ result.string(neon.PRIORITY_LOW_COLOR);
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js b/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
index 895e460b68c6b3f644f4498f679651d4eaf3bfde..3f2d1eaa3579ee3f78f4a16bf8af3febf87cc270 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("Sql_lib");
import("system.db");
import("system.vars");
@@ -20,4 +21,4 @@ var values = [
];
db.updateData("AB_ATTRIBUTE", columns, null, values,
- SqlCondition.equals("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.UID", "1=2"));
\ No newline at end of file
+ SqlCondition.equals("AB_ATTRIBUTE.AB_ATTRIBUTEID", vars.get("$field.UID"), "1=2"));
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js
index a8754300a5ed02b50adf50695d4eef4f5b43aab8..45222625e116d1ca417a83bca89e9607377bf4a4 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js
@@ -1,9 +1,7 @@
-import("system.logging");
import("system.vars");
import("system.neon");
import("Campaign_lib");
var stepId;
-CampaignUtils.getDefaultCampaignStep(vars.get("$field.CAMPAIGN_ID"));
-
+stepId = CampaignUtils.getDefaultCampaignStep(vars.get("$field.CAMPAIGN_ID"));
neon.setFieldValue("$field.CAMPAIGNSTEP_ID", stepId);
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/displayValueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/displayValueProcess.js
index 649caa2bc64329ecde4daf38beb3d1d35fe666b8..42912a8480cc5ba01a619786eda263c6068b51bf 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/displayValueProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/displayValueProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("Campaign_lib");
import("system.result");
diff --git a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
index cadda267735d1e2481992b20d9addead9611895c..109ef8e54dcca640ddac6994573261ebe153ca5a 100644
--- a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
@@ -36,6 +36,7 @@ else
}
var statementArray = [];
+var logArray = [];
logging.log("isUpdate -> " + isUpdate);
for (participant in participants)
{
@@ -51,7 +52,7 @@ for (participant in participants)
let valsCampaignParticipantLog = new Array(participants[participant], campaignId, newCampaignStepId, campaignParticipantLogId, vars.get("$sys.user"), vars.get("$sys.date"));
statementArray.push(["CAMPAIGNPARTICIPANT", cols, null, updatedValues, condition]);
- statementArray.push(["CAMPAIGNPARTICIPANTLOG", colNamesCampaignParticipantLog, null, valsCampaignParticipantLog]);
+ logArray.push(["CAMPAIGNPARTICIPANTLOG", colNamesCampaignParticipantLog, null, valsCampaignParticipantLog]);
}
else
{
@@ -68,7 +69,7 @@ for (participant in participants)
let valsCampaignParticipantLog = new Array(campaignParticipantId, campaignId, newCampaignStepId, campaignParticipantLogId, vars.get("$sys.user"), vars.get("$sys.date"));
statementArray.push(["CAMPAIGNPARTICIPANT", cols, null, valsCampaignParticipant]);
- statementArray.push(["CAMPAIGNPARTICIPANTLOG", colNamesCampaignParticipantLog, null, valsCampaignParticipantLog]);
+ logArray.push(["CAMPAIGNPARTICIPANTLOG", colNamesCampaignParticipantLog, null, valsCampaignParticipantLog]);
}
}
@@ -76,3 +77,5 @@ if(isUpdate == "true")
db.updates(statementArray)
else
db.inserts(statementArray);
+
+db.inserts(logArray);
\ No newline at end of file
diff --git a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7bc8fbfe93f8c363e428c57d9da324afafc3f9ce
--- /dev/null
+++ b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
@@ -0,0 +1,56 @@
+<?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.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
+ <name>CampaignCostChart_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>PARENT</name>
+ </entityField>
+ <entityField>
+ <name>X</name>
+ <title>Cost</title>
+ </entityField>
+ <entityField>
+ <name>Y</name>
+ </entityField>
+ <entityParameter>
+ <name>CampaignId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>CostChart</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>e519262b-ff42-4c26-9d28-4d9566eafcdc</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>CampaignCostsChart</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/CampaignCostChart_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ <element>PARENT.value</element>
+ <element>X.value</element>
+ <element>X.displayValue</element>
+ <element>Y.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/CampaignCostChart_entity/recordcontainers/jdito/contentProcess.js b/entity/CampaignCostChart_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..148ffa8a083a3719811da1b498be0f36ed1adfda
--- /dev/null
+++ b/entity/CampaignCostChart_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,72 @@
+import("system.result");
+import("system.util");
+import("Sql_lib");
+import("system.db");
+import("system.translate");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("Campaign_lib");
+
+var campaignId = vars.get("$param.CampaignId_param");
+var campaignName = CampaignUtils.getCampaignNameById(campaignId);
+
+var costSqlSelect = "select CAMPAIGNCOSTID, CAMPAIGNSTEP_ID, CAMPAIGNSTEP.NAME, CATEGORY, "
+ + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.campaignStepCostCategory(), "CAMPAIGNCOST.CATEGORY")
+ + ", NET from CAMPAIGNCOST left join CAMPAIGNSTEP on CAMPAIGNSTEP_ID = CAMPAIGNSTEPID";
+var costData = db.table(SqlCondition.begin()
+ .andPrepare("CAMPAIGNCOST.CAMPAIGN_ID", campaignId)
+ .buildSql(costSqlSelect, "1=2")
+);
+
+var types = {
+ FIX : "FIX",
+ VARIABLE : "VARIABLE"
+};
+var campaignCost = {};
+
+costData.forEach(function ([costId, stepId, stepName, categoryId, categoryName, netCost])
+{
+ let type = stepId
+ ? types.VARIABLE
+ : types.FIX;
+
+ if (!(type in this))
+ {
+ let typeName = type == types.FIX
+ ? translate.text("Fix cost")
+ : translate.text("Variable costs")
+ this[type] = new CampaignCostNode("", typeName, 0);
+ }
+ if (type == types.VARIABLE && !(stepId in this))
+ this[stepId] = new CampaignCostNode(type, translate.text("Step") + ": " + stepName, 0);
+
+ categoryId = categoryId + stepId + type;
+ if (!(categoryId in this))
+ this[categoryId] = new CampaignCostNode(stepId || type, categoryName, 0);
+
+ netCost = Number(netCost);
+ this[categoryId].value += netCost;
+ this[type].value += netCost;
+ if (stepId)
+ this[stepId].value += netCost;
+}, campaignCost);
+
+var records = [];
+for (let i in campaignCost)
+ records.push([
+ i,
+ campaignCost[i].parent,
+ i,
+ campaignCost[i].title,
+ campaignCost[i].value
+ ]);
+
+result.object(records);
+
+function CampaignCostNode (pParent, pTitle, pValue)
+{
+ this.parent = pParent;
+ this.title = pTitle;
+ this.value = Number(pValue);
+}
\ No newline at end of file
diff --git a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..143dbb1f06ede974a5fa5ee7c37d056d9ec92c5f
--- /dev/null
+++ b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
@@ -0,0 +1,57 @@
+<?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.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
+ <name>CampaignParticipantChart_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityProvider>
+ <name>ParticipantChart</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>59e7c7ff-a649-4efe-89dd-8fdb7967261b</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>CampaignParticipantsChart</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>X</name>
+ <title>Step</title>
+ </entityField>
+ <entityField>
+ <name>Y</name>
+ </entityField>
+ <entityField>
+ <name>CATEGORY</name>
+ </entityField>
+ <entityParameter>
+ <name>CampaignId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ <element>CATEGORY.value</element>
+ <element>CATEGORY.displayValue</element>
+ <element>X.value</element>
+ <element>X.displayValue</element>
+ <element>Y.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js b/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e210588e47d8813e30295c7bb229e222752d4491
--- /dev/null
+++ b/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,55 @@
+import("system.translate");
+import("system.result");
+import("system.db");
+import("Sql_lib");
+import("system.vars");
+
+var campaignId = vars.get("$param.CampaignId_param");
+
+var sqlSelect = "select CAMPAIGNSTEPID, CAMPAIGNSTEP.NAME, count(distinct CAMPAIGNPARTICIPANTID), MAXPARTICIPANTS, count(distinct CAMPAIGNPARTICIPANTLOGID) "
+ + "from CAMPAIGNSTEP left join CAMPAIGNPARTICIPANT on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID "
+ + "left join CAMPAIGNPARTICIPANTLOG on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANTLOG.CAMPAIGNSTEP_ID ";
+var sqlGroupOrderBy = "group by CAMPAIGNSTEPID, CAMPAIGNSTEP.NAME, MAXPARTICIPANTS, CAMPAIGNSTEP.SORTING order by CAMPAIGNSTEP.SORTING";
+
+var sqlQuery = SqlCondition.begin()
+ .andPrepare("CAMPAIGNSTEP.CAMPAIGN_ID", campaignId)
+ .buildSql(sqlSelect, "1=2", sqlGroupOrderBy);
+
+var stepData = db.table(sqlQuery);
+
+var categories = {
+ CURRENT : "CURRENT",
+ MAX : "MAX",
+ LOGGED : "LOGGED"
+};
+var records = [];
+
+stepData.forEach(function ([stepId, stepName, currentCount, maxCount, loggedCount])
+{
+ records.push([
+ stepId + categories.CURRENT,
+ categories.CURRENT,
+ translate.text("Current participants"),
+ stepId,
+ stepName,
+ currentCount || 0,
+ ]);
+ records.push([
+ stepId + categories.MAX,
+ categories.MAX,
+ translate.text("Max participants"),
+ stepId,
+ stepName,
+ maxCount || 0,
+ ]);
+ records.push([
+ stepId + categories.LOGGED,
+ categories.LOGGED,
+ translate.text("Participated"),
+ stepId,
+ stepName,
+ loggedCount || 0,
+ ]);
+});
+
+result.object(records);
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index a0153d6c26b181670facf33bab32b42902ecd1a1..92dde9b3b1b0d9866b8b0323cecf5b9e07add0c6 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -83,9 +83,9 @@
<title>Campaign Step</title>
<consumer>CampaignSteps</consumer>
<mandatory v="true" />
+ <groupable v="true" />
<state>EDITABLE</state>
<displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstep_id/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
diff --git a/entity/CampaignParticipant_entity/entityfields/campaign_id/stateProcess.js b/entity/CampaignParticipant_entity/entityfields/campaign_id/stateProcess.js
index 08bb8ede9acc54fa91f0ae1b22db90a5f61cea36..ca54a5bcb39a3129766916d2a18ffd04748bee80 100644
--- a/entity/CampaignParticipant_entity/entityfields/campaign_id/stateProcess.js
+++ b/entity/CampaignParticipant_entity/entityfields/campaign_id/stateProcess.js
@@ -1,9 +1,9 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("system.logging");
-
-if(vars.exists("$param.CampaignId_param") && vars.get("$param.CampaignId_param") != "")
- result.string(neon.COMPONENTSTATE_READONLY);
-else
- result.string(neon.COMPONENTSTATE_EDITABLE);
\ No newline at end of file
+//import("system.neon");
+//import("system.result");
+//import("system.vars");
+//
+//if(vars.exists("$param.CampaignId_param") && vars.get("$param.CampaignId_param") != null)
+// result.string(neon.COMPONENTSTATE_READONLY);
+//else
+// result.string(neon.COMPONENTSTATE_EDITABLE);
+//todo campaignllokup readonly?
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/campaign_id/valueProcess.js b/entity/CampaignParticipant_entity/entityfields/campaign_id/valueProcess.js
index 619a4eb3879036407125c0a0f51cf0419a54b1fc..786b8bb1a59bea4737695d019250ba76c377e867 100644
--- a/entity/CampaignParticipant_entity/entityfields/campaign_id/valueProcess.js
+++ b/entity/CampaignParticipant_entity/entityfields/campaign_id/valueProcess.js
@@ -5,5 +5,10 @@ import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW &&
vars.exists("$param.CampaignId_param") && vars.get("$param.CampaignId_param"))
{
+ //todo
+ //Has to be set here because of a bug which prevents loading of the param in the value process
+ if(vars.exists("$param.CampaignStepId_param") && vars.get("$param.CampaignStepId_param"))
+ neon.setFieldValue("$field.CAMPAIGNSTEP_ID", vars.get("$param.CampaignStepId_param"));
+
result.string(vars.get("$param.CampaignId_param"));
}
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/campaignstep_id/displayValueProcess.js b/entity/CampaignParticipant_entity/entityfields/campaignstep_id/displayValueProcess.js
index e99107695ed42802fee2490b171383bdc2de6ea6..6a379f5fd6249fc59ea18bfb2a2ad442aa88e7a8 100644
--- a/entity/CampaignParticipant_entity/entityfields/campaignstep_id/displayValueProcess.js
+++ b/entity/CampaignParticipant_entity/entityfields/campaignstep_id/displayValueProcess.js
@@ -1,7 +1,7 @@
-import("system.logging");
+import("Campaign_lib");
import("system.vars");
import("system.db");
import("system.result");
-logging.log("campaignstep_idim displayvalue -> " + vars.get("$field.CAMPAIGNSTEP_ID"));
-result.string(db.cell("select NAME from CAMPAIGNSTEP where CAMPAIGNSTEPID = '" + vars.get("$field.CAMPAIGNSTEP_ID") + "'"));
\ No newline at end of file
+
+result.string(CampaignUtils.getCampaignStepNameById(vars.get("$field.CAMPAIGNSTEP_ID")));
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/campaignstep_id/onValueChange.js b/entity/CampaignParticipant_entity/entityfields/campaignstep_id/onValueChange.js
deleted file mode 100644
index 786b3ee87f36dd8cee13c107c0ba28bc76dc008c..0000000000000000000000000000000000000000
--- a/entity/CampaignParticipant_entity/entityfields/campaignstep_id/onValueChange.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.logging");
-logging.log("campaignstep_id im onValueChange -> " + vars.get("$field.CAMPAIGNSTEP_ID"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 491dce1b683f23324b5106dbd9f7c83f14ae7e32..8dd8aa144722e5bf7230b72799eb66b3c76acca4 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -10,6 +10,14 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>13f82959-7e04-449f-a657-c34f6b97f3be</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>CampaignSteps</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>CAMPAIGNSTEPID</name>
@@ -119,6 +127,12 @@
<fieldName>CampaignSteps</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>3fde1e51-cc4c-4727-b4e7-fd30bed1ee04</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>CampaignStepsReadonly</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -155,6 +169,7 @@
<title>Max participants</title>
<contentType>NUMBER</contentType>
<mandatory v="true" />
+ <onValidation>%aditoprj%/entity/CampaignStep_entity/entityfields/maxparticipants/onValidation.js</onValidation>
</entityField>
<entityConsumer>
<name>CampaignParticipantsConsumer</name>
@@ -236,6 +251,63 @@
<fieldName>CampaignProvider</fieldName>
</dependency>
</entityConsumer>
+ <entityConsumer>
+ <name>Activities</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <title>Activities</title>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>RowId_param</name>
+ <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Tasks</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <title>Tasks</title>
+ <stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/tasks/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>RowId_param</name>
+ <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <fieldType>ACTION</fieldType>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>NEON:HISTORY</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>newTask</name>
+ <fieldType>ACTION</fieldType>
+ <title>New task</title>
+ <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TASKS</iconId>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/CampaignStep_entity/entityfields/activities/children/objectid_param/valueProcess.js b/entity/CampaignStep_entity/entityfields/activities/children/objectid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/activities/children/objectid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/activities/children/rowid_param/valueProcess.js b/entity/CampaignStep_entity/entityfields/activities/children/rowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..73512b5ba01cbb1eb0c5c71d8b3bb16712f8f7bc
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/activities/children/rowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CAMPAIGNSTEPID"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/maxparticipants/onValidation.js b/entity/CampaignStep_entity/entityfields/maxparticipants/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..378e2a7a10e331996da72cd84e0bc1eb2b8d45b6
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/maxparticipants/onValidation.js
@@ -0,0 +1,10 @@
+import("Campaign_lib");
+import("system.result");
+import("Entity_lib");
+import("system.vars");
+
+var currentParticipantsCount = parseInt(vars.get("$field.CurrentMaxParticipantsInfo")[0]);
+var newMaxParticipantsCount = parseInt(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MAXPARTICIPANTS")));
+
+if(newMaxParticipantsCount < currentParticipantsCount)
+ result.string(CampaignUtils.getMaxParticipantsValidationMessage());
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/newactivity/onActionProcess.js b/entity/CampaignStep_entity/entityfields/newactivity/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..59a786db9b15cca4809d11586ba9adc7b70fea37
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/newactivity/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("ActivityTask_lib");
+
+ActivityUtils.createNewActivity(vars.getString("$field.CAMPAIGNSTEPID"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/newactivity/tooltipProcess.js b/entity/CampaignStep_entity/entityfields/newactivity/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c71e677c22663c2295e524aa7f3ed3dd571724d7
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/newactivity/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/newtask/onActionProcess.js b/entity/CampaignStep_entity/entityfields/newtask/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c674a6a4942409c114993fc541519e0b3c23a236
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/newtask/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("ActivityTask_lib");
+
+TaskUtils.createNewTask(vars.get("$field.CAMPAIGNSTEPID"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/tasks/children/objectid_param/valueProcess.js b/entity/CampaignStep_entity/entityfields/tasks/children/objectid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/tasks/children/objectid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/tasks/children/rowid_param/valueProcess.js b/entity/CampaignStep_entity/entityfields/tasks/children/rowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..73512b5ba01cbb1eb0c5c71d8b3bb16712f8f7bc
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/tasks/children/rowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CAMPAIGNSTEPID"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/tasks/stateProcess.js b/entity/CampaignStep_entity/entityfields/tasks/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..527624728ab45db1d1e548022197a2e509eee432
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/tasks/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+
+if (TaskUtils.hasTasks(vars.get("$field.CAMPAIGNSTEPID"), ContextUtils.getCurrentContextId()))
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 627cde03dbf2c846ba1938f79a9730204e29ec13..1f88b6da4481b3f285fab3397a1e39e7ead6e960 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -5,11 +5,20 @@
<icon>VAADIN:GROUP</icon>
<title>Campaign</title>
<contentTitleProcess>%aditoprj%/entity/Campaign_entity/contentTitleProcess.js</contentTitleProcess>
+ <afterUiInit>%aditoprj%/entity/Campaign_entity/afterUiInit.js</afterUiInit>
<titlePlural>Campaigns</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>8db36fa6-e799-488c-882f-1141f781c9dc</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>Campaigns</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>CAMPAIGNID</name>
@@ -51,6 +60,7 @@
<name>DESCRIPTION</name>
<title>Description</title>
<contentType>LONG_TEXT</contentType>
+ <titleProcess>%aditoprj%/entity/Campaign_entity/entityfields/description/titleProcess.js</titleProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
@@ -77,6 +87,7 @@
<entityConsumer>
<name>CampaignSteps</name>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <state>EDITABLE</state>
<dependency>
<name>dependency</name>
<entityName>CampaignStep_entity</entityName>
@@ -226,6 +237,135 @@
<title>Participants</title>
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/participantcount/valueProcess.js</valueProcess>
</entityField>
+ <entityConsumer>
+ <name>Activities</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <title>Activities</title>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>RowId_param</name>
+ <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Tasks</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <title>Tasks</title>
+ <stateProcess>%aditoprj%/entity/Campaign_entity/entityfields/tasks/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>RowId_param</name>
+ <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <fieldType>ACTION</fieldType>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>NEON:HISTORY</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Campaign_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>newTask</name>
+ <fieldType>ACTION</fieldType>
+ <title>New task</title>
+ <onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TASKS</iconId>
+ </entityActionField>
+ <entityConsumer>
+ <name>CampaignCostsChart</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <title>Charts</title>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignCostChart_entity</entityName>
+ <fieldName>CostChart</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>CampaignId_param</name>
+ <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaigncostschart/children/campaignid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>CampaignParticipantsChart</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <title>Chart 2</title>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignParticipantChart_entity</entityName>
+ <fieldName>ParticipantChart</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>CampaignId_param</name>
+ <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignparticipantschart/children/campaignid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>remainingRuntime</name>
+ <title>Remaining Runtime</title>
+ <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/remainingruntime/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>CampaignStepsReadonly</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <state>READONLY</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignSteps</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>campaignId_param</name>
+ <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignstepsreadonly/children/campaignid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Attributes</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Campaign_entity/afterUiInit.js b/entity/Campaign_entity/afterUiInit.js
new file mode 100644
index 0000000000000000000000000000000000000000..031b635db2bf916a03eda91e8db23dc6c8bb5d35
--- /dev/null
+++ b/entity/Campaign_entity/afterUiInit.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+import("Attribute_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
+}
diff --git a/entity/Campaign_entity/entityfields/activities/children/objectid_param/valueProcess.js b/entity/Campaign_entity/entityfields/activities/children/objectid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/activities/children/objectid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js b/entity/Campaign_entity/entityfields/activities/children/rowid_param/valueProcess.js
similarity index 52%
rename from entity/Offer_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
rename to entity/Campaign_entity/entityfields/activities/children/rowid_param/valueProcess.js
index 4adebe4edff067c1964160dfa9f90a08cc5fdfe0..3814648f507bd77edb266f38a807c1669e8c5f1e 100644
--- a/entity/Offer_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
+++ b/entity/Campaign_entity/entityfields/activities/children/rowid_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.OFFERID"));
\ No newline at end of file
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CAMPAIGNID"));
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/Campaign_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..533f8ec837ea2f9b588ddf05545ac47cdda23d18
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$sys.uid"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js b/entity/Campaign_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
similarity index 96%
rename from entity/Offer_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
rename to entity/Campaign_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
index 431bcc952145cb451362fc69754f84ff1514bac5..e8b4e72e74a0a4696ff39e83135aa6100ef908c0 100644
--- a/entity/Offer_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
+++ b/entity/Campaign_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getCurrentContextId());
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/Campaign_entity/entityfields/campaigncostschart/children/campaignid_param/valueProcess.js b/entity/Campaign_entity/entityfields/campaigncostschart/children/campaignid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3814648f507bd77edb266f38a807c1669e8c5f1e
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/campaigncostschart/children/campaignid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CAMPAIGNID"));
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/campaignparticipantschart/children/campaignid_param/valueProcess.js b/entity/Campaign_entity/entityfields/campaignparticipantschart/children/campaignid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3814648f507bd77edb266f38a807c1669e8c5f1e
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/campaignparticipantschart/children/campaignid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CAMPAIGNID"));
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/campaignstepsreadonly/children/campaignid_param/valueProcess.js b/entity/Campaign_entity/entityfields/campaignstepsreadonly/children/campaignid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ea290bfda9377cc69f8b4c727ccbe2cf83f493de
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/campaignstepsreadonly/children/campaignid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+
+result.string(vars.getString("$field.CAMPAIGNID"));
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/description/titleProcess.js b/entity/Campaign_entity/entityfields/description/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..076336c605a88532487f3d2043c0450d7021806e
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/description/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("system.translate");
+
+if(vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_VIEW)
+{
+ result.string(translate.text("Description"));
+}
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/employee_contact_id/valueProcess.js b/entity/Campaign_entity/entityfields/employee_contact_id/valueProcess.js
index 1e62e7551ccb20b0b0d7aca34f64b6e448b5dda7..008a2ed6a798ca63548aadf7f9d7bcd2d71efb4d 100644
--- a/entity/Campaign_entity/entityfields/employee_contact_id/valueProcess.js
+++ b/entity/Campaign_entity/entityfields/employee_contact_id/valueProcess.js
@@ -3,5 +3,5 @@ import("system.neon");
import("system.vars");
import("Employee_lib");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
result.string(EmployeeUtils.getCurrentContactId());
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/newactivity/onActionProcess.js b/entity/Campaign_entity/entityfields/newactivity/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3cc8f6e5013e0a16d03444898c3a7f2cfa366552
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/newactivity/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("ActivityTask_lib");
+
+ActivityUtils.createNewActivity(vars.getString("$field.CAMPAIGNID"));
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/newactivity/tooltipProcess.js b/entity/Campaign_entity/entityfields/newactivity/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c71e677c22663c2295e524aa7f3ed3dd571724d7
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/newactivity/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/newtask/onActionProcess.js b/entity/Campaign_entity/entityfields/newtask/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d870f4d21cebf7aeaf34d6b59f2157d03d8e82ff
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/newtask/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("ActivityTask_lib");
+
+TaskUtils.createNewTask(vars.get("$field.CAMPAIGNID"));
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/remainingruntime/valueProcess.js b/entity/Campaign_entity/entityfields/remainingruntime/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f1bb2d459a4c0944026218aac403ef0c3195f2e5
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/remainingruntime/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("4");
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/tasks/children/objectid_param/valueProcess.js b/entity/Campaign_entity/entityfields/tasks/children/objectid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/tasks/children/objectid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/tasks/children/rowid_param/valueProcess.js b/entity/Campaign_entity/entityfields/tasks/children/rowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3814648f507bd77edb266f38a807c1669e8c5f1e
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/tasks/children/rowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CAMPAIGNID"));
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/tasks/stateProcess.js b/entity/Campaign_entity/entityfields/tasks/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d77c2eeb195571306ce7f9e977a5f9ad26b47079
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/tasks/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+
+if (TaskUtils.hasTasks(vars.get("$field.CAMPAIGNID"), ContextUtils.getCurrentContextId()))
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/onDBDelete.js b/entity/Campaign_entity/recordcontainers/db/onDBDelete.js
index fe6d290a0d7833058d4503ef92c6a787bee31f28..af050049af87260fc04101c288c6d52cb1e231aa 100644
--- a/entity/Campaign_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Campaign_entity/recordcontainers/db/onDBDelete.js
@@ -2,7 +2,7 @@ import("system.db");
import("system.vars");
import("Sql_lib");
-var currentId = vars.getString("$field.SALESPROJECTID");
+var currentId = vars.getString("$field.CAMPAIGNID");
if (currentId)
{
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0a6a6ee2f14243c15fe573fc695e2c3e1227b836
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -0,0 +1,167 @@
+<?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.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
+ <name>DocumentTemplateLink_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Attachment</title>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DOCUMENTTEMPLATE_ID_PARENT</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_parent/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DOCUMENTTEMPLATELINKID</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplatelinkid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DOCUMENTTEMPLATE_ID_CHILD</name>
+ <consumer>Attachments</consumer>
+ <linkedContext>DocumentTemplate</linkedContext>
+ <stateProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>DocumentId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>Attachments</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>Attachments</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DocumentTemplateType_param</name>
+ <title></title>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/attachments/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>Links</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <targetIdField>DOCUMENTTEMPLATE_ID_CHILD</targetIdField>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>db3b7e04-ca3b-4205-a1d3-5e5e5cb13073</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>Links</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>DocumentId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Type_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>Type_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityActionField>
+ <name>OpenDocument</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:DOWNLOAD</iconId>
+ </entityActionField>
+ <entityField>
+ <name>ICON</name>
+ <contentType>TEXT</contentType>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/icon/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <fromClauseProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>05d25e85-1cd8-4897-be48-ecf699322b1f</name>
+ <tableName>DOCUMENTTEMPLATELINK</tableName>
+ <primaryKey>DOCUMENTTEMPLATELINKID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>34ca9c71-3de5-48ce-ade2-fa203360ebbd</name>
+ <tableName>DOCUMENTTEMPLATE</tableName>
+ <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DOCUMENTTEMPLATE_ID_CHILD.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_CHILD</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DOCUMENTTEMPLATE_ID_PARENT.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_PARENT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DOCUMENTTEMPLATELINKID.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATELINKID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/DocumentTemplateLink_entity/entityfields/attachments/children/documenttemplatetype_param/valueProcess.js b/entity/DocumentTemplateLink_entity/entityfields/attachments/children/documenttemplatetype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bc450eb560a7a5c7c39bcfb557dd579e30f26eb8
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/attachments/children/documenttemplatetype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.documentTemplateType$attachment());
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/entityfields/date_edit/valueProcess.js b/entity/DocumentTemplateLink_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1615e15bf31dcf9823f5a8949ad1a73fd5fef6ae
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/entityfields/date_new/valueProcess.js b/entity/DocumentTemplateLink_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9477aae8647e69beb635ccbbe3a5aed9e7dc693e
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js b/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c39c4f940d57a66abfcb5fe424361ee10bd55469
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("system.db");
+import("system.vars");
+import("Contact_lib");
+
+var documenttemplatename = "";
+var documenttemplateId = vars.get("$field.DOCUMENTTEMPLATE_ID_CHILD");
+
+documenttemplatename = db.cell(SqlCondition.begin()
+ .andPrepare("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", documenttemplateId)
+ .buildSql("select DOCUMENTTEMPLATE.NAME from DOCUMENTTEMPLATE"));
+
+result.string(documenttemplatename);
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js b/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bab14e8a9c1f3f4f529686b2f55032d0b4bb1e6b
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js
@@ -0,0 +1,13 @@
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("system.db");
+
+var parenttype = vars.get("$param.Type_param");
+//logging.log(parenttype);
+
+//if(vars.exists(parenttype) && paraenttype != null && parenttype != "MAI"){
+// result.object(neon.COMPONENTSTATE_DISABLED);
+//}
+//
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/valueProcess.js b/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_parent/valueProcess.js b/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_parent/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4be9f65997ab3fef36f35f86c932c08ac51e12d4
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_parent/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.DocumentId_param"))
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/entityfields/documenttemplatelinkid/valueProcess.js b/entity/DocumentTemplateLink_entity/entityfields/documenttemplatelinkid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a2378ee42b3638db13001b2890b78669e5c65d9e
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/documenttemplatelinkid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/entityfields/icon/valueProcess.js b/entity/DocumentTemplateLink_entity/entityfields/icon/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c22e061e07dad1aa4d4045f2d0a5c40d7641af12
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/icon/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("vaadin:file_text");
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js b/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..df7fdfffbfa712ea63faca46424e7dd059f1495b
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js
@@ -0,0 +1,13 @@
+import("system.db");
+import("system.vars");
+import("system.neon");
+import("system.logging");
+
+var fileInformation = db.array(db.ROW, "select ID, FILENAME from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATE_ID_CHILD") + "'", "_____SYSTEMALIAS");
+var data = db.getBinaryContent(fileInformation[0], "_____SYSTEMALIAS");
+neon.download(data, fileInformation[1]);
+
+
+
+
+
diff --git a/entity/DocumentTemplateLink_entity/entityfields/user_edit/valueProcess.js b/entity/DocumentTemplateLink_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9abd7045eee6f2813960ef3b0921d2951fc75978
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/entityfields/user_new/valueProcess.js b/entity/DocumentTemplateLink_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ad6636be180fbc3dd74567a8751bc69af1f287ff
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplateLink_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..71ea6e3b7429b2c32f14f376e501a3dc7ce29180
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.db");
+import("Sql_lib");
+
+var cond = SqlCondition.begin()
+ .andPrepareVars("DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_PARENT", "$param.DocumentId_param")
+
+result.string(db.translateCondition(cond.build("1=2")));
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/recordcontainers/db/fromClauseProcess.js b/entity/DocumentTemplateLink_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..52d46e62a6de93a2f1853cbc2d94d7f478e583f8
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DOCUMENTTEMPLATELINK join DOCUMENTTEMPLATE on DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID = DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_PARENT");
\ No newline at end of file
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..460033f4b5aefe62b46439933e20fb125c8a9c47
--- /dev/null
+++ b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
@@ -0,0 +1,76 @@
+<?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.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
+ <name>DocumentTemplateTypeCategory_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <contentTitleProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityParameter>
+ <name>usageFilter_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>AB_KEYWORD_ENTRYID</name>
+ </entityField>
+ <entityField>
+ <name>KEYID</name>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ </entityField>
+ <entityProvider>
+ <name>ByCategory</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <lookupIdfield>KEYID</lookupIdfield>
+ <dependencies>
+ <entityDependency>
+ <name>5eb6b17c-8c13-48df-84d5-a949b7d21cf3</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateTypeCategory</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>usageFilter_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>6cfa2424-b81b-4750-ae43-e3b1126eab0a</name>
+ <tableName>AB_KEYWORD_ENTRY</tableName>
+ <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>AB_KEYWORD_ENTRYID.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>KEYID.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TITLE.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js b/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..554c806f6eba1b0e1f71ea1b1b1b9dc8f032b094
--- /dev/null
+++ b/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text(vars.get("$field.TITLE")));
\ No newline at end of file
diff --git a/entity/DocumentTemplateTypeCategory_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplateTypeCategory_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dc7d1be863628e131e9e10c6ea401aa9aca87e12
--- /dev/null
+++ b/entity/DocumentTemplateTypeCategory_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,25 @@
+import("system.logging");
+import("system.db");
+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+import("Sql_lib");
+import("Keyword_lib");
+
+var cond = SqlCondition.begin()
+ .andPrepare("AB_KEYWORD_ENTRY.CONTAINER", $KeywordRegistry.documentTemplateTypeCategory());
+
+var usageFilter = vars.get("$param.usageFilter_param");
+if (usageFilter)
+{
+ var keywordAttribute = new KeywordAttribute($KeywordRegistry.documentTemplateTypeCategory(), usageFilter);
+ cond.andAttachPrepared(SqlCondition.begin()
+ .andPrepare("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID", keywordAttribute.id)
+ .andPrepare("AB_KEYWORD_ATTRIBUTERELATION." + keywordAttribute.dbField, "1")
+ .buildSql("AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID in (\n\
+ select AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID \n\
+ from AB_KEYWORD_ATTRIBUTERELATION ", null, ")"));
+}
+
+cond = db.translateStatement(cond.build("1 = 2"));
+result.string(cond);
\ No newline at end of file
diff --git a/entity/DocumentTemplateTypeCategory_entity/titleProcess.js b/entity/DocumentTemplateTypeCategory_entity/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..554c806f6eba1b0e1f71ea1b1b1b9dc8f032b094
--- /dev/null
+++ b/entity/DocumentTemplateTypeCategory_entity/titleProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text(vars.get("$field.TITLE")));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..44249b447c4c81726c797cec5d163226b644b1bb
--- /dev/null
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -0,0 +1,311 @@
+<?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.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
+ <name>DocumentTemplate_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:FILE_FONT</icon>
+ <title>Document Template</title>
+ <contentTitleProcess>%aditoprj%/entity/DocumentTemplate_entity/contentTitleProcess.js</contentTitleProcess>
+ <afterUiInit>%aditoprj%/entity/DocumentTemplate_entity/afterUiInit.js</afterUiInit>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <title>Date edit</title>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
+ <entityField>
+ <name>DOCUMENTTEMPLATEID</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <title>Date new</title>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TYPE</name>
+ <title>Type</title>
+ <consumer>KeywordDocumentTemplateType</consumer>
+ <mandatory v="true" />
+ <groupable v="true" />
+ <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/onValueChange.js</onValueChange>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ </entityField>
+ <entityField>
+ <name>NAME</name>
+ <title>Name</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>LANGUAGE</name>
+ <title>Language</title>
+ <consumer>Languages</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>BINDATA</name>
+ <contentType>FILE</contentType>
+ <onValueChange>%aditoprj%/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js</onValueChange>
+ </entityField>
+ <entityConsumer>
+ <name>Documents</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Languages</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>ISO3Name</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDocumentTemplateType</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/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Attributes</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>htmlText</name>
+ <title>HTML</title>
+ <contentType>HTML</contentType>
+ <state>INVISIBLE</state>
+ <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>texText</name>
+ <title>Text</title>
+ <contentType>LONG_TEXT</contentType>
+ <state>INVISIBLE</state>
+ <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATION</name>
+ <title>Classification</title>
+ <consumer>DocumentTemplateTypeCategory</consumer>
+ <groupable v="true" />
+ <state>DISABLED</state>
+ <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>DocumentTemplateTypeCategory</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplateTypeCategory_entity</entityName>
+ <fieldName>ByCategory</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>usageFilter_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplatetypecategory/children/usagefilter_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>Attachments</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>TARGET_CONTEXT</targetContextField>
+ <targetIdField>DOCUMENTTEMPLATEID</targetIdField>
+ <targetConsumerProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attachments/targetConsumerProcess.js</targetConsumerProcess>
+ <titlePlural>Attachments</titlePlural>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>856e3435-a173-4cf5-8e81-3f884f8238d3</name>
+ <entityName>DocumentTemplateLink_entity</entityName>
+ <fieldName>Attachments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityConsumer>
+ <name>Links</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplateLink_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DocumentId_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/children/documentid_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Type_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/children/type_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>DocumentTemplateTypeClassification_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>DocumentTemplateProvider</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>e1c555c3-9e53-4ccf-962c-4bdd3c14bb16</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>DocumentTemplateText</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>9c10883d-eb73-4587-b758-693a66367a4c</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>DocumentTemplateTex</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>DocumentTemplateType_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>TARGET_CONTEXT</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <onDBInsert>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <linkInformation>
+ <linkInformation>
+ <name>982325b6-d12e-43f9-8ac2-c4b9f013aafd</name>
+ <tableName>DOCUMENTTEMPLATE</tableName>
+ <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>DOCUMENTTEMPLATE.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>DOCUMENTTEMPLATE.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DESCRIPTION.value</name>
+ <recordfield>DOCUMENTTEMPLATE.DESCRIPTION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LANGUAGE.value</name>
+ <recordfield>DOCUMENTTEMPLATE.LANGUAGE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>NAME.value</name>
+ <recordfield>DOCUMENTTEMPLATE.NAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TYPE.value</name>
+ <recordfield>DOCUMENTTEMPLATE.TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>DOCUMENTTEMPLATE.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>DOCUMENTTEMPLATE.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DOCUMENTTEMPLATEID.value</name>
+ <recordfield>DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATION.value</name>
+ <recordfield>DOCUMENTTEMPLATE.CLASSIFICATION</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/DocumentTemplate_entity/afterUiInit.js b/entity/DocumentTemplate_entity/afterUiInit.js
new file mode 100644
index 0000000000000000000000000000000000000000..031b635db2bf916a03eda91e8db23dc6c8bb5d35
--- /dev/null
+++ b/entity/DocumentTemplate_entity/afterUiInit.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+import("Attribute_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
+}
diff --git a/entity/DocumentTemplate_entity/contentTitleProcess.js b/entity/DocumentTemplate_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..50558aa1c66aa3d4589060db47e5ab49a46eadbd
--- /dev/null
+++ b/entity/DocumentTemplate_entity/contentTitleProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text(vars.get("$field.NAME")));
diff --git a/entity/DocumentTemplate_entity/entityfields/attachments/targetConsumerProcess.js b/entity/DocumentTemplate_entity/entityfields/attachments/targetConsumerProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/DocumentTemplate_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8664993b9e558e2315aca8e89fb11698b5a6b2bf
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.DOCUMENTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e8b4e72e74a0a4696ff39e83135aa6100ef908c0
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js b/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca1705e355c1a2199a9f6ef5ffe027958db1a83f
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
@@ -0,0 +1,20 @@
+import("system.logging");
+import("system.vars");
+import("system.neon");
+import("Entity_lib");
+import("Document_lib");
+
+var uploadValue = DocumentUtil.getFilenameFromUpload(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.BINDATA")));
+
+logging.log(uploadValue.length)
+
+if(!(vars.get("$field.NAME") != null && vars.get("$field.NAME") != ""))
+{
+ if(uploadValue.length <= 40)
+ {
+ neon.setFieldValue("$field.NAME", uploadValue);
+ }else{
+ var limit = uploadValue.length - 40;
+ neon.setFieldValue("$field.NAME", uploadValue.substr(0, uploadValue.length - limit));
+ }
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/classification/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/classification/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3fa63d8f1e264fdb9df414a564214a57a2a58868
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/classification/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.documentTemplateTypeCategory(), vars.get("$field.CLASSIFICATION")));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bada82b49dcfafa93649cba6f1e0d966fba0f665
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$field.TYPE") != "")
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/date_new/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8ee28e84edb9930de54975f81e8cb5a13c9aa02f
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentname_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6429dbcc1ac80330962ba43cb085a71d46871c52
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8664993b9e558e2315aca8e89fb11698b5a6b2bf
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.DOCUMENTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4fccd6bbf06c0613f12b6dd668116698fada04e4
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("DOCUMENTTEMPLATE");
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..86ef789e064a4016f2d12c432498dc23474807aa
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplatetypecategory/children/usagefilter_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/documenttemplatetypecategory/children/usagefilter_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..362313e65fdfab456319665cf556658958e5b5ab
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documenttemplatetypecategory/children/usagefilter_param/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+
+logging.log("aufruf");
+
+result.object(vars.get("$field.TYPE"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/htmltext/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/htmltext/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..98c975d068848e945101f47d0a176190340079f7
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.BINDATA") == "")
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f466ca039d12607076026cbc9beb07797bf33d83
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.util");
+import("system.db");
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.BINDATA") == "" && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+ var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
+ result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d01f72a9ca9c8d5200473ded7df761fc013de5fe
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.documentTemplateType());
diff --git a/entity/DocumentTemplate_entity/entityfields/language/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/language/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f4cab09b91902faee535768a00c0a618baa3ff27
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/language/displayValueProcess.js
@@ -0,0 +1,12 @@
+import("system.db");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var iso3 = vars.get("$field.LANGUAGE");
+var latinName = db.cell(SqlCondition.begin()
+ .andPrepare("AB_LANGUAGE.ISO3", iso3)
+ .buildSql("select NAME_LATIN from AB_LANGUAGE", "1=0"));
+latinName = translate.text(latinName);
+result.string(latinName);
diff --git a/entity/DocumentTemplate_entity/entityfields/links/children/documentid_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/links/children/documentid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..67b75101e52e109f54ed5fccd1dd7ae185cde4a3
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/links/children/documentid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.DOCUMENTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/links/children/type_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/links/children/type_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e133265a133774e7833f803e776e6321c6ab1aac
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/links/children/type_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.TYPE"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..957a413f1d7036e74834b8f00622619178d16b15
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.neon");
+
+if(vars.get("$field.TYPE") != $KeywordRegistry.documentTemplateType$mail())
+{
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..183df0aef24b48a3650d4295f38428336c337ff0
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.logging");
+import("system.db");
+import("system.vars");
+import("system.result");
+import("system.util");
+import("Context_lib");
+
+result.string('Document');
+
+
diff --git a/entity/DocumentTemplate_entity/entityfields/textext/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/textext/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fbe7078587b5a27d6cf21bb4a78d718c76009441
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.BINDATA") == "")
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5d970a867f246821e5e4b98b5fe9483d8b9cca91
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.util");
+import("system.db");
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.BINDATA") == "" && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+ var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
+ result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/type/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/type/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..543177e2faddef74ec044962aac2969efe9b04de
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/type/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.documentTemplateType(), vars.get("$field.TYPE")));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/type/onValueChange.js b/entity/DocumentTemplate_entity/entityfields/type/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/DocumentTemplate_entity/entityfields/type/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/type/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..49d3d53d991cc1a864d6db072347af1800f035cf
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/type/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(neon.COMPONENTSTATE_READONLY);
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/user_new/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dda83cfd00e13df5c6da64151f5d1e6d932a681e
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..98f1298fa355374b4ce435e8cb69f792a19228e1
--- /dev/null
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.vars");
+import("system.db");
+import("Sql_lib");
+
+var cond = SqlCondition.begin()
+ .andPrepareVars("DOCUMENTTEMPLATE.TYPE", "$param.DocumentTemplateType_param")
+ .andPrepareVars("DOCUMENTTEMPLATE.CLASSIFICATION", "$param.DocumentTemplateTypeClassification_param");
+
+result.string(db.translateStatement(cond.build("1=1")));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/fromClauseProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js b/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..2f13bfd83f2b04a297b4bb3aa174698f30228391
--- /dev/null
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,33 @@
+import("system.logging");
+import("system.vars");
+import("system.db");
+import("system.util");
+import("Document_lib");
+
+//TODO - Function
+
+var bindataUpload = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA"));
+var filename = "";
+var bindata = "";
+
+if(bindataUpload != "")
+{
+ filename = DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA"));
+ bindata = bindataUpload;
+}
+else if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.htmlText") != "")
+{
+ filename = vars.get("$field.NAME") + ".html";
+ bindata = util.encodeBase64String(vars.get("$field.htmlText"));
+}
+else if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.texText") != "")
+{
+ filename = vars.get("$field.NAME") + ".txt";
+ bindata = util.encodeBase64String(vars.get("$field.texText"));
+}
+
+if(bindata != "" && filename != "")
+{
+ db.insertBinary("DOCUMENTTEMPLATE", "DOCUMENT", vars.get("$field.DOCUMENTTEMPLATEID"),
+ "", bindata, filename, "", "", "_____SYSTEMALIAS");
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js b/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..429cc8a2e1cdf354250f0753f78fde2b58f6810a
--- /dev/null
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
@@ -0,0 +1,32 @@
+import("system.util");
+import("system.vars");
+import("system.db");
+import("Document_lib");
+
+//TODO - Function
+
+var bindataUpload = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA"));
+var filename = "";
+var bindata = "";
+
+if(bindataUpload != "")
+{
+ bindata = bindataUpload;
+ filename = DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA"));
+}
+else if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.htmlText") != "")
+{
+ filename = vars.get("$field.NAME") + ".html";
+ bindata = util.encodeBase64String(vars.get("$field.htmlText"));
+}
+else if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.texText") != "")
+{
+ filename = vars.get("$field.NAME") + ".txt";
+ bindata = util.encodeBase64String(vars.get("$field.texText"));
+}
+
+if(bindata != "" && filename != "")
+{
+ var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
+ db.updateBinary(binaryId, "", bindata, filename, "", "", "_____SYSTEMALIAS");
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/titleProcess.js b/entity/DocumentTemplate_entity/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..50558aa1c66aa3d4589060db47e5ab49a46eadbd
--- /dev/null
+++ b/entity/DocumentTemplate_entity/titleProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text(vars.get("$field.NAME")));
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js b/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
index 258b1455824907ef5831d1b350b843da2330aa37..5286ead89b8157c574973a93fd3f38f79c81568d 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
@@ -5,7 +5,7 @@ import("system.tools");
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
var role = vars.get("$field.ROLE");
-if (userTitle)
+if (userTitle && tools.existUsers(userTitle))
{
var user = tools.getUser(userTitle);
var roles = tools.getRoles(userTitle);
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 50ffb189a0894cd8a53cffef2eda04a81e87f407..149fb2a0acdc86fb7a9fd9be87d4fcf9af7518eb 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -6,7 +6,6 @@
<contentTitleProcess>%aditoprj%/entity/Employee_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Employee_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
- <afterOperatingState>%aditoprj%/entity/Employee_entity/afterOperatingState.js</afterOperatingState>
<iconId>VAADIN:USER</iconId>
<titlePlural>Employees</titlePlural>
<recordContainer>jdito</recordContainer>
@@ -272,14 +271,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>USERID</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>USERID_SMALL</name>
- <searchable v="false" />
- </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -301,8 +292,6 @@
<element>CONTACT_ID.value</element>
<element>CONTACT_ID.displayValue</element>
<element>DEPARTMENT.value</element>
- <element>USERID.value</element>
- <element>USERID_SMALL.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/Employee_entity/afterOperatingState.js b/entity/Employee_entity/afterOperatingState.js
deleted file mode 100644
index 4423124e0c78787a3141d45a7d23ea0295ef4145..0000000000000000000000000000000000000000
--- a/entity/Employee_entity/afterOperatingState.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- neon.setFieldValue("$field.UID", ""); //UID = user-title, should be initially empty
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
index 4efd08e3fe4c862d5eef9eda053cb9ddf4720b0c..21dc251f63b3ae3e77d8bcdd3a36b384f7f6e6d3 100644
--- a/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,5 @@
+import("Employee_lib");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.USERID_SMALL"));
\ No newline at end of file
+result.string(EmployeeUtils.sliceUserId(vars.get("$field.UID")));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
index 4efd08e3fe4c862d5eef9eda053cb9ddf4720b0c..21dc251f63b3ae3e77d8bcdd3a36b384f7f6e6d3 100644
--- a/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,5 @@
+import("Employee_lib");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.USERID_SMALL"));
\ No newline at end of file
+result.string(EmployeeUtils.sliceUserId(vars.get("$field.UID")));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/contact_id/onValidation.js b/entity/Employee_entity/entityfields/contact_id/onValidation.js
index 46842576f46eab3aff937175ea2fd26972a66880..e061f78317ebce5e121c09b11c3eda7a53e6db39 100644
--- a/entity/Employee_entity/entityfields/contact_id/onValidation.js
+++ b/entity/Employee_entity/entityfields/contact_id/onValidation.js
@@ -6,7 +6,7 @@ import("system.translate");
var contactId = vars.get("$field.CONTACT_ID");
var isTaken = tools.getUserByAttribute(tools.CONTACTID, [contactId]);
isTaken = isTaken
- ? isTaken[tools.NAME] != vars.get("$field.USERID")
+ ? isTaken[tools.NAME] != vars.get("$field.UID")
: false;
if (contactId && isTaken)
result.string(translate.text("The person is already associated with another employee!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/department/displayValueProcess.js b/entity/Employee_entity/entityfields/department/displayValueProcess.js
index 054924b0a34bb4c52b0b3ffe2648ecfedb2aedf7..30234aac2753fd812e7778c6c9977e2fb25d0f72 100644
--- a/entity/Employee_entity/entityfields/department/displayValueProcess.js
+++ b/entity/Employee_entity/entityfields/department/displayValueProcess.js
@@ -1,5 +1,5 @@
-import("system.result");
-import("system.vars");
-import("Attribute_lib");
-
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+
result.string(AttributeUtil.getFullAttributeName(vars.get("$field.DEPARTMENT")));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/departments/children/attrparentid_param/valueProcess.js b/entity/Employee_entity/entityfields/departments/children/attrparentid_param/valueProcess.js
index 69d5189f033b57b9df7bc2b150851c4785abfeee..69955f29620ecadd6e6b02b1a8029c3eec423f3b 100644
--- a/entity/Employee_entity/entityfields/departments/children/attrparentid_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/departments/children/attrparentid_param/valueProcess.js
@@ -1,2 +1,2 @@
-import("system.result");
+import("system.result");
result.string("87d4ff5b-0ab6-4534-be26-76c6ef486072");
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/departments/children/attrparenttype_param/valueProcess.js b/entity/Employee_entity/entityfields/departments/children/attrparenttype_param/valueProcess.js
index 67a485769c386a03ada03f1ecb2c774b87fcd091..2a8c15df42a4200e8e35bd2f54a0e4dd4b63a127 100644
--- a/entity/Employee_entity/entityfields/departments/children/attrparenttype_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/departments/children/attrparenttype_param/valueProcess.js
@@ -1,3 +1,3 @@
-import("system.result");
-import("Attribute_lib");
+import("system.result");
+import("Attribute_lib");
result.string($AttributeTypes.VOID);
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
index 4efd08e3fe4c862d5eef9eda053cb9ddf4720b0c..21dc251f63b3ae3e77d8bcdd3a36b384f7f6e6d3 100644
--- a/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -1,4 +1,5 @@
+import("Employee_lib");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.USERID_SMALL"));
\ No newline at end of file
+result.string(EmployeeUtils.sliceUserId(vars.get("$field.UID")));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/email_address/onValidation.js b/entity/Employee_entity/entityfields/email_address/onValidation.js
index 9525ada052cc9ef5885522ecb5cd6e36b5739c74..bab7f655340a24e0b80308afb856dca0e41762da 100644
--- a/entity/Employee_entity/entityfields/email_address/onValidation.js
+++ b/entity/Employee_entity/entityfields/email_address/onValidation.js
@@ -7,7 +7,7 @@ import("system.translate");
var email = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.EMAIL_ADDRESS"));
var isTaken = tools.getUserByAttribute(tools.EMAIL, [email]);
isTaken = isTaken
- ? isTaken[tools.NAME] != vars.get("$field.USERID")
+ ? isTaken[tools.NAME] != vars.get("$field.UID")
: false;
if (email && isTaken)
result.string(translate.text("Email must be unique!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js b/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js
index 16c85500b5355a72548030867e3d300661e9d4aa..94f61859cc64100bb6a6dcd445efc67835002c1a 100644
--- a/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.UID"));
\ No newline at end of file
+result.string(vars.get("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/title/onValidation.js b/entity/Employee_entity/entityfields/title/onValidation.js
index 9c3a98b9d7a71864c1c5e687bf2a35e30cb10bbd..98e95a5e362e36df26315c31b2bb5325011a9937 100644
--- a/entity/Employee_entity/entityfields/title/onValidation.js
+++ b/entity/Employee_entity/entityfields/title/onValidation.js
@@ -6,8 +6,12 @@ import("system.tools");
import("Entity_lib");
var title = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.TITLE"));
-var oldTitle = tools.getUserByAttribute(tools.NAME, vars.get("$field.USERID"), tools.PROFILE_TITLE);
-oldTitle = oldTitle && oldTitle[tools.TITLE];
-if (!(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && title == oldTitle)
- && title != "" && tools.existUsers(title))
- result.string(translate.text("Username already exists!"));
\ No newline at end of file
+var isOldTitle = false;
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ let oldTitle = tools.getUserByAttribute(tools.NAME, [vars.get("$field.UID")], tools.PROFILE_TITLE);
+ oldTitle = oldTitle && oldTitle[tools.TITLE];
+ isOldTitle = title == oldTitle;
+}
+if (!isOldTitle && title != "" && tools.existUsers(title))
+ result.string(translate.text("Username already exists!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/uid/valueProcess.js b/entity/Employee_entity/entityfields/uid/valueProcess.js
index 4e2c2abf86f0bd1c75ffb84ca5ef712288a78c3f..a0af11c4780ff9d1d8bdcc3379b24b22681a8e14 100644
--- a/entity/Employee_entity/entityfields/uid/valueProcess.js
+++ b/entity/Employee_entity/entityfields/uid/valueProcess.js
@@ -1,7 +1,7 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- && vars.get("$field.TITLE"))
- result.string(vars.get("$field.TITLE"));
\ No newline at end of file
+import("system.tools");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(tools.generateNewUserName());
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index 5013833de46e737ff1980036e6ef8b7ac5a8861a..363e27ae998d795abfb0bbc1863f2e0f231a21a8 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -9,7 +9,7 @@ import("Employee_lib");
var users;
if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
- users = [tools.getUser(vars.get("$local.idvalues"), tools.PROFILE_FULL)];
+ users = [tools.getUserByAttribute(tools.NAME, vars.get("$local.idvalues"), tools.PROFILE_FULL)];
else
{
var values = ["true", "false"];
@@ -21,7 +21,7 @@ else
users = users.map(function (user)
{
return [
- user[tools.TITLE],
+ user[tools.NAME],
user[tools.TITLE],
user[tools.PARAMS][tools.ISACTIVE],
user[tools.PARAMS][tools.FIRSTNAME],
@@ -31,9 +31,7 @@ users = users.map(function (user)
user[tools.DESCRIPTION],
user[tools.PARAMS][tools.CONTACTID],
ContactUtils.getTitleByContactId(user[tools.PARAMS][tools.CONTACTID]), //TODO: get the names more efficiently
- user[tools.PARAMS].department,
- user[tools.NAME],
- EmployeeUtils.sliceUserId(user[tools.NAME])
+ user[tools.PARAMS].department
];
});
diff --git a/entity/Employee_entity/recordcontainers/jdito/onInsert.js b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
index 5d7b9281709e2d6896f6b5b126ccfd959089cf40..550621cd85e24e75075260e194d2011feb3c1487 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
@@ -21,4 +21,4 @@ if (vars.get("$field.PASSWORD") && vars.get("$field.PASSWORD") == vars.get("$fie
{
user[tools.PASSWORD] = vars.getString("$field.PASSWORD");
}
-tools.insertUser(user);
\ No newline at end of file
+tools.insertUser(user, vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
index 825985279c1694a30876a88105aba44fb25a7bac..2eb1cf2e7619e1c305a7f61d232bee85f9b2c8da 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
@@ -17,7 +17,7 @@ FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function (state, value)
PersUtils.removeImage(personId);
});
-var user = tools.getUserByAttribute(tools.NAME, vars.get("$field.USERID"));
+var user = tools.getUserByAttribute(tools.NAME, vars.get("$field.UID"));
user[tools.TITLE] = vars.get("$field.TITLE");
user[tools.PARAMS][tools.ISACTIVE] = vars.get("$field.ISACTIVE");
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index 32d999a4f9431a351e8d7cf9d5a3dc0b47fb7546..30cec857a2e3f4796042bccb2744b9413f4cfe1b 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -2,9 +2,10 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>LogHistory_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <title>LogHistory</title>
+ <title>Log</title>
<iconId>NEON:HISTORY</iconId>
<imageProcess>%aditoprj%/entity/LogHistory_entity/imageProcess.js</imageProcess>
+ <titlePlural>Logs</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
@@ -28,7 +29,7 @@
<entityField>
<name>DESCRIPTION</name>
<title>Description</title>
- <contentType>TEXT</contentType>
+ <contentType>LONG_TEXT</contentType>
<mandatory v="true" />
</entityField>
<entityProvider>
@@ -77,6 +78,12 @@
<fieldName>LogHistoryConsumer</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>6d14d6dd-ce6e-464f-9132-3e10c1116246</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>LogHistories</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityParameter>
diff --git a/entity/LogHistory_entity/entityfields/icon/valueProcess.js b/entity/LogHistory_entity/entityfields/icon/valueProcess.js
index 99ead80ca86db298117227846aab3b893c0a89c6..677fa0aa9e6302772450e50b059ae01c359026f8 100644
--- a/entity/LogHistory_entity/entityfields/icon/valueProcess.js
+++ b/entity/LogHistory_entity/entityfields/icon/valueProcess.js
@@ -1,3 +1,3 @@
-import("system.result");
-
+import("system.result");
+
result.string("NEON:HISTORY");
\ No newline at end of file
diff --git a/entity/LogHistory_entity/imageProcess.js b/entity/LogHistory_entity/imageProcess.js
index 1206221d6b2098453563589d3414163150d452e0..610fc40230c25cd0b6dca3b6ffb82580d97f2e4c 100644
--- a/entity/LogHistory_entity/imageProcess.js
+++ b/entity/LogHistory_entity/imageProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
result.string(vars.getString("$field.ICON"));
\ No newline at end of file
diff --git a/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js b/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
index 089be1779e505513066b27516052f5f5194a77b3..8c430b5b8c73859366121a73c5663c8147e8beb0 100644
--- a/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.eMath");
import("Util_lib");
import("system.datetime");
import("system.result");
@@ -10,26 +11,32 @@ import("system.db");
var recordCond = SqlCondition.begin();
-//condition for only one/some selected records (maybe needed later for preview, etc.)
-//since this a unique ID it's perfectly fine to filter only for the IDs and ignore other filters
-if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+//condition for only one/some selected records
+//since this NOT (!) a unique ID we need to filter with all the other filters (via params) too
+if (vars.exists("$local.idvalues"))
{
- recordCond.and(" AB_LOGHISTORY.AB_LOGHISTORYID in ('" + vars.get("$local.idvalues").join("','") + "')");
-}
-else
-{
- //condition for restricting the loghistory to some specific tables (e.g. only contact-related tables) and a specific ID
- var tableNameCond = _getTableNameCondition();
- recordCond.andSqlCondition(tableNameCond);
-
- //user defined filter
- if (vars.exists("$local.filter") && vars.get("$local.filter"))
+ var semiId = vars.get("$local.idvalues");//this not really an ID, it's an object that contain the grouped content fields
+ if (semiId)
{
- var filter = vars.get("$local.filter");
- recordCond.andSqlCondition((JditoFilterUtils.getSqlCondition(filter, "AB_LOGHISTORY")));
+ var groupingInfo = JSON.parse(semiId);
+ recordCond.andPrepare("AB_LOGHISTORY.USER_NEW", groupingInfo.u);
+ var dateFilterValue = datetime.toLong(groupingInfo.d, "yyyy-MM-dd HH:mm");
+ recordCond.andPrepare("AB_LOGHISTORY.DATE_NEW", dateFilterValue, "# >= ?");
+ recordCond.andPrepare("AB_LOGHISTORY.DATE_NEW", eMath.addInt(dateFilterValue, datetime.ONE_MINUTE), "# < ?");
}
}
+//condition for restricting the loghistory to some specific tables (e.g. only contact-related tables) and a specific ID
+var tableNameCond = _getTableNameCondition();
+recordCond.andSqlCondition(tableNameCond);
+
+//user defined filter
+if (vars.exists("$local.filter") && vars.get("$local.filter"))
+{
+ var filter = vars.get("$local.filter");
+ recordCond.andSqlCondition((JditoFilterUtils.getSqlCondition(filter, "AB_LOGHISTORY")));
+}
+
var dataQuery = recordCond.buildSql("select AB_LOGHISTORY.DATE_NEW, AB_LOGHISTORY.USER_NEW, AB_LOGHISTORY.DESCRIPTION \n\
from AB_LOGHISTORY ", "1 = 2", "order by DATE_NEW desc, USER_NEW asc");
@@ -44,6 +51,7 @@ result.object(resultData);
function _makeGroupingIdentifier(pDatetime, pUser)
{
//no need to translate the datepattern since this is only used for internal checks and is never displayed to the user
+ //since this is also [part of] the ID keep it very short
return JSON.stringify({d: datetime.toDate(pDatetime, "yyyy-MM-dd HH:mm"), u: pUser});
}
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 7e16ca061a6816080fe26477947a2cc1dd16d1c4..a90f3b45db74ac338f8d397947426fbfa335bfb4 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -2,7 +2,9 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Notification_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Notification</title>
+ <title>Notifications</title>
+ <iconId>VAADIN:BELL</iconId>
+ <titlePlural>Notifications</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -22,24 +24,34 @@
</entityField>
<entityField>
<name>STATE</name>
+ <title>State</title>
+ <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>BACKPACK</name>
</entityField>
<entityField>
<name>CAPTION</name>
+ <title>title</title>
</entityField>
<entityField>
<name>CREATIONDATE</name>
+ <title>Date</title>
+ <contentType>DATE</contentType>
+ <resolution>MINUTE</resolution>
+ <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/creationdate/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DESCRIPTION</name>
+ <title>description</title>
</entityField>
<entityField>
<name>FORCEDPRIORITY</name>
</entityField>
<entityField>
<name>ICON</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>LIFETIME</name>
@@ -67,6 +79,43 @@
<entityField>
<name>LINKINFO</name>
</entityField>
+ <entityActionGroup>
+ <name>setNotificationState</name>
+ <children>
+ <entityActionField>
+ <name>archieve</name>
+ <fieldType>ACTION</fieldType>
+ <description></description>
+ <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js</onActionProcess>
+ <isSelectionAction v="true" />
+ <iconId>VAADIN:ARCHIVE</iconId>
+ <tooltip>archieve</tooltip>
+ </entityActionField>
+ <entityActionField>
+ <name>setRead</name>
+ <fieldType>ACTION</fieldType>
+ <description></description>
+ <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js</onActionProcess>
+ <isSelectionAction v="true" />
+ <iconId>VAADIN:OPEN_BOOK</iconId>
+ <tooltip>set read</tooltip>
+ </entityActionField>
+ <entityActionField>
+ <name>setUnread</name>
+ <fieldType>ACTION</fieldType>
+ <description></description>
+ <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js</onActionProcess>
+ <isSelectionAction v="true" />
+ <iconId>VAADIN:BOOK</iconId>
+ <tooltip>set unread</tooltip>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityActionField>
+ <name>rowClickAction</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js</onActionProcess>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -74,6 +123,7 @@
<alias>_____SYSTEMALIAS</alias>
<isPageable v="false" />
<conditionProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<linkInformation>
<linkInformation>
<name>33b9740c-cd3d-43ec-97e6-65c9e880655a</name>
@@ -115,10 +165,6 @@
<name>FORCEDPRIORITY.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.FORCEDPRIORITY</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ICON.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.ICON_INFO</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LIFETIME.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.LIFETIME</recordfield>
@@ -155,6 +201,10 @@
<name>LINKINFO.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.LINK_INFO</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ICON.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.ICON_INFO</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Notification_entity/entityfields/creationdate/valueProcess.js b/entity/Notification_entity/entityfields/creationdate/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..139597f9cb07c5d48bed18984ec4747f4b4f3438
--- /dev/null
+++ b/entity/Notification_entity/entityfields/creationdate/valueProcess.js
@@ -0,0 +1,2 @@
+
+
diff --git a/entity/Notification_entity/entityfields/icon/valueProcess.js b/entity/Notification_entity/entityfields/icon/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..42ceb3e11613a838e987a9b09441b3fa952aa307
--- /dev/null
+++ b/entity/Notification_entity/entityfields/icon/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.notification");
+
+if(vars.get("$field.TYPECODE"))
+{
+ var type = notification.getType(vars.get("$field.TYPECODE"));
+ result.string(type["icon"]);
+}
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/linkcontext/valueProcess.js b/entity/Notification_entity/entityfields/linkcontext/valueProcess.js
index 276ea44e9a0d5b7e1850d52e12fd455c6fd6f7b6..71498f96ff2cb46740fedae074f4e986d88ce781 100644
--- a/entity/Notification_entity/entityfields/linkcontext/valueProcess.js
+++ b/entity/Notification_entity/entityfields/linkcontext/valueProcess.js
@@ -4,5 +4,4 @@ import("system.result");
import("system.text");
var context = text.decodeMS(vars.get("$field.LINKINFO"))[0];
-logging.log("context: " + context);
result.string(context);
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/linkid/valueProcess.js b/entity/Notification_entity/entityfields/linkid/valueProcess.js
index 53b0ffeef7c0efe723e17be8af25a010c77e09d5..ed81b20aacd0ecad75448115a86b4845defd114f 100644
--- a/entity/Notification_entity/entityfields/linkid/valueProcess.js
+++ b/entity/Notification_entity/entityfields/linkid/valueProcess.js
@@ -4,5 +4,4 @@ import("system.result");
import("system.text");
var id = text.decodeMS(vars.get("$field.LINKINFO"))[1];
-logging.log("id: " + id);
result.string(id);
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js b/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c58075c3e254af66e256f646e627da96aec8fea5
--- /dev/null
+++ b/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.tools");
+import("system.notification");
+import("system.neon");
+
+var user = tools.getCurrentUser();
+var selectedNotifications = JSON.parse(vars.get("$sys.selection"));
+
+for(var i = 0; i < selectedNotifications.length; i++)
+ notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
+
+neon.refreshAll();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..48b800683175f330ddfce43173a1aeb08f369762
--- /dev/null
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.tools");
+import("system.notification");
+import("system.neon");
+
+var user = tools.getCurrentUser();
+var selectedNotifications = JSON.parse(vars.get("$sys.selection"));
+
+for(var i = 0; i < selectedNotifications.length; i++)
+ notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_ARCHIVE);
+
+neon.refreshAll();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c58075c3e254af66e256f646e627da96aec8fea5
--- /dev/null
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.tools");
+import("system.notification");
+import("system.neon");
+
+var user = tools.getCurrentUser();
+var selectedNotifications = JSON.parse(vars.get("$sys.selection"));
+
+for(var i = 0; i < selectedNotifications.length; i++)
+ notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
+
+neon.refreshAll();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c56286bb565f52ef7f62c37b090feb20504a9e24
--- /dev/null
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.tools");
+import("system.notification");
+import("system.neon");
+
+var user = tools.getCurrentUser();
+var selectedNotifications = JSON.parse(vars.get("$sys.selection"));
+
+for(var i = 0; i < selectedNotifications.length; i++)
+ notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_UNSEEN);
+
+neon.refreshAll();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/state/displayValueProcess.js b/entity/Notification_entity/entityfields/state/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7e736b667632a0590db5625794ae3d632963be83
--- /dev/null
+++ b/entity/Notification_entity/entityfields/state/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+
+result.string(translate.text(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js b/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..eb0a11a5c9c14b8f6bb5a190072f67c23b064661
--- /dev/null
+++ b/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.db");
+
+result.object({
+ "ASYS_NOTIFICATIONS.STATE": db.DESCENDING,
+ "ASYS_NOTIFICATIONCONTENTS.CREATIONDATE": db.DESCENDING
+ });
\ No newline at end of file
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 903aaff0b915a374c9ba25632f9681cbe179aca7..9680fb42089f0284558ae840065658405838bfea 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -155,6 +155,24 @@
</entityParameter>
</children>
</entityProvider>
+ <entityConsumer>
+ <name>Campaigns</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>CampaignSteps</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 05c2f6464ab903608dfa0609d6151b91aa6f273f..8431b8efbef9c1d3666a72ce62032552a08ed870 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -7,7 +7,6 @@
<contentTitleProcess>%aditoprj%/entity/Offer_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Offer_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:CART</iconId>
- <titlePlural>Offers</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -385,7 +384,7 @@
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/valueProcess.js</valueProcess>
- <expose v="true" />
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -643,27 +642,6 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
- <entityConsumer>
- <name>AttributeTree</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
<entityField>
<name>USER_NEW</name>
<searchable v="false" />
@@ -705,6 +683,29 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>chooseTEXHeader</name>
+ <consumer>DocumentTemplateTex</consumer>
+ </entityField>
+ <entityConsumer>
+ <name>DocumentTemplateTex</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DocumentTemplateType_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>DocumentTemplateTypeClassification_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
<entityConsumer>
<name>LogHistoryConsumer</name>
<fieldType>DEPENDENCY_OUT</fieldType>
diff --git a/entity/Offer_entity/contentTitleProcess.js b/entity/Offer_entity/contentTitleProcess.js
index 98f9e420320b5614344632935f8bb864a240052e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/entity/Offer_entity/contentTitleProcess.js
+++ b/entity/Offer_entity/contentTitleProcess.js
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.OfferCode_VersNr_fieldgroup"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetype_param/valueProcess.js b/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..90d0786d0d58c1664a2c481e5583a260dd7da783
--- /dev/null
+++ b/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetype_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("TEX");
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetypeclassification_param/valueProcess.js b/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetypeclassification_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9738198122152a6fbabc4dd57c08ec73cb8b6e39
--- /dev/null
+++ b/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetypeclassification_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("3")
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetype_param/valueProcess.js b/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..361c9a219045f0f73c9d32749357157e8501d650
--- /dev/null
+++ b/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetype_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("TEX");
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetypeclassification_param/valueProcess.js b/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetypeclassification_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f6a588e3153735de6e83ab226ebb0941991ad63
--- /dev/null
+++ b/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetypeclassification_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("3");
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/header/valueProcess.js b/entity/Offer_entity/entityfields/header/valueProcess.js
index 54affd8d1dd840989e3e9092a406e5a374150ccc..508e3cb15b8c84962d2b371ab25377589620370b 100644
--- a/entity/Offer_entity/entityfields/header/valueProcess.js
+++ b/entity/Offer_entity/entityfields/header/valueProcess.js
@@ -1,6 +1,8 @@
import("system.result");
import("system.vars");
import("system.neon");
+import("system.db");
+import("system.util");
if(vars.exists("$param.OfferHeader_param") && vars.get("$param.OfferHeader_param"))
result.string(vars.get("$param.OfferHeader_param"));
@@ -10,3 +12,9 @@ else if(vars.get("$this.value"))
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("gerne bieten wir Ihnen wie folgt an:")
+
+if (vars.get("$field.chooseTEXHeader") != "")
+{
+ var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.chooseTEXHeader") + "'", "_____SYSTEMALIAS");
+ result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
+}
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index ac2fc62d49b5274456a37f9e24129bc7b7de66ac..18b0cf323f399c50f064b7f0ec933e91e1f4dafb 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -38,7 +38,7 @@
</entityField>
<entityField>
<name>SALESORDERDATE</name>
- <title>Creation date</title>
+ <title>Date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<outputFormat>dd.MM.yyyy</outputFormat>
@@ -54,7 +54,7 @@
<name>CONTACT_ID</name>
<documentation>%aditoprj%/entity/Order_entity/entityfields/contact_id/documentation.adoc</documentation>
<title>Connection</title>
- <consumer>Relations</consumer>
+ <consumer>AnyContacts</consumer>
<linkedContextProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/valueProcess.js</valueProcess>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index a3b2b0a7e2f6689ba81888d099d42721d3de2db7..5c18a9c717f9ff902ef85aa7ce606e7254fb8e18 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -50,7 +50,6 @@
<name>OPTIONAL</name>
<title>Optional</title>
<contentType>BOOLEAN</contentType>
- <mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/dropDownProcess.js</dropDownProcess>
<valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/valueProcess.js</valueProcess>
</entityField>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 6123909d247a64eac74c403c3875074e9749d71b..550e2fcdb31d835970d28ec6131a0c975bec2183 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -110,6 +110,14 @@
<name>Organisations</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>85aa363e-d8ba-4df5-8422-bf7aff86a4f8</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>WithPrivate_param</name>
@@ -220,12 +228,6 @@
<entityProvider>
<name>#PROVIDER</name>
<dependencies>
- <entityDependency>
- <name>c84fdb27-45a1-4dec-b013-af43751f6a7b</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>1a472ca0-4d27-453c-8de5-a046b86f22fb</name>
<entityName>Object_entity</entityName>
diff --git a/entity/Person_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js b/entity/Person_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
index 3d9e27e02fddb7859929d550e3fec80b3bdbf585..babb0e1760093b90e065d2202e4c0f871f3b6940 100644
--- a/entity/Person_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CONTACTID"));
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACTID"));
diff --git a/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js
index 48cfc6320620c6baf8bba6379b6dffe9f3cc6e15..3bd92b4f6f69e42d1a38d3123c35175e1c38e12a 100644
--- a/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js
+++ b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js
@@ -8,6 +8,6 @@ import("system.SQLTYPES")
var forecast = db.cell(SqlCondition.begin()
.andPrepare("SALESPROJECT_FORECAST.DATE_START", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
- .buildSql("select sum(VOLUME * 1000) from SALESPROJECT_FORECAST", "1=2"));
+ .buildSql("select sum(VOLUME) from SALESPROJECT_FORECAST", "1=2"));
result.string(forecast);
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js b/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js
index 0eb24b9e842ca3435a90aaf55a691acaa95586ba..82cab2177f7b315ead9d1eb3e67520d5c3385869 100644
--- a/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js
@@ -31,4 +31,3 @@ result.object(phases);
-
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index c7cea65bb57c2342d02ea2b7d1b258c97dc092c0..68aa6b74b7a051ae50fd44df4c0933145592e75a 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -3,6 +3,7 @@
<name>SalesprojectCompetition_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Competition</title>
+ <titlePlural>Competitors</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index 2b3a82977d35a4b12c33590234a1be298e98fe64..f08b3d91d16b0ab44ec8f6049c1ba4166c94d33c 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -18,7 +18,7 @@
</entityField>
<entityField>
<name>GROUPCODE</name>
- <title>Product</title>
+ <title>Commodity group</title>
<consumer>KeywordProductGroupcodes</consumer>
<displayValueProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js</displayValueProcess>
</entityField>
diff --git a/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js b/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js
index a85f1176a29643305d67fad51f1203686754a367..f7b76c335483a7410366d5c56db6ae8ba7917091 100644
--- a/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js
+++ b/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.translate");
-result.string(translate.text("${VOLUME_MONEY}") + " (" + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}") + ")");
\ No newline at end of file
+result.string(translate.text("${VOLUME_MONEY}") + " (" + translate.text("${EURO_SIGN}") + ")");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 9ad20313a7f06aae3f80bf4d99689cf152e54da8..faa8f54f7afa881f80640faf05a0808d17e839ed 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -112,7 +112,7 @@
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
+ <fieldName>Organisations</fieldName>
</dependency>
</entityConsumer>
<entityField>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 3ae84ca393080fb1f4014e737107665fccd39ad5..1d8e6ddc9d561d4320373529e5d1c4965bd3d467 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -359,6 +359,18 @@
<fieldName>Tasks</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>335e31ad-ab67-4567-b4ea-3668f04922b2</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>fbaa2f6c-0ba1-4c93-acae-d7b636581679</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -406,6 +418,21 @@
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority_icon/valueProcess.js</valueProcess>
</entityField>
+ <entityConsumer>
+ <name>LogHistories</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Task_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Task_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js b/entity/Task_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..74e588ab40311a8579dc8f58638aea090d8746b0
--- /dev/null
+++ b/entity/Task_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.TASKID"), tableNames: ["TASK"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/entity/TurnoverTree_entity/TurnoverTree_entity.aod b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..fdef45bc089615fa9bcedabc31524678826d41f5
--- /dev/null
+++ b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
@@ -0,0 +1,102 @@
+<?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.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
+ <name>TurnoverTree_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Tree</title>
+ <iconId>NEON:LOGO</iconId>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>CATEGORY</name>
+ <groupable v="true" />
+ </entityField>
+ <entityField>
+ <name>TURNOVERPRICE</name>
+ <title>Turnover</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ </entityField>
+ <entityParameter>
+ <name>YearCountToShow_param</name>
+ <valueProcess>%aditoprj%/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="false" />
+ <documentation>%aditoprj%/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/documentation.adoc</documentation>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>MaxYear_param</name>
+ <valueProcess>%aditoprj%/entity/TurnoverTree_entity/entityfields/maxyear_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="false" />
+ <documentation>%aditoprj%/entity/TurnoverTree_entity/entityfields/maxyear_param/documentation.adoc</documentation>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>FilteredTurnovers</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>0ea4ad47-985b-4a9c-81d8-946be324ae04</name>
+ <entityName>Turnover_entity</entityName>
+ <fieldName>Turnover_tree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>YearCountToShow_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>PARENT</name>
+ </entityField>
+ <entityField>
+ <name>GROUP</name>
+ <title>Product group</title>
+ </entityField>
+ <entityField>
+ <name>FORECASTPRICE</name>
+ <title>Forecast</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ </entityField>
+ <entityField>
+ <name>YEAR</name>
+ </entityField>
+ <entityField>
+ <name>MONTH</name>
+ </entityField>
+ <entityField>
+ <name>LAYER</name>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/TurnoverTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ <element>PARENT.value</element>
+ <element>GROUP.value</element>
+ <element>CATEGORY.value</element>
+ <element>TURNOVERPRICE.value</element>
+ <element>FORECASTPRICE.value</element>
+ <element>YEAR.value</element>
+ <element>MONTH.value</element>
+ <element>LAYER.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/TurnoverTree_entity/entityfields/maxyear_param/documentation.adoc b/entity/TurnoverTree_entity/entityfields/maxyear_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..fcbd74f60e6720f1d9085e894eb9220ec9ce8e85
--- /dev/null
+++ b/entity/TurnoverTree_entity/entityfields/maxyear_param/documentation.adoc
@@ -0,0 +1,3 @@
+this parameter is for setting the maximum year to show.
+
+The default is the current year.
\ No newline at end of file
diff --git a/entity/TurnoverTree_entity/entityfields/maxyear_param/valueProcess.js b/entity/TurnoverTree_entity/entityfields/maxyear_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..652de6453d7648618499d56b211e46eccefc2493
--- /dev/null
+++ b/entity/TurnoverTree_entity/entityfields/maxyear_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+import("system.datetime");
+
+result.string(datetime.toDate(vars.get("$sys.date"), "yyyy"));
\ No newline at end of file
diff --git a/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/documentation.adoc b/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..a0783738ca4add70cc06867ecfe633dd35f7d086
--- /dev/null
+++ b/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/documentation.adoc
@@ -0,0 +1,3 @@
+This parameter is for setting the number of years to show.
+
+Default is 4.
\ No newline at end of file
diff --git a/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/valueProcess.js b/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..02fc6e39ebb2c279000ffa389aa42a31bc2f6076
--- /dev/null
+++ b/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("4");
\ No newline at end of file
diff --git a/entity/TurnoverTree_entity/recordcontainers/jdito/contentProcess.js b/entity/TurnoverTree_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e9ab2d319ba83e196acb2e09e5122e5767c62f30
--- /dev/null
+++ b/entity/TurnoverTree_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,106 @@
+import("Turnover_lib");
+import("system.vars");
+import("system.result");
+import("Money_lib");
+import("Util_lib");
+import("system.datetime");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.translate");
+
+var turnoverCategory = translate.text('Turnover');
+var forecastCategory = translate.text('Forecast');
+
+var maxYear = parseInt(vars.get("$param.MaxYear_param"));
+var yearCountToShow = parseInt(vars.get("$param.YearCountToShow_param"));
+var minYear = maxYear - yearCountToShow + 1;
+
+var turnover = TurnoverUtil.getTurnoverData(maxYear, yearCountToShow);
+var forecast = TurnoverUtil.getForecastData(maxYear, yearCountToShow);
+
+var columns = {
+ type: 0,
+ year: 1,
+ month: 2,
+ discount: 3,
+ vat: 4,
+ price: 5,
+ quantity: 6,
+ groupcodeId: 7,
+ groupcodeName: 8
+};
+
+// combine both data sources
+
+
+var treeData = [];
+var countData = {};
+
+turnover.forEach(function(row)
+{
+ var monthDate = new Date(row[columns.year], row[columns.month]-1);
+ monthDate = datetime.toDate(monthDate.getTime(), "MMM yyyy", "UTC");
+ _addCount([row[columns.year], [row[columns.month], monthDate], [row[columns.groupcodeId], row[columns.groupcodeName]]], row[columns.type], row[columns.year], row[columns.month],
+ MoneyUtils.getGross(
+ (row[columns.vat] ? parseFloat(row[columns.vat]) : 0.0),
+ (row[columns.price] ? parseFloat(row[columns.price]) : 0.0),
+ (row[columns.quantity] ? parseFloat(row[columns.quantity]) : 0.0),
+ (row[columns.discount] ? parseFloat(row[columns.discount]) : 0.0)));
+});
+
+forecast.forEach(function(row)
+{
+ var monthDate = new Date(row[columns.year], row[columns.month]-1);
+ monthDate = datetime.toDate(monthDate.getTime(), "MMM yyyy", "UTC");
+ _addCount([row[columns.year], [row[columns.month], monthDate], [row[columns.groupcodeId], row[columns.groupcodeName]]], row[columns.type], row[columns.year], row[columns.month], row[columns.price]);
+});
+
+// create tree
+for (let key in countData) {
+ var countDataSet = countData[key];
+ treeData.push([key, countDataSet.parent, countDataSet.groupName, countDataSet.category, countDataSet[turnoverCategory], countDataSet[forecastCategory], parseInt(countDataSet.year), parseInt(countDataSet.month), parseInt(countDataSet.layer)]);
+}
+
+treeData = TreeUtils.treeOrderBy(treeData, 8, [[6, true], [7, false], [2, false]])
+result.object(treeData);
+
+/**
+ * add the counts to countData for the given key and value
+ * @param {Array} pKeys an array containing all keys for this value. If the x-value for one key is different from the key-value: add an array [key, value] instead of only the key
+ * the first key is year
+ * @param {String} pCategory the category to add
+ * @param {integer} pYear the year
+ * @param {integer} pMonth the month
+ * @param {float} pValue the value to display
+ */
+function _addCount(pKeys, pCategory, pYear, pMonth, pValue) {
+ var key = "";
+
+ for (let i = 0; i < pKeys.length; i++) {
+ let keyId;
+ let keyName;
+
+ if (typeof pKeys[i] != "object")
+ {
+ keyId = pKeys[i];
+ keyName = pKeys[i];
+ }
+ else // handle array: first is id seccond is name for X-value
+ {
+ keyId = pKeys[i][0];
+ keyName = pKeys[i][1];
+ }
+ var parent = key;
+
+ key += ";" + keyId;
+
+ if (countData[key] == undefined)
+ {
+ countData[key] = {parent: parent, category: pCategory, groupName: keyName, data: pKeys[i], year: pYear, month: pMonth, layer: i}; // keys[0] is the category
+ countData[key][forecastCategory] = 0.0;
+ countData[key][turnoverCategory] = 0.0;
+ }
+
+ countData[key][pCategory] += parseFloat(pValue);
+ }
+}
\ No newline at end of file
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index 2f8ab9d9f8efd8b691957875730d30abf726283a..ea6be4be71dd3742873344433ca8e1ee34f90239 100644
--- a/entity/Turnover_entity/Turnover_entity.aod
+++ b/entity/Turnover_entity/Turnover_entity.aod
@@ -64,6 +64,25 @@
</entityParameter>
</children>
</entityProvider>
+ <entityConsumer>
+ <name>Turnover_tree</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>TurnoverTree_entity</entityName>
+ <fieldName>FilteredTurnovers</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>MaxYear_param</name>
+ <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/maxyear_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>YearCountToShow_param</name>
+ <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/yearcounttoshow_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Turnover_entity/entityfields/turnover_tree/children/maxyear_param/valueProcess.js b/entity/Turnover_entity/entityfields/turnover_tree/children/maxyear_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..55220f39547358d4ac27319394796362654d50fc
--- /dev/null
+++ b/entity/Turnover_entity/entityfields/turnover_tree/children/maxyear_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.MaxYear_param"));
\ No newline at end of file
diff --git a/entity/Turnover_entity/entityfields/turnover_tree/children/yearcounttoshow_param/valueProcess.js b/entity/Turnover_entity/entityfields/turnover_tree/children/yearcounttoshow_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6769ee4809dd12cbe5af03ca76deeb956e801965
--- /dev/null
+++ b/entity/Turnover_entity/entityfields/turnover_tree/children/yearcounttoshow_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.YearCountToShow_param"));
\ No newline at end of file
diff --git a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
index cee26913021aaca4b49d84e0a50eca912e8a2799..4f94c77a16d4c1158c06232d605d56ad62009d08 100644
--- a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
@@ -1,141 +1,116 @@
+import("Turnover_lib");
import("system.vars");
-import("system.datetime");
-import("system.db");
import("system.result");
-import("system.translate");
-import("Data_lib");
-import("Keyword_lib");
import("Money_lib");
+import("system.datetime");
import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.translate");
var turnoverCategory = translate.text('Turnover');
var forecastCategory = translate.text('Forecast');
-
-// load data
-var sumOfMonthTurnover = db.table("select year(SALESORDERDATE) yearNum, month(SALESORDERDATE) monthNum, sum(NET + VAT) from SALESORDER group by year(SALESORDERDATE), month(SALESORDERDATE) order by yearNum, monthNum");
-var sumOfMonthForecast = db.table("select year(DATE_START) yearNum, month(DATE_START) monthNum, sum(VOLUME * 1000) from SALESPROJECT_FORECAST group by year(DATE_START), month(DATE_START) order by yearNum, monthNum");
-var sumOfMonthProductsTurnover = db.table("select year(SALESORDERDATE) yearNum, month(SALESORDERDATE) monthNum, SALESORDERITEM.DISCOUNT, SALESORDERITEM.VAT, SALESORDERITEM.PRICE, sum(SALESORDERITEM.QUANTITY), SALESORDERITEM.GROUPCODEID, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "SALESORDERITEM.GROUPCODEID") + ") \n\
- from SALESORDER \n\
- join SALESORDERITEM on SALESORDERITEM.SALESORDER_ID = SALESORDER.SALESORDERID \n\
- where SALESORDERITEM.OPTIONAL <> 1 \n\
- group by year(SALESORDERDATE), month(SALESORDERDATE), SALESORDERITEM.GROUPCODEID, SALESORDERITEM.DISCOUNT, SALESORDERITEM.VAT, SALESORDERITEM.PRICE \n\
- order by yearNum, monthNum"); // V--V--> there is no VAT/Discount in forecasts V-----> forecasts are grouped by grupcode and have always quantity 1
-var sumOfMonthProductsForecast = db.table("select year(DATE_START) yearNum, month(DATE_START) monthNum, 0, 0, sum(VOLUME * 1000), 1, GROUPCODE, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODE") + ") from SALESPROJECT_FORECAST group by year(DATE_START), month(DATE_START), GROUPCODE order by yearNum, monthNum");
-
-// build chartData
-var rootNode = "";
-var chartData = ReferencingData.begin(rootNode);
-
-var skippedCounts = {};
var maxYear = parseInt(vars.get("$param.MaxYear_param"));
var yearCountToShow = parseInt(vars.get("$param.YearCountToShow_param"));
+var minYear = maxYear - yearCountToShow + 1;
-for (let i = 0; i < yearCountToShow; i++)
-{
- var year = i + maxYear - yearCountToShow + 1;
-
- var turnoverYearSum = 0;
- var forecastYearSum = 0;
-
- // filter data by current year
- var turnoverYearData = sumOfMonthTurnover.filter(function(row)
- {
- return row[0] == year;
- });
-
- var forecastYearData = sumOfMonthForecast.filter(function(row)
- {
- return row[0] == year;
- });
-
- for (let i = 1; i <= 12; i++)
- {
- // add months
- turnoverYearSum += _addMonth(year, i, turnoverYearData, turnoverCategory);
- forecastYearSum += _addMonth(year, i, forecastYearData, forecastCategory);
-
- _addProducts(year, i, sumOfMonthProductsTurnover, turnoverCategory);
- _addProducts(year, i, sumOfMonthProductsForecast, forecastCategory);
- }
-
- // add year nodes
- chartData.add(turnoverCategory + year, rootNode, [turnoverCategory, year.toString(), turnoverYearSum]);
- chartData.add(forecastCategory + year, rootNode, [forecastCategory, year.toString(), forecastYearSum]);
+var data = TurnoverUtil.getTurnoverAndForecastData(maxYear, yearCountToShow);
-}
+var columns = {
+ type: 0,
+ year: 1,
+ month: 2,
+ discount: 3,
+ vat: 4,
+ price: 5,
+ quantity: 6,
+ groupcodeId: 7,
+ groupcodeName: 8
+};
-result.object(chartData.toArray());
+var chartData = [];
+var countData = {}
-function _addMonth(pYear, pMonth, pData, pCategory)
+var monthDate;
+
+// add all months for all years
+for (let y = minYear; y <= maxYear; y++)
{
- var yearSum = 0;
-
- // count months, which didn't exist in data source.
- if (pMonth == 1)
+ for (let m = 0; m < 12; m++)
{
- skippedCounts[pCategory] = 0;
+ monthDate = new Date(y, m-1);
+ monthDate = datetime.toDate(monthDate.getTime(), "MMM yyyy", "UTC");
+ _addCount([forecastCategory, ""+y, [m, monthDate]], 0.0);
+ _addCount([turnoverCategory, ""+y, [m, monthDate]], 0.0);
}
+}
-
- var currentMonthData = pData[pMonth - skippedCounts[pCategory] - 1];
- var monthDate = new Date(pYear, pMonth-1);
+data.forEach(function(row)
+{
+ monthDate = new Date(row[columns.year], row[columns.month]-1);
monthDate = datetime.toDate(monthDate.getTime(), "MMM yyyy", "UTC");
-
- var monthValue = 0.0;
- if (currentMonthData != undefined && currentMonthData[1] == pMonth.toString())
- {
- monthValue = currentMonthData[2];
- yearSum += parseInt(currentMonthData[2]);
- }
- else
+
+ switch(row[columns.type])
{
- // if month didn't exist in data source, use 0.0 as value.
- skippedCounts[pCategory]++;
+ case forecastCategory:
+ _addCount([row[columns.type], row[columns.year], [row[columns.month], monthDate], [row[columns.groupcodeId], row[columns.groupcodeName]]], row[columns.price]);
+ break;
+ case turnoverCategory:
+ _addCount([row[columns.type], row[columns.year], [row[columns.month], monthDate], [row[columns.groupcodeId], row[columns.groupcodeName]]],
+ MoneyUtils.getGross(
+ (row[columns.vat] ? parseFloat(row[columns.vat]) : 0.0),
+ (row[columns.price] ? parseFloat(row[columns.price]) : 0.0),
+ (row[columns.quantity] ? parseFloat(row[columns.quantity]) : 0.0),
+ (row[columns.discount] ? parseFloat(row[columns.discount]) : 0.0)));
+ break;
}
+});
- // add month node
- chartData.add(pCategory + pYear + pMonth, pCategory + pYear, [pCategory, monthDate, monthValue]);
- return yearSum;
+for (let key in countData) {
+ var countDataSet = countData[key];
+ chartData.push([key, countDataSet.parent, countDataSet.category, countDataSet.x, countDataSet.count]);
}
-function _addProducts(pYear, pMonth, pData, pCategory)
-{
- var monthDate = new Date(pYear, pMonth-1);
- monthDate = datetime.toDate(monthDate.getTime(), "MMM yyyy", "UTC");
-
- var groupcodeSums = {};
+result.object(chartData);
+
+/**
+ * add the counts to countData for the given key and value
+ * @param {Array} pKeys an array containing all keys for this value. If the x-value for one key is different from the key-value: add an array [key, value] instead of only the key
+ * the first key is the Category
+ * @param {float} pValue the value to display
+ */
+function _addCount(pKeys, pValue) {
+ var key = "";
- for (let i = 0; i < pData.length; i++)
- {
- if (pData[i][0] == pYear && pData[i][1] == pMonth)
+ for (let i = 0; i < pKeys.length; i++) {
+ let keyId;
+ let keyName;
+
+ if (typeof pKeys[i] != "object")
{
- var groupCode = pData[i][6];
- if (groupCode != undefined)
- {
- if (groupcodeSums[groupCode] == undefined)
- {
- groupcodeSums[groupCode] = {
- sum: 0,
- name: pData[i][7]
- }
- }
-
- pData[i][2] = pData[i][2] || 0;
- pData[i][3] = pData[i][3] || 0;
- pData[i][4] = pData[i][4] || 0;
- pData[i][5] = pData[i][5] || 0;
-
- groupcodeSums[groupCode]["sum"] += MoneyUtils.getGross(parseFloat(pData[i][3]), parseFloat(pData[i][4]), parseFloat(pData[i][5]), parseFloat(pData[i][2]));
- }
+ keyId = pKeys[i];
+ keyName = pKeys[i];
}
- }
-
- for (let groupcode in groupcodeSums)
- {
- if (groupcodeSums[groupcode]["sum"])
+ else // handle array: first is id seccond is name for X-value
+ {
+ keyId = pKeys[i][0];
+ keyName = pKeys[i][1];
+ }
+ var parent = key;
+ if (i < 2)
+ {
+ parent = ""
+ }
+
+ key += ";" + keyId;
+ if (i > 0)
{
- chartData.add(pCategory + pYear + pMonth + groupcode, pCategory + pYear + pMonth, [pCategory, groupcodeSums[groupcode]["name"] + " (" + monthDate.toString() + ")", groupcodeSums[groupcode]["sum"]]);
+ if (countData[key] == undefined)
+ {
+ countData[key] = {parent: parent, count: 0.0, category: pKeys[0], x: keyName}; // keys[0] is the category
+ }
+
+ countData[key].count += parseFloat(pValue);
}
}
-}
+}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 73de1258d7416732498b60b937bafd30f74a4d74..4ba1371106af3d7db62aee4bc2e22253640727ed 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -3090,6 +3090,12 @@
<entry>
<key>The minimal count can't be larger than the maximal count!</key>
</entry>
+ <entry>
+ <key>The max participants count has to be equal or greater than the count of the current participants!</key>
+ </entry>
+ <entry>
+ <key>Variable costs</key>
+ </entry>
<entry>
<key>Version number</key>
</entry>
@@ -3477,6 +3483,18 @@
<entry>
<key>Offer date</key>
</entry>
+ <entry>
+ <key>Competitors</key>
+ </entry>
+ <entry>
+ <key>Notifications</key>
+ </entry>
+ <entry>
+ <key>Overview</key>
+ </entry>
+ <entry>
+ <key>Participated</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 ab1b4642fe76a2e8c1d333f37bedb1192dcd867e..cde72b065a3bc7d795d351e702305f17f26553d7 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -18,6 +18,10 @@
<key>Project management</key>
<value>Projektmanagement</value>
</entry>
+ <entry>
+ <key>Notifications</key>
+ <value>Benachrichtigungen</value>
+ </entry>
<entry>
<key>Add to Campaign</key>
<value>Zu Kampagne hinzufügen</value>
@@ -50,6 +54,10 @@
<key>Human Resources</key>
<value>Personal</value>
</entry>
+ <entry>
+ <key>Single</key>
+ <value>Einzel</value>
+ </entry>
<entry>
<key>Entrydate (Day)</key>
<value>Eingangsdatum (Tag)</value>
@@ -62,6 +70,10 @@
<key>${ATTRIBUTE_VOID}</key>
<value>Tag</value>
</entry>
+ <entry>
+ <key>Campaign Period</key>
+ <value>Kampagnen Laufzeit</value>
+ </entry>
<entry>
<key>Turnover</key>
<value>Umsatz</value>
@@ -469,6 +481,10 @@
<key>Ignore series</key>
<value>Monatliche Serie nicht genauer spezifiziert. Ignoriere Serie.</value>
</entry>
+ <entry>
+ <key>Attachments</key>
+ <value>Anhänge</value>
+ </entry>
<entry>
<key>Internal (2)</key>
</entry>
@@ -476,6 +492,10 @@
<key>Touchpoints</key>
<value>Kontaktpunkte</value>
</entry>
+ <entry>
+ <key>Document Template</key>
+ <value>Dokumentvorlage</value>
+ </entry>
<entry>
<key>Attribute Tree</key>
<value>Eigenschaftsbaum</value>
@@ -635,6 +655,10 @@
<key>Contract start date</key>
<value>Vertragsbeginn</value>
</entry>
+ <entry>
+ <key>Remaining Runtime</key>
+ <value>Restlaufzeit</value>
+ </entry>
<entry>
<key>Spare parts</key>
<value>Ersatzteile</value>
@@ -870,6 +894,10 @@
<entry>
<key>50 %</key>
</entry>
+ <entry>
+ <key>Competitors</key>
+ <value>Mitbewerber</value>
+ </entry>
<entry>
<key>Won</key>
<value>Gewonnen</value>
@@ -1328,6 +1356,10 @@
<entry>
<key>0.00</key>
</entry>
+ <entry>
+ <key>Document Templates</key>
+ <value>Dokumentvorlagen</value>
+ </entry>
<entry>
<key>Conditions of payment</key>
<value>Zahlungsbedingung</value>
@@ -1336,6 +1368,10 @@
<key>Relationship</key>
<value>Beziehung</value>
</entry>
+ <entry>
+ <key>Text Modular</key>
+ <value>Textbaustein</value>
+ </entry>
<entry>
<key>${BINARY_LIB_TOO_MANY_BINARIES}</key>
<value>Für dieses Binärfeld ist nur ein Datensatz erlaubt.</value>
@@ -1977,6 +2013,10 @@
<key>Malaysia</key>
<value>Malaysia</value>
</entry>
+ <entry>
+ <key>Letter</key>
+ <value>Brief</value>
+ </entry>
<entry>
<key>Armenia</key>
<value>Armenien</value>
@@ -2141,6 +2181,10 @@
<key>Canada</key>
<value>Kanada</value>
</entry>
+ <entry>
+ <key>Attachment</key>
+ <value>Anhang</value>
+ </entry>
<entry>
<key>Maldives</key>
<value>Malediven</value>
@@ -2573,6 +2617,10 @@
<key>Jersey</key>
<value>Jersey</value>
</entry>
+ <entry>
+ <key>Overview</key>
+ <value>Ãœbersicht</value>
+ </entry>
<entry>
<key>Slovenia</key>
<value>Slowenien</value>
@@ -2585,6 +2633,10 @@
<key>Annually</key>
<value>jährlich</value>
</entry>
+ <entry>
+ <key>Participated</key>
+ <value>Teilgenommen</value>
+ </entry>
<entry>
<key>Colombia</key>
<value>Kolumbien</value>
@@ -3794,6 +3846,10 @@
<entry>
<key>Imminent appointments for today </key>
</entry>
+ <entry>
+ <key>Variable costs</key>
+ <value>Variable Kosten</value>
+ </entry>
<entry>
<key>To-Do</key>
</entry>
@@ -3923,6 +3979,10 @@
<key>Layout costs</key>
<value>Layout</value>
</entry>
+ <entry>
+ <key>Serial</key>
+ <value>Serie </value>
+ </entry>
<entry>
<key>Costs</key>
<value>Kosten</value>
@@ -3943,6 +4003,10 @@
<key>per</key>
<value>pro</value>
</entry>
+ <entry>
+ <key>The max participants count has to be equal or greater than the count of the current participants!</key>
+ <value>Die maximale Teilnehmerzahl muss gleich oder größer der aktuellen Teilnehmerzahl sein!</value>
+ </entry>
<entry>
<key>Version number</key>
</entry>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 4ad2cb2b03272291dc4da98a1fe8bad8dbcf1f64..ae0173689a97afe2e7e44753e361a49730acfb50 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -3125,6 +3125,12 @@
<entry>
<key>The minimal count can't be larger than the maximal count!</key>
</entry>
+ <entry>
+ <key>The max participants count has to be equal or greater than the count of the current participants!</key>
+ </entry>
+ <entry>
+ <key>Variable costs</key>
+ </entry>
<entry>
<key>Version number</key>
</entry>
@@ -3512,6 +3518,18 @@
<entry>
<key>Offer date</key>
</entry>
+ <entry>
+ <key>Competitors</key>
+ </entry>
+ <entry>
+ <key>Notifications</key>
+ </entry>
+ <entry>
+ <key>Overview</key>
+ </entry>
+ <entry>
+ <key>Participated</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/360Degree/360Degree.aod b/neonContext/360Degree/360Degree.aod
index 25790be7555bde4d78c208588ba8ad0320b8d5ed..4e5a782345d479a8fd79bdc62d41d468b0b12253 100644
--- a/neonContext/360Degree/360Degree.aod
+++ b/neonContext/360Degree/360Degree.aod
@@ -1,14 +1,14 @@
-<?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>360Degree</name>
- <title>360 Degree</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>360DegreeFilter_view</filterview>
- <entity>360Degree_entity</entity>
- <references>
- <neonViewReference>
- <name>9e68c23b-1b55-4ff7-971d-815af0f9dd8a</name>
- <view>360DegreeFilter_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>360Degree</name>
+ <title>360 Degree</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>360DegreeFilter_view</filterview>
+ <entity>360Degree_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>9e68c23b-1b55-4ff7-971d-815af0f9dd8a</name>
+ <view>360DegreeFilter_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Activity/Activity.aod b/neonContext/Activity/Activity.aod
index 25ae52541afc98821f91d6cc70a13005028d0803..5822e64fb80fca5377d40de7308530bf2c8dc26b 100644
--- a/neonContext/Activity/Activity.aod
+++ b/neonContext/Activity/Activity.aod
@@ -1,33 +1,33 @@
-<?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>Activity</name>
- <title>Activity</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>ActivityMain_view</mainview>
- <filterview>ActivityFilter_view</filterview>
- <editview>ActivityEdit_view</editview>
- <preview>ActivityPreview_view</preview>
- <entity>Activity_entity</entity>
- <references>
- <neonViewReference>
- <name>7de980e4-39d8-4fa7-ae00-bd664e6d3cd4</name>
- <view>ActivityFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>a026dad7-fa53-44b4-98c8-1d32b172e78b</name>
- <view>ActivityPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>9b432ee5-c767-4c47-ad2a-66d2163557d1</name>
- <view>ActivityEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>23964361-3977-4d2d-8af4-5cac94406d3d</name>
- <view>ActivityMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>d842dc4a-46f4-44d0-ab2e-2ff460a5aa47</name>
- <view>ActivityDetail_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Activity</name>
+ <title>Activity</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>ActivityMain_view</mainview>
+ <filterview>ActivityFilter_view</filterview>
+ <editview>ActivityEdit_view</editview>
+ <preview>ActivityPreview_view</preview>
+ <entity>Activity_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>7de980e4-39d8-4fa7-ae00-bd664e6d3cd4</name>
+ <view>ActivityFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>a026dad7-fa53-44b4-98c8-1d32b172e78b</name>
+ <view>ActivityPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>9b432ee5-c767-4c47-ad2a-66d2163557d1</name>
+ <view>ActivityEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>23964361-3977-4d2d-8af4-5cac94406d3d</name>
+ <view>ActivityMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>d842dc4a-46f4-44d0-ab2e-2ff460a5aa47</name>
+ <view>ActivityDetail_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/ActivityLink/ActivityLink.aod b/neonContext/ActivityLink/ActivityLink.aod
index dfc2613a966bd617ce4d43c74b82624fadb3222d..cf28e4b41783a8c25bd855452a82d3939c6e04f5 100644
--- a/neonContext/ActivityLink/ActivityLink.aod
+++ b/neonContext/ActivityLink/ActivityLink.aod
@@ -1,26 +1,26 @@
-<?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>ActivityLink</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>ActivityLinkFilter_view</filterview>
- <preview>ActivityLinkPreview_view</preview>
- <entity>ActivityLink_entity</entity>
- <references>
- <neonViewReference>
- <name>ca489cb3-98c0-446b-93cc-d9c0cdfa0f13</name>
- <view>ActivityLinkFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>16c750bf-b7b7-4222-86b2-9bd1b28f0c1f</name>
- <view>ActivityLinkPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>0960878d-9077-4707-8239-b48f1b55a5e8</name>
- <view>ActivityLinkMultiEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>e814dfa7-68da-485f-aea1-462197b33f67</name>
- <view>ActivityLinkPreviewList_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>ActivityLink</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>ActivityLinkFilter_view</filterview>
+ <preview>ActivityLinkPreview_view</preview>
+ <entity>ActivityLink_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>ca489cb3-98c0-446b-93cc-d9c0cdfa0f13</name>
+ <view>ActivityLinkFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>16c750bf-b7b7-4222-86b2-9bd1b28f0c1f</name>
+ <view>ActivityLinkPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>0960878d-9077-4707-8239-b48f1b55a5e8</name>
+ <view>ActivityLinkMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e814dfa7-68da-485f-aea1-462197b33f67</name>
+ <view>ActivityLinkPreviewList_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Address/Address.aod b/neonContext/Address/Address.aod
index 87c5beb15bea545ae2a141faac7d78717b994320..b60374eacb99556dd3633577fd1bb019bb36135d 100644
--- a/neonContext/Address/Address.aod
+++ b/neonContext/Address/Address.aod
@@ -1,22 +1,22 @@
-<?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>Address</name>
- <title>Addresses</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <lookupview>AddressLookup_view</lookupview>
- <entity>Address_entity</entity>
- <references>
- <neonViewReference>
- <name>0b476864-5342-4cb2-aa0c-f1ab29bb99b4</name>
- <view>AddressList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>f4c516c0-b9de-47df-91e4-43bdb3297fe7</name>
- <view>AdressMultiEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>77b182a7-2361-41a7-ae78-dc5285b41b97</name>
- <view>AddressLookup_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Address</name>
+ <title>Addresses</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <lookupview>AddressLookup_view</lookupview>
+ <entity>Address_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>0b476864-5342-4cb2-aa0c-f1ab29bb99b4</name>
+ <view>AddressList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>f4c516c0-b9de-47df-91e4-43bdb3297fe7</name>
+ <view>AdressMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>77b182a7-2361-41a7-ae78-dc5285b41b97</name>
+ <view>AddressLookup_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/AddressType/AddressType.aod b/neonContext/AddressType/AddressType.aod
index 164e1a5a06a2ef868dbc40ca895c407d8d33299d..cdedd4a52dcb53e93feeb5317a72436d9213887b 100644
--- a/neonContext/AddressType/AddressType.aod
+++ b/neonContext/AddressType/AddressType.aod
@@ -1,6 +1,6 @@
-<?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>AddressType</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>AddressType_entity</entity>
-</neonContext>
+<?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>AddressType</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>AddressType_entity</entity>
+</neonContext>
diff --git a/neonContext/Analyses/Analyses.aod b/neonContext/Analyses/Analyses.aod
index f9466ef0070a184017d9a5ace7105ef623acd44f..ea8a1ab388a5dfea3efe36fa25c0ddbbe6bab0fb 100644
--- a/neonContext/Analyses/Analyses.aod
+++ b/neonContext/Analyses/Analyses.aod
@@ -1,14 +1,14 @@
-<?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>Analyses</name>
- <title>Analyses</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>MyDashboardScoreCard_view</filterview>
- <entity>Analyses_entity</entity>
- <references>
- <neonViewReference>
- <name>f995b030-7b74-4513-89ca-57c6979ac06f</name>
- <view>MyDashboardScoreCard_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Analyses</name>
+ <title>Analyses</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>MyDashboardScoreCard_view</filterview>
+ <entity>Analyses_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>f995b030-7b74-4513-89ca-57c6979ac06f</name>
+ <view>MyDashboardScoreCard_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/AnyContact/AnyContact.aod b/neonContext/AnyContact/AnyContact.aod
index 3989b6cb544b9b6d4239efea95ac2ef936ba923c..03a45501d2aaa4fce635f6551198bbb42cc67c05 100644
--- a/neonContext/AnyContact/AnyContact.aod
+++ b/neonContext/AnyContact/AnyContact.aod
@@ -1,13 +1,13 @@
-<?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>AnyContact</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <lookupview>AnyContactLookup_view</lookupview>
- <entity>AnyContact_entity</entity>
- <references>
- <neonViewReference>
- <name>1ea0b1ed-c2b5-4b8c-b359-27ffdef6e5ea</name>
- <view>AnyContactLookup_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>AnyContact</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <lookupview>AnyContactLookup_view</lookupview>
+ <entity>AnyContact_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>1ea0b1ed-c2b5-4b8c-b359-27ffdef6e5ea</name>
+ <view>AnyContactLookup_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Appointment/Appointment.aod b/neonContext/Appointment/Appointment.aod
index a7d5dadf2a860abe2eec1822d979f7e6a48a1657..ad9c16271253ff3ed8a60c315b72be8991d876a0 100644
--- a/neonContext/Appointment/Appointment.aod
+++ b/neonContext/Appointment/Appointment.aod
@@ -1,23 +1,23 @@
-<?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>Appointment</name>
- <title>Termin</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/neonContext/Appointment/documentation.adoc</documentation>
- <icon>VAADIN:CALENDAR</icon>
- <mainview>AppointmentEdit_view</mainview>
- <filterview>AppointmentPreview_view</filterview>
- <editview>AppointmentEdit_view</editview>
- <preview>AppointmentPreview_view</preview>
- <entity>Appointment_entity</entity>
- <references>
- <neonViewReference>
- <name>90fe74fe-9bc6-4f63-9c06-52e1b0ccfcb3</name>
- <view>AppointmentEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>9cf48e57-ca02-4cee-911c-20b09e36637d</name>
- <view>AppointmentPreview_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Appointment</name>
+ <title>Termin</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/neonContext/Appointment/documentation.adoc</documentation>
+ <icon>VAADIN:CALENDAR</icon>
+ <mainview>AppointmentEdit_view</mainview>
+ <filterview>AppointmentPreview_view</filterview>
+ <editview>AppointmentEdit_view</editview>
+ <preview>AppointmentPreview_view</preview>
+ <entity>Appointment_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>90fe74fe-9bc6-4f63-9c06-52e1b0ccfcb3</name>
+ <view>AppointmentEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>9cf48e57-ca02-4cee-911c-20b09e36637d</name>
+ <view>AppointmentPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Attribute/Attribute.aod b/neonContext/Attribute/Attribute.aod
index 83b69a56be7b8396e57d3dd63022b7e90e895d66..a31d17c07bf37316a20816416bfe5f95c89099cd 100644
--- a/neonContext/Attribute/Attribute.aod
+++ b/neonContext/Attribute/Attribute.aod
@@ -1,34 +1,34 @@
-<?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>Attribute</name>
- <title>Attributes</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:TAGS</icon>
- <mainview>AttributeMain_view</mainview>
- <filterview>AttributeFilter_view</filterview>
- <editview>AttributeEdit_view</editview>
- <preview>AttributePreview_view</preview>
- <entity>Attribute_entity</entity>
- <references>
- <neonViewReference>
- <name>058f2577-b598-4d92-90ad-628342302a9c</name>
- <view>AttributeFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>96bf484d-dc8d-42ad-9242-dfefacc87956</name>
- <view>AttributePreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>59089acc-a6db-48c2-8061-2d3ca8246e37</name>
- <view>AttributeEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>05d998e7-7364-4425-aefe-3cf284933d52</name>
- <view>AttributeMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>6ab8d733-544c-4e48-ade9-b5210a5e5355</name>
- <view>AttributeTree_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Attribute</name>
+ <title>Attributes</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:TAGS</icon>
+ <mainview>AttributeMain_view</mainview>
+ <filterview>AttributeFilter_view</filterview>
+ <editview>AttributeEdit_view</editview>
+ <preview>AttributePreview_view</preview>
+ <entity>Attribute_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>058f2577-b598-4d92-90ad-628342302a9c</name>
+ <view>AttributeFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>96bf484d-dc8d-42ad-9242-dfefacc87956</name>
+ <view>AttributePreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>59089acc-a6db-48c2-8061-2d3ca8246e37</name>
+ <view>AttributeEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>05d998e7-7364-4425-aefe-3cf284933d52</name>
+ <view>AttributeMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6ab8d733-544c-4e48-ade9-b5210a5e5355</name>
+ <view>AttributeTree_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/AttributeRelation/AttributeRelation.aod b/neonContext/AttributeRelation/AttributeRelation.aod
index 6a64d2f7d6dd15ed63f866b1d6f9f9e732042bba..680b6ddc1b202031673cde193e35068683d620ff 100644
--- a/neonContext/AttributeRelation/AttributeRelation.aod
+++ b/neonContext/AttributeRelation/AttributeRelation.aod
@@ -1,6 +1,6 @@
<?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>
+ <name>AttributeRelation</name>
<title>Attributes</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<editview>AttributeRelationTreeEdit_view</editview>
diff --git a/neonContext/AttributeUsage/AttributeUsage.aod b/neonContext/AttributeUsage/AttributeUsage.aod
index 416418d8946980587ec77db5ba87f0b511578e53..fa7176fd2d24ad706d0703a320654287498cd21d 100644
--- a/neonContext/AttributeUsage/AttributeUsage.aod
+++ b/neonContext/AttributeUsage/AttributeUsage.aod
@@ -1,16 +1,16 @@
-<?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>AttributeUsage</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>AttributeUsage_entity</entity>
- <references>
- <neonViewReference>
- <name>6f384e66-886a-4a88-90b2-3fa74447b485</name>
- <view>AttributeUsageFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>db6545ff-cbf4-4c47-aa52-30ae7e203448</name>
- <view>AttributeUsageMultiEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>AttributeUsage</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>AttributeUsage_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>6f384e66-886a-4a88-90b2-3fa74447b485</name>
+ <view>AttributeUsageFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>db6545ff-cbf4-4c47-aa52-30ae7e203448</name>
+ <view>AttributeUsageMultiEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Campaign/Campaign.aod b/neonContext/Campaign/Campaign.aod
index 44da77e955ace0671af2cb87a25685eaf48ff6ea..9d15d6f3ac8be8cd6778f29fa97c0d0bd5376317 100644
--- a/neonContext/Campaign/Campaign.aod
+++ b/neonContext/Campaign/Campaign.aod
@@ -31,5 +31,9 @@
<name>4a5377cc-af00-49c7-aad2-ac93e2752b3f</name>
<view>CampaignCost_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>484d39ea-5135-4bb2-a12d-cb7114e2981c</name>
+ <view>CampaignCharts_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/CampaignCostChart/CampaignCostChart.aod b/neonContext/CampaignCostChart/CampaignCostChart.aod
new file mode 100644
index 0000000000000000000000000000000000000000..a7a868378f8c090c93002ec738d965c303271acd
--- /dev/null
+++ b/neonContext/CampaignCostChart/CampaignCostChart.aod
@@ -0,0 +1,12 @@
+<?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>CampaignCostChart</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>CampaignCostChart_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>c859b91d-d802-49c6-b330-5f66e80fe5c6</name>
+ <view>CampaignCostChart_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/CampaignParticipantChart/CampaignParticipantChart.aod b/neonContext/CampaignParticipantChart/CampaignParticipantChart.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9f0506d6c9470c242a3cb21476da5a73e3b7d4e6
--- /dev/null
+++ b/neonContext/CampaignParticipantChart/CampaignParticipantChart.aod
@@ -0,0 +1,12 @@
+<?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>CampaignParticipantChart</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>CampaignParticipantChart_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>820b8b1b-9b8e-47f9-a5b8-f0afb934909b</name>
+ <view>CampaignParticipantChart_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/CampaignStep/CampaignStep.aod b/neonContext/CampaignStep/CampaignStep.aod
index 17e6119fb7f175a1485f953f92a111e9f8f03fee..4347dcf41de3c2e0f603ab1f53a66f6acf4f4aae 100644
--- a/neonContext/CampaignStep/CampaignStep.aod
+++ b/neonContext/CampaignStep/CampaignStep.aod
@@ -34,5 +34,9 @@
<name>c1be17f6-c4ca-4d9d-8c3a-0cc8f75906f6</name>
<view>CampaignStepAddParticipants_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>ad879f25-4659-49d0-81ed-2e09c8b11ac1</name>
+ <view>CampaignStepParticipnatsPerStep_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Communication/Communication.aod b/neonContext/Communication/Communication.aod
index 1382749eacf8ddd1b8df828256734c4ad671b8a0..539896737dab7f3444ee9cc24a4ce71c005a91f2 100644
--- a/neonContext/Communication/Communication.aod
+++ b/neonContext/Communication/Communication.aod
@@ -1,25 +1,25 @@
-<?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>Communication</name>
- <title>Communication</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>Communication_entity</entity>
- <references>
- <neonViewReference>
- <name>a6ea1a77-09d3-4c36-90dc-3bcb4a22842a</name>
- <view>CommunicationMultiEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>af0e1f4b-a859-4302-b8d8-05568b9a4655</name>
- <view>CommunicationList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>9bccd737-1feb-48e3-9b77-9b6b4720a4f8</name>
- <view>CommunicationEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>ba995694-e88f-4f50-b4e7-5018b034747f</name>
- <view>CommunicationFilter_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Communication</name>
+ <title>Communication</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>Communication_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>a6ea1a77-09d3-4c36-90dc-3bcb4a22842a</name>
+ <view>CommunicationMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>af0e1f4b-a859-4302-b8d8-05568b9a4655</name>
+ <view>CommunicationList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>9bccd737-1feb-48e3-9b77-9b6b4720a4f8</name>
+ <view>CommunicationEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ba995694-e88f-4f50-b4e7-5018b034747f</name>
+ <view>CommunicationFilter_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Contact/Contact.aod b/neonContext/Contact/Contact.aod
index 3ad4a70c1f640792a4944db95a21992e29b69a45..90ffc09e088b096753d5484199a057e08d5db395 100644
--- a/neonContext/Contact/Contact.aod
+++ b/neonContext/Contact/Contact.aod
@@ -1,17 +1,17 @@
-<?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>Contact</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <editview>ContactEdit_view</editview>
- <entity>Contact_entity</entity>
- <references>
- <neonViewReference>
- <name>c96479fe-4f9c-433d-9de3-c2e1bbb5aac7</name>
- <view>ContactEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>dde4fdab-4a5e-4183-8d4d-4e96d34054c7</name>
- <view>ContactList_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Contact</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <editview>ContactEdit_view</editview>
+ <entity>Contact_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>c96479fe-4f9c-433d-9de3-c2e1bbb5aac7</name>
+ <view>ContactEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>dde4fdab-4a5e-4183-8d4d-4e96d34054c7</name>
+ <view>ContactList_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Context/Context.aod b/neonContext/Context/Context.aod
index 965d326f242e22a9100384d5f0f0e27843ad6933..4777c6de6d163b62048264feb8b908217e4691d9 100644
--- a/neonContext/Context/Context.aod
+++ b/neonContext/Context/Context.aod
@@ -1,16 +1,16 @@
-<?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>Context</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>Context_entity</entity>
- <references>
- <neonViewReference>
- <name>ddec38ae-82e6-4ac7-a50e-8a735eb9a075</name>
- <view>ContextFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>86650dd4-9569-433e-b3e5-fb9d62a7e45d</name>
- <view>ContextLookup_vieww</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Context</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>Context_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>ddec38ae-82e6-4ac7-a50e-8a735eb9a075</name>
+ <view>ContextFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>86650dd4-9569-433e-b3e5-fb9d62a7e45d</name>
+ <view>ContextLookup_vieww</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Contract/Contract.aod b/neonContext/Contract/Contract.aod
index 39e367fa3ed00ca8656fc424b465caa93c955b06..c4fb8084f5020df81d2e21c079fb259c0901bcf5 100644
--- a/neonContext/Contract/Contract.aod
+++ b/neonContext/Contract/Contract.aod
@@ -1,30 +1,30 @@
-<?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>Contract</name>
- <title>Contract</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>ContractMain_view</mainview>
- <filterview>ContractFilter_view</filterview>
- <editview>ContractEdit_view</editview>
- <preview>ContractPreview_view</preview>
- <lookupview>ContractFilter_view</lookupview>
- <entity>Contract_entity</entity>
- <references>
- <neonViewReference>
- <name>b3049f73-3918-407f-905f-61307497a3d8</name>
- <view>ContractFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>dbca973c-b41f-4a85-961c-025ebe073e62</name>
- <view>ContractPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>ff6d8aec-1ad3-4cfe-a7a8-3346f4fa8ff0</name>
- <view>ContractMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>e096f918-5312-46eb-8289-d9eddbeaa1f6</name>
- <view>ContractEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Contract</name>
+ <title>Contract</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>ContractMain_view</mainview>
+ <filterview>ContractFilter_view</filterview>
+ <editview>ContractEdit_view</editview>
+ <preview>ContractPreview_view</preview>
+ <lookupview>ContractFilter_view</lookupview>
+ <entity>Contract_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>b3049f73-3918-407f-905f-61307497a3d8</name>
+ <view>ContractFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>dbca973c-b41f-4a85-961c-025ebe073e62</name>
+ <view>ContractPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ff6d8aec-1ad3-4cfe-a7a8-3346f4fa8ff0</name>
+ <view>ContractMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e096f918-5312-46eb-8289-d9eddbeaa1f6</name>
+ <view>ContractEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Countries/Countries.aod b/neonContext/Countries/Countries.aod
index b8ca1c12754e99098fbc360b71a3658500760e0d..ef453675c6afd84ecb6a701052cf149837260625 100644
--- a/neonContext/Countries/Countries.aod
+++ b/neonContext/Countries/Countries.aod
@@ -1,20 +1,20 @@
-<?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>Countries</name>
- <title>Countries</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>CountriesTable_view</filterview>
- <editview>CountriesPreview_view</editview>
- <preview>CountriesPreview_view</preview>
- <entity>Countries_Entity</entity>
- <references>
- <neonViewReference>
- <name>1411e023-b968-486c-9b64-602705d6c53b</name>
- <view>CountriesPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>3d154dab-8451-4f9f-bed1-2baef0235ba7</name>
- <view>CountriesTable_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Countries</name>
+ <title>Countries</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>CountriesTable_view</filterview>
+ <editview>CountriesPreview_view</editview>
+ <preview>CountriesPreview_view</preview>
+ <entity>Countries_Entity</entity>
+ <references>
+ <neonViewReference>
+ <name>1411e023-b968-486c-9b64-602705d6c53b</name>
+ <view>CountriesPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>3d154dab-8451-4f9f-bed1-2baef0235ba7</name>
+ <view>CountriesTable_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Default_context/Default_context.aod b/neonContext/Default_context/Default_context.aod
index cbe3c0ea33df4fdfced796ee90288f2291389422..99089a9d6ed9974e085eff4b2ae79f7b3c462050 100644
--- a/neonContext/Default_context/Default_context.aod
+++ b/neonContext/Default_context/Default_context.aod
@@ -1,12 +1,12 @@
-<?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>Default_context</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/neonContext/Default_context/documentation.adoc</documentation>
- <references>
- <neonViewReference>
- <name>9fab8655-e49d-4108-a64f-a371c3d9c80b</name>
- <view>DefaultLookup_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Default_context</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/neonContext/Default_context/documentation.adoc</documentation>
+ <references>
+ <neonViewReference>
+ <name>9fab8655-e49d-4108-a64f-a371c3d9c80b</name>
+ <view>DefaultLookup_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Document/Document.aod b/neonContext/Document/Document.aod
index 3b779141fd18b6c4d3231d2d0e9144fec0f59388..bdc733dc1b240079dc84f44a22d7be2cee1bb354 100644
--- a/neonContext/Document/Document.aod
+++ b/neonContext/Document/Document.aod
@@ -1,29 +1,29 @@
-<?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>Document</name>
- <title>Document</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:FILE_TEXT_O</icon>
- <filterview>DocumentFilter_view</filterview>
- <editview>DocumentEdit_view</editview>
- <preview>DocumentPreview_view</preview>
- <entity>Document_entity</entity>
- <references>
- <neonViewReference>
- <name>3634ca6a-2317-4dde-9368-efa64f7227d7</name>
- <view>DocumentFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>fcc99fdd-5524-4f32-a418-a88a4b7c0c09</name>
- <view>DocumentEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>c3a522f3-897e-4d02-862b-6e44c4873714</name>
- <view>DocumentPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>b9455efd-d150-46c0-bfae-cdccb0c9bcad</name>
- <view>DocumentList_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Document</name>
+ <title>Document</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:FILE_TEXT_O</icon>
+ <filterview>DocumentFilter_view</filterview>
+ <editview>DocumentEdit_view</editview>
+ <preview>DocumentPreview_view</preview>
+ <entity>Document_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>3634ca6a-2317-4dde-9368-efa64f7227d7</name>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>fcc99fdd-5524-4f32-a418-a88a4b7c0c09</name>
+ <view>DocumentEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c3a522f3-897e-4d02-862b-6e44c4873714</name>
+ <view>DocumentPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>b9455efd-d150-46c0-bfae-cdccb0c9bcad</name>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/DocumentTemplate/DocumentTemplate.aod b/neonContext/DocumentTemplate/DocumentTemplate.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7d1f11e305160657b6ecacb03bbea81bdba47b90
--- /dev/null
+++ b/neonContext/DocumentTemplate/DocumentTemplate.aod
@@ -0,0 +1,30 @@
+<?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>DocumentTemplate</name>
+ <title>Document Template</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:FILE_FONT</icon>
+ <filterview>DocumentTemplateFilter_view</filterview>
+ <editview>DocumentTemplateEdit_view</editview>
+ <preview>DocumentTemplatePreview_view</preview>
+ <lookupview>DocumentTemplateFilterSmall_view</lookupview>
+ <entity>DocumentTemplate_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>d63a58ee-5ff0-4633-af45-7469707a888c</name>
+ <view>DocumentTemplateFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>d49f9ade-9f33-4996-8482-d2520f6cb8db</name>
+ <view>DocumentTemplateEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c67fc6df-2511-4ddf-8638-cec8591fc9dc</name>
+ <view>DocumentTemplatePreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>df9dab28-502c-41c2-8a8f-1c0745ca14dd</name>
+ <view>DocumentTemplateFilterSmall_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/DocumentTemplateLink/DocumentTemplateLink.aod b/neonContext/DocumentTemplateLink/DocumentTemplateLink.aod
new file mode 100644
index 0000000000000000000000000000000000000000..95f4078e2f0abe0aa4000505d502f517b05fc96d
--- /dev/null
+++ b/neonContext/DocumentTemplateLink/DocumentTemplateLink.aod
@@ -0,0 +1,17 @@
+<?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>DocumentTemplateLink</name>
+ <title>Attachment</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>DocumentTemplateLink_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>f21abb6d-0abf-472e-8f5e-2b2578d355ea</name>
+ <view>DocumentTemplateLinkMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>a9968bc4-885e-41df-9a50-15798e91f901</name>
+ <view>DocumentTemplateLinkList_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/DocumentTemplateTypeCategory/DocumentTemplateTypeCategory.aod b/neonContext/DocumentTemplateTypeCategory/DocumentTemplateTypeCategory.aod
new file mode 100644
index 0000000000000000000000000000000000000000..134d52984b4704c31830c35690989fc0816974f4
--- /dev/null
+++ b/neonContext/DocumentTemplateTypeCategory/DocumentTemplateTypeCategory.aod
@@ -0,0 +1,6 @@
+<?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>DocumentTemplateTypeCategory</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>DocumentTemplateTypeCategory_entity</entity>
+</neonContext>
diff --git a/neonContext/Employee/Employee.aod b/neonContext/Employee/Employee.aod
index 9dd4dd642bc410be26be22a52ccd6fc95ebab569..1d7640c1878336cea3c0cd2eb9b10be458256954 100644
--- a/neonContext/Employee/Employee.aod
+++ b/neonContext/Employee/Employee.aod
@@ -1,38 +1,38 @@
-<?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>Employee</name>
- <title>Employee</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>EmployeeMain_view</mainview>
- <filterview>EmployeeFilter_view</filterview>
- <editview>EmployeeEdit_view</editview>
- <preview>EmployeePreview_view</preview>
- <lookupview>EmployeeLookup_view</lookupview>
- <entity>Employee_entity</entity>
- <references>
- <neonViewReference>
- <name>51816f14-17da-4c96-80d8-f3b5280863b8</name>
- <view>EmployeeFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>91c2bbc7-89fb-4688-881e-6fa21e96b211</name>
- <view>EmployeeEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>6a36e3cf-5918-4c60-94d9-a3a7ed50ffce</name>
- <view>EmployeePreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>215e8e26-662f-45f6-9c61-c0b0b1129e66</name>
- <view>EmployeeMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>a01b0910-cd32-4fa7-a739-0b9eb19debc2</name>
- <view>EmployeePassword_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>3427f53f-9201-495c-a37c-b2c9b33eb123</name>
- <view>EmployeeLookup_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Employee</name>
+ <title>Employee</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>EmployeeMain_view</mainview>
+ <filterview>EmployeeFilter_view</filterview>
+ <editview>EmployeeEdit_view</editview>
+ <preview>EmployeePreview_view</preview>
+ <lookupview>EmployeeLookup_view</lookupview>
+ <entity>Employee_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>51816f14-17da-4c96-80d8-f3b5280863b8</name>
+ <view>EmployeeFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>91c2bbc7-89fb-4688-881e-6fa21e96b211</name>
+ <view>EmployeeEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6a36e3cf-5918-4c60-94d9-a3a7ed50ffce</name>
+ <view>EmployeePreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>215e8e26-662f-45f6-9c61-c0b0b1129e66</name>
+ <view>EmployeeMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>a01b0910-cd32-4fa7-a739-0b9eb19debc2</name>
+ <view>EmployeePassword_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>3427f53f-9201-495c-a37c-b2c9b33eb123</name>
+ <view>EmployeeLookup_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/EmployeeRole/EmployeeRole.aod b/neonContext/EmployeeRole/EmployeeRole.aod
index 436cf33ca9e7a829e908e1d8f4a26638703a7c93..28bfe0b0c7e712c468bea65fcabd675c9b7a5839 100644
--- a/neonContext/EmployeeRole/EmployeeRole.aod
+++ b/neonContext/EmployeeRole/EmployeeRole.aod
@@ -1,16 +1,16 @@
-<?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>EmployeeRole</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>EmployeeRole_entity</entity>
- <references>
- <neonViewReference>
- <name>fd4de342-238b-494e-a85b-ff08e3f065b9</name>
- <view>EmployeeRoleFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>6ec0af90-47aa-4f94-8e05-7c535bd4c965</name>
- <view>EmployeeRoleEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>EmployeeRole</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>EmployeeRole_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>fd4de342-238b-494e-a85b-ff08e3f065b9</name>
+ <view>EmployeeRoleFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6ec0af90-47aa-4f94-8e05-7c535bd4c965</name>
+ <view>EmployeeRoleEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/KeywordAttribute/KeywordAttribute.aod b/neonContext/KeywordAttribute/KeywordAttribute.aod
index 8a66f3eb1ad18c6d46b5d3372d055341bd4a6783..efeda86ba4caebb20db324ee03cef9c72ddf2321 100644
--- a/neonContext/KeywordAttribute/KeywordAttribute.aod
+++ b/neonContext/KeywordAttribute/KeywordAttribute.aod
@@ -1,19 +1,19 @@
-<?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>KeywordAttribute</name>
- <title>Keyword Attribute</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>KeywordAttributeFilter_view</filterview>
- <editview>KeywordAttributeEdit_view</editview>
- <entity>KeywordAttribute_entity</entity>
- <references>
- <neonViewReference>
- <name>3d33f7a2-f215-4810-bb70-adaae32e09f9</name>
- <view>KeywordAttributeFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>ca209089-0c98-4424-9e15-4e3c01b0e2aa</name>
- <view>KeywordAttributeEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>KeywordAttribute</name>
+ <title>Keyword Attribute</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>KeywordAttributeFilter_view</filterview>
+ <editview>KeywordAttributeEdit_view</editview>
+ <entity>KeywordAttribute_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>3d33f7a2-f215-4810-bb70-adaae32e09f9</name>
+ <view>KeywordAttributeFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ca209089-0c98-4424-9e15-4e3c01b0e2aa</name>
+ <view>KeywordAttributeEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/KeywordAttributeRelation/KeywordAttributeRelation.aod b/neonContext/KeywordAttributeRelation/KeywordAttributeRelation.aod
index 0270a99f81eb13075f82ebf11104a6011a233653..25d5191578e24441db38fce5eb3565f23d77e2a8 100644
--- a/neonContext/KeywordAttributeRelation/KeywordAttributeRelation.aod
+++ b/neonContext/KeywordAttributeRelation/KeywordAttributeRelation.aod
@@ -1,17 +1,17 @@
-<?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>KeywordAttributeRelation</name>
- <title>Keyword Attribute Values</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>KeywordAttributeRelation_entity</entity>
- <references>
- <neonViewReference>
- <name>4340ec15-39bd-4c0c-a7b9-c03829f9ff78</name>
- <view>KeywordAttributeRelationRows_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>c27dbf5c-1a3d-4256-9103-bbf5256b005b</name>
- <view>KeywordAttriubteRelationTitled_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>KeywordAttributeRelation</name>
+ <title>Keyword Attribute Values</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>KeywordAttributeRelation_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>4340ec15-39bd-4c0c-a7b9-c03829f9ff78</name>
+ <view>KeywordAttributeRelationRows_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c27dbf5c-1a3d-4256-9103-bbf5256b005b</name>
+ <view>KeywordAttriubteRelationTitled_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/KeywordEntry/KeywordEntry.aod b/neonContext/KeywordEntry/KeywordEntry.aod
index 7a7310575cba29ec500f2fe0739553bdc95d9235..9c8eee02ee349531f5f2bb4cf2bdcfcdb084fc5d 100644
--- a/neonContext/KeywordEntry/KeywordEntry.aod
+++ b/neonContext/KeywordEntry/KeywordEntry.aod
@@ -1,34 +1,34 @@
-<?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>KeywordEntry</name>
- <title>Keyword</title>
- <description><null value></description>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>KeywordEntryMain_view</mainview>
- <filterview>KeywordEntryFilter_view</filterview>
- <editview>KeywordEntryEdit_view</editview>
- <preview>KeywordEntryPreview_view</preview>
- <entity>KeywordEntry_entity</entity>
- <references>
- <neonViewReference>
- <name>75271eb0-8ddf-4b02-a943-01f589df1b20</name>
- <view>KeywordEntryFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>e73f8fa3-3538-4af5-8116-84358b3254fa</name>
- <view>KeywordEntryEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>9bb352b9-5a8c-41ac-9c42-7f4f7f4827f3</name>
- <view>KeywordEntryPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>bba3520e-3e12-44e9-89dc-b42183e332ec</name>
- <view>KeywordEntryMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>fb697cca-5e7d-4814-a6ed-09f32f9f60fd</name>
- <view>KeywordEntryMainSide_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>KeywordEntry</name>
+ <title>Keyword</title>
+ <description><null value></description>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>KeywordEntryMain_view</mainview>
+ <filterview>KeywordEntryFilter_view</filterview>
+ <editview>KeywordEntryEdit_view</editview>
+ <preview>KeywordEntryPreview_view</preview>
+ <entity>KeywordEntry_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>75271eb0-8ddf-4b02-a943-01f589df1b20</name>
+ <view>KeywordEntryFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e73f8fa3-3538-4af5-8116-84358b3254fa</name>
+ <view>KeywordEntryEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>9bb352b9-5a8c-41ac-9c42-7f4f7f4827f3</name>
+ <view>KeywordEntryPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>bba3520e-3e12-44e9-89dc-b42183e332ec</name>
+ <view>KeywordEntryMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>fb697cca-5e7d-4814-a6ed-09f32f9f60fd</name>
+ <view>KeywordEntryMainSide_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Language/Language.aod b/neonContext/Language/Language.aod
index 480664ed7caf1f1b6cb2c055b709c07e7b933ea6..7abe32162952352bf38af422d669e2e812d0921b 100644
--- a/neonContext/Language/Language.aod
+++ b/neonContext/Language/Language.aod
@@ -1,6 +1,6 @@
-<?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>Language</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>Language_entity</entity>
-</neonContext>
+<?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>Language</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>Language_entity</entity>
+</neonContext>
diff --git a/neonContext/LogHistory/LogHistory.aod b/neonContext/LogHistory/LogHistory.aod
index f2c9352b523d2250c208dee11ee4dfaffc4209fb..179d44bff14cd005a74965ccc19a1650f0315b00 100644
--- a/neonContext/LogHistory/LogHistory.aod
+++ b/neonContext/LogHistory/LogHistory.aod
@@ -1,14 +1,19 @@
-<?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>LogHistory</name>
- <title>LogHistory</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>LogHistoryFilter_view</filterview>
- <entity>LogHistory_entity</entity>
- <references>
- <neonViewReference>
- <name>76df2f61-4176-4648-81c7-33da90b76967</name>
- <view>LogHistoryFilter_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>LogHistory</name>
+ <title>LogHistory</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>LogHistoryFilter_view</filterview>
+ <preview>LogHistoryPreview_view</preview>
+ <entity>LogHistory_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>76df2f61-4176-4648-81c7-33da90b76967</name>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>32181ad2-2766-4d52-a04b-4b74bcbd2453</name>
+ <view>LogHistoryPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/ModuleTree/ModuleTree.aod b/neonContext/ModuleTree/ModuleTree.aod
index f12da947c8aef3dd33305c984a91244763268c67..1974801491477f2588cf221a6203e5d384ecedcf 100644
--- a/neonContext/ModuleTree/ModuleTree.aod
+++ b/neonContext/ModuleTree/ModuleTree.aod
@@ -1,13 +1,13 @@
-<?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>ModuleTree</name>
- <title>Tree</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>ModuleTree_entity</entity>
- <references>
- <neonViewReference>
- <name>90d2e21e-1231-418e-8729-d29f2453dfdd</name>
- <view>ModuleTree_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>ModuleTree</name>
+ <title>Tree</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>ModuleTree_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>90d2e21e-1231-418e-8729-d29f2453dfdd</name>
+ <view>ModuleTree_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Notification/Notification.aod b/neonContext/Notification/Notification.aod
index ef86e6f5e55ffc6d82304521cfe2be15f783fae3..96109dc523d021e92a5c9c2a010ecc2867a3db81 100644
--- a/neonContext/Notification/Notification.aod
+++ b/neonContext/Notification/Notification.aod
@@ -1,6 +1,7 @@
<?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>Notification</name>
+ <title></title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterview>NotificationFilter_view</filterview>
<preview>NotificationPreview_view</preview>
diff --git a/neonContext/Object/Object.aod b/neonContext/Object/Object.aod
index 999aeded525716cf2f528e20f1d1c35db736add5..d1d8523101c0f9013f4b02d14bd24d3a7b679758 100644
--- a/neonContext/Object/Object.aod
+++ b/neonContext/Object/Object.aod
@@ -1,6 +1,6 @@
-<?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>Object</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>Object_entity</entity>
-</neonContext>
+<?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>Object</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>Object_entity</entity>
+</neonContext>
diff --git a/neonContext/ObjectRelationType/ObjectRelationType.aod b/neonContext/ObjectRelationType/ObjectRelationType.aod
index c90b46ece5109ab161d5df449e410baa5bcfc690..d360e5500d6989bb2f895b138ba1803f1995f32e 100644
--- a/neonContext/ObjectRelationType/ObjectRelationType.aod
+++ b/neonContext/ObjectRelationType/ObjectRelationType.aod
@@ -1,20 +1,20 @@
-<?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>ObjectRelationType</name>
- <title>Relation type</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:SPLIT</icon>
- <filterview>ObjectRelationTypeFilter_view</filterview>
- <editview>ObjectRelationTypeEdit_view</editview>
- <entity>ObjectRelationType_entity</entity>
- <references>
- <neonViewReference>
- <name>3bee0408-8a9b-4188-8ebf-0b9671bbf436</name>
- <view>ObjectRelationTypeFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>afb5b3c7-fb34-4511-8b72-34808d64e226</name>
- <view>ObjectRelationTypeEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>ObjectRelationType</name>
+ <title>Relation type</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:SPLIT</icon>
+ <filterview>ObjectRelationTypeFilter_view</filterview>
+ <editview>ObjectRelationTypeEdit_view</editview>
+ <entity>ObjectRelationType_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>3bee0408-8a9b-4188-8ebf-0b9671bbf436</name>
+ <view>ObjectRelationTypeFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>afb5b3c7-fb34-4511-8b72-34808d64e226</name>
+ <view>ObjectRelationTypeEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Offer/Offer.aod b/neonContext/Offer/Offer.aod
index ff88eb5a2d7980c3abf9393624b544b07a813d0d..6e9ba1f1001ad9c7efa2d0d415d375b055b05593 100644
--- a/neonContext/Offer/Offer.aod
+++ b/neonContext/Offer/Offer.aod
@@ -1,34 +1,34 @@
-<?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>Offer</name>
- <title>Offer</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>OfferMain_view</mainview>
- <filterview>OfferFilter_view</filterview>
- <editview>OfferEdit_view</editview>
- <preview>OfferPreview_view</preview>
- <lookupview>OfferFilter_view</lookupview>
- <entity>Offer_entity</entity>
- <references>
- <neonViewReference>
- <name>1dd0290d-b820-4a3b-ada7-1850025ca914</name>
- <view>OfferFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>08b180ed-7983-4675-9be4-2b55467c713c</name>
- <view>OfferMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>4ed03135-fe7e-4413-8272-c64ad5f3287d</name>
- <view>OfferEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>c7f456ce-a141-436b-ad4b-7007a95eae04</name>
- <view>OfferPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>a68c9d63-aff4-4e82-af23-72d20c2b6b76</name>
- <view>OfferCoverLetter_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Offer</name>
+ <title>Offer</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>OfferMain_view</mainview>
+ <filterview>OfferFilter_view</filterview>
+ <editview>OfferEdit_view</editview>
+ <preview>OfferPreview_view</preview>
+ <lookupview>OfferFilter_view</lookupview>
+ <entity>Offer_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>1dd0290d-b820-4a3b-ada7-1850025ca914</name>
+ <view>OfferFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>08b180ed-7983-4675-9be4-2b55467c713c</name>
+ <view>OfferMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>4ed03135-fe7e-4413-8272-c64ad5f3287d</name>
+ <view>OfferEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c7f456ce-a141-436b-ad4b-7007a95eae04</name>
+ <view>OfferPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>a68c9d63-aff4-4e82-af23-72d20c2b6b76</name>
+ <view>OfferCoverLetter_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Offeritem/Offeritem.aod b/neonContext/Offeritem/Offeritem.aod
index 6a8a4c7a18a8791fc6eeceae8c87e7705bf5fb35..1725a06f30b13f13541a25f426e98fb71902488d 100644
--- a/neonContext/Offeritem/Offeritem.aod
+++ b/neonContext/Offeritem/Offeritem.aod
@@ -1,28 +1,28 @@
-<?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>Offeritem</name>
- <title>Offeritem</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>OfferitemFilter_view</filterview>
- <editview>OfferitemEdit_view</editview>
- <preview>OfferitemPreview_view</preview>
- <entity>Offeritem_entity</entity>
- <references>
- <neonViewReference>
- <name>67982f26-ac82-4a24-8dcf-5b3db4d21f33</name>
- <view>OfferitemFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>3439b9ca-cc68-47f7-bfae-676280b28cdf</name>
- <view>OfferitemPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>440a19f2-4893-47b9-b10c-864540b6287f</name>
- <view>OfferitemMultiEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>9571eef4-1b84-4f4f-9109-7c5f63571a93</name>
- <view>OfferitemEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Offeritem</name>
+ <title>Offeritem</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>OfferitemFilter_view</filterview>
+ <editview>OfferitemEdit_view</editview>
+ <preview>OfferitemPreview_view</preview>
+ <entity>Offeritem_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>67982f26-ac82-4a24-8dcf-5b3db4d21f33</name>
+ <view>OfferitemFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>3439b9ca-cc68-47f7-bfae-676280b28cdf</name>
+ <view>OfferitemPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>440a19f2-4893-47b9-b10c-864540b6287f</name>
+ <view>OfferitemMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>9571eef4-1b84-4f4f-9109-7c5f63571a93</name>
+ <view>OfferitemEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Options/Options.aod b/neonContext/Options/Options.aod
index c0d219d623ee8e1262671965ab1dc8097c096498..ca93a799a06f0f6ac3e9eb79a3b816fb1cd5411e 100644
--- a/neonContext/Options/Options.aod
+++ b/neonContext/Options/Options.aod
@@ -1,23 +1,23 @@
-<?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>Options</name>
- <title>Options</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>Options_View</mainview>
- <editview>Options_View</editview>
- <entity>Options_Entity</entity>
- <references>
- <neonViewReference>
- <name>41b764ba-7d8f-4f54-8d88-808038ff01a2</name>
- <view>Options_View</view>
- </neonViewReference>
- <neonViewReference>
- <name>c3116b4a-d4a1-4851-9587-5a3e4617e8a6</name>
- <view>Options1_View</view>
- </neonViewReference>
- <neonViewReference>
- <name>7d218935-8b37-4506-89f0-778ad6e7ae06</name>
- <view>Options2_View</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Options</name>
+ <title>Options</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>Options_View</mainview>
+ <editview>Options_View</editview>
+ <entity>Options_Entity</entity>
+ <references>
+ <neonViewReference>
+ <name>41b764ba-7d8f-4f54-8d88-808038ff01a2</name>
+ <view>Options_View</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c3116b4a-d4a1-4851-9587-5a3e4617e8a6</name>
+ <view>Options1_View</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>7d218935-8b37-4506-89f0-778ad6e7ae06</name>
+ <view>Options2_View</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Order/Order.aod b/neonContext/Order/Order.aod
index 09c0811ee91145d2da35a68b888fdbb39853e24a..d4e54824f96757373a0e44b20dd6037ce53cbe3c 100644
--- a/neonContext/Order/Order.aod
+++ b/neonContext/Order/Order.aod
@@ -1,35 +1,35 @@
-<?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>Order</name>
- <title>Receipt</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:FILE_TEXT_O</icon>
- <mainview>OrderMain_view</mainview>
- <filterview>OrderFilter_view</filterview>
- <editview>OrderEdit_view</editview>
- <preview>OrderPreview_view</preview>
- <lookupview>OrderFilter_view</lookupview>
- <entity>Order_entity</entity>
- <references>
- <neonViewReference>
- <name>e9de537a-43e9-4ea3-9da4-0a4812954543</name>
- <view>OrderDetail_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>dba88ac9-716e-4907-8bc7-9a623fbad1e1</name>
- <view>OrderFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>53966f88-a6e9-4b41-8c71-2ebbbaf2e568</name>
- <view>OrderMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>1015ce77-7be5-4d70-8b35-2953a5b25a2a</name>
- <view>OrderPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>26c6c56a-7e5a-4101-884a-41f522f071ae</name>
- <view>OrderEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Order</name>
+ <title>Receipt</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:FILE_TEXT_O</icon>
+ <mainview>OrderMain_view</mainview>
+ <filterview>OrderFilter_view</filterview>
+ <editview>OrderEdit_view</editview>
+ <preview>OrderPreview_view</preview>
+ <lookupview>OrderFilter_view</lookupview>
+ <entity>Order_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>e9de537a-43e9-4ea3-9da4-0a4812954543</name>
+ <view>OrderDetail_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>dba88ac9-716e-4907-8bc7-9a623fbad1e1</name>
+ <view>OrderFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>53966f88-a6e9-4b41-8c71-2ebbbaf2e568</name>
+ <view>OrderMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>1015ce77-7be5-4d70-8b35-2953a5b25a2a</name>
+ <view>OrderPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>26c6c56a-7e5a-4101-884a-41f522f071ae</name>
+ <view>OrderEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Orderitem/Orderitem.aod b/neonContext/Orderitem/Orderitem.aod
index a3c13ab9a3280edb9e568c9ed17b989fd09d0987..eef110136d8d776a4ef989980323dca83d2cadcd 100644
--- a/neonContext/Orderitem/Orderitem.aod
+++ b/neonContext/Orderitem/Orderitem.aod
@@ -1,20 +1,20 @@
-<?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>Orderitem</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>Orderitem_entity</entity>
- <references>
- <neonViewReference>
- <name>353a51ee-b67d-4d4f-80c9-7435dc99efcc</name>
- <view>OrderitemMultiEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>716ff8ff-9dac-44fe-b825-cb013678bce4</name>
- <view>OrderitemFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>f86311e6-1afa-4470-be34-ce145d3570b2</name>
- <view>OrderitemPreview_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Orderitem</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>Orderitem_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>353a51ee-b67d-4d4f-80c9-7435dc99efcc</name>
+ <view>OrderitemMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>716ff8ff-9dac-44fe-b825-cb013678bce4</name>
+ <view>OrderitemFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>f86311e6-1afa-4470-be34-ce145d3570b2</name>
+ <view>OrderitemPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index cb83a2d172c16e3bfa122efe4e6f74a1ad648021..db1e96a1a1cf5ea94667f4690f0ead8e8ac31285 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -1,39 +1,39 @@
-<?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>Organisation</name>
- <title>Company</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:BUILDING</icon>
- <mainview>OrganisationMain_view</mainview>
- <filterview>OrganisationFilter_view</filterview>
- <editview>OrganisationEdit_view</editview>
- <preview>OrganisationPreview_view</preview>
- <lookupview>OrganisationLookup_view</lookupview>
- <entity>Organisation_entity</entity>
- <references>
- <neonViewReference>
- <name>c71a570c-2408-474d-961a-7409d0999fde</name>
- <view>OrganisationFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>167b9623-4050-480a-811c-9824549d3834</name>
- <view>OrganisationPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>42b328d7-e3f2-4bab-bca8-6899d89df78d</name>
- <view>OrganisationMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>68c233a5-ac5a-4aa7-b795-cd5aeb7af2e6</name>
- <view>OrganisationEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>27c1cd03-506a-4e1e-a080-79b9dca6eefd</name>
- <view>OrganisationLookup_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>0e8f983b-0ff6-431c-9118-fecd9563c742</name>
- <view>OrganisationEditDefaults_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Organisation</name>
+ <title>Company</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:BUILDING</icon>
+ <mainview>OrganisationMain_view</mainview>
+ <filterview>OrganisationFilter_view</filterview>
+ <editview>OrganisationEdit_view</editview>
+ <preview>OrganisationPreview_view</preview>
+ <lookupview>OrganisationLookup_view</lookupview>
+ <entity>Organisation_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>c71a570c-2408-474d-961a-7409d0999fde</name>
+ <view>OrganisationFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>167b9623-4050-480a-811c-9824549d3834</name>
+ <view>OrganisationPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>42b328d7-e3f2-4bab-bca8-6899d89df78d</name>
+ <view>OrganisationMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>68c233a5-ac5a-4aa7-b795-cd5aeb7af2e6</name>
+ <view>OrganisationEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>27c1cd03-506a-4e1e-a080-79b9dca6eefd</name>
+ <view>OrganisationLookup_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>0e8f983b-0ff6-431c-9118-fecd9563c742</name>
+ <view>OrganisationEditDefaults_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Person/Person.aod b/neonContext/Person/Person.aod
index 6fa7445bfa465572263bcad1b992f7d6a49b6975..a4a5cc7512cdf85a22433cbfca52f29457b19519 100644
--- a/neonContext/Person/Person.aod
+++ b/neonContext/Person/Person.aod
@@ -1,46 +1,46 @@
-<?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>Person</name>
- <title>Contact</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>PersonMain_view</mainview>
- <filterview>PersonFilter_view</filterview>
- <editview>PersonEdit_view</editview>
- <preview>PersonPreview_view</preview>
- <lookupview>PersonLookup_view</lookupview>
- <entity>Person_entity</entity>
- <references>
- <neonViewReference>
- <name>901b3b2b-0f39-4d21-89fc-7d3cc7f6f5bc</name>
- <view>PersonMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>44ddbcaa-f5ae-4cf7-a12c-36e0c4fe854d</name>
- <view>PersonFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>aa2fef1f-796c-4d00-b37c-0d91e55957a0</name>
- <view>PersonPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>ab08dc45-8021-4b9c-8f95-5a515441973f</name>
- <view>PersonEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>059b25be-ba0e-43c9-983a-6a6115b3a24c</name>
- <view>PersonDetail_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>4192e40d-23f0-45ff-8f2c-3a0694a59582</name>
- <view>PersonEditDefaults_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>c597732e-0291-42a1-8edf-20ff701aac5d</name>
- <view>PersonLookup_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>d2fe8cd9-e3fc-4f4e-bd61-f762e3315798</name>
- <view>PersonSimpleList_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Person</name>
+ <title>Contact</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>PersonMain_view</mainview>
+ <filterview>PersonFilter_view</filterview>
+ <editview>PersonEdit_view</editview>
+ <preview>PersonPreview_view</preview>
+ <lookupview>PersonLookup_view</lookupview>
+ <entity>Person_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>901b3b2b-0f39-4d21-89fc-7d3cc7f6f5bc</name>
+ <view>PersonMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>44ddbcaa-f5ae-4cf7-a12c-36e0c4fe854d</name>
+ <view>PersonFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>aa2fef1f-796c-4d00-b37c-0d91e55957a0</name>
+ <view>PersonPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ab08dc45-8021-4b9c-8f95-5a515441973f</name>
+ <view>PersonEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>059b25be-ba0e-43c9-983a-6a6115b3a24c</name>
+ <view>PersonDetail_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>4192e40d-23f0-45ff-8f2c-3a0694a59582</name>
+ <view>PersonEditDefaults_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c597732e-0291-42a1-8edf-20ff701aac5d</name>
+ <view>PersonLookup_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>d2fe8cd9-e3fc-4f4e-bd61-f762e3315798</name>
+ <view>PersonSimpleList_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Prod2prod/Prod2prod.aod b/neonContext/Prod2prod/Prod2prod.aod
index 3599d2911411108281f6660aa074a9d6087a9979..00dad8c407034533c52c2d6eb08cae568a25a7c9 100644
--- a/neonContext/Prod2prod/Prod2prod.aod
+++ b/neonContext/Prod2prod/Prod2prod.aod
@@ -1,20 +1,20 @@
-<?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>Prod2prod</name>
- <title></title>
- <comment>Prod2Prod is mainly used for the parts list of products</comment>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>Prod2prodFilter_view</filterview>
- <editview>Prod2ProdEdit_view</editview>
- <entity>Prod2prod_entity</entity>
- <references>
- <neonViewReference>
- <name>0f388c5e-7873-49de-8396-16a2e01dfa84</name>
- <view>Prod2prodFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>428b22a1-427f-4547-a478-964442078bc1</name>
- <view>Prod2ProdEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Prod2prod</name>
+ <title></title>
+ <comment>Prod2Prod is mainly used for the parts list of products</comment>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>Prod2prodFilter_view</filterview>
+ <editview>Prod2ProdEdit_view</editview>
+ <entity>Prod2prod_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>0f388c5e-7873-49de-8396-16a2e01dfa84</name>
+ <view>Prod2prodFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>428b22a1-427f-4547-a478-964442078bc1</name>
+ <view>Prod2ProdEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Product/Product.aod b/neonContext/Product/Product.aod
index 210cbc039444ba0442108f0022758085c0d37a4e..64a4cf42e7c55d9be744f9b415413a62aeeaa7b3 100644
--- a/neonContext/Product/Product.aod
+++ b/neonContext/Product/Product.aod
@@ -1,34 +1,34 @@
-<?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>Product</name>
- <title>Product</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>ProductMain_view</mainview>
- <filterview>ProductFilter_view</filterview>
- <editview>ProductEdit_view</editview>
- <preview>ProductPreview_view</preview>
- <lookupview>ProductFilter_view</lookupview>
- <entity>Product_entity</entity>
- <references>
- <neonViewReference>
- <name>8a0bd726-b3f6-4c5a-bd2a-251285b9ad90</name>
- <view>ProductMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>ecb98950-5460-44ab-8da8-757bd143c03e</name>
- <view>ProductEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>cc985c0d-755f-46bd-89a2-71c5c6227198</name>
- <view>ProductFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>5580ead4-2257-4cdb-a3ac-5e7067c4c1ab</name>
- <view>ProductPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>f5f7c429-56ca-421e-8e43-e8da14ca88a0</name>
- <view>ProductDescription_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Product</name>
+ <title>Product</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>ProductMain_view</mainview>
+ <filterview>ProductFilter_view</filterview>
+ <editview>ProductEdit_view</editview>
+ <preview>ProductPreview_view</preview>
+ <lookupview>ProductFilter_view</lookupview>
+ <entity>Product_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>8a0bd726-b3f6-4c5a-bd2a-251285b9ad90</name>
+ <view>ProductMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ecb98950-5460-44ab-8da8-757bd143c03e</name>
+ <view>ProductEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>cc985c0d-755f-46bd-89a2-71c5c6227198</name>
+ <view>ProductFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>5580ead4-2257-4cdb-a3ac-5e7067c4c1ab</name>
+ <view>ProductPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>f5f7c429-56ca-421e-8e43-e8da14ca88a0</name>
+ <view>ProductDescription_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Productprice/Productprice.aod b/neonContext/Productprice/Productprice.aod
index 26fb37f5e29b6c3d2db429df161fec5b5973159a..5385e3c1cb27bf2f4217a831622eb7770d5d7873 100644
--- a/neonContext/Productprice/Productprice.aod
+++ b/neonContext/Productprice/Productprice.aod
@@ -1,22 +1,22 @@
-<?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>Productprice</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>ProductpriceFilter_view</filterview>
- <editview>ProductpriceEdit_view</editview>
- <entity>Productprice_entity</entity>
- <references>
- <neonViewReference>
- <name>cb76925e-63da-45c8-b332-e0fd2faff26e</name>
- <view>ProductpriceFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>5d987a22-773d-4353-87d5-8da2427f4239</name>
- <view>ProductpriceEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>d1c8b084-a20b-49ae-88fe-7a578396d4a5</name>
- <view>ProductpriceRelation_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Productprice</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>ProductpriceFilter_view</filterview>
+ <editview>ProductpriceEdit_view</editview>
+ <entity>Productprice_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>cb76925e-63da-45c8-b332-e0fd2faff26e</name>
+ <view>ProductpriceFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>5d987a22-773d-4353-87d5-8da2427f4239</name>
+ <view>ProductpriceEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>d1c8b084-a20b-49ae-88fe-7a578396d4a5</name>
+ <view>ProductpriceRelation_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index 918124f55773f30f2c60e4ef6a6c16f7809456fb..32644798b5c21bf488c38e39e421faf54cf233b1 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -1,34 +1,34 @@
-<?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>Salesproject</name>
- <title>Salesproject</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>SalesprojectMain_view</mainview>
- <filterview>SalesprojectFilter_view</filterview>
- <editview>SalesprojectEdit_view</editview>
- <preview>SalesprojectPreview_view</preview>
- <lookupview>SalesprojectFilter_view</lookupview>
- <entity>Salesproject_entity</entity>
- <references>
- <neonViewReference>
- <name>a791a80d-ecec-43e3-b168-633e411835c2</name>
- <view>SalesprojectPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>0d053d4a-a946-417f-a6f7-95e22b9a7cae</name>
- <view>SalesprojectMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>fe6fb9fc-4e7c-49d6-a452-e022b55cbc55</name>
- <view>SalesprojectFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>c35cc718-94a8-43cf-afe4-f02d251d4e9f</name>
- <view>SalesprojectEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>9d4603e0-6e0e-4c9e-af97-f5c059debe9e</name>
- <view>SalesprojectMilestone_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Salesproject</name>
+ <title>Salesproject</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>SalesprojectMain_view</mainview>
+ <filterview>SalesprojectFilter_view</filterview>
+ <editview>SalesprojectEdit_view</editview>
+ <preview>SalesprojectPreview_view</preview>
+ <lookupview>SalesprojectFilter_view</lookupview>
+ <entity>Salesproject_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>a791a80d-ecec-43e3-b168-633e411835c2</name>
+ <view>SalesprojectPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>0d053d4a-a946-417f-a6f7-95e22b9a7cae</name>
+ <view>SalesprojectMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>fe6fb9fc-4e7c-49d6-a452-e022b55cbc55</name>
+ <view>SalesprojectFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c35cc718-94a8-43cf-afe4-f02d251d4e9f</name>
+ <view>SalesprojectEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>9d4603e0-6e0e-4c9e-af97-f5c059debe9e</name>
+ <view>SalesprojectMilestone_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/SalesprojectClassification/SalesprojectClassification.aod b/neonContext/SalesprojectClassification/SalesprojectClassification.aod
index 6ee5b6a54fdd22e67974f3ab748291623013216c..76e29d04b86f10591bb48ff255822d4685510324 100644
--- a/neonContext/SalesprojectClassification/SalesprojectClassification.aod
+++ b/neonContext/SalesprojectClassification/SalesprojectClassification.aod
@@ -1,18 +1,18 @@
-<?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>SalesprojectClassification</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>SalesprojectClassificationFilter_view</filterview>
- <preview>SalesprojectClassificationPreview_view</preview>
- <entity>SalesprojectClassification_entity</entity>
- <references>
- <neonViewReference>
- <name>c0720a84-98a8-459d-bdf5-b3daf56ee059</name>
- <view>SalesprojectClassificationFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>e5f1c9a7-19a8-433e-b25e-83001d4f7bf8</name>
- <view>SalesprojectClassificationPreview_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>SalesprojectClassification</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>SalesprojectClassificationFilter_view</filterview>
+ <preview>SalesprojectClassificationPreview_view</preview>
+ <entity>SalesprojectClassification_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>c0720a84-98a8-459d-bdf5-b3daf56ee059</name>
+ <view>SalesprojectClassificationFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e5f1c9a7-19a8-433e-b25e-83001d4f7bf8</name>
+ <view>SalesprojectClassificationPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/SalesprojectClassificationEntry/SalesprojectClassificationEntry.aod b/neonContext/SalesprojectClassificationEntry/SalesprojectClassificationEntry.aod
index 1ce28c5a7eb718f3083b6a8f92fa42dda40f4132..80ff2cc86e9f990b1f5f596528eb5d2acf8ebf39 100644
--- a/neonContext/SalesprojectClassificationEntry/SalesprojectClassificationEntry.aod
+++ b/neonContext/SalesprojectClassificationEntry/SalesprojectClassificationEntry.aod
@@ -1,20 +1,20 @@
-<?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>SalesprojectClassificationEntry</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>SalesprojectClassificationEntryPreview_view</mainview>
- <filterview>SalesprojectClassificationEntryPreview_view</filterview>
- <editview>SalesprojectClassificationEntryEdit_view</editview>
- <preview>SalesprojectClassificationEntryPreview_view</preview>
- <entity>SalesprojectClassificationEntry_entity</entity>
- <references>
- <neonViewReference>
- <name>7cddda68-3dcb-4daf-84a4-1546298cabb6</name>
- <view>SalesprojectClassificationEntryPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>80205380-7785-43a3-af7b-73ef8112ca38</name>
- <view>SalesprojectClassificationEntryEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>SalesprojectClassificationEntry</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>SalesprojectClassificationEntryPreview_view</mainview>
+ <filterview>SalesprojectClassificationEntryPreview_view</filterview>
+ <editview>SalesprojectClassificationEntryEdit_view</editview>
+ <preview>SalesprojectClassificationEntryPreview_view</preview>
+ <entity>SalesprojectClassificationEntry_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>7cddda68-3dcb-4daf-84a4-1546298cabb6</name>
+ <view>SalesprojectClassificationEntryPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>80205380-7785-43a3-af7b-73ef8112ca38</name>
+ <view>SalesprojectClassificationEntryEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/SalesprojectCompetition/SalesprojectCompetition.aod b/neonContext/SalesprojectCompetition/SalesprojectCompetition.aod
index a4cc216e121585ad1a58c80464422d9dadb5bf4b..20698327ec099dd3dbda4b261c5ddfee79cc177b 100644
--- a/neonContext/SalesprojectCompetition/SalesprojectCompetition.aod
+++ b/neonContext/SalesprojectCompetition/SalesprojectCompetition.aod
@@ -1,23 +1,23 @@
-<?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>SalesprojectCompetition</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>SalesprojectCompetitionFilter_view</filterview>
- <editview>SalesprojectCompetitionEdit_view</editview>
- <preview>SalesprojectCompetitionPreview_view</preview>
- <entity>SalesprojectCompetition_entity</entity>
- <references>
- <neonViewReference>
- <name>a002c925-becb-4051-95bc-a38a4b01b65a</name>
- <view>SalesprojectCompetitionFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>df710f0b-ed2b-46d1-852d-47ada0b6b8f0</name>
- <view>SalesprojectCompetitionEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>6df65cb7-f8fc-4b6e-963d-df6dde6d523b</name>
- <view>SalesprojectCompetitionPreview_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>SalesprojectCompetition</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>SalesprojectCompetitionFilter_view</filterview>
+ <editview>SalesprojectCompetitionEdit_view</editview>
+ <preview>SalesprojectCompetitionPreview_view</preview>
+ <entity>SalesprojectCompetition_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>a002c925-becb-4051-95bc-a38a4b01b65a</name>
+ <view>SalesprojectCompetitionFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>df710f0b-ed2b-46d1-852d-47ada0b6b8f0</name>
+ <view>SalesprojectCompetitionEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6df65cb7-f8fc-4b6e-963d-df6dde6d523b</name>
+ <view>SalesprojectCompetitionPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/SalesprojectForecast/SalesprojectForecast.aod b/neonContext/SalesprojectForecast/SalesprojectForecast.aod
index b345c4c47e0503fb1655ecbd89b8b17f9e9cf27f..4a1b96a50fe65547544ef278b40fccd77d050f7f 100644
--- a/neonContext/SalesprojectForecast/SalesprojectForecast.aod
+++ b/neonContext/SalesprojectForecast/SalesprojectForecast.aod
@@ -1,23 +1,23 @@
-<?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>SalesprojectForecast</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>SalesprojectForecastFilter_view</filterview>
- <editview>SalesprojectForecastEdit_view</editview>
- <preview>SalesprojectForecastPreview_view</preview>
- <entity>SalesprojectForecast_entity</entity>
- <references>
- <neonViewReference>
- <name>20d80c15-97f0-490c-b845-b2b4f63c6a5d</name>
- <view>SalesprojectForecastFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>7cc72509-722b-4d4f-870c-08878129ceb9</name>
- <view>SalesprojectForecastEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>1fe6e10b-52b4-44a4-88d8-9784a967572c</name>
- <view>SalesprojectForecastPreview_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>SalesprojectForecast</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>SalesprojectForecastFilter_view</filterview>
+ <editview>SalesprojectForecastEdit_view</editview>
+ <preview>SalesprojectForecastPreview_view</preview>
+ <entity>SalesprojectForecast_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>20d80c15-97f0-490c-b845-b2b4f63c6a5d</name>
+ <view>SalesprojectForecastFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>7cc72509-722b-4d4f-870c-08878129ceb9</name>
+ <view>SalesprojectForecastEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>1fe6e10b-52b4-44a4-88d8-9784a967572c</name>
+ <view>SalesprojectForecastPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/SalesprojectMember/SalesprojectMember.aod b/neonContext/SalesprojectMember/SalesprojectMember.aod
index be5169e7862f9c01cb2a794a2eae9dd2d4b648f5..ade9ba64f87a933fe925695525117df577ab64ff 100644
--- a/neonContext/SalesprojectMember/SalesprojectMember.aod
+++ b/neonContext/SalesprojectMember/SalesprojectMember.aod
@@ -1,18 +1,18 @@
-<?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>SalesprojectMember</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>SalesprojectMemberFilter_view</filterview>
- <editview>SalesprojectMemberEdit_view</editview>
- <entity>SalesprojectMember_entity</entity>
- <references>
- <neonViewReference>
- <name>6b0b9d8f-6fe8-475b-a303-f1c4f2011d37</name>
- <view>SalesprojectMemberFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>ebef21a3-c0e1-4333-b769-eb967cb4099b</name>
- <view>SalesprojectMemberEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>SalesprojectMember</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>SalesprojectMemberFilter_view</filterview>
+ <editview>SalesprojectMemberEdit_view</editview>
+ <entity>SalesprojectMember_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>6b0b9d8f-6fe8-475b-a303-f1c4f2011d37</name>
+ <view>SalesprojectMemberFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ebef21a3-c0e1-4333-b769-eb967cb4099b</name>
+ <view>SalesprojectMemberEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/SalesprojectMilestone/SalesprojectMilestone.aod b/neonContext/SalesprojectMilestone/SalesprojectMilestone.aod
index 3626804e1c32ebcc9f4fbb25529c806c6937080f..d4ad5d6d3e6f841493e091ce12a4e19c506fd682 100644
--- a/neonContext/SalesprojectMilestone/SalesprojectMilestone.aod
+++ b/neonContext/SalesprojectMilestone/SalesprojectMilestone.aod
@@ -1,14 +1,14 @@
-<?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>SalesprojectMilestone</name>
- <description>Milestones of a salesproject</description>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>SalesprojectMilestoneChart_view</filterview>
- <entity>SalesprojectMilestone_entity</entity>
- <references>
- <neonViewReference>
- <name>54bee07a-f45d-458a-bfc6-56ba4992b63d</name>
- <view>SalesprojectMilestoneChart_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>SalesprojectMilestone</name>
+ <description>Milestones of a salesproject</description>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>SalesprojectMilestoneChart_view</filterview>
+ <entity>SalesprojectMilestone_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>54bee07a-f45d-458a-bfc6-56ba4992b63d</name>
+ <view>SalesprojectMilestoneChart_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/SalesprojectSource/SalesprojectSource.aod b/neonContext/SalesprojectSource/SalesprojectSource.aod
index 7b0288a7c958761aaef54c18434b1fa88ab560fa..85736ec596358f7e5fe53ab9807900275b169695 100644
--- a/neonContext/SalesprojectSource/SalesprojectSource.aod
+++ b/neonContext/SalesprojectSource/SalesprojectSource.aod
@@ -1,23 +1,23 @@
-<?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>SalesprojectSource</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>SalesprojectSourceFilter_view</filterview>
- <editview>SalesprojectSourceEdit_view</editview>
- <preview>SalesprojectSourcePreview_view</preview>
- <entity>SalesprojectSource_entity</entity>
- <references>
- <neonViewReference>
- <name>3e2369d1-ac9a-4c89-996a-2e9394dfd478</name>
- <view>SalesprojectSourceFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>56784b63-0558-433d-94cc-30170b64c9ca</name>
- <view>SalesprojectSourceEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>231302ed-b2a5-4ccd-bd08-e6a536efbc58</name>
- <view>SalesprojectSourcePreview_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>SalesprojectSource</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>SalesprojectSourceFilter_view</filterview>
+ <editview>SalesprojectSourceEdit_view</editview>
+ <preview>SalesprojectSourcePreview_view</preview>
+ <entity>SalesprojectSource_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>3e2369d1-ac9a-4c89-996a-2e9394dfd478</name>
+ <view>SalesprojectSourceFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>56784b63-0558-433d-94cc-30170b64c9ca</name>
+ <view>SalesprojectSourceEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>231302ed-b2a5-4ccd-bd08-e6a536efbc58</name>
+ <view>SalesprojectSourcePreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/SalutationDistinct/SalutationDistinct.aod b/neonContext/SalutationDistinct/SalutationDistinct.aod
index 0b5f0bef4315815c799aa5b1b7a79548545b8d1c..6bcaacd805af046981fb886dddc32e7bbdd816cc 100644
--- a/neonContext/SalutationDistinct/SalutationDistinct.aod
+++ b/neonContext/SalutationDistinct/SalutationDistinct.aod
@@ -1,6 +1,6 @@
-<?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>SalutationDistinct</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>SalutationDistinct_entity</entity>
-</neonContext>
+<?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>SalutationDistinct</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>SalutationDistinct_entity</entity>
+</neonContext>
diff --git a/neonContext/SalutationTitleDistinct/SalutationTitleDistinct.aod b/neonContext/SalutationTitleDistinct/SalutationTitleDistinct.aod
index 03e5b2f36e2a3c3f209bac534999fffbfc2f2393..24115b3561cec329155f28904199056473d91ad6 100644
--- a/neonContext/SalutationTitleDistinct/SalutationTitleDistinct.aod
+++ b/neonContext/SalutationTitleDistinct/SalutationTitleDistinct.aod
@@ -1,6 +1,6 @@
-<?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>SalutationTitleDistinct</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>SalutationTitleDistinct_entity</entity>
-</neonContext>
+<?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>SalutationTitleDistinct</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>SalutationTitleDistinct_entity</entity>
+</neonContext>
diff --git a/neonContext/Social/Social.aod b/neonContext/Social/Social.aod
index b62ce0e462f0f01f17063f3a8f7afa162c789cd3..f3f9bfb8af6def8df75df565f7058c95568e0093 100644
--- a/neonContext/Social/Social.aod
+++ b/neonContext/Social/Social.aod
@@ -1,19 +1,19 @@
-<?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>Social</name>
- <title>Social</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview></mainview>
- <filterview><null value></filterview>
- <entity>Social_entity</entity>
- <references>
- <neonViewReference>
- <name>fa40f298-c3ba-43e8-9045-3b2b2ec31670</name>
- <view>TwitterTimeline_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>8019c4bb-40e2-48c2-aeee-a9f9e9650dc8</name>
- <view>FacebookTimeline_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Social</name>
+ <title>Social</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview></mainview>
+ <filterview><null value></filterview>
+ <entity>Social_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>fa40f298-c3ba-43e8-9045-3b2b2ec31670</name>
+ <view>TwitterTimeline_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>8019c4bb-40e2-48c2-aeee-a9f9e9650dc8</name>
+ <view>FacebookTimeline_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Stock/Stock.aod b/neonContext/Stock/Stock.aod
index 0147733f37d1ccd4cb21fd8a8d791f72f111944a..9ba980018c88adc500e24c7e7ab367a8bf380dff 100644
--- a/neonContext/Stock/Stock.aod
+++ b/neonContext/Stock/Stock.aod
@@ -1,23 +1,23 @@
-<?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>Stock</name>
- <title>Stock</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>StockFilter_view</filterview>
- <editview>StockEdit_view</editview>
- <entity>Stock_entity</entity>
- <references>
- <neonViewReference>
- <name>cf5ed980-dc4f-40b2-9e85-cad631bd1c85</name>
- <view>StockFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>29d6a038-220f-411c-95ac-335e6779b1fa</name>
- <view>StockEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>e2028340-f80f-4b43-8f44-d88e5ea03f62</name>
- <view>StockCount_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Stock</name>
+ <title>Stock</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>StockFilter_view</filterview>
+ <editview>StockEdit_view</editview>
+ <entity>Stock_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>cf5ed980-dc4f-40b2-9e85-cad631bd1c85</name>
+ <view>StockFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>29d6a038-220f-411c-95ac-335e6779b1fa</name>
+ <view>StockEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e2028340-f80f-4b43-8f44-d88e5ea03f62</name>
+ <view>StockCount_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Task/Task.aod b/neonContext/Task/Task.aod
index 05ee5012657e5bd3dba9f633ccea3015addc4d58..73a85997d1948f608eec8fa6ca79a68729c4efce 100644
--- a/neonContext/Task/Task.aod
+++ b/neonContext/Task/Task.aod
@@ -1,34 +1,34 @@
-<?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>Task</name>
- <title>Task</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/neonContext/Task/documentation.adoc</documentation>
- <mainview>TaskMain_view</mainview>
- <filterview>TaskFilter_view</filterview>
- <editview>TaskEdit_view</editview>
- <preview>TaskPreview_view</preview>
- <entity>Task_entity</entity>
- <references>
- <neonViewReference>
- <name>5e6fdab4-8781-4e2d-af7a-755d834b631d</name>
- <view>TaskFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>7a4bcf0f-2861-4400-8fab-152c6a9ecb9b</name>
- <view>TaskPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>b9bd19b5-2a67-47a4-83cd-41ba30e81888</name>
- <view>TaskEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>83309ef0-d1c0-4f74-bb44-41fd8e054b4b</name>
- <view>TaskMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>b2d84509-c72b-497e-9422-e4efae2e6b68</name>
- <view>TaskMainPreview_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Task</name>
+ <title>Task</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/neonContext/Task/documentation.adoc</documentation>
+ <mainview>TaskMain_view</mainview>
+ <filterview>TaskFilter_view</filterview>
+ <editview>TaskEdit_view</editview>
+ <preview>TaskPreview_view</preview>
+ <entity>Task_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>5e6fdab4-8781-4e2d-af7a-755d834b631d</name>
+ <view>TaskFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>7a4bcf0f-2861-4400-8fab-152c6a9ecb9b</name>
+ <view>TaskPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>b9bd19b5-2a67-47a4-83cd-41ba30e81888</name>
+ <view>TaskEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>83309ef0-d1c0-4f74-bb44-41fd8e054b4b</name>
+ <view>TaskMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>b2d84509-c72b-497e-9422-e4efae2e6b68</name>
+ <view>TaskMainPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/TaskLink/TaskLink.aod b/neonContext/TaskLink/TaskLink.aod
index 4ac1b80b124d0f35484bae8ee83160581f5ca6dd..089aaff2351e7fc1d7cf662149f04187d0901170 100644
--- a/neonContext/TaskLink/TaskLink.aod
+++ b/neonContext/TaskLink/TaskLink.aod
@@ -1,24 +1,24 @@
-<?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>TaskLink</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>TaskLink_entity</entity>
- <references>
- <neonViewReference>
- <name>10ad5fab-a0c5-4822-af9b-d30cf877dfb5</name>
- <view>TaskLinkPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>a969be52-00fb-4b0e-96e9-4c8ffb8f5ac0</name>
- <view>TaskLinkFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>cd180425-6562-49d9-99be-f3a47a88f427</name>
- <view>TaskLinkMultiEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>8799454a-92af-4604-8e6c-9323f745a258</name>
- <view>TaskLinkPreviewList_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>TaskLink</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>TaskLink_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>10ad5fab-a0c5-4822-af9b-d30cf877dfb5</name>
+ <view>TaskLinkPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>a969be52-00fb-4b0e-96e9-4c8ffb8f5ac0</name>
+ <view>TaskLinkFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>cd180425-6562-49d9-99be-f3a47a88f427</name>
+ <view>TaskLinkMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>8799454a-92af-4604-8e6c-9323f745a258</name>
+ <view>TaskLinkPreviewList_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Timetracking/Timetracking.aod b/neonContext/Timetracking/Timetracking.aod
index 1058d0737570e80a2947f01d726b9d387cf98cdf..1e5a05053df48bf466bd9209177543af4a709385 100644
--- a/neonContext/Timetracking/Timetracking.aod
+++ b/neonContext/Timetracking/Timetracking.aod
@@ -1,23 +1,23 @@
-<?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>Timetracking</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>TimetrackingFilter_view</filterview>
- <editview>TimetrackingEdit_view</editview>
- <preview>TimetrackingPreview_view</preview>
- <entity>Timetracking_entity</entity>
- <references>
- <neonViewReference>
- <name>46e0d5e2-479f-43f3-8245-7e0c668a2b3e</name>
- <view>TimetrackingFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>4ef4a364-e7e1-47d3-a3fa-604d9239bb03</name>
- <view>TimetrackingEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>4ee9a88d-98a4-4fb5-b1ab-0fffa03c9344</name>
- <view>TimetrackingPreview_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Timetracking</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>TimetrackingFilter_view</filterview>
+ <editview>TimetrackingEdit_view</editview>
+ <preview>TimetrackingPreview_view</preview>
+ <entity>Timetracking_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>46e0d5e2-479f-43f3-8245-7e0c668a2b3e</name>
+ <view>TimetrackingFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>4ef4a364-e7e1-47d3-a3fa-604d9239bb03</name>
+ <view>TimetrackingEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>4ee9a88d-98a4-4fb5-b1ab-0fffa03c9344</name>
+ <view>TimetrackingPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Turnover/Turnover.aod b/neonContext/Turnover/Turnover.aod
index d6990c9e72c4722904a69805fc427fae011d4cf6..7a814c64dee57940c0d197731e0966af3496f44e 100644
--- a/neonContext/Turnover/Turnover.aod
+++ b/neonContext/Turnover/Turnover.aod
@@ -1,14 +1,14 @@
-<?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>Turnover</name>
- <title>Turnover</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>TurnoverChart_view</filterview>
- <entity>Turnover_entity</entity>
- <references>
- <neonViewReference>
- <name>41a2a339-d41d-47e7-8416-4bd788a269af</name>
- <view>TurnoverChart_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>Turnover</name>
+ <title>Turnover</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>TurnoverChart_view</filterview>
+ <entity>Turnover_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>41a2a339-d41d-47e7-8416-4bd788a269af</name>
+ <view>TurnoverChart_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/TurnoverTree/TurnoverTree.aod b/neonContext/TurnoverTree/TurnoverTree.aod
new file mode 100644
index 0000000000000000000000000000000000000000..767e00d8da61a3b203763da6fd71cff72bc26537
--- /dev/null
+++ b/neonContext/TurnoverTree/TurnoverTree.aod
@@ -0,0 +1,13 @@
+<?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>TurnoverTree</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>TurnoverTree_view</filterview>
+ <entity>TurnoverTree_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>b8135e50-da8e-424c-9073-e721b4822736</name>
+ <view>TurnoverTree_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonDashboard/Home/Home.aod b/neonDashboard/Home/Home.aod
index 5957160eb8721a09f7088b19d8a6be6c76f5ff8b..dea5eed6fa4c3d2da13523f069f87c6adb7d8f1b 100644
--- a/neonDashboard/Home/Home.aod
+++ b/neonDashboard/Home/Home.aod
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonDashboard 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/neonDashboard/1.1.0">
- <name>Home</name>
- <title>My Dashboard</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:HOME</icon>
- <dashboardType>PRIVATE</dashboardType>
- <editRoles />
- <defaultDashlets>
- <neonDashlet>
- <name>Dashlet2</name>
- <viewName>PersonFilter_view</viewName>
- <configName>AllContactsDashlet</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="0" />
- <yPos v="0" />
- <colspan v="1" />
- <rowspan v="6" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>Dashlet3</name>
- <viewName>TwitterTimeline_view</viewName>
- <configName>AditoTwitterDashlet</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="2" />
- <yPos v="0" />
- <colspan v="1" />
- <rowspan v="10" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>Dashlet</name>
- <viewName>ActivityFilter_view</viewName>
- <configName>InnateActivitiesDashlet</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="1" />
- <yPos v="0" />
- <colspan v="1" />
- <rowspan v="6" />
- </uiConfiguration>
- </neonDashlet>
- </defaultDashlets>
-</neonDashboard>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonDashboard 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/neonDashboard/1.1.0">
+ <name>Home</name>
+ <title>My Dashboard</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:HOME</icon>
+ <dashboardType>PRIVATE</dashboardType>
+ <editRoles />
+ <defaultDashlets>
+ <neonDashlet>
+ <name>Dashlet2</name>
+ <viewName>PersonFilter_view</viewName>
+ <configName>AllContactsDashlet</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="0" />
+ <yPos v="0" />
+ <colspan v="1" />
+ <rowspan v="6" />
+ </uiConfiguration>
+ </neonDashlet>
+ <neonDashlet>
+ <name>Dashlet3</name>
+ <viewName>TwitterTimeline_view</viewName>
+ <configName>AditoTwitterDashlet</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="2" />
+ <yPos v="0" />
+ <colspan v="1" />
+ <rowspan v="10" />
+ </uiConfiguration>
+ </neonDashlet>
+ <neonDashlet>
+ <name>Dashlet</name>
+ <viewName>ActivityFilter_view</viewName>
+ <configName>InnateActivitiesDashlet</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="1" />
+ <yPos v="0" />
+ <colspan v="1" />
+ <rowspan v="6" />
+ </uiConfiguration>
+ </neonDashlet>
+ </defaultDashlets>
+</neonDashboard>
diff --git a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
index d78d8f15560ea90feedb14ff60cd19f30c526c75..f6813451bfa56d60bcbddaed22287a8268901cb9 100644
--- a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
+++ b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonDashboard 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/neonDashboard/1.1.0">
- <name>Vertriebsdashboard</name>
- <title>Salesdashboard</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:CHART_GRID</icon>
- <dashboardType>PUBLIC</dashboardType>
- <editRoles>
- <element>INTERNAL_ADMINISTRATOR</element>
- <element>INTERNAL_DASHBOARDSTOREADMIN</element>
- </editRoles>
- <defaultDashlets>
- <neonDashlet>
- <name>Dashlet</name>
- <viewName>SalesprojectScoreCard_view</viewName>
- <configName>KeyFigures</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="1" />
- <yPos v="0" />
- <colspan v="1" />
- <rowspan v="5" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>Dashlet4</name>
- <viewName>OrganisationFilter_view</viewName>
- <configName>AllOrgsDashlet</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="2" />
- <yPos v="0" />
- <colspan v="1" />
- <rowspan v="5" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>Dashlet5</name>
- <viewName>TurnoverChart_view</viewName>
- <configName>TurnoverDashlet</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="0" />
- <yPos v="0" />
- <colspan v="1" />
- <rowspan v="5" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>Dashlet2</name>
- <viewName>SalesprojectFilter_view</viewName>
- <configName>OpenSalesprojectsDashlet</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="1" />
- <yPos v="5" />
- <colspan v="2" />
- <rowspan v="5" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>Dashlet3</name>
- <viewName>SalesprojectPhases_view</viewName>
- <configName>Salesproject phases</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="0" />
- <yPos v="5" />
- <colspan v="1" />
- <rowspan v="5" />
- </uiConfiguration>
- </neonDashlet>
- </defaultDashlets>
-</neonDashboard>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonDashboard 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/neonDashboard/1.1.0">
+ <name>Vertriebsdashboard</name>
+ <title>Salesdashboard</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:CHART_GRID</icon>
+ <dashboardType>PUBLIC</dashboardType>
+ <editRoles>
+ <element>INTERNAL_ADMINISTRATOR</element>
+ <element>INTERNAL_DASHBOARDSTOREADMIN</element>
+ </editRoles>
+ <defaultDashlets>
+ <neonDashlet>
+ <name>Dashlet</name>
+ <viewName>SalesprojectScoreCard_view</viewName>
+ <configName>KeyFigures</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="1" />
+ <yPos v="0" />
+ <colspan v="1" />
+ <rowspan v="5" />
+ </uiConfiguration>
+ </neonDashlet>
+ <neonDashlet>
+ <name>Dashlet4</name>
+ <viewName>OrganisationFilter_view</viewName>
+ <configName>AllOrgsDashlet</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="2" />
+ <yPos v="0" />
+ <colspan v="1" />
+ <rowspan v="5" />
+ </uiConfiguration>
+ </neonDashlet>
+ <neonDashlet>
+ <name>Dashlet5</name>
+ <viewName>TurnoverChart_view</viewName>
+ <configName>TurnoverDashlet</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="0" />
+ <yPos v="0" />
+ <colspan v="1" />
+ <rowspan v="5" />
+ </uiConfiguration>
+ </neonDashlet>
+ <neonDashlet>
+ <name>Dashlet2</name>
+ <viewName>SalesprojectFilter_view</viewName>
+ <configName>OpenSalesprojectsDashlet</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="1" />
+ <yPos v="5" />
+ <colspan v="2" />
+ <rowspan v="5" />
+ </uiConfiguration>
+ </neonDashlet>
+ <neonDashlet>
+ <name>Dashlet3</name>
+ <viewName>SalesprojectPhases_view</viewName>
+ <configName>Salesproject phases</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="0" />
+ <yPos v="5" />
+ <colspan v="1" />
+ <rowspan v="5" />
+ </uiConfiguration>
+ </neonDashlet>
+ </defaultDashlets>
+</neonDashboard>
diff --git a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
index ed1ab18e2ef1501fdebc7e68273456f98022afc8..bcb6c78792745869f1ccdabbf78a8eec64ee1010 100644
--- a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
+++ b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
@@ -1,31 +1,31 @@
-<?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>360DegreeFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <groupLayout>
- <name>layout</name>
- </groupLayout>
- </layout>
- <children>
- <treeViewTemplate>
- <name>Treetable</name>
- <favoriteActionGroup2>newModule</favoriteActionGroup2>
- <titleField>TITLE</titleField>
- <descriptionField>DATE</descriptionField>
- <iconField>ICON</iconField>
- <defaultGroupFields>
- <element>CONTEXT_NAME</element>
- </defaultGroupFields>
- <entityField>#ENTITY</entityField>
- </treeViewTemplate>
- <timelineViewTemplate>
- <name>Timeline</name>
- <dateField>DATE</dateField>
- <titleField>TITLE</titleField>
- <descriptionField>CONTEXT_NAME</descriptionField>
- <entityField>#ENTITY</entityField>
- </timelineViewTemplate>
- </children>
-</neonView>
+<?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>360DegreeFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <treeViewTemplate>
+ <name>Treetable</name>
+ <favoriteActionGroup2>newModule</favoriteActionGroup2>
+ <titleField>TITLE</titleField>
+ <descriptionField>DATE</descriptionField>
+ <iconField>ICON</iconField>
+ <defaultGroupFields>
+ <element>CONTEXT_NAME</element>
+ </defaultGroupFields>
+ <entityField>#ENTITY</entityField>
+ </treeViewTemplate>
+ <timelineViewTemplate>
+ <name>Timeline</name>
+ <dateField>DATE</dateField>
+ <titleField>TITLE</titleField>
+ <descriptionField>CONTEXT_NAME</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </timelineViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ActivityDetail_view/ActivityDetail_view.aod b/neonView/ActivityDetail_view/ActivityDetail_view.aod
index 7bb44f0e160cc3ab64d04b20a51bb0c93b34f698..97c355590c2f00a64a59848650f9236f2f870af3 100644
--- a/neonView/ActivityDetail_view/ActivityDetail_view.aod
+++ b/neonView/ActivityDetail_view/ActivityDetail_view.aod
@@ -1,27 +1,27 @@
-<?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>ActivityDetail_view</name>
- <title>Description</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>OfferInfo</name>
- <editMode v="false" />
- <showDrawer v="true" />
- <drawerCaption>Detail</drawerCaption>
- <hideLabels v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>c7e75393-4745-478b-9f89-878b9a19b722</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>ActivityDetail_view</name>
+ <title>Description</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>OfferInfo</name>
+ <editMode v="false" />
+ <showDrawer v="true" />
+ <drawerCaption>Detail</drawerCaption>
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>c7e75393-4745-478b-9f89-878b9a19b722</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod b/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
index a4f49f54de50cd9dd29394ad32d154a737d44a16..f8b211437c6da897cbfadc24a02e0075c6ce2518 100644
--- a/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
+++ b/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
@@ -1,28 +1,28 @@
-<?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>ActivityLinkFilter_view</name>
- <title>Connections</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Objects</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>2cf427f2-2dcd-4e4e-9f5c-82f103f9cf86</name>
- <entityField>OBJECT_TYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>27bc9661-7f28-44d6-bda5-1353d8734b7a</name>
- <entityField>OBJECT_ROWID</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>ActivityLinkFilter_view</name>
+ <title>Connections</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Objects</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>2cf427f2-2dcd-4e4e-9f5c-82f103f9cf86</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>27bc9661-7f28-44d6-bda5-1353d8734b7a</name>
+ <entityField>OBJECT_ROWID</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod b/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
index 8ccfba24c2ca0ff9ae72ed5b2d486f5b8215944c..5b2f0728fd1f77371ab52de2c342dab9716787ec 100644
--- a/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
+++ b/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
@@ -1,27 +1,27 @@
-<?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>ActivityLinkMultiEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <genericMultipleViewTemplate>
- <name>MultipleEdit</name>
- <entityField>#ENTITY</entityField>
- <title></title>
- <columns>
- <neonTableColumn>
- <name>b7f68733-33f2-4ed7-a222-4298491b5cb0</name>
- <entityField>OBJECT_TYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>3d98edbb-44aa-4d85-97fe-9260081292c3</name>
- <entityField>OBJECT_ROWID</entityField>
- </neonTableColumn>
- </columns>
- </genericMultipleViewTemplate>
- </children>
-</neonView>
+<?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>ActivityLinkMultiEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>MultipleEdit</name>
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ <columns>
+ <neonTableColumn>
+ <name>b7f68733-33f2-4ed7-a222-4298491b5cb0</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>3d98edbb-44aa-4d85-97fe-9260081292c3</name>
+ <entityField>OBJECT_ROWID</entityField>
+ </neonTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod b/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod
index b384acfdd505a2023c7aea5cd671a3aa72bd5ca3..d5a7e6b8d09cd8f080766f67c960fd29e5fa999b 100644
--- a/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod
+++ b/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod
@@ -1,22 +1,22 @@
-<?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>ActivityLinkPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- </headerFooterLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Links</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>3b3315d6-0872-447f-ac8a-0653a92bbf2d</name>
- <entityField>OBJECT_ROWID</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>ActivityLinkPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Links</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>3b3315d6-0872-447f-ac8a-0653a92bbf2d</name>
+ <entityField>OBJECT_ROWID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index 5553ffc4d225860fab8196668e128b6d4368661f..94937fc368f2ed154201b4463f1c4c6fdd2156cd 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -1,54 +1,54 @@
-<?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>ActivityPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>ICON</iconField>
- <titleField>SUBJECT</titleField>
- <descriptionField>ENTRYDATE</descriptionField>
- <favoriteAction1>newActivity</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>84dac619-4438-492c-a6b4-61b285dc80fe</name>
- <entityField>DIRECTION</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ad41c89c-2f4a-414c-90c8-d5a5df24aeaa</name>
- <entityField>CATEGORY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>b0673d1d-af3d-4daa-b6ec-511f18367e7f</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c4569e50-223e-4b99-8253-e8fa72ef45a0</name>
- <entityField>RESPONSIBLE</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>4c365613-81c5-4518-8953-751b5ae35cc2</name>
- <entityField>Links</entityField>
- <view>ActivityLinkPreviewList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>43167618-e4dc-429b-a264-3ea95bd647f9</name>
- <entityField>MainDocuments</entityField>
- <view>DocumentList_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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>ActivityPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Header</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>ICON</iconField>
+ <titleField>SUBJECT</titleField>
+ <descriptionField>ENTRYDATE</descriptionField>
+ <favoriteAction1>newActivity</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>84dac619-4438-492c-a6b4-61b285dc80fe</name>
+ <entityField>DIRECTION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ad41c89c-2f4a-414c-90c8-d5a5df24aeaa</name>
+ <entityField>CATEGORY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>b0673d1d-af3d-4daa-b6ec-511f18367e7f</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c4569e50-223e-4b99-8253-e8fa72ef45a0</name>
+ <entityField>RESPONSIBLE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>4c365613-81c5-4518-8953-751b5ae35cc2</name>
+ <entityField>Links</entityField>
+ <view>ActivityLinkPreviewList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>43167618-e4dc-429b-a264-3ea95bd647f9</name>
+ <entityField>MainDocuments</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index 63782018ac9680289975c8c3d0ebe6733db30c65..47567501426d89c5cc26da153922338e6df1ea2e 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -18,6 +18,10 @@
<name>49e14587-34f7-4f09-916c-9eb4aaf55509</name>
<entityField>ADDR_TYPE</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>dfaa01a1-0b11-4f92-aa18-89f12ebb2db5</name>
+ <entityField>COUNTRY</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>4e5e6a4f-f43e-4861-a912-fb05e576f960</name>
<entityField>ADDRESS</entityField>
@@ -34,10 +38,6 @@
<name>12727b21-0359-4430-a9c2-54eb48e2e864</name>
<entityField>CITY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>dfaa01a1-0b11-4f92-aa18-89f12ebb2db5</name>
- <entityField>COUNTRY</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>aafc58cf-7dbb-42cb-b04c-d0869e58d09a</name>
<entityField>STATE</entityField>
diff --git a/neonView/AnyContactLookup_view/AnyContactLookup_view.aod b/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
index 2854715d2de3512b0f292649ef7c8d0a4211c2e5..8dbce3dece648b6c5c35b1d3119cb15802a5a4cd 100644
--- a/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
+++ b/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
@@ -1,44 +1,44 @@
-<?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>AnyContactLookup_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Relations</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>5a0d38bb-bfa5-4abc-86e7-fac65804bb5c</name>
- <entityField>IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ca59a64a-adce-49c3-93ad-2978c81809f8</name>
- <entityField>ORGANISATION_NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4b05d812-aa6c-49a5-afa3-ea5cd99560ef</name>
- <entityField>PERSON_FULL_NAME</entityField>
- <width v="75" />
- <expandRatio v="100" />
- </neonTableColumn>
- <neonTableColumn>
- <name>2ee5838b-e0ff-4f21-bf57-e41d0766fdec</name>
- <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>16174be3-c8fb-46a8-8f73-f6b8d8fad963</name>
- <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>c7d50d7a-11da-491c-a4be-7d5f75d335f0</name>
- <entityField>ADDRESS_ID</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>AnyContactLookup_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Relations</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>5a0d38bb-bfa5-4abc-86e7-fac65804bb5c</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ca59a64a-adce-49c3-93ad-2978c81809f8</name>
+ <entityField>ORGANISATION_NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4b05d812-aa6c-49a5-afa3-ea5cd99560ef</name>
+ <entityField>PERSON_FULL_NAME</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2ee5838b-e0ff-4f21-bf57-e41d0766fdec</name>
+ <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>16174be3-c8fb-46a8-8f73-f6b8d8fad963</name>
+ <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c7d50d7a-11da-491c-a4be-7d5f75d335f0</name>
+ <entityField>ADDRESS_ID</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod b/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod
index 7b76743657467674c1aae4734ab8633ad26ffd6c..24c3d28150657dfd017be4a1d23b3f62f1f47959 100644
--- a/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod
+++ b/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod
@@ -1,19 +1,19 @@
-<?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>AnyObjectRelationTree_view0</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <treeViewTemplate>
- <name>AnyObjectRelations</name>
- <parentField>AnyObjectType</parentField>
- <titleField>AnyObjectRowid</titleField>
- <entityField>#ENTITY</entityField>
- <title></title>
- </treeViewTemplate>
- </children>
-</neonView>
+<?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>AnyObjectRelationTree_view0</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <treeViewTemplate>
+ <name>AnyObjectRelations</name>
+ <parentField>AnyObjectType</parentField>
+ <titleField>AnyObjectRowid</titleField>
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ </treeViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
index 9e8660757e4051effc152de0161cce4d41d56d0f..6007ef7669965102d211ec690e99271dc8e85965 100644
--- a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
+++ b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
@@ -1,28 +1,28 @@
-<?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>AppointmentLinkFilter_view</name>
- <title>relations</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericMultipleViewTemplate>
- <name>MultipleEdit</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>539c9844-8f4b-49e8-8974-30bdf127f47c</name>
- <entityField>OBJECTTYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>eba00f45-cd7e-43c0-9dea-559293ca7d49</name>
- <entityField>OBJECTID</entityField>
- </neonTableColumn>
- </columns>
- </genericMultipleViewTemplate>
- </children>
-</neonView>
+<?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>AppointmentLinkFilter_view</name>
+ <title>relations</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>MultipleEdit</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>539c9844-8f4b-49e8-8974-30bdf127f47c</name>
+ <entityField>OBJECTTYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>eba00f45-cd7e-43c0-9dea-559293ca7d49</name>
+ <entityField>OBJECTID</entityField>
+ </neonTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index ff89173c01ea28f661e4216e92d58d74a86808a1..be8a19a301f6f1532c42af136b631774c4345117 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -27,10 +27,5 @@
<favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
</appointmentPreviewViewTemplate>
- <neonViewReference>
- <name>be0befe0-4b29-4c23-924a-0167240d2b54</name>
- <entityField>AppointmentLinks</entityField>
- <view>AppointmentLinkFilter_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/neonView/AttributeEdit_view/AttributeEdit_view.aod b/neonView/AttributeEdit_view/AttributeEdit_view.aod
index b26276f75c5b97d4b48ed3588effbb48440872da..f78afae6d06272d3077a637ba3bd057ab9a1b512 100644
--- a/neonView/AttributeEdit_view/AttributeEdit_view.aod
+++ b/neonView/AttributeEdit_view/AttributeEdit_view.aod
@@ -2,6 +2,7 @@
<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>AttributeEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/AttributeFilter_view/AttributeFilter_view.aod b/neonView/AttributeFilter_view/AttributeFilter_view.aod
index 3a1c298e1cff4737c6a2d8acf4415c7944f1c33f..79fc5402108a04f36332e5e5dbceb2e699619cb5 100644
--- a/neonView/AttributeFilter_view/AttributeFilter_view.aod
+++ b/neonView/AttributeFilter_view/AttributeFilter_view.aod
@@ -54,7 +54,7 @@
</neonTableColumn>
<neonTableColumn>
<name>cc88ea53-2673-4c6e-ac2e-6766d2698453</name>
- <entityField>ATTRIBUTE_ACTIVE</entityField>
+ <entityField>USAGELIST</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
diff --git a/neonView/AttributeMain_view/AttributeMain_view.aod b/neonView/AttributeMain_view/AttributeMain_view.aod
index eb7ee8159d2847212ac97b04124f182bc24eb5d4..8e3efc3dcc725ba52bd5a16c38c49cc5f2d2f13c 100644
--- a/neonView/AttributeMain_view/AttributeMain_view.aod
+++ b/neonView/AttributeMain_view/AttributeMain_view.aod
@@ -1,28 +1,28 @@
-<?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>AttributeMain_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <masterSlaveLayout>
- <name>layout</name>
- <master>b8e5b606-4fbb-4a74-b7c4-ac612a9797f2</master>
- </masterSlaveLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>b8e5b606-4fbb-4a74-b7c4-ac612a9797f2</name>
- <entityField>#ENTITY</entityField>
- <view>AttributePreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>981059c6-2f57-4c6b-86bb-45e5a0a8f138</name>
- <entityField>AttributeChildren</entityField>
- <view>AttributeFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>5dee1c0b-c670-4eb9-bd95-6f6474709aa2</name>
- <entityField>AttributeUsages</entityField>
- <view>AttributeUsageFilter_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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>AttributeMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>b8e5b606-4fbb-4a74-b7c4-ac612a9797f2</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>b8e5b606-4fbb-4a74-b7c4-ac612a9797f2</name>
+ <entityField>#ENTITY</entityField>
+ <view>AttributePreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>981059c6-2f57-4c6b-86bb-45e5a0a8f138</name>
+ <entityField>AttributeChildren</entityField>
+ <view>AttributeFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>5dee1c0b-c670-4eb9-bd95-6f6474709aa2</name>
+ <entityField>AttributeUsages</entityField>
+ <view>AttributeUsageFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/AttributePreview_view/AttributePreview_view.aod b/neonView/AttributePreview_view/AttributePreview_view.aod
index 812510e36bcf15293daa63d6d34912cedb7428f5..30160531d5866274c009a4c3484e169b46909ae4 100644
--- a/neonView/AttributePreview_view/AttributePreview_view.aod
+++ b/neonView/AttributePreview_view/AttributePreview_view.aod
@@ -11,6 +11,7 @@
<children>
<cardViewTemplate>
<name>Head</name>
+ <iconField>ICON</iconField>
<titleField>FULL_ATTRIBUTE_NAME</titleField>
<subtitleField>ATTRIBUTE_TYPE</subtitleField>
<entityField>#ENTITY</entityField>
diff --git a/neonView/AttributeRelationMultiEdit_view/AttributeRelationMultiEdit_view.aod b/neonView/AttributeRelationMultiEdit_view/AttributeRelationMultiEdit_view.aod
index b3f7e06aafeef4f2eac6dc03a9d1c3b864eb7836..8f7b33981ff589b147054db2dd34297b00e2fd9e 100644
--- a/neonView/AttributeRelationMultiEdit_view/AttributeRelationMultiEdit_view.aod
+++ b/neonView/AttributeRelationMultiEdit_view/AttributeRelationMultiEdit_view.aod
@@ -3,9 +3,9 @@
<name>AttributeRelationMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <noneLayout>
<name>layout</name>
- </boxLayout>
+ </noneLayout>
</layout>
<children>
<genericMultipleViewTemplate>
diff --git a/neonView/AttributeTree_view/AttributeTree_view.aod b/neonView/AttributeTree_view/AttributeTree_view.aod
index ecc1b210da04e548cb805245ed07510f1476da7e..cfb114ace2b0093fc55048a869412d7dca7610e2 100644
--- a/neonView/AttributeTree_view/AttributeTree_view.aod
+++ b/neonView/AttributeTree_view/AttributeTree_view.aod
@@ -1,19 +1,19 @@
-<?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>AttributeTree_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <treeViewTemplate>
- <name>Attributes</name>
- <parentField>ATTRIBUTE_PARENT_ID</parentField>
- <titleField>ATTRIBUTE_NAME</titleField>
- <descriptionField>ATTRIBUTE_TYPE</descriptionField>
- <entityField>#ENTITY</entityField>
- </treeViewTemplate>
- </children>
-</neonView>
+<?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>AttributeTree_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <treeViewTemplate>
+ <name>Attributes</name>
+ <parentField>ATTRIBUTE_PARENT_ID</parentField>
+ <titleField>ATTRIBUTE_NAME</titleField>
+ <descriptionField>ATTRIBUTE_TYPE</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </treeViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod b/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod
index be89cedfa70b52fba0ae98df1cd41f9ee8419383..71ee6f4bdd38c588c182eb0d46cda6a6765062bf 100644
--- a/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod
+++ b/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod
@@ -1,32 +1,32 @@
-<?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>AttributeUsageFilter_view</name>
- <description>View for listing all contexts where a attribute can be used in the attribute entity</description>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Usages</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>ba8d5468-4e59-4ab8-8174-afcca1ae0d9e</name>
- <entityField>OBJECT_TYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>22924cb1-25df-4c5c-92ec-2e51cb5b330b</name>
- <entityField>MIN_COUNT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ee879f6d-dc3a-4e85-9711-e470c0eb9cc4</name>
- <entityField>MAX_COUNT</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>AttributeUsageFilter_view</name>
+ <description>View for listing all contexts where a attribute can be used in the attribute entity</description>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Usages</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>ba8d5468-4e59-4ab8-8174-afcca1ae0d9e</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>22924cb1-25df-4c5c-92ec-2e51cb5b330b</name>
+ <entityField>MIN_COUNT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ee879f6d-dc3a-4e85-9711-e470c0eb9cc4</name>
+ <entityField>MAX_COUNT</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod b/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod
index ce7b20e704ad302fe485ba0d951bb285e8e9f3bd..d32c9d8afbbdbe9a856502e560363b68392735a9 100644
--- a/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod
+++ b/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod
@@ -3,9 +3,9 @@
<name>AttributeUsageMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <noneLayout>
<name>layout</name>
- </boxLayout>
+ </noneLayout>
</layout>
<children>
<genericMultipleViewTemplate>
diff --git a/neonView/CampaignCharts_view/CampaignCharts_view.aod b/neonView/CampaignCharts_view/CampaignCharts_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..bb0f266e21de5d8c773a8e3c3f06a91131accb37
--- /dev/null
+++ b/neonView/CampaignCharts_view/CampaignCharts_view.aod
@@ -0,0 +1,23 @@
+<?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>CampaignCharts_view</name>
+ <title>Overview</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>e96b6827-e47e-4d85-a1fd-b1b52f36fe31</name>
+ <entityField>CampaignCostsChart</entityField>
+ <view>CampaignCostChart_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e6d6c775-3d85-4a59-8df0-d57e7174ed90</name>
+ <entityField>CampaignParticipantsChart</entityField>
+ <view>CampaignParticipantChart_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/CampaignCostChart_view/CampaignCostChart_view.aod b/neonView/CampaignCostChart_view/CampaignCostChart_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..70c5e7f5cbc9d4a8de285a96be5014a8cd3f09fb
--- /dev/null
+++ b/neonView/CampaignCostChart_view/CampaignCostChart_view.aod
@@ -0,0 +1,21 @@
+<?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>CampaignCostChart_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <singleDataChartViewTemplate>
+ <name>SingleDataChart</name>
+ <chartTitle>Cost</chartTitle>
+ <chartType>DONUT</chartType>
+ <xAxis>X</xAxis>
+ <yAxis>Y</yAxis>
+ <parentField>PARENT</parentField>
+ <entityField>#ENTITY</entityField>
+ </singleDataChartViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CampaignEdit_view/CampaignEdit_view.aod b/neonView/CampaignEdit_view/CampaignEdit_view.aod
index 5635c65c2e8c9bcfa2347478f9092d682acc849e..29d30dd1c512b42a1888a84f9093d38fcbb729f6 100644
--- a/neonView/CampaignEdit_view/CampaignEdit_view.aod
+++ b/neonView/CampaignEdit_view/CampaignEdit_view.aod
@@ -37,5 +37,10 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>58b76841-24df-4fce-a05b-580712e8ecdc</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationMultiEdit_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/CampaignMain_view/CampaignMain_view.aod b/neonView/CampaignMain_view/CampaignMain_view.aod
index e35b2793103a62830da3077fb2619a2db03d079d..c9465927c542a66e2809f13a711cab9417d81905 100644
--- a/neonView/CampaignMain_view/CampaignMain_view.aod
+++ b/neonView/CampaignMain_view/CampaignMain_view.aod
@@ -15,6 +15,11 @@
<entityField>#ENTITY</entityField>
<view>CampaignPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>400f5a85-2691-47f6-9cc0-e7635828c5a5</name>
+ <entityField>#ENTITY</entityField>
+ <view>CampaignCharts_view</view>
+ </neonViewReference>
<neonViewReference>
<name>ad66a5a6-65fb-45d5-bf62-45661fc16e30</name>
<entityField>CampaignSteps</entityField>
@@ -30,5 +35,20 @@
<entityField>#ENTITY</entityField>
<view>CampaignCost_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>90d3d016-63e6-4e8a-98ee-30033bef49fc</name>
+ <entityField>Activities</entityField>
+ <view>ActivityFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e28e5598-9366-4f5a-be8f-70dd3cc0399a</name>
+ <entityField>Tasks</entityField>
+ <view>TaskFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c6237b30-d638-43e3-93c5-fc3abbb87443</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod b/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..eb58fcc3ea60134c733adedc6abc8955a1fa6d97
--- /dev/null
+++ b/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod
@@ -0,0 +1,21 @@
+<?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>CampaignParticipantChart_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <multiDataChartViewTemplate>
+ <name>MultiDataChart</name>
+ <chartTitle>Participants</chartTitle>
+ <chartType>BAR</chartType>
+ <xAxis>X</xAxis>
+ <yAxis>Y</yAxis>
+ <categoryField>CATEGORY</categoryField>
+ <entityField>#ENTITY</entityField>
+ </multiDataChartViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
index cb62a6a056152b5bd834a2fad1f1451cd0c85b1c..47076d4fcbfaa6d6a4fc86fd32a52daa75f76456 100644
--- a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
+++ b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
@@ -4,28 +4,31 @@
<title></title>
<description></description>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="false" />
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
- <tableViewTemplate>
- <name>ParticipantsTable</name>
+ <treeTableViewTemplate>
+ <name>ParticipantsTreeTable</name>
+ <parentField>CAMPAIGNSTEP_ID</parentField>
<favoriteActionGroup1>FilterViewActionGroup</favoriteActionGroup1>
- <favoriteActionGroup2></favoriteActionGroup2>
+ <defaultGroupFields>
+ <element>CAMPAIGNSTEP_ID</element>
+ </defaultGroupFields>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>85558e09-e1f0-4430-b779-f807f5763808</name>
+ <name>8bfe5a3d-e0c2-4a34-b510-984960c6de6f</name>
<entityField>CONTACT_ID</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>fc7ef954-ec19-43cf-bc0c-908760f20144</name>
+ <name>feeea168-1cf9-4402-86ad-ede7d511750f</name>
<entityField>CAMPAIGNSTEP_ID</entityField>
</neonTableColumn>
</columns>
- </tableViewTemplate>
+ </treeTableViewTemplate>
</children>
</neonView>
diff --git a/neonView/CampaignPreview_view/CampaignPreview_view.aod b/neonView/CampaignPreview_view/CampaignPreview_view.aod
index a1d6b8859c18d6f830605335621dc7a623376ad4..807406980b72d68120ef87044ea2b1f81af80bfe 100644
--- a/neonView/CampaignPreview_view/CampaignPreview_view.aod
+++ b/neonView/CampaignPreview_view/CampaignPreview_view.aod
@@ -16,12 +16,15 @@
<name>Header</name>
<titleField>NAME</titleField>
<subtitleField>STATE</subtitleField>
- <descriptionField>DESCRIPTION</descriptionField>
+ <descriptionField>EMPLOYEE_CONTACT_ID</descriptionField>
+ <favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
<title></title>
</cardViewTemplate>
<genericViewTemplate>
<name>TimespanGeneric</name>
+ <showDrawer v="true" />
+ <drawerCaption>Campaign Period</drawerCaption>
<entityField>#ENTITY</entityField>
<title>Kampagnenzeitraum</title>
<fields>
@@ -35,6 +38,24 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>4ae0c7d5-8573-4e4d-a047-2944d82aebe0</name>
+ <entityField>CampaignStepsReadonly</entityField>
+ <view>CampaignStepParticipnatsPerStep_view</view>
+ </neonViewReference>
+ <genericViewTemplate>
+ <name>Description</name>
+ <showDrawer v="true" />
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <title>Beschreibung</title>
+ <fields>
+ <entityFieldLink>
+ <name>d7c993ff-9696-4de8-9ba5-fc7c92a1a22b</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
<scoreCardViewTemplate>
<name>ScoreCard</name>
<entityField>#ENTITY</entityField>
@@ -44,8 +65,8 @@
<entityField>COST</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>1cdf9373-790e-47ae-a6ce-d7673cb8cdb2</name>
- <entityField>participantCount</entityField>
+ <name>53123640-7524-426a-bb5c-16dab64cef76</name>
+ <entityField>remainingRuntime</entityField>
</entityFieldLink>
<entityFieldLink>
<name>b689668f-1d48-4ff1-95d9-2e217547c853</name>
diff --git a/neonView/CampaignStepMain_view/CampaignStepMain_view.aod b/neonView/CampaignStepMain_view/CampaignStepMain_view.aod
index ba87160a9b109f44b7bcc99017b7c48ec0715d8d..0c083351809757f1e6c5e4a1395b279506d3a90e 100644
--- a/neonView/CampaignStepMain_view/CampaignStepMain_view.aod
+++ b/neonView/CampaignStepMain_view/CampaignStepMain_view.aod
@@ -29,5 +29,15 @@
<entityField>CampaignStepCosts</entityField>
<view>CampaignCostExtendedFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>d99ab70c-2a08-408e-a665-1ef566c75650</name>
+ <entityField>Activities</entityField>
+ <view>ActivityFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>4fd5e3cc-0696-4fc4-877b-440c0b6c2472</name>
+ <entityField>Tasks</entityField>
+ <view>TaskFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/CampaignStepParticipnatsPerStep_view/CampaignStepParticipnatsPerStep_view.aod b/neonView/CampaignStepParticipnatsPerStep_view/CampaignStepParticipnatsPerStep_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..14cbf839e1a26fed98a124332c3fee57a6db2a07
--- /dev/null
+++ b/neonView/CampaignStepParticipnatsPerStep_view/CampaignStepParticipnatsPerStep_view.aod
@@ -0,0 +1,27 @@
+<?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>CampaignStepParticipnatsPerStep_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>ParticipantsPerStep</name>
+ <highlightingField>CurrentMaxParticipantsInfo</highlightingField>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>04ff1319-d06d-4738-a221-5755c016af70</name>
+ <entityField>NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4ea71a13-4108-47a5-9a28-2256618fdc2c</name>
+ <entityField>CurrentMaxParticipantsInfo</entityField>
+ </neonTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
index f3de7b97b364387b4ccc0e4782dcca1a011bf9c0..cd7903384570b3137e9860af17819761a704a9ab 100644
--- a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
+++ b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
@@ -15,11 +15,16 @@
<titleField>NAME</titleField>
<subtitleField>STATE</subtitleField>
<descriptionField>DESCRIPTION</descriptionField>
+ <favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
<name>CampaignStepInfosGeneric</name>
+ <editMode v="false" />
+ <showDrawer v="true" />
+ <drawerCaption></drawerCaption>
<entityField>#ENTITY</entityField>
+ <title>Details</title>
<fields>
<entityFieldLink>
<name>4cbf0232-1dab-47f9-b62a-b539d5035c53</name>
@@ -29,12 +34,18 @@
<name>677875bc-6b50-4dd8-b8bf-eba5c0e94c56</name>
<entityField>DATE_END</entityField>
</entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>CampaignId</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
<entityFieldLink>
- <name>a4dc1652-1c0c-4ca1-8f53-58e0b0c18177</name>
+ <name>cee78c4b-bbac-458a-ab1c-53734ea8c7f0</name>
<entityField>CAMPAIGN_ID</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>1a30ddde-aaaf-43c5-ab4c-52581175ff12</name>
+ <name>0bffa6f8-cb18-47f8-a8f4-08cf9d718114</name>
<entityField>CampaignStatus</entityField>
</entityFieldLink>
</fields>
diff --git a/neonView/CommunicationEdit_view/CommunicationEdit_view.aod b/neonView/CommunicationEdit_view/CommunicationEdit_view.aod
index 9ecbfcdcf7a13b2f1f55ab597b44487b4f6f9097..21b8cf54ef2118d0881ddfbcc3bc848d88d47032 100644
--- a/neonView/CommunicationEdit_view/CommunicationEdit_view.aod
+++ b/neonView/CommunicationEdit_view/CommunicationEdit_view.aod
@@ -1,26 +1,26 @@
-<?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>CommunicationEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>baa7e569-6ee2-4c42-aaee-975d3cfb5977</name>
- <entityField>MEDIUM_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>6003ad0c-5e9d-4a56-a0a0-19f9a597a702</name>
- <entityField>ADDR</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>CommunicationEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>baa7e569-6ee2-4c42-aaee-975d3cfb5977</name>
+ <entityField>MEDIUM_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6003ad0c-5e9d-4a56-a0a0-19f9a597a702</name>
+ <entityField>ADDR</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CommunicationFilter_view/CommunicationFilter_view.aod b/neonView/CommunicationFilter_view/CommunicationFilter_view.aod
index ffad63e17e60f7fa24ac3b8af2a792553e3f5ae5..95e878c1f74cfc81373d93684ec2aab62b5aaca1 100644
--- a/neonView/CommunicationFilter_view/CommunicationFilter_view.aod
+++ b/neonView/CommunicationFilter_view/CommunicationFilter_view.aod
@@ -1,27 +1,27 @@
-<?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>CommunicationFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Communications</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>8a7d17a8-e6b9-430e-90ea-4a50daa97cba</name>
- <entityField>MEDIUM_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>1f8b562b-142d-4fdc-82d0-2d0cc855cdd5</name>
- <entityField>ADDR</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>CommunicationFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Communications</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>8a7d17a8-e6b9-430e-90ea-4a50daa97cba</name>
+ <entityField>MEDIUM_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1f8b562b-142d-4fdc-82d0-2d0cc855cdd5</name>
+ <entityField>ADDR</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CommunicationList_view/CommunicationList_view.aod b/neonView/CommunicationList_view/CommunicationList_view.aod
index cc011575bf237e29f8ef54966ed644faf16ec5ae..8999e7a1e89e23b9209a24b08d6c16f73438b304 100644
--- a/neonView/CommunicationList_view/CommunicationList_view.aod
+++ b/neonView/CommunicationList_view/CommunicationList_view.aod
@@ -1,27 +1,27 @@
-<?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>CommunicationList_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <titledListViewTemplate>
- <name>Communications</name>
- <highlightingField>IS_STANDARD</highlightingField>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>5649723d-2478-4b4c-9e32-7944e643bc42</name>
- <entityField>MEDIUM_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>825df64b-901b-49ac-a759-3ee1c260a88a</name>
- <entityField>ADDR</entityField>
- </neonTableColumn>
- </columns>
- </titledListViewTemplate>
- </children>
-</neonView>
+<?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>CommunicationList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>Communications</name>
+ <highlightingField>IS_STANDARD</highlightingField>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>5649723d-2478-4b4c-9e32-7944e643bc42</name>
+ <entityField>MEDIUM_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>825df64b-901b-49ac-a759-3ee1c260a88a</name>
+ <entityField>ADDR</entityField>
+ </neonTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod b/neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod
index 723b26dfe6a35bfa4b9e8bc307a02a8aebc8baa7..68d633623084f52676fef1bc3cb91ba15dbe1904 100644
--- a/neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod
+++ b/neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod
@@ -1,26 +1,26 @@
-<?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>CommunicationMultiEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <genericMultipleViewTemplate>
- <name>MultipleEdit</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>b210222e-dfd3-4cec-bc2e-84b72aebb2b6</name>
- <entityField>MEDIUM_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>c20668f3-6722-4a38-86d6-0d29be06dbe1</name>
- <entityField>ADDR</entityField>
- </neonTableColumn>
- </columns>
- </genericMultipleViewTemplate>
- </children>
-</neonView>
+<?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>CommunicationMultiEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>MultipleEdit</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>b210222e-dfd3-4cec-bc2e-84b72aebb2b6</name>
+ <entityField>MEDIUM_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c20668f3-6722-4a38-86d6-0d29be06dbe1</name>
+ <entityField>ADDR</entityField>
+ </neonTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ContactEdit_view/ContactEdit_view.aod b/neonView/ContactEdit_view/ContactEdit_view.aod
index 03a2f0de84d3c649892b2703ade040afc6bc8967..87804b22391a2e98c37c4055abb1f60c1776f0b4 100644
--- a/neonView/ContactEdit_view/ContactEdit_view.aod
+++ b/neonView/ContactEdit_view/ContactEdit_view.aod
@@ -1,53 +1,53 @@
-<?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>ContactEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>35e8b7a8-30b0-4c6f-921d-c199158aa294</name>
- <entityField>PERSON_TITLE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>40d2367e-c197-424c-8442-9b04c7369e3a</name>
- <entityField>ORGANISATION_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>847e9231-d6df-4ead-903d-b70dbcd69333</name>
- <entityField>DEPARTMENT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>74e712fb-595f-4f96-9ecb-bd6a99948dce</name>
- <entityField>CONTACTROLE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>e7c57e62-ff21-4ccd-8458-55d2fcca7b97</name>
- <entityField>POSITION</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3028e060-b360-4584-96e6-4cf17ef94b07</name>
- <entityField>LANGUAGE</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>2912698f-2123-4c4f-b277-b7aa16b1c5e0</name>
- <entityField>Communications</entityField>
- <view>CommunicationMultiEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>3e90f469-405f-46e4-9fed-ce017dc0c222</name>
- <entityField>ContactAddresses</entityField>
- <view>AdressMultiEdit_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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>ContactEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>35e8b7a8-30b0-4c6f-921d-c199158aa294</name>
+ <entityField>PERSON_TITLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>40d2367e-c197-424c-8442-9b04c7369e3a</name>
+ <entityField>ORGANISATION_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>847e9231-d6df-4ead-903d-b70dbcd69333</name>
+ <entityField>DEPARTMENT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>74e712fb-595f-4f96-9ecb-bd6a99948dce</name>
+ <entityField>CONTACTROLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e7c57e62-ff21-4ccd-8458-55d2fcca7b97</name>
+ <entityField>POSITION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3028e060-b360-4584-96e6-4cf17ef94b07</name>
+ <entityField>LANGUAGE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>2912698f-2123-4c4f-b277-b7aa16b1c5e0</name>
+ <entityField>Communications</entityField>
+ <view>CommunicationMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>3e90f469-405f-46e4-9fed-ce017dc0c222</name>
+ <entityField>ContactAddresses</entityField>
+ <view>AdressMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/ContactList_view/ContactList_view.aod b/neonView/ContactList_view/ContactList_view.aod
index b99e10274e606c0fe62fba52080c1854c06301e6..975b21a7f63d8917e9e7f2228e8380d1acfb3085 100644
--- a/neonView/ContactList_view/ContactList_view.aod
+++ b/neonView/ContactList_view/ContactList_view.aod
@@ -1,40 +1,40 @@
-<?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>ContactList_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Contacts</name>
- <hideContentSearch v="true" />
- <isEditable v="false" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>ef71b5ad-8581-4845-ae66-7df17d1459e0</name>
- <entityField>ORGANISATION_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>a3f3a2b8-1f7a-4783-b080-1853df3d1613</name>
- <entityField>CONTACTROLE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>a8f4283d-7a40-4ee9-ae34-e4d424a9342a</name>
- <entityField>DEPARTMENT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>13b085a4-9ee7-418b-b3a9-acaf053c44f1</name>
- <entityField>POSITION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>1daa17e8-0e8d-4760-b229-651ae9a121d3</name>
- <entityField>STATUS</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>ContactList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Contacts</name>
+ <hideContentSearch v="true" />
+ <isEditable v="false" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>ef71b5ad-8581-4845-ae66-7df17d1459e0</name>
+ <entityField>ORGANISATION_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a3f3a2b8-1f7a-4783-b080-1853df3d1613</name>
+ <entityField>CONTACTROLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a8f4283d-7a40-4ee9-ae34-e4d424a9342a</name>
+ <entityField>DEPARTMENT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>13b085a4-9ee7-418b-b3a9-acaf053c44f1</name>
+ <entityField>POSITION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1daa17e8-0e8d-4760-b229-651ae9a121d3</name>
+ <entityField>STATUS</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ContractFilter_view/ContractFilter_view.aod b/neonView/ContractFilter_view/ContractFilter_view.aod
index c508588317a7ad788ca44f004382c3120b2f2bc6..5ef1fa5e8c38cfa14fc5ec48bbdaa8095071c378 100644
--- a/neonView/ContractFilter_view/ContractFilter_view.aod
+++ b/neonView/ContractFilter_view/ContractFilter_view.aod
@@ -1,68 +1,68 @@
-<?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>ContractFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>AllContractsDashlet</name>
- <title>Contracts</title>
- <description>Show all contracts</description>
- <fragment>Contract/filter</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:form</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>contract</name>
- <title>Contract</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Contracts</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>67ceacc5-6238-496a-9bc6-ccc52ce91cd3</name>
- <entityField>IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>1a610a45-8c8c-48d4-bc0b-905655afa016</name>
- <entityField>CONTRACTCODE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ea38d067-af86-4936-8311-f64305fc5576</name>
- <entityField>CONTRACTTYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>0ec4c5ee-4af2-4530-8fc3-fbecef7983b7</name>
- <entityField>CONTACT_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>05f745fe-6f29-4536-9794-8ddfefd2b369</name>
- <entityField>CONTRACTSTATUS</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ef313bd9-b3a3-4c60-b7d5-9cf2e208aade</name>
- <entityField>CONTRACTSTART</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>845c3a71-0fa9-4299-9b85-8fa25f92436d</name>
- <entityField>CONTRACTEND</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>ContractFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>AllContractsDashlet</name>
+ <title>Contracts</title>
+ <description>Show all contracts</description>
+ <fragment>Contract/filter</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:form</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>contract</name>
+ <title>Contract</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Contracts</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>67ceacc5-6238-496a-9bc6-ccc52ce91cd3</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1a610a45-8c8c-48d4-bc0b-905655afa016</name>
+ <entityField>CONTRACTCODE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ea38d067-af86-4936-8311-f64305fc5576</name>
+ <entityField>CONTRACTTYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>0ec4c5ee-4af2-4530-8fc3-fbecef7983b7</name>
+ <entityField>CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>05f745fe-6f29-4536-9794-8ddfefd2b369</name>
+ <entityField>CONTRACTSTATUS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ef313bd9-b3a3-4c60-b7d5-9cf2e208aade</name>
+ <entityField>CONTRACTSTART</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>845c3a71-0fa9-4299-9b85-8fa25f92436d</name>
+ <entityField>CONTRACTEND</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ContractPreview_view/ContractPreview_view.aod b/neonView/ContractPreview_view/ContractPreview_view.aod
index 328e2dd523937fb023dda5ce211cc3678946b96b..1381f3f41059df31d3b47b318dbb8c5250c85abb 100644
--- a/neonView/ContractPreview_view/ContractPreview_view.aod
+++ b/neonView/ContractPreview_view/ContractPreview_view.aod
@@ -1,66 +1,66 @@
-<?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>ContractPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>IMAGE</iconField>
- <titleField>CONTRACTCODE_DISPLAY_fieldGroup</titleField>
- <descriptionField>CONTACT_ID</descriptionField>
- <favoriteAction1>newActivity</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Details</name>
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>b0ced77c-bd97-4318-8c0b-ad028111f039</name>
- <entityField>CONTRACTSTATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>9101eee8-57b1-4bcf-a271-2501b7a3b842</name>
- <entityField>CONTRACTSTART</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>9cc46e86-0f4b-406a-a702-77e840fc3988</name>
- <entityField>CONTRACTEND</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>aa310f7a-d66b-4128-8af0-3619099605ce</name>
- <entityField>PAYMENT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>6529a64b-4249-434a-8692-45daad5264e3</name>
- <entityField>CONTRACTDUE</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <drawerCaption>Further informations</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>546ff394-e0bd-4dce-82a4-8341bcd92243</name>
- <entityField>REMARK</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>90de7332-5d4c-4d72-a93a-1bd2c06d12a4</name>
- <entityField>MainDocuments</entityField>
- <view>DocumentList_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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>ContractPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Header</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>IMAGE</iconField>
+ <titleField>CONTRACTCODE_DISPLAY_fieldGroup</titleField>
+ <descriptionField>CONTACT_ID</descriptionField>
+ <favoriteAction1>newActivity</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Details</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>b0ced77c-bd97-4318-8c0b-ad028111f039</name>
+ <entityField>CONTRACTSTATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9101eee8-57b1-4bcf-a271-2501b7a3b842</name>
+ <entityField>CONTRACTSTART</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9cc46e86-0f4b-406a-a702-77e840fc3988</name>
+ <entityField>CONTRACTEND</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>aa310f7a-d66b-4128-8af0-3619099605ce</name>
+ <entityField>PAYMENT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6529a64b-4249-434a-8692-45daad5264e3</name>
+ <entityField>CONTRACTDUE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Further informations</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>546ff394-e0bd-4dce-82a4-8341bcd92243</name>
+ <entityField>REMARK</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>90de7332-5d4c-4d72-a93a-1bd2c06d12a4</name>
+ <entityField>MainDocuments</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/CountriesPreview_view/CountriesPreview_view.aod b/neonView/CountriesPreview_view/CountriesPreview_view.aod
index 90df6f69c339ecc0fa4d9fb5117a574fa14636d5..c2d913dc585d81a30e81569bde580971e53215d7 100644
--- a/neonView/CountriesPreview_view/CountriesPreview_view.aod
+++ b/neonView/CountriesPreview_view/CountriesPreview_view.aod
@@ -1,43 +1,43 @@
-<?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>CountriesPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>FLAG</iconField>
- <titleField>NAME_TRANSLATED</titleField>
- <descriptionField>ISO2</descriptionField>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <editMode v="false" />
- <showDrawer v="false" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>b1172810-a6f9-4dd7-b9fd-669333a04e0e</name>
- <entityField>ISO2</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>33def870-bc1d-4ed8-85e5-80bbc70c8f45</name>
- <entityField>ISO3</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>f93ab4d2-26f0-4de5-9c8d-a2e2f985218e</name>
- <entityField>NAME_ORIGIN</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>98128115-da62-4bfb-9ca3-9465a024f56c</name>
- <entityField>NAME_TRANSLATED</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>CountriesPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>FLAG</iconField>
+ <titleField>NAME_TRANSLATED</titleField>
+ <descriptionField>ISO2</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <editMode v="false" />
+ <showDrawer v="false" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>b1172810-a6f9-4dd7-b9fd-669333a04e0e</name>
+ <entityField>ISO2</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>33def870-bc1d-4ed8-85e5-80bbc70c8f45</name>
+ <entityField>ISO3</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f93ab4d2-26f0-4de5-9c8d-a2e2f985218e</name>
+ <entityField>NAME_ORIGIN</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>98128115-da62-4bfb-9ca3-9465a024f56c</name>
+ <entityField>NAME_TRANSLATED</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CountriesTable_view/CountriesTable_view.aod b/neonView/CountriesTable_view/CountriesTable_view.aod
index feecd97ed92edf776020689ee66c6073879730d7..8f8e935aeb265b1dcee0242946a6c2c4a86decab 100644
--- a/neonView/CountriesTable_view/CountriesTable_view.aod
+++ b/neonView/CountriesTable_view/CountriesTable_view.aod
@@ -1,48 +1,48 @@
-<?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>CountriesTable_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Countries</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>34fb0f82-8052-418e-a1c7-2c538c7f74d4</name>
- <entityField>FLAG</entityField>
- <width v="50" />
- <expandRatio v="0" />
- </neonTableColumn>
- <neonTableColumn>
- <name>fbe22eec-3856-4f6a-bf75-a7da6b32b1f0</name>
- <entityField>ISO2</entityField>
- <width v="50" />
- <expandRatio v="0" />
- <collapse v="true" />
- </neonTableColumn>
- <neonTableColumn>
- <name>00a6a60e-2d6f-44c2-bcf0-74545ec423b8</name>
- <entityField>ISO3</entityField>
- <width v="50" />
- <expandRatio v="0" />
- <collapse v="true" />
- </neonTableColumn>
- <neonTableColumn>
- <name>0afbb69c-3ea1-4168-b581-bbc2540acf6d</name>
- <entityField>NAME_ORIGIN</entityField>
- <width v="200" />
- <expandRatio v="100" />
- </neonTableColumn>
- <neonTableColumn>
- <name>6120eed0-2d3c-4956-a9ba-d089f19e03ea</name>
- <entityField>NAME_TRANSLATED</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>CountriesTable_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Countries</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>34fb0f82-8052-418e-a1c7-2c538c7f74d4</name>
+ <entityField>FLAG</entityField>
+ <width v="50" />
+ <expandRatio v="0" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>fbe22eec-3856-4f6a-bf75-a7da6b32b1f0</name>
+ <entityField>ISO2</entityField>
+ <width v="50" />
+ <expandRatio v="0" />
+ <collapse v="true" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>00a6a60e-2d6f-44c2-bcf0-74545ec423b8</name>
+ <entityField>ISO3</entityField>
+ <width v="50" />
+ <expandRatio v="0" />
+ <collapse v="true" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>0afbb69c-3ea1-4168-b581-bbc2540acf6d</name>
+ <entityField>NAME_ORIGIN</entityField>
+ <width v="200" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6120eed0-2d3c-4956-a9ba-d089f19e03ea</name>
+ <entityField>NAME_TRANSLATED</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DefaultLookup_view/DefaultLookup_view.aod b/neonView/DefaultLookup_view/DefaultLookup_view.aod
index ff5f7c4ad683368a3e85ea81e857e3bbc1c7c385..ace992440583670fe49d0c3119f7e791e8d7d654 100644
--- a/neonView/DefaultLookup_view/DefaultLookup_view.aod
+++ b/neonView/DefaultLookup_view/DefaultLookup_view.aod
@@ -1,16 +1,16 @@
-<?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>DefaultLookup_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <listViewTemplate>
- <name>DefaultList</name>
- <entityField>#ENTITY</entityField>
- </listViewTemplate>
- </children>
-</neonView>
+<?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>DefaultLookup_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <listViewTemplate>
+ <name>DefaultList</name>
+ <entityField>#ENTITY</entityField>
+ </listViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentEdit_view/DocumentEdit_view.aod b/neonView/DocumentEdit_view/DocumentEdit_view.aod
index 94c8f4329ba5469401611c1d36b95d8e342a8464..e0cd372b0b900a03188a1d31c70c23be0e423e08 100644
--- a/neonView/DocumentEdit_view/DocumentEdit_view.aod
+++ b/neonView/DocumentEdit_view/DocumentEdit_view.aod
@@ -1,35 +1,35 @@
-<?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>DocumentEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>7d74c495-1af7-4e00-8a78-5787e544e101</name>
- <entityField>BINDATA_UPLOAD</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>91d96ac4-d838-4f92-90e7-954166b57288</name>
- <entityField>NAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>253b8716-bdec-4e24-8540-7513d934693b</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>d3265f22-18dd-468b-8316-6a11fab662c3</name>
- <entityField>IS_MAIN_DOCUMENT</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>DocumentEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>7d74c495-1af7-4e00-8a78-5787e544e101</name>
+ <entityField>BINDATA_UPLOAD</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>91d96ac4-d838-4f92-90e7-954166b57288</name>
+ <entityField>NAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>253b8716-bdec-4e24-8540-7513d934693b</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d3265f22-18dd-468b-8316-6a11fab662c3</name>
+ <entityField>IS_MAIN_DOCUMENT</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentFilter_view/DocumentFilter_view.aod b/neonView/DocumentFilter_view/DocumentFilter_view.aod
index 88007b4a1c2a3ad67ae4732cbaf982f3f0118bf5..b32a54d029edd7df54e4ee9ab4b3319b688f756f 100644
--- a/neonView/DocumentFilter_view/DocumentFilter_view.aod
+++ b/neonView/DocumentFilter_view/DocumentFilter_view.aod
@@ -1,48 +1,48 @@
-<?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>DocumentFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Documents</name>
- <favoriteActionGroup1>Document_actions</favoriteActionGroup1>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>1ecb7858-44ab-42de-abb8-d8c74afa30d0</name>
- <entityField>NAME</entityField>
- <width v="75" />
- <expandRatio v="100" />
- </neonTableColumn>
- <neonTableColumn>
- <name>455a5afa-82f0-42d0-aba4-46ff1196234f</name>
- <entityField>TYPE</entityField>
- <width v="75" />
- <expandRatio v="100" />
- </neonTableColumn>
- <neonTableColumn>
- <name>000be993-3d70-4511-add9-8590b4d3c8ef</name>
- <entityField>SIZE</entityField>
- <width v="75" />
- <expandRatio v="100" />
- </neonTableColumn>
- <neonTableColumn>
- <name>a533d8a1-ae5e-434d-8254-415586af26ed</name>
- <entityField>DATE_EDIT</entityField>
- <width v="75" />
- <expandRatio v="100" />
- </neonTableColumn>
- <neonTableColumn>
- <name>0f7279fa-612b-4f2b-90aa-9de8efd1d3fb</name>
- <entityField>IS_MAIN_DOCUMENT</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>DocumentFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Documents</name>
+ <favoriteActionGroup1>Document_actions</favoriteActionGroup1>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>1ecb7858-44ab-42de-abb8-d8c74afa30d0</name>
+ <entityField>NAME</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>455a5afa-82f0-42d0-aba4-46ff1196234f</name>
+ <entityField>TYPE</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>000be993-3d70-4511-add9-8590b4d3c8ef</name>
+ <entityField>SIZE</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a533d8a1-ae5e-434d-8254-415586af26ed</name>
+ <entityField>DATE_EDIT</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>0f7279fa-612b-4f2b-90aa-9de8efd1d3fb</name>
+ <entityField>IS_MAIN_DOCUMENT</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentList_view/DocumentList_view.aod b/neonView/DocumentList_view/DocumentList_view.aod
index d82e31df5478a41698efbbabce79fd9e0c184491..2c74f41abfaccacca16bccb71b1957e1471a0c6c 100644
--- a/neonView/DocumentList_view/DocumentList_view.aod
+++ b/neonView/DocumentList_view/DocumentList_view.aod
@@ -1,21 +1,22 @@
-<?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>DocumentList_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <drawerLayout>
- <name>layout</name>
- <layoutCaption>Maindocuments</layoutCaption>
- </drawerLayout>
- </layout>
- <children>
- <actionListViewTemplate>
- <name>Actions</name>
- <titleField>NAME</titleField>
- <descriptionField>DESCRIPTION</descriptionField>
- <iconField>ICON</iconField>
- <entryAction>downloadSingleFileAction</entryAction>
- <entityField>#ENTITY</entityField>
- </actionListViewTemplate>
- </children>
-</neonView>
+<?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>DocumentList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <drawerLayout>
+ <name>layout</name>
+ <layoutCaption>Maindocuments</layoutCaption>
+ </drawerLayout>
+ </layout>
+ <children>
+ <actionListViewTemplate>
+ <name>Actions</name>
+ <titleField>NAME</titleField>
+ <descriptionField>DESCRIPTION</descriptionField>
+ <iconField>ICON</iconField>
+ <entryAction>downloadSingleFileAction</entryAction>
+ <entityField>#ENTITY</entityField>
+ <title>Documents</title>
+ </actionListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentPreview_view/DocumentPreview_view.aod b/neonView/DocumentPreview_view/DocumentPreview_view.aod
index eaf0fc619b087f5480398bd61d86691949368c45..3b0aef5d27cba6490563b7f2216452191a0e9bd0 100644
--- a/neonView/DocumentPreview_view/DocumentPreview_view.aod
+++ b/neonView/DocumentPreview_view/DocumentPreview_view.aod
@@ -1,36 +1,36 @@
-<?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>DocumentPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Head</name>
- <iconField>PREVIEW_IMAGE</iconField>
- <titleField>NAME</titleField>
- <subtitleField>TYPE</subtitleField>
- <descriptionField>SIZE</descriptionField>
- <favoriteAction1>downloadSingleFileAction</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Details</name>
- <showDrawer v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>85eba544-ca8f-40aa-ba01-9311f8861033</name>
- <entityField>IS_MAIN_DOCUMENT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4a89e2f0-1b61-432f-9560-b5f171f7e06d</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>DocumentPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Head</name>
+ <iconField>PREVIEW_IMAGE</iconField>
+ <titleField>NAME</titleField>
+ <subtitleField>TYPE</subtitleField>
+ <descriptionField>SIZE</descriptionField>
+ <favoriteAction1>downloadSingleFileAction</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Details</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>85eba544-ca8f-40aa-ba01-9311f8861033</name>
+ <entityField>IS_MAIN_DOCUMENT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4a89e2f0-1b61-432f-9560-b5f171f7e06d</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b5234dd548b0bf391932422e78d422181951f02e
--- /dev/null
+++ b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
@@ -0,0 +1,65 @@
+<?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>DocumentTemplateEdit_view</name>
+ <title>Document Template</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:FILE_FONT</icon>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Details</name>
+ <editMode v="true" />
+ <showDrawer v="false" />
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ <fields>
+ <entityFieldLink>
+ <name>63388992-5b40-4f1e-a2be-aa35bedbfd2e</name>
+ <entityField>BINDATA</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>5e68bfdb-b5c9-4ea0-8f5d-152e36262401</name>
+ <entityField>NAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e3940793-c511-4fb1-93e7-68fb9f614b32</name>
+ <entityField>TYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>de86d66c-8281-4050-946b-a6b35bb01db8</name>
+ <entityField>CLASSIFICATION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c25464a6-1111-4f9f-a834-92015c2d87bc</name>
+ <entityField>LANGUAGE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>850130f7-75b1-42ef-9da9-da98966d6367</name>
+ <entityField>htmlText</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bf313ea8-821a-4693-8ba2-4246ad8a4f62</name>
+ <entityField>texText</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0fed8c5c-1be5-4599-938d-31241c4c9395</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>2e118acd-473a-4587-9945-a0ca59012f40</name>
+ <entityField>Links</entityField>
+ <view>DocumentTemplateLinkMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>8111a7d1-efc0-4588-a5a7-d798b0a8c7bb</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/DocumentTemplateFilterSmall_view/DocumentTemplateFilterSmall_view.aod b/neonView/DocumentTemplateFilterSmall_view/DocumentTemplateFilterSmall_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3626b2055112bb805d70d6f31deccdaf1ef7507a
--- /dev/null
+++ b/neonView/DocumentTemplateFilterSmall_view/DocumentTemplateFilterSmall_view.aod
@@ -0,0 +1,30 @@
+<?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>DocumentTemplateFilterSmall_view</name>
+ <title>Document Template</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Search</name>
+ <entityField>#ENTITY</entityField>
+ <title>Document Template</title>
+ <columns>
+ <neonTableColumn>
+ <name>4d73c680-ebf6-4225-a6b3-d30ad0082ef4</name>
+ <entityField>NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>cd4067b5-befe-459a-8a41-043eb884caff</name>
+ <entityField>LANGUAGE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod b/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0de215bb5bcf2da1a83c9a2c3c78b766b0050831
--- /dev/null
+++ b/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
@@ -0,0 +1,42 @@
+<?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>DocumentTemplateFilter_view</name>
+ <title>Document Template</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:FILE_FONT</icon>
+ <filterable v="true" />
+ <isSmall v="false" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <treeTableViewTemplate>
+ <name>SearchTree</name>
+ <parentField>TYPE</parentField>
+ <defaultGroupFields>
+ <element>TYPE</element>
+ </defaultGroupFields>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>c0085121-edf6-4e3e-ace4-d599af4aa2f1</name>
+ <entityField>NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>f163cdaa-ed96-431a-a648-1823b2a8ded6</name>
+ <entityField>TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>7554151d-a099-4573-89c7-2f2b3070bff6</name>
+ <entityField>CLASSIFICATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>65c98ef0-a3cc-4153-a58d-db4776e33532</name>
+ <entityField>LANGUAGE</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentTemplateLinkList_view/DocumentTemplateLinkList_view.aod b/neonView/DocumentTemplateLinkList_view/DocumentTemplateLinkList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4195ff1ec8beefed2dcaa146a2feded9be1a835c
--- /dev/null
+++ b/neonView/DocumentTemplateLinkList_view/DocumentTemplateLinkList_view.aod
@@ -0,0 +1,23 @@
+<?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>DocumentTemplateLinkList_view</name>
+ <title>Attachments</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <drawerLayout>
+ <name>layout</name>
+ <layoutCaption>Attachments</layoutCaption>
+ </drawerLayout>
+ </layout>
+ <children>
+ <actionListViewTemplate>
+ <name>ActionList</name>
+ <titleField>DOCUMENTTEMPLATE_ID_CHILD</titleField>
+ <descriptionField></descriptionField>
+ <iconField>ICON</iconField>
+ <entryAction>OpenDocument</entryAction>
+ <entityField>#ENTITY</entityField>
+ <title>Attachments</title>
+ </actionListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentTemplateLinkMultiEdit_view/DocumentTemplateLinkMultiEdit_view.aod b/neonView/DocumentTemplateLinkMultiEdit_view/DocumentTemplateLinkMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..df6a9f255f9fbe87b43403143a748014e494ddd8
--- /dev/null
+++ b/neonView/DocumentTemplateLinkMultiEdit_view/DocumentTemplateLinkMultiEdit_view.aod
@@ -0,0 +1,23 @@
+<?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>DocumentTemplateLinkMultiEdit_view</name>
+ <title>Attachments</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>MultipleEdit</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>c379aae6-f79e-424c-b379-d7393e63bc4e</name>
+ <entityField>DOCUMENTTEMPLATE_ID_CHILD</entityField>
+ </neonTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..f7a6a63264ff58d5e49a54cb628770e7174df61c
--- /dev/null
+++ b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
@@ -0,0 +1,36 @@
+<?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>DocumentTemplatePreview_view</name>
+ <title>Document Template</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Card</name>
+ <titleField>NAME</titleField>
+ <subtitleField>TYPE</subtitleField>
+ <descriptionField>CLASSIFICATION</descriptionField>
+ <entityField>#ENTITY</entityField>
+ <title>Document Template</title>
+ </cardViewTemplate>
+ <neonViewReference>
+ <name>0da2cc6b-86c9-4455-b5b2-edc54b30e793</name>
+ <entityField>Documents</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>632c3a73-41f9-4d95-b394-2699a7200cf1</name>
+ <entityField>Links</entityField>
+ <view>DocumentTemplateLinkList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>5a2db686-85a9-4a21-acde-7a6ee826eeaa</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationPreviewList</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
index 88171ca8fcb9cc79b14de3c3d8590240268af14a..f4644fdd94916d3a1424ab62bae534d47d3ed201 100644
--- a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
+++ b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
@@ -1,39 +1,39 @@
-<?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>EmployeeFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Employees</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>15185ef0-5402-43c4-b5c9-1e0e836ef1c3</name>
- <entityField>IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>3e3552f9-9591-45ae-a0bb-a85210c2b382</name>
- <entityField>TITLE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>307dfdad-a0b2-436f-b8a1-9825821dba0c</name>
- <entityField>ISACTIVE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>18b974f1-81ea-4ca0-83bf-a1505f763446</name>
- <entityField>FIRSTNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>27c4199c-157a-4c3e-a851-01aa1d82dfd2</name>
- <entityField>LASTNAME</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>EmployeeFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Employees</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>15185ef0-5402-43c4-b5c9-1e0e836ef1c3</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>3e3552f9-9591-45ae-a0bb-a85210c2b382</name>
+ <entityField>TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>307dfdad-a0b2-436f-b8a1-9825821dba0c</name>
+ <entityField>ISACTIVE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>18b974f1-81ea-4ca0-83bf-a1505f763446</name>
+ <entityField>FIRSTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>27c4199c-157a-4c3e-a851-01aa1d82dfd2</name>
+ <entityField>LASTNAME</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/EmployeePassword_view/EmployeePassword_view.aod b/neonView/EmployeePassword_view/EmployeePassword_view.aod
index 731d112028ca26d6f7c8d66fba730c9a5240f45a..ebe5f2c3bc40ae7738a2eb7fe924a144f2075a84 100644
--- a/neonView/EmployeePassword_view/EmployeePassword_view.aod
+++ b/neonView/EmployeePassword_view/EmployeePassword_view.aod
@@ -2,6 +2,7 @@
<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>EmployeePassword_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/EmployeePreview_view/EmployeePreview_view.aod b/neonView/EmployeePreview_view/EmployeePreview_view.aod
index 9854f076d27c12eb237d322449d017e0bdd456f0..dd211a4a4d9abd37c866e3600aec45ce6ab5ef1a 100644
--- a/neonView/EmployeePreview_view/EmployeePreview_view.aod
+++ b/neonView/EmployeePreview_view/EmployeePreview_view.aod
@@ -1,47 +1,47 @@
-<?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>EmployeePreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>IMAGE</iconField>
- <titleField>NAME_fieldGroup</titleField>
- <subtitleField>TITLE</subtitleField>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>68755289-a351-4915-8626-52f023e237f8</name>
- <entityField>ISACTIVE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>a5f8b519-26d8-4824-b9cf-9119c03b1bd8</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0bda9209-1437-49eb-98b7-6edea9c6836a</name>
- <entityField>DEPARTMENT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>d9786e3d-5364-4075-a08d-0d4ea91c4728</name>
- <entityField>EMAIL_ADDRESS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>79cd6a97-6caf-4acb-81af-028b94f33e8f</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>EmployeePreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Header</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>IMAGE</iconField>
+ <titleField>NAME_fieldGroup</titleField>
+ <subtitleField>TITLE</subtitleField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>68755289-a351-4915-8626-52f023e237f8</name>
+ <entityField>ISACTIVE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>a5f8b519-26d8-4824-b9cf-9119c03b1bd8</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0bda9209-1437-49eb-98b7-6edea9c6836a</name>
+ <entityField>DEPARTMENT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d9786e3d-5364-4075-a08d-0d4ea91c4728</name>
+ <entityField>EMAIL_ADDRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>79cd6a97-6caf-4acb-81af-028b94f33e8f</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod b/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
index 80d5076129ade0ac6b9dfa8481a146c81c1e3200..9fc81ddf21b067bfd7f7653c9d1a8b66f99b4d9a 100644
--- a/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
+++ b/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
@@ -1,23 +1,23 @@
-<?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>EmployeeRoleFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Table</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>ab1c8d39-fc29-42e8-8b8e-3557d544b272</name>
- <entityField>ROLE</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>EmployeeRoleFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Table</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>ab1c8d39-fc29-42e8-8b8e-3557d544b272</name>
+ <entityField>ROLE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/FacebookTimeline_view/FacebookTimeline_view.aod b/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
index 1cfd71aba5679bdd29d96d6c58e8d9b099794351..5a85a8d9298ee07abf0185b837cffb146d67142c 100644
--- a/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
+++ b/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
@@ -1,68 +1,68 @@
-<?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>FacebookTimeline_view</name>
- <title>Facebook</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>AditoFacebookDashlet</name>
- <title>ADITO Facebook Feed</title>
- <description>Show all Facebook posts of ADITO</description>
- <fragment>Social/full</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:facebook_square</icon>
- <categories>
- <neonDashletCategory>
- <name>social</name>
- <title>Social Media</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>facebook</name>
- <title>Facebook</title>
- </neonDashletCategory>
- </categories>
- <parameters>
- <neonDashletParameter>
- <name>Account_param</name>
- <value>adito.crm</value>
- </neonDashletParameter>
- </parameters>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>FacebookDashletConfig</name>
- <title>Facebook Feed</title>
- <description>Show all Facebook posts of a user</description>
- <fragment>Social/full</fragment>
- <requiresConfiguration v="true" />
- <icon>vaadin:facebook_square</icon>
- <categories>
- <neonDashletCategory>
- <name>social</name>
- <title>Social Media</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>facebook</name>
- <title>Facebook</title>
- </neonDashletCategory>
- </categories>
- <parameters>
- <neonDashletParameter>
- <name>Account_param</name>
- <value></value>
- </neonDashletParameter>
- </parameters>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <webContentViewTemplate>
- <name>Timeline</name>
- <entityField>FACEBOOK_TIMELINE</entityField>
- </webContentViewTemplate>
- </children>
-</neonView>
+<?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>FacebookTimeline_view</name>
+ <title>Facebook</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>AditoFacebookDashlet</name>
+ <title>ADITO Facebook Feed</title>
+ <description>Show all Facebook posts of ADITO</description>
+ <fragment>Social/full</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:facebook_square</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>social</name>
+ <title>Social Media</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>facebook</name>
+ <title>Facebook</title>
+ </neonDashletCategory>
+ </categories>
+ <parameters>
+ <neonDashletParameter>
+ <name>Account_param</name>
+ <value>adito.crm</value>
+ </neonDashletParameter>
+ </parameters>
+ </neonDashletConfiguration>
+ <neonDashletConfiguration>
+ <name>FacebookDashletConfig</name>
+ <title>Facebook Feed</title>
+ <description>Show all Facebook posts of a user</description>
+ <fragment>Social/full</fragment>
+ <requiresConfiguration v="true" />
+ <icon>vaadin:facebook_square</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>social</name>
+ <title>Social Media</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>facebook</name>
+ <title>Facebook</title>
+ </neonDashletCategory>
+ </categories>
+ <parameters>
+ <neonDashletParameter>
+ <name>Account_param</name>
+ <value></value>
+ </neonDashletParameter>
+ </parameters>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <webContentViewTemplate>
+ <name>Timeline</name>
+ <entityField>FACEBOOK_TIMELINE</entityField>
+ </webContentViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/KeywordAttributeEdit_view/KeywordAttributeEdit_view.aod b/neonView/KeywordAttributeEdit_view/KeywordAttributeEdit_view.aod
index cf2b3b2248c676aea6eb7b541d9d9adfab9de5de..729d4013d6616185f87f1942e960acbe00aa7467 100644
--- a/neonView/KeywordAttributeEdit_view/KeywordAttributeEdit_view.aod
+++ b/neonView/KeywordAttributeEdit_view/KeywordAttributeEdit_view.aod
@@ -1,32 +1,32 @@
-<?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>KeywordAttributeEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <isSmall v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>88fcd6c8-8dfc-4a1d-96d9-33412768feb9</name>
- <entityField>CONTAINER</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4e120b1d-1016-41a1-abe7-9d28f8053380</name>
- <entityField>NAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>245c3f6f-3874-46d6-a24d-72cb9abb2e16</name>
- <entityField>TYPE</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>KeywordAttributeEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>88fcd6c8-8dfc-4a1d-96d9-33412768feb9</name>
+ <entityField>CONTAINER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4e120b1d-1016-41a1-abe7-9d28f8053380</name>
+ <entityField>NAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>245c3f6f-3874-46d6-a24d-72cb9abb2e16</name>
+ <entityField>TYPE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod b/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod
index 8322746e525e02f4dc2d8fe27ef0eb801c202f14..6416e22a798697c134dc9b6a25c0660427d811ac 100644
--- a/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod
+++ b/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod
@@ -1,36 +1,36 @@
-<?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>KeywordAttributeFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Attributes</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>94fdd272-46f0-415e-aff8-76789a215921</name>
- <entityField>#ICON</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>7efe2ae9-8b76-439f-95cb-547f7dec9057</name>
- <entityField>CONTAINER</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>682fd08f-b121-469c-b86e-afdf013dbc7b</name>
- <entityField>NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>8d142e4d-c15d-409a-9a2c-251192e3e98e</name>
- <entityField>TYPE</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>KeywordAttributeFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Attributes</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>94fdd272-46f0-415e-aff8-76789a215921</name>
+ <entityField>#ICON</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>7efe2ae9-8b76-439f-95cb-547f7dec9057</name>
+ <entityField>CONTAINER</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>682fd08f-b121-469c-b86e-afdf013dbc7b</name>
+ <entityField>NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>8d142e4d-c15d-409a-9a2c-251192e3e98e</name>
+ <entityField>TYPE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/KeywordAttributeRelationRows_view/KeywordAttributeRelationRows_view.aod b/neonView/KeywordAttributeRelationRows_view/KeywordAttributeRelationRows_view.aod
index a7c6d12369c479620ccf45080fda8e9586e4a96c..18c59a004c4a678b16d144067222bbb99cdea1a0 100644
--- a/neonView/KeywordAttributeRelationRows_view/KeywordAttributeRelationRows_view.aod
+++ b/neonView/KeywordAttributeRelationRows_view/KeywordAttributeRelationRows_view.aod
@@ -1,28 +1,28 @@
-<?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>KeywordAttributeRelationRows_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="false" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Relations</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>f0eec86d-a223-4208-9e9d-6a6bda1969c8</name>
- <entityField>AB_KEYWORD_ATTRIBUTE_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4d5656d1-a928-47d9-9d88-de8572866a79</name>
- <entityField>valueProxy</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>KeywordAttributeRelationRows_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="false" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Relations</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>f0eec86d-a223-4208-9e9d-6a6bda1969c8</name>
+ <entityField>AB_KEYWORD_ATTRIBUTE_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4d5656d1-a928-47d9-9d88-de8572866a79</name>
+ <entityField>valueProxy</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/KeywordAttriubteRelationTitled_view/KeywordAttriubteRelationTitled_view.aod b/neonView/KeywordAttriubteRelationTitled_view/KeywordAttriubteRelationTitled_view.aod
index a4468d9f60da464c9d856469df4a9c573a3fec73..a3ead120476ab7167d0a87859927cc78e6193012 100644
--- a/neonView/KeywordAttriubteRelationTitled_view/KeywordAttriubteRelationTitled_view.aod
+++ b/neonView/KeywordAttriubteRelationTitled_view/KeywordAttriubteRelationTitled_view.aod
@@ -1,26 +1,26 @@
-<?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>KeywordAttriubteRelationTitled_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <titledListViewTemplate>
- <name>mainList</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>9426ded9-a818-424e-8dd6-397dc439fffc</name>
- <entityField>AB_KEYWORD_ATTRIBUTE_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>35d71c73-cd55-4f45-8a22-22ac6ae7049d</name>
- <entityField>valueProxy</entityField>
- </neonTableColumn>
- </columns>
- </titledListViewTemplate>
- </children>
-</neonView>
+<?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>KeywordAttriubteRelationTitled_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>mainList</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>9426ded9-a818-424e-8dd6-397dc439fffc</name>
+ <entityField>AB_KEYWORD_ATTRIBUTE_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>35d71c73-cd55-4f45-8a22-22ac6ae7049d</name>
+ <entityField>valueProxy</entityField>
+ </neonTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod b/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod
index 061bbb6eebafc1131e711f7ab64fe66fb11bba7d..cc854e71df72b620f16fcb30b6c29d21bcc51488 100644
--- a/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod
+++ b/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod
@@ -1,36 +1,36 @@
-<?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>KeywordEntryEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <isSmall v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>236c9d71-a619-47b5-b5a0-8d4e5bc45903</name>
- <entityField>CONTAINER</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>f7f66b08-521c-46bf-b6e9-3c3f130648bc</name>
- <entityField>TITLE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3fb4b999-853a-407e-b928-8f5e633c1dc5</name>
- <entityField>ISACTIVE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>fc93fdff-860e-4593-8355-9c2677877964</name>
- <entityField>KEYID</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>KeywordEntryEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>236c9d71-a619-47b5-b5a0-8d4e5bc45903</name>
+ <entityField>CONTAINER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f7f66b08-521c-46bf-b6e9-3c3f130648bc</name>
+ <entityField>TITLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3fb4b999-853a-407e-b928-8f5e633c1dc5</name>
+ <entityField>ISACTIVE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>fc93fdff-860e-4593-8355-9c2677877964</name>
+ <entityField>KEYID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/KeywordEntryMainSide_view/KeywordEntryMainSide_view.aod b/neonView/KeywordEntryMainSide_view/KeywordEntryMainSide_view.aod
index 66dfddc51e82026ef05a6d8fe02a5f651f8ccfdd..4748a8aa330c6b693b228cbac8b223bcf32cb8ab 100644
--- a/neonView/KeywordEntryMainSide_view/KeywordEntryMainSide_view.aod
+++ b/neonView/KeywordEntryMainSide_view/KeywordEntryMainSide_view.aod
@@ -1,37 +1,37 @@
-<?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>KeywordEntryMainSide_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <titleField>TITLE</titleField>
- <subtitleField>CONTAINER</subtitleField>
- <descriptionField>KEYID</descriptionField>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>12e16874-32ee-47d7-b9d7-acaa32ca0402</name>
- <entityField>ISACTIVE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>74f8f491-43e2-4de5-b1c6-c83055b4ffa1</name>
- <entityField>ISESSENTIAL</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>5608493f-90b5-4baf-9114-63cb6a2e85bf</name>
- <entityField>SORTING</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>KeywordEntryMainSide_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <titleField>TITLE</titleField>
+ <subtitleField>CONTAINER</subtitleField>
+ <descriptionField>KEYID</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>12e16874-32ee-47d7-b9d7-acaa32ca0402</name>
+ <entityField>ISACTIVE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>74f8f491-43e2-4de5-b1c6-c83055b4ffa1</name>
+ <entityField>ISESSENTIAL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>5608493f-90b5-4baf-9114-63cb6a2e85bf</name>
+ <entityField>SORTING</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/KeywordEntryMain_view/KeywordEntryMain_view.aod b/neonView/KeywordEntryMain_view/KeywordEntryMain_view.aod
index 53dc6badf13d9b11632943da598e897cb054fb18..462bdd5f5abd831bac793c0b989376171c410686 100644
--- a/neonView/KeywordEntryMain_view/KeywordEntryMain_view.aod
+++ b/neonView/KeywordEntryMain_view/KeywordEntryMain_view.aod
@@ -1,23 +1,23 @@
-<?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>KeywordEntryMain_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <masterSlaveLayout>
- <name>layout</name>
- <master>267eb426-08d6-4699-9b9f-743c9c071463</master>
- </masterSlaveLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>267eb426-08d6-4699-9b9f-743c9c071463</name>
- <entityField>#ENTITY</entityField>
- <view>KeywordEntryMainSide_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>e722eb4b-5737-4801-b6e4-550fca43963a</name>
- <entityField>KeywordAttributeRelations</entityField>
- <view>KeywordAttributeRelationRows_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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>KeywordEntryMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>267eb426-08d6-4699-9b9f-743c9c071463</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>267eb426-08d6-4699-9b9f-743c9c071463</name>
+ <entityField>#ENTITY</entityField>
+ <view>KeywordEntryMainSide_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e722eb4b-5737-4801-b6e4-550fca43963a</name>
+ <entityField>KeywordAttributeRelations</entityField>
+ <view>KeywordAttributeRelationRows_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod b/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod
index 56c89cf8897a305cd083da826ecb48ba15099d76..c69424ff7cfa78592ebf50d5d5088022fecfee25 100644
--- a/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod
+++ b/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod
@@ -1,45 +1,45 @@
-<?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>KeywordEntryPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <titleField>TITLE</titleField>
- <subtitleField>CONTAINER</subtitleField>
- <descriptionField>KEYID</descriptionField>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <entityField>#ENTITY</entityField>
- <title></title>
- <fields>
- <entityFieldLink>
- <name>8455ebce-3bc2-4b0c-8e80-ec3795202d0e</name>
- <entityField>ISACTIVE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4b0bb3a6-5457-4eee-b0d8-6ec4b23c0aa7</name>
- <entityField>ISESSENTIAL</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>30d80ba1-235e-4b4a-9e9c-2b63f70f87b5</name>
- <entityField>SORTING</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>31f3e341-19b3-452e-a381-942c9860f696</name>
- <entityField>KeywordAttributeRelationsReadOnly</entityField>
- <view>KeywordAttriubteRelationTitled_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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>KeywordEntryPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Header</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <titleField>TITLE</titleField>
+ <subtitleField>CONTAINER</subtitleField>
+ <descriptionField>KEYID</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ <fields>
+ <entityFieldLink>
+ <name>8455ebce-3bc2-4b0c-8e80-ec3795202d0e</name>
+ <entityField>ISACTIVE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4b0bb3a6-5457-4eee-b0d8-6ec4b23c0aa7</name>
+ <entityField>ISESSENTIAL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>30d80ba1-235e-4b4a-9e9c-2b63f70f87b5</name>
+ <entityField>SORTING</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>31f3e341-19b3-452e-a381-942c9860f696</name>
+ <entityField>KeywordAttributeRelationsReadOnly</entityField>
+ <view>KeywordAttriubteRelationTitled_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod b/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
index 6b0d403e7a8e643fbfebf6e815c81d0eaa9f2846..6674803a75b4632436ac1c38d6a418efe09091f8 100644
--- a/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
+++ b/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
@@ -1,6 +1,7 @@
<?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>LogHistoryFilter_view</name>
+ <title>Log</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
@@ -9,6 +10,14 @@
</groupLayout>
</layout>
<children>
+ <timelineViewTemplate>
+ <name>LogHistoryTimeLine</name>
+ <dateField>DATE_NEW</dateField>
+ <titleField>USER_NEW</titleField>
+ <descriptionField>DESCRIPTION</descriptionField>
+ <iconIdField>#IMAGE</iconIdField>
+ <entityField>#ENTITY</entityField>
+ </timelineViewTemplate>
<tableViewTemplate>
<name>LogHistoryTable</name>
<hideContentSearch v="true" />
@@ -29,13 +38,5 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <timelineViewTemplate>
- <name>LogHistoryTimeLine</name>
- <dateField>DATE_NEW</dateField>
- <titleField>USER_NEW</titleField>
- <descriptionField>DESCRIPTION</descriptionField>
- <iconIdField>#IMAGE</iconIdField>
- <entityField>#ENTITY</entityField>
- </timelineViewTemplate>
</children>
</neonView>
diff --git a/neonView/LogHistoryPreview_view/LogHistoryPreview_view.aod b/neonView/LogHistoryPreview_view/LogHistoryPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..46ea9f080dffb3fbb5c7a8a7c95e478a8cbb1d49
--- /dev/null
+++ b/neonView/LogHistoryPreview_view/LogHistoryPreview_view.aod
@@ -0,0 +1,30 @@
+<?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>LogHistoryPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>head</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>head</name>
+ <subtitleField>DATE_NEW</subtitleField>
+ <descriptionField>USER_NEW</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>text</name>
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>f8d426d2-6e87-4c8c-90c1-8af65b24a90f</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ModuleTree_view/ModuleTree_view.aod b/neonView/ModuleTree_view/ModuleTree_view.aod
index f57a3fe1d5b3c925c775ac8af6e9eca173319e48..512bfdabb016e8bc048d67350e1467d4f9de281b 100644
--- a/neonView/ModuleTree_view/ModuleTree_view.aod
+++ b/neonView/ModuleTree_view/ModuleTree_view.aod
@@ -1,23 +1,23 @@
-<?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>ModuleTree_view</name>
- <title>Tree</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <treeViewTemplate>
- <name>Modules</name>
- <parentField>PARENT_ID</parentField>
- <favoriteActionGroup3></favoriteActionGroup3>
- <titleField>TITLE</titleField>
- <descriptionField>DESCRIPTION</descriptionField>
- <iconField>ICON</iconField>
- <entityField>#ENTITY</entityField>
- <title></title>
- </treeViewTemplate>
- </children>
-</neonView>
+<?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>ModuleTree_view</name>
+ <title>Tree</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <treeViewTemplate>
+ <name>Modules</name>
+ <parentField>PARENT_ID</parentField>
+ <favoriteActionGroup3></favoriteActionGroup3>
+ <titleField>TITLE</titleField>
+ <descriptionField>DESCRIPTION</descriptionField>
+ <iconField>ICON</iconField>
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ </treeViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod b/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod
index 1dda983c317269889fd41ecd94a1666364e88dae..c72f7535143b95cb61379886ac1b32b0be2994e3 100644
--- a/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod
+++ b/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod
@@ -1,49 +1,49 @@
-<?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>MyDashboardScoreCard_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>Information</name>
- <title>To-Do</title>
- <fragment>Analyses/full</fragment>
- <singleton v="true" />
- <icon>VAADIN:CLIPBOARD_CHECK</icon>
- <categories>
- <neonDashletCategory>
- <name>tasks</name>
- <title>Tasks</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>calendar</name>
- <title>Calendar</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <scoreCardViewTemplate>
- <name>Scorecard</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>158d3dd5-4de6-470b-b61d-6de1e9907264</name>
- <entityField>OVERDUE_TASKS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>5bbd7580-6fdd-4134-b33a-1082f4891c7c</name>
- <entityField>NEW_TASKS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3631eda6-dfda-4c75-9caa-8b2c2e7c39e4</name>
- <entityField>IMMINENT_APPOINTMENTS</entityField>
- </entityFieldLink>
- </fields>
- </scoreCardViewTemplate>
- </children>
-</neonView>
+<?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>MyDashboardScoreCard_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>Information</name>
+ <title>To-Do</title>
+ <fragment>Analyses/full</fragment>
+ <singleton v="true" />
+ <icon>VAADIN:CLIPBOARD_CHECK</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>tasks</name>
+ <title>Tasks</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>calendar</name>
+ <title>Calendar</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <scoreCardViewTemplate>
+ <name>Scorecard</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>158d3dd5-4de6-470b-b61d-6de1e9907264</name>
+ <entityField>OVERDUE_TASKS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>5bbd7580-6fdd-4134-b33a-1082f4891c7c</name>
+ <entityField>NEW_TASKS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3631eda6-dfda-4c75-9caa-8b2c2e7c39e4</name>
+ <entityField>IMMINENT_APPOINTMENTS</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index 11a8ea6866cb1b0fdd61e0fe94caca420a868eed..9ff898ddb00d41699c71cfaefb116654cf31636f 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -11,12 +11,21 @@
<children>
<tableViewTemplate>
<name>Table</name>
+ <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
+ <entryAction>rowClickAction</entryAction>
+ <showHeader v="true" />
+ <isSaveable v="false" />
+ <isEditable v="false" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>0ed20b46-be6a-424c-a583-a3f7496ec3f9</name>
+ <name>1cff3be1-523d-4a5a-b7d1-389d7cbb726f</name>
<entityField>ICON</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>0ed20b46-be6a-424c-a583-a3f7496ec3f9</name>
+ <entityField>CREATIONDATE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>3bf425ed-227c-4768-b339-4794aa0d6063</name>
<entityField>CAPTION</entityField>
@@ -25,10 +34,6 @@
<name>ff33a6c1-7ac6-4acd-a083-e56a36f89977</name>
<entityField>DESCRIPTION</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>63df503b-2502-4123-917a-77c932f61268</name>
- <entityField>ORIGINATORNAME</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>5cb09de4-4413-41e5-8a7c-4970a3cf6a62</name>
<entityField>STATE</entityField>
diff --git a/neonView/ObjectRelationTypeEdit_view/ObjectRelationTypeEdit_view.aod b/neonView/ObjectRelationTypeEdit_view/ObjectRelationTypeEdit_view.aod
index 2c89e7aaf5a2ac56411d4e3e9105fb2276aef838..587ab9e94becd69e8eea497ce03dfd74361508d3 100644
--- a/neonView/ObjectRelationTypeEdit_view/ObjectRelationTypeEdit_view.aod
+++ b/neonView/ObjectRelationTypeEdit_view/ObjectRelationTypeEdit_view.aod
@@ -1,44 +1,44 @@
-<?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>ObjectRelationTypeEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <isSmall v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Info</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>adb2c427-89fd-4f8d-abae-39c8273c9916</name>
- <entityField>SOURCE_RELATION_TITLE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ffaf9de0-6866-4d0a-80af-42b57169d83e</name>
- <entityField>SOURCE_OBJECT_TYPE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8c839d7f-31c2-4339-a74a-ff5fb83288df</name>
- <entityField>Type2Enabled_proxy</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0fd227e4-2896-4ce3-b699-8e5ce82a2862</name>
- <entityField>DEST_RELATION_TITLE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>e7578539-f60d-4136-af56-9fd587ed34ec</name>
- <entityField>DEST_OBJECT_TYPE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>945f613e-ce96-419d-8a71-f3196e41e444</name>
- <entityField>HIERARCHY</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>ObjectRelationTypeEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Info</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>adb2c427-89fd-4f8d-abae-39c8273c9916</name>
+ <entityField>SOURCE_RELATION_TITLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ffaf9de0-6866-4d0a-80af-42b57169d83e</name>
+ <entityField>SOURCE_OBJECT_TYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8c839d7f-31c2-4339-a74a-ff5fb83288df</name>
+ <entityField>Type2Enabled_proxy</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0fd227e4-2896-4ce3-b699-8e5ce82a2862</name>
+ <entityField>DEST_RELATION_TITLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e7578539-f60d-4136-af56-9fd587ed34ec</name>
+ <entityField>DEST_OBJECT_TYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>945f613e-ce96-419d-8a71-f3196e41e444</name>
+ <entityField>HIERARCHY</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ObjectRelationTypeFilter_view/ObjectRelationTypeFilter_view.aod b/neonView/ObjectRelationTypeFilter_view/ObjectRelationTypeFilter_view.aod
index 474bfcaaf5f51ab1861982ad275bc228d867326e..b1e0e1afb48350d6062b15d77aec93e5f6b2e290 100644
--- a/neonView/ObjectRelationTypeFilter_view/ObjectRelationTypeFilter_view.aod
+++ b/neonView/ObjectRelationTypeFilter_view/ObjectRelationTypeFilter_view.aod
@@ -1,38 +1,38 @@
-<?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>ObjectRelationTypeFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>RelationTypes</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>e526e3fb-2776-42f9-b75e-67a5dc7bde9d</name>
- <entityField>SOURCE_RELATION_TITLE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>89ee84eb-b50b-47e4-863c-7537c8a2c1d0</name>
- <entityField>SOURCE_OBJECT_TYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>2230c73a-f5d9-44bb-bcfa-67d42a24881b</name>
- <entityField>DEST_RELATION_TITLE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>755d8ce7-3995-457c-b5f2-39f5aae361f6</name>
- <entityField>DEST_OBJECT_TYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>3e9e27c1-e971-4431-9f47-1d8fe436be76</name>
- <entityField>HIERARCHY</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>ObjectRelationTypeFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>RelationTypes</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>e526e3fb-2776-42f9-b75e-67a5dc7bde9d</name>
+ <entityField>SOURCE_RELATION_TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>89ee84eb-b50b-47e4-863c-7537c8a2c1d0</name>
+ <entityField>SOURCE_OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2230c73a-f5d9-44bb-bcfa-67d42a24881b</name>
+ <entityField>DEST_RELATION_TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>755d8ce7-3995-457c-b5f2-39f5aae361f6</name>
+ <entityField>DEST_OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>3e9e27c1-e971-4431-9f47-1d8fe436be76</name>
+ <entityField>HIERARCHY</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ObjectTreeEdit_view/ObjectTreeEdit_view.aod b/neonView/ObjectTreeEdit_view/ObjectTreeEdit_view.aod
index 84df33d76d26106a9ad4823f9a0a1fe528aea555..e20758a078855451fc99e2e590ddb3bc747cfed5 100644
--- a/neonView/ObjectTreeEdit_view/ObjectTreeEdit_view.aod
+++ b/neonView/ObjectTreeEdit_view/ObjectTreeEdit_view.aod
@@ -1,32 +1,32 @@
-<?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>ObjectTreeEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <isSmall v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>fd656c16-ef80-479f-a106-4741fb86c95f</name>
- <entityField>OBJECTRELATIONTYPEID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>81ec0bf6-132c-4046-b770-f65da3cd4b6e</name>
- <entityField>TARGET_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>04579da5-0609-4a43-97dd-9e773ec1a29b</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>ObjectTreeEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>fd656c16-ef80-479f-a106-4741fb86c95f</name>
+ <entityField>OBJECTRELATIONTYPEID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>81ec0bf6-132c-4046-b770-f65da3cd4b6e</name>
+ <entityField>TARGET_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>04579da5-0609-4a43-97dd-9e773ec1a29b</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ObjectTreeFilter_view/ObjectTreeFilter_view.aod b/neonView/ObjectTreeFilter_view/ObjectTreeFilter_view.aod
index 36498203200d5587def0786af4a0ec1a15c76ceb..ed8d4002c00dea70ad6c07ad55d6acd2d4419491 100644
--- a/neonView/ObjectTreeFilter_view/ObjectTreeFilter_view.aod
+++ b/neonView/ObjectTreeFilter_view/ObjectTreeFilter_view.aod
@@ -1,24 +1,24 @@
-<?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>ObjectTreeFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <treeViewTemplate>
- <name>ObjectRelations</name>
- <parentField>PARENT_ID</parentField>
- <favoriteActionGroup1>alter</favoriteActionGroup1>
- <nodeExpandedField>EXPANDED</nodeExpandedField>
- <titleField>TITLE</titleField>
- <descriptionField>INFO</descriptionField>
- <iconField>ICON</iconField>
- <hideContentSearch v="true" />
- <entityField>#ENTITY</entityField>
- </treeViewTemplate>
- </children>
-</neonView>
+<?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>ObjectTreeFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <treeViewTemplate>
+ <name>ObjectRelations</name>
+ <parentField>PARENT_ID</parentField>
+ <favoriteActionGroup1>alter</favoriteActionGroup1>
+ <nodeExpandedField>EXPANDED</nodeExpandedField>
+ <titleField>TITLE</titleField>
+ <descriptionField>INFO</descriptionField>
+ <iconField>ICON</iconField>
+ <hideContentSearch v="true" />
+ <entityField>#ENTITY</entityField>
+ </treeViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OfferCoverLetter_view/OfferCoverLetter_view.aod b/neonView/OfferCoverLetter_view/OfferCoverLetter_view.aod
index 3eb7add5eefa24bba18d5cee1d847b29ddb3118a..c16fba47be7d1fe724f8e707b2caf48f6029b587 100644
--- a/neonView/OfferCoverLetter_view/OfferCoverLetter_view.aod
+++ b/neonView/OfferCoverLetter_view/OfferCoverLetter_view.aod
@@ -1,30 +1,30 @@
-<?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>OfferCoverLetter_view</name>
- <title>Cover letter</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Details</name>
- <showDrawer v="true" />
- <drawerCaption>Cover letter</drawerCaption>
- <entityField>#ENTITY</entityField>
- <title></title>
- <fields>
- <entityFieldLink>
- <name>ab742325-7d03-4dfd-8afb-779dd8da805b</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8bf2a10e-e7e9-4f33-98cf-4ded02bf68a9</name>
- <entityField>HEADER</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>OfferCoverLetter_view</name>
+ <title>Cover letter</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Details</name>
+ <showDrawer v="true" />
+ <drawerCaption>Cover letter</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ <fields>
+ <entityFieldLink>
+ <name>ab742325-7d03-4dfd-8afb-779dd8da805b</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8bf2a10e-e7e9-4f33-98cf-4ded02bf68a9</name>
+ <entityField>HEADER</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index 8dae75fcec804d05780df05043f1ccc621f6a26b..27b34577ba50603f3da92ad84f61b1b880e62da3 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -56,6 +56,10 @@
<name>45ddf7c2-531b-4e18-826d-9c652ecc4d01</name>
<entityField>INFO</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>6005aedd-bbfb-452f-bdc8-3b99247022d9</name>
+ <entityField>chooseTEXHeader</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>ed71986f-303c-4118-a895-51ec31ba8775</name>
<entityField>HEADER</entityField>
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index ee8f03128aa738e1bdce1f7eb404d0ebd6eeb547..ce15ecfc7acbba67f3b9cf383fb3e744da71a5e2 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -1,93 +1,93 @@
-<?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>OfferFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>AllOffersDashlet</name>
- <title>Offers</title>
- <description>Show all offers</description>
- <fragment>Offer/filter</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:cart</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>offer</name>
- <title>Offer</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>SendOffersDashlet</name>
- <title>Sent offers</title>
- <description>Show all sent offers</description>
- <fragment>Offer/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZSI6ImU1ZDZiNWE0LTc1NzYtNDQwZi04MzMyLWJjNDAxNDdjMDMzNSIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:cart</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>offer</name>
- <title>Offer</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Offers</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>5755c4a7-0ec4-4ba8-9fa8-a64c440042f8</name>
- <entityField>IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4d40cee3-bcb1-4e67-8c1d-d5fc2e49cc11</name>
- <entityField>FullOfferCode</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>780087e7-ff3c-4592-90be-607357168295</name>
- <entityField>CONTACT_ID</entityField>
- <width v="75" />
- <expandRatio v="100" />
- </neonTableColumn>
- <neonTableColumn>
- <name>c5780864-ac2c-4650-8630-2690a9a074ea</name>
- <entityField>STATUS</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>443c8480-5676-43a3-9617-f86dae39c960</name>
- <entityField>OFFERDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>6f55da1e-281c-44ba-ab97-729b75516c32</name>
- <entityField>NET</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>a0e5fc8f-ce4f-4a79-902d-27f3e3ad2a3d</name>
- <entityField>CURRENCY</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>24440d2f-cb7a-4a5f-9d54-b1cd130908c8</name>
- <entityField>PROBABILITY</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>OfferFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>AllOffersDashlet</name>
+ <title>Offers</title>
+ <description>Show all offers</description>
+ <fragment>Offer/filter</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:cart</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>offer</name>
+ <title>Offer</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ <neonDashletConfiguration>
+ <name>SendOffersDashlet</name>
+ <title>Sent offers</title>
+ <description>Show all sent offers</description>
+ <fragment>Offer/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZSI6ImU1ZDZiNWE0LTc1NzYtNDQwZi04MzMyLWJjNDAxNDdjMDMzNSIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:cart</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>offer</name>
+ <title>Offer</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Offers</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>5755c4a7-0ec4-4ba8-9fa8-a64c440042f8</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4d40cee3-bcb1-4e67-8c1d-d5fc2e49cc11</name>
+ <entityField>FullOfferCode</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>780087e7-ff3c-4592-90be-607357168295</name>
+ <entityField>CONTACT_ID</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c5780864-ac2c-4650-8630-2690a9a074ea</name>
+ <entityField>STATUS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>443c8480-5676-43a3-9617-f86dae39c960</name>
+ <entityField>OFFERDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6f55da1e-281c-44ba-ab97-729b75516c32</name>
+ <entityField>NET</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a0e5fc8f-ce4f-4a79-902d-27f3e3ad2a3d</name>
+ <entityField>CURRENCY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>24440d2f-cb7a-4a5f-9d54-b1cd130908c8</name>
+ <entityField>PROBABILITY</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OfferMain_view/OfferMain_view.aod b/neonView/OfferMain_view/OfferMain_view.aod
index fbc90aac96fcf671f11fc34626716590116430b7..39f586c0e0ae8c60b84da8d905354bad968568d4 100644
--- a/neonView/OfferMain_view/OfferMain_view.aod
+++ b/neonView/OfferMain_view/OfferMain_view.aod
@@ -34,16 +34,16 @@
<entityField>Tasks</entityField>
<view>TaskFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>bc335644-c046-4362-9c7f-db6baa0b7394</name>
- <entityField>AttributeTree</entityField>
- <view>AttributeRelationTree_view</view>
- </neonViewReference>
<neonViewReference>
<name>e96f2fec-1a98-4380-895a-82ab78ba408a</name>
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>1e993b34-a5ce-4fe5-a299-9963fe5f1085</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
<neonViewReference>
<name>d79a0304-4106-4749-b2e1-c5ba005b4448</name>
<entityField>LogHistoryConsumer</entityField>
diff --git a/neonView/OfferitemEdit_view/OfferitemEdit_view.aod b/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
index 52a11dc88e9969ec87a44efe8fdd271c388d06d4..e2a37f682b4bad8d064947d60bcb8c9db17d5a07 100644
--- a/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
+++ b/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
@@ -2,6 +2,7 @@
<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>OfferitemEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod b/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
index 9db36fae73c345f5663a68afad952b7e5528c8df..2b839526316d8e0fa868e98b59efe3acbd30a0a7 100644
--- a/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
+++ b/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
@@ -1,55 +1,55 @@
-<?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>OfferitemMultiEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <genericMultipleViewTemplate>
- <name>MultipleEdit</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>12f27f34-ab2d-4025-99ec-5377ff392466</name>
- <entityField>ITEMPOSITION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ba428fc1-4f38-4888-b48d-35ef4cec5b7c</name>
- <entityField>PRODUCT_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>6f4713ef-5642-4d2f-8ac1-eb315ca27fed</name>
- <entityField>QUANTITY</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>9aeb9256-a31a-4a96-bae7-d9a007191254</name>
- <entityField>UNIT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>d97355ec-c266-4ef3-ac3a-dae3507c3a85</name>
- <entityField>PRICE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>78f80e28-dfd1-44d5-8d7a-c45c63aa89e8</name>
- <entityField>DISCOUNT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>d0255477-0e96-48eb-9596-c5ab523a2622</name>
- <entityField>VAT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>c60f6315-5b63-4c4a-96fa-eaa99b94646e</name>
- <entityField>OPTIONAL</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>a605715e-5efc-4aeb-860f-f16ff4b80321</name>
- <entityField>INFO</entityField>
- </neonTableColumn>
- </columns>
- </genericMultipleViewTemplate>
- </children>
-</neonView>
+<?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>OfferitemMultiEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>MultipleEdit</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>12f27f34-ab2d-4025-99ec-5377ff392466</name>
+ <entityField>ITEMPOSITION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ba428fc1-4f38-4888-b48d-35ef4cec5b7c</name>
+ <entityField>PRODUCT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6f4713ef-5642-4d2f-8ac1-eb315ca27fed</name>
+ <entityField>QUANTITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9aeb9256-a31a-4a96-bae7-d9a007191254</name>
+ <entityField>UNIT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d97355ec-c266-4ef3-ac3a-dae3507c3a85</name>
+ <entityField>PRICE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>78f80e28-dfd1-44d5-8d7a-c45c63aa89e8</name>
+ <entityField>DISCOUNT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d0255477-0e96-48eb-9596-c5ab523a2622</name>
+ <entityField>VAT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c60f6315-5b63-4c4a-96fa-eaa99b94646e</name>
+ <entityField>OPTIONAL</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a605715e-5efc-4aeb-860f-f16ff4b80321</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/Options1_View/Options1_View.aod b/neonView/Options1_View/Options1_View.aod
index 492de6430c08c538cf1217f32b86eae625bf86ac..0dbf0b3d310ed13cb4e966e1feca1c3c9a318d36 100644
--- a/neonView/Options1_View/Options1_View.aod
+++ b/neonView/Options1_View/Options1_View.aod
@@ -1,29 +1,29 @@
-<?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>Options1_View</name>
- <title>Group1</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Options</name>
- <showDrawer v="true" />
- <drawerCaption></drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>fccab195-3408-4119-ab40-598125af4e2c</name>
- <entityField>Option1</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3eea0976-79bf-41f2-aeeb-57607f92a902</name>
- <entityField>Option2</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>Options1_View</name>
+ <title>Group1</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Options</name>
+ <showDrawer v="true" />
+ <drawerCaption></drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>fccab195-3408-4119-ab40-598125af4e2c</name>
+ <entityField>Option1</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3eea0976-79bf-41f2-aeeb-57607f92a902</name>
+ <entityField>Option2</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/Options2_View/Options2_View.aod b/neonView/Options2_View/Options2_View.aod
index 369889ca34486a0d06be4dc8ef3b45aac0898785..9ec3572f41814c3d1e5b8e69685bd0a676349be9 100644
--- a/neonView/Options2_View/Options2_View.aod
+++ b/neonView/Options2_View/Options2_View.aod
@@ -1,28 +1,28 @@
-<?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>Options2_View</name>
- <title>Group2</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Options</name>
- <showDrawer v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>a53a3fab-877d-4402-8daf-1205be48b2ae</name>
- <entityField>Option3</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4197c1ba-3520-4c2a-bd8e-85e08c9bb478</name>
- <entityField>Option4</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>Options2_View</name>
+ <title>Group2</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Options</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>a53a3fab-877d-4402-8daf-1205be48b2ae</name>
+ <entityField>Option3</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4197c1ba-3520-4c2a-bd8e-85e08c9bb478</name>
+ <entityField>Option4</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/Options_View/Options_View.aod b/neonView/Options_View/Options_View.aod
index 6ca564e9c7e0d6344a2b5b7f9be396d5a0950993..129b10215d36311f41735cb1bf49795693dc9f04 100644
--- a/neonView/Options_View/Options_View.aod
+++ b/neonView/Options_View/Options_View.aod
@@ -1,23 +1,23 @@
-<?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>Options_View</name>
- <title>Options</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <masterSlaveLayout>
- <name>layout</name>
- </masterSlaveLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>Group1</name>
- <entityField>#ENTITY</entityField>
- <view>Options1_View</view>
- </neonViewReference>
- <neonViewReference>
- <name>Group2</name>
- <entityField>#ENTITY</entityField>
- <view>Options2_View</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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>Options_View</name>
+ <title>Options</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>Group1</name>
+ <entityField>#ENTITY</entityField>
+ <view>Options1_View</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>Group2</name>
+ <entityField>#ENTITY</entityField>
+ <view>Options2_View</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/OrderDetail_view/OrderDetail_view.aod b/neonView/OrderDetail_view/OrderDetail_view.aod
index b64c1463029003a06205c309aef7eb0a0f25cc57..fffa1a47cf616548bc615b5f7150de889af0e20d 100644
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
@@ -1,29 +1,29 @@
-<?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>OrderDetail_view</name>
- <title>Details</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Details</name>
- <showDrawer v="true" />
- <drawerCaption>Detail</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>8bf2a10e-e7e9-4f33-98cf-4ded02bf68a9</name>
- <entityField>HEADER</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>d6f2774b-34c2-4db8-9730-e98b4c83503a</name>
- <entityField>FOOTER</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>OrderDetail_view</name>
+ <title>Details</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Details</name>
+ <showDrawer v="true" />
+ <drawerCaption>Detail</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>8bf2a10e-e7e9-4f33-98cf-4ded02bf68a9</name>
+ <entityField>HEADER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d6f2774b-34c2-4db8-9730-e98b4c83503a</name>
+ <entityField>FOOTER</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index 0c2cb08ffc4b05dab0f2d3a167f55501d47086f1..4ab1486bce9311639a49a605ca5253f5c206c721 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -1,89 +1,89 @@
-<?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>OrderFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>AllOrdersDashlet</name>
- <title>Receipts</title>
- <description>Show all receipts</description>
- <fragment>Order/filter</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>VAADIN:FILE_TEXT_O</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>order</name>
- <title>Receipt</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>SendOrdersDashlet</name>
- <title>Sent receipts</title>
- <description>Show all sent receipts</description>
- <fragment>Order/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZUtleSI6IjIiLCJ2YWx1ZSI6IlZlcnNlbmRldCIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>VAADIN:FILE_TEXT_O</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>order</name>
- <title>Receipt</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Orders</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>8d4948c3-40cb-45dd-ae04-32ae06458b26</name>
- <entityField>IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>60b83daa-9349-4bef-94d8-5f1fc350da59</name>
- <entityField>SALESORDERCODE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>5688908f-7c50-46a3-8899-2767ea5b4a90</name>
- <entityField>CONTACT_ID</entityField>
- <width v="75" />
- <expandRatio v="100" />
- </neonTableColumn>
- <neonTableColumn>
- <name>443c8480-5676-43a3-9617-f86dae39c960</name>
- <entityField>SALESORDERDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>c5780864-ac2c-4650-8630-2690a9a074ea</name>
- <entityField>STATUS</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>6f55da1e-281c-44ba-ab97-729b75516c32</name>
- <entityField>NET</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>a0e5fc8f-ce4f-4a79-902d-27f3e3ad2a3d</name>
- <entityField>CURRENCY</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>OrderFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>AllOrdersDashlet</name>
+ <title>Receipts</title>
+ <description>Show all receipts</description>
+ <fragment>Order/filter</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>VAADIN:FILE_TEXT_O</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>order</name>
+ <title>Receipt</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ <neonDashletConfiguration>
+ <name>SendOrdersDashlet</name>
+ <title>Sent receipts</title>
+ <description>Show all sent receipts</description>
+ <fragment>Order/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZUtleSI6IjIiLCJ2YWx1ZSI6IlZlcnNlbmRldCIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>VAADIN:FILE_TEXT_O</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>order</name>
+ <title>Receipt</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Orders</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>8d4948c3-40cb-45dd-ae04-32ae06458b26</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>60b83daa-9349-4bef-94d8-5f1fc350da59</name>
+ <entityField>SALESORDERCODE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>5688908f-7c50-46a3-8899-2767ea5b4a90</name>
+ <entityField>CONTACT_ID</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>443c8480-5676-43a3-9617-f86dae39c960</name>
+ <entityField>SALESORDERDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c5780864-ac2c-4650-8630-2690a9a074ea</name>
+ <entityField>STATUS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6f55da1e-281c-44ba-ab97-729b75516c32</name>
+ <entityField>NET</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a0e5fc8f-ce4f-4a79-902d-27f3e3ad2a3d</name>
+ <entityField>CURRENCY</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
index 99689b6ae5ab97edaa1932c62fcfd0049954b8bc..002197a5c6de2abd4691ae1a2500eda1b1dca770 100644
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
@@ -1,60 +1,60 @@
-<?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>OrderitemFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Orderitems</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>8c74810d-d127-4e64-8fbf-1b3db1835232</name>
- <entityField>ITEMPOSITION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>545f79bf-2fee-4112-9541-0889d0e514eb</name>
- <entityField>PRODUCT_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>2a907da4-b48d-4933-bc17-a40e7d4556f9</name>
- <entityField>QUANTITY</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>a8dcb2bb-bb09-4a6e-b0f0-1b4d1111eb22</name>
- <entityField>UNIT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>33ef0703-d4ea-4187-b555-648a1733ee99</name>
- <entityField>PRICE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>61a39c6b-f7dd-487c-bc5f-c2e95376ec37</name>
- <entityField>DISCOUNT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>bfd34c94-1a5f-4caf-ae6e-2c09375c023c</name>
- <entityField>VAT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
- <entityField>OPTIONAL</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>03a15cab-67d9-4e9d-b911-0d5599c87671</name>
- <entityField>INFO</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>eecc066d-e380-4fe7-9e9b-99d80842981d</name>
- <entityField>TotalPrice</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>OrderitemFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Orderitems</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>8c74810d-d127-4e64-8fbf-1b3db1835232</name>
+ <entityField>ITEMPOSITION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>545f79bf-2fee-4112-9541-0889d0e514eb</name>
+ <entityField>PRODUCT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2a907da4-b48d-4933-bc17-a40e7d4556f9</name>
+ <entityField>QUANTITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a8dcb2bb-bb09-4a6e-b0f0-1b4d1111eb22</name>
+ <entityField>UNIT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>33ef0703-d4ea-4187-b555-648a1733ee99</name>
+ <entityField>PRICE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>61a39c6b-f7dd-487c-bc5f-c2e95376ec37</name>
+ <entityField>DISCOUNT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>bfd34c94-1a5f-4caf-ae6e-2c09375c023c</name>
+ <entityField>VAT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
+ <entityField>OPTIONAL</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>03a15cab-67d9-4e9d-b911-0d5599c87671</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>eecc066d-e380-4fe7-9e9b-99d80842981d</name>
+ <entityField>TotalPrice</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod b/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
index 684f0e1de2ac13f6acbd1b6f8a33392c9f06afa9..783351091f308e6da05114587b972d51c9db4a31 100644
--- a/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
+++ b/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
@@ -1,55 +1,55 @@
-<?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>OrderitemMultiEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericMultipleViewTemplate>
- <name>MultipleEdit</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>12f27f34-ab2d-4025-99ec-5377ff392466</name>
- <entityField>ITEMPOSITION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ba428fc1-4f38-4888-b48d-35ef4cec5b7c</name>
- <entityField>PRODUCT_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>6f4713ef-5642-4d2f-8ac1-eb315ca27fed</name>
- <entityField>QUANTITY</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>9aeb9256-a31a-4a96-bae7-d9a007191254</name>
- <entityField>UNIT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>d97355ec-c266-4ef3-ac3a-dae3507c3a85</name>
- <entityField>PRICE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>78f80e28-dfd1-44d5-8d7a-c45c63aa89e8</name>
- <entityField>DISCOUNT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>d0255477-0e96-48eb-9596-c5ab523a2622</name>
- <entityField>VAT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>c60f6315-5b63-4c4a-96fa-eaa99b94646e</name>
- <entityField>OPTIONAL</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>96f0b5bd-6187-44ad-aac0-15ac262e30a2</name>
- <entityField>INFO</entityField>
- </neonTableColumn>
- </columns>
- </genericMultipleViewTemplate>
- </children>
-</neonView>
+<?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>OrderitemMultiEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>MultipleEdit</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>12f27f34-ab2d-4025-99ec-5377ff392466</name>
+ <entityField>ITEMPOSITION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ba428fc1-4f38-4888-b48d-35ef4cec5b7c</name>
+ <entityField>PRODUCT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6f4713ef-5642-4d2f-8ac1-eb315ca27fed</name>
+ <entityField>QUANTITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9aeb9256-a31a-4a96-bae7-d9a007191254</name>
+ <entityField>UNIT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d97355ec-c266-4ef3-ac3a-dae3507c3a85</name>
+ <entityField>PRICE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>78f80e28-dfd1-44d5-8d7a-c45c63aa89e8</name>
+ <entityField>DISCOUNT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d0255477-0e96-48eb-9596-c5ab523a2622</name>
+ <entityField>VAT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c60f6315-5b63-4c4a-96fa-eaa99b94646e</name>
+ <entityField>OPTIONAL</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>96f0b5bd-6187-44ad-aac0-15ac262e30a2</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrderitemPreview_view/OrderitemPreview_view.aod b/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
index 9cf09add5fc3db3568e6592679b0a876ab7a5faf..cfe31daf6b6f985a6f99916002e333df985d215c 100644
--- a/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
+++ b/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
@@ -1,39 +1,39 @@
-<?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>OrderitemPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>IMAGE</iconField>
- <titleField>ITEMNAME</titleField>
- <descriptionField>INFO</descriptionField>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <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>e25386dc-a740-4f93-a1f0-32317cf5a36a</name>
- <entityField>OPTIONAL</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>OrderitemPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Header</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>IMAGE</iconField>
+ <titleField>ITEMNAME</titleField>
+ <descriptionField>INFO</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <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>e25386dc-a740-4f93-a1f0-32317cf5a36a</name>
+ <entityField>OPTIONAL</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod b/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
index 67713dbe162982f4748096ecf637d25f0bf421f1..994f0d4875d113c881c82a419e0065b40a887d8a 100644
--- a/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
+++ b/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
@@ -2,6 +2,7 @@
<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>OrganisationEditDefaults_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
index ba23ce75d87d07174812cbe14ef41cffdd104bb1..735b49420282c81b68ce49bbf8236420c607bb4b 100644
--- a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
+++ b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
@@ -1,38 +1,38 @@
-<?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>OrganisationLookup_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Organisations</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>8c14a108-c672-4b48-bd10-b5ca2e777168</name>
- <entityField>#IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>c2b34d5e-cefa-4bea-88bb-b62874956c19</name>
- <entityField>NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>61a8f2be-98d3-4bfc-84c2-35b60aa0e2d6</name>
- <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>44f2a229-3288-448e-9f74-b29751ab3c49</name>
- <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>6e0191b5-468b-41f6-b87e-732bb1c0ded8</name>
- <entityField>ADDRESS_ID</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>OrganisationLookup_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Organisations</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>8c14a108-c672-4b48-bd10-b5ca2e777168</name>
+ <entityField>#IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c2b34d5e-cefa-4bea-88bb-b62874956c19</name>
+ <entityField>NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>61a8f2be-98d3-4bfc-84c2-35b60aa0e2d6</name>
+ <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>44f2a229-3288-448e-9f74-b29751ab3c49</name>
+ <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6e0191b5-468b-41f6-b87e-732bb1c0ded8</name>
+ <entityField>ADDRESS_ID</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index 4ac4e0f35270000aff358c1a72d47d3176488bb5..2b02edb17989e14ce99df03ceff2f19cc74e3bd1 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -1,54 +1,54 @@
-<?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>OrganisationPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>PICTURE</iconField>
- <titleField>NAME</titleField>
- <descriptionField>CUSTOMERCODE_DISPLAY_fieldGroup</descriptionField>
- <favoriteAction1>newActivity</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <neonViewReference>
- <name>2cb11b4e-dd8e-419b-8fff-ef0852ef2641</name>
- <entityField>Communications</entityField>
- <view>CommunicationList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>df605bb6-5d18-4233-abc0-1da82e4910ca</name>
- <entityField>Addresses</entityField>
- <view>AddressList_view</view>
- </neonViewReference>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>4bad7219-1a3a-4e6e-ae5a-533d3acb6845</name>
- <entityField>LANGUAGE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>5a397737-2768-4e16-8c58-890b8a26b4a2</name>
- <entityField>STATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>89e9aa74-1568-4f74-b42a-a02b13752802</name>
- <entityField>TYPE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>180e8467-4eb2-4f89-a59f-ff76b8810925</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>OrganisationPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Header</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>PICTURE</iconField>
+ <titleField>NAME</titleField>
+ <descriptionField>CUSTOMERCODE_DISPLAY_fieldGroup</descriptionField>
+ <favoriteAction1>newActivity</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <neonViewReference>
+ <name>2cb11b4e-dd8e-419b-8fff-ef0852ef2641</name>
+ <entityField>Communications</entityField>
+ <view>CommunicationList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>df605bb6-5d18-4233-abc0-1da82e4910ca</name>
+ <entityField>Addresses</entityField>
+ <view>AddressList_view</view>
+ </neonViewReference>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>4bad7219-1a3a-4e6e-ae5a-533d3acb6845</name>
+ <entityField>LANGUAGE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>5a397737-2768-4e16-8c58-890b8a26b4a2</name>
+ <entityField>STATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>89e9aa74-1568-4f74-b42a-a02b13752802</name>
+ <entityField>TYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>180e8467-4eb2-4f89-a59f-ff76b8810925</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/PersonDetail_view/PersonDetail_view.aod b/neonView/PersonDetail_view/PersonDetail_view.aod
index c09b04ddf5c789b92a83f135fb262a2c1b433d4e..8f093cb6094fda2662e09b20261105b0d488b25a 100644
--- a/neonView/PersonDetail_view/PersonDetail_view.aod
+++ b/neonView/PersonDetail_view/PersonDetail_view.aod
@@ -1,35 +1,35 @@
-<?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>PersonDetail_view</name>
- <title>Details</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Details</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>c08b6952-9825-42fa-9b42-7a20a376fec7</name>
- <entityField>FULL_NAME_fieldGroup</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>bfd5e2d2-d89d-4c90-a8e2-f85fb2cc48f3</name>
- <entityField>GENDER</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>39ca0ab2-b2d5-4d56-9ded-f8df1ae4dd0a</name>
- <entityField>LANGUAGE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>86e3b7c4-44ee-4fd4-83f1-2842a0eabda7</name>
- <entityField>ORGNAME</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>PersonDetail_view</name>
+ <title>Details</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Details</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>c08b6952-9825-42fa-9b42-7a20a376fec7</name>
+ <entityField>FULL_NAME_fieldGroup</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bfd5e2d2-d89d-4c90-a8e2-f85fb2cc48f3</name>
+ <entityField>GENDER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>39ca0ab2-b2d5-4d56-9ded-f8df1ae4dd0a</name>
+ <entityField>LANGUAGE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>86e3b7c4-44ee-4fd4-83f1-2842a0eabda7</name>
+ <entityField>ORGNAME</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/PersonEditDefaults_view/PersonEditDefaults_view.aod b/neonView/PersonEditDefaults_view/PersonEditDefaults_view.aod
index f5a9a421c5d12b9839ec58d39d6716d7691b1695..f9e87e7b583b12e2d260fd52cac13c54be1145f8 100644
--- a/neonView/PersonEditDefaults_view/PersonEditDefaults_view.aod
+++ b/neonView/PersonEditDefaults_view/PersonEditDefaults_view.aod
@@ -2,6 +2,7 @@
<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>PersonEditDefaults_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/PersonLookup_view/PersonLookup_view.aod b/neonView/PersonLookup_view/PersonLookup_view.aod
index 9d5267529859cd20da454c829fb587f75c00f88e..01da1a8660b63258989e90a12c496476dd37adc2 100644
--- a/neonView/PersonLookup_view/PersonLookup_view.aod
+++ b/neonView/PersonLookup_view/PersonLookup_view.aod
@@ -1,42 +1,42 @@
-<?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>PersonLookup_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Persons</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>9541c336-10e9-4767-b6e5-52b6108d967a</name>
- <entityField>#IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>876baf47-81c8-477a-951c-18df2dd4d972</name>
- <entityField>FIRSTNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>fb150402-a576-4e21-855c-91dd7574f353</name>
- <entityField>LASTNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>768f2294-2c4e-4c71-9992-ee9cea299041</name>
- <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>eb778e57-1f2d-436e-b22a-e92f7a190606</name>
- <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>27d03313-3ec6-438f-b79b-724369316ef3</name>
- <entityField>ADDRESS_ID</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>PersonLookup_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Persons</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>9541c336-10e9-4767-b6e5-52b6108d967a</name>
+ <entityField>#IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>876baf47-81c8-477a-951c-18df2dd4d972</name>
+ <entityField>FIRSTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>fb150402-a576-4e21-855c-91dd7574f353</name>
+ <entityField>LASTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>768f2294-2c4e-4c71-9992-ee9cea299041</name>
+ <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>eb778e57-1f2d-436e-b22a-e92f7a190606</name>
+ <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>27d03313-3ec6-438f-b79b-724369316ef3</name>
+ <entityField>ADDRESS_ID</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
index 4948fa0ae20d3ab16c766c03ef30bdedaffae570..eff1b886601523dc24d025511ec35177ff5b26c3 100644
--- a/neonView/PersonPreview_view/PersonPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_view.aod
@@ -37,14 +37,6 @@
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
- <entityFieldLink>
- <name>b1fae414-9818-48ff-8774-c310caf34d79</name>
- <entityField>SALUTATION</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c12f22ff-3536-45b6-b26f-1d8de6b5aea0</name>
- <entityField>TITLE</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>f9875d78-3d72-47d3-b729-9cf80d236f6e</name>
<entityField>GENDER</entityField>
diff --git a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
index 30b81a27aac3ade30157dd6216b1acad3b3da580..e9408e8d52ef829ae699cccca46ae7130c9021d1 100644
--- a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
+++ b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
@@ -1,46 +1,46 @@
-<?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>PersonSimpleList_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Persons</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>d6207ade-29e7-4af0-ba5f-e9ddd799de7b</name>
- <entityField>#IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>1053d3a7-c5ee-4260-86f6-54e820f53e9f</name>
- <entityField>SALUTATION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>a7eb48e2-d2a0-4ddb-b197-74ee77896960</name>
- <entityField>TITLE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>302d875b-644d-4f75-b8c2-f99bab8ae88d</name>
- <entityField>FIRSTNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>eacb1707-191c-4f09-b213-fbe87988c523</name>
- <entityField>LASTNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>38e8ea31-060d-4a4c-aa70-a6752019dcff</name>
- <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>60cb743a-7a1f-4faa-92d6-780bd2ad0564</name>
- <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>PersonSimpleList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Persons</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>d6207ade-29e7-4af0-ba5f-e9ddd799de7b</name>
+ <entityField>#IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1053d3a7-c5ee-4260-86f6-54e820f53e9f</name>
+ <entityField>SALUTATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a7eb48e2-d2a0-4ddb-b197-74ee77896960</name>
+ <entityField>TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>302d875b-644d-4f75-b8c2-f99bab8ae88d</name>
+ <entityField>FIRSTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>eacb1707-191c-4f09-b213-fbe87988c523</name>
+ <entityField>LASTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>38e8ea31-060d-4a4c-aa70-a6752019dcff</name>
+ <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>60cb743a-7a1f-4faa-92d6-780bd2ad0564</name>
+ <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod b/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod
index fc5c333248e7eda23103f6092291af70fa3699b3..64c811afd8e155050255bdfec9f8cfd9391a3f6a 100644
--- a/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod
+++ b/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod
@@ -1,36 +1,36 @@
-<?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>Prod2ProdEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <isSmall v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>a522d552-60cd-4b79-827f-64bb9b551f57</name>
- <entityField>SOURCE_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>868f8e9b-c863-4515-8aec-0b3d8c7657b5</name>
- <entityField>QUANTITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>79c10c6e-d84e-4147-b4a6-fb283cc3521e</name>
- <entityField>OPTIONAL</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>7fb15e31-bb91-47a8-9ae4-15cc1734d7ee</name>
- <entityField>TAKEPRICE</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>Prod2ProdEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>a522d552-60cd-4b79-827f-64bb9b551f57</name>
+ <entityField>SOURCE_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>868f8e9b-c863-4515-8aec-0b3d8c7657b5</name>
+ <entityField>QUANTITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>79c10c6e-d84e-4147-b4a6-fb283cc3521e</name>
+ <entityField>OPTIONAL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7fb15e31-bb91-47a8-9ae4-15cc1734d7ee</name>
+ <entityField>TAKEPRICE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ProductDescription_view/ProductDescription_view.aod b/neonView/ProductDescription_view/ProductDescription_view.aod
index 27be19e6d9bcd2408ac68eeb00026126c90112d1..b5f0f9e807ae07a33d7f8f3eca82c6a53086666b 100644
--- a/neonView/ProductDescription_view/ProductDescription_view.aod
+++ b/neonView/ProductDescription_view/ProductDescription_view.aod
@@ -1,29 +1,29 @@
-<?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>ProductDescription_view</name>
- <title>Description</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <drawerCaption>Description</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>f0743860-a2f8-4c9c-998f-200ad1e67bb2</name>
- <entityField>LANGUAGE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>cd7cd596-0f25-4067-9aac-5ee188a3af64</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>ProductDescription_view</name>
+ <title>Description</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Description</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>f0743860-a2f8-4c9c-998f-200ad1e67bb2</name>
+ <entityField>LANGUAGE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>cd7cd596-0f25-4067-9aac-5ee188a3af64</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ProductFilter_view/ProductFilter_view.aod b/neonView/ProductFilter_view/ProductFilter_view.aod
index 51e6a88b6443da181609e32946ea9b025cf99e94..b31994e0ae9ee65a12cb55c5f59e995ae1316ea4 100644
--- a/neonView/ProductFilter_view/ProductFilter_view.aod
+++ b/neonView/ProductFilter_view/ProductFilter_view.aod
@@ -1,76 +1,76 @@
-<?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>ProductFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>AllProductsDashlet</name>
- <title>Products</title>
- <description>Show all products</description>
- <fragment>Product/filter</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:hammer</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>product</name>
- <title>Product</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Products</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>bf58edbf-0708-41a7-a092-ebc87a60c3c2</name>
- <entityField>IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>913381d1-91cc-4ec7-b732-b35ddab01b90</name>
- <entityField>test</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ee627d12-c60c-48c2-a86e-2a144f5853e6</name>
- <entityField>PRODUCTCODE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>cd013f0c-b9b0-4c5a-866b-53a9f69ad75e</name>
- <entityField>PRODUCTNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>346eab87-8fea-4828-8ea6-86af61f973ce</name>
- <entityField>GROUPCODEID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>3e774e1c-0998-4b2c-b876-22e99a79cb55</name>
- <entityField>STATUS</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4f31b5e8-0e09-4417-b9e9-96b69049b3cf</name>
- <entityField>CONTACT_ID</entityField>
- <width v="75" />
- <expandRatio v="100" />
- </neonTableColumn>
- <neonTableColumn>
- <name>9cfc7b76-3d75-4a26-a21f-3b2b1a2faac5</name>
- <entityField>UNIT</entityField>
- <width v="75" />
- <expandRatio v="100" />
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>ProductFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>AllProductsDashlet</name>
+ <title>Products</title>
+ <description>Show all products</description>
+ <fragment>Product/filter</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:hammer</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>product</name>
+ <title>Product</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Products</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>bf58edbf-0708-41a7-a092-ebc87a60c3c2</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>913381d1-91cc-4ec7-b732-b35ddab01b90</name>
+ <entityField>test</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ee627d12-c60c-48c2-a86e-2a144f5853e6</name>
+ <entityField>PRODUCTCODE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>cd013f0c-b9b0-4c5a-866b-53a9f69ad75e</name>
+ <entityField>PRODUCTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>346eab87-8fea-4828-8ea6-86af61f973ce</name>
+ <entityField>GROUPCODEID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>3e774e1c-0998-4b2c-b876-22e99a79cb55</name>
+ <entityField>STATUS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4f31b5e8-0e09-4417-b9e9-96b69049b3cf</name>
+ <entityField>CONTACT_ID</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9cfc7b76-3d75-4a26-a21f-3b2b1a2faac5</name>
+ <entityField>UNIT</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ProductPreview_view/ProductPreview_view.aod b/neonView/ProductPreview_view/ProductPreview_view.aod
index 7e1a9a45302931054f22caa2d0d7c63019d0c67f..cbe4e918fa8161d48ac38b5143ddc95c88dcab66 100644
--- a/neonView/ProductPreview_view/ProductPreview_view.aod
+++ b/neonView/ProductPreview_view/ProductPreview_view.aod
@@ -1,74 +1,74 @@
-<?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>ProductPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>IMAGE</iconField>
- <titleField>PRODUCTCODE</titleField>
- <descriptionField>PRODUCTNAME</descriptionField>
- <favoriteAction1>newActivity</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>c47d3f86-867d-4bc4-bcc3-6e22ff8efa6d</name>
- <entityField>GROUPCODEID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>505cc05b-0497-4baa-81cb-294ec6e1a133</name>
- <entityField>STATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>bd8e7e33-6fc6-48fe-b9be-931383f4d859</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>a5a3ecee-059d-4bf2-9654-abe3efd58510</name>
- <entityField>UNIT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>abef7fe5-88f6-44fe-af91-38487eb9b750</name>
- <entityField>ADVERTISING</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ba604dc5-06b2-44f2-a9b3-c4c3adb9f8f8</name>
- <entityField>MINSTOCK</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <genericViewTemplate>
- <name>ProductPriceCurrent</name>
- <showDrawer v="true" />
- <drawerCaption>Prices</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>e47628f5-dd89-4a5d-bb39-8edf8dba9e73</name>
- <entityField>currentPurchasePrice</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>da93c159-d0b2-41d4-8ebe-7f28f623356c</name>
- <entityField>currentSalesPrice</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>cf0f8792-3f4a-435d-b04c-16843e3f1cd4</name>
- <entityField>MainDocuments</entityField>
- <view>DocumentList_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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>ProductPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Header</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>IMAGE</iconField>
+ <titleField>PRODUCTCODE</titleField>
+ <descriptionField>PRODUCTNAME</descriptionField>
+ <favoriteAction1>newActivity</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>c47d3f86-867d-4bc4-bcc3-6e22ff8efa6d</name>
+ <entityField>GROUPCODEID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>505cc05b-0497-4baa-81cb-294ec6e1a133</name>
+ <entityField>STATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bd8e7e33-6fc6-48fe-b9be-931383f4d859</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>a5a3ecee-059d-4bf2-9654-abe3efd58510</name>
+ <entityField>UNIT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>abef7fe5-88f6-44fe-af91-38487eb9b750</name>
+ <entityField>ADVERTISING</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ba604dc5-06b2-44f2-a9b3-c4c3adb9f8f8</name>
+ <entityField>MINSTOCK</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>ProductPriceCurrent</name>
+ <showDrawer v="true" />
+ <drawerCaption>Prices</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>e47628f5-dd89-4a5d-bb39-8edf8dba9e73</name>
+ <entityField>currentPurchasePrice</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>da93c159-d0b2-41d4-8ebe-7f28f623356c</name>
+ <entityField>currentSalesPrice</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>cf0f8792-3f4a-435d-b04c-16843e3f1cd4</name>
+ <entityField>MainDocuments</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod b/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
index 4d0c69c899429e6c7118c605f9d60d37d2d56750..1e03e13850a41a952d37f22ec4b1b9e38d89fb5d 100644
--- a/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
+++ b/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
@@ -1,57 +1,57 @@
-<?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>ProductpriceEdit_view</name>
- <title>Price list</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <isSmall v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>e2afee84-173b-430a-8e29-1fd16d33dd69</name>
- <entityField>PRICELIST</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>21c8be49-ee64-4d9c-a8b0-eb44575cfd01</name>
- <entityField>PRODUCT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>fa21fa53-ac64-44b1-a5d1-8a1af16590fe</name>
- <entityField>VALID_FROM</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>62012f94-6139-4419-9124-12c6f6720a71</name>
- <entityField>VALID_TO</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>e82da6cf-63f2-4d52-a7e5-38e775b4c123</name>
- <entityField>PRICE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3685f50e-e21c-4091-9246-d042cf1e0fa9</name>
- <entityField>BUYSELL</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3a9e1f32-2c7e-42ab-8ffb-7e4e32c40bd6</name>
- <entityField>FROMQUANTITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>562e1b29-ba29-4eae-b8f0-473935ea62a3</name>
- <entityField>VAT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ca06ebcb-abf5-4606-98cd-fd54dccce6d0</name>
- <entityField>CURRENCY</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>ProductpriceEdit_view</name>
+ <title>Price list</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>e2afee84-173b-430a-8e29-1fd16d33dd69</name>
+ <entityField>PRICELIST</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>21c8be49-ee64-4d9c-a8b0-eb44575cfd01</name>
+ <entityField>PRODUCT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>fa21fa53-ac64-44b1-a5d1-8a1af16590fe</name>
+ <entityField>VALID_FROM</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>62012f94-6139-4419-9124-12c6f6720a71</name>
+ <entityField>VALID_TO</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e82da6cf-63f2-4d52-a7e5-38e775b4c123</name>
+ <entityField>PRICE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3685f50e-e21c-4091-9246-d042cf1e0fa9</name>
+ <entityField>BUYSELL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3a9e1f32-2c7e-42ab-8ffb-7e4e32c40bd6</name>
+ <entityField>FROMQUANTITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>562e1b29-ba29-4eae-b8f0-473935ea62a3</name>
+ <entityField>VAT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ca06ebcb-abf5-4606-98cd-fd54dccce6d0</name>
+ <entityField>CURRENCY</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod b/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod
index e014c2674003f2ddc968ebef0cc612ea7ad879cd..80dae257c9923647d887cebc7a44320ce1bff51d 100644
--- a/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod
+++ b/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod
@@ -1,26 +1,26 @@
-<?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>SalesprojectClassificationEntryEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>003f3304-b8fb-4009-ba55-b56d005191e3</name>
- <entityField>NAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>90630f8e-8e32-4743-9b79-a1faa6e26414</name>
- <entityField>VALUE</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectClassificationEntryEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>003f3304-b8fb-4009-ba55-b56d005191e3</name>
+ <entityField>NAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>90630f8e-8e32-4743-9b79-a1faa6e26414</name>
+ <entityField>VALUE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod b/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod
index 32393670ae7d33074fcc5bc9ddd0673035992b15..f3aac2c0b1e5630b2794daf0a4d35efd8162829d 100644
--- a/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod
+++ b/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod
@@ -1,35 +1,35 @@
-<?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>SalesprojectClassificationEntryPreview_view</name>
- <title>asdf</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- </headerFooterLayout>
- </layout>
- <children>
- <titledListViewTemplate>
- <name>Info</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>91aa4685-98f7-40e9-87be-877583a91143</name>
- <entityField>NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>88105c9a-fdf8-4d2b-ac96-d57ef4f41aa4</name>
- <entityField>TYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>b862235e-6595-4ae0-8bd0-5f942d975c67</name>
- <entityField>VALUE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ff2b615b-5c98-4a21-bb71-34027711d5e7</name>
- <entityField>POINTS</entityField>
- </neonTableColumn>
- </columns>
- </titledListViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectClassificationEntryPreview_view</name>
+ <title>asdf</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>Info</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>91aa4685-98f7-40e9-87be-877583a91143</name>
+ <entityField>NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>88105c9a-fdf8-4d2b-ac96-d57ef4f41aa4</name>
+ <entityField>TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>b862235e-6595-4ae0-8bd0-5f942d975c67</name>
+ <entityField>VALUE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ff2b615b-5c98-4a21-bb71-34027711d5e7</name>
+ <entityField>POINTS</entityField>
+ </neonTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod b/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod
index c12d4d020ed0be624ca97c968eaf8513307c9237..87da3752309443372ef83944905b3c79e605857f 100644
--- a/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod
+++ b/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod
@@ -1,26 +1,26 @@
-<?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>SalesprojectClassificationFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Classifications</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>4139f5bd-0273-4b43-99a7-9122f0322170</name>
- <entityField>CLASSNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>9d31832d-86e4-49a8-99a5-2129cd6a1994</name>
- <entityField>POINTS</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectClassificationFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Classifications</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>4139f5bd-0273-4b43-99a7-9122f0322170</name>
+ <entityField>CLASSNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9d31832d-86e4-49a8-99a5-2129cd6a1994</name>
+ <entityField>POINTS</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod b/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
index 7fc86e847504296d1b616f06fc346fb3d866b6ad..93d3137486787d482825a37edc12f0b58e5a0080 100644
--- a/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
+++ b/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
@@ -1,31 +1,31 @@
-<?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>SalesprojectClassificationPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- </headerFooterLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Info</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>51712a19-9a8c-4967-bd15-a448b5bffb77</name>
- <entityField>CLASSNAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c3621e4e-53b0-4932-b943-e1c07fe16a24</name>
- <entityField>POINTS</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>c6c26fdd-3812-495f-bd30-d3a6cdcd4eb0</name>
- <entityField>SalesprojectClassificationEntries</entityField>
- <view>SalesprojectClassificationEntryPreview_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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>SalesprojectClassificationPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Info</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>51712a19-9a8c-4967-bd15-a448b5bffb77</name>
+ <entityField>CLASSNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c3621e4e-53b0-4932-b943-e1c07fe16a24</name>
+ <entityField>POINTS</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>c6c26fdd-3812-495f-bd30-d3a6cdcd4eb0</name>
+ <entityField>SalesprojectClassificationEntries</entityField>
+ <view>SalesprojectClassificationEntryPreview_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod b/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
index f07324516eb75e61d0841a18a2b4af2ae49faed7..1fba13ea39d0990722c2b9334394da2366ab85d2 100644
--- a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
+++ b/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
@@ -1,56 +1,56 @@
-<?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>SalesprojectCompetitionEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <isSmall v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>8b4c3245-7b3a-4cd0-90f0-09631e2dbde8</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>d6e1eaf9-3269-4350-a1a8-3f6517a167cf</name>
- <entityField>PHASE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>cdbba6a7-59d1-4831-b098-98a82ad46444</name>
- <entityField>STATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>256f0a57-5336-4877-a6d5-96c19f924047</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>b0f6a089-a131-4148-acec-818779669d86</name>
- <entityField>DATE_CANCELLED</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>087036b6-4b07-4f7e-90fe-b35c5ceb6dd9</name>
- <entityField>REASON</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>cb795feb-20f0-48d8-a147-5edb6a911d19</name>
- <entityField>PRICE_POLITICS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>755e1dc3-08f6-4a03-a572-3bb84ec73b05</name>
- <entityField>STRENGTH</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>e14f29e5-36ff-4740-ae72-854d713c3f8f</name>
- <entityField>WEAKNESS</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectCompetitionEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>8b4c3245-7b3a-4cd0-90f0-09631e2dbde8</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d6e1eaf9-3269-4350-a1a8-3f6517a167cf</name>
+ <entityField>PHASE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>cdbba6a7-59d1-4831-b098-98a82ad46444</name>
+ <entityField>STATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>256f0a57-5336-4877-a6d5-96c19f924047</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>b0f6a089-a131-4148-acec-818779669d86</name>
+ <entityField>DATE_CANCELLED</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>087036b6-4b07-4f7e-90fe-b35c5ceb6dd9</name>
+ <entityField>REASON</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>cb795feb-20f0-48d8-a147-5edb6a911d19</name>
+ <entityField>PRICE_POLITICS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>755e1dc3-08f6-4a03-a572-3bb84ec73b05</name>
+ <entityField>STRENGTH</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e14f29e5-36ff-4740-ae72-854d713c3f8f</name>
+ <entityField>WEAKNESS</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod b/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
index 72233eec4d73ce2a3248faaf5b8e352168a63a57..6236db526de5f5cdf0245e13bb4b72a6f638e8af 100644
--- a/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
+++ b/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
@@ -1,46 +1,46 @@
-<?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>SalesprojectCompetitionFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Competitions</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>511ea459-1b6f-41e8-b35a-0f67361c82eb</name>
- <entityField>CONTACT_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>5d146f0e-f0c7-4e7e-82e6-2b24bc241001</name>
- <entityField>PHASE</entityField>
- <width v="75" />
- <expandRatio v="100" />
- </neonTableColumn>
- <neonTableColumn>
- <name>322f7067-83ac-486e-9540-16d693775bdb</name>
- <entityField>STATUS</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>7143021a-18a5-4e78-a530-a46cd8dba1c8</name>
- <entityField>DATE_CANCELLED</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>1072d35e-6367-4f68-a92c-aae95c3e40b9</name>
- <entityField>REASON</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>8922dc2c-e9e1-4a1b-b9db-b1908510d4e8</name>
- <entityField>INFO</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectCompetitionFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Competitions</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>511ea459-1b6f-41e8-b35a-0f67361c82eb</name>
+ <entityField>CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>5d146f0e-f0c7-4e7e-82e6-2b24bc241001</name>
+ <entityField>PHASE</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>322f7067-83ac-486e-9540-16d693775bdb</name>
+ <entityField>STATUS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>7143021a-18a5-4e78-a530-a46cd8dba1c8</name>
+ <entityField>DATE_CANCELLED</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1072d35e-6367-4f68-a92c-aae95c3e40b9</name>
+ <entityField>REASON</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>8922dc2c-e9e1-4a1b-b9db-b1908510d4e8</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index 04505e731bafead634f8abb604c4782935fb49b1..7552475d87ac3897fb08596f26585c5f97c96a5d 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -1,92 +1,92 @@
-<?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>SalesprojectFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>AllSalesprojectDashlet</name>
- <title>Salesprojects</title>
- <description>Show all salesprojects</description>
- <fragment>Salesproject/filter</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:filter</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>salesproject</name>
- <title>Salesproject</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>OpenSalesprojectsDashlet</name>
- <title>Open salesprojects</title>
- <description>Show open salesprojects</description>
- <fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiMjViMGFjNzctZWY5Mi00ODA5LTgwMmUtYmI5ZDg3ODJmODY1IiwiY29udGVudFR5cGUiOiJURVhUIn1d</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:filter</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>salesproject</name>
- <title>Salesproject</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Salesprojects</name>
- <entityField>#ENTITY</entityField>
- <title></title>
- <columns>
- <neonTableColumn>
- <name>2cbd6486-e1e4-4660-94f9-1b71e29b11ba</name>
- <entityField>IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>6702bb75-1c57-42a7-9cf0-acd7cd8515f5</name>
- <entityField>CONTACT_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>9f6b967e-5140-420f-84ca-2273920221bd</name>
- <entityField>PROJECTTITLE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>fec843c3-f7c0-42c7-8295-50386651edb2</name>
- <entityField>STARTDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4cc3c3f1-6f86-434d-8d1d-32a965aa76b2</name>
- <entityField>ENDDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>92699fdb-4eea-4ce2-98d2-6cc3f3b7581e</name>
- <entityField>VOLUME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>2689fee8-bebb-4d7c-b11e-4a7310664977</name>
- <entityField>PHASE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>52a851b0-9059-4d57-8ff5-335c819359e8</name>
- <entityField>STATE</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>AllSalesprojectDashlet</name>
+ <title>Salesprojects</title>
+ <description>Show all salesprojects</description>
+ <fragment>Salesproject/filter</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:filter</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>salesproject</name>
+ <title>Salesproject</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ <neonDashletConfiguration>
+ <name>OpenSalesprojectsDashlet</name>
+ <title>Open salesprojects</title>
+ <description>Show open salesprojects</description>
+ <fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiMjViMGFjNzctZWY5Mi00ODA5LTgwMmUtYmI5ZDg3ODJmODY1IiwiY29udGVudFR5cGUiOiJURVhUIn1d</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:filter</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>salesproject</name>
+ <title>Salesproject</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Salesprojects</name>
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ <columns>
+ <neonTableColumn>
+ <name>2cbd6486-e1e4-4660-94f9-1b71e29b11ba</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6702bb75-1c57-42a7-9cf0-acd7cd8515f5</name>
+ <entityField>CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9f6b967e-5140-420f-84ca-2273920221bd</name>
+ <entityField>PROJECTTITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>fec843c3-f7c0-42c7-8295-50386651edb2</name>
+ <entityField>STARTDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4cc3c3f1-6f86-434d-8d1d-32a965aa76b2</name>
+ <entityField>ENDDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>92699fdb-4eea-4ce2-98d2-6cc3f3b7581e</name>
+ <entityField>VOLUME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2689fee8-bebb-4d7c-b11e-4a7310664977</name>
+ <entityField>PHASE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>52a851b0-9059-4d57-8ff5-335c819359e8</name>
+ <entityField>STATE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod b/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod
index 626e71ea6539a7164475d7f6c829ed5d53289ad6..4762fe310033f801a2bd17659e1d540437c1bee9 100644
--- a/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod
+++ b/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod
@@ -1,40 +1,40 @@
-<?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>SalesprojectForecastEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <isSmall v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>8c7e16f6-222d-4f8a-9cc6-74de1a0ee481</name>
- <entityField>GROUPCODE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>fefae7ed-072c-4c48-92fd-d3fa6ccd0711</name>
- <entityField>DATE_START</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>7bf22970-1a62-4d8f-b40a-b2d4e5fc4dd8</name>
- <entityField>VOLUME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>f5e95dd2-c853-48be-ad18-e5fdbe714873</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>382caf7e-d3db-4bac-af99-a95d62504da7</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectForecastEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>8c7e16f6-222d-4f8a-9cc6-74de1a0ee481</name>
+ <entityField>GROUPCODE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>fefae7ed-072c-4c48-92fd-d3fa6ccd0711</name>
+ <entityField>DATE_START</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7bf22970-1a62-4d8f-b40a-b2d4e5fc4dd8</name>
+ <entityField>VOLUME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f5e95dd2-c853-48be-ad18-e5fdbe714873</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>382caf7e-d3db-4bac-af99-a95d62504da7</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod b/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod
index 63f7e54df860019a04eace135ed6e27dd8705471..821a4c272d01aa615aedbc57e94b113e18eb7164 100644
--- a/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod
+++ b/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod
@@ -1,35 +1,35 @@
-<?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>SalesprojectForecastFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Forecasts</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>323f26d7-4ac2-4ff9-91d1-7459cc7e3469</name>
- <entityField>GROUPCODE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>c5422952-0a36-4963-a755-d513b4c8b23f</name>
- <entityField>DATE_START</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>24ecfbc3-5f8a-4ce1-b21b-663385845ff6</name>
- <entityField>VOLUME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>305d0254-a1ea-4733-87a7-a4d85fc78b7e</name>
- <entityField>INFO</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectForecastFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Forecasts</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>323f26d7-4ac2-4ff9-91d1-7459cc7e3469</name>
+ <entityField>GROUPCODE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c5422952-0a36-4963-a755-d513b4c8b23f</name>
+ <entityField>DATE_START</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>24ecfbc3-5f8a-4ce1-b21b-663385845ff6</name>
+ <entityField>VOLUME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>305d0254-a1ea-4733-87a7-a4d85fc78b7e</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod b/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod
index 8b7f0b9c84e4a46bb94aff397eb6a168831b3f13..48095804a33f48cf688bfe2afd0bcd0237ea6cef 100644
--- a/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod
+++ b/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod
@@ -1,35 +1,35 @@
-<?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>SalesprojectForecastPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <titleField>GROUPCODE</titleField>
- <descriptionField>DATE_START</descriptionField>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>796d2325-8684-4723-b376-262074268f4c</name>
- <entityField>VOLUME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>745f1f28-49a0-4c35-9c1a-e442d15716dc</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectForecastPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Header</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <titleField>GROUPCODE</titleField>
+ <descriptionField>DATE_START</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>796d2325-8684-4723-b376-262074268f4c</name>
+ <entityField>VOLUME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>745f1f28-49a0-4c35-9c1a-e442d15716dc</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod b/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
index c8bd8886231cc4481d9680a3f30462b8169ae2f5..72f201d902b6ad950f01672667761eae7ea092b9 100644
--- a/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
+++ b/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
@@ -1,28 +1,28 @@
-<?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>SalesprojectMemberEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <isSmall v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>0f78acf5-bea7-4c91-afe0-0907d20db131</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>b74ab5a3-2d3c-49e6-b7df-219b16ca22fd</name>
- <entityField>SALESPROJECT_ROLE</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectMemberEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>0f78acf5-bea7-4c91-afe0-0907d20db131</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>b74ab5a3-2d3c-49e6-b7df-219b16ca22fd</name>
+ <entityField>SALESPROJECT_ROLE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod b/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
index fe1a90deac900cb39a02966139204731459fd850..06067b78f960d356765705090c98860fe149422c 100644
--- a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
+++ b/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
@@ -1,43 +1,43 @@
-<?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>SalesprojectMemberFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Members</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>27e658bc-c134-4fef-a3a5-b172852d606e</name>
- <entityField>ORGANISATION_NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>59e6aea1-9752-48b5-9d91-43edd0c1d670</name>
- <entityField>PERSON_FULL_NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>bea82980-0639-405a-ab3f-92e45f97090e</name>
- <entityField>SALESPROJECT_ROLE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>a30a083a-be66-4690-a7b6-19860a9bc72e</name>
- <entityField>DEPARTMENT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>f02ac764-56a9-4f96-816e-37caa7854ac2</name>
- <entityField>CONTACTROLE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>c23f4e8b-87a1-4535-b2d1-f6c97d6bfe0b</name>
- <entityField>POSITION</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectMemberFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Members</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>27e658bc-c134-4fef-a3a5-b172852d606e</name>
+ <entityField>ORGANISATION_NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>59e6aea1-9752-48b5-9d91-43edd0c1d670</name>
+ <entityField>PERSON_FULL_NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>bea82980-0639-405a-ab3f-92e45f97090e</name>
+ <entityField>SALESPROJECT_ROLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a30a083a-be66-4690-a7b6-19860a9bc72e</name>
+ <entityField>DEPARTMENT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>f02ac764-56a9-4f96-816e-37caa7854ac2</name>
+ <entityField>CONTACTROLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c23f4e8b-87a1-4535-b2d1-f6c97d6bfe0b</name>
+ <entityField>POSITION</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod b/neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod
index 5075336ab8a62209ae9b092900eec7b8f8496614..4f2896e3c76acb8de54f27688c188c2bee670d70 100644
--- a/neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod
+++ b/neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod
@@ -1,20 +1,20 @@
-<?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>SalesprojectMilestoneChart_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <multiDataChartViewTemplate>
- <name>MilestoneChart</name>
- <chartType>COLUMN</chartType>
- <xAxis>VALUE</xAxis>
- <yAxis>DaysCount</yAxis>
- <categoryField>TYPE</categoryField>
- <entityField>#ENTITY</entityField>
- </multiDataChartViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectMilestoneChart_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <multiDataChartViewTemplate>
+ <name>MilestoneChart</name>
+ <chartType>COLUMN</chartType>
+ <xAxis>VALUE</xAxis>
+ <yAxis>DaysCount</yAxis>
+ <categoryField>TYPE</categoryField>
+ <entityField>#ENTITY</entityField>
+ </multiDataChartViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod b/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod
index 603dfb9ffa5354b8fcf974e27a9befa054e5ec25..7e2e145ac56f048f9355e2ac8fbf7d2e93ba19ae 100644
--- a/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod
+++ b/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod
@@ -1,23 +1,23 @@
-<?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>SalesprojectMilestone_view</name>
- <title>Milestones</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>30c775ea-7488-4dfd-8e6d-c65b7982849d</name>
- <entityField>SalesprojectStateMilestones</entityField>
- <view>SalesprojectMilestoneChart_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>cc8f1469-805f-4e2c-aa4f-d55f932c6deb</name>
- <entityField>SalesprojectPhaseMilestones</entityField>
- <view>SalesprojectMilestoneChart_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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>SalesprojectMilestone_view</name>
+ <title>Milestones</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>30c775ea-7488-4dfd-8e6d-c65b7982849d</name>
+ <entityField>SalesprojectStateMilestones</entityField>
+ <view>SalesprojectMilestoneChart_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>cc8f1469-805f-4e2c-aa4f-d55f932c6deb</name>
+ <entityField>SalesprojectPhaseMilestones</entityField>
+ <view>SalesprojectMilestoneChart_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 3cbdfdbad942b1e3fc8d7e6e0a7bf1b6836a24b9..3696d1a1edae0e1a63e90e6ed414d2ecb046a746 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -1,94 +1,94 @@
-<?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>SalesprojectPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Head</header>
- <footer>AdditionalInfo</footer>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Head</name>
- <iconField>IMAGE</iconField>
- <titleField>PROJECTTITLE</titleField>
- <subtitleField>CONTACT_ID</subtitleField>
- <descriptionField>PROJECTCODE</descriptionField>
- <favoriteAction1>newActivity</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Details</name>
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
- <entityField>RELATION_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4e3d7a37-f55b-4c18-9ba1-ab4ab0bbb442</name>
- <entityField>STATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>2867e662-b824-4bbf-8eaf-bbd34f44598e</name>
- <entityField>REASONS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ff0dcd67-56ec-4db1-8c53-531f22fda716</name>
- <entityField>PHASE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3164fe37-8ca0-44c0-bebe-b9573346fb72</name>
- <entityField>STARTDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>529e8b1f-014f-4b44-8bba-96869156ebf7</name>
- <entityField>ENDDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
- <entityField>PROBABILITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
- <entityField>VOLUME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
- <entityField>TIMETRACKINGSUM</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <drawerCaption>Further informations</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>9fe11db5-ec66-4238-9c56-5ace055f1d90</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>f3542270-e7bd-4f9f-b7c0-f6c5210bb337</name>
- <entityField>MainDocuments</entityField>
- <view>DocumentList_view</view>
- </neonViewReference>
- <scoreCardViewTemplate>
- <name>AdditionalInfo</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>79490331-6be4-422f-9450-da0db56f0654</name>
- <entityField>DAYS_NOTACTIVE</entityField>
- </entityFieldLink>
- </fields>
- </scoreCardViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Head</header>
+ <footer>AdditionalInfo</footer>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Head</name>
+ <iconField>IMAGE</iconField>
+ <titleField>PROJECTTITLE</titleField>
+ <subtitleField>CONTACT_ID</subtitleField>
+ <descriptionField>PROJECTCODE</descriptionField>
+ <favoriteAction1>newActivity</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Details</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
+ <entityField>RELATION_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4e3d7a37-f55b-4c18-9ba1-ab4ab0bbb442</name>
+ <entityField>STATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>2867e662-b824-4bbf-8eaf-bbd34f44598e</name>
+ <entityField>REASONS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ff0dcd67-56ec-4db1-8c53-531f22fda716</name>
+ <entityField>PHASE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3164fe37-8ca0-44c0-bebe-b9573346fb72</name>
+ <entityField>STARTDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>529e8b1f-014f-4b44-8bba-96869156ebf7</name>
+ <entityField>ENDDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
+ <entityField>PROBABILITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
+ <entityField>VOLUME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
+ <entityField>TIMETRACKINGSUM</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Further informations</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>9fe11db5-ec66-4238-9c56-5ace055f1d90</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>f3542270-e7bd-4f9f-b7c0-f6c5210bb337</name>
+ <entityField>MainDocuments</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ <scoreCardViewTemplate>
+ <name>AdditionalInfo</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>79490331-6be4-422f-9450-da0db56f0654</name>
+ <entityField>DAYS_NOTACTIVE</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectSourceEdit_view/SalesprojectSourceEdit_view.aod b/neonView/SalesprojectSourceEdit_view/SalesprojectSourceEdit_view.aod
index e022fe5f28cba9d24cab6a68cf328dd5e5c64a73..7dfd25bd034303c35c363015bfe0e4dc5d3e0573 100644
--- a/neonView/SalesprojectSourceEdit_view/SalesprojectSourceEdit_view.aod
+++ b/neonView/SalesprojectSourceEdit_view/SalesprojectSourceEdit_view.aod
@@ -1,32 +1,32 @@
-<?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>SalesprojectSourceEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <isSmall v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>9b5f8ee4-9950-43d8-902f-552e57bbc45e</name>
- <entityField>ENTRYDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>594e9e35-cf0c-45b6-a32c-885d442adad4</name>
- <entityField>SOURCE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>f97539fd-70ec-44a0-9d49-01fe829f8d81</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectSourceEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>9b5f8ee4-9950-43d8-902f-552e57bbc45e</name>
+ <entityField>ENTRYDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>594e9e35-cf0c-45b6-a32c-885d442adad4</name>
+ <entityField>SOURCE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f97539fd-70ec-44a0-9d49-01fe829f8d81</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
index 919820dd8d63652abb4bacb9aca9a14cae94de34..f3476905c33387705685cdc1e6a87bacc435d6e1 100644
--- a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
+++ b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
@@ -1,32 +1,32 @@
-<?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>SalesprojectSourceFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Entries</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>4931127b-117d-4b1c-81ba-81ac2162f1b7</name>
- <entityField>ENTRYDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>5e672c0f-af11-46e2-8c25-8c9bd3f153f1</name>
- <entityField>SOURCE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>e5660207-7b70-4ac6-b5b5-b87a54d5b032</name>
- <entityField>INFO</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectSourceFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Entries</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>4931127b-117d-4b1c-81ba-81ac2162f1b7</name>
+ <entityField>ENTRYDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>5e672c0f-af11-46e2-8c25-8c9bd3f153f1</name>
+ <entityField>SOURCE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>e5660207-7b70-4ac6-b5b5-b87a54d5b032</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
index dd2d009711d7cdfe60217035fcc3564c588da3ca..15e04bd2e1d58f9d7b429e4f188ba4ba7f1f2789 100644
--- a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
+++ b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
@@ -1,31 +1,31 @@
-<?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>SalesprojectSourcePreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <titleField>SOURCE</titleField>
- <descriptionField>INFO</descriptionField>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>7c61ec34-3206-4dba-96cf-24fe0112bf7b</name>
- <entityField>ENTRYDATE</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectSourcePreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Header</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <titleField>SOURCE</titleField>
+ <descriptionField>INFO</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>7c61ec34-3206-4dba-96cf-24fe0112bf7b</name>
+ <entityField>ENTRYDATE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/StockCount_view/StockCount_view.aod b/neonView/StockCount_view/StockCount_view.aod
index f6884c6a6ceeb22d492e8b032062115b43a2c4d4..ac1bb7b0bc36e5c89cc0e59544c420a6b3982c75 100644
--- a/neonView/StockCount_view/StockCount_view.aod
+++ b/neonView/StockCount_view/StockCount_view.aod
@@ -1,24 +1,24 @@
-<?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>StockCount_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Stocks</name>
- <showDrawer v="true" />
- <drawerCaption>Stock</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>fe1e5348-0579-4e2c-8d80-2594db6cfb22</name>
- <entityField>STOCKCOUNT</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>StockCount_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Stocks</name>
+ <showDrawer v="true" />
+ <drawerCaption>Stock</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>fe1e5348-0579-4e2c-8d80-2594db6cfb22</name>
+ <entityField>STOCKCOUNT</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/StockEdit_view/StockEdit_view.aod b/neonView/StockEdit_view/StockEdit_view.aod
index b50a5b72944f43b4a4ca7fcf826fc96ec85c7821..2fd6d93ec7a3da8bb5b4b1d4839a7839df2c00af 100644
--- a/neonView/StockEdit_view/StockEdit_view.aod
+++ b/neonView/StockEdit_view/StockEdit_view.aod
@@ -1,39 +1,39 @@
-<?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>StockEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>4c474e8e-ad47-484a-91fb-a8bd6390e0af</name>
- <entityField>WAREHOUSE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>588e46dd-4761-47cb-87c3-a483f69fecae</name>
- <entityField>ENTRYDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>9f8426c6-84d6-4065-880a-805ebecb6638</name>
- <entityField>IN_OUT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8004c2e8-5ef1-480c-9381-dad3cd574dca</name>
- <entityField>QUANTITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>591e6fbd-d392-458e-a79a-d20e9cb845d3</name>
- <entityField>REFNUMBER</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>StockEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>4c474e8e-ad47-484a-91fb-a8bd6390e0af</name>
+ <entityField>WAREHOUSE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>588e46dd-4761-47cb-87c3-a483f69fecae</name>
+ <entityField>ENTRYDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9f8426c6-84d6-4065-880a-805ebecb6638</name>
+ <entityField>IN_OUT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8004c2e8-5ef1-480c-9381-dad3cd574dca</name>
+ <entityField>QUANTITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>591e6fbd-d392-458e-a79a-d20e9cb845d3</name>
+ <entityField>REFNUMBER</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/StockFilter_view/StockFilter_view.aod b/neonView/StockFilter_view/StockFilter_view.aod
index 85433255ea297c1706d5b158a9f2ca557738b823..d2a37a6366c804a000846511ab9b699bc9651a55 100644
--- a/neonView/StockFilter_view/StockFilter_view.aod
+++ b/neonView/StockFilter_view/StockFilter_view.aod
@@ -1,44 +1,44 @@
-<?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>StockFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Stocks</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>c57eed89-267a-4df6-9ac9-e9b5c5e49794</name>
- <entityField>IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>135080e7-1d91-4be2-8bdb-8368e247127d</name>
- <entityField>WAREHOUSE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>1a744bfe-b078-4ac4-a930-f1c8cd3ecac7</name>
- <entityField>ENTRYDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>fea73255-6fd2-4a32-8e53-37f47fa57ac1</name>
- <entityField>IN_OUT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>a5dcfc3a-c464-4c63-bd2d-ebe4d195b45b</name>
- <entityField>QUANTITY</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>82f57c96-613e-4699-925d-a49a0ef8a29f</name>
- <entityField>REFNUMBER</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>StockFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Stocks</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>c57eed89-267a-4df6-9ac9-e9b5c5e49794</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>135080e7-1d91-4be2-8bdb-8368e247127d</name>
+ <entityField>WAREHOUSE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1a744bfe-b078-4ac4-a930-f1c8cd3ecac7</name>
+ <entityField>ENTRYDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>fea73255-6fd2-4a32-8e53-37f47fa57ac1</name>
+ <entityField>IN_OUT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a5dcfc3a-c464-4c63-bd2d-ebe4d195b45b</name>
+ <entityField>QUANTITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>82f57c96-613e-4699-925d-a49a0ef8a29f</name>
+ <entityField>REFNUMBER</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/TaskEdit_view/TaskEdit_view.aod b/neonView/TaskEdit_view/TaskEdit_view.aod
index 9325040e6458936b9059aa794cbe6951e96614d7..d0995eb3aba18df0dc69dcdef0e0cfc665ea7165 100644
--- a/neonView/TaskEdit_view/TaskEdit_view.aod
+++ b/neonView/TaskEdit_view/TaskEdit_view.aod
@@ -17,6 +17,10 @@
<name>fb5768fe-2dd2-45cd-8d21-f20af279f409</name>
<entityField>SUBJECT</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>b31bb2ab-22a6-4bc6-8b6c-d73a1c43283f</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>b5d6e9ea-355f-49f8-bcc2-f3efd44adb19</name>
<entityField>START_DATE</entityField>
@@ -49,10 +53,6 @@
<name>8428cbf6-7df0-4f7e-b6d6-5ab17e266028</name>
<entityField>EDITOR_CONTACT_ID</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>b31bb2ab-22a6-4bc6-8b6c-d73a1c43283f</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
diff --git a/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod b/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod
index 6388445f76128a851b93ac91c467ee7149019d96..f8edc993f0f258f795f0c39d0bda875aa91909dc 100644
--- a/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod
+++ b/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod
@@ -1,27 +1,27 @@
-<?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>TaskLinkFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>TaskLinks</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>4d2b280c-adb2-4977-b70a-ba07959e44c2</name>
- <entityField>OBJECT_TYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>d8467d50-50c8-42df-90c3-dcb3359f1267</name>
- <entityField>OBJECT_ROWID</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>TaskLinkFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>TaskLinks</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>4d2b280c-adb2-4977-b70a-ba07959e44c2</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d8467d50-50c8-42df-90c3-dcb3359f1267</name>
+ <entityField>OBJECT_ROWID</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod b/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
index 9fdda896ab693871ee041bbe441478b1e62a3e88..0b9c9864f2b5007e217888dc5a50601fefde5fc6 100644
--- a/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
+++ b/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
@@ -1,26 +1,26 @@
-<?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>TaskLinkMultiEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <genericMultipleViewTemplate>
- <name>MultipleEdit</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>4f3bde0b-cdd7-46a3-b0fc-24eba3ff9b92</name>
- <entityField>OBJECT_TYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ef83bb53-da75-498c-8ad5-4927c83243e4</name>
- <entityField>OBJECT_ROWID</entityField>
- </neonTableColumn>
- </columns>
- </genericMultipleViewTemplate>
- </children>
-</neonView>
+<?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>TaskLinkMultiEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>MultipleEdit</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>4f3bde0b-cdd7-46a3-b0fc-24eba3ff9b92</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ef83bb53-da75-498c-8ad5-4927c83243e4</name>
+ <entityField>OBJECT_ROWID</entityField>
+ </neonTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod b/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod
index 6171351549a23bc55bec3d914087045a1e0c24b6..e2161c0bf04cf51fe55bdbb117c7e29e2774fa9b 100644
--- a/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod
+++ b/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod
@@ -1,22 +1,22 @@
-<?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>TaskLinkPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Info</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>9b0dacf0-a053-499d-b87a-22db6c3cb2f4</name>
- <entityField>OBJECT_ROWID</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>TaskLinkPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Info</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>9b0dacf0-a053-499d-b87a-22db6c3cb2f4</name>
+ <entityField>OBJECT_ROWID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/TaskMain_view/TaskMain_view.aod b/neonView/TaskMain_view/TaskMain_view.aod
index ac9d30a87c148300144507fe39e7274db8338ba3..928e1837ed4732f9779c331295e4259ce6e3d3aa 100644
--- a/neonView/TaskMain_view/TaskMain_view.aod
+++ b/neonView/TaskMain_view/TaskMain_view.aod
@@ -1,45 +1,50 @@
-<?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>TaskMain_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <masterSlaveLayout>
- <name>layout</name>
- <master>339e160e-e482-4be2-9550-fc06131fbffe</master>
- </masterSlaveLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>339e160e-e482-4be2-9550-fc06131fbffe</name>
- <entityField>#ENTITY</entityField>
- <view>TaskMainPreview_view</view>
- </neonViewReference>
- <genericViewTemplate>
- <name>details</name>
- <showDrawer v="true" />
- <drawerCaption>Detail</drawerCaption>
- <entityField>#ENTITY</entityField>
- <title>details</title>
- <fields>
- <entityFieldLink>
- <name>e95918f5-d21e-4c99-8d05-d70811aa3d89</name>
- <entityField>PROTECTIONLEVEL</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>fea59f13-750b-427d-bf33-cc1bead95446</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>4211b2cf-3a1f-4447-ad1c-f521d2d3f258</name>
- <entityField>ModuleTrees</entityField>
- <view>ModuleTree_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>6846f680-84ef-46da-a0ea-6797044cf693</name>
- <entityField>MainDocuments</entityField>
- <view>DocumentFilter_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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>TaskMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>339e160e-e482-4be2-9550-fc06131fbffe</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>339e160e-e482-4be2-9550-fc06131fbffe</name>
+ <entityField>#ENTITY</entityField>
+ <view>TaskMainPreview_view</view>
+ </neonViewReference>
+ <genericViewTemplate>
+ <name>details</name>
+ <showDrawer v="true" />
+ <drawerCaption>Detail</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <title>details</title>
+ <fields>
+ <entityFieldLink>
+ <name>e95918f5-d21e-4c99-8d05-d70811aa3d89</name>
+ <entityField>PROTECTIONLEVEL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>fea59f13-750b-427d-bf33-cc1bead95446</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>4211b2cf-3a1f-4447-ad1c-f521d2d3f258</name>
+ <entityField>ModuleTrees</entityField>
+ <view>ModuleTree_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6846f680-84ef-46da-a0ea-6797044cf693</name>
+ <entityField>MainDocuments</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ffa776bd-013c-4d4d-aedd-490625ef0fe1</name>
+ <entityField>LogHistories</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod b/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
index 2fc9b6faccedc4fbabc072d66b670163b0e8187e..63d3d3f41e47c655531fdcba5676eabd42136e89 100644
--- a/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
+++ b/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
@@ -1,36 +1,36 @@
-<?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>TimetrackingEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <isSmall v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>8a0941a2-2c33-4a66-a460-5f2f7258e051</name>
- <entityField>DATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8c27f579-543a-484f-ba3d-ba0579e6db12</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ef97d0da-a0d4-4147-b440-96d249ffec73</name>
- <entityField>MINUTES</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>57370b00-130c-439e-9b70-fd56fc28c892</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>TimetrackingEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>8a0941a2-2c33-4a66-a460-5f2f7258e051</name>
+ <entityField>DATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8c27f579-543a-484f-ba3d-ba0579e6db12</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ef97d0da-a0d4-4147-b440-96d249ffec73</name>
+ <entityField>MINUTES</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>57370b00-130c-439e-9b70-fd56fc28c892</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
index 2e727ddd7fa99013db59b9d8d51ea7a94aa5d32a..a56872794430998d5cca3930ce8edab27668f754 100644
--- a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
+++ b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
@@ -1,36 +1,36 @@
-<?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>TimetrackingFilter_view</name>
- <title>Timetracking</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Timetrackings</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>fa423332-8987-4fc2-981c-66447678b922</name>
- <entityField>DATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>63068c6c-1508-47f2-ad2e-bbe66a448af1</name>
- <entityField>CONTACT_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>7e18967d-3c78-4f75-bc03-f6d925553484</name>
- <entityField>MINUTES</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>e17a680c-5a05-42a1-ab34-067a97192690</name>
- <entityField>INFO</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>TimetrackingFilter_view</name>
+ <title>Timetracking</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Timetrackings</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>fa423332-8987-4fc2-981c-66447678b922</name>
+ <entityField>DATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>63068c6c-1508-47f2-ad2e-bbe66a448af1</name>
+ <entityField>CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>7e18967d-3c78-4f75-bc03-f6d925553484</name>
+ <entityField>MINUTES</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>e17a680c-5a05-42a1-ab34-067a97192690</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod b/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
index 4a5957525d9385b65959951416ff21e9a6ce35a1..bbd4c498bd926c7c73a75d483b9a360dd4d012e2 100644
--- a/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
+++ b/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
@@ -1,36 +1,36 @@
-<?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>TimetrackingPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- </headerFooterLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>TimetrackingInfo_template</name>
- <showDrawer v="true" />
- <drawerCaption>Information</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>64005996-e735-4c5d-bdb7-29aaf8851107</name>
- <entityField>DATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>835197c0-2e0c-4989-8d5b-80ccd064d55e</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>25921a31-5563-4a74-aa7e-67d660c60f0b</name>
- <entityField>MINUTES</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>54123bdf-3008-4597-9f30-fc2877a274f7</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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>TimetrackingPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>TimetrackingInfo_template</name>
+ <showDrawer v="true" />
+ <drawerCaption>Information</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>64005996-e735-4c5d-bdb7-29aaf8851107</name>
+ <entityField>DATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>835197c0-2e0c-4989-8d5b-80ccd064d55e</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>25921a31-5563-4a74-aa7e-67d660c60f0b</name>
+ <entityField>MINUTES</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>54123bdf-3008-4597-9f30-fc2877a274f7</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/TurnoverChart_view/TurnoverChart_view.aod b/neonView/TurnoverChart_view/TurnoverChart_view.aod
index 0b728d0c7185dd55d10c508769456a841e12ae67..5b05bdf764f29741f23e6c8a3f21fce8c55a0082 100644
--- a/neonView/TurnoverChart_view/TurnoverChart_view.aod
+++ b/neonView/TurnoverChart_view/TurnoverChart_view.aod
@@ -73,5 +73,10 @@
<categoryField>CATEGORY</categoryField>
<entityField>#ENTITY</entityField>
</multiDataChartViewTemplate>
+ <neonViewReference>
+ <name>b0a9f719-3768-4ce5-9d32-e0f5fa5bf1eb</name>
+ <entityField>Turnover_tree</entityField>
+ <view>TurnoverTree_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/TurnoverTree_view/TurnoverTree_view.aod b/neonView/TurnoverTree_view/TurnoverTree_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..caa1df078ff99337f41287ff7ba3a67511fade52
--- /dev/null
+++ b/neonView/TurnoverTree_view/TurnoverTree_view.aod
@@ -0,0 +1,33 @@
+<?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>TurnoverTree_view</name>
+ <title>Tree</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <treeTableViewTemplate>
+ <name>turnover</name>
+ <parentField>PARENT</parentField>
+ <entityField>#ENTITY</entityField>
+ <title>Tree</title>
+ <columns>
+ <neonTableColumn>
+ <name>3925d6aa-6a42-4cdc-84c3-e96ce2eff27b</name>
+ <entityField>GROUP</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>bc75d6a3-b226-4b28-8090-7142a264552a</name>
+ <entityField>FORECASTPRICE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d56ec015-556a-4fd6-bf43-c127b10b07bc</name>
+ <entityField>TURNOVERPRICE</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/TwitterTimeline_view/TwitterTimeline_view.aod b/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
index 10d401110bd7b8a57f30bbb16a85d2ca85429bf0..1af95adb16a04460d8d4ab5ef6b61d1aa2feba27 100644
--- a/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
+++ b/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
@@ -1,68 +1,68 @@
-<?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>TwitterTimeline_view</name>
- <title>Twitter</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>AditoTwitterDashlet</name>
- <title>ADITO Twitter Feed</title>
- <description>Show all tweets of ADITO</description>
- <fragment>Social/full</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:twitter_square</icon>
- <categories>
- <neonDashletCategory>
- <name>social</name>
- <title>Social Media</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>twitter</name>
- <title>Twitter</title>
- </neonDashletCategory>
- </categories>
- <parameters>
- <neonDashletParameter>
- <name>Account_param</name>
- <value>adito_software</value>
- </neonDashletParameter>
- </parameters>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>TwitterDashletConfig</name>
- <title>Twitter Feed</title>
- <description>Show all tweets of a user</description>
- <fragment>Social/full</fragment>
- <requiresConfiguration v="true" />
- <icon>vaadin:twitter_square</icon>
- <categories>
- <neonDashletCategory>
- <name>social</name>
- <title>Social Media</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>twitter</name>
- <title>Twitter</title>
- </neonDashletCategory>
- </categories>
- <parameters>
- <neonDashletParameter>
- <name>Account_param</name>
- <value></value>
- </neonDashletParameter>
- </parameters>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <webContentViewTemplate>
- <name>Timeline</name>
- <entityField>TWITTER_TIMELINE</entityField>
- </webContentViewTemplate>
- </children>
-</neonView>
+<?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>TwitterTimeline_view</name>
+ <title>Twitter</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>AditoTwitterDashlet</name>
+ <title>ADITO Twitter Feed</title>
+ <description>Show all tweets of ADITO</description>
+ <fragment>Social/full</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:twitter_square</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>social</name>
+ <title>Social Media</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>twitter</name>
+ <title>Twitter</title>
+ </neonDashletCategory>
+ </categories>
+ <parameters>
+ <neonDashletParameter>
+ <name>Account_param</name>
+ <value>adito_software</value>
+ </neonDashletParameter>
+ </parameters>
+ </neonDashletConfiguration>
+ <neonDashletConfiguration>
+ <name>TwitterDashletConfig</name>
+ <title>Twitter Feed</title>
+ <description>Show all tweets of a user</description>
+ <fragment>Social/full</fragment>
+ <requiresConfiguration v="true" />
+ <icon>vaadin:twitter_square</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>social</name>
+ <title>Social Media</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>twitter</name>
+ <title>Twitter</title>
+ </neonDashletCategory>
+ </categories>
+ <parameters>
+ <neonDashletParameter>
+ <name>Account_param</name>
+ <value></value>
+ </neonDashletParameter>
+ </parameters>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <webContentViewTemplate>
+ <name>Timeline</name>
+ <entityField>TWITTER_TIMELINE</entityField>
+ </webContentViewTemplate>
+ </children>
+</neonView>
diff --git a/others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml b/others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/others/db_changes/readme.adoc b/others/db_changes/readme.adoc
deleted file mode 100644
index 240dfacc5017f2e44ee53aa96535bc83ce96a311..0000000000000000000000000000000000000000
--- a/others/db_changes/readme.adoc
+++ /dev/null
@@ -1,88 +0,0 @@
-liquibase-readme
-================
-
-== TODO: update to new Structure ==
-
-== Structure within ADITO
-=== in theory
-
-When using liquibase in an ADITO-System, your project structure _should_ look like this:
-----
-PROJECTHOME/others/db_changes/masterChangelog.xml
-PROJECTHOME/others/db_changes/struct/
-PROJECTHOME/others/db_changes/data/
-PROJECTHOME/others/db_changes/misc/
-PROJECTHOME/others/db_changes/liquibase.properties
-----
-
-The file `masterChangelog.xml` contains a list of all changes (well, in fact more like a list of all changelog-files). The structure could look like this:
-[source,xml]
-----
-<?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">
- <include file="struct/create_org.xml"/>
- <include file="data/example_org.xml"/>
-</databaseChangeLog>
-----
-
-TIP: Keep in mind that the header-information can change, visit therefore the liquibase-website: http://www.liquibase.org Specific: the XML-format definition: http://www.liquibase.org/documentation/xml_format.html
-
-So, that's where all our changes are located - but what about the changes _itself_?
-As you can think of, they're stored in files located in the folders `struct` for DDL-stuff like _create_, _alter_ etc.
-and `data` for DML-stuff like _insert_, _update_ etc.
-
-If you want to know what to do add in these files take a look at the official liquibase documentation for further information how to fill these XML files: http://www.liquibase.org/documentation/index.html
-
-IMPORTANT: Always remember that you might have to define some rollback-entries. +
-This is e.g. not needed for create-entries but for others like insert.
-
-So, whats about that `liquibase.properties` file? The file is needed to specify some data here, e.g. the driver-name, classpath (of the driver), jdbc-url, etc.
-You want to store these information there because otherwise you'd need to specify them on every call of liquibase. Not cool.
-
-Now you're ready to run commands like `liquibase update` in the `PROJECTHOME/others/db_changes` folder.
-
-=== in practice
-
-.Let's say we want to add a new table `FOOBAR` with some demo-data. We need to:
-* create a new file in the struct-folder; e.g. `create_FOOBAR.xml`
-* fill the file with changesets that will create a table
-* add `include`-tag in the `masterChangelog.xml` for the created file
-* create a new file in the data-foler; e.g. `demoData_FOOBAR.xml`
-* fill the file with changesets that will insert data into the table and define *rollback-entries*
-* add `include`-tag in the `masterChangelog.xml` for the created file
-* to apply the changes simply run `liquibase update`
-
-For example one feature package "add contact management" could contain several files itself:
-----
- create_org.xml
- create_pers.xml
- create_relation.xml
-----
-On the other hand, several feature packages cannot be contained in one changelog-file.
-
-
-== How to use it
-Normally everything you need is provided by the project-template and the existing files in the git-repository.
-Therefore it's easy to use and you can start immediately.
-
-.Keep in mind:
-* run `liquibase update` to apply possible changes after merging something into your repository
-* apply modifications on the database always with liquibase; do not write a create-script in SQL. Write some changesets and execute them
-* set correct `author`- and `id`-attributes in your changelog-files
-
-
-
-== FAQ
-[qanda]
-What about unicode-columns like `NVARCHAR` or `NCLOB`?::
- Simply define them in your changesets. They are prefered over non-unicode-datatypes
-What if i switch between branches and want to switch between different database-states?::
- This is something that needs to be defined. Possible ways: rollback or recreate your database entirely
-Is it possible to write an update-changeset where I can use a preparedStatement in the where-clause?::
- This needs to be analyzed and (the result) added here.
-
-
-
----
-
-~have~ ~a~ ~nice~ ~day~ ~:-)~
\ No newline at end of file
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 4bbd9ff96962e74d458ee612745af48cf0c8de30..918bf0d09a54d5d47564b8b3b449e2a0f90ca518 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic2019</projectName>
+ <projectName>basic</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
diff --git a/process/ActivityTask_lib/ActivityTask_lib.aod b/process/ActivityTask_lib/ActivityTask_lib.aod
index 141c9c3f9344db9b60ff2be3992885545ebcb96a..7034e38366797cbdfa2616e01f1f7fce870a17c6 100644
--- a/process/ActivityTask_lib/ActivityTask_lib.aod
+++ b/process/ActivityTask_lib/ActivityTask_lib.aod
@@ -1,9 +1,9 @@
-<?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>ActivityTask_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/ActivityTask_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>ActivityTask_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/ActivityTask_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index f68618c2379dddff760583ee455a00191d06b8a0..daaa13a2c466805748147eae69819cf324fa30ff 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -192,7 +192,7 @@ _ActivityTaskUtils._addLinkRecords = function(pObjectIdField, pRowIdField, pAddi
}
presetLinks.forEach(function(link) {
- neon.addRecord(null, pConsumerName, {
+ neon.addRecord(pConsumerName, {
"OBJECT_TYPE" : link[0],
"OBJECT_ROWID" : link[1]
});
diff --git a/process/AddressEntity_lib/AddressEntity_lib.aod b/process/AddressEntity_lib/AddressEntity_lib.aod
index 4ecf49e2e70d3882be5ed8a66b3ec91a4d509593..ec863732aee1fd985812d5c9bde73d8051dc7a8d 100644
--- a/process/AddressEntity_lib/AddressEntity_lib.aod
+++ b/process/AddressEntity_lib/AddressEntity_lib.aod
@@ -1,9 +1,9 @@
-<?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>AddressEntity_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/AddressEntity_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>AddressEntity_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/AddressEntity_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Appointment_lib/Appointment_lib.aod b/process/Appointment_lib/Appointment_lib.aod
index 5b832c601af4bab0a69bff58acf1c2427be6911c..e40b36772dc56d81415ec518ec86625dbbe28ba1 100644
--- a/process/Appointment_lib/Appointment_lib.aod
+++ b/process/Appointment_lib/Appointment_lib.aod
@@ -1,9 +1,9 @@
-<?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>Appointment_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Appointment_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Appointment_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Appointment_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Attribute_lib/Attribute_lib.aod b/process/Attribute_lib/Attribute_lib.aod
index 7d9936e818274c5e11dd7fec0c27953f2d32d4e9..a37f3b6deb26ab83a7b0fbe3ca5f49deb80e8c9c 100644
--- a/process/Attribute_lib/Attribute_lib.aod
+++ b/process/Attribute_lib/Attribute_lib.aod
@@ -1,10 +1,10 @@
-<?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>Attribute_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Attribute_lib/process.js</process>
- <alias>Data_alias</alias>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Attribute_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Attribute_lib/process.js</process>
+ <alias>Data_alias</alias>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 0d8b84908b10e42213831fe846712a617822eee2..f8e1f4f0e911b5fefee973e04d8d7da8881604d0 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -355,7 +355,7 @@ AttributeRelationUtils.presetMandatoryAttributes = function (pObjectType, pConsu
{
//adding an attribute more than 20 times would be too much (having a min_count > 20 is very unlikely)
for (let i = 0; i < usage[1] && i < 20; i++)
- neon.addRecord(null, pConsumer, {
+ neon.addRecord(pConsumer, {
"AB_ATTRIBUTE_ID" : usage[0]
});
});
diff --git a/process/Binary_lib/Binary_lib.aod b/process/Binary_lib/Binary_lib.aod
index 39de483b5c216084257d95a007b355a11c1d53c0..20ffe29ea69924ef69f5d0d12beb0c47d372fcda 100644
--- a/process/Binary_lib/Binary_lib.aod
+++ b/process/Binary_lib/Binary_lib.aod
@@ -1,10 +1,10 @@
-<?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>Binary_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Binary_lib/process.js</process>
- <alias>_____SYSTEMALIAS</alias>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Binary_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Binary_lib/process.js</process>
+ <alias>_____SYSTEMALIAS</alias>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Calendar_lib/Calendar_lib.aod b/process/Calendar_lib/Calendar_lib.aod
index ba466c5bf5fc50d099a4c5de79e3808744b53b56..62672bc559a1fe686a1fe554217001ac5f57fbf9 100644
--- a/process/Calendar_lib/Calendar_lib.aod
+++ b/process/Calendar_lib/Calendar_lib.aod
@@ -1,9 +1,9 @@
-<?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>Calendar_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Calendar_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Calendar_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Calendar_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Calendar_lib/process.js b/process/Calendar_lib/process.js
index d7e20bff690a2d93e1bd7270d1c8e224d07a7091..2c0288ceafb3eee49c338e30c930c6e8792c3267 100644
--- a/process/Calendar_lib/process.js
+++ b/process/Calendar_lib/process.js
@@ -747,11 +747,11 @@ function _addEntryCondition(pConditions, pIndex, pValues)
for (var i = 0; i < params.length; i++)
if (pValues[params[i]] != undefined) pConditions[params[i] + "_" + pIndex] = pValues[params[i]];
}
-
CalendarUtil.addEntryCondition = function(pConditions, pIndex, pValues)
{
_addEntryCondition(pConditions, pIndex, pValues);
-}
+}
+
/*
* Liefert Events zu bestimmten Usern/Daten in einem Array.
*
diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js
index d4932b0cc7df8f6d96b58e5e6588382503ed4d85..fc875f9b7770588efd2caf260adb7a5feae174b9 100644
--- a/process/Campaign_lib/process.js
+++ b/process/Campaign_lib/process.js
@@ -1,3 +1,4 @@
+import("system.translate");
import("system.logging");
import("system.vars");
import("system.db");
@@ -78,7 +79,7 @@ CampaignUtils.getParticipantCount = function(pCampaignId)
let selectQuery = "select count(*) from CAMPAIGNPARTICIPANT";
let conditionField = "CAMPAIGNPARTICIPANT.CAMPAIGN_ID";
let defaultValue = 0;
-
+
return _CampaignUtils._loadSingleValueFromDb(selectQuery, conditionField, pCampaignId, defaultValue);
}
@@ -102,7 +103,7 @@ CampaignUtils.getStepCount = function(pCampaignId)
let selectQuery = "select count(*) from CAMPAIGNSTEP";
let conditionField = "CAMPAIGNSTEP.CAMPAIGN_ID";
let defaultValue = 0;
-
+
return _CampaignUtils._loadSingleValueFromDb(selectQuery, conditionField, pCampaignId, defaultValue);
}
@@ -165,8 +166,7 @@ CampaignUtils.getDefaultCampaignStep = function(pCampaignId)
{
let selectQuery = "select CAMPAIGNSTEPID from CAMPAIGNSTEP " +
"where CAMPAIGNSTEP.CAMPAIGN_ID = '" + pCampaignId + "' " +
- "order by CAMPAIGNSTEP.SORTING asc " +
- "fetch first 1 rows only";
+ "order by CAMPAIGNSTEP.SORTING asc";
return db.cell(selectQuery)
@@ -195,6 +195,15 @@ CampaignUtils.getCampaignEndDate = function(pCapmaignId)
return db.cell(campaignIdCondition.buildSql("SELECT DATE_END, SORTING FROM CAMPAIGNSTEP", "1=2", "order by SORTING ASC FETCH FIRST 1 ROWS ONLY"));
}
+/**
+ * todo
+ */
+CampaignUtils.getMaxParticipantsValidationMessage = function()
+{
+ //todo how/where should this text be stored?
+ return translate.text("The max participants count has to be equal or greater than the count of the current participants!");
+}
+
/**
* Methods for campaignmanagement.
* Do not create an instance of this!
diff --git a/process/Communication_lib/Communication_lib.aod b/process/Communication_lib/Communication_lib.aod
index a69299aa2aa56c2a3a2b1a4321e8779ff438187b..eafc05f496039ffc0a4571613220dbbcf0c593c7 100644
--- a/process/Communication_lib/Communication_lib.aod
+++ b/process/Communication_lib/Communication_lib.aod
@@ -1,9 +1,9 @@
-<?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>Communication_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Communication_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Communication_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Communication_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Contact_lib/Contact_lib.aod b/process/Contact_lib/Contact_lib.aod
index ea8e5020017153333df78eddfd6bfd9c415e7208..14ac4241a49fe1b8987ee0a3907b94a802af9e5c 100644
--- a/process/Contact_lib/Contact_lib.aod
+++ b/process/Contact_lib/Contact_lib.aod
@@ -1,9 +1,9 @@
-<?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>Contact_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Contact_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Contact_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Contact_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index e70b9797751490b8bcce4814f808f76eee56abdc..af62133929989b629878eaaf37939bd9c7ed8392 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -47,7 +47,7 @@ OrganisationUtils.getNameByContactId = function(pContactId)
if (pContactId)
{
orgname = db.cell(SqlCondition.begin()
- .andPrepare("CONTACT.CONTACT", pContactId)
+ .andPrepare("CONTACT.CONTACTID", pContactId)
.buildSql("select ORGANISATION.NAME \n\
from ORGANISATION \n\
join CONTACT on (CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null)"));
diff --git a/process/Context_lib/Context_lib.aod b/process/Context_lib/Context_lib.aod
index 88f0211eacad5423f96a78a8ceaa903a1bf72cdb..e7e0bcccf76364c14dc6bd314226e7657e68fa6e 100644
--- a/process/Context_lib/Context_lib.aod
+++ b/process/Context_lib/Context_lib.aod
@@ -1,9 +1,9 @@
-<?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>Context_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Context_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Context_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Context_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 12db5eafe807c4e4f6841f500d1ceda069e6e63a..39a53ff50e6a8ae0983da1ece4743bb30868f17e 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.translate");
import("system.project");
import("system.vars");
@@ -383,11 +384,12 @@ ContextUtils.getSelectMap = function()
maskingUtils.cast("CAMPAIGNSTEP.NAME", SQLTYPES.VARCHAR, 10)
], "", false))
.setContactIdField("CAMPAIGNPARTICIPANT.CONTACT_ID")
- .setJoinExpression("join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID " +
- "join CAMPAIGNSTEP on CAMPAIGNSTEP.CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID")
+ .setJoinExpression("left join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID " +
+ "left join CAMPAIGNSTEP on CAMPAIGNSTEP.CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID")
.setCreationDateField("CAMPAIGNSTEP.DATE_START")
.setStateField("CAMPAIGN.STATE")
.setActiveStates(["e04c9c59-0590-463c-a10e-e25c583e9cf2", "42e1ee2b-0108-4ccf-ab43-29cbcb0377bf"])
+ ,"CampaignStep" : ContextSelector.create("CAMPAIGNSTEP", "CAMPAIGNSTEPID", "NAME")
}
}
diff --git a/process/Contract_lib/Contract_lib.aod b/process/Contract_lib/Contract_lib.aod
index f7e066be340112fbe6298f410624cc9ba6284dad..eba775cc09cada93dc105ba8cf4734076d7111ed 100644
--- a/process/Contract_lib/Contract_lib.aod
+++ b/process/Contract_lib/Contract_lib.aod
@@ -1,9 +1,9 @@
-<?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>Contract_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Contract_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Contract_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Contract_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Data_lib/Data_lib.aod b/process/Data_lib/Data_lib.aod
index 7e6dc0e007d710b42680bd618e2e6e4889e0296d..9d90ce31765a6b5dfb19f525ad7886947391644a 100644
--- a/process/Data_lib/Data_lib.aod
+++ b/process/Data_lib/Data_lib.aod
@@ -1,9 +1,9 @@
-<?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>Data_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Data_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Data_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Data_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Data_lib/process.js b/process/Data_lib/process.js
index e6802ed44f10df422da714d12f634bafda9918e8..f6c7d2295ac9082b8a94fc01dcd6a3ba9e53322f 100644
--- a/process/Data_lib/process.js
+++ b/process/Data_lib/process.js
@@ -1,7 +1,7 @@
import("system.util");
/**
- * This class is for data which is built in a children -> parent - way. Eich "row" consists of one UID and one parentId.<br>
+ * This class is for data which is built in a children -> parent - way. Each "row" consists of one UID and one parentId.<br>
* The class makes sure that even if you add an child multiple times, the ID is corrected, so that the resulting array has only unique id's.<br>
* <br>
* Keep in mind for performance reasons that as soon, as you add a seccond item withe the same UID as an already added child, a tree-object is buiilt internally.<br>
diff --git a/process/Date_lib/Date_lib.aod b/process/Date_lib/Date_lib.aod
index 9833cb86c53bc720131800ef98c93138e6b61db2..fc456bc941b930f6461fe93ce95ea40cda2c841b 100644
--- a/process/Date_lib/Date_lib.aod
+++ b/process/Date_lib/Date_lib.aod
@@ -1,9 +1,9 @@
-<?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>Date_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Date_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Date_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Date_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Document_lib/Document_lib.aod b/process/Document_lib/Document_lib.aod
index 9f2ede3e40f379602f2d598e9027e4605ab4044c..43cf673ce45fd8f2c32d5d890e8fd713c35b2178 100644
--- a/process/Document_lib/Document_lib.aod
+++ b/process/Document_lib/Document_lib.aod
@@ -1,9 +1,9 @@
-<?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>Document_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Document_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Document_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Document_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Document_lib/process.js b/process/Document_lib/process.js
index 99ce4cc17d045c5c337a038e54a709c862ef2134..e70f107941a857d9e5cf8f736e6fb725b9d4a227 100644
--- a/process/Document_lib/process.js
+++ b/process/Document_lib/process.js
@@ -19,7 +19,7 @@ function DocumentUtil(){
* Documents will be downloaded with neon.download
*/
DocumentUtil.downloadSelectedDocuments = function() {
- var alias = db.getCurrentAlias();
+ var alias = SqlUtils.getSystemAlias();
if(vars.exists("$sys.selectionRows") && vars.get("$sys.selectionRows")) {
var rows;
diff --git a/process/Employee_lib/Employee_lib.aod b/process/Employee_lib/Employee_lib.aod
index 1a08f91b6ef81042668340de79dfea0687a520e6..355e6893f0f9dccd142a1042c4d886b005213119 100644
--- a/process/Employee_lib/Employee_lib.aod
+++ b/process/Employee_lib/Employee_lib.aod
@@ -1,9 +1,9 @@
-<?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>Employee_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Employee_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Employee_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Employee_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Employee_lib/process.js b/process/Employee_lib/process.js
index 1394a104183042a9a94d00947089892e44e2fb30..0bf4983884d5b4ddf0c7071c58387a1e9ed929bd 100644
--- a/process/Employee_lib/process.js
+++ b/process/Employee_lib/process.js
@@ -35,7 +35,7 @@ EmployeeUtils.getCurrentUserName = function ()
EmployeeUtils.sliceUserId = function (pUserId)
{
- return pUserId.substr(10, 36);
+ return pUserId.slice(-36);
}
/**
diff --git a/process/Entity_lib/Entity_lib.aod b/process/Entity_lib/Entity_lib.aod
index d106b77a163c3a6f9266ffd622878cd794b9699a..133044d0245b71bb3a968c020ff1db1bd8df19d3 100644
--- a/process/Entity_lib/Entity_lib.aod
+++ b/process/Entity_lib/Entity_lib.aod
@@ -1,9 +1,9 @@
-<?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>Entity_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Entity_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Entity_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Entity_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/ImporterCustomMappingFunctions_lib/ImporterCustomMappingFunctions_lib.aod b/process/ImporterCustomMappingFunctions_lib/ImporterCustomMappingFunctions_lib.aod
index 6544d46839aa52bd3517add653f0eb0a8fb7e881..a5489db7223955aff2a25e471685849026ad4d33 100644
--- a/process/ImporterCustomMappingFunctions_lib/ImporterCustomMappingFunctions_lib.aod
+++ b/process/ImporterCustomMappingFunctions_lib/ImporterCustomMappingFunctions_lib.aod
@@ -1,9 +1,9 @@
-<?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>ImporterCustomMappingFunctions_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/ImporterCustomMappingFunctions_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>ImporterCustomMappingFunctions_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/ImporterCustomMappingFunctions_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/ImporterMappingFunctions_lib/ImporterMappingFunctions_lib.aod b/process/ImporterMappingFunctions_lib/ImporterMappingFunctions_lib.aod
index 0e8acf1918c716ed3d774608965f64b1dba0d136..8eaa7e82c788473f788f40cf693211c1c128ba03 100644
--- a/process/ImporterMappingFunctions_lib/ImporterMappingFunctions_lib.aod
+++ b/process/ImporterMappingFunctions_lib/ImporterMappingFunctions_lib.aod
@@ -1,10 +1,10 @@
-<?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>ImporterMappingFunctions_lib</name>
- <comment></comment>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/ImporterMappingFunctions_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>ImporterMappingFunctions_lib</name>
+ <comment></comment>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/ImporterMappingFunctions_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/ImporterTest_lib/ImporterTest_lib.aod b/process/ImporterTest_lib/ImporterTest_lib.aod
index e1204321106696757a47000f28e10cc890d73182..25f811bfa2e9a01f384dc0ccd927dba0e4633b78 100644
--- a/process/ImporterTest_lib/ImporterTest_lib.aod
+++ b/process/ImporterTest_lib/ImporterTest_lib.aod
@@ -1,9 +1,9 @@
-<?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>ImporterTest_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/ImporterTest_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>ImporterTest_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/ImporterTest_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Importer_lib/Importer_lib.aod b/process/Importer_lib/Importer_lib.aod
index 0c29a1e97e07715224d80de8a9a3a4f803a5fcf0..64f0fa9601602070ea81917a6feed1686040f37d 100644
--- a/process/Importer_lib/Importer_lib.aod
+++ b/process/Importer_lib/Importer_lib.aod
@@ -1,9 +1,9 @@
-<?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>Importer_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Importer_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Importer_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Importer_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/IndexSearch_lib/IndexSearch_lib.aod b/process/IndexSearch_lib/IndexSearch_lib.aod
index bfc314526ea673c93e94af2e8fae2d019e835386..cff2150b5a24d171d4f1b67680e27652a3731982 100644
--- a/process/IndexSearch_lib/IndexSearch_lib.aod
+++ b/process/IndexSearch_lib/IndexSearch_lib.aod
@@ -1,9 +1,9 @@
-<?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>IndexSearch_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/IndexSearch_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>IndexSearch_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/IndexSearch_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/JditoFilter_lib/JditoFilter_lib.aod b/process/JditoFilter_lib/JditoFilter_lib.aod
index 39f93d7408ba9b780ffa2103135c3164dee04d68..b27ba3b2504b16a4143e38b23e9b5af875533302 100644
--- a/process/JditoFilter_lib/JditoFilter_lib.aod
+++ b/process/JditoFilter_lib/JditoFilter_lib.aod
@@ -1,9 +1,9 @@
-<?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>JditoFilter_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/JditoFilter_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>JditoFilter_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/JditoFilter_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/KeywordRegistry_basic/KeywordRegistry_basic.aod b/process/KeywordRegistry_basic/KeywordRegistry_basic.aod
index f16c2160c96dbf655bd3d9e8c09fa6cdf23fe58f..a6d95923c070ac1cd38e211903114acdc99c5661 100644
--- a/process/KeywordRegistry_basic/KeywordRegistry_basic.aod
+++ b/process/KeywordRegistry_basic/KeywordRegistry_basic.aod
@@ -1,9 +1,9 @@
-<?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>KeywordRegistry_basic</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/KeywordRegistry_basic/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>KeywordRegistry_basic</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/KeywordRegistry_basic/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index c5d0caf1d19e8d98344c26d354d09a4bf1840e76..ece0b8e36a049827b257050e159e263d018c66aa 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -86,3 +86,7 @@ $KeywordRegistry.campaignState$planning = function(){return "e04c9c59-0590-463c-
$KeywordRegistry.campaignStepState = function(){return "CampaignManagementStepStates";};
$KeywordRegistry.campaignStepState$open = function(){return "bbf69673-2ec6-46f8-b231-684a31be9fbd";};
$KeywordRegistry.campaignStepCostCategory = function(){return "CampaignManagementCostCategory";};
+$KeywordRegistry.documentTemplateType = function(){return "DocumentTemplateType";};
+$KeywordRegistry.documentTemplateTypeCategory = function(){return "DocumentTemplateTypeCategory";};
+$KeywordRegistry.documentTemplateType$mail = function(){return "MAI ";};
+$KeywordRegistry.documentTemplateType$attachment = function(){return "ATT ";};
\ No newline at end of file
diff --git a/process/Keyword_lib/Keyword_lib.aod b/process/Keyword_lib/Keyword_lib.aod
index 2dd2a647ff95df46a7e1b5d118e021129d1d30d7..485362ea608ebd5c2d074be4c12176121557fe85 100644
--- a/process/Keyword_lib/Keyword_lib.aod
+++ b/process/Keyword_lib/Keyword_lib.aod
@@ -1,9 +1,9 @@
-<?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>Keyword_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Keyword_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Keyword_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Keyword_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 1b01908232f309424584197b5554fcb6aa8538c8..20f2d485c8d13b46d12e2c516a721448d347addf 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -34,7 +34,7 @@ KeywordUtils.getResolvedTitleSqlPart = function(pContainerName, pDbFieldName, pL
* <br/>if the key could not be found an empty string "" is returned
* @param {String} keywordContainer specifies the type of the keyword and therefore the list elements; e.g. "COUNTRY"
* @param {String} key id value of the keyword where the view-value shall be searched
- * @param {String} [locale] Language-value for translations
+ * @param {String} [locale=locale depending on current client/servercontext] Language-value for translations
* @return {String} representation of the translated name of the keyword-key
* @example
* var histMedium;
@@ -153,16 +153,17 @@ KeywordUtils.getContainerNames = function()
* usefull for lists where the key is the name which is then a editable displayValue
*
* @param {String} pContainerName name of the keyword container for filtering
+* @param {String} [pLocale=locale depending on current client/servercontext] Language-value for translations
*
* @return {String[]} translated titles as 1D-Array
*/
-KeywordUtils.getEntryNamesByContainer = function(pContainerName)
+KeywordUtils.getEntryNamesByContainer = function(pContainerName, pLocale)
{
var sql = SqlCondition.begin()
.andPrepare("AB_KEYWORD_ENTRY.CONTAINER", pContainerName)
.buildSql("select AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY", null, "order by AB_KEYWORD_ENTRY.SORTING asc, AB_KEYWORD_ENTRY.TITLE asc")
var list = db.array(db.COLUMN, sql).map(function (v){
- return translate.text(v);
+ return pLocale ? translate.text(v, pLocale) : translate.text(v);
});
return list;
};
@@ -173,19 +174,20 @@ KeywordUtils.getEntryNamesByContainer = function(pContainerName)
* usefull for lists where the key is the name which is then a editable displayValue
*
* @param {String} pContainerName name of the keyword container for filtering
+* * @param {String} [pLocale=locale depending on current client/servercontext] Language-value for translations
*
-* @return {String[]} translated titles as 1D-Array
+* @return {String[]} 2D-Array in the form of [[id1, translatedTitle1], [idN, translatedTitleN]]
*/
-KeywordUtils.getEntryNamesAndIdsByContainer = function(pContainerName)
+KeywordUtils.getEntryNamesAndIdsByContainer = function(pContainerName, pLocale)
{
var sql = SqlCondition.begin()
.andPrepare("AB_KEYWORD_ENTRY.CONTAINER", pContainerName)
.buildSql("select AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID, AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY", null, "order by AB_KEYWORD_ENTRY.SORTING asc, AB_KEYWORD_ENTRY.TITLE asc")
- var list = db.table(sql);
- for(var i = 0; i<list.length; i = i + 1)
- list[i][1] = translate.text(list[i][1]);
-
+ var list = db.table(sql).map(function (elem){
+ elem[1] = pLocale ? translate.text(elem[1], pLocale) : translate.text(elem[1]);
+ return elem;
+ });
return list;
};
@@ -295,7 +297,7 @@ LanguageKeywordUtils.getResolvedTitleSqlPart = function(pDbFieldName, pLocale)
* returns a specific name (translated) - this is normally the view-value of a language
*
* @param {String} key id value of the language where the view-value shall be searched
- * @param {String} [locale] Language-value for translations
+ * @param {String} [locale=locale depending on current client/servercontext] Language-value for translations
*
* @return {String} representation of the translated name
*
diff --git a/process/Loghistory_lib/process.js b/process/Loghistory_lib/process.js
index 474b568aeb46e6601ee1010579b373c94b605b70..82dd062bfb143960ac4cee6be365595276e4401d 100644
--- a/process/Loghistory_lib/process.js
+++ b/process/Loghistory_lib/process.js
@@ -187,8 +187,10 @@ LogHistoryExecutor.prototype.execute = function ()
description.push(translate.withArguments("%0 from \"%1\" to \"%2\"", [logfieldTitle + ":", this.oldValues[i], this.newValues[i]], this.translationLanguage));
}
- if (this.sqlAction == 'I' && this.newValues[i] != "") description.push(logfieldTitle + ": \"" + this.newValues[i] + "\"");
- if (this.sqlAction == 'D' && this.oldValues[i] != "") description.push(logfieldTitle + ": \"" + this.oldValues[i] + "\"");
+ if (this.sqlAction == 'I' && this.newValues[i] != "" && this.newValues[i] != "[CLOB]")
+ description.push(logfieldTitle + ": \"" + this.newValues[i] + "\"");
+ if (this.sqlAction == 'D' && this.oldValues[i] != "" && this.oldValues[i] != "[CLOB]")
+ description.push(logfieldTitle + ": \"" + this.oldValues[i] + "\"");
}
}
if (this.sqlAction == "U")
@@ -199,9 +201,9 @@ LogHistoryExecutor.prototype.execute = function ()
if (description.length > 0)
{
- if (this.sqlAction == 'I') description = translate.withArguments("%0 added.", [description.join(", ")], this.translationLanguage);
- else if (this.sqlAction == 'U') description = translate.withArguments("%0 modified.", [description.join(", ")], this.translationLanguage);
- else if (this.sqlAction == 'D') description = translate.withArguments("%0 deleted.", [description.join(", ")], this.translationLanguage);
+ if (this.sqlAction == 'I') description = translate.withArguments("%0 added.", [description.join(",\n")], this.translationLanguage);
+ else if (this.sqlAction == 'U') description = translate.withArguments("%0 modified.", [description.join(",\n")], this.translationLanguage);
+ else if (this.sqlAction == 'D') description = translate.withArguments("%0 deleted.", [description.join(",\n")], this.translationLanguage);
for (index in references)
{
if (references[index].id != "")
@@ -342,7 +344,7 @@ LogHistoryExecutor.prototype._getFormattedValue = function (pColumnName, pDescri
+ this.structureDefinitionAlias + "." + this.affectedTable + "." + pColumnName + ".translate4Log";
pValue = process.executeScript(scriptId, pDescription.translate4Log, params, vars.get("$sys.dbalias"));
}
- else if (pDescription.columnType == String(SQLTYPES.TIMESTAMP))
+ else if (pDescription.columnType == String(SQLTYPES.TIMESTAMP) || pDescription.columnType == String(SQLTYPES.DATE))
pValue = datetime.toDate(pValue, translate.text("dd.MM.yyyy", this.translationLanguage), "Europe/Berlin");//TODO: timezone?
else if (pDescription.autoMapTrueFalse4Log)
{
diff --git a/process/Money_lib/Money_lib.aod b/process/Money_lib/Money_lib.aod
index 9c27e1c6debbf49bc099056bddd3fe16f4243480..95f60cdb6d9d686fdfc5729236d478ec2b39df02 100644
--- a/process/Money_lib/Money_lib.aod
+++ b/process/Money_lib/Money_lib.aod
@@ -1,9 +1,9 @@
-<?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>Money_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Money_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Money_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Money_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Neon_lib/Neon_lib.aod b/process/Neon_lib/Neon_lib.aod
index ace4a1e8ec19c194c1d9e00326013f3656cd35b4..cc4ae1edacf94aea697288d6d08fdd39b2d7f7b5 100644
--- a/process/Neon_lib/Neon_lib.aod
+++ b/process/Neon_lib/Neon_lib.aod
@@ -1,9 +1,9 @@
-<?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>Neon_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Neon_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Neon_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Neon_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/ObjectRelation_lib/ObjectRelation_lib.aod b/process/ObjectRelation_lib/ObjectRelation_lib.aod
index e5a4d95eb356b4bf2900d50e7b7a62ed22355697..ba062049a238cf1de09e9199d51701ac695c76c1 100644
--- a/process/ObjectRelation_lib/ObjectRelation_lib.aod
+++ b/process/ObjectRelation_lib/ObjectRelation_lib.aod
@@ -1,9 +1,9 @@
-<?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>ObjectRelation_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/ObjectRelation_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>ObjectRelation_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/ObjectRelation_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/OfferOrder_lib/OfferOrder_lib.aod b/process/OfferOrder_lib/OfferOrder_lib.aod
index 0df9d9a624d014c6b4583935732acbdea2b2b99e..c4bbeb5f5a0bfa5f20219fc2dd3d897693a643f4 100644
--- a/process/OfferOrder_lib/OfferOrder_lib.aod
+++ b/process/OfferOrder_lib/OfferOrder_lib.aod
@@ -1,9 +1,9 @@
-<?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>OfferOrder_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/OfferOrder_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>OfferOrder_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/OfferOrder_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Offer_lib/Offer_lib.aod b/process/Offer_lib/Offer_lib.aod
index 41247d62423c487255eb9fe234106031fd8a1b6f..711bca0fb5c729d063aa576b5afb12571678bbb1 100644
--- a/process/Offer_lib/Offer_lib.aod
+++ b/process/Offer_lib/Offer_lib.aod
@@ -1,9 +1,9 @@
-<?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>Offer_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Offer_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Offer_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Offer_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Order_lib/Order_lib.aod b/process/Order_lib/Order_lib.aod
index 3e225851b15f65e8d77e15182de060a04aee4878..aad2b4135e59e662edd045f3bf8106050e344067 100644
--- a/process/Order_lib/Order_lib.aod
+++ b/process/Order_lib/Order_lib.aod
@@ -1,9 +1,9 @@
-<?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>Order_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Order_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Order_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Order_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Organisation_lib/Organisation_lib.aod b/process/Organisation_lib/Organisation_lib.aod
index 47bca652458c91d875f43aa22721999afeb471e7..081e5bc520b048e33533822148e030dbfbc05d1f 100644
--- a/process/Organisation_lib/Organisation_lib.aod
+++ b/process/Organisation_lib/Organisation_lib.aod
@@ -1,10 +1,10 @@
-<?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>Organisation_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Organisation_lib/process.js</process>
- <alias>Data_alias</alias>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Organisation_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Organisation_lib/process.js</process>
+ <alias>Data_alias</alias>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Person_lib/Person_lib.aod b/process/Person_lib/Person_lib.aod
index 04c0795c9a2fcb6fcdd7f580da9ffe3a2be374e9..8bfe01686170ef52cd1d039139759cd2a368a5e5 100644
--- a/process/Person_lib/Person_lib.aod
+++ b/process/Person_lib/Person_lib.aod
@@ -1,10 +1,10 @@
-<?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>Person_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Person_lib/process.js</process>
- <alias>_____SYSTEMALIAS</alias>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Person_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Person_lib/process.js</process>
+ <alias>_____SYSTEMALIAS</alias>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/PostalAddress_lib/PostalAddress_lib.aod b/process/PostalAddress_lib/PostalAddress_lib.aod
index f7af81f2c9b9cb3ab8b20c4faa523894b5df10f7..6549dc71984e275e54973890e2eea06cb5a5fd52 100644
--- a/process/PostalAddress_lib/PostalAddress_lib.aod
+++ b/process/PostalAddress_lib/PostalAddress_lib.aod
@@ -1,9 +1,9 @@
-<?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>PostalAddress_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/PostalAddress_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>PostalAddress_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/PostalAddress_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/PostalAddress_lib/process.js b/process/PostalAddress_lib/process.js
index 71de1bb3d79977e237b5fe8f66d88bb33ed41af2..48d3b89455fda48b3970397073af600921c8295c 100644
--- a/process/PostalAddress_lib/process.js
+++ b/process/PostalAddress_lib/process.js
@@ -28,7 +28,8 @@ function AddressUtils(){}
*/
AddressUtils.formatOneline = function (pCountry, pAddressLine, pBuildingNo, pZipCode, pCity, pAddressIdentifier)
{
- return StringUtils.concat(", ", [pCountry, pAddressLine, pBuildingNo, pZipCode, pCity, pAddressIdentifier]);
+ //request (and resulting change) was made here to NOT include Country int othe title
+ return StringUtils.concat(", ", [pAddressLine, pBuildingNo, pZipCode, pCity, pAddressIdentifier]);
};
/**
@@ -38,8 +39,9 @@ AddressUtils.formatOneline = function (pCountry, pAddressLine, pBuildingNo, pZip
*/
AddressUtils.formatOnelineSql = function ()
{
+ //request (and resulting change) was made here to NOT include Country int othe title
var maskingHelper = new SqlMaskingUtils();
- var sqlExpression = maskingHelper.concat(["ADDRESS.COUNTRY", "ADDRESS.ADDRESS", "ADDRESS.BUILDINGNO", "ADDRESS.ZIP", "ADDRESS.CITY", "ADDRESS.ADDRIDENTIFIER"], ", ");
+ var sqlExpression = maskingHelper.concat(["ADDRESS.ADDRESS", "ADDRESS.BUILDINGNO", "ADDRESS.ZIP", "ADDRESS.CITY", "ADDRESS.ADDRIDENTIFIER"], ", ");
return sqlExpression;
};
diff --git a/process/Product_lib/Product_lib.aod b/process/Product_lib/Product_lib.aod
index 9c72fa0f0cdb72396fc83c73d54fadb87bcfd7ad..c775d616e6a6c137d55caf746d0c2ccf585a8974 100644
--- a/process/Product_lib/Product_lib.aod
+++ b/process/Product_lib/Product_lib.aod
@@ -1,9 +1,9 @@
-<?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>Product_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Product_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Product_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Product_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Proto_lib/Proto_lib.aod b/process/Proto_lib/Proto_lib.aod
index dd8841dc7aba84fa95c02f339956908458bb7307..6e45460ce613d9c1285208b0b5ce8e8d51d93250 100644
--- a/process/Proto_lib/Proto_lib.aod
+++ b/process/Proto_lib/Proto_lib.aod
@@ -1,9 +1,9 @@
-<?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>Proto_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Proto_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Proto_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Proto_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Report_lib/Report_lib.aod b/process/Report_lib/Report_lib.aod
index b847e04de6288a50fd822dffef554f45c285423f..10f5c12e999c965d73546948c0e8184bce00d7ad 100644
--- a/process/Report_lib/Report_lib.aod
+++ b/process/Report_lib/Report_lib.aod
@@ -1,9 +1,9 @@
-<?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>Report_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Report_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Report_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Report_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Salesproject_lib/Salesproject_lib.aod b/process/Salesproject_lib/Salesproject_lib.aod
index 06956e427082baea872c1f395aca9c5337032e42..3b48b4f2ab534791221fc03946fe114dec77726a 100644
--- a/process/Salesproject_lib/Salesproject_lib.aod
+++ b/process/Salesproject_lib/Salesproject_lib.aod
@@ -1,9 +1,9 @@
-<?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>Salesproject_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Salesproject_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Salesproject_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Salesproject_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Sql_lib/Sql_lib.aod b/process/Sql_lib/Sql_lib.aod
index be614f7e821c6a2eb65bd21911a0db57c6672077..10bc1033877cd0430e31d44211499aa54c5603fb 100644
--- a/process/Sql_lib/Sql_lib.aod
+++ b/process/Sql_lib/Sql_lib.aod
@@ -1,9 +1,9 @@
-<?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>Sql_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Sql_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Sql_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Sql_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 082ba83b99f8234b2a0606420fd87a859ce21922..161f32c580fca1ec9b6741557140f4bf14cc7c2b 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -1,5 +1,7 @@
+import("system.logging");
import("system.translate");
import("system.vars");
+import("system.util");
import("system.db");
import("system.datetime");
import("system.tools");
@@ -1369,3 +1371,54 @@ SqlUtils.getResolvingCaseWhen = function(pKeyValueArray, pDbFieldName, pLocale)
resSql = [resSql, preparedValues];
return resSql;
};
+
+SqlUtils.exportToLiquibase = function(pAuthor, pTableName, pColumns, pNewUUIDForIndexes)
+{
+ if(!pNewUUIDForIndexes)
+ pNewUUIDForIndexes = []
+
+ var xmlData = <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">
+ </databaseChangeLog>;
+ xmlData.changeSet.@author = pAuthor
+ xmlData.changeSet.@id = util.getNewUUID()
+
+ var dbData = db.table("select " + pColumns.join(", ") + " from " + pTableName);
+ var types = db.getColumnTypes(pTableName, pColumns);
+
+ dbData.forEach(function(pRow) {
+ var node = <insert></insert>;
+ node.@tableName = pTableName;
+
+ for (let i = 0; i < pColumns.length; i++)
+ {
+ var value = "";
+
+ for (j = 0; j < pNewUUIDForIndexes.length; j++) {
+
+ if (i == pNewUUIDForIndexes[j])
+ {
+ value = util.getNewUUID();
+ break;
+ }
+ }
+
+ if (!value)
+ value = pRow[i];
+
+ var col = <column/>;
+ col.@name = pColumns[i];
+
+ if (SQLTYPES.isNumberType(types[i]))
+ col.@valueNumeric = value;
+ else
+ col.@value = value;
+
+ node.appendChild(col);
+ }
+ this.appendChild(node);
+ }, xmlData.changeSet);
+
+ //xmlData.changeSet.push(<insert>6</insert>);
+
+ return xmlData.toXMLString()
+};
diff --git a/process/StandardObject_lib/StandardObject_lib.aod b/process/StandardObject_lib/StandardObject_lib.aod
index 94c1fcc045a7d0035211ebd8afb1d46832b39065..6312bafb4733d0ec98f6c11cb8035ba0cae10b3d 100644
--- a/process/StandardObject_lib/StandardObject_lib.aod
+++ b/process/StandardObject_lib/StandardObject_lib.aod
@@ -1,10 +1,10 @@
-<?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>StandardObject_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/process/StandardObject_lib/documentation.adoc</documentation>
- <process>%aditoprj%/process/StandardObject_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>StandardObject_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/process/StandardObject_lib/documentation.adoc</documentation>
+ <process>%aditoprj%/process/StandardObject_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Timetracking_lib/Timetracking_lib.aod b/process/Timetracking_lib/Timetracking_lib.aod
index b514721991f2a2544cf57c10e3bc5d89c0571d7b..e6b0d62a796fc85cbfd8a6b577c78072d1e57a71 100644
--- a/process/Timetracking_lib/Timetracking_lib.aod
+++ b/process/Timetracking_lib/Timetracking_lib.aod
@@ -1,9 +1,9 @@
-<?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>Timetracking_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Timetracking_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Timetracking_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Timetracking_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Turnover_lib/Turnover_lib.aod b/process/Turnover_lib/Turnover_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..28bacd7d8eaa8d0f3bd01ed7f72c229487b2372e
--- /dev/null
+++ b/process/Turnover_lib/Turnover_lib.aod
@@ -0,0 +1,9 @@
+<?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>Turnover_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Turnover_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Turnover_lib/process.js b/process/Turnover_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..3e61ef64230b04645ea8f06d36784182cd454788
--- /dev/null
+++ b/process/Turnover_lib/process.js
@@ -0,0 +1,78 @@
+import("system.translate");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.SQLTYPES");
+import("system.db");
+import("system.neon");
+import("Context_lib");
+
+/**
+ * Methods used for turnover data.
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function TurnoverUtil() {}
+
+/**
+ * get all turnover data.
+ *
+ * @param {Number} pMaxYear the maximum year
+ * @param {Number} pYearCount count of years to select
+ *
+ * @return {String[][]}
+ */
+TurnoverUtil.getTurnoverData = function (pMaxYear, pYearCount)
+{
+ var turnoverCategory = translate.text('Turnover');
+
+ var minYear = pMaxYear - pYearCount + 1;
+
+ // load data
+ var data = db.table(SqlCondition.begin()
+ .and("SALESORDERITEM.OPTIONAL <> 1")
+ .andPrepare("SALESORDER.SALESORDERDATE", pMaxYear, "year(#) <= ?", SQLTYPES.INTEGER)
+ .andPrepare("SALESORDER.SALESORDERDATE", minYear, "year(#) >= ?", SQLTYPES.INTEGER)
+ .buildSql("select '" + turnoverCategory + "', year(SALESORDERDATE) yearNum, month(SALESORDERDATE) monthNum, SALESORDERITEM.DISCOUNT discount, SALESORDERITEM.VAT vat, SALESORDERITEM.PRICE price, sum(SALESORDERITEM.QUANTITY) quantity, SALESORDERITEM.GROUPCODEID prodGroup, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "SALESORDERITEM.GROUPCODEID") + ") prodGroupName \n\
+ from SALESORDER \n\
+ join SALESORDERITEM on SALESORDERITEM.SALESORDER_ID = SALESORDER.SALESORDERID", "1=2", "group by year(SALESORDERDATE), month(SALESORDERDATE), SALESORDERITEM.GROUPCODEID, SALESORDERITEM.DISCOUNT, SALESORDERITEM.VAT, SALESORDERITEM.PRICE \n\
+ order by yearNum, monthNum "));
+
+ return data;
+}
+
+/**
+ * get forecast data
+ *
+ * @param {Number} pMaxYear the maximum year
+ * @param {Number} pYearCount count of years to select
+ *
+ * @return {String[][]}
+ */
+TurnoverUtil.getForecastData = function (pMaxYear, pYearCount)
+{
+ var forecastCategory = translate.text('Forecast');
+
+ var minYear = pMaxYear - pYearCount + 1;
+
+ // load data
+ var data = db.table(SqlCondition.begin()
+ .andPrepare("SALESPROJECT_FORECAST.DATE_START", pMaxYear, "year(#) <= ?", SQLTYPES.INTEGER)
+ .andPrepare("SALESPROJECT_FORECAST.DATE_START", minYear, "year(#) >= ?", SQLTYPES.INTEGER)
+ .buildSql("select '" + forecastCategory + "', year(DATE_START) yearNum, month(DATE_START) monthNum, 0 discount, 0 vat, sum(VOLUME) price, 1 quantity, GROUPCODE prodGroup, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODE") + ") prodGroupName from SALESPROJECT_FORECAST", "1=2", " group by year(DATE_START), month(DATE_START), GROUPCODE order by yearNum, monthNum"))
+
+ return data;
+}
+
+/**
+ * get turnover data
+ *
+ * @param {Number} pMaxYear the maximum year
+ * @param {Number} pYearCount count of years to select
+ *
+ * @return {String[][]}
+ */
+TurnoverUtil.getTurnoverAndForecastData = function (pMaxYear, pYearCount)
+{
+ return TurnoverUtil.getTurnoverData(pMaxYear, pYearCount).concat(TurnoverUtil.getForecastData(pMaxYear, pYearCount));
+}
\ No newline at end of file
diff --git a/process/Util_lib/Util_lib.aod b/process/Util_lib/Util_lib.aod
index 18ccba5128774c467915662c198183f2f6f93744..cc42c5bacd57f92fbc904a50a4060c739fcadfdd 100644
--- a/process/Util_lib/Util_lib.aod
+++ b/process/Util_lib/Util_lib.aod
@@ -1,9 +1,9 @@
-<?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>Util_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Util_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?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>Util_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Util_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index b834cbcb4ee7cbbb5c598de3c57d455fe4ed6894..ddbb258a847462214bdf71f3c3870b3974d65e65 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -540,3 +540,78 @@ NumberSequencingUtils.getMaxUniqueNumber = function(pColumn, pTable, pCondition)
var maxNum = db.cell("select max(" + pColumn + ") from " + pTable + condition);
return maxNum == "" ? "0" : maxNum;
}
+
+/**
+ * functions for trees
+ */
+function TreeUtils () {}
+
+/**
+ * sorts an array in a way that a tree(-table) can be built (parents are added before children)
+ * This function does not garantee that the order of the children stays the same. If you need this, use TreeUtils.treeOrderBy
+ *
+ * consider the use of TreeUtils.treeOrderBy as it may be more performant, but it needs the layernumber of each row.
+ *
+ * @param {Array} pArray two-dimensional array to sort
+ * @param {Number} pUidIndex the index of the uid in a row
+ * @param {Number} pParentIdIndex the index of the parent id in a row
+ *
+ * @return {Array} the sorted array
+ */
+TreeUtils.sortArrayForTree = function (pArray, pUidIndex, pParentIdIndex)
+{
+ if (pArray.length <= 1)
+ return pArray;
+ var rows = {};
+ var allIds = {};
+
+ pArray.forEach(function (row) {allIds[row[pUidIndex]] = true;});
+ var index = 0;
+
+ do {
+ var oldIndex = index;
+ pArray.forEach(function (row)
+ {
+ if (!(row[pUidIndex] in this) && (row[pParentIdIndex] in this || !allIds[row[pParentIdIndex]]))
+ this[row[pUidIndex]] = {
+ data : row,
+ index : index++
+ };
+ }, rows);
+
+ /* stop if no new items were added, otherwise incorrect data (for instance
+ an item that is it's own parent) could cause an infinite loop */
+ } while (oldIndex != index);
+ var sortedArray = new Array(index);
+ for (let i in rows)
+ sortedArray[rows[i].index] = rows[i].data;
+ return sortedArray;
+}
+
+/**
+ * like TreeUtils.sortArrayForTree, this function garantees that parents are added before children
+ * But it works in a different way based on the layer number.
+ *
+ * It can also sort all children based on the given orderBys. For this you can Probvide an array of Indexes and direction (pOrderByIndexes)
+ *
+ * @param {Array} pData two-dimensional array to sort
+ * @param {Number} pLayerIndex The index of the layernumber-Field
+ * @param {Array[][]} pOrderByIndexes Array containing arrays of [field-index, direction]. The direction can be true (desc) or false (asc).
+ *
+ * @return {Array} the sorted array
+ */
+TreeUtils.treeOrderBy = function(pData, pLayerIndex, pOrderByIndexes)
+{
+ pOrderByIndexes = [[pLayerIndex, false]].concat(pOrderByIndexes)
+
+ return pData.sort(function(pRow1, pRow2)
+ {
+ for (let i = 0; i < pOrderByIndexes.length; i++) {
+ var orderBy = pOrderByIndexes[i];
+ if (pRow1[orderBy[0]] > pRow2[orderBy[0]]) return (orderBy[1] ? -1 : 1);
+ if (pRow1[orderBy[0]] < pRow2[orderBy[0]]) return (orderBy[1] ? 1 : -1);
+ }
+
+ return 0;
+ })
+}
\ No newline at end of file
diff --git a/process/_test_importer/_test_importer.aod b/process/_test_importer/_test_importer.aod
index 054240e430569eceaeff6e6c6e1a7731a30a849d..dbac3d114ee5bf9292a22d2fba0317cd6af67d7b 100644
--- a/process/_test_importer/_test_importer.aod
+++ b/process/_test_importer/_test_importer.aod
@@ -1,10 +1,10 @@
-<?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>_test_importer</name>
- <title>Importer</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/_test_importer/process.js</process>
- <variants>
- <element>EXECUTABLE</element>
- </variants>
-</process>
+<?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>_test_importer</name>
+ <title>Importer</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/_test_importer/process.js</process>
+ <variants>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/process/autostartNeon/autostartNeon.aod b/process/autostartNeon/autostartNeon.aod
index 348fc7c6ca8c2be930aa7723be1d1012d813380c..73ea7a910d55c4263af5d1e1cf58de40c315d4ea 100644
--- a/process/autostartNeon/autostartNeon.aod
+++ b/process/autostartNeon/autostartNeon.aod
@@ -1,6 +1,6 @@
-<?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>autostartNeon</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/autostartNeon/process.js</process>
-</process>
+<?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>autostartNeon</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/autostartNeon/process.js</process>
+</process>
diff --git a/process/autostartNeon/process.js b/process/autostartNeon/process.js
index 0d612f4106852032aaafe8518e8f1e3c9a834c43..4be138216f2e17ec96f966951ba858c98c2c0c81 100644
--- a/process/autostartNeon/process.js
+++ b/process/autostartNeon/process.js
@@ -1,3 +1,4 @@
+import("system.tools");
import("system.logging");
import("system.calendars")
import("system.notification")
@@ -6,4 +7,15 @@ import("system.util");
var users = ["Admin", "Birgit Leicht", "John Doe"]
calendars.addPermissions(users, calendars.VEVENT, ["READ", "WRITE"], null, false, calendars.SORTSTRATEGY_NATURAL);
-calendars.setCheckAttendeesOnWrite(false);
\ No newline at end of file
+calendars.setCheckAttendeesOnWrite(false);
+
+//var user = tools.getCurrentUser();
+//var notis = notification.getUserNotifications(user["name"], null);
+//
+//var noti = notis[0];
+//logging.log("noti USERID: " + noti);
+//logging.log("noti2 USERID: " + noti[notification.USERID.toSource()]);
+//notification.updateUserNotificationState(noti[notification.USERID], noti[notification.CONTENTID], notification.STATE_ARCHIVE);
+//
+//notis = notification.getUserNotifications(user["name"], null);
+//logging.log("notifications: " + notis[0][notification.STATE]);
\ No newline at end of file
diff --git a/process/blobHandler/blobHandler.aod b/process/blobHandler/blobHandler.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e637f87da95ce602acdc4b93af89d3c11c4554e6
--- /dev/null
+++ b/process/blobHandler/blobHandler.aod
@@ -0,0 +1,7 @@
+<?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>blobHandler</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/blobHandler/process.js</process>
+ <alias>_____SYSTEMALIAS</alias>
+</process>
diff --git a/process/blobHandler/process.js b/process/blobHandler/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..0e58d547a035e2a6c9a67a31752c5723f3d777c4
--- /dev/null
+++ b/process/blobHandler/process.js
@@ -0,0 +1,71 @@
+import("Sql_lib");
+import("system.db");
+import("system.result");
+import("system.util");
+import("system.fileIO");
+import("system.vars");
+
+var path = vars.get("$sys.serverhome") + "/binaryfiles/"
+var operation = null;
+
+switch (vars.get("$local.operation"))
+{
+ case "CREATE":
+ operation = createBlob;
+ break;
+ case "DELETE":
+ operation = deleteBlob;
+ break;
+ case "UPDATE":
+ operation = updateBlob;
+ break;
+ case "READ":
+ operation = readBlob;
+ break;
+ default:
+ break;
+}
+
+if (operation)
+{
+ operation(path, vars.get("$local.idvalue"));
+}
+
+function createBlob (path, filename)
+{
+ _writeBlob(path + filename + ".0")
+}
+
+function deleteBlob (path, filename)
+{
+ fileIO.remove(path + filename + ".0");
+}
+
+function updateBlob (path, filename)
+{
+ _writeBlob(path + filename + ".0");
+}
+
+function readBlob (path, filename)
+{
+ var fullPath = path + filename + ".0";
+ var fromWhereCond = " from ASYS_BINARIES where ID = '" + filename + "'";
+
+ sqlHelper = new SqlMaskingUtils();
+
+ if (fileIO.exists(fullPath) && fileIO.canRead(fullPath))
+ {
+ var blob = fileIO.getData(fullPath, util.DATA_BINARY);
+ result.string(blob);
+ }
+ else if (db.cell("select " + sqlHelper.bindataLength("BINDATA") + fromWhereCond) > 0)
+ {
+ blob = db.cell("select BINDATA " + fromWhereCond);
+ result.string(blob);
+ }
+}
+
+function _writeBlob (fullPath)
+{
+ fileIO.storeData(fullPath, vars.get("$local.data"), util.DATA_BINARY, false);
+}
diff --git a/process/rebuildIndex_serverProcess/process.js b/process/rebuildIndex_serverProcess/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..ba3ab1567c414d31ce8e304269d9f534d32ed974
--- /dev/null
+++ b/process/rebuildIndex_serverProcess/process.js
@@ -0,0 +1,2 @@
+import("system.indexsearch");
+indexsearch.runIndexer(null);
\ No newline at end of file
diff --git a/process/rebuildIndex_serverProcess/rebuildIndex_serverProcess.aod b/process/rebuildIndex_serverProcess/rebuildIndex_serverProcess.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4455787de667d6813030c4d24069f0b2f924f165
--- /dev/null
+++ b/process/rebuildIndex_serverProcess/rebuildIndex_serverProcess.aod
@@ -0,0 +1,11 @@
+<?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>rebuildIndex_serverProcess</name>
+ <title>rebuild Index</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/rebuildIndex_serverProcess/process.js</process>
+ <alias>Data_alias</alias>
+ <variants>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/report/Offer_report/Offer_report.aod b/report/Offer_report/Offer_report.aod
index 737a6889a7a04378f01339685a85661f15da8849..269c90f6a4aeab4f0d27e2bee8879c44a2aa57ec 100644
--- a/report/Offer_report/Offer_report.aod
+++ b/report/Offer_report/Offer_report.aod
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<report xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.2.0">
- <name>Offer_report</name>
- <title>Angebot</title>
- <description></description>
- <comment><null value></comment>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <alias>Data_alias</alias>
- <reportData>%aditoprj%/report/Offer_report/reportData.jrxml</reportData>
- <reportType>JASPER</reportType>
- <subReports>
- <subreport>
- <name>reportData_subreport1</name>
- <reportData>%aditoprj%/report/Offer_report/reportData_subreport1.jrxml</reportData>
- </subreport>
- </subReports>
- <images>
- <image>
- <name>myLogo</name>
- <fileName>myLogo.png</fileName>
- <imageData>%aditoprj%/report/Offer_report/myLogo.png</imageData>
- </image>
- </images>
- <ribbon>
- <name>ribbon</name>
- <ribbonTasks>
- <ribbonTask>
- <name>TASK_REPORT</name>
- <showNavigationBar v="true" />
- <showZoom v="true" />
- <showExport v="true" />
- <showAux v="true" />
- <icon>REPORT_24</icon>
- <enabled v="true" />
- <layoutPosition>POSITION_TOP</layoutPosition>
- <customComponents>
- <rcCommandButton>
- <name>Button</name>
- <onClick>%aditoprj%/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js</onClick>
- <title>Senden per E-Mail</title>
- <imageData>%aditoprj%/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/imageData.png</imageData>
- </rcCommandButton>
- </customComponents>
- </ribbonTask>
- </ribbonTasks>
- </ribbon>
-</report>
+<?xml version="1.0" encoding="UTF-8"?>
+<report xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.2.0">
+ <name>Offer_report</name>
+ <title>Angebot</title>
+ <description></description>
+ <comment><null value></comment>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <alias>Data_alias</alias>
+ <reportData>%aditoprj%/report/Offer_report/reportData.jrxml</reportData>
+ <reportType>JASPER</reportType>
+ <subReports>
+ <subreport>
+ <name>reportData_subreport1</name>
+ <reportData>%aditoprj%/report/Offer_report/reportData_subreport1.jrxml</reportData>
+ </subreport>
+ </subReports>
+ <images>
+ <image>
+ <name>myLogo</name>
+ <fileName>myLogo.png</fileName>
+ <imageData>%aditoprj%/report/Offer_report/myLogo.png</imageData>
+ </image>
+ </images>
+ <ribbon>
+ <name>ribbon</name>
+ <ribbonTasks>
+ <ribbonTask>
+ <name>TASK_REPORT</name>
+ <showNavigationBar v="true" />
+ <showZoom v="true" />
+ <showExport v="true" />
+ <showAux v="true" />
+ <icon>REPORT_24</icon>
+ <enabled v="true" />
+ <layoutPosition>POSITION_TOP</layoutPosition>
+ <customComponents>
+ <rcCommandButton>
+ <name>Button</name>
+ <onClick>%aditoprj%/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js</onClick>
+ <title>Senden per E-Mail</title>
+ <imageData>%aditoprj%/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/imageData.png</imageData>
+ </rcCommandButton>
+ </customComponents>
+ </ribbonTask>
+ </ribbonTasks>
+ </ribbon>
+</report>
diff --git a/report/Organisation_report/Organisation_report.aod b/report/Organisation_report/Organisation_report.aod
index 0d4e3d583a6c710d89307a87795d36f95418d8ac..60a2f7af201d646e45153c55386183d7e5959856 100644
--- a/report/Organisation_report/Organisation_report.aod
+++ b/report/Organisation_report/Organisation_report.aod
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<report xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.2.0">
- <name>Organisation_report</name>
- <title>Kundenstammblatt</title>
- <description></description>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>%aditoprj%/report/Organisation_report/icon.png</icon>
- <iconInactive>%aditoprj%/report/Organisation_report/iconInactive.png</iconInactive>
- <reportData>%aditoprj%/report/Organisation_report/reportData.jrxml</reportData>
- <reportType>JASPER</reportType>
- <subReports>
- <subreport>
- <name>Kontaktpersonen</name>
- <reportData>%aditoprj%/report/Organisation_report/Kontaktpersonen.jrxml</reportData>
- </subreport>
- <subreport>
- <name>Historien</name>
- <reportData>%aditoprj%/report/Organisation_report/Historien.jrxml</reportData>
- </subreport>
- <subreport>
- <name>Aufgaben</name>
- <reportData>%aditoprj%/report/Organisation_report/Aufgaben.jrxml</reportData>
- </subreport>
- <subreport>
- <name>Kommunikationsdaten</name>
- <reportData>%aditoprj%/report/Organisation_report/Kommunikationsdaten.jrxml</reportData>
- </subreport>
- </subReports>
- <images>
- <image>
- <name>myLogo</name>
- <fileName>myLogo.png</fileName>
- <imageData>%aditoprj%/report/Organisation_report/myLogo.png</imageData>
- </image>
- <image>
- <name>icon</name>
- <fileName>icon.png</fileName>
- <imageData>%aditoprj%/report/Organisation_report/icon.png</imageData>
- </image>
- <image>
- <name>iconInactive</name>
- <fileName>iconInactive.png</fileName>
- <imageData>%aditoprj%/report/Organisation_report/iconInactive.png</imageData>
- </image>
- </images>
- <ribbon>
- <name>ribbon</name>
- <ribbonTasks>
- <ribbonTask>
- <name>TASK_REPORT</name>
- <showNavigationBar v="true" />
- <showZoom v="true" />
- <showExport v="true" />
- <showAux v="true" />
- <icon>REPORT_24</icon>
- <enabled v="true" />
- <layoutPosition>POSITION_TOP</layoutPosition>
- </ribbonTask>
- </ribbonTasks>
- </ribbon>
-</report>
+<?xml version="1.0" encoding="UTF-8"?>
+<report xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.2.0">
+ <name>Organisation_report</name>
+ <title>Kundenstammblatt</title>
+ <description></description>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>%aditoprj%/report/Organisation_report/icon.png</icon>
+ <iconInactive>%aditoprj%/report/Organisation_report/iconInactive.png</iconInactive>
+ <reportData>%aditoprj%/report/Organisation_report/reportData.jrxml</reportData>
+ <reportType>JASPER</reportType>
+ <subReports>
+ <subreport>
+ <name>Kontaktpersonen</name>
+ <reportData>%aditoprj%/report/Organisation_report/Kontaktpersonen.jrxml</reportData>
+ </subreport>
+ <subreport>
+ <name>Historien</name>
+ <reportData>%aditoprj%/report/Organisation_report/Historien.jrxml</reportData>
+ </subreport>
+ <subreport>
+ <name>Aufgaben</name>
+ <reportData>%aditoprj%/report/Organisation_report/Aufgaben.jrxml</reportData>
+ </subreport>
+ <subreport>
+ <name>Kommunikationsdaten</name>
+ <reportData>%aditoprj%/report/Organisation_report/Kommunikationsdaten.jrxml</reportData>
+ </subreport>
+ </subReports>
+ <images>
+ <image>
+ <name>myLogo</name>
+ <fileName>myLogo.png</fileName>
+ <imageData>%aditoprj%/report/Organisation_report/myLogo.png</imageData>
+ </image>
+ <image>
+ <name>icon</name>
+ <fileName>icon.png</fileName>
+ <imageData>%aditoprj%/report/Organisation_report/icon.png</imageData>
+ </image>
+ <image>
+ <name>iconInactive</name>
+ <fileName>iconInactive.png</fileName>
+ <imageData>%aditoprj%/report/Organisation_report/iconInactive.png</imageData>
+ </image>
+ </images>
+ <ribbon>
+ <name>ribbon</name>
+ <ribbonTasks>
+ <ribbonTask>
+ <name>TASK_REPORT</name>
+ <showNavigationBar v="true" />
+ <showZoom v="true" />
+ <showExport v="true" />
+ <showAux v="true" />
+ <icon>REPORT_24</icon>
+ <enabled v="true" />
+ <layoutPosition>POSITION_TOP</layoutPosition>
+ </ribbonTask>
+ </ribbonTasks>
+ </ribbon>
+</report>
diff --git a/role/PROJECT_Administrator/PROJECT_Administrator.aod b/role/PROJECT_Administrator/PROJECT_Administrator.aod
deleted file mode 100644
index 49266936de0d7480ee3bcb1c58c4c1d84b0e9a05..0000000000000000000000000000000000000000
--- a/role/PROJECT_Administrator/PROJECT_Administrator.aod
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<role xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/role/1.2.0">
- <name>PROJECT_Administrator</name>
- <title>Administrator</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
-</role>
diff --git a/system/default/default.aod b/system/default/default.aod
index 4d42ce551bf25394fc68370fddc08442f0ab1654..8afea7846c7f9099200f45e7f3408c916e67553f 100644
--- a/system/default/default.aod
+++ b/system/default/default.aod
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<system 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/system/1.1.0">
- <name>default</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <serverConfigPath>$ADITODATA/config/serverconfig_default.xml</serverConfigPath>
- <aditoHomePath>$ADITOHOME</aditoHomePath>
- <aditoDataPath>$PROJECTHOME/data</aditoDataPath>
- <loginUser>admin</loginUser>
- <autoLogin v="false" />
- <enableJDitoDebug v="true" />
-</system>
+<?xml version="1.0" encoding="UTF-8"?>
+<system 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/system/1.1.0">
+ <name>default</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <serverConfigPath>$ADITODATA/config/serverconfig_default.xml</serverConfigPath>
+ <aditoHomePath>$ADITOHOME</aditoHomePath>
+ <aditoDataPath>$PROJECTHOME/data</aditoDataPath>
+ <loginUser>admin</loginUser>
+ <autoLogin v="false" />
+ <enableJDitoDebug v="true" />
+</system>