diff --git a/.aditoprj/blueprints/CreateExportAction.xml b/.aditoprj/blueprints/CreateExportAction.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c6df83894e53e19d6001d4d84337e48b622108aa
--- /dev/null
+++ b/.aditoprj/blueprints/CreateExportAction.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<blueprint name="Create Export Action">
+ <type>entityActionField</type>
+ <parameters>
+ </parameters>
+ <data>
+ <document name="context"><![CDATA[
+ <entity VERSION="1.3.17">
+ <entityFields>
+ <entityActionField>
+ <name>export</name>
+ <title>Export</title>
+ <onActionProcess>import("ExportTemplate_lib");
+import("system.vars");
+
+var selection = vars.get("$sys.selection");
+
+if(selection.length == 0) //no selection -> use Filtercondition;
+{
+ selection = vars.get("$sys.filter");
+}
+
+ExportTemplateUtils.addParticipants(JSON.stringify(selection), vars.get("$sys.currentcontextname"));</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <iconId>NEON:EXPORT</iconId>
+ <stateProcess>import("system.result");
+import("FilterViewAction_lib");
+import("system.vars");
+
+var contactCount = vars.get("$sys.datarowcount");
+
+result.string(FilterViewActionUtils.getComponentStateByRowCount(contactCount));</stateProcess>
+ <tooltip>Export fields of this table</tooltip>
+ <tooltipProcess>import("system.translate");
+import("system.result");
+
+result.string(translate.text("Export columns using a exporttemplate"));</tooltipProcess>
+ </entityActionField>
+ </entityFields>
+ </entity>
+ ]]></document>
+ </data>
+</blueprint>
diff --git a/.liquibase/Data_alias/basic/2021.1.0/changelog.xml b/.liquibase/Data_alias/basic/2021.1.0/changelog.xml
index d23a18f8fb29173c0522892be410c03620a6c31d..14de37ddbc5272cbdc21cb6f1518f454f8dab1d4 100644
--- a/.liquibase/Data_alias/basic/2021.1.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.1.0/changelog.xml
@@ -8,8 +8,6 @@
<include relativeToChangelogFile="true" file="offerWorkflow/add_ab_keyword_entry_activityCategory.xml"/>
<include relativeToChangelogFile="true" file="create_standardWorkflow.xml"/>
- <include relativeToChangelogFile="true" file="EwsContactSync/create_ewsInfoLog.xml"/>
- <include relativeToChangelogFile="true" file="EwsContactSync/add_AB_SYNCCONTACT_updateContact.xml"/>
<include relativeToChangelogFile="true" file="Advertising/changelog.xml"/>
<include relativeToChangelogFile="true" file="Bulkmail/changelog.xml"/>
<include relativeToChangelogFile="true" file="Addressvalidation/changelog.xml"/>
diff --git a/.liquibase/Data_alias/basic/2021.1.0/EwsContactSync/add_AB_SYNCCONTACT_updateContact.xml b/.liquibase/Data_alias/basic/2021.2.0/EwsContactSync/add_AB_SYNCCONTACT_updateContact.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2021.1.0/EwsContactSync/add_AB_SYNCCONTACT_updateContact.xml
rename to .liquibase/Data_alias/basic/2021.2.0/EwsContactSync/add_AB_SYNCCONTACT_updateContact.xml
diff --git a/.liquibase/Data_alias/basic/2021.2.0/EwsContactSync/changelog.xml b/.liquibase/Data_alias/basic/2021.2.0/EwsContactSync/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4b416e736e987f916c7653a1c0541f1e9f6018b7
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/EwsContactSync/changelog.xml
@@ -0,0 +1,7 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include relativeToChangelogFile="true" file="add_AB_SYNCCONTACT_updateContact.xml"/>
+ <include relativeToChangelogFile="true" file="create_ewsInfoLog.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.1.0/EwsContactSync/create_ewsInfoLog.xml b/.liquibase/Data_alias/basic/2021.2.0/EwsContactSync/create_ewsInfoLog.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2021.1.0/EwsContactSync/create_ewsInfoLog.xml
rename to .liquibase/Data_alias/basic/2021.2.0/EwsContactSync/create_ewsInfoLog.xml
diff --git a/.liquibase/Data_alias/basic/2021.2.0/Export/add_ExportTemplateFields_Dependency_ID.xml b/.liquibase/Data_alias/basic/2021.2.0/Export/add_ExportTemplateFields_Dependency_ID.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f32a31b9b21c986a24ed06c0aa65f37bf83dfe11
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/Export/add_ExportTemplateFields_Dependency_ID.xml
@@ -0,0 +1,19 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.pongratz" id="bcf10957-f79e-48b7-8a7b-013cfebe23bc">
+ <addColumn tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" type="CHAR(36)" />
+
+ <column name="USER_NEW" type="NVARCHAR(50)" />
+ <column name="DATE_NEW" type="DATETIME" />
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATETIME" />
+ </addColumn>
+ </changeSet>
+
+ <changeSet author="s.pongratz" id="a573c6b0-41ba-4bf1-99f5-b9c2c184dcc2">
+ <createIndex indexName="IDX_EXPORTTEMPLATEPOU_ID" tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/Export/add_ExportTemplatePlaceOfUse.xml b/.liquibase/Data_alias/basic/2021.2.0/Export/add_ExportTemplatePlaceOfUse.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e5d45f305e725e82ede22b39669c89b331f3f1e0
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/Export/add_ExportTemplatePlaceOfUse.xml
@@ -0,0 +1,23 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.pongratz" id="8cd938e0-bffc-46ab-8009-b2e2c099c4e3">
+ <addColumn tableName="EXPORTTEMPLATEPLACEOFUSE">
+ <column name="TITLE" type="NVARCHAR(150)"/>
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" type="CHAR(36)" />
+
+ <column name="OBJECT_FILTER" type="NCLOB" />
+
+ <column name="USER_NEW" type="NVARCHAR(50)" />
+ <column name="DATE_NEW" type="DATETIME" />
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATETIME" />
+ </addColumn>
+ </changeSet>
+ <changeSet author="s.pongratz" id="b8121ece-f3ee-4899-a7d9-c61762cdf1a1">
+ <createIndex indexName="IDX_ETPOU_ID" tableName="EXPORTTEMPLATEPLACEOFUSE">
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/Export/changelog.xml b/.liquibase/Data_alias/basic/2021.2.0/Export/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..44a347e06d1ea9d4664f4d2ee98b1be874402a82
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/Export/changelog.xml
@@ -0,0 +1,7 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include relativeToChangelogFile="true" file="add_ExportTemplatePlaceOfUse.xml"/>
+ <include relativeToChangelogFile="true" file="add_ExportTemplateFields_Dependency_ID.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/Offer/alter_OfferProbabilityVarcharToInteger.xml b/.liquibase/Data_alias/basic/2021.2.0/Offer/alter_OfferProbabilityVarcharToInteger.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b4e5a8a169ffbf26e0ea9538779c45806a15f91b
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/Offer/alter_OfferProbabilityVarcharToInteger.xml
@@ -0,0 +1,25 @@
+<?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 dbms="derby" author="b.ulrich" id="58fad879-afc5-48b3-984f-a9ebba7185cd">
+ <sql>
+ ALTER TABLE OFFER ADD COLUMN PROBABILITY_NEW CHAR(10);
+ UPDATE OFFER SET PROBABILITY_NEW=CAST ( PROBABILITY as CHAR(10));
+ ALTER TABLE OFFER DROP COLUMN PROBABILITY;
+ RENAME COLUMN OFFER.PROBABILITY_NEW TO PROBABILITY;
+
+ ALTER TABLE OFFER ADD COLUMN PROBABILITY_NEW INTEGER;
+ UPDATE OFFER SET PROBABILITY_NEW=CAST ( PROBABILITY as INTEGER);
+ ALTER TABLE OFFER DROP COLUMN PROBABILITY;
+ RENAME COLUMN OFFER.PROBABILITY_NEW TO PROBABILITY;
+ </sql>
+ </changeSet>
+
+ <changeSet author="b.ulrich" id="1dc2d055-0f1a-447a-af36-fb0b36bb5558">
+ <preConditions onFail="CONTINUE">
+ <not>
+ <dbms type="derby" />
+ </not>
+ </preConditions>
+ <modifyDataType columnName="PROBABILITY" newDataType="INTEGER" tableName="OFFER"/>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2021.2.0/Offer/changelog.xml b/.liquibase/Data_alias/basic/2021.2.0/Offer/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..107af93251e6f449f73196baf7f88a2f2c0dc7cf
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/Offer/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include relativeToChangelogFile="true" file="alter_OfferProbabilityVarcharToInteger.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/changelog.xml b/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
index aa084e4023bd6c13e18a160339a7921709800bd7..822f717495e2e7b04ab38705816c23e05a9f90e9 100644
--- a/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
@@ -5,6 +5,9 @@
<include relativeToChangelogFile="true" file="Duplicate/changelog.xml"/>
<include relativeToChangelogFile="true" file="TopicTree/changelog.xml"/>
<include relativeToChangelogFile="true" file="CampaignStep/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="Offer/changelog.xml"/>
<include relativeToChangelogFile="true" file="xRM-Service/changelog.xml"/>
<include relativeToChangelogFile="true" file="Mosaico/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="EwsContactSync/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="Export/changelog.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplate.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplate.xml
index 873fb1848500de115bc983a22e347ef455296060..143a6c1549e4c07dbc7feeef1a4d4961898c34da 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplate.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplate.xml
@@ -1,54 +1,83 @@
-<?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="autogenerated" id="61e54a43-888e-4762-a188-45046738a877">
- <delete tableName="exporttemplate"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<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-4.1.xsd">
+ <changeSet author="s.pongratz" id="b0d902bd-317a-4a61-a0c3-c88d4697fe34">
<insert tableName="exporttemplate">
- <column name="FIELDDELIMITER" value="quotation mark"/>
- <column name="ISOLANGUAGE" value="deu"/>
- <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
- <column name="DESCRIPTION" value="Anrede, Vor und Nachname sowie Email und Telefonnummer"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="TITLE" value="Personen und Kontaktmöglichkeiten"/>
- <column name="EXPORTTEMPLATEID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
- <column name="FIELDSEPARATOR" value="tabulator"/>
- <column name="SENTENCESEPARATOR" value="carriage return and line feed"/>
- <column name="USER_NEW" value="Admin"/>
+ <column name="EXPORTTEMPLATEID" value="3acf26f9-4807-4661-8084-c0c21c593c81" />
+ <column name="TITLE" value="Personen und Kontaktmöglichkeiten" />
+ <column name="FIELDSEPARATOR" value="tabulator" />
+ <column name="SENTENCESEPARATOR" value="carriage return and line feed" />
+ <column name="FIELDDELIMITER" value="quotation mark" />
+ <column name="ISOLANGUAGE" value="deu" />
+ <column name="DESCRIPTION" value="Anrede, Vor und Nachname sowie Email und Telefonnummer" />
+ <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="USER_NEW" value="Admin" />
</insert>
<insert tableName="exporttemplate">
- <column name="FIELDDELIMITER" value="quotation mark"/>
- <column name="ISOLANGUAGE" value="eng"/>
- <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
- <column name="DESCRIPTION" value="Anrede, Vor und Nachname sowie Email und Telefonnummer"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="TITLE" value="Personen und Kontaktmöglichkeiten (Englisch)"/>
- <column name="EXPORTTEMPLATEID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
- <column name="FIELDSEPARATOR" value="tabulator"/>
- <column name="SENTENCESEPARATOR" value="carriage return and line feed"/>
- <column name="USER_NEW" value="Admin"/>
+ <column name="EXPORTTEMPLATEID" value="5aaa7d13-3b12-45b5-a794-1f702e31051a" />
+ <column name="TITLE" value="Empfänger der Serienmail" />
+ <column name="FIELDSEPARATOR" value="semicolon" />
+ <column name="SENTENCESEPARATOR" value="carriage return and line feed" />
+ <column name="FIELDDELIMITER" value="quotation mark" />
+ <column name="ISOLANGUAGE" />
+ <column name="DESCRIPTION" value="Liste der Empfänger der ausgewählten Serienmails mit Status usw" />
+ <column name="DATE_EDIT" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="USER_NEW" />
</insert>
<insert tableName="exporttemplate">
- <column name="FIELDDELIMITER" value="quotation mark"/>
- <column name="ISOLANGUAGE" value="deu"/>
- <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
- <column name="DESCRIPTION" value="Name mit Anrede, Titel und vollständiger Addresse"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="TITLE" value="Personen mit Anschriften"/>
- <column name="EXPORTTEMPLATEID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
- <column name="FIELDSEPARATOR" value="semicolon"/>
- <column name="SENTENCESEPARATOR" value="carriage return and line feed"/>
- <column name="USER_NEW" value="Admin"/>
+ <column name="EXPORTTEMPLATEID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="TITLE" value="Ãœbersicht Vertriebsprojekte" />
+ <column name="FIELDSEPARATOR" value="semicolon" />
+ <column name="SENTENCESEPARATOR" value="carriage return and line feed" />
+ <column name="FIELDDELIMITER" value="quotation mark" />
+ <column name="ISOLANGUAGE" />
+ <column name="DESCRIPTION" value="Ãœbersicht von Vertriebsprojekten" />
+ <column name="DATE_EDIT" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="USER_NEW" />
</insert>
<insert tableName="exporttemplate">
- <column name="FIELDDELIMITER" value="quotation mark"/>
- <column name="ISOLANGUAGE" value="deu"/>
- <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
- <column name="DESCRIPTION" value="Firmen und deren Addressen"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="TITLE" value="Firmen mit Addressen"/>
- <column name="EXPORTTEMPLATEID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
- <column name="FIELDSEPARATOR" value="comma"/>
- <column name="SENTENCESEPARATOR" value="carriage return and line feed"/>
- <column name="USER_NEW" value="Admin"/>
+ <column name="EXPORTTEMPLATEID" value="86b48d2c-3850-4778-9240-45cf79396a0a" />
+ <column name="TITLE" value="Personen mit Anschriften" />
+ <column name="FIELDSEPARATOR" value="semicolon" />
+ <column name="SENTENCESEPARATOR" value="carriage return and line feed" />
+ <column name="FIELDDELIMITER" value="quotation mark" />
+ <column name="ISOLANGUAGE" value="deu" />
+ <column name="DESCRIPTION" value="Name mit Anrede, Titel und vollständiger Adresse" />
+ <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="USER_NEW" value="Admin" />
+ </insert>
+ <insert tableName="exporttemplate">
+ <column name="EXPORTTEMPLATEID" value="8a7fefcd-3e35-4bbf-8ad2-f10d4ed1d66b" />
+ <column name="TITLE" value="Teilnehmerliste" />
+ <column name="FIELDSEPARATOR" value="semicolon" />
+ <column name="SENTENCESEPARATOR" value="carriage return and line feed" />
+ <column name="FIELDDELIMITER" value="quotation mark" />
+ <column name="ISOLANGUAGE" />
+ <column name="DESCRIPTION" value="Teilnehmerliste mit allen relevanten Daten, Vorname, Name, Firma usw." />
+ <column name="DATE_EDIT" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="USER_NEW" />
+ </insert>
+ <insert tableName="exporttemplate">
+ <column name="EXPORTTEMPLATEID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3" />
+ <column name="TITLE" value="Firmen mit Adressen" />
+ <column name="FIELDSEPARATOR" value="comma" />
+ <column name="SENTENCESEPARATOR" value="carriage return and line feed" />
+ <column name="FIELDDELIMITER" value="quotation mark" />
+ <column name="ISOLANGUAGE" value="deu" />
+ <column name="DESCRIPTION" value="Firmen und deren Adressen" />
+ <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="USER_NEW" value="Admin" />
</insert>
</changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplatefield.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplatefield.xml
index b0c7acf8736af48ff2321381a6630cad79a6d1c9..9fd2ca3f7ea57fc3bcd8214f43491719c828c484 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplatefield.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplatefield.xml
@@ -1,144 +1,489 @@
-<?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="autogenerated" id="69fd0952-c01c-4b65-960a-4bb53d11ba31">
- <delete tableName="exporttemplatefield"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<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-4.1.xsd">
+ <changeSet author="s.pongratz" id="cb95f3fd-b07a-4a10-9c97-f1a990abc164">
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
- <column name="FIELD" value="{@lastname@}"/>
- <column name="SORTING" valueNumeric="3"/>
- <column name="EXPORTTEMPLATEFIELDID" value="0804cb9a-0cfb-43d6-bd37-2680e24604b0"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="06087ff5-a22c-4f35-94fc-d738aaec6eb6" />
+ <column name="EXPORTTEMPLATE_ID" value="8a7fefcd-3e35-4bbf-8ad2-f10d4ed1d66b" />
+ <column name="FIELD" value="RESPONSIBLE_CONTACT_ID" />
+ <column name="SORTING" valueNumeric="6" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="dbcc278e-bcc3-45d2-8315-502efbec6714" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
- <column name="FIELD" value="{@firstname@}"/>
- <column name="SORTING" valueNumeric="2"/>
- <column name="EXPORTTEMPLATEFIELDID" value="10194e81-65d8-4a12-acd3-123d6a692fba"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="064fcc0b-2a26-4dc4-9d90-4289022b5638" />
+ <column name="EXPORTTEMPLATE_ID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="FIELD" value="PROJECTCODE" />
+ <column name="SORTING" valueNumeric="1" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e6f81233-685f-434c-99e4-4ab2c4adbeff" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
- <column name="FIELD" value="{@country@}"/>
- <column name="SORTING" valueNumeric="5"/>
- <column name="EXPORTTEMPLATEFIELDID" value="224cf307-fe26-4a6b-aae8-61190a2bff19"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="07ff173f-23db-4b04-9cde-d3c278ab999f" />
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3" />
+ <column name="FIELD" value="STANDARD_COUNTRY" />
+ <column name="SORTING" valueNumeric="2" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="86865c59-aa8b-4511-bf3d-b069395c684d" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
- <column name="FIELD" value="{@salutation@}"/>
- <column name="SORTING" valueNumeric="1"/>
- <column name="EXPORTTEMPLATEFIELDID" value="300aeca0-0de8-4225-99ce-bcbb850016aa"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="0d50e14b-4447-488c-b1ca-ec093bc5440a" />
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3" />
+ <column name="FIELD" value="ADDRESS_ID" />
+ <column name="SORTING" valueNumeric="5" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="86865c59-aa8b-4511-bf3d-b069395c684d" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
- <column name="FIELD" value="{@lastname@}"/>
- <column name="SORTING" valueNumeric="4"/>
- <column name="EXPORTTEMPLATEFIELDID" value="330bc05f-501e-4774-85bc-046347829dda"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="1428942a-f595-4d9a-8e30-8506b360eb9b" />
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a" />
+ <column name="FIELD" value="STANDARD_ZIP" />
+ <column name="SORTING" valueNumeric="6" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="4f036ac7-b1bf-4667-9177-7c0d444b1819" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
- <column name="FIELD" value="{@phone@}"/>
- <column name="SORTING" valueNumeric="4"/>
- <column name="EXPORTTEMPLATEFIELDID" value="334146d9-7950-4c59-9b07-d89eb57a0da2"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="252abd36-6dbd-49cd-a7f4-e8d99a061d88" />
+ <column name="EXPORTTEMPLATE_ID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="FIELD" value="STARTDATE" />
+ <column name="SORTING" valueNumeric="7" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e6f81233-685f-434c-99e4-4ab2c4adbeff" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
- <column name="FIELD" value="{@firstname@}"/>
- <column name="SORTING" valueNumeric="3"/>
- <column name="EXPORTTEMPLATEFIELDID" value="34c65722-937f-4741-9c08-48a841e19527"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="2a270e64-55c2-4521-a509-77a7c4f024cb" />
+ <column name="EXPORTTEMPLATE_ID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="FIELD" value="volumeWeighted" />
+ <column name="SORTING" valueNumeric="13" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e6f81233-685f-434c-99e4-4ab2c4adbeff" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
- <column name="FIELD" value="{@address@}"/>
- <column name="SORTING" valueNumeric="5"/>
- <column name="EXPORTTEMPLATEFIELDID" value="5ebc3ae4-80dd-497e-a26e-f275769f81e4"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="2e686a67-ac5c-407b-9b38-2f40168efdb1" />
+ <column name="EXPORTTEMPLATE_ID" value="5aaa7d13-3b12-45b5-a794-1f702e31051a" />
+ <column name="FIELD" value="CONTACT_ID" />
+ <column name="SORTING" valueNumeric="2" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="9dd3dadf-4a98-42b2-8ed3-534791b5dc9c" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
- <column name="FIELD" value="{@zipCode@}"/>
- <column name="SORTING" valueNumeric="7"/>
- <column name="EXPORTTEMPLATEFIELDID" value="779f6222-d1e8-4ec3-953a-31cb27115b9a"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="31be21ec-f403-42a3-a600-558b2e0133f3" />
+ <column name="EXPORTTEMPLATE_ID" value="5aaa7d13-3b12-45b5-a794-1f702e31051a" />
+ <column name="FIELD" value="EMAIL_ADDRESS" />
+ <column name="SORTING" valueNumeric="3" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="9dd3dadf-4a98-42b2-8ed3-534791b5dc9c" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
- <column name="FIELD" value="{@email@}"/>
- <column name="SORTING" valueNumeric="5"/>
- <column name="EXPORTTEMPLATEFIELDID" value="8fd83e1e-e2ef-499c-9425-0da511fdb6fb"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="32872d18-d88d-40db-afee-3d5e8d1317ab" />
+ <column name="EXPORTTEMPLATE_ID" value="8a7fefcd-3e35-4bbf-8ad2-f10d4ed1d66b" />
+ <column name="FIELD" value="CAMPAIGNSTEP_ID" />
+ <column name="SORTING" valueNumeric="5" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="dbcc278e-bcc3-45d2-8315-502efbec6714" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
- <column name="FIELD" value="{@salutation@}"/>
- <column name="SORTING" valueNumeric="1"/>
- <column name="EXPORTTEMPLATEFIELDID" value="a9fae3fa-e2c1-4c34-a264-e74bc93e6ac9"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="34afc9f5-633d-4504-a04b-0e99b8b159a9" />
+ <column name="EXPORTTEMPLATE_ID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="FIELD" value="PHASE" />
+ <column name="SORTING" valueNumeric="9" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e6f81233-685f-434c-99e4-4ab2c4adbeff" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
- <column name="FIELD" value="{@salutation@}"/>
- <column name="SORTING" valueNumeric="1"/>
- <column name="EXPORTTEMPLATEFIELDID" value="acb36d07-089e-4a25-a0c2-694b06e74ae5"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="3bac8770-f493-4500-b61c-ba8c8430eb6b" />
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a" />
+ <column name="FIELD" value="STANDARD_COUNTRY" />
+ <column name="SORTING" valueNumeric="5" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="4f036ac7-b1bf-4667-9177-7c0d444b1819" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
- <column name="FIELD" value="{@lastname@}"/>
- <column name="SORTING" valueNumeric="3"/>
- <column name="EXPORTTEMPLATEFIELDID" value="ba303e1b-40c9-4fef-bbdf-6d16ab0dbeb0"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="43d1c9fa-bfb1-4d29-b03d-d7bda33e38f0" />
+ <column name="EXPORTTEMPLATE_ID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="FIELD" value="DATE_NEW" />
+ <column name="SORTING" valueNumeric="6" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e6f81233-685f-434c-99e4-4ab2c4adbeff" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
- <column name="FIELD" value="{@country@}"/>
- <column name="SORTING" valueNumeric="2"/>
- <column name="EXPORTTEMPLATEFIELDID" value="bfeb9284-6db4-4d15-a07b-9b3f21fe9c22"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="4aa7c73e-4fae-4453-ba1f-740d291b0210" />
+ <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81" />
+ <column name="FIELD" value="LASTNAME" />
+ <column name="SORTING" valueNumeric="3" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="408eba99-bcc3-4308-9b2c-1a4495e01a0f" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
- <column name="FIELD" value="{@address@}"/>
- <column name="SORTING" valueNumeric="8"/>
- <column name="EXPORTTEMPLATEFIELDID" value="bffb3d69-7774-438e-85b2-81fc0629462a"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="58a0832a-05bd-4fc6-b190-7224caf01ba8" />
+ <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81" />
+ <column name="FIELD" value="SALUTATION" />
+ <column name="SORTING" valueNumeric="1" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="408eba99-bcc3-4308-9b2c-1a4495e01a0f" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
- <column name="FIELD" value="{@region@}"/>
- <column name="SORTING" valueNumeric="3"/>
- <column name="EXPORTTEMPLATEFIELDID" value="c245bf8e-1d99-4d85-834c-64613bad5042"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="58a2a677-8459-4292-a8c7-5818f3568cac" />
+ <column name="EXPORTTEMPLATE_ID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="FIELD" value="ENDDATE" />
+ <column name="SORTING" valueNumeric="8" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e6f81233-685f-434c-99e4-4ab2c4adbeff" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
- <column name="FIELD" value="{@zipCode@}"/>
- <column name="SORTING" valueNumeric="4"/>
- <column name="EXPORTTEMPLATEFIELDID" value="c39bb945-ecd2-4836-9cee-002178ae9709"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="5c86ea95-be1f-4eb2-9b12-02bb35f5a532" />
+ <column name="EXPORTTEMPLATE_ID" value="5aaa7d13-3b12-45b5-a794-1f702e31051a" />
+ <column name="FIELD" value="NAME" />
+ <column name="SORTING" valueNumeric="1" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="4fba481d-310a-45aa-b1ff-d1667dab141f" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
- <column name="FIELD" value="{@phone@}"/>
- <column name="SORTING" valueNumeric="4"/>
- <column name="EXPORTTEMPLATEFIELDID" value="cacce4e9-c9ad-4dd3-ac43-79684ef57008"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="7d36b12a-db74-4d21-908d-56902caaee86" />
+ <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81" />
+ <column name="FIELD" value="FIRSTNAME" />
+ <column name="SORTING" valueNumeric="2" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="408eba99-bcc3-4308-9b2c-1a4495e01a0f" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
- <column name="FIELD" value="{@email@}"/>
- <column name="SORTING" valueNumeric="5"/>
- <column name="EXPORTTEMPLATEFIELDID" value="d01169d3-aab0-4233-b5ec-02ede86995cf"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="7db7cf51-5da9-41f4-911d-87f322c1bc68" />
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a" />
+ <column name="FIELD" value="ADDRESS_ID" />
+ <column name="SORTING" valueNumeric="7" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="4f036ac7-b1bf-4667-9177-7c0d444b1819" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
- <column name="FIELD" value="{@orgname@}"/>
- <column name="SORTING" valueNumeric="1"/>
- <column name="EXPORTTEMPLATEFIELDID" value="e153ea76-5e68-497a-8a3e-9bb40ce734b3"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="896ec040-5b57-4ca6-b4e5-42cadd18682a" />
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a" />
+ <column name="FIELD" value="SALUTATION" />
+ <column name="SORTING" valueNumeric="1" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="4f036ac7-b1bf-4667-9177-7c0d444b1819" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
- <column name="FIELD" value="{@title@}"/>
- <column name="SORTING" valueNumeric="2"/>
- <column name="EXPORTTEMPLATEFIELDID" value="e1b5c9c8-846a-4195-af5c-09e923c1c1c6"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="8e0f578f-43dc-43d3-8c48-ec174f466c23" />
+ <column name="EXPORTTEMPLATE_ID" value="8a7fefcd-3e35-4bbf-8ad2-f10d4ed1d66b" />
+ <column name="FIELD" value="STANDARD_EMAIL_COMMUNICATION" />
+ <column name="SORTING" valueNumeric="7" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="dbcc278e-bcc3-45d2-8315-502efbec6714" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
- <column name="FIELD" value="{@firstname@}"/>
- <column name="SORTING" valueNumeric="2"/>
- <column name="EXPORTTEMPLATEFIELDID" value="e319ac75-3468-4167-8f0d-568a0dfaef7d"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="97607099-0219-4245-a5e7-a340973e74ea" />
+ <column name="EXPORTTEMPLATE_ID" value="8a7fefcd-3e35-4bbf-8ad2-f10d4ed1d66b" />
+ <column name="FIELD" value="STANDARD_PHONE_COMMUNICATION" />
+ <column name="SORTING" valueNumeric="8" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="dbcc278e-bcc3-45d2-8315-502efbec6714" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
<insert tableName="exporttemplatefield">
- <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
- <column name="FIELD" value="{@region@}"/>
- <column name="SORTING" valueNumeric="6"/>
- <column name="EXPORTTEMPLATEFIELDID" value="e9f1cd83-5652-4f5b-913b-40dea9eda1c8"/>
+ <column name="EXPORTTEMPLATEFIELDID" value="98ab5af0-f780-4723-b64f-9dc186eb4fc5" />
+ <column name="EXPORTTEMPLATE_ID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="FIELD" value="VOLUME" />
+ <column name="SORTING" valueNumeric="12" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e6f81233-685f-434c-99e4-4ab2c4adbeff" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="98deeade-09b5-46b3-b0d8-b8ecc3950f90" />
+ <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81" />
+ <column name="FIELD" value="STANDARD_EMAIL_COMMUNICATION" />
+ <column name="SORTING" valueNumeric="5" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="408eba99-bcc3-4308-9b2c-1a4495e01a0f" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="999b389f-2e64-433d-8acc-f1a62f49942c" />
+ <column name="EXPORTTEMPLATE_ID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="FIELD" value="PROBABILITY" />
+ <column name="SORTING" valueNumeric="11" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e6f81233-685f-434c-99e4-4ab2c4adbeff" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="9bd8c67a-2a07-4998-b47e-b6eccfc28a9b" />
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a" />
+ <column name="FIELD" value="TITLE" />
+ <column name="SORTING" valueNumeric="2" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="4f036ac7-b1bf-4667-9177-7c0d444b1819" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="9e6cc3fa-dbb1-49bd-839b-6999f289194c" />
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a" />
+ <column name="FIELD" value="FIRSTNAME" />
+ <column name="SORTING" valueNumeric="3" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="4f036ac7-b1bf-4667-9177-7c0d444b1819" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="a2f51b99-0add-424c-ba85-8ad690b4d33d" />
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3" />
+ <column name="FIELD" value="STANDARD_ZIP" />
+ <column name="SORTING" valueNumeric="4" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="86865c59-aa8b-4511-bf3d-b069395c684d" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="a3fd3c48-9b00-4de6-9fed-044b89266508" />
+ <column name="EXPORTTEMPLATE_ID" value="5aaa7d13-3b12-45b5-a794-1f702e31051a" />
+ <column name="FIELD" value="STATUS" />
+ <column name="SORTING" valueNumeric="5" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="9dd3dadf-4a98-42b2-8ed3-534791b5dc9c" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="aa33fc39-ca51-4cd9-a11a-e9fbdb2e2d2d" />
+ <column name="EXPORTTEMPLATE_ID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="FIELD" value="PROJECTTITLE" />
+ <column name="SORTING" valueNumeric="2" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e6f81233-685f-434c-99e4-4ab2c4adbeff" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="ab0190b1-fbb5-485f-ade7-e1953f14bc27" />
+ <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81" />
+ <column name="FIELD" value="STANDARD_PHONE_COMMUNICATION" />
+ <column name="SORTING" valueNumeric="4" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="408eba99-bcc3-4308-9b2c-1a4495e01a0f" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="ada14af6-4daf-4448-bbbf-baa70c3b69ac" />
+ <column name="EXPORTTEMPLATE_ID" value="5aaa7d13-3b12-45b5-a794-1f702e31051a" />
+ <column name="FIELD" value="IS_TEST_RECIPIENT" />
+ <column name="SORTING" valueNumeric="4" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="9dd3dadf-4a98-42b2-8ed3-534791b5dc9c" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="adf9b254-aece-4a52-a48b-ddd559507810" />
+ <column name="EXPORTTEMPLATE_ID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="FIELD" value="STATUS" />
+ <column name="SORTING" valueNumeric="10" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e6f81233-685f-434c-99e4-4ab2c4adbeff" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="ae2c4074-c8b2-458e-8afc-e395b7d0b033" />
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3" />
+ <column name="FIELD" value="NAME" />
+ <column name="SORTING" valueNumeric="1" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="86865c59-aa8b-4511-bf3d-b069395c684d" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="c1fc93ee-93c0-46c5-a5f8-50ee48730fff" />
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a" />
+ <column name="FIELD" value="LASTNAME" />
+ <column name="SORTING" valueNumeric="4" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="4f036ac7-b1bf-4667-9177-7c0d444b1819" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="c245bf8e-1d99-4d85-834c-64613bad5042" />
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3" />
+ <column name="FIELD" value="{@region@}" />
+ <column name="SORTING" valueNumeric="3" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="c6958ee7-0043-40c5-9e4d-36e0539a7108" />
+ <column name="EXPORTTEMPLATE_ID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="FIELD" value="InactiveTime" />
+ <column name="SORTING" valueNumeric="5" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e6f81233-685f-434c-99e4-4ab2c4adbeff" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="c6c5b3f4-463a-46d4-a41d-e626d0779ffe" />
+ <column name="EXPORTTEMPLATE_ID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="FIELD" value="CONTACT_ID" />
+ <column name="SORTING" valueNumeric="3" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e6f81233-685f-434c-99e4-4ab2c4adbeff" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="cef3af15-0882-4d9b-998e-33c1a8a3bb16" />
+ <column name="EXPORTTEMPLATE_ID" value="8a7fefcd-3e35-4bbf-8ad2-f10d4ed1d66b" />
+ <column name="FIELD" value="FIRSTNAME" />
+ <column name="SORTING" valueNumeric="2" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e0a19680-fd01-49a3-9993-ac57fc37d403" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="d32d0a6b-c315-47e8-bedf-ff49b529d232" />
+ <column name="EXPORTTEMPLATE_ID" value="8a7fefcd-3e35-4bbf-8ad2-f10d4ed1d66b" />
+ <column name="FIELD" value="LASTNAME" />
+ <column name="SORTING" valueNumeric="3" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e0a19680-fd01-49a3-9993-ac57fc37d403" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="db86c14a-3eef-4910-aa06-ff2d1a19d92d" />
+ <column name="EXPORTTEMPLATE_ID" value="8a7fefcd-3e35-4bbf-8ad2-f10d4ed1d66b" />
+ <column name="FIELD" value="NAME" />
+ <column name="SORTING" valueNumeric="1" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="a148ad53-b921-45f0-81d4-e573a5c05661" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="dbb557ad-00eb-402f-b4e7-e90a86d228d4" />
+ <column name="EXPORTTEMPLATE_ID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="FIELD" value="CLASSIFICATIONVALUE" />
+ <column name="SORTING" valueNumeric="4" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="e6f81233-685f-434c-99e4-4ab2c4adbeff" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="e296802a-04a5-4860-8f8c-63be42dd932b" />
+ <column name="EXPORTTEMPLATE_ID" value="5aaa7d13-3b12-45b5-a794-1f702e31051a" />
+ <column name="FIELD" value="SENTDATE" />
+ <column name="SORTING" valueNumeric="6" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="9dd3dadf-4a98-42b2-8ed3-534791b5dc9c" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplatefield">
+ <column name="EXPORTTEMPLATEFIELDID" value="f0311199-5555-4eda-8964-752857d0bbb9" />
+ <column name="EXPORTTEMPLATE_ID" value="8a7fefcd-3e35-4bbf-8ad2-f10d4ed1d66b" />
+ <column name="FIELD" value="CONTACT_ORGANISATION_ID" />
+ <column name="SORTING" valueNumeric="4" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="dbcc278e-bcc3-45d2-8315-502efbec6714" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
</changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplateplaceofuse.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplateplaceofuse.xml
index a48b54def84be4bde31a284e85a5d5dc0c82855e..40a5c48680df6d7a3f727f01428cddaa26224117 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplateplaceofuse.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplateplaceofuse.xml
@@ -1,26 +1,161 @@
-<?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="autogenerated" id="fb7d1b86-3a39-4fe4-b963-0c61abebca52">
- <delete tableName="exporttemplateplaceofuse"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<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-4.1.xsd">
+ <changeSet author="s.pongratz" id="2ab02746-44f6-414e-922c-0b43ea0f3ab3">
<insert tableName="exporttemplateplaceofuse">
- <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
- <column name="EXPORTTEMPLATEPLACEOFUSEID" value="135975c6-6c7a-408b-93e3-f04239503ff0"/>
- <column name="PLACEOFUSE" value="Person"/>
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="408eba99-bcc3-4308-9b2c-1a4495e01a0f" />
+ <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81" />
+ <column name="PLACEOFUSE" value="Person" />
+ <column name="TITLE" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" />
+ <column name="OBJECT_FILTER" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-09-29T08:05:30" />
</insert>
<insert tableName="exporttemplateplaceofuse">
- <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
- <column name="EXPORTTEMPLATEPLACEOFUSEID" value="408eba99-bcc3-4308-9b2c-1a4495e01a0f"/>
- <column name="PLACEOFUSE" value="Person"/>
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="4f036ac7-b1bf-4667-9177-7c0d444b1819" />
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a" />
+ <column name="PLACEOFUSE" value="Person" />
+ <column name="TITLE" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" />
+ <column name="OBJECT_FILTER" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-09-29T08:40:37" />
</insert>
<insert tableName="exporttemplateplaceofuse">
- <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
- <column name="EXPORTTEMPLATEPLACEOFUSEID" value="4f036ac7-b1bf-4667-9177-7c0d444b1819"/>
- <column name="PLACEOFUSE" value="Person"/>
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="4fba481d-310a-45aa-b1ff-d1667dab141f" />
+ <column name="EXPORTTEMPLATE_ID" value="5aaa7d13-3b12-45b5-a794-1f702e31051a" />
+ <column name="PLACEOFUSE" value="BulkMail" />
+ <column name="TITLE" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" />
+ <column name="OBJECT_FILTER" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-09-30T11:19:47" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-09-30T11:40:16" />
</insert>
<insert tableName="exporttemplateplaceofuse">
- <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
- <column name="EXPORTTEMPLATEPLACEOFUSEID" value="86865c59-aa8b-4511-bf3d-b069395c684d"/>
- <column name="PLACEOFUSE" value="Organisation"/>
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="510ce9f1-9903-4978-9457-7bb85e85c71c" />
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3" />
+ <column name="PLACEOFUSE" value="Offeritem" />
+ <column name="TITLE" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="94b03949-623a-4898-91cf-32ff21befaac" />
+ <column name="OBJECT_FILTER" value="{"entity":"Offeritem_entity","filter":{"type":"group","operator":"AND","childs":[]}}" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-09-29T09:30:33" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplateplaceofuse">
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="58390700-4308-45c2-865f-ea86cb38e7f5" />
+ <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81" />
+ <column name="PLACEOFUSE" value="Address" />
+ <column name="TITLE" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="408eba99-bcc3-4308-9b2c-1a4495e01a0f" />
+ <column name="OBJECT_FILTER" value="{"entity":"Address_entity","filter":{"type":"group","operator":"AND","childs":[]}}" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-09-29T08:26:27" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplateplaceofuse">
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="58c8768c-0d1b-4a68-a7c1-4d2d35fe3431" />
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3" />
+ <column name="PLACEOFUSE" value="Address" />
+ <column name="TITLE" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="86865c59-aa8b-4511-bf3d-b069395c684d" />
+ <column name="OBJECT_FILTER" value="{"entity":"Address_entity","filter":{"type":"group","operator":"AND","childs":[]}}" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-09-29T09:32:08" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplateplaceofuse">
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="86865c59-aa8b-4511-bf3d-b069395c684d" />
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3" />
+ <column name="PLACEOFUSE" value="Organisation" />
+ <column name="TITLE" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" />
+ <column name="OBJECT_FILTER" />
+ <column name="USER_NEW" />
+ <column name="DATE_NEW" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-09-29T08:49:04" />
+ </insert>
+ <insert tableName="exporttemplateplaceofuse">
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="94b03949-623a-4898-91cf-32ff21befaac" />
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3" />
+ <column name="PLACEOFUSE" value="Offer" />
+ <column name="TITLE" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="86865c59-aa8b-4511-bf3d-b069395c684d" />
+ <column name="OBJECT_FILTER" value="{"entity":"Offer_entity","filter":{"type":"group","operator":"AND","childs":[]}}" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-09-29T09:30:23" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplateplaceofuse">
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="9dd3dadf-4a98-42b2-8ed3-534791b5dc9c" />
+ <column name="EXPORTTEMPLATE_ID" value="5aaa7d13-3b12-45b5-a794-1f702e31051a" />
+ <column name="PLACEOFUSE" value="BulkMailRecipient" />
+ <column name="TITLE" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="4fba481d-310a-45aa-b1ff-d1667dab141f" />
+ <column name="OBJECT_FILTER" value="{"entity":"BulkMailRecipient_entity","filter":{"type":"group","operator":"AND","childs":[]}}" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-09-30T11:20:24" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplateplaceofuse">
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="a148ad53-b921-45f0-81d4-e573a5c05661" />
+ <column name="EXPORTTEMPLATE_ID" value="8a7fefcd-3e35-4bbf-8ad2-f10d4ed1d66b" />
+ <column name="PLACEOFUSE" value="Campaign" />
+ <column name="TITLE" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" />
+ <column name="OBJECT_FILTER" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-09-30T11:04:56" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-09-30T11:07:11" />
+ </insert>
+ <insert tableName="exporttemplateplaceofuse">
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="dbcc278e-bcc3-45d2-8315-502efbec6714" />
+ <column name="EXPORTTEMPLATE_ID" value="8a7fefcd-3e35-4bbf-8ad2-f10d4ed1d66b" />
+ <column name="PLACEOFUSE" value="CampaignParticipant" />
+ <column name="TITLE" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="a148ad53-b921-45f0-81d4-e573a5c05661" />
+ <column name="OBJECT_FILTER" value="{"entity":"CampaignParticipant_entity","filter":{"type":"group","operator":"AND","childs":[]}}" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-09-30T11:07:59" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplateplaceofuse">
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="e0a19680-fd01-49a3-9993-ac57fc37d403" />
+ <column name="EXPORTTEMPLATE_ID" value="8a7fefcd-3e35-4bbf-8ad2-f10d4ed1d66b" />
+ <column name="PLACEOFUSE" value="Person" />
+ <column name="TITLE" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" value="dbcc278e-bcc3-45d2-8315-502efbec6714" />
+ <column name="OBJECT_FILTER" value="{"entity":"Person_entity","filter":{"type":"group","operator":"AND","childs":[]}}" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-09-30T11:25:58" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ </insert>
+ <insert tableName="exporttemplateplaceofuse">
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="e6f81233-685f-434c-99e4-4ab2c4adbeff" />
+ <column name="EXPORTTEMPLATE_ID" value="726f7fa4-510f-407b-b42c-53f70df3f529" />
+ <column name="PLACEOFUSE" value="Salesproject" />
+ <column name="TITLE" />
+ <column name="EXPORTTEMPLATEPLACEOFUSE_ID" />
+ <column name="OBJECT_FILTER" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-09-30T11:42:32" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
</insert>
</changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index e211a0f400b6d71748232707325c22af7fbf936c..b55ed31802b0171eb979ba27c488a46982645380 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -28,7 +28,7 @@
<include relativeToChangelogFile="true" file="basic/2021.1.2/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2021.1.3/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2021.2.0/changelog.xml"/>
-
+
<include relativeToChangelogFile="true" file="basic/workflows/changelog.xml" context="workflow"/>
<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
</databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index feec25de65ce36341ba0f176987e4c67d325f38b..ba8a6cf1629d22cd4c2bcaae90d4f114303ecb31 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -50,7 +50,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -150,8 +150,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -164,8 +164,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -205,7 +205,7 @@
<name>PICTURE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-4" />
+ <columnType v="2004" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -445,8 +445,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -473,8 +473,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -720,8 +720,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -748,8 +748,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -775,7 +775,7 @@
<name>PICTURE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-4" />
+ <columnType v="2004" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1092,8 +1092,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1120,8 +1120,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -1175,7 +1175,7 @@
<name>VALIDATION_RESULT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1242,8 +1242,8 @@
<name>ISSTANDARD</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -1283,8 +1283,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1297,8 +1297,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -1406,8 +1406,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1466,8 +1466,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1566,8 +1566,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1585,7 +1585,7 @@
<name>REMARK</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1645,8 +1645,8 @@
<name>ADVERTISING</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="1" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -1706,7 +1706,7 @@
<columnType v="12" />
<size v="100" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="true" />
<index v="true" />
<title>Product number</title>
@@ -1822,8 +1822,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1850,8 +1850,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -1877,7 +1877,7 @@
<name>PICTURE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-4" />
+ <columnType v="2004" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1925,8 +1925,8 @@
<name>OPTIONAL</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -1945,8 +1945,8 @@
<name>TAKEPRICE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -1992,7 +1992,7 @@
<name>QUANTITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -2092,7 +2092,7 @@
<name>PRICE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -2112,7 +2112,7 @@
<name>VAT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -2205,8 +2205,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2224,7 +2224,7 @@
<name>FROMQUANTITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -2277,8 +2277,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2382,7 +2382,7 @@
<name>QUANTITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -2403,8 +2403,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2449,8 +2449,8 @@
<name>IN_OUT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -2627,7 +2627,7 @@
<name>FLAG</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-4" />
+ <columnType v="2004" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -2688,7 +2688,7 @@
<name>VAT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -2714,8 +2714,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2766,9 +2766,9 @@
<name>PROBABILITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
- <size v="6" />
- <scale v="2" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2848,7 +2848,7 @@
<name>NET</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -2873,7 +2873,7 @@
<name>HEADER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -2935,7 +2935,7 @@
<name>ADDRESS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -3008,7 +3008,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -3030,8 +3030,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3058,8 +3058,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -3113,7 +3113,7 @@
<name>FOOTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -3155,7 +3155,7 @@
<name>DISCOUNT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -3169,7 +3169,7 @@
<name>DISCOUNTED_NET</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -3183,7 +3183,7 @@
<name>DISCOUNTED_VAT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -3270,7 +3270,7 @@
<name>PRICE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -3290,7 +3290,7 @@
<name>QUANTITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -3310,7 +3310,7 @@
<name>VAT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -3402,7 +3402,7 @@
<name>DISCOUNT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -3442,8 +3442,8 @@
<name>OPTIONAL</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -3517,7 +3517,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<title>Assigned to</title>
<description></description>
<customProperties>
@@ -3552,7 +3552,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -3594,8 +3594,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3613,7 +3613,7 @@
<name>VOLUME</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -3633,7 +3633,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -3654,8 +3654,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3862,8 +3862,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3876,8 +3876,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3913,48 +3913,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>CURRENCY</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>CURRENCYRATE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="6" />
- <size v="12" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>VOLUMEFOREIGNCURRENCY</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="3" />
- <size v="14" />
- <scale v="2" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -4042,7 +4000,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -4099,8 +4057,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -4180,8 +4138,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
@@ -4200,7 +4158,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -4309,8 +4267,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -4337,8 +4295,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -4364,8 +4322,8 @@
<name>RESPONSIBLE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="12" />
+ <size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -4386,20 +4344,6 @@
</customJDitoProperty>
</customProperties>
</entityFieldDb>
- <entityFieldDb>
- <name>HAS_ATTACHMENTS</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -4449,7 +4393,7 @@
<name>VAT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -4470,7 +4414,7 @@
<name>FOOTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -4491,7 +4435,7 @@
<name>HEADER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -4534,8 +4478,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -4608,7 +4552,7 @@
<name>NET</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -4723,7 +4667,7 @@
<name>NOTICE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -4745,8 +4689,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -4765,8 +4709,8 @@
<name>CANCELLATION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -4792,8 +4736,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -4812,7 +4756,7 @@
<name>DUNNINGTEXT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -4860,8 +4804,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -4958,7 +4902,7 @@
<name>PAYMENTADDRESS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -5026,7 +4970,7 @@
<name>DELIVERYADDRESS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -5047,8 +4991,8 @@
<name>ORDERSTATUS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -5087,7 +5031,7 @@
<name>DISCOUNTED_VAT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -5101,7 +5045,7 @@
<name>DISCOUNT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -5115,7 +5059,7 @@
<name>DISCOUNTED_NET</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -5174,7 +5118,7 @@
<name>PRICE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -5195,7 +5139,7 @@
<name>QUANTITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -5216,7 +5160,7 @@
<name>VAT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -5269,7 +5213,7 @@
<name>DISCOUNT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -5396,7 +5340,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title>Assigned to</title>
<description></description>
@@ -5447,7 +5391,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -5825,8 +5769,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -5853,8 +5797,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -5997,7 +5941,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -6212,8 +6156,8 @@
<name>ATTRIBUTE_ACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -6296,7 +6240,7 @@
<name>ATTRIBUTE_INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -6387,8 +6331,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
@@ -6407,7 +6351,7 @@
<name>NUMBER_VALUE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -6527,8 +6471,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -6555,8 +6499,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -6707,8 +6651,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -6721,8 +6665,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -6781,8 +6725,8 @@
<name>ISESSENTIAL</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -6886,8 +6830,8 @@
<name>ISACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -7011,8 +6955,8 @@
<name>ISACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -7202,8 +7146,8 @@
<name>BOOL_VALUE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -7237,7 +7181,7 @@
<name>NUMBER_VALUE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -7300,7 +7244,7 @@
<name>LONG_CHAR_VALUE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -7882,8 +7826,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -8174,8 +8118,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8194,7 +8138,7 @@
<name>LOCKED</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-7" />
+ <columnType v="16" />
<size v="1" />
<scale v="0" />
<notNull v="true" />
@@ -8283,7 +8227,7 @@
<name>DESCRIPTION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -8368,8 +8312,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
@@ -8416,8 +8360,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8465,8 +8409,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8597,8 +8541,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8632,8 +8576,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -8729,8 +8673,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8785,8 +8729,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -8882,8 +8826,8 @@
<name>ALL_TICKET_CATEGORIES</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -8896,7 +8840,7 @@
<name>TEMPLATECONTENT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -8930,8 +8874,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8958,8 +8902,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -9048,8 +8992,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -9104,8 +9048,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -9235,8 +9179,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -9277,8 +9221,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -9357,8 +9301,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -9497,8 +9441,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -9664,8 +9608,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -9699,8 +9643,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -9838,8 +9782,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -9880,8 +9824,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -9907,7 +9851,7 @@
<name>NET</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -10019,7 +9963,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="63" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -10032,7 +9976,7 @@
<name>FILTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -10209,7 +10153,7 @@
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
@@ -10220,7 +10164,7 @@
<name>SCOREPOINTS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -10310,9 +10254,9 @@
<name>SCOREPERCENT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
+ <columnType v="2" />
<size v="10" />
- <scale v="0" />
+ <scale v="2" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -10468,9 +10412,9 @@
<name>VOLUME</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
- <size v="14" />
- <scale v="2" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -10490,8 +10434,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -10503,7 +10447,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -10631,20 +10575,6 @@
</customBooleanProperty>
</customProperties>
</entityFieldDb>
- <entityFieldDb>
- <name>VOLUMEFOREIGNCURRENCY</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="3" />
- <size v="14" />
- <scale v="2" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -10672,7 +10602,7 @@
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
@@ -10746,7 +10676,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -10774,7 +10704,7 @@
<name>REASON</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -10789,8 +10719,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -10851,8 +10781,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11057,8 +10987,8 @@
<name>CREATEACTIVITIES</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -11099,8 +11029,8 @@
<name>USE_TEMPLATE_ATTACHMENTS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -11114,8 +11044,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11170,8 +11100,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11198,8 +11128,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11344,8 +11274,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11385,8 +11315,8 @@
<name>IS_TEST_RECIPIENT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -11400,8 +11330,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11414,8 +11344,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11539,8 +11469,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11567,7 +11497,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="50" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -11594,7 +11524,7 @@
<name>EMAIL_DESCRIPTION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -11609,8 +11539,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11623,7 +11553,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="50" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -11665,7 +11595,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="50" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -11735,22 +11665,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>HAS_ATTACHMENTS</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11797,8 +11713,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11811,8 +11727,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11860,8 +11776,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -12011,7 +11927,7 @@
<name>DESCRIPTION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -12073,7 +11989,7 @@
<name>MAIL</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -12088,8 +12004,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -12130,8 +12046,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -12171,7 +12087,7 @@
<name>RECIPIENTS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -12200,8 +12116,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
@@ -12275,8 +12191,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -12317,8 +12233,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -12697,7 +12613,7 @@
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
@@ -12750,8 +12666,8 @@
<name>ONSITE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -12764,8 +12680,8 @@
<name>RESPONSIBLE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -12827,8 +12743,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -12840,7 +12756,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -12896,8 +12812,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -12924,8 +12840,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -13021,7 +12937,7 @@
<name>SCAN_PATTERN</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -13160,8 +13076,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -13216,8 +13132,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -13481,8 +13397,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -13809,8 +13725,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -13935,8 +13851,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -13963,8 +13879,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -14039,8 +13955,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -14081,8 +13997,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -14416,6 +14332,104 @@
</entityDependency>
</dependencies>
</entityFieldDb>
+ <entityFieldDb>
+ <name>EXPORTTEMPLATEPLACEOFUSE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OBJECT_FILTER</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="-1" />
+ <size v="2147483647" />
+ <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>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <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="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <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="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <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>TITLE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="150" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -14524,8 +14538,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -14580,8 +14594,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -14742,6 +14756,76 @@
</entityDependency>
</dependencies>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <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="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <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="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <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>EXPORTTEMPLATEPLACEOFUSE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -14864,8 +14948,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -14892,8 +14976,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -14996,8 +15080,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -15065,7 +15149,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -15136,8 +15220,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -15164,8 +15248,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -15239,7 +15323,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -15302,7 +15386,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="92" />
- <size v="10" />
+ <size v="8" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -15316,7 +15400,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="92" />
- <size v="10" />
+ <size v="8" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -15441,7 +15525,7 @@
<name>PREPARATION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -15704,8 +15788,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -15732,8 +15816,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -15864,8 +15948,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -15906,8 +15990,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -15989,7 +16073,7 @@
<name>DISTRICT_FILTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -16052,8 +16136,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16108,8 +16192,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16178,8 +16262,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16192,8 +16276,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16215,62 +16299,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>VALIDTO</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ADVISERSTATUS</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>VALIDFROM</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ADVISERROLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -16430,8 +16458,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16444,8 +16472,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16458,8 +16486,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16486,8 +16514,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16588,7 +16616,7 @@
<name>DISCUSSIONTEXT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -16603,8 +16631,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16659,8 +16687,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16735,8 +16763,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16763,8 +16791,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16853,8 +16881,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16929,7 +16957,7 @@
<name>CONTENTDECODED</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -16964,7 +16992,7 @@
<name>CONTENT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -16986,8 +17014,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17131,8 +17159,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17173,8 +17201,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17339,8 +17367,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17353,8 +17381,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17429,8 +17457,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17471,9 +17499,9 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
- <notNull v="false" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -17712,8 +17740,8 @@
<name>IS_ARCHIVED</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -17754,8 +17782,8 @@
<name>GENERAL_CHANNELID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="48" />
+ <columnType v="12" />
+ <size v="200" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -17801,7 +17829,7 @@
<name>OBJECT_FILTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -17815,8 +17843,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17905,8 +17933,8 @@
<name>TRIGGEREVENTDELETE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -17918,8 +17946,8 @@
<name>TRIGGEREVENTINSERT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -17931,8 +17959,8 @@
<name>TRIGGEREVENTUPDATE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -17945,8 +17973,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17983,7 +18011,7 @@
<name>OBJECT_FIELD</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -18042,8 +18070,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18068,8 +18096,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18179,8 +18207,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18205,8 +18233,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18243,8 +18271,8 @@
<name>AUTO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -18257,7 +18285,7 @@
<name>COND</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -18271,8 +18299,8 @@
<name>FILTER_USED</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -18332,8 +18360,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18345,8 +18373,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18425,7 +18453,7 @@
<name>COND</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -18499,8 +18527,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18525,8 +18553,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18590,8 +18618,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18714,8 +18742,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18745,7 +18773,7 @@
<size v="36" />
<scale v="0" />
<notNull v="false" />
- <isUnique v="true" />
+ <isUnique v="false" />
<index v="true" />
<documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/ab_synccontact/entityfields/asys_favoriteid/documentation.adoc</documentation>
<title></title>
@@ -18784,8 +18812,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18812,8 +18840,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18874,8 +18902,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18902,8 +18930,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18999,8 +19027,8 @@
<name>ISREDIRECT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -19076,8 +19104,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19104,8 +19132,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19193,7 +19221,7 @@
<name>ERRORMESSAGE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -19306,8 +19334,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19410,8 +19438,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19438,8 +19466,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19638,8 +19666,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19652,8 +19680,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -19693,8 +19721,8 @@
<name>ISACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -19742,8 +19770,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19784,8 +19812,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
@@ -19916,8 +19944,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19930,8 +19958,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20048,8 +20076,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20062,8 +20090,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20179,8 +20207,8 @@
<name>IS_DEFAULT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -20194,8 +20222,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20208,8 +20236,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20368,8 +20396,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20382,8 +20410,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20396,8 +20424,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20471,7 +20499,7 @@
<name>MONTH_FACTOR</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="3" />
+ <columnType v="2" />
<size v="5" />
<scale v="2" />
<notNull v="false" />
@@ -20519,7 +20547,7 @@
<name>FILTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -20534,8 +20562,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20562,8 +20590,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20685,8 +20713,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20787,8 +20815,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -21108,7 +21136,7 @@
<name>PERSINFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -21473,8 +21501,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -21514,7 +21542,7 @@
<name>ORGINFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -21557,8 +21585,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -21633,7 +21661,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2004" />
- <size v="65535" />
+ <size v="2147483647" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -21647,7 +21675,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2004" />
- <size v="65535" />
+ <size v="2147483647" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -21727,7 +21755,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/ews_info_log/entityfields/user_id/documentation.adoc</documentation>
<title></title>
<description></description>
@@ -21741,7 +21769,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/ews_info_log/entityfields/priority/documentation.adoc</documentation>
<title></title>
<description></description>
@@ -21751,8 +21779,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -21783,7 +21811,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/ews_info_log/entityfields/type/documentation.adoc</documentation>
<title></title>
<description></description>
@@ -21812,7 +21840,7 @@
<name>FILTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -21910,8 +21938,8 @@
<name>ISACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -21920,20 +21948,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>ACTION_TYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>EMAIL_FILTER_HANDLINGID</name>
<dbName></dbName>
@@ -21949,130 +21963,17 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>ISFALLTHROUGH</name>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
- <title>Responsible</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- <customJDitoProperty>
- <name>translate4Log</name>
- <global v="false" />
- <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/advertising/entityfields/responsible_id/customproperties/translate4log/property.js</property>
- </customJDitoProperty>
- </customProperties>
- </entityFieldDb>
- <entityFieldDb>
- <name>CONTACT_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title>Contact</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- <customJDitoProperty>
- <name>translate4log</name>
- <global v="false" />
- <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/advertising/entityfields/contact_id/customproperties/translate4log/property.js</property>
- </customJDitoProperty>
- </customProperties>
- </entityFieldDb>
- <entityFieldDb>
- <name>OBJECT_TYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>CURRENCY</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title>Currency</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- </customProperties>
- </entityFieldDb>
- <entityFieldDb>
- <name>STATUS</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title>Status</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- <customStringProperty>
- <name>keyword</name>
- <global v="false" />
- <property>advertisingStatus</property>
- </customStringProperty>
- </customProperties>
- </entityFieldDb>
- <entityFieldDb>
- <name>DATE_EDIT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
+ <title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -22117,20 +22018,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>OBJECT_ROWID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -22265,7 +22152,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
@@ -22334,8 +22221,8 @@
<name>ITEMPOSITION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="30" />
+ <columnType v="4" />
+ <size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -22417,9 +22304,9 @@
</entityFields>
</entityDb>
<entityDb>
- <name>CURRENCYRATE</name>
+ <name>ADVERTISING</name>
<dbName></dbName>
- <idColumn>CURRENCYRATEID</idColumn>
+ <idColumn>ADVERTISINGID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
@@ -22435,25 +22322,39 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>CURRENCYRATEID</name>
+ <name>CURRENCY</name>
<dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
+ <primaryKey v="false" />
+ <columnType v="12" />
<size v="36" />
<scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>STATUS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>TARGETCURRENCYISO</name>
+ <name>RESPONSIBLE_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
- <size v="3" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -22467,8 +22368,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -22477,15 +22378,29 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>CURRENCYRATE</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="6" />
- <size v="12" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ADVERTISINGID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -22495,8 +22410,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -22505,13 +22420,13 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>SOURCECURRENCYISO</name>
+ <name>OBJECT_TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="3" />
+ <columnType v="12" />
+ <size v="63" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -22519,7 +22434,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>USER_NEW</name>
+ <name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
@@ -22533,11 +22448,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>VALID_FROM</name>
+ <name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="19" />
+ <columnType v="12" />
+ <size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -22547,15 +22462,15 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>USER_EDIT</name>
+ <name>OBJECT_ROWID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="50" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -22563,9 +22478,9 @@
</entityFields>
</entityDb>
<entityDb>
- <name>ADVERTISING</name>
+ <name>MAIL_BOUNCE</name>
<dbName></dbName>
- <idColumn>ADVERTISINGID</idColumn>
+ <idColumn>MAIL_BOUNCEID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
@@ -22581,12 +22496,12 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>CURRENCY</name>
+ <name>DATE_BOUNCE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="36" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -22595,10 +22510,10 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>STATUS</name>
+ <name>EMAIL_FILTER_HANDLING_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
+ <columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
@@ -22609,25 +22524,25 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RESPONSIBLE_ID</name>
+ <name>MAIL_BOUNCEID</name>
<dbName></dbName>
- <primaryKey v="false" />
+ <primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
+ <notNull v="true" />
+ <isUnique v="true" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>DATE_EDIT</name>
+ <name>CATEGORY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="19" />
+ <columnType v="12" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -22637,216 +22552,28 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>CONTACT_ID</name>
+ <name>RECIPIENT_EMAIL</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="12" />
+ <size v="255" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>ADVERTISINGID</name>
+ <name>MAIL_LOG_ID</name>
<dbName></dbName>
- <primaryKey v="true" />
+ <primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DATE_NEW</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="19" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>OBJECT_TYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ROW_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>WORKFLOWSIGNAL_NAME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="250" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <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>USER_NEW</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>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>MAIL_BOUNCE</name>
- <dbName></dbName>
- <idColumn>MAIL_BOUNCEID</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_BOUNCE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="19" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>EMAIL_FILTER_HANDLING_ID</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>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>MAIL_BOUNCEID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>CATEGORY</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>RECIPIENT_EMAIL</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>MAIL_LOG_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
+ <notNull v="false" />
+ <isUnique v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
@@ -22905,8 +22632,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -22933,8 +22660,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -23036,8 +22763,8 @@
<name>ACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -23051,8 +22778,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -23205,8 +22932,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -23281,8 +23008,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -23294,7 +23021,7 @@
<name>DESCRIPTION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -23323,8 +23050,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -23413,8 +23140,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -23565,8 +23292,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -23592,7 +23319,7 @@
<name>STATE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
+ <columnType v="12" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
@@ -23731,8 +23458,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -23930,8 +23657,8 @@
<name>ACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -23959,7 +23686,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="50" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -24056,7 +23783,7 @@
<name>DESCRIPTION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -24071,7 +23798,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="50" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -24112,8 +23839,8 @@
<name>REVIEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -24202,7 +23929,7 @@
<name>STATUS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
+ <columnType v="12" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
@@ -24231,8 +23958,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -24306,8 +24033,8 @@
<name>SEND_MAIL</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-7" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -24418,8 +24145,8 @@
<name>DEFAULTSIGNATURE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
+ <columnType v="5" />
+ <size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -24477,21 +24204,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>THRESHOLD</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="3" />
- <size v="5" />
- <scale v="2" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ATTRIBUTE_FILTERID</name>
+ <name>ATTRIBUTE_FILTERID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
@@ -24532,20 +24245,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>COMPARISON_METHOD</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -24646,7 +24345,7 @@
<name>COND</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
+ <columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -24737,8 +24436,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -24765,8 +24464,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="19" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -24805,9 +24504,9 @@
</entityFields>
</entityDb>
<entityDb>
- <name>ASYS_USERS</name>
+ <name>MOSAICOTEMPLATE</name>
<dbName></dbName>
- <idColumn>ID</idColumn>
+ <idColumn>MOSAICOTEMPLATEID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
@@ -24823,12 +24522,12 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>PROPVAL</name>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="1024" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -24837,27 +24536,27 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>GROUPID</name>
+ <name>MOSAICOTEMPLATEID</name>
<dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
+ <isUnique v="true" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>PROPKEY</name>
+ <name>CONTENT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="1024" />
+ <columnType v="2005" />
+ <size v="2147483647" />
<scale v="0" />
- <notNull v="true" />
+ <notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -24865,13 +24564,13 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>DATE_EDIT</name>
+ <name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -24879,13 +24578,13 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>DATE_NEW</name>
+ <name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
+ <columnType v="12" />
+ <size v="50" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -24893,25 +24592,25 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>ID</name>
+ <name>METADATA</name>
<dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
+ <primaryKey v="false" />
+ <columnType v="2005" />
+ <size v="2147483647" />
<scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>PROPVAL_CLOB</name>
+ <name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
+ <columnType v="12" />
+ <size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -24925,7 +24624,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="63" />
+ <size v="250" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -24934,46 +24633,26 @@
<title></title>
<description></description>
</entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_COLLECTOR_TAGS</name>
- <dbName></dbName>
- <idColumn>COLLECTORDATAID</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>COLLECTORDATAID</name>
+ <name>BASETEMPLATE</name>
<dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="63" />
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
<scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>TAGNAME</name>
+ <name>ISOLANGUAGE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
+ <columnType v="1" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -24983,11 +24662,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>TAGVALUE</name>
+ <name>CATEGORY</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="63" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -24999,9 +24678,10 @@
</entityFields>
</entityDb>
<entityDb>
- <name>ASYS_TIMERS</name>
+ <name>SALESORDERLINK</name>
+ <category></category>
<dbName></dbName>
- <idColumn>TIMERID</idColumn>
+ <idColumn>SALESORDERLINKID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
@@ -25017,69 +24697,13 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>INTERVALUNIT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>THREADPRIORITY</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>STARTTIME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ACTIVE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="5" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>KEEPJDITO</name>
+ <name>OBJECT_ROWID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="5" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -25087,12 +24711,12 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>LASTRUN</name>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="23" />
- <scale v="0" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -25101,11 +24725,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>TIMERID</name>
+ <name>SALESORDERLINKID</name>
<dbName></dbName>
<primaryKey v="true" />
- <columnType v="12" />
- <size v="127" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
@@ -25115,13 +24739,13 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>PROCESSNAME</name>
+ <name>SALESORDER_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -25129,12 +24753,12 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>INTERVALDESCRIPTION</name>
+ <name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -25143,11 +24767,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>TIMERTYPE</name>
+ <name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="12" />
+ <size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -25157,13 +24781,13 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>PROCESSUSER</name>
+ <name>OBJECT_TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="255" />
+ <size v="63" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -25171,2681 +24795,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>INTERVALVALUE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_RECORDGROUP</name>
- <dbName></dbName>
- <idColumn>ID</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>GROUP_TYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="64" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>USER_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="46" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TITLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="256" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_PERMISSIONSET</name>
- <dbName></dbName>
- <idColumn>ASYS_PERMISSIONSETID</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>ENTITY_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>FIELD_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ACCESSTYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="1" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ROLE_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ASYS_PERMISSIONSET_ID</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>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ASYS_PERMISSIONSETID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_PERMISSIONACTION</name>
- <dbName></dbName>
- <idColumn>ASYS_PERMISSIONACTIONID</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>ASYS_PERMISSION_ID</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>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ACTION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ASYS_PERMISSIONACTIONID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_NOTIFICATIONS</name>
- <dbName></dbName>
- <idColumn>ID</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>CONTENTID</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>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>RESOLVEDPRIORITY</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="15" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>USERID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <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="12" />
- <size v="15" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_COLLECTOR_DATA</name>
- <dbName></dbName>
- <idColumn>DATAID</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>DATAID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="63" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>PARENTID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>METRICS</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>SHORTINFO</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TIMECOLLECTED</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_SEQUENCES</name>
- <dbName></dbName>
- <idColumn>ID_TABLE</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>ID_GUID</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>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID_TABLE</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="12" />
- <size v="127" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID_HIGH</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>ID_LOW</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>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_USERTOKEN</name>
- <dbName></dbName>
- <idColumn>ID</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>VALID_ONCE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>VALID_TO</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>REFERENCE_USER_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <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>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>VALID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <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="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>USER_NEW</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>VALID_FROM</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>LOGIN_USER_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <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="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>GROUP_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_DASHLETCONFIGURATIONS</name>
- <dbName></dbName>
- <idColumn>ID</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>REQUIRES_CONFIGURATION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>SINGLETON</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>PARAMETERS</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>CATEGORIES</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
- <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="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>STORE_ROLES</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="1023" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>VIEW_NAME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <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="512" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>FRAGMENT_CUSTOMIZABLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>FRAGMENT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="1023" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TITLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ICON</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>PREVIEW</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_NOTIFICATIONCONTENTS</name>
- <dbName></dbName>
- <idColumn>CONTENTID</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>CONTENTID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>FORCEDPRIORITY</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="15" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ICON_INFO</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="1023" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>CREATEDATE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DELETEDATE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <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="1023" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>LINK_INFO</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="1023" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>VERSION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>RECIPIENTUSERIDS</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TYPECODE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>BACKPACK</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>CAPTION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="512" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ORIGINATORNAME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_PERMISSION</name>
- <dbName></dbName>
- <idColumn>ASYS_PERMISSIONID</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>CONDTYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-6" />
- <size v="3" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ASYS_PERMISSIONID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ASYS_PERMISSIONSET_ID</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>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>COND</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_CALENDARBACKEND</name>
- <dbName></dbName>
- <idColumn>DATASETID</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>DTSTART</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ENDTIME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>MAILBOX</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>CLASSIFICATION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ELEMENTUID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="512" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DTEND</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ISRECUR</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DATASETID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TRANSP</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="1" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>OWNER</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>STATUS</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="32" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>STARTTIME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>HASALARM</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>SUMMARY</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>VCOMPONENT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>LASTMODIFIED</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ENTRYTYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ORGANIZER</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_CALENDARLINK</name>
- <dbName></dbName>
- <idColumn>DBID</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>DBTABLENAME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="127" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ENTRYSTORE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ENTRYID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="512" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DBID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="12" />
- <size v="191" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DBIDCOLUMN</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="127" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TITLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="2000" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>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>DBALIAS</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="127" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>FRAME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="1023" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_TIMERS_SERVERRUNS</name>
- <dbName></dbName>
- <idColumn></idColumn>
- <idGeneratorType v="1" />
- <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>SERVERID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="12" />
- <size v="127" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>LASTRUN</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TIMERID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="12" />
- <size v="127" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_ROLES_CHILDREN</name>
- <dbName></dbName>
- <idColumn>ID</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>PARENT_ROLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>CHILD_ROLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_DASHLETS</name>
- <dbName></dbName>
- <idColumn>ID</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>CONFIGURATION_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>FRAGMENT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="1023" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>X</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>Y</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ROWSPAN</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TITLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>PARAMETERS</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>COLSPAN</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DASHBOARD_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_ALIASCONFIG</name>
- <dbName></dbName>
- <idColumn>ID</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>ALIASID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <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>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TENANTID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>SERVERID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <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="63" />
- <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="63" />
- <scale v="0" />
- <notNull v="true" />
- <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="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>KIND</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>XMLDATA</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-4" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TITLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <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="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ICON</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-4" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>USER_NEW</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_MONITOR_DASHLETCONFIG</name>
- <dbName></dbName>
- <idColumn>ID</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>YPOSITION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>VISUALISATIONCONFIG</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TITLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>WIDTH</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="63" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>HEIGHT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>XPOSITION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_SYSTEM</name>
- <dbName></dbName>
- <idColumn>ID</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="93" />
- <size v="23" />
- <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="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>KIND</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>XMLDATA</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-4" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TITLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <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="93" />
- <size v="23" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ICON</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-4" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="63" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>USER_NEW</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <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="63" />
- <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="63" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_RECORD</name>
- <dbName></dbName>
- <idColumn>ID</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>RECORDGROUP_ID</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>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>OBJECT_TYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="64" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ROW_ID</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>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_ROLES</name>
- <dbName></dbName>
- <idColumn>ROLENAME</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>ROLETITLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ASSIGNABLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ROLENAME</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>CHILDREN</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ROLEDESCRIPTION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>MOSAICOTEMPLATE</name>
- <dbName></dbName>
- <idColumn>MOSAICOTEMPLATEID</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="93" />
- <size v="19" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>MOSAICOTEMPLATEID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>CONTENT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <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="93" />
- <size v="19" />
- <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="50" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>METADATA</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>USER_EDIT</name>
+ <name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
@@ -27858,62 +24808,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>NAME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="250" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>BASETEMPLATE</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>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ISOLANGUAGE</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>CATEGORY</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>
- <title></title>
- <description></description>
- </entityFieldDb>
</entityFields>
</entityDb>
</entities>
diff --git a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
index b3519c357f472cb7e6708fa5e34c80e7d237ab3a..8ba25ef273b8803d603907d914676fe6b3ce1178 100644
--- a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
+++ b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
@@ -375,6 +375,104 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>EXPORTTEMPLATEPLACEOFUSE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OBJECT_FILTER</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="-1" />
+ <size v="2147483647" />
+ <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>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <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="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <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="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <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>TITLE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="150" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -14589,6 +14687,76 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <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="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <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="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <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>EXPORTTEMPLATEPLACEOFUSE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
diff --git a/cypress/integration/globalTests/indexSearch.ts b/cypress/integration/globalTests/indexSearch.ts
index 2ec4c2d088e2ae667a80b04fed4d90cd4d604486..49f0d905fdd6950954f66da7c67d4f14940f8c5e 100644
--- a/cypress/integration/globalTests/indexSearch.ts
+++ b/cypress/integration/globalTests/indexSearch.ts
@@ -1,12 +1,16 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Index Search", () =>
{
- it("Should find a specific company in the index search component", () =>
+ it([Tag.DEFAULT], "Should find a specific company in the index search component", () =>
{
cy.login();
cy.searchIndex("meineFirma");
});
- it("Should search for a company in the indexsearch and open the 'show more' context", () =>
+ it([Tag.DEFAULT], "Should search for a company in the indexsearch and open the 'show more' context", () =>
{
cy.login();
cy.openIndexResult("Bucher");
diff --git a/cypress/integration/globalTests/login.ts b/cypress/integration/globalTests/login.ts
index 86eb61c9825f5dbc20103034cf020be8ad98a9ca..8b24210f573708e7f4913bcaec517f86693f1e57 100644
--- a/cypress/integration/globalTests/login.ts
+++ b/cypress/integration/globalTests/login.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Login", () => {
it([Tag.DEFAULT], "should login with admin account properly", () => {
cy.login();
diff --git a/cypress/integration/globalTests/main_menu.ts b/cypress/integration/globalTests/main_menu.ts
index 7594eacea4d6f9408152bf17118f4042ef0671dd..3047df22213d7a98109526872740358f92ed7ec2 100644
--- a/cypress/integration/globalTests/main_menu.ts
+++ b/cypress/integration/globalTests/main_menu.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Admin-Menu", () => {
it([Tag.DEFAULT], "Should show all Admin Menu-Points", () => {
cy.login();
diff --git a/cypress/integration/singleTests/ActivityEdit_view/CreateActivity_AllFields.ts b/cypress/integration/singleTests/ActivityEdit_view/CreateActivity_AllFields.ts
index b6a0b3ca5577896b3c0d35a4cd010a7a6e5878ec..b93f26ebc1fcc30c6f0d039a5f91cfcf0dd0346b 100644
--- a/cypress/integration/singleTests/ActivityEdit_view/CreateActivity_AllFields.ts
+++ b/cypress/integration/singleTests/ActivityEdit_view/CreateActivity_AllFields.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Create Activity", () =>
{
it([Tag.DEFAULT], "Should try to create an Activity, but as it is in the future it should not be possible", () =>
diff --git a/cypress/integration/singleTests/AttributeEdit_view/AttributeEdit_Person.ts b/cypress/integration/singleTests/AttributeEdit_view/AttributeEdit_Person.ts
index 55be10cb818a721e64be9eb86e77b56d7c9fa935..f0f9c568f1b0fa7e741e79a4973003706f281b5e 100644
--- a/cypress/integration/singleTests/AttributeEdit_view/AttributeEdit_Person.ts
+++ b/cypress/integration/singleTests/AttributeEdit_view/AttributeEdit_Person.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Add, change, cancel, delete Attribute in Person", () =>
{
diff --git a/cypress/integration/singleTests/DocumentEdit_view/DocumentEdit_UploadOrg.ts b/cypress/integration/singleTests/DocumentEdit_view/DocumentEdit_UploadOrg.ts
index 76137e2f0c724fccb8c2d11701bb45e373c02c02..c889e63110a6769287530ef38b8023d75f2dba59 100644
--- a/cypress/integration/singleTests/DocumentEdit_view/DocumentEdit_UploadOrg.ts
+++ b/cypress/integration/singleTests/DocumentEdit_view/DocumentEdit_UploadOrg.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Upload and delete document from Organisation", () =>
{
diff --git a/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation.ts b/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation.ts
index b9dd9296a833140346b3ecb35cd83bbf46c8a959..28cceb08b69081e3b31beef0463499493609111e 100644
--- a/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation.ts
+++ b/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Create Organisation", () =>
{
it([Tag.DEFAULT], "Should create an organisation with all necessary fields", () =>
diff --git a/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation_AllFields.ts b/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation_AllFields.ts
index 63028cb800b72772d9d86e1992cef83c5c3a86c0..cc9ad7ae7f8c0082afd84dce8422f79e926aa040 100644
--- a/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation_AllFields.ts
+++ b/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation_AllFields.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Create Organisation with all fields", () =>
{
it([Tag.DEFAULT], "Should create an organisation with all fields", () =>
diff --git a/cypress/integration/singleTests/OrganisationFilter_view/OrganisationFilter_Group.ts b/cypress/integration/singleTests/OrganisationFilter_view/OrganisationFilter_Group.ts
index bc1e01270939307cea5a895c8b8a6f5c6c98e671..f59e68f92b72b5755d417c93e158ef3165df7808 100644
--- a/cypress/integration/singleTests/OrganisationFilter_view/OrganisationFilter_Group.ts
+++ b/cypress/integration/singleTests/OrganisationFilter_view/OrganisationFilter_Group.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Filter Organisation data", () =>
{
diff --git a/cypress/integration/singleTests/OrganisationMain_view/OrganisationMain_openAndChangeTab.ts b/cypress/integration/singleTests/OrganisationMain_view/OrganisationMain_openAndChangeTab.ts
index 38b2f78e9ec491404c304517d6d94753e664f863..cd2af68fe7b0c88fd3d32ede16361bc1c29c4bb8 100644
--- a/cypress/integration/singleTests/OrganisationMain_view/OrganisationMain_openAndChangeTab.ts
+++ b/cypress/integration/singleTests/OrganisationMain_view/OrganisationMain_openAndChangeTab.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Open Organisation", () =>
{
diff --git a/cypress/integration/singleTests/OrganisationPreview_view/OrganisationPreview_setFavorite.ts b/cypress/integration/singleTests/OrganisationPreview_view/OrganisationPreview_setFavorite.ts
index b3878fcb73ada2fa5f424dc4afb4aeb23163f45e..894eb325b9a68224f30b2270ced03cea18d11e9c 100644
--- a/cypress/integration/singleTests/OrganisationPreview_view/OrganisationPreview_setFavorite.ts
+++ b/cypress/integration/singleTests/OrganisationPreview_view/OrganisationPreview_setFavorite.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Set a favorite organisation", () => {
it([Tag.DEFAULT], "Should set a favorite organisation without tag", () =>
diff --git a/cypress/integration/singleTests/PersonEdit_view/CreatePerson.ts b/cypress/integration/singleTests/PersonEdit_view/CreatePerson.ts
index c28bd486a6db790f7faa50c5f43dda5d5478ed02..6323a91af4735dedea1aa7b0ef1d0649eb566854 100644
--- a/cypress/integration/singleTests/PersonEdit_view/CreatePerson.ts
+++ b/cypress/integration/singleTests/PersonEdit_view/CreatePerson.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Create Person", () =>
{
it([Tag.DEFAULT], "Should create a person with all necessary fields", () =>
diff --git a/cypress/integration/singleTests/PersonEdit_view/CreatePerson_AllFields.ts b/cypress/integration/singleTests/PersonEdit_view/CreatePerson_AllFields.ts
index ed7dfc6f93c08d801f3f2dfd6dcc3f334cebe73b..949d6b465ff983188b48670c72a4eac2c4c58da3 100644
--- a/cypress/integration/singleTests/PersonEdit_view/CreatePerson_AllFields.ts
+++ b/cypress/integration/singleTests/PersonEdit_view/CreatePerson_AllFields.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Create Person", () =>
{
it([Tag.DEFAULT], "Should create a person with all fields", () =>
diff --git a/cypress/integration/singleTests/PersonFilter_view/PersonFilter_AllTypes.ts b/cypress/integration/singleTests/PersonFilter_view/PersonFilter_AllTypes.ts
index bd2394c2c85f828b12d4f84fe436fb96be1184e0..6d4a910215928b11ee14c40d1cc17ca5bacbe032 100644
--- a/cypress/integration/singleTests/PersonFilter_view/PersonFilter_AllTypes.ts
+++ b/cypress/integration/singleTests/PersonFilter_view/PersonFilter_AllTypes.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Filter Person data", () => {
it([Tag.DEFAULT], "Should filter person surname correctly", () =>
diff --git a/cypress/integration/singleTests/PersonFilter_view/PersonFilter_SpecificFilter.ts b/cypress/integration/singleTests/PersonFilter_view/PersonFilter_SpecificFilter.ts
index 8d1c0ff2089c8300535a17aed29a504b55fce8e8..c7da2ff35b21a30ce0fff5fd8a3e8daa9769a244 100644
--- a/cypress/integration/singleTests/PersonFilter_view/PersonFilter_SpecificFilter.ts
+++ b/cypress/integration/singleTests/PersonFilter_view/PersonFilter_SpecificFilter.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Filter Person data - specific types with assertion", () =>
{
it([Tag.DEFAULT], "Should filter person firstname correctly", () =>
diff --git a/cypress/integration/singleTests/PersonFilter_view/PersonFilter_testButtons.ts b/cypress/integration/singleTests/PersonFilter_view/PersonFilter_testButtons.ts
index 6e90b308c286f5d06529eedf269367b064f90081..666fb39670aed35a6d94ad7d2bd82b1c363ec77e 100644
--- a/cypress/integration/singleTests/PersonFilter_view/PersonFilter_testButtons.ts
+++ b/cypress/integration/singleTests/PersonFilter_view/PersonFilter_testButtons.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Press different buttons", () =>
{
diff --git a/cypress/integration/singleTests/PersonMain_view/PersonMain_openAndEdit.ts b/cypress/integration/singleTests/PersonMain_view/PersonMain_openAndEdit.ts
index 9926ec69f17171b1dba43c147105a41b06351bb7..2af813a186c7cb136ad879b21e28aa7e661548aa 100644
--- a/cypress/integration/singleTests/PersonMain_view/PersonMain_openAndEdit.ts
+++ b/cypress/integration/singleTests/PersonMain_view/PersonMain_openAndEdit.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Filter Person data", () => {
it([Tag.DEFAULT], "Should open main view and then edit", () =>
diff --git a/cypress/integration/singleTests/PersonPreview_view/PersonPreview_openAndCloseDrawer.ts b/cypress/integration/singleTests/PersonPreview_view/PersonPreview_openAndCloseDrawer.ts
index 1df38dbb236dcf7c7e34ee10aedf2396d0d0e009..b18b222a09a620006ab46ff5ccd4b481744af48d 100644
--- a/cypress/integration/singleTests/PersonPreview_view/PersonPreview_openAndCloseDrawer.ts
+++ b/cypress/integration/singleTests/PersonPreview_view/PersonPreview_openAndCloseDrawer.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Drawer actions person", () =>
{
diff --git a/cypress/integration/singleTests/PersonPreview_view/PersonPreview_setFavorite.ts b/cypress/integration/singleTests/PersonPreview_view/PersonPreview_setFavorite.ts
index d1e03765b4b26666d528999bd20adde50c4f8568..2e65af25b376d448f16e766c920c1cb1896b9e59 100644
--- a/cypress/integration/singleTests/PersonPreview_view/PersonPreview_setFavorite.ts
+++ b/cypress/integration/singleTests/PersonPreview_view/PersonPreview_setFavorite.ts
@@ -1,3 +1,7 @@
+beforeEach(() => {
+ cy.resetData();
+})
+
describe("Set a favorite person", () => {
it([Tag.DEFAULT], "Should set a favorite person without tag", () =>
diff --git a/cypress/support/authentication.ts b/cypress/support/authentication.ts
index fb7d33ce691884c01a8c1e79e12ba790053835b9..878558e589ecebfa0076e5ea0ddabeeab546f30c 100644
--- a/cypress/support/authentication.ts
+++ b/cypress/support/authentication.ts
@@ -32,7 +32,11 @@ Cypress.Commands.add('login', (pUsername, pPassword, pLocale) =>
if(!pUsername && !pPassword)
{
pUsername = AdminLogin.USER;
- pPassword = AdminLogin.PASSWORD;
+ pPassword = Cypress.env("ADMIN_PASSWORD");
+ if(!pPassword)
+ {
+ pPassword = AdminLogin.PASSWORD;
+ }
}
if(!pPassword && pUsername)
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
index 70c186a1190ebdd3b13956c3cf90da9ea3221b72..63e9530e4e1c9c1d516f58b2504ec2a213a12ef8 100644
--- a/cypress/support/index.ts
+++ b/cypress/support/index.ts
@@ -7,6 +7,7 @@ import './view'
import './actions'
import './indexer'
import './internal/taggingTests'
+import './internal/resetData'
import 'cypress-wait-until'
import './enum.ts'
diff --git a/cypress/support/internal/resetData.ts b/cypress/support/internal/resetData.ts
new file mode 100644
index 0000000000000000000000000000000000000000..c6fbcf4e84988ea707472eee703d4e62a650de80
--- /dev/null
+++ b/cypress/support/internal/resetData.ts
@@ -0,0 +1,14 @@
+/// <reference types="cypress" />
+
+declare namespace Cypress {
+ interface Chainable {
+ /**
+ * Executes the nodejs script reset:data
+ */
+ resetData(): Chainable<any>;
+ }
+}
+
+Cypress.Commands.add('resetData', (pSearchWord) => {
+ cy.exec("npm run reset:data", { failOnNonZeroExit: false });
+});
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
index 415e8d2a1af6a882e10fdc486befb142aa59713e..738c1a7ab7fbcce5cfacd7a11d57d3122be0c30c 100644
--- a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
@@ -14,11 +14,8 @@ var res = {
"groupByKeyword":"OrderType"
},
"Contract": {},
- "SupportTicket": {
- "subContext":"TaskLink",
- "childField":"TASK_ID",
- "parentField":"TASK_TASKID",
- "contactIdField":"OBJECT_ROWID"
+ "SupportTicket": {
+ "connectionField":"TASK_REQUESTOR_CONTACT_ID"
},
"Campaign": {
"subContext":"CampaignParticipant",
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index 19f43ebcb586a085f8f43e823fd2d4dace177c97..5a95e209f60d6d026a2f8406f132dc440eaa1b37 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -550,6 +550,17 @@
<stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/observeactionogroup/children/cancelobservation/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/BulkMail_entity/entityfields/observeactionogroup/children/cancelobservation/titleProcess.js</titleProcess>
</entityActionField>
+ <entityActionField>
+ <name>export</name>
+ <title>Export</title>
+ <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/observeactionogroup/children/export/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <iconId>NEON:EXPORT</iconId>
+ <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/observeactionogroup/children/export/stateProcess.js</stateProcess>
+ <tooltip>Export fields of this table</tooltip>
+ <tooltipProcess>%aditoprj%/entity/BulkMail_entity/entityfields/observeactionogroup/children/export/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
</children>
</entityActionGroup>
<entityActionField>
diff --git a/entity/BulkMail_entity/entityfields/observeactionogroup/children/export/onActionProcess.js b/entity/BulkMail_entity/entityfields/observeactionogroup/children/export/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6c68dcef71d0a7db12fd4d25819640764899dbad
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/observeactionogroup/children/export/onActionProcess.js
@@ -0,0 +1,11 @@
+import("ExportTemplate_lib");
+import("system.vars");
+
+var selection = vars.get("$sys.selection");
+
+if(selection.length == 0) //no selection -> use Filtercondition;
+{
+ selection = vars.get("$sys.filter");
+}
+
+ExportTemplateUtils.addParticipants(JSON.stringify(selection), vars.get("$sys.currentcontextname"));
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/observeactionogroup/children/export/stateProcess.js b/entity/BulkMail_entity/entityfields/observeactionogroup/children/export/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7fc578ee7942eeb948f08d3dd86f5950d3fa1c41
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/observeactionogroup/children/export/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("FilterViewAction_lib");
+import("system.vars");
+
+var contactCount = vars.get("$sys.datarowcount");
+
+result.string(FilterViewActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/observeactionogroup/children/export/tooltipProcess.js b/entity/BulkMail_entity/entityfields/observeactionogroup/children/export/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4aaaed5c074ef854441aa45e3e7993b2f77c04c4
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/observeactionogroup/children/export/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Export columns using a exporttemplate"));
\ No newline at end of file
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 15fab50f35ce1f2913fcb8acb86e88c0b67304c8..f2379d3a6494932a6dd60629f32c45c4a53c33f3 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -42,6 +42,17 @@
<stateProcess>%aditoprj%/entity/Campaign_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Campaign_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
</entityActionField>
+ <entityActionField>
+ <name>export</name>
+ <title>Export</title>
+ <onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/observeactiongroup/children/export/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <iconId>NEON:EXPORT</iconId>
+ <stateProcess>%aditoprj%/entity/Campaign_entity/entityfields/observeactiongroup/children/export/stateProcess.js</stateProcess>
+ <tooltip>Export fields of this table</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Campaign_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
</children>
</entityActionGroup>
<entityProvider>
diff --git a/entity/Campaign_entity/entityfields/observeactiongroup/children/export/onActionProcess.js b/entity/Campaign_entity/entityfields/observeactiongroup/children/export/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6c68dcef71d0a7db12fd4d25819640764899dbad
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/observeactiongroup/children/export/onActionProcess.js
@@ -0,0 +1,11 @@
+import("ExportTemplate_lib");
+import("system.vars");
+
+var selection = vars.get("$sys.selection");
+
+if(selection.length == 0) //no selection -> use Filtercondition;
+{
+ selection = vars.get("$sys.filter");
+}
+
+ExportTemplateUtils.addParticipants(JSON.stringify(selection), vars.get("$sys.currentcontextname"));
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/observeactiongroup/children/export/stateProcess.js b/entity/Campaign_entity/entityfields/observeactiongroup/children/export/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7fc578ee7942eeb948f08d3dd86f5950d3fa1c41
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/observeactiongroup/children/export/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("FilterViewAction_lib");
+import("system.vars");
+
+var contactCount = vars.get("$sys.datarowcount");
+
+result.string(FilterViewActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js b/entity/Campaign_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4aaaed5c074ef854441aa45e3e7993b2f77c04c4
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Export columns using a exporttemplate"));
\ No newline at end of file
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index 108747fd1e9c1b8e7d087e2949887ac8df728af0..b43f51cac27d3c24901388362180f772de3954d6 100644
--- a/entity/Competition_entity/Competition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -29,6 +29,7 @@
<title>Reason</title>
<dropDownProcess>%aditoprj%/entity/Competition_entity/entityfields/reason/dropDownProcess.js</dropDownProcess>
<selectionMode>MULTI</selectionMode>
+ <displayValueProcess>%aditoprj%/entity/Competition_entity/entityfields/reason/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>COMPETITIONID</name>
diff --git a/entity/Competition_entity/entityfields/reason/displayValueProcess.js b/entity/Competition_entity/entityfields/reason/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d62990a61b8cf202d84fb1af8efa98423cf7ea8
--- /dev/null
+++ b/entity/Competition_entity/entityfields/reason/displayValueProcess.js
@@ -0,0 +1,17 @@
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.result");
+import("system.vars");
+import("system.text");
+
+var reasonViewValue = [];
+var reasons = text.decodeMS(vars.get("$field.REASON"));
+
+var reasonObject = vars.get("$property.REASON.dropDown");
+
+reasons.forEach(function(reason)
+{
+ reasonViewValue.push(reasonObject[reason]);
+})
+
+result.string(reasonViewValue.join(", "));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 17f075c645ad79860c201c3534a6310a24fd70a4..1f4270024c189074fb928c3d230af6e1e498df48 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -165,7 +165,6 @@
<onValueChangeTypes>
<element>MASK</element>
</onValueChangeTypes>
- <onValidation></onValidation>
</entityField>
<entityConsumer>
<name>DocumentTemplateTypeCategory</name>
diff --git a/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js b/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
index b6482e533bfaca580e8687788e6860726fe8520f..0f764f5e3f168f6916af16d84e27a1fad880e478 100644
--- a/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
+++ b/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
@@ -6,7 +6,7 @@ import("system.vars");
// --> only set in $field.Content.valueProcess if $field.Content is null and set it from here only if MASK triggered change
if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW))
{
- [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$field."), new FileUpload(vars.get("$local.value")));
+ [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$field.DOCUMENTTEMPLATEID"), new FileUpload(vars.get("$local.value")));
vars.set("$context.currentTemplateType", type);
vars.set("$field.Content", content);
diff --git a/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js
index 3e355079f4d1a56e8cb0750909f476765d887614..6fcf14fa75d5ac836bd68df2ee8fed4bbc6835ae 100644
--- a/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js
@@ -4,10 +4,11 @@ import("system.vars");
import("system.result");
import("system.neon");
-if(vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$attachment()
-|| vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$signature()
-|| vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$replymail()
- && vars.exists("$context.currentTemplateType") && vars.get("$context.currentTemplateType") != DocumentTemplate.types.ODT)
+if((vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$attachment()
+ || vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$signature()
+ || vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$replymail())
+|| (vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$letter()
+ && vars.exists("$context.currentTemplateType") && vars.get("$context.currentTemplateType") != DocumentTemplate.types.ODT))
{
result.string(neon.COMPONENTSTATE_DISABLED);
}
diff --git a/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod b/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod
index 964b64aa8e9a81cfbe45a723b2cafad844a9d9c4..289e21e87ed155012e2ea6ba6403d1fafa0a0341 100644
--- a/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod
+++ b/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod
@@ -17,6 +17,7 @@
<consumer>Employees</consumer>
<linkedContextProcess></linkedContextProcess>
<displayValueProcess>%aditoprj%/entity/EmployeeGroupContactRelation_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/EmployeeGroupContactRelation_entity/entityfields/contact_id/onValidation.js</onValidation>
</entityField>
<entityField>
<name>EMPLOYEEGROUP_CONTACT_RELATIONID</name>
diff --git a/entity/EmployeeGroupContactRelation_entity/entityfields/contact_id/onValidation.js b/entity/EmployeeGroupContactRelation_entity/entityfields/contact_id/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..89007aafec39152c565838fe3b89fdeefe7c4c3c
--- /dev/null
+++ b/entity/EmployeeGroupContactRelation_entity/entityfields/contact_id/onValidation.js
@@ -0,0 +1,19 @@
+import("system.neon");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var sql = new SqlBuilder()
+ .selectCount("CONTACT_ID")
+ .from("EMPLOYEEGROUP_CONTACT_RELATION")
+ .where("EMPLOYEEGROUP_CONTACT_RELATION.CONTACT_ID", vars.get("$field.CONTACT_ID"))
+ .and("EMPLOYEEGROUP_CONTACT_RELATION.EMPLOYEEGROUP_ID", vars.get("$field.EMPLOYEEGROUP_ID"))
+ .andIfSet("EMPLOYEEGROUP_CONTACT_RELATION.EMPLOYEEGROUP_CONTACT_RELATIONID", vars.get("$field.EMPLOYEEGROUP_CONTACT_RELATIONID"),SqlBuilder.NOT_EQUAL())
+ .cell();
+
+
+if (sql > 0 )
+{
+ result.string(translate.text("Employee already selected") + ".");
+}
diff --git a/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod b/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod
index b46580ea5bcf69b18c5cf43da210b641f11366d3..2d96b5aaf88b57df50d9a2aa00d84db3d68502d4 100644
--- a/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod
+++ b/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod
@@ -31,6 +31,7 @@
<name>NAME</name>
<title>Name</title>
<mandatory v="true" />
+ <onValidation>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/entityfields/name/onValidation.js</onValidation>
</entityField>
<entityConsumer>
<name>EmpGroupRules</name>
diff --git a/entity/EmployeeGroupRuleGroup_entity/entityfields/name/onValidation.js b/entity/EmployeeGroupRuleGroup_entity/entityfields/name/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..2e1930affbd4098a8d1ef811958273041ea1d9e8
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroup_entity/entityfields/name/onValidation.js
@@ -0,0 +1,17 @@
+import("system.neon");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var sql = new SqlBuilder()
+ .selectCount("NAME")
+ .from("EMPLOYEEGROUP_RULEGROUP")
+ .where("EMPLOYEEGROUP_RULEGROUP.NAME", vars.get("$field.NAME"))
+ .and("EMPLOYEEGROUP_RULEGROUP.EMPLOYEEGROUP_RULEGROUPID", vars.get("sys.uid"),SqlBuilder.NOT())
+ .cell();
+
+if (sql > 0)
+{
+ result.string(translate.text("Name has to be unique") + ".");
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRule_entity/EmployeeGroupRule_entity.aod b/entity/EmployeeGroupRule_entity/EmployeeGroupRule_entity.aod
index 1c235b5a30f278f46c5a6c593a7d1365e1c3b489..f53e3460a1c2478956099f11a8bb0c2109c89f9d 100644
--- a/entity/EmployeeGroupRule_entity/EmployeeGroupRule_entity.aod
+++ b/entity/EmployeeGroupRule_entity/EmployeeGroupRule_entity.aod
@@ -36,6 +36,7 @@
<name>NAME</name>
<title>Name</title>
<mandatory v="true" />
+ <onValidation>%aditoprj%/entity/EmployeeGroupRule_entity/entityfields/name/onValidation.js</onValidation>
</entityField>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/EmployeeGroupRule_entity/entityfields/name/onValidation.js b/entity/EmployeeGroupRule_entity/entityfields/name/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..6cd8121c41e8437c62ae7265945b9ff48507a15e
--- /dev/null
+++ b/entity/EmployeeGroupRule_entity/entityfields/name/onValidation.js
@@ -0,0 +1,16 @@
+import("system.neon");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var sql = new SqlBuilder()
+ .selectCount("NAME")
+ .from("EMPLOYEEGROUP_RULEGROUP")
+ .where("EMPLOYEEGROUP_RULEGROUP.NAME", vars.get("$field.NAME"))
+ .andIfSet("EMPLOYEEGROUP_RULEGROUP.EMPLOYEEGROUP_RULEGROUPID", vars.get("$field.EMPLOYEEGROUP_RULEGROUP_ID"),SqlBuilder.NOT_EQUAL())
+ .cell();
+if (sql > 0)
+{
+ result.string(translate.text("Name has to be unique") + ".");
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod b/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod
index 7166da239b1f917854bacf1061491d459ea2a1ad..da7a223f92849ab3bb95a659ecd53f8f30845bd7 100644
--- a/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod
+++ b/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod
@@ -21,6 +21,7 @@
<name>GROUPNAME</name>
<title>Group name</title>
<mandatory v="true" />
+ <onValidation>%aditoprj%/entity/EmployeeGroup_entity/entityfields/groupname/onValidation.js</onValidation>
</entityField>
<entityProvider>
<name>EmployeesGroups</name>
diff --git a/entity/EmployeeGroup_entity/entityfields/groupname/onValidation.js b/entity/EmployeeGroup_entity/entityfields/groupname/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..2556968f99e2f972b472208d5405c38b5e4fbed3
--- /dev/null
+++ b/entity/EmployeeGroup_entity/entityfields/groupname/onValidation.js
@@ -0,0 +1,16 @@
+import("system.neon");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var sql = new SqlBuilder()
+ .selectCount("GROUPNAME")
+ .from("EMPLOYEEGROUP")
+ .where("EMPLOYEEGROUP.GROUPNAME", vars.get("$field.GROUPNAME"))
+ .and("EMPLOYEEGROUP.EMPLOYEEGROUPID", vars.get("sys.uid"),SqlBuilder.NOT())
+ .cell();
+if (sql > 0)
+{
+ result.string(translate.text("Name has to be unique") + ".");
+}
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
index 971d3efbf5b977a3fb4487665096b021cc0616fe..657050d20ec94a04c0eff6c74a61d1c7e04bb17e 100644
--- a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
+++ b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
@@ -4,6 +4,11 @@
<title>Export Template Field</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ExportTemplateField_entity/documentation.adoc</documentation>
+ <siblings>
+ <element>ExportTemplatePlaceOfUse_entity</element>
+ </siblings>
+ <grantUpdate v="false" />
+ <contentTitleProcess>%aditoprj%/entity/ExportTemplateField_entity/contentTitleProcess.js</contentTitleProcess>
<titlePlural>Export Template Fields</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -29,13 +34,20 @@
<title>Field</title>
<mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/field/dropDownProcess.js</dropDownProcess>
+ <stateProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/field/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/field/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
</entityField>
<entityProvider>
<name>ExportTemplateFields</name>
<documentation>%aditoprj%/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc</documentation>
</entityProvider>
<entityParameter>
- <name>ExportTemplateField_param</name>
+ <name>ExportTemplateId_param</name>
<expose v="true" />
</entityParameter>
<entityField>
@@ -44,12 +56,75 @@
<contentType>NUMBER</contentType>
<outputFormat>###</outputFormat>
<inputFormat>###</inputFormat>
- <mandatory v="true" />
+ <mandatory v="false" />
</entityField>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>ExportTemplatePlacesOfUse</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ExportTemplatePlaceOfUse_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ExportTemplateId_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>EXPORTTEMPLATEPLACEOFUSE_ID</name>
+ <title>Place of Use</title>
+ <consumer>ExportTemplatePlacesOfUse</consumer>
+ <mandatory v="true" />
+ <onValueChange>%aditoprj%/entity/ExportTemplateField_entity/entityfields/exporttemplateplaceofuse_id/onValueChange.js</onValueChange>
+ </entityField>
+ <entityField>
+ <name>placeOfUse</name>
+ <title>Place of Use</title>
+ <valueProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/placeofuse/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/placeofuse/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityActionGroup>
+ <name>MoveActions</name>
+ <title>Move</title>
+ <children>
+ <entityActionField>
+ <name>Down</name>
+ <title></title>
+ <onActionProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/moveactions/children/down/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:ANGLE_DOWN</iconId>
+ <stateProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/moveactions/children/down/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>Up</name>
+ <title></title>
+ <onActionProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/moveactions/children/up/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:ANGLE_UP</iconId>
+ <stateProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/moveactions/children/up/stateProcess.js</stateProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -58,6 +133,8 @@
<isReadOnly v="false" />
<conditionProcess>%aditoprj%/entity/ExportTemplateField_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/ExportTemplateField_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBInsert>%aditoprj%/entity/ExportTemplateField_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBDelete>%aditoprj%/entity/ExportTemplateField_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
@@ -76,10 +153,30 @@
<name>SORTING.value</name>
<recordfield>EXPORTTEMPLATEFIELD.SORTING</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>EXPORTTEMPLATEFIELD.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>EXPORTTEMPLATEFIELD.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>EXPORTTEMPLATEFIELD.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>EXPORTTEMPLATEFIELD.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>EXPORTTEMPLATEPLACEOFUSE_ID.value</name>
+ <recordfield>EXPORTTEMPLATEFIELD.EXPORTTEMPLATEPLACEOFUSE_ID</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
- <name>7236de85-f623-4f6a-9ff5-d9014a2f7a4c</name>
+ <name>4cec9829-254f-4588-9abf-a224a390a172</name>
<tableName>EXPORTTEMPLATEFIELD</tableName>
<primaryKey>EXPORTTEMPLATEFIELDID</primaryKey>
<isUIDTable v="true" />
diff --git a/entity/ExportTemplateField_entity/contentTitleProcess.js b/entity/ExportTemplateField_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..52bd0deb2169ccfd1f5d531869b4e2fe4304d298
--- /dev/null
+++ b/entity/ExportTemplateField_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.FIELD"));
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/date_edit/valueProcess.js b/entity/ExportTemplateField_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+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/ExportTemplateField_entity/entityfields/date_new/valueProcess.js b/entity/ExportTemplateField_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+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/ExportTemplateField_entity/entityfields/exporttemplate_id/valueProcess.js b/entity/ExportTemplateField_entity/entityfields/exporttemplate_id/valueProcess.js
index 76dc5ef71d45ba4b444c21383abcbd8281f1e26f..fe71bb2cb95ec8ed9488118ac627cf17d082bc69 100644
--- a/entity/ExportTemplateField_entity/entityfields/exporttemplate_id/valueProcess.js
+++ b/entity/ExportTemplateField_entity/entityfields/exporttemplate_id/valueProcess.js
@@ -1,9 +1,10 @@
import("system.result");
import("system.neon");
import("system.vars");
+import("Util_lib");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if(Utils.isNotNullOrEmptyString(vars.getString("$param.ExportTemplateId_param")) && Utils.isNullOrEmptyString(vars.getString("$this.value")))
{
- if(vars.exists("$param.ExportTemplateField_param") && vars.get("$param.ExportTemplateField_param") != null)
- result.string(vars.getString("$param.ExportTemplateField_param"));
-}
\ No newline at end of file
+ result.string(vars.getString("$param.ExportTemplateId_param"));
+}
+
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/exporttemplateplaceofuses/children/exporttemplateid_param/valueProcess.js b/entity/ExportTemplateField_entity/entityfields/exporttemplateplaceofuses/children/exporttemplateid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..be49d03de451c24366fc615db9b981efb4e15661
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/exporttemplateplaceofuses/children/exporttemplateid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.ExportTemplateId_param"))
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateid_param/valueProcess.js b/entity/ExportTemplateField_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..be49d03de451c24366fc615db9b981efb4e15661
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.ExportTemplateId_param"))
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/field/displayValueProcess.js b/entity/ExportTemplateField_entity/entityfields/field/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..173f0d3ec44861d0b1c3e5c3da2a8ae9559e72ad
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/field/displayValueProcess.js
@@ -0,0 +1,18 @@
+import("system.result");
+import("system.project");
+import("Util_lib");
+import("system.vars");
+import("system.entities");
+import("Context_lib");
+
+if (Utils.isNotNullOrEmptyString(vars.getString("$this.value")))
+{
+ let type = vars.getString("$field.placeOfUse");
+
+ if (Utils.isNotNullOrEmptyString(type))
+ {
+ var fields = project.getEntityStructure(ContextUtils.getEntity(type)).fields;
+
+ result.string(fields[vars.getString("$this.value")].title);
+ }
+}
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/field/dropDownProcess.js b/entity/ExportTemplateField_entity/entityfields/field/dropDownProcess.js
index 3c830477d519292b231f502d1caa9cffc392f984..671728966e3d1b25b66fd779e4aad824133e89ab 100644
--- a/entity/ExportTemplateField_entity/entityfields/field/dropDownProcess.js
+++ b/entity/ExportTemplateField_entity/entityfields/field/dropDownProcess.js
@@ -1,15 +1,31 @@
+import("ExportTemplate_lib");
+import("Util_lib");
+import("system.vars");
+import("system.entities");
+import("Context_lib");
+import("system.project");
import("system.result");
import("Placeholder_lib");
-import("system.text")
+import("system.text");
+let type = vars.getString("$field.placeOfUse");
-//The current selection of Exportfields is created by using the Placeholder function "PlaceholderUtils.getPlaceholders()".
-//if you want to add more fields, you just have to add the function "CustomPlaceholderUtils.getPlaceholders()" to the dropDownProcess
-//and add the desired Fields as placeholders in the CustomPlaceholder_lib.
+if (!Utils.isNullOrEmpty(type))
+{
+ var resultFields = [];
+ var entity = ContextUtils.getEntity(type);
+ var fields = project.getEntityStructure(entity).fields;
+ var excludeFields = ExportTemplateUtils.excludedFields()[entity] || [];
+
+ for (var field in fields)
+ {
+ if (fields[field].fieldType == project.ENTITYFIELDTYPE_FIELD && excludeFields.indexOf(field) == -1)
+ {
+ let title = fields[field].title ? fields[field].title : fields[field].name;
+ resultFields.push([fields[field].name, title]);
+ }
+
+ }
-
-var placeholders = PlaceholderUtils.getPlaceholders(null, true).map(function (placeholder){
- return [placeholder.getFormattedName(), placeholder.title || placeholder.getFormattedName()];
-})
-
-result.object(placeholders);
\ No newline at end of file
+ result.object(resultFields);
+}
diff --git a/entity/ExportTemplateField_entity/entityfields/field/stateProcess.js b/entity/ExportTemplateField_entity/entityfields/field/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..871d7d670a1603b16fc0a86ad3ad344a87eecba1
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/field/stateProcess.js
@@ -0,0 +1,14 @@
+import("Util_lib");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (Utils.isNullOrEmptyString(vars.get("$field.EXPORTTEMPLATEPLACEOFUSE_ID"))
+ && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
diff --git a/entity/ExportTemplateField_entity/entityfields/moveactions/children/down/onActionProcess.js b/entity/ExportTemplateField_entity/entityfields/moveactions/children/down/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c06102416278aac37343d7c70a2151f57debd9f2
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/moveactions/children/down/onActionProcess.js
@@ -0,0 +1,15 @@
+import("system.vars");
+import("Sql_lib");
+import("system.neon");
+
+// The sorting value of the following field is set to the current sorting value
+newWhere("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", vars.get("$field.EXPORTTEMPLATE_ID"))
+.and("EXPORTTEMPLATEFIELD.SORTING", parseInt(vars.get("$field.SORTING")) + 1)
+.updateFields({"SORTING":vars.get("$field.SORTING")}, "EXPORTTEMPLATEFIELD");
+
+// The sorting is increased by one for the current field
+newWhere("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", vars.get("$field.EXPORTTEMPLATE_ID"))
+.and("EXPORTTEMPLATEFIELD.EXPORTTEMPLATEFIELDID", vars.get("$field.EXPORTTEMPLATEFIELDID"))
+.updateFields({"SORTING":(parseInt(vars.get("$field.SORTING")) + 1)}, "EXPORTTEMPLATEFIELD");
+
+neon.refreshAll();
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/moveactions/children/down/stateProcess.js b/entity/ExportTemplateField_entity/entityfields/moveactions/children/down/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..aeb2fdc86a54722b08df6d06a7e6e99c691e8689
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/moveactions/children/down/stateProcess.js
@@ -0,0 +1,14 @@
+import("Sql_lib");
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+let maxSorting = newSelect(new SqlMaskingUtils().max("SORTING"))
+.from("EXPORTTEMPLATEFIELD")
+.where("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", vars.get("$field.EXPORTTEMPLATE_ID"))
+.cell();
+
+if (vars.get("$field.SORTING") == maxSorting)
+{
+ result.string(neon.COMPONENTSTATE_DISABLED);
+}
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/moveactions/children/up/onActionProcess.js b/entity/ExportTemplateField_entity/entityfields/moveactions/children/up/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2835e61598f7386c73ac100e57f1ade18bc4d47e
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/moveactions/children/up/onActionProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("Sql_lib");
+import("system.neon");
+
+newWhere("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", vars.get("$field.EXPORTTEMPLATE_ID"))
+.and("EXPORTTEMPLATEFIELD.SORTING", parseInt(vars.get("$field.SORTING")) - 1)
+.updateFields({"SORTING":vars.get("$field.SORTING")}, "EXPORTTEMPLATEFIELD");
+
+newWhere("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", vars.get("$field.EXPORTTEMPLATE_ID"))
+.and("EXPORTTEMPLATEFIELD.EXPORTTEMPLATEFIELDID", vars.get("$field.EXPORTTEMPLATEFIELDID"))
+.updateFields({"SORTING":(parseInt(vars.get("$field.SORTING")) - 1)}, "EXPORTTEMPLATEFIELD");
+
+neon.refreshAll();
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/moveactions/children/up/stateProcess.js b/entity/ExportTemplateField_entity/entityfields/moveactions/children/up/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ff98b8b28e4578c4468b50ecef18acb36e628797
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/moveactions/children/up/stateProcess.js
@@ -0,0 +1,9 @@
+import("Util_lib");
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+if (vars.get("$field.SORTING") == 1 || Utils.isNullOrEmpty(vars.get("$field.SORTING")))
+{
+ result.string(neon.COMPONENTSTATE_DISABLED);
+}
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/placeofuse/displayValueProcess.js b/entity/ExportTemplateField_entity/entityfields/placeofuse/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1634464ae492abc975dd02449be0d684362faa23
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/placeofuse/displayValueProcess.js
@@ -0,0 +1,11 @@
+import("Util_lib");
+import("system.vars");
+import("Context_lib");
+import("system.project");
+import("system.result");
+
+if (Utils.isNotNullOrEmptyString(vars.getString("$this.value")))
+{
+ let title = ContextUtils.getTranslatedTitle(vars.getString("$this.value")) || vars.getString("$this.value");
+ result.string(title);
+}
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/placeofuse/valueProcess.js b/entity/ExportTemplateField_entity/entityfields/placeofuse/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6ff5f51c28d2599e9a73ee18b02d4d20a4bab195
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/placeofuse/valueProcess.js
@@ -0,0 +1,22 @@
+import("Util_lib");
+import("system.result");
+import("system.entities");
+import("system.vars");
+
+let loadConfig = entities.createConfigForLoadingConsumerRows()
+.consumer("ExportTemplatePlacesOfUse")
+.fields(["PLACEOFUSE", "#UID"]);
+
+let filtertConsumerRows = entities.getRows(loadConfig).find(_findUIDRow, {
+ UID: vars.get("$field.EXPORTTEMPLATEPLACEOFUSE_ID")
+});
+
+if (!Utils.isNullOrEmpty(filtertConsumerRows))
+{
+ result.string(filtertConsumerRows["PLACEOFUSE"]);
+}
+
+function _findUIDRow (pRow)
+{
+ return pRow["#UID"] === this.UID;
+}
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/user_edit/valueProcess.js b/entity/ExportTemplateField_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+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/ExportTemplateField_entity/entityfields/user_new/valueProcess.js b/entity/ExportTemplateField_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+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/ExportTemplateField_entity/recordcontainers/db/conditionProcess.js b/entity/ExportTemplateField_entity/recordcontainers/db/conditionProcess.js
index 0a8fd4155c358a1f28eecdeba07050276ed58e5b..5195254f656b5dfbc0ad70e280064dcc56dc4458 100644
--- a/entity/ExportTemplateField_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ExportTemplateField_entity/recordcontainers/db/conditionProcess.js
@@ -2,6 +2,6 @@ import("system.vars");
import("system.result");
import("Sql_lib");
-var cond = newWhereIfSet("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", "$param.ExportTemplateField_param");
+var cond = newWhereIfSet("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", "$param.ExportTemplateId_param");
result.string(cond);
diff --git a/entity/ExportTemplateField_entity/recordcontainers/db/onDBDelete.js b/entity/ExportTemplateField_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..0ad3890b048495757cfe3eb70ac5d85356d19df0
--- /dev/null
+++ b/entity/ExportTemplateField_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,18 @@
+import("system.vars");
+import("Sql_lib");
+import("system.db");
+
+let updateStatements = [];
+let sorting = vars.get("$field.SORTING");
+let fields = newSelect("EXPORTTEMPLATEFIELD.EXPORTTEMPLATEFIELDID")
+.from("EXPORTTEMPLATEFIELD")
+.where("EXPORTTEMPLATEFIELD.SORTING",sorting, SqlBuilder.GREATER())
+.and("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", vars.get("$field.EXPORTTEMPLATE_ID"))
+.orderBy("EXPORTTEMPLATEFIELD.SORTING").arrayColumn();
+
+fields.forEach(function (pFieldId, pIndex){
+ updateStatements.push(newWhere("EXPORTTEMPLATEFIELD.EXPORTTEMPLATEFIELDID", pFieldId)
+ .buildUpdateStatement({"SORTING" : parseInt(sorting) + pIndex }, "EXPORTTEMPLATEFIELD"));
+});
+
+db.updates(updateStatements);
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/recordcontainers/db/onDBInsert.js b/entity/ExportTemplateField_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..f6607d593faf825e45e834c3bd225fc980dc5eca
--- /dev/null
+++ b/entity/ExportTemplateField_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("Sql_lib");
+
+let sorting = newSelect([new SqlMaskingUtils().max("EXPORTTEMPLATEFIELD.SORTING")])
+.from("EXPORTTEMPLATEFIELD")
+.where("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", vars.get("$field.EXPORTTEMPLATE_ID"))
+.cell();
+
+sorting = parseInt(sorting);
+
+// The field is only sorted in the onInsert, so I can make sure that it is very likely that there are not two identical numbers.
+newWhere("EXPORTTEMPLATEFIELD.EXPORTTEMPLATEFIELDID", vars.get("$local.uid"))
+ .updateFields({"SORTING" : ((sorting ? sorting : 0) +1) }, "EXPORTTEMPLATEFIELD")
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
index 5ef84de7e6b853b11d7cf013ed96e5f854cb3ef9..c641aa1da42c27646c590d0659e150ec4a1a24f8 100644
--- a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
+++ b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
@@ -4,18 +4,68 @@
<title>Place of Use</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/documentation.adoc</documentation>
- <titlePlural>Places of Usage</titlePlural>
+ <siblings>
+ <element>ExportTemplateField_entity</element>
+ </siblings>
+ <grantUpdate v="false" />
+ <contentTitleProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/contentTitleProcess.js</contentTitleProcess>
+ <titlePlural>Dependencies</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
+ <entityActionField>
+ <name>openAdminView</name>
+ <title>Open admin view</title>
+ <onActionProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="true" />
+ <iconId>VAADIN:CURLY_BRACKETS</iconId>
+ <stateProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/openadminview/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
<entityField>
<name>EXPORTTEMPLATEPLACEOFUSEID</name>
<title>EXPORTTEMPLATEPLACEOFUSEID</title>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuseid/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>EXPORTTEMPLATEPLACEOFUSE_ID</name>
+ <title>Predecessor</title>
+ <consumer>ExportTemplatePlacesOfUse</consumer>
+ <mandatory v="true" />
+ <mandatoryProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_id/mandatoryProcess.js</mandatoryProcess>
+ <stateProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_id/stateProcess.js</stateProcess>
+ <onValueChange>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_id/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ </entityField>
<entityField>
<name>EXPORTTEMPLATE_ID</name>
<title>Exporttemplate</title>
@@ -26,69 +76,124 @@
<name>PLACEOFUSE</name>
<documentation>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/documentation.adoc</documentation>
<title>Place of use</title>
- <consumer>ContextExportTemplatePlaceOfUse</consumer>
+ <consumer>Contexts</consumer>
<mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/titleProcess.js</titleProcess>
<displayValueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/onValueChange.js</onValueChange>
+ </entityField>
+ <entityField>
+ <name>OBJECT_FILTER</name>
+ <title>Filter</title>
+ <contentType>FILTER_TREE</contentType>
+ <stateProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/object_filter/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/object_filter/valueProcess.js</valueProcess>
</entityField>
+ <entityParameter>
+ <name>ExportTemplateId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
<entityConsumer>
- <name>ContextExportTemplatePlaceOfUse</name>
+ <name>Contexts</name>
<dependency>
<name>dependency</name>
<entityName>Context_entity</entityName>
- <fieldName>ContextTemplatePlaceOfUse</fieldName>
+ <fieldName>Exclusive</fieldName>
</dependency>
<children>
<entityParameter>
<name>InvertBlacklist_param</name>
- <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/invertblacklist_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>Blacklist_param</name>
- <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/blacklist_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/contexts/children/blacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
- <name>ExportTemplatePlaceOfUse_param</name>
+ <name>ExportTemplatePlaceOfUseID_param</name>
<expose v="true" />
</entityParameter>
- <entityProvider>
- <name>ExportTemplatePlaceOfUser</name>
- <documentation>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc</documentation>
+ <entityParameter>
+ <name>IsMainPlaceOfUse_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityConsumer>
+ <name>ExportTemplatePlacesOfUse</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>#ENTITY</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
<children>
<entityParameter>
- <name>ExportTemplatePlaceOfUse_param</name>
- <expose v="true" />
+ <name>ExportTemplatePlaceOfUseID_param</name>
+ </entityParameter>
+ <entityParameter>
+ <name>ExportTemplateId_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityProvider>
- <entityProvider>
- <name>#PROVIDER_AGGREGATES</name>
- <useAggregates v="true" />
- </entityProvider>
+ </entityConsumer>
+ <entityField>
+ <name>TITLE</name>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
+ <isPageable v="false" />
+ <hasDependentRecords v="true" />
<conditionProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <onDBDelete>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<alias>Data_alias</alias>
<recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>EXPORTTEMPLATEPLACEOFUSE.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>EXPORTTEMPLATEPLACEOFUSE.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>EXPORTTEMPLATE_ID.value</name>
<recordfield>EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATE_ID</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>EXPORTTEMPLATEPLACEOFUSE_ID.value</name>
+ <recordfield>EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATEPLACEOFUSE_ID</recordfield>
+ </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>EXPORTTEMPLATEPLACEOFUSEID.value</name>
<recordfield>EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATEPLACEOFUSEID</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_FILTER.value</name>
+ <recordfield>EXPORTTEMPLATEPLACEOFUSE.OBJECT_FILTER</recordfield>
+ </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PLACEOFUSE.value</name>
<recordfield>EXPORTTEMPLATEPLACEOFUSE.PLACEOFUSE</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>EXPORTTEMPLATEPLACEOFUSE.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>EXPORTTEMPLATEPLACEOFUSE.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TITLE.value</name>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
- <name>5e6f806e-c845-49ab-bfee-31b12e4c41f3</name>
+ <name>06fe6e4f-5ab7-404a-b820-7c23fc4a520b</name>
<tableName>EXPORTTEMPLATEPLACEOFUSE</tableName>
<primaryKey>EXPORTTEMPLATEPLACEOFUSEID</primaryKey>
<isUIDTable v="true" />
diff --git a/entity/ExportTemplatePlaceOfUse_entity/contentTitleProcess.js b/entity/ExportTemplatePlaceOfUse_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a974c8c7914cd2c8cd3d56dbfd54a91f186dacfa
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.PLACEOFUSE"));
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/documentation.adoc b/entity/ExportTemplatePlaceOfUse_entity/documentation.adoc
deleted file mode 100644
index a61ae5a651de0f753557aa094ba139dc5c3957a5..0000000000000000000000000000000000000000
--- a/entity/ExportTemplatePlaceOfUse_entity/documentation.adoc
+++ /dev/null
@@ -1,9 +0,0 @@
-= ExportTemplatePlaceOfUse_entity
-
-Entity to select all Modules where the created template should be useable (to limit the availability in the modules).
-
-The selection of Places Of usage is created via the link to the context_entity and limiting it
-by the Blacklist_param (which is being inverted to an whitelist thanks to the invertBlacklist_param).
-
-Linked via the ExportTemplateID to ExportTemplates.
-Own dbTable and Entity are to make it possible to store multiple fields for one template.
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/blacklist_param/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/blacklist_param/valueProcess.js
deleted file mode 100644
index 9e45ce3b6cda9f9cffa1f8c6046d4267f2eb0a61..0000000000000000000000000000000000000000
--- a/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/blacklist_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.object(["Person", "Organisation"]);
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/contexts/children/blacklist_param/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/contexts/children/blacklist_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..289f1a413d80a3add469ae4915172a6776a54546
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/contexts/children/blacklist_param/valueProcess.js
@@ -0,0 +1,41 @@
+import("ExportTemplate_lib");
+import("Context_lib");
+import("Dependency_lib");
+import("Observation_lib");
+import("system.vars");
+import("system.result");
+import("Sql_lib")
+
+let placeOfUse;
+let contexts = [];
+let entityNames;
+
+if (vars.get("$field.EXPORTTEMPLATEPLACEOFUSE_ID"))
+{
+ placeOfUse = newSelect("EXPORTTEMPLATEPLACEOFUSE.PLACEOFUSE")
+ .from("EXPORTTEMPLATEPLACEOFUSE")
+ .where("EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATEPLACEOFUSEID", vars.get("$field.EXPORTTEMPLATEPLACEOFUSE_ID"))
+ .cell();
+}
+
+if (placeOfUse)
+{
+ entityNames = Dependency.getDependency(ContextUtils.getEntity(placeOfUse), {
+ "isExportable" : true
+ });
+}
+else
+{
+ entityNames = ExportTemplateUtils.exportableEntities();
+}
+
+for (let i = 0; i < entityNames.length; i++)
+{
+ let context = ContextUtils.getContextId(entityNames[i]);
+ if (context)
+ {
+ contexts.push(context);
+ }
+}
+
+result.string(JSON.stringify(contexts));
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..40effa0178464da0c7850912345f19c7fa95975a
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(true);
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/date_edit/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+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/ExportTemplatePlaceOfUse_entity/entityfields/date_new/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+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/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplate_id/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplate_id/valueProcess.js
index 7c84123ee891ea1b5d0719e8b77ae5cc7a0ca33b..d375ac965253d49ab53cd40c380df1e4bd9d8a88 100644
--- a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplate_id/valueProcess.js
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplate_id/valueProcess.js
@@ -1,10 +1,9 @@
+import("Util_lib");
import("system.result");
import("system.neon");
import("system.vars");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if(!Utils.isNullOrEmpty(vars.getString("$param.ExportTemplateId_param")) && Utils.isNullOrEmpty(vars.get("$this.value")))
{
- if(vars.exists("$param.ExportTemplatePlaceOfUse_param") && vars.get("$param.ExportTemplatePlaceOfUse_param") != null
- && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
- result.string(vars.getString("$param.ExportTemplatePlaceOfUse_param"));
+ result.string(vars.getString("$param.ExportTemplateId_param"));
}
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_id/mandatoryProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_id/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fb63b4864fee1cabf68f849cdab01fe7a9ba8b0a
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_id/mandatoryProcess.js
@@ -0,0 +1,5 @@
+import("Util_lib");
+import("system.vars");
+import("system.result");
+
+result.string(!Utils.toBoolean(vars.get("$param.IsMainPlaceOfUse_param")));
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_id/onValueChange.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_id/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..c570d33c4d73c61ecfacfa6a5b089dcfa4d96374
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_id/onValueChange.js
@@ -0,0 +1,5 @@
+import("Context_lib");
+import("system.vars");
+
+// If the place of use of the export template is changed, the selected place of use no longer matches the parent.
+vars.set("$field.PLACEOFUSE", null);
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_id/stateProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_id/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..924fa6c76f892bf6f5c14e1f10f6a4bf53b08547
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_id/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("Util_lib");
+import("system.result");
+import("system.neon");
+
+// If this is the Main PlaceOfUse, there the parent One is null
+if (Utils.toBoolean(vars.get("$param.IsMainPlaceOfUse_param")))
+{
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuseid/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuseid/valueProcess.js
index d81b1c1049eb25c998728bf5e0b90bada3a24e8d..067717d36961db97edf8c1e05f4b43ead60a4b52 100644
--- a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuseid/valueProcess.js
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuseid/valueProcess.js
@@ -4,4 +4,7 @@ import("system.util");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-result.string(util.getNewUUID());
\ No newline at end of file
+{
+ result.string(util.getNewUUID());
+}
+
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc
deleted file mode 100644
index 9713220ef692ca2f93ca9047460db28270795e3c..0000000000000000000000000000000000000000
--- a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= ExportTemplatePlaceOfUse_entity - ExportTemplatePlaceOfUser
-
-needed instead of the #PROVIDER so the ExportTemplatePlaceOfUse_param can be used
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuses/children/exporttemplateid_param/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuses/children/exporttemplateid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..001cc890f029455658cd08a1d8ad7ce8259f24d7
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuses/children/exporttemplateid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.ExportTemplateId_param"));
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateid_param/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..001cc890f029455658cd08a1d8ad7ce8259f24d7
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.ExportTemplateId_param"));
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/object_filter/stateProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/object_filter/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..679e8717260d56278206209c3dc3b517dfe526b6
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/object_filter/stateProcess.js
@@ -0,0 +1,17 @@
+import("Util_lib");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+let state;
+
+if (!Utils.isNullOrEmpty(vars.get("$field.PLACEOFUSE")) && !Utils.isNullOrEmpty(vars.get("$field.EXPORTTEMPLATEPLACEOFUSE_ID")))
+{
+ state = neon.COMPONENTSTATE_EDITABLE;
+}
+else
+{
+ state = neon.COMPONENTSTATE_INVISIBLE;
+}
+
+result.string(state);
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/object_filter/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/object_filter/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..077a69be63354948d7599480c4bf234cfd9a72c6
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/object_filter/valueProcess.js
@@ -0,0 +1,18 @@
+import("JditoFilter_lib");
+import("Util_lib");
+import("Observation_lib");
+import("system.vars");
+import("system.result");
+
+let resFilter;
+
+if (!Utils.isNullOrEmpty(vars.get("$this.value")) && !Utils.isNullOrEmpty(vars.get("$field.PLACEOFUSE")))
+{
+ resFilter = JditoFilterUtils.getContextFilter(vars.get("$field.PLACEOFUSE"), null);
+}
+
+if (resFilter)
+{
+ result.string(resFilter);
+}
+
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/openadminview/onActionProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/openadminview/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..be9984d0b0f68cabba9d60cd3404b7063374b4e3
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Context_lib");
+
+AdminViewUtils.open("", []);
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/openadminview/stateProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/openadminview/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..38f2298db7304b4d44a15fbad7f720558c02da99
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+import("Context_lib");
+import("system.result");
+
+result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/displayValueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/displayValueProcess.js
index dd3384b9ec0af65bca467795cd70e356e2e08fe4..dda429b59d3dc879f6d66653ed762fddfc26722e 100644
--- a/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/displayValueProcess.js
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/displayValueProcess.js
@@ -1,8 +1,12 @@
+import("system.translate");
+import("Util_lib");
import("system.vars");
-import("system.result");
import("Context_lib");
+import("system.project");
+import("system.result");
-var placeOfUse = vars.get("$field.PLACEOFUSE");
-
-if(placeOfUse)
-result.string(ContextUtils.getTitle(placeOfUse, true));
\ No newline at end of file
+if (Utils.isNotNullOrEmptyString(vars.getString("$this.value")))
+{
+ let title = ContextUtils.getTranslatedTitle(vars.getString("$this.value")) || translate.text(vars.getString("$this.value"));
+ result.string(title);
+}
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/documentation.adoc b/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/documentation.adoc
deleted file mode 100644
index 38a9ff1a0f6494d732d9d7fe50d771885f7496fa..0000000000000000000000000000000000000000
--- a/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/documentation.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-= PlaceOfuse
-
-The selection of Places Of usage is created via the link to the context_entity and limiting it
-by the Blacklist_param (which is being inverted to an whitelist thanks to the invertBlacklist_param).
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/onValueChange.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..e96809eae5c79ded9a2456c13793f208f5f6faf6
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/onValueChange.js
@@ -0,0 +1,8 @@
+import("JditoFilter_lib");
+import("Util_lib");
+import("system.vars");
+
+if (!Utils.isNullOrEmpty(vars.get("$field.EXPORTTEMPLATEPLACEOFUSE_ID")))
+{
+ vars.set("$field.OBJECT_FILTER", JditoFilterUtils.getContextFilter(vars.get("$this.value"), null));
+}
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/stateProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..20fc8dccf50778351e6ffde02caa9518556780ea
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/stateProcess.js
@@ -0,0 +1,21 @@
+import("Util_lib");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+let state;
+
+if (!Utils.isNullOrEmpty(vars.get("$field.EXPORTTEMPLATEPLACEOFUSE_ID")) || Utils.toBoolean(vars.get("$param.IsMainPlaceOfUse_param")))
+{
+ state = neon.COMPONENTSTATE_EDITABLE;
+}
+else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ state = neon.COMPONENTSTATE_INVISIBLE;
+}
+else
+{
+ state = neon.COMPONENTSTATE_READONLY;
+}
+
+result.string(state);
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/titleProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3ecda2e88772989f3e48f3ff3e482cfd6ac38b24
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.vars");
+import("Util_lib");
+import("system.result");
+
+if (!Utils.toBoolean(vars.get("$param.IsMainPlaceOfUse_param")))
+{
+ result.string(translate.text("Dependency"));
+}
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/user_edit/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+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/ExportTemplatePlaceOfUse_entity/entityfields/user_new/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+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/ExportTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js b/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js
index 30942689497eb2091398b6c15fb77fa8267a5806..a3490df303d908344ba798f904a69a6076de4627 100644
--- a/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js
@@ -1,6 +1,21 @@
import("system.vars");
import("system.result");
import("Sql_lib");
+import("Util_lib");
-var cond = newWhereIfSet("EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATE_ID", "$param.ExportTemplatePlaceOfUse_param");
-result.string(cond);
\ No newline at end of file
+let isMainPlaceOfUse = Utils.toBoolean(vars.get("$param.IsMainPlaceOfUse_param"));
+let isParentPlaceOfUseIdFilled = Utils.toBoolean(vars.get("$param.ExportTemplatePlaceOfUseID_param"));
+let exportTemplateId = vars.get("$param.ExportTemplateId_param");
+
+let cond = newWhereIfSet("EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATE_ID", exportTemplateId);
+
+if (isMainPlaceOfUse)
+{
+ cond.and("EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATEPLACEOFUSE_ID IS NULL");
+}
+else if (isParentPlaceOfUseIdFilled)
+{
+ cond.and("EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATEPLACEOFUSE_ID IS NOT NULL");
+}
+
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/onDBDelete.js b/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..2bb03e6ffba889fd320be5ad65ae54bf965aa3a0
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,28 @@
+import("system.translate");
+import("system.question");
+import("system.db");
+import("system.vars");
+import("Sql_lib");
+
+let countDeletedRows = newWhere("EXPORTTEMPLATEFIELD.EXPORTTEMPLATEPLACEOFUSE_ID", vars.get("$field.EXPORTTEMPLATEPLACEOFUSEID"))
+.and("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", vars.get("$field.EXPORTTEMPLATE_ID"))
+.deleteData(true, "EXPORTTEMPLATEFIELD");
+
+if (countDeletedRows > 0)
+{
+ question.showMessage(translate.text("Deleting the dependency also deletes its fields."), question.INFORMATION, translate.text("Fields of Dependency"));
+ let updateStatements = [];
+ let fields = newSelect("EXPORTTEMPLATEFIELD.EXPORTTEMPLATEFIELDID")
+ .from("EXPORTTEMPLATEFIELD")
+ .where("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", vars.get("$field.EXPORTTEMPLATE_ID"))
+ .orderBy("EXPORTTEMPLATEFIELD.SORTING").arrayColumn();
+
+ fields.forEach(function (pFieldId, pIndex){
+ updateStatements.push(newWhere("EXPORTTEMPLATEFIELD.EXPORTTEMPLATEFIELDID", pFieldId)
+ .buildUpdateStatement({
+ "SORTING" : pIndex + 1
+ }, "EXPORTTEMPLATEFIELD"));
+ });
+ //The gaps created by deleting the dependent fields are closed.
+ db.updates(updateStatements);
+}
diff --git a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
index 5c5e00cfcb49e5cb3ae07a120b0e467b89041a00..7f406a333783ddf4fbdcdec44e903ae4d16f6345 100644
--- a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
+++ b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
@@ -45,6 +45,14 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>Languages</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>ISO3Name</fieldName>
+ </dependency>
+ </entityConsumer>
<entityField>
<name>UID</name>
<state>EDITABLE</state>
@@ -87,6 +95,19 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityField>
+ <name>ISOLANGUAGE</name>
+ <consumer>Languages</consumer>
+ <state>INVISIBLE</state>
+ <valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/isolanguage/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/isolanguage/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>charset</name>
+ <title>Charset</title>
+ <dropDownProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/charset/dropDownProcess.js</dropDownProcess>
+ <state>EDITABLE</state>
+ </entityField>
</entityFields>
<recordContainers>
<datalessRecordContainer>
diff --git a/entity/ExportTemplateSelection_entity/entityfields/charset/dropDownProcess.js b/entity/ExportTemplateSelection_entity/entityfields/charset/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3e47786c24e9684a064259923ad38c356aafaac2
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/entityfields/charset/dropDownProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.object([["UTF-8", "UTF-8"]]);
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/isolanguage/displayValueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/isolanguage/displayValueProcess.js
similarity index 100%
rename from entity/ExportTemplate_entity/entityfields/isolanguage/displayValueProcess.js
rename to entity/ExportTemplateSelection_entity/entityfields/isolanguage/displayValueProcess.js
diff --git a/entity/ExportTemplate_entity/entityfields/isolanguage/valueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/isolanguage/valueProcess.js
similarity index 83%
rename from entity/ExportTemplate_entity/entityfields/isolanguage/valueProcess.js
rename to entity/ExportTemplateSelection_entity/entityfields/isolanguage/valueProcess.js
index 2bb039c219ee635fbd789a66704d4f5dd483dbfb..574a9ebe136046ed2bccfcde532d19ee19ce53b7 100644
--- a/entity/ExportTemplate_entity/entityfields/isolanguage/valueProcess.js
+++ b/entity/ExportTemplateSelection_entity/entityfields/isolanguage/valueProcess.js
@@ -3,4 +3,7 @@ import("system.neon");
import("system.vars");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.getString("$this.value") == null)
- result.string("deu");
\ No newline at end of file
+{
+ result.string("deu");
+}
+
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js b/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js
index 66ee0547575d06eeb39f33b7ede5258e639295dc..0f971c77dd629f6479980c7f816214ec4ca6dbd6 100644
--- a/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js
+++ b/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js
@@ -1,16 +1,30 @@
+import("system.process");
+import("Employee_lib");
import("system.neon");
import("system.vars");
import("ExportTemplate_lib");
var filename = vars.get("$field.FILENAME");
var templateId = vars.get("$field.EXPORTTEMPLATE_ID");
-var selection = vars.get("$field.selection");
+var selection = JSON.stringify(vars.get("$field.selection"));
var comingFrom = vars.get("$field.comingfrom");
+var charset = vars.get("$field.charset");
if(templateId)
{
- var document = ExportTemplateUtils.buildExport(templateId, selection, comingFrom, filename);
- neon.download(document.content, document.filename);
+ var user = EmployeeUtils.getCurrentUserId();
+ var processConfig = process.createStartAsyncConfig()
+ .setName("buildExport_serverProcess")
+ .setLocalVariables({
+ "selection" : selection,
+ "exportTemplateId" : templateId,
+ "charset" : charset,
+ "filename" : filename,
+ "user" : user
+ })
+ .setUser(vars.get("$sys.user"));
+ process.startAsync(processConfig);
//since we do not open something after the download we need to close the window where the action is placed
neon.closeImage(vars.get("$sys.currentimage"), true);
+
}
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
index 48a62cdd0966b6bbe80a745fb17b579bcc982de5..4cea3664caaf81a16515e7a4967cde5cc2270001 100644
--- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod
+++ b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
@@ -36,14 +36,6 @@
<dropDownProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/fieldseparator/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
</entityField>
- <entityField>
- <name>ISOLANGUAGE</name>
- <title>Language</title>
- <consumer>Languages</consumer>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/isolanguage/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/isolanguage/displayValueProcess.js</displayValueProcess>
- </entityField>
<entityField>
<name>DATE_EDIT</name>
<contentType>DATE</contentType>
@@ -63,17 +55,9 @@
<title>Description</title>
<contentType>LONG_TEXT</contentType>
</entityField>
- <entityConsumer>
- <name>Languages</name>
- <dependency>
- <name>dependency</name>
- <entityName>Language_entity</entityName>
- <fieldName>ISO3Name</fieldName>
- </dependency>
- </entityConsumer>
<entityConsumer>
<name>ExportTemplateFields</name>
- <state>EDITABLE</state>
+ <refreshParent v="true" />
<dependency>
<name>dependency</name>
<entityName>ExportTemplateField_entity</entityName>
@@ -81,7 +65,7 @@
</dependency>
<children>
<entityParameter>
- <name>ExportTemplateField_param</name>
+ <name>ExportTemplateId_param</name>
<valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/valueProcess.js</valueProcess>
<expose v="true" />
<documentation>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/documentation.adoc</documentation>
@@ -93,21 +77,6 @@
<valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateids_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
- <entityConsumer>
- <name>ExportTemplateplaceOfUseCon</name>
- <dependency>
- <name>dependency</name>
- <entityName>ExportTemplatePlaceOfUse_entity</entityName>
- <fieldName>ExportTemplatePlaceOfUser</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ExportTemplatePlaceOfUse_param</name>
- <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateplaceofusecon/children/exporttemplateplaceofuse_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
<entityProvider>
<name>ExportTemplateIDs</name>
<documentation>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc</documentation>
@@ -139,8 +108,8 @@
<textInputAllowed v="true" />
</entityField>
<entityField>
- <name>EXPORTTEMPLATE_OBJECTTYPE</name>
- <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplate_objecttype/valueProcess.js</valueProcess>
+ <name>exportTemplateObjectType</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateobjecttype/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -153,6 +122,60 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityConsumer>
+ <name>ExportTemplatePlacesOfUse</name>
+ <refreshParent v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>ExportTemplatePlaceOfUse_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ExportTemplateId_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ExportTemplatePlaceOfUseID_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateplaceofuseid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ExportTemplateMainPlaceOfUse</name>
+ <isOneToOneRelationship v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>ExportTemplatePlaceOfUse_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ExportTemplateId_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplatemainplaceofuse/children/exporttemplateid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>IsMainPlaceOfUse_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplatemainplaceofuse/children/ismainplaceofuse_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ExportTemplateFieldsPreview</name>
+ <documentation>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplatefieldspreview/documentation.adoc</documentation>
+ <state>READONLY</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ExportTemplateField_entity</entityName>
+ <fieldName>ExportTemplateFields</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ExportTemplateId_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplatefieldspreview/children/exporttemplateid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -170,12 +193,6 @@
<name>DATE_NEW.value</name>
<recordfield>EXPORTTEMPLATE.DATE_NEW</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ISOLANGUAGE.value</name>
- <recordfield>EXPORTTEMPLATE.ISOLANGUAGE</recordfield>
- <isFilterable v="true" />
- <isLookupFilter v="true" />
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>EXPORTTEMPLATEID.value</name>
<recordfield>EXPORTTEMPLATE.EXPORTTEMPLATEID</recordfield>
@@ -198,11 +215,6 @@
<name>DESCRIPTION.value</name>
<recordfield>EXPORTTEMPLATE.DESCRIPTION</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ISOLANGUAGE.displayValue</name>
- <isFilterable v="true" />
- <isLookupFilter v="true" />
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TITLE.displayValue</name>
<isFilterable v="true" />
@@ -223,7 +235,7 @@
</recordFieldMappings>
<linkInformation>
<linkInformation>
- <name>ce410f40-846b-43e6-9c30-150393cee43d</name>
+ <name>3b838097-7531-42c2-abee-db95cce7c729</name>
<tableName>EXPORTTEMPLATE</tableName>
<primaryKey>EXPORTTEMPLATEID</primaryKey>
<isUIDTable v="true" />
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplatefieldspreview/children/exporttemplateid_param/valueProcess.js b/entity/ExportTemplate_entity/entityfields/exporttemplatefieldspreview/children/exporttemplateid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3cbc49005642cf289c724b7b2de89a5db926e630
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplatefieldspreview/children/exporttemplateid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.EXPORTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplatefieldspreview/documentation.adoc b/entity/ExportTemplate_entity/entityfields/exporttemplatefieldspreview/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..87813a66bc64775d1518863cda388c18721e1607
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplatefieldspreview/documentation.adoc
@@ -0,0 +1 @@
+This Consumer is a Workaround for the fields in the preview so that they cannot be edited.
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplateplaceofusecon/children/exporttemplateplaceofuse_param/valueProcess.js b/entity/ExportTemplate_entity/entityfields/exporttemplatemainplaceofuse/children/exporttemplateid_param/valueProcess.js
similarity index 100%
rename from entity/ExportTemplate_entity/entityfields/exporttemplateplaceofusecon/children/exporttemplateplaceofuse_param/valueProcess.js
rename to entity/ExportTemplate_entity/entityfields/exporttemplatemainplaceofuse/children/exporttemplateid_param/valueProcess.js
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/invertblacklist_param/valueProcess.js b/entity/ExportTemplate_entity/entityfields/exporttemplatemainplaceofuse/children/ismainplaceofuse_param/valueProcess.js
similarity index 100%
rename from entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/invertblacklist_param/valueProcess.js
rename to entity/ExportTemplate_entity/entityfields/exporttemplatemainplaceofuse/children/ismainplaceofuse_param/valueProcess.js
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplate_objecttype/valueProcess.js b/entity/ExportTemplate_entity/entityfields/exporttemplateobjecttype/valueProcess.js
similarity index 100%
rename from entity/ExportTemplate_entity/entityfields/exporttemplate_objecttype/valueProcess.js
rename to entity/ExportTemplate_entity/entityfields/exporttemplateobjecttype/valueProcess.js
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateid_param/valueProcess.js b/entity/ExportTemplate_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d8e00008de741ec03a1997e0bd169d0acd7f4cc7
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.EXPORTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateplaceofuseid_param/valueProcess.js b/entity/ExportTemplate_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateplaceofuseid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9bdc0c36bbda23a5a14dc48d29423e1979f0ee01
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplateplacesofuse/children/exporttemplateplaceofuseid_param/valueProcess.js
@@ -0,0 +1,9 @@
+import("Entity_lib");
+import("system.result");
+
+// Transfer of the UID of the main place of use with the help of the consumer.
+result.string(new EntityConsumerRowsHelper()
+ .consumer("ExportTemplateMainPlaceOfUse")
+ .fetchRowsFromConsumer()
+ .getRows()[0]["#UID"]);
+
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js b/entity/ExportTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
index 57784ebda7e75d58197542d071b5afb2a61cc74e..3832b22bd97d302fcdf45333a3240016072281d2 100644
--- a/entity/ExportTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
+++ b/entity/ExportTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
@@ -6,7 +6,7 @@ import("Sql_lib");
var operator = vars.get("$local.operator");
var rawvalue = vars.get("$local.rawvalue");
-var objecttype = vars.get("$field.EXPORTTEMPLATE_OBJECTTYPE");
+var objecttype = vars.get("$field.exportTemplateObjectType");
var idcolumn = "EXPORTTEMPLATE.EXPORTTEMPLATEID";
result.string(FavoritesUtil.getFilterDisplayCondition(objecttype, operator, rawvalue, idcolumn));
\ No newline at end of file
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index d6a3a8231f161f09c2ed372c5d094f42be4542c1..a596f7e006fc85e895b9fa6c94b204c646819060 100644
--- a/entity/Forecast_entity/Forecast_entity.aod
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -4,6 +4,7 @@
<title>${FORECAST_ENGLISH}</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Forecast_entity/documentation.adoc</documentation>
+ <afterSave>%aditoprj%/entity/Forecast_entity/afterSave.js</afterSave>
<titlePlural>Forecasts</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
diff --git a/entity/Forecast_entity/afterSave.js b/entity/Forecast_entity/afterSave.js
new file mode 100644
index 0000000000000000000000000000000000000000..5465a06689922c673973a24fdfa5ba111c79d42d
--- /dev/null
+++ b/entity/Forecast_entity/afterSave.js
@@ -0,0 +1,21 @@
+import("system.entities");
+import("Sql_lib");
+import("system.vars");
+
+var objectType = vars.get("$field.OBJECT_TYPE");
+if(objectType == "Salesproject")
+{
+ var objectRowId = vars.get("$field.OBJECT_ROWID");
+ var volume = newSelect("sum(VOLUME)")
+ .from("FORECAST")
+ .where("FORECAST.OBJECT_TYPE", "Salesproject")
+ .and("FORECAST.OBJECT_ROWID", objectRowId)
+ .cell();
+
+ var config = entities.createConfigForUpdatingRows()
+ .uid(objectRowId)
+ .addParameter("IgnoreChecklists_param", true)
+ .fieldValues({"VOLUME": volume})
+ .entity("Salesproject_entity");
+ entities.updateRow(config);
+}
\ No newline at end of file
diff --git a/entity/InboxEmployeegroupRelation_entity/InboxEmployeegroupRelation_entity.aod b/entity/InboxEmployeegroupRelation_entity/InboxEmployeegroupRelation_entity.aod
index 4bd204d10578d094b7334eb88b79edc1e3c08d80..bf862f146661c7997f952d398ddf0b1060464017 100644
--- a/entity/InboxEmployeegroupRelation_entity/InboxEmployeegroupRelation_entity.aod
+++ b/entity/InboxEmployeegroupRelation_entity/InboxEmployeegroupRelation_entity.aod
@@ -19,6 +19,7 @@
<title>Employee Group</title>
<consumer>EmployeesGroupsForCompanyGroup</consumer>
<displayValueProcess>%aditoprj%/entity/InboxEmployeegroupRelation_entity/entityfields/employeegroup_id/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/InboxEmployeegroupRelation_entity/entityfields/employeegroup_id/onValidation.js</onValidation>
</entityField>
<entityField>
<name>INBOX_ID</name>
diff --git a/entity/InboxEmployeegroupRelation_entity/entityfields/employeegroup_id/onValidation.js b/entity/InboxEmployeegroupRelation_entity/entityfields/employeegroup_id/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..a221833a595548cdf760326ff6ee505bba243ffd
--- /dev/null
+++ b/entity/InboxEmployeegroupRelation_entity/entityfields/employeegroup_id/onValidation.js
@@ -0,0 +1,19 @@
+import("system.neon");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+
+var sql = new SqlBuilder()
+ .selectCount("EMPLOYEEGROUP_ID")
+ .from("INBOX_EMPLOYEEGROUP_RELATION")
+ .where("INBOX_EMPLOYEEGROUP_RELATION.EMPLOYEEGROUP_ID", vars.get("$field.EMPLOYEEGROUP_ID"))
+ .and("INBOX_EMPLOYEEGROUP_RELATION.INBOX_ID", vars.get("$field.INBOX_ID"))
+ .andIfSet("INBOX_EMPLOYEEGROUP_RELATION.INBOX_EMPLOYEEGROUP_RELATIONID", vars.get("$field.INBOX_EMPLOYEEGROUP_RELATIONID"),SqlBuilder.NOT_EQUAL())
+ .cell();
+
+if (sql > 0)
+{
+ result.string(translate.text("Employee group already selected") + ".");
+}
\ No newline at end of file
diff --git a/entity/InboxFilterGroupRelation_entity/InboxFilterGroupRelation_entity.aod b/entity/InboxFilterGroupRelation_entity/InboxFilterGroupRelation_entity.aod
index 633b529675e5237b28a01282ffb3ab5e539bb03f..bc52ff958a5b667ab02683c038b38a9e23ab1619 100644
--- a/entity/InboxFilterGroupRelation_entity/InboxFilterGroupRelation_entity.aod
+++ b/entity/InboxFilterGroupRelation_entity/InboxFilterGroupRelation_entity.aod
@@ -16,6 +16,8 @@
<name>INBOXFILTERGROUP_ID</name>
<title>Inbox filter group</title>
<consumer>InboxFilterGroups</consumer>
+ <displayValueProcess>%aditoprj%/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroup_id/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroup_id/onValidation.js</onValidation>
</entityField>
<entityField>
<name>INBOX_ID</name>
@@ -78,7 +80,6 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>INBOXFILTERGROUP_ID.displayValue</name>
- <expression>%aditoprj%/entity/InboxFilterGroupRelation_entity/recordcontainers/db/recordfieldmappings/inboxfiltergroup_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
diff --git a/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroup_id/displayValueProcess.js b/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroup_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0f2db0bf1cddbe8f3c565406b434296eece29489
--- /dev/null
+++ b/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroup_id/displayValueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+result.string(newSelect("NAME")
+.from("INBOXFILTERGROUP")
+.where("INBOXFILTERGROUP.INBOXFILTERGROUPID", vars.get("$field.INBOXFILTERGROUP_ID")).cell());
\ No newline at end of file
diff --git a/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroup_id/onValidation.js b/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroup_id/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..1d234c44a60d6d854f716b853f947d021ea8e13d
--- /dev/null
+++ b/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroup_id/onValidation.js
@@ -0,0 +1,17 @@
+import("system.neon");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var sql = new SqlBuilder()
+ .selectCount("INBOXFILTERGROUP_ID")
+ .from("INBOXFILTERGROUP_RELATION")
+ .where("INBOXFILTERGROUP_RELATION.INBOXFILTERGROUP_ID", vars.get("$field.INBOXFILTERGROUP_ID"))
+ .cell();
+
+if (sql > 0)
+{
+ result.string(translate.text("Rulegroup already selected") + ".");
+}
+
diff --git a/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroups/children/excludeinboxfiltergroups_param/valueProcess.js b/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroups/children/excludeinboxfiltergroups_param/valueProcess.js
index 52e04d7128121199cd05f34d3d5a6181f35c4f45..e743c07a2228759bd7bbde62ba333bafdabb1458 100644
--- a/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroups/children/excludeinboxfiltergroups_param/valueProcess.js
+++ b/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroups/children/excludeinboxfiltergroups_param/valueProcess.js
@@ -1,9 +1,11 @@
import("system.result");
import("system.vars");
+import("Sql_lib");
var sql = new SqlBuilder()
.select("INBOXFILTERGROUP_RELATION.INBOXFILTERGROUP_ID")
.from("INBOXFILTERGROUP_RELATION")
- .where("INBOX_ID", vars.get("$param.InboxId_param"))
- .arrayColumn();
-result.object(sql);
\ No newline at end of file
+ .where("INBOXFILTERGROUP_RELATION.INBOX_ID", vars.get("$param.InboxId_param"))
+ .arrayColumn();
+
+result.object(sql);
diff --git a/entity/InboxFilterGroupRelation_entity/recordcontainers/db/recordfieldmappings/inboxfiltergroup_id.displayvalue/expression.js b/entity/InboxFilterGroupRelation_entity/recordcontainers/db/recordfieldmappings/inboxfiltergroup_id.displayvalue/expression.js
deleted file mode 100644
index 234d5690451a6793590572b93a2e69423ab4c277..0000000000000000000000000000000000000000
--- a/entity/InboxFilterGroupRelation_entity/recordcontainers/db/recordfieldmappings/inboxfiltergroup_id.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Sql_lib");
-
-result.string(newSelect("NAME")
-.from("INBOXFILTERGROUP")
-.where("INBOXFILTERGROUPID = INBOXFILTERGROUP_ID").toString());
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod b/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod
index a57f3d4421506abc8cacb5a7eb37236042ff4b64..e5c6a604f7c1fc270baf9f25ad5de3bd3df6b99f 100644
--- a/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod
+++ b/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod
@@ -26,6 +26,7 @@
<name>NAME</name>
<title>Name</title>
<mandatory v="true" />
+ <onValidation>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/name/onValidation.js</onValidation>
</entityField>
<entityField>
<name>DATE</name>
@@ -75,6 +76,9 @@
<name>PRIORITY</name>
<title>Priority</title>
<contentType>NUMBER</contentType>
+ <maxValue v="9999" />
+ <minValue v="1" />
+ <inputFormat>#</inputFormat>
<onValidation>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/priority/onValidation.js</onValidation>
</entityField>
<entityProvider>
diff --git a/entity/InboxFilterGroup_entity/entityfields/name/onValidation.js b/entity/InboxFilterGroup_entity/entityfields/name/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..5f2a7b84bb1a7be48d3319a6978042734c878416
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/entityfields/name/onValidation.js
@@ -0,0 +1,19 @@
+import("system.neon");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ var sql = new SqlBuilder()
+ .selectCount("NAME")
+ .from("INBOXFILTERGROUP")
+ .where("INBOXFILTERGROUP.NAME", vars.get("$field.NAME"))
+ .cell();
+
+ if (sql > 0)
+ {
+ result.string(translate.text("Name has to be unique") + ".");
+ }
+}
diff --git a/entity/InboxFilterGroup_entity/recordcontainers/db/conditionProcess.js b/entity/InboxFilterGroup_entity/recordcontainers/db/conditionProcess.js
index 79067f745f39cc71feb32de8cf86a3d9bfb87290..e729ee44133e252a15704c57c27d24bcaab28182 100644
--- a/entity/InboxFilterGroup_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/InboxFilterGroup_entity/recordcontainers/db/conditionProcess.js
@@ -1,8 +1,13 @@
+import("system.vars");
import("system.result");
import("Sql_lib");
-var cond = newWhereIfSet("INBOXFILTERGROUP.INBOXFILTERGROUPID", "$param.ExcludeInboxFilterGroups_param",SqlBuilder.NOT_IN());
+if (vars.get("$param.ExcludeInboxFilterGroups_param"))
+{
+ var cond = newWhereIfSet("INBOXFILTERGROUP.INBOXFILTERGROUPID", [vars.get("$param.ExcludeInboxFilterGroups_param")],SqlBuilder.NOT_IN());
+ result.string(cond.toString());
+}
+
+
-result.string(cond.toString());
-
diff --git a/entity/Inbox_entity/Inbox_entity.aod b/entity/Inbox_entity/Inbox_entity.aod
index 4dafa5bfcb40428b30f89912a583ce12cca3034a..40918ab17a08543a1133feb0e3b085b96b8ab04f 100644
--- a/entity/Inbox_entity/Inbox_entity.aod
+++ b/entity/Inbox_entity/Inbox_entity.aod
@@ -4,6 +4,7 @@
<title>Inboxes</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Inbox_entity/documentation.adoc</documentation>
+ <grantDelete v="false" />
<contentTitleProcess>%aditoprj%/entity/Inbox_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:ENVELOPES</iconId>
<imageProcess>%aditoprj%/entity/Inbox_entity/imageProcess.js</imageProcess>
@@ -20,11 +21,13 @@
<name>INBOXNAME</name>
<title>Name</title>
<mandatory v="true" />
+ <onValidation>%aditoprj%/entity/Inbox_entity/entityfields/inboxname/onValidation.js</onValidation>
</entityField>
<entityField>
<name>EMAILADDRESS</name>
<title>E-Mail Adresse</title>
<mandatory v="true" />
+ <onValidation>%aditoprj%/entity/Inbox_entity/entityfields/emailaddress/onValidation.js</onValidation>
</entityField>
<entityField>
<name>INBOXDATE</name>
@@ -119,7 +122,7 @@
<dependency>
<name>dependency</name>
<entityName>SupportTicket_entity</entityName>
- <fieldName>TicketsProvider</fieldName>
+ <fieldName>SupportTickets</fieldName>
</dependency>
<children>
<entityParameter>
@@ -201,12 +204,26 @@
<titleProcess>%aditoprj%/entity/Inbox_entity/entityfields/closure_dayspreview/titleProcess.js</titleProcess>
<displayValueProcess>%aditoprj%/entity/Inbox_entity/entityfields/closure_dayspreview/displayValueProcess.js</displayValueProcess>
</entityField>
+ <entityActionGroup>
+ <name>deleteActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>deleteInbox</name>
+ <title>Delete Inbox</title>
+ <onActionProcess>%aditoprj%/entity/Inbox_entity/entityfields/deleteactiongroup/children/deleteinbox/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <selectionType>UNBOUND</selectionType>
+ <iconId>NEON:TRASH</iconId>
+ <titleProcess>%aditoprj%/entity/Inbox_entity/entityfields/deleteactiongroup/children/deleteinbox/titleProcess.js</titleProcess>
+ <tooltipProcess>%aditoprj%/entity/Inbox_entity/entityfields/deleteactiongroup/children/deleteinbox/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<conditionProcess>%aditoprj%/entity/Inbox_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <onDBDelete>%aditoprj%/entity/Inbox_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
diff --git a/entity/Inbox_entity/entityfields/deleteactiongroup/children/deleteinbox/onActionProcess.js b/entity/Inbox_entity/entityfields/deleteactiongroup/children/deleteinbox/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..870ad8d179c7c96b10b89ffadcdfc571f4010857
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/deleteactiongroup/children/deleteinbox/onActionProcess.js
@@ -0,0 +1,20 @@
+import("system.neon");
+import("system.translate");
+import("system.question");
+import("system.vars");
+import("system.db");
+import("Sql_lib");
+
+var answer = question.askYesNo(translate.text("Confirmation dialog"), translate.withArguments("Do you really want to delete \"%0\"? If tickets still use this inbox, this might cause problems.", [vars.get("$field.INBOXNAME")]), false);
+
+if (answer == true){
+ if (vars.get("$field.INBOXID"))
+ {
+ newWhereIfSet("INBOX.INBOXID", "$field.INBOXID").deleteData(true, "INBOX");
+ newWhereIfSet("INBOX_EMPLOYEEGROUP_RELATION.INBOX_ID", "$field.INBOXID").deleteData(true, "INBOX_EMPLOYEEGROUP_RELATION");
+ newWhereIfSet("INBOXFILTERGROUP_RELATION.INBOX_ID","$field.INBOXID").deleteData(true, "INBOXFILTERGROUP_RELATION");
+
+ question.showMessage(translate.withArguments("Inbox \"%0\" has been deleted.", [vars.get("$field.INBOXNAME")]), question.INFORMATION, translate.text("Successful"));
+ neon.refresh();
+ }
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/deleteactiongroup/children/deleteinbox/titleProcess.js b/entity/Inbox_entity/entityfields/deleteactiongroup/children/deleteinbox/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4c735eec0a19f45f6fb85acf727bdc1167ac935e
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/deleteactiongroup/children/deleteinbox/titleProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.result");
+
+
+result.string(translate.text("Delete Inbox"));
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/deleteactiongroup/children/deleteinbox/tooltipProcess.js b/entity/Inbox_entity/entityfields/deleteactiongroup/children/deleteinbox/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..aab4212fb6f2124ccf2bd5c28a309bc54d09ec4b
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/deleteactiongroup/children/deleteinbox/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Remove Inbox and it's occurance in Tickets."));
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/emailaddress/onValidation.js b/entity/Inbox_entity/entityfields/emailaddress/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..507d9d8532a1cbac486f4f2b758dcc2ccce54883
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/emailaddress/onValidation.js
@@ -0,0 +1,37 @@
+import("KeywordRegistry_basic");
+import("Communication_lib");
+import("Keyword_lib");
+import("system.neon");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var sql = new SqlBuilder()
+ .selectCount("EMAIL_ADDRESS")
+ .from("INBOX")
+ .where("INBOX.EMAIL_ADDRESS", vars.get("$field.EMAILADDRESS"))
+ .andIfSet("INBOX.INBOXID", vars.get("$field.INBOXID"),SqlBuilder.NOT_EQUAL())
+ .cell();
+if (sql > 0)
+{
+ result.string(translate.text("Email address has to be unique") + ".");
+}
+
+var commMedium = "COMMEMAIL";
+
+var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(commMedium, $KeywordRegistry.communicationMedium());
+var commCategory = keywordAttributes.contentType || "TEXT";
+
+var fn = CommValidationUtil.makeValidationFn(commCategory);
+if (fn != null)
+{
+ var commAddr = vars.get("$local.value");
+ var additional = CommValidationUtil.getExtensionsBlueprint();
+
+ var res = fn.call(null, commAddr, additional);
+ if (res != null)
+ {
+ result.string(res);
+ }
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/inboxname/onValidation.js b/entity/Inbox_entity/entityfields/inboxname/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..473fa0fa759bda8d0267ec9390156f30f0f688ce
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/inboxname/onValidation.js
@@ -0,0 +1,17 @@
+import("system.neon");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var sql = new SqlBuilder()
+ .selectCount("NAME")
+ .from("INBOX")
+ .where("INBOX.NAME", vars.get("$field.INBOXNAME"))
+ .andIfSet("INBOX.INBOXID", vars.get("$field.INBOXID"),SqlBuilder.NOT_EQUAL())
+ .cell();
+
+if (sql > 0)
+{
+ result.string(translate.text("Name has to be unique") + ".");
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/recordcontainers/db/onDBDelete.js b/entity/Inbox_entity/recordcontainers/db/onDBDelete.js
deleted file mode 100644
index 822cd6d44276a07416ff880be0be41a469ec0100..0000000000000000000000000000000000000000
--- a/entity/Inbox_entity/recordcontainers/db/onDBDelete.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("Sql_lib");
-import("system.vars");
-import("system.db");
-
-let inboxID = vars.getString("$field.INBOXID");
-if(inboxID)
-{
- newWhereIfSet("INBOX_EMPLOYEEGROUP_RELATION.INBOX_ID", inboxID).deleteData();
- newWhereIfSet("INBOXFIITERGROUP_RELATION.INBOX_ID",inboxID).deleteData();
-}
\ No newline at end of file
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index ca8ce950d521606798a60856041330c7d396a368..b928cf5d32e9ff7583f67b026d9eec857d701b2e 100644
--- a/entity/Letter_entity/Letter_entity.aod
+++ b/entity/Letter_entity/Letter_entity.aod
@@ -40,6 +40,7 @@
<entityParameter>
<name>IncludeDocumentTemplateIds_param</name>
<valueProcess>%aditoprj%/entity/Letter_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js</valueProcess>
+ <title></title>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js b/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js
index 3e13e00bc051c6f70f830b1c02ab242268887787..489ff072d50288d03c732806a74e476c8eb99807 100644
--- a/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js
+++ b/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js
@@ -1,9 +1,4 @@
import("system.vars");
import("system.result");
-var actionName = vars.get("$param.ActionName_param")
-
-if(actionName != "ServiceLetter")
-{
- result.string(vars.get("$field.comingfrom"));
-}
\ No newline at end of file
+result.string(vars.get("$field.comingfrom"));
\ No newline at end of file
diff --git a/entity/Letter_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js b/entity/Letter_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js
index 2db34ec5ae810d121fdab2280e91c78d72f5d1a2..11178b6b4c4b3854d383a9067877120aed771ccd 100644
--- a/entity/Letter_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js
+++ b/entity/Letter_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js
@@ -1,10 +1,4 @@
-import("system.vars");
import("KeywordRegistry_basic");
import("system.result");
-var actionName = vars.get("$param.ActionName_param")
-
-if (actionName != "ServiceLetter")
-{
- result.string($KeywordRegistry.documentTemplateType$letter());
-}
\ No newline at end of file
+result.string($KeywordRegistry.documentTemplateType$letter());
diff --git a/entity/Letter_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js b/entity/Letter_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js
index 87c558625abc2db1e8a706eecbeadc6335f2ccd2..2411e8b9b345db0ed5e6aa25842d28daec667994 100644
--- a/entity/Letter_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js
+++ b/entity/Letter_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js
@@ -11,10 +11,14 @@ if (actionName == "ServiceLetter")
documenttemplates = newSelect("DOCUMENTTEMPLATEID")
.from("DOCUMENTTEMPLATE")
.leftJoin("DOCUMENTTEMPLATE_TICKETCATEGORY", "DOCUMENTTEMPLATE_ID = DOCUMENTTEMPLATEID")
- .whereIfSet("DOCUMENTTEMPLATE.KIND", $KeywordRegistry.documentTemplateType$letter())
- .andIfSet("DOCUMENTTEMPLATE_TICKETCATEGORY.CLASSIFICATION", "$param.TicketCategory_param")
- .or("DOCUMENTTEMPLATE.CLASSIFICATION", 10)
+ .where("DOCUMENTTEMPLATE.KIND", $KeywordRegistry.documentTemplateType$letter())
+ .and(newWhere()
+ .or("DOCUMENTTEMPLATE.CLASSIFICATION", $KeywordRegistry.documentTemplateTypeCategory$singleall())
+ .or("DOCUMENTTEMPLATE.CLASSIFICATION", $KeywordRegistry.documentTemplateTypeCategory$singleinternal())
+ .or("DOCUMENTTEMPLATE.CLASSIFICATION", $KeywordRegistry.documentTemplateTypeCategory$singleexternal()))
+ .and(newWhere()
.or("DOCUMENTTEMPLATE.ALL_TICKET_CATEGORIES", 1)
+ .or("DOCUMENTTEMPLATE_TICKETCATEGORY.CLASSIFICATION", "$param.TicketCategory_param"))
.arrayColumn();
result.string(JSON.stringify(documenttemplates));
}
diff --git a/entity/MailSignature_entity/entityfields/mail_address/onValidation.js b/entity/MailSignature_entity/entityfields/mail_address/onValidation.js
index 02cab60da6883adeb8db01a91e73c5517ad83657..58b3402b3df4874097c94f5b50adbe94fa44aac8 100644
--- a/entity/MailSignature_entity/entityfields/mail_address/onValidation.js
+++ b/entity/MailSignature_entity/entityfields/mail_address/onValidation.js
@@ -1,9 +1,23 @@
+import("Sql_lib");
+import("system.translate");
+import("system.neon");
import("system.result");
import("Communication_lib");
import("system.vars");
import("KeywordRegistry_basic");
import("Keyword_lib");
+var sql = new SqlBuilder()
+ .selectCount("MAIL_ADDRESS")
+ .from("MAILSIGNATURE")
+ .where("MAILSIGNATURE.MAIL_ADDRESS", vars.get("$field.MAIL_ADDRESS"))
+ .andIfSet("MAILSIGNATURE.MAILSIGNATUREID", vars.get("$field.MAILSIGNATUREID"),SqlBuilder.NOT_EQUAL())
+ .cell();
+
+if (sql > 0)
+{
+ result.string(translate.text("Email address has to be unique") + ".");
+}
var commMedium = "COMMEMAIL";
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 5c1fd6ebd52ac41949e646f2052f92d15621a2fa..592118582b0fd365988013d8d85f9a6450832ed7 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -24,7 +24,6 @@
<consumer>Contacts</consumer>
<linkedContext>Person</linkedContext>
<mandatory v="true" />
- <dropDownProcess>%aditoprj%/entity/Member_entity/entityfields/contact_id/dropDownProcess.js</dropDownProcess>
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
diff --git a/entity/Member_entity/entityfields/contact_id/dropDownProcess.js b/entity/Member_entity/entityfields/contact_id/dropDownProcess.js
deleted file mode 100644
index e04712f9964d01c3585f846d62f43a8ec9c2a17b..0000000000000000000000000000000000000000
--- a/entity/Member_entity/entityfields/contact_id/dropDownProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-//This dropDownProcess exists, even though the fieldState is READONLY.
-//-->So we can use it when using the filter
-var res = KeywordUtils.getEntryNamesByContainer($KeywordRegistry.contactPosition()).map(function (e){
- return [e, e]; //currently the first column is ID, second view value - which is the same because there is no ID for keyword-containers
-});
-
-result.object(res);
\ No newline at end of file
diff --git a/entity/Observation_entity/entityfields/contexts/children/blacklist_param/valueProcess.js b/entity/Observation_entity/entityfields/contexts/children/blacklist_param/valueProcess.js
index ce4ed3a334253f41bc34a9e5751e2e316485f481..37a3f5dbb180129c0cac6bf9f33e23c5ba05cc0f 100644
--- a/entity/Observation_entity/entityfields/contexts/children/blacklist_param/valueProcess.js
+++ b/entity/Observation_entity/entityfields/contexts/children/blacklist_param/valueProcess.js
@@ -13,4 +13,4 @@ if (vars.get("$field.OBSERVATION_ID"))
.cell();
}
-result.object(Observation.getAllContextValue(type));
\ No newline at end of file
+ result.object(Observation.getAllContextValue(type));
\ No newline at end of file
diff --git a/entity/Observation_entity/entityfields/object_filter/valueProcess.js b/entity/Observation_entity/entityfields/object_filter/valueProcess.js
index df026f7192e7752d7364fa8739aad1c0973d3acc..5df8f1ef2df62ce0338c8c20c8521e697d088342 100644
--- a/entity/Observation_entity/entityfields/object_filter/valueProcess.js
+++ b/entity/Observation_entity/entityfields/object_filter/valueProcess.js
@@ -1,5 +1,5 @@
+import("JditoFilter_lib");
import("Observation_lib");
-import("Context_lib");
import("system.vars");
import("system.result");
@@ -8,7 +8,7 @@ let resFilter;
if ((vars.get("$this.value") == null || vars.get("$this.value") == "") && vars.get("$field.OBJECT_TYPE") && !vars.get("$field.OBJECT_ID") && !filterParam)
{
- resFilter = Observation.getContextFilter(vars.get("$field.OBJECT_TYPE"), null);
+ resFilter = JditoFilterUtils.getContextFilter(vars.get("$field.OBJECT_TYPE"), null);
}
else if (!vars.get("$this.value") && filterParam)
{
diff --git a/entity/Observation_entity/recordcontainers/db/onDBInsert.js b/entity/Observation_entity/recordcontainers/db/onDBInsert.js
index aa3b524a0b205afb4d6793903fc229447669fc89..18326447c59744ab1733c0474408dc6969ccbbcd 100644
--- a/entity/Observation_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Observation_entity/recordcontainers/db/onDBInsert.js
@@ -1,3 +1,4 @@
+import("JditoFilter_lib");
import("system.vars");
import("Observation_lib");
import("system.entities");
@@ -14,7 +15,7 @@ if (vars.get("$field.includeDependencies") == "1")
"OBJECT_FIELD" : Observation.getAllFieldValue(contextID).toString(),
"includeDependencies" : false,
"OBSERVATION_ID" : observation_id,
- "OBJECT_FILTER" : Observation.getContextFilter(contextID, null)
+ "OBJECT_FILTER" : JditoFilterUtils.getContextFilter(contextID, null)
}
let createRowConfig = entities.createConfigForAddingRows()
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index f6b1857720a6695d4ceb61e27984b1cec0b6f04c..3a3141a0516d08027b51893b5a2f7622a427cf85 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -18,6 +18,17 @@
<titlePlural>Offers</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
+ <entityActionField>
+ <name>export</name>
+ <title>Export</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/export/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <iconId>NEON:EXPORT</iconId>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/export/stateProcess.js</stateProcess>
+ <tooltip>Export fields of this table</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Offer_entity/entityfields/export/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
@@ -61,14 +72,14 @@
<entityField>
<name>PROBABILITY</name>
<title>Probability</title>
- <consumer>KeywordProbabilityOffer</consumer>
<contentType>NUMBER</contentType>
<maxValue v="100" />
<minValue v="0" />
<outputFormat>0'%'</outputFormat>
<groupable v="true" />
+ <dropDownProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/dropDownProcess.js</dropDownProcess>
+ <textInputAllowed v="false" />
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>STATUS</name>
diff --git a/entity/Offer_entity/entityfields/export/onActionProcess.js b/entity/Offer_entity/entityfields/export/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6c68dcef71d0a7db12fd4d25819640764899dbad
--- /dev/null
+++ b/entity/Offer_entity/entityfields/export/onActionProcess.js
@@ -0,0 +1,11 @@
+import("ExportTemplate_lib");
+import("system.vars");
+
+var selection = vars.get("$sys.selection");
+
+if(selection.length == 0) //no selection -> use Filtercondition;
+{
+ selection = vars.get("$sys.filter");
+}
+
+ExportTemplateUtils.addParticipants(JSON.stringify(selection), vars.get("$sys.currentcontextname"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/export/stateProcess.js b/entity/Offer_entity/entityfields/export/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7fc578ee7942eeb948f08d3dd86f5950d3fa1c41
--- /dev/null
+++ b/entity/Offer_entity/entityfields/export/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("FilterViewAction_lib");
+import("system.vars");
+
+var contactCount = vars.get("$sys.datarowcount");
+
+result.string(FilterViewActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/export/tooltipProcess.js b/entity/Offer_entity/entityfields/export/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4aaaed5c074ef854441aa45e3e7993b2f77c04c4
--- /dev/null
+++ b/entity/Offer_entity/entityfields/export/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Export columns using a exporttemplate"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/probability/dropDownProcess.js b/entity/Offer_entity/entityfields/probability/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..552d50268008ae0f21578c5984e1a6cac636dd1d
--- /dev/null
+++ b/entity/Offer_entity/entityfields/probability/dropDownProcess.js
@@ -0,0 +1,17 @@
+import("system.result");
+import("Sql_lib");
+
+//needed because we want to
+//1. have a dropdown with the valeus defined at the keyword
+//2. be able to have text input to specify other values
+//3. while still making it possible to filter using both the dropdown and userinput
+//
+//It is possible to do the first two ones with a normal keyword consumer without using a dropdown. We do need the dropDown instead of using a normal consumer to also make the third one possible.
+var sqlHelper = new SqlMaskingUtils();
+var sql = newSelect(["AB_KEYWORD_ENTRY.KEYID", sqlHelper.concatenate(["AB_KEYWORD_ENTRY.KEYID", "'%'"])])
+ .from("AB_KEYWORD_ENTRY")
+ .where("AB_KEYWORD_ENTRY.CONTAINER", "ProbabilityOffer")
+ .and("AB_KEYWORD_ENTRY.ISACTIVE", "1")
+ .orderBy("SORTING").table()
+
+result.object(sql);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/probability/valueProcess.js b/entity/Offer_entity/entityfields/probability/valueProcess.js
deleted file mode 100644
index 9ae444393cd06e0831d37db9c44162cbfff4b19e..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/probability/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-{
- result.string("0");
-}
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 289f5890fd4f0cff3ee3b45aab0913c6931ec22a..f87373f7ec8272b903ee9f9a1aa65cc9ce297d42 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -401,6 +401,10 @@
<name>PRODUCT_ID.displayValue</name>
<expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISCOUNT.displayValue</name>
+ <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/discount.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/discount.displayvalue/expression.js b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/discount.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..171a4725655b52380e1aaaaaa368a4e81ca423fd
--- /dev/null
+++ b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/discount.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Sql_lib");
+
+result.string(SqlBuilder.caseWhen(newWhere("OFFERITEM.DISCOUNT is null")).then("0").elseValue("OFFERITEM.DISCOUNT").toString());
\ No newline at end of file
diff --git a/entity/OrderLink_entity/OrderLink_entity.aod b/entity/OrderLink_entity/OrderLink_entity.aod
index 31ef46c5af384b5db5df4961ab7df4c10e27876b..71dc81b9a775fddabd6f524c94ff39520fed7c1c 100644
--- a/entity/OrderLink_entity/OrderLink_entity.aod
+++ b/entity/OrderLink_entity/OrderLink_entity.aod
@@ -100,32 +100,42 @@
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
+ <recordfield>SALESORDERLINK.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_NEW.value</name>
+ <recordfield>SALESORDERLINK.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OBJECT_ROWID.value</name>
+ <recordfield>SALESORDERLINK.OBJECT_ROWID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OBJECT_TYPE.value</name>
+ <recordfield>SALESORDERLINK.OBJECT_TYPE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SALESORDER_ID.value</name>
+ <recordfield>SALESORDERLINK.SALESORDER_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SALESORDERLINKID.value</name>
+ <recordfield>SALESORDERLINK.SALESORDERLINKID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_EDIT.value</name>
+ <recordfield>SALESORDERLINK.USER_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
+ <recordfield>SALESORDERLINK.USER_NEW</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
- <name>ee3c9a6f-53e4-4579-b2b8-994913cba502</name>
+ <name>7db945ec-4717-4c06-b462-a28dc35f4411</name>
+ <tableName>SALESORDERLINK</tableName>
+ <primaryKey>SALESORDERLINKID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
diff --git a/entity/Order_entity/entityfields/chosenpaymentaddress/onValueChange.js b/entity/Order_entity/entityfields/chosenpaymentaddress/onValueChange.js
index 939aea52612434f5450d2f2a56cafdb07de0f079..03a7b02e08cb1b622f5b3bb716870c93b8246d64 100644
--- a/entity/Order_entity/entityfields/chosenpaymentaddress/onValueChange.js
+++ b/entity/Order_entity/entityfields/chosenpaymentaddress/onValueChange.js
@@ -8,7 +8,10 @@ var newAddressId = vars.get("$local.value");
if (newAddressId)
{
neon.setFieldValue("$field.PAYMENTADDRESS", AddressUtils.getAddressById(newAddressId));
- neon.setFieldValue("$field.ChosenDeliveryAddress", newAddressId);
- neon.setFieldValue("$field.DELIVERYADDRESS", AddressUtils.getAddressById(newAddressId));
+ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ {
+ neon.setFieldValue("$field.ChosenDeliveryAddress", newAddressId);
+ neon.setFieldValue("$field.DELIVERYADDRESS", AddressUtils.getAddressById(newAddressId));
+ }
}
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
index ecad88623a921908ff07c1929560d806ff8c440d..6c68dcef71d0a7db12fd4d25819640764899dbad 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
@@ -1,14 +1,11 @@
import("ExportTemplate_lib");
import("system.vars");
-var sysSelection = vars.get("$sys.selection");
+var selection = vars.get("$sys.selection");
-if(sysSelection.length > 0) //if data selected -> use selected data
+if(selection.length == 0) //no selection -> use Filtercondition;
{
- ExportTemplateUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), vars.get("$sys.currentcontextname"));
+ selection = vars.get("$sys.filter");
}
-else //else -> use Filtercondition
-{
- let sysFilter = vars.get("$sys.filter");
- ExportTemplateUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
-}
\ No newline at end of file
+
+ExportTemplateUtils.addParticipants(JSON.stringify(selection), vars.get("$sys.currentcontextname"));
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 5668029cc950db0f04026a5a0abf6b8ce60676f4..057d30016a75808bf365324c215ef214b43c29ea 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1375,7 +1375,7 @@
<dependency>
<name>dependency</name>
<entityName>SupportTicket_entity</entityName>
- <fieldName>TicketsProvider</fieldName>
+ <fieldName>SupportTickets</fieldName>
</dependency>
<children>
<entityParameter>
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
index ecad88623a921908ff07c1929560d806ff8c440d..6c68dcef71d0a7db12fd4d25819640764899dbad 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
@@ -1,14 +1,11 @@
import("ExportTemplate_lib");
import("system.vars");
-var sysSelection = vars.get("$sys.selection");
+var selection = vars.get("$sys.selection");
-if(sysSelection.length > 0) //if data selected -> use selected data
+if(selection.length == 0) //no selection -> use Filtercondition;
{
- ExportTemplateUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), vars.get("$sys.currentcontextname"));
+ selection = vars.get("$sys.filter");
}
-else //else -> use Filtercondition
-{
- let sysFilter = vars.get("$sys.filter");
- ExportTemplateUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
-}
\ No newline at end of file
+
+ExportTemplateUtils.addParticipants(JSON.stringify(selection), vars.get("$sys.currentcontextname"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/serviceticket/children/returnempty_param/valueProcess.js b/entity/Person_entity/entityfields/serviceticket/children/returnempty_param/valueProcess.js
index b691020ed6224d159383287eb2b841b9d5d225bd..dc28dd1668428cd72a6afb49c02147bd36f8ba42 100644
--- a/entity/Person_entity/entityfields/serviceticket/children/returnempty_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/serviceticket/children/returnempty_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.result");
-result.string( true);
\ No newline at end of file
+result.string( false);
\ No newline at end of file
diff --git a/entity/QuickEntry_entity/entityfields/quickentrysupporttickets/children/returnempty_param/valueProcess.js b/entity/QuickEntry_entity/entityfields/supporttickets/children/returnempty_param/valueProcess.js
similarity index 100%
rename from entity/QuickEntry_entity/entityfields/quickentrysupporttickets/children/returnempty_param/valueProcess.js
rename to entity/QuickEntry_entity/entityfields/supporttickets/children/returnempty_param/valueProcess.js
diff --git a/entity/QuickEntry_entity/entityfields/quickentrysupporttickets/children/taskrequestorcontactid_param/valueProcess.js b/entity/QuickEntry_entity/entityfields/supporttickets/children/taskrequestorcontactid_param/valueProcess.js
similarity index 100%
rename from entity/QuickEntry_entity/entityfields/quickentrysupporttickets/children/taskrequestorcontactid_param/valueProcess.js
rename to entity/QuickEntry_entity/entityfields/supporttickets/children/taskrequestorcontactid_param/valueProcess.js
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index b191f7fa4fc783031dc3d23e9621ab649ed023ee..a869641a5b7dce9cb61e167c092bf8a0e6e88c7a 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -116,6 +116,7 @@
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<groupable v="true" />
+ <state>READONLY</state>
</entityField>
<entityConsumer>
<name>Organisations</name>
@@ -768,6 +769,17 @@
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
</entityActionField>
+ <entityActionField>
+ <name>export</name>
+ <title>Export</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <iconId>NEON:EXPORT</iconId>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/stateProcess.js</stateProcess>
+ <tooltip>Export fields of this table</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
</children>
</entityActionGroup>
<entityActionField>
@@ -868,6 +880,7 @@
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<groupable v="true" />
+ <state>READONLY</state>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volumeweighted/valueProcess.js</valueProcess>
</entityField>
<entityAggregateField>
@@ -1163,6 +1176,10 @@
<useConsumer v="true" />
<consumer>Contacts</consumer>
<filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/filterConditionProcess.js</filterConditionProcess>
+ <groupedRecordField>OBJECTMEMBER.CONTACT_ID</groupedRecordField>
+ <titleRecordField>$$$TITLERECORDFIELD_PLACEHOLDER$$$</titleRecordField>
+ <isGroupable v="true" />
+ <groupQueryProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/groupQueryProcess.js</groupQueryProcess>
<filtertype>BASIC</filtertype>
</filterExtension>
<filterExtension>
diff --git a/entity/Salesproject_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js
index 35c86fce60207e00936f99096038f1ee1f4519e9..c8150fdcd5f99b0b53138d178fa6986b2385efc9 100644
--- a/entity/Salesproject_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js
@@ -1,5 +1,4 @@
import("system.result");
import("system.vars");
-
result.string(vars.get("$field.SALESPROJECTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/onActionProcess.js b/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6c68dcef71d0a7db12fd4d25819640764899dbad
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/onActionProcess.js
@@ -0,0 +1,11 @@
+import("ExportTemplate_lib");
+import("system.vars");
+
+var selection = vars.get("$sys.selection");
+
+if(selection.length == 0) //no selection -> use Filtercondition;
+{
+ selection = vars.get("$sys.filter");
+}
+
+ExportTemplateUtils.addParticipants(JSON.stringify(selection), vars.get("$sys.currentcontextname"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/stateProcess.js b/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7fc578ee7942eeb948f08d3dd86f5950d3fa1c41
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("FilterViewAction_lib");
+import("system.vars");
+
+var contactCount = vars.get("$sys.datarowcount");
+
+result.string(FilterViewActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js b/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4aaaed5c074ef854441aa45e3e7993b2f77c04c4
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Export columns using a exporttemplate"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/groupQueryProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/groupQueryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ae312c407b3821a214ec84d0be07a0fe95cc778d
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/groupQueryProcess.js
@@ -0,0 +1,4 @@
+import("Salesproject_lib");
+import("system.result");
+
+result.string(Salesproject.responsibleGroupQueryProcess());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
index 98e485c0fb60aafa9e3cf2e6abad127399eb2898..61aa43cba4691fadddc0a7dd5a6f6789b966cefd 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
@@ -90,7 +90,7 @@ vars.get("$local.changed").forEach(function(fieldName) {
, "progress": $KeywordRegistry.taskProgress$0()
, "status": $KeywordRegistry.taskStatus$assigned()
, "protectionlevel": "0"
- }, [["Salesproject", vars.getString("$local.uid")]]);
+ , "attendees": [contactId]}, [["Salesproject", vars.getString("$local.uid")]]);
// ask if forecast should be cleared. Else reset to old value.
diff --git a/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod b/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod
index 14587c1c59fe4274ae3e95bf5b7ccc2defde911e..e91a4c5f39a803af31846213648d3a6a13e4605d 100644
--- a/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod
+++ b/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod
@@ -20,12 +20,6 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
- <entityConsumer>
- <name>ServiceMail</name>
- <dependency>
- <name>dependency</name>
- </dependency>
- </entityConsumer>
<entityConsumer>
<name>PersonsConsumer</name>
<dependency>
@@ -34,18 +28,6 @@
<fieldName>Contacts</fieldName>
</dependency>
</entityConsumer>
- <entityConsumer>
- <name>ServiceEmailRecipientsEmployeesConsumer</name>
- <dependency>
- <name>dependency</name>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>ServiceEmailRecipientsPersonsConsumer</name>
- <dependency>
- <name>dependency</name>
- </dependency>
- </entityConsumer>
<entityField>
<name>contact_id</name>
<title>Contact</title>
diff --git a/entity/ServiceEmail_entity/ServiceEmail_entity.aod b/entity/ServiceEmail_entity/ServiceEmail_entity.aod
index 155c7b6436fd82ebdfccd9a828097368c6544ff6..02fc4d48fa8c01c2539e67a24f1003eca47eb915 100644
--- a/entity/ServiceEmail_entity/ServiceEmail_entity.aod
+++ b/entity/ServiceEmail_entity/ServiceEmail_entity.aod
@@ -173,10 +173,6 @@
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
- <entityParameter>
- <name>ExcludedKeyIdsSubquery_param</name>
- <valueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/excludedkeyidssubquery_param/valueProcess.js</valueProcess>
- </entityParameter>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/containername_param/valueProcess.js</valueProcess>
@@ -251,16 +247,9 @@
</entityProvider>
<entityField>
<name>ServiceEmailRecipientsEmployee</name>
- <consumer>ServiceEmailRecipientsEmployeeConsumer</consumer>
<linkedContext>Employee</linkedContext>
<valueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/serviceemailrecipientsemployee/valueProcess.js</valueProcess>
</entityField>
- <entityConsumer>
- <name>ServiceEmailRecipientsEmployeeConsumer</name>
- <dependency>
- <name>dependency</name>
- </dependency>
- </entityConsumer>
<entityParameter>
<name>DocumentTemplateType_param</name>
<expose v="true" />
diff --git a/entity/ServiceEmail_entity/entityfields/conclusion/stateProcess.js b/entity/ServiceEmail_entity/entityfields/conclusion/stateProcess.js
index ed6bf1f9fe8458ff48dc0e7c13a43888182e6b03..3f5af3519d294c871f6d10ce934ac626f91595d7 100644
--- a/entity/ServiceEmail_entity/entityfields/conclusion/stateProcess.js
+++ b/entity/ServiceEmail_entity/entityfields/conclusion/stateProcess.js
@@ -8,7 +8,7 @@ import("KeywordRegistry_basic");
var str_ret = neon.COMPONENTSTATE_INVISIBLE;
var str_status = vars.get( "$field.TICKET_STATUS_AFTER_SEND");
-if( [ $KeywordRegistry.taskStatus$ended(), $KeywordRegistry.taskStatus$endedAbandoned(), $KeywordRegistry.taskStatus$endedDone()].includes( str_status) != -1)
+if( [$KeywordRegistry.taskStatus$ended(), $KeywordRegistry.taskStatus$endedAbandoned(), $KeywordRegistry.taskStatus$endedDone()].includes( str_status))
{
str_ret = ( [neon.OPERATINGSTATE_EDIT, neon.OPERATINGSTATE_NEW].indexOf( vars.get( "$sys.recordstate")) != -1)?
neon.COMPONENTSTATE_EDITABLE : neon.COMPONENTSTATE_READONLY;
diff --git a/entity/ServiceEmail_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js b/entity/ServiceEmail_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js
index ff0a6c5305debd67631c04ad323b40fabcafbe24..30deec0d2f3960f2eefc91b1121c84170502e531 100644
--- a/entity/ServiceEmail_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js
+++ b/entity/ServiceEmail_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js
@@ -11,11 +11,13 @@ if (actionName == "replayEmailAction")
documenttemplates = newSelect("DOCUMENTTEMPLATEID")
.from("DOCUMENTTEMPLATE")
.leftJoin("DOCUMENTTEMPLATE_TICKETCATEGORY", "DOCUMENTTEMPLATE_ID = DOCUMENTTEMPLATEID")
- .whereIfSet("DOCUMENTTEMPLATE.KIND", $KeywordRegistry.documentTemplateType$mail())
- .andIfSet("DOCUMENTTEMPLATE_TICKETCATEGORY.CLASSIFICATION", "$param.TicketCategory_param")
- .or("DOCUMENTTEMPLATE.CLASSIFICATION", 10)
- .or("DOCUMENTTEMPLATE.CLASSIFICATION", 12)
+ .where("DOCUMENTTEMPLATE.KIND", $KeywordRegistry.documentTemplateType$mail())
+ .and(newWhere()
+ .or("DOCUMENTTEMPLATE.CLASSIFICATION", $KeywordRegistry.documentTemplateTypeCategory$singleall())
+ .or("DOCUMENTTEMPLATE.CLASSIFICATION", $KeywordRegistry.documentTemplateTypeCategory$singleexternal()))
+ .and(newWhere()
.or("DOCUMENTTEMPLATE.ALL_TICKET_CATEGORIES", 1)
+ .or("DOCUMENTTEMPLATE_TICKETCATEGORY.CLASSIFICATION", "$param.TicketCategory_param"))
.arrayColumn();
}
@@ -24,11 +26,13 @@ if (actionName == "forwardEmailAction")
documenttemplates = newSelect("DOCUMENTTEMPLATEID")
.from("DOCUMENTTEMPLATE")
.leftJoin("DOCUMENTTEMPLATE_TICKETCATEGORY", "DOCUMENTTEMPLATE_ID = DOCUMENTTEMPLATEID")
- .whereIfSet("DOCUMENTTEMPLATE.KIND", $KeywordRegistry.documentTemplateType$mail())
- .andIfSet("DOCUMENTTEMPLATE_TICKETCATEGORY.CLASSIFICATION", "$param.TicketCategory_param")
- .or("DOCUMENTTEMPLATE.CLASSIFICATION", 10)
- .or("DOCUMENTTEMPLATE.CLASSIFICATION", 11)
+ .where("DOCUMENTTEMPLATE.KIND", $KeywordRegistry.documentTemplateType$mail())
+ .and(newWhere()
+ .or("DOCUMENTTEMPLATE.CLASSIFICATION", $KeywordRegistry.documentTemplateTypeCategory$singleall())
+ .or("DOCUMENTTEMPLATE.CLASSIFICATION", $KeywordRegistry.documentTemplateTypeCategory$singleinternal()))
+ .and(newWhere()
.or("DOCUMENTTEMPLATE.ALL_TICKET_CATEGORIES", 1)
+ .or("DOCUMENTTEMPLATE_TICKETCATEGORY.CLASSIFICATION", "$param.TicketCategory_param"))
.arrayColumn();
}
diff --git a/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/excludedkeyidssubquery_param/valueProcess.js b/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/excludedkeyidssubquery_param/valueProcess.js
deleted file mode 100644
index f5116087517790fd336c6c9b251962582ca41451..0000000000000000000000000000000000000000
--- a/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/excludedkeyidssubquery_param/valueProcess.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import("system.vars");
-import("system.result");
-import("KeywordRegistry_basic")
-
-if(vars.get("$param.ActionName_param"))
-{
- var actionName = vars.get("$param.ActionName_param");
-
- if(actionName != null)
- {
-
- if( (actionName == "replayEmailAction") || (actionName == "replayEmailToAllAction") )
- {
- result.string($KeywordRegistry.taskStatus$entry(),$KeywordRegistry.taskStatus$reopen(),$KeywordRegistry.taskStatus$inProgress(),$KeywordRegistry.taskStatus$internalreply());
- }
- if(actionName == 'forwardEmailAction')
- {
- result.string($KeywordRegistry.taskStatus$entry(),$KeywordRegistry.taskStatus$reopen(),$KeywordRegistry.taskStatus$request(),$KeywordRegistry.taskStatus$reply(),$KeywordRegistry.taskStatus$inProgress());
- }
- }
-}
-
-
-
-
diff --git a/entity/ServiceEmail_entity/onValidation.js b/entity/ServiceEmail_entity/onValidation.js
index 44b92991eac08e87aa241696ab5beae4f1ef470f..fbfb40d8866791fa449d85148dbb94af5ea9d82d 100644
--- a/entity/ServiceEmail_entity/onValidation.js
+++ b/entity/ServiceEmail_entity/onValidation.js
@@ -4,37 +4,6 @@ import("system.neon");
import("system.translate");
import("system.result");
import("system.vars");
-
-var noRecipient = true;
-
-var recipientsTo = [];
-
-if(vars.exists("$field.Recipients_TO.insertedRows"))
-{
- recipientsTo = vars.get("$field.Recipients_TO.insertedRows");
- recipientsTo.forEach(function(obj)
- {
- if(obj.Recipient)
- {
- noRecipient = false;
- }
- });
-}
-
-if(noRecipient)
-{
- if( vars.exists("$field.Recipients_ToLookup.insertedRows"))
- {
- recipientsTo = vars.get("$field.Recipients_ToLookup.insertedRows");
- recipientsTo.forEach(function(obj)
- {
- if(obj.RecipientPerson)
- {
- noRecipient = false;
- }
- });
- }
-}
//// CHECK SENDER
diff --git a/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js b/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js
index 2cb651be1bb7534c4ff52488a1163eb808219d77..8c507747bc810136d2b47e3289006557b8678a66 100644
--- a/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js
@@ -17,6 +17,8 @@ import("ActivityTask_lib");
var recArray = [];
var ccArray = [];
var bccArray = [];
+var TaskfieldValues = {};
+var TicketfieldValues = {};
var fromEmail = vars.get("$field.from");
var subject = vars.get("$field.subject");
@@ -188,17 +190,14 @@ if(returnedMsgAfterSend == true)
// insert for ACTIVITY
var DataPreset =
{
- "directionKeywordId" : $KeywordRegistry.activityDirection$outgoing,
+ "directionKeywordId" : $KeywordRegistry.activityDirection$outgoing(),
"subject" : infoText,
"content" : contentActivity,
- "categoryKeywordId" : $KeywordRegistry.activityCategory$mail()
- }
- var ActivityLink =
- {
- "SupportTicket" : ticketID
- }
-
- ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+ "categoryKeywordId" : $KeywordRegistry.activityCategory$mail()
+ };
+ var ActivityLink = ["Supportticket", ticketID];
+
+ ActivityUtils.insertNewActivity(DataPreset, [ActivityLink]);
/// UPDATE TICKET FIELD: CONCLUSION & DATE_EDIT_STATUS
if( ticketID)
@@ -290,18 +289,15 @@ if(returnedMsgAfterSend == true)
// insert for ACTIVITY
var DataPreset =
{
- "directionKeywordId" : $KeywordRegistry.activityDirection$outgoing,
+ "directionKeywordId" : $KeywordRegistry.activityDirection$outgoing(),
"responsibleContactId" : vars.get( "$param.ContactId_param"),
"subject" : translate.text("EMAIL ERROR") + "!",
"content" : contentActivity,
"categoryKeywordId" : $KeywordRegistry.activityCategory$mail()
- }
- var ActivityLink =
- {
- "SupportTicket" : ticketID
- }
-
- ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+ };
+ var ActivityLink = ["Supportticket", ticketID];
+
+ ActivityUtils.insertNewActivity(DataPreset, [ActivityLink]);
}
diff --git a/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod b/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod
index cc6a0d3c3d385168837672224094486386f02d8b..c8daea565749df730da1358a2480166421e75c80 100644
--- a/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod
+++ b/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod
@@ -103,11 +103,35 @@
<name>ChangeData</name>
<title>Save changes</title>
<onActionProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js</onActionProcess>
+ <titleProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/changedata/titleProcess.js</titleProcess>
</entityActionField>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityField>
+ <name>CONCLUSION</name>
+ <title>Conclusion</title>
+ <consumer>KeywordTicketConclusion</consumer>
+ <mandatoryProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/mandatoryProcess.js</mandatoryProcess>
+ <stateProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordTicketConclusion</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/keywordticketconclusion/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<datalessRecordContainer>
diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js
index dd746b7f0eb2f24b041346fc721ecd79fe12e2c2..41ee4231cb9743c4c282d138cef7ec27294f9cb4 100644
--- a/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js
+++ b/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js
@@ -1,34 +1,58 @@
+import("ActivityTask_lib");
+import("system.translate");
+import("system.tools");
import("Util_lib");
import("Sql_lib");
import("system.neon");
import("system.vars");
+import("KeywordRegistry_basic");
var taskIDs= JSON.parse(vars.get("$param.TaskIds_param"));
var TaskfieldValues = {};
var TicketfieldValues = {};
-/// TASK
+/// PRIORITY
if(vars.exists("$field.PRIORITY") && (vars.get("$field.PRIORITY") != "" ))
{
TaskfieldValues["PRIORITY"] = vars.get("$field.PRIORITY");
}
-
+/// STATUS
if(vars.exists("$field.STATUS") && (vars.get("$field.STATUS") != "" ))
{
TaskfieldValues["STATUS"] = vars.get("$field.STATUS");
-}
-
-/// UPDATE TASK
-TaskfieldValues["STATUS"] = vars.get("$field.TICKET_STATUS_AFTER_SEND");
-newWhere("TASK.TASKID",taskIDs,SqlBuilder.IN()).updateFields(TaskfieldValues);
-
-/// TICKET
-var TicketfieldValues = {};
-
+ TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date");
+ if(vars.get("$field.STATUS") == $KeywordRegistry.taskStatus$unassigned())
+ {
+ TicketfieldValues["EDITOR_CONTACT_ID"] = "";
+ }
+ if(vars.get("field.STATUS") == $KeywordRegistry.taskStatus$ended())
+ {
+ TicketfieldValues["DATE_END"] = vars.get("$sys.date");
+ TicketfieldValues["CONCLUSION"] = vars.get("$field.CONCLUSION");
+
+ var obj_toolsUser = tools.getCurrentUser()[tools.PARAMS];
+
+ //insert Activity
+ DataPreset =
+ {
+ "directionKeywordId" : $KeywordRegistry.activityDirection$internal(),
+ "subject" : translate.text("Ticket returned"),
+ "content" : translate.text("Ticket returned to pool") + ". "
+ +"\n"+ translate.text("Original editor") + ": " + vars.get( "$field.EDITOR_CONTACT_ID")
+ +"\n"+ translate.text("Returned by") + ": "+ obj_toolsUser[tools.FIRSTNAME] +" "+ obj_toolsUser[tools.LASTNAME],
+ "categoryKeywordId" : $KeywordRegistry.activityCategory$sys()
+ };
+ var ActivityLink = ["Supportticket", ticketID];
+
+ ActivityUtils.insertNewActivity(DataPreset, [ActivityLink]);
+ }
+}
+/// EDITOR
if(vars.exists("$field.EDITOR_CONTACT_ID") && (vars.get("$field.EDITOR_CONTACT_ID") != "" ))
{
TicketfieldValues["EDITOR_CONTACT_ID"] = vars.get("$field.EDITOR_CONTACT_ID");
}
+/// CATEGORY
if(vars.exists("$field.CATEGORY") && (vars.get("$field.CATEGORY") != "" ))
{
TicketfieldValues["CATEGORY"] = vars.get("$field.CATEGORY");
diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/changedata/titleProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/changedata/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c68d9bac28840d78e04d019b6712de9e5678792a
--- /dev/null
+++ b/entity/SupportTicketMultiSelect_entity/entityfields/changedata/titleProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.result");
+
+
+result.string(translate.text("Save changes"));
\ No newline at end of file
diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/displayValueProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5bb3f4ad5d00d2b1ae6e2e765f47bc3725d4b079
--- /dev/null
+++ b/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/displayValueProcess.js
@@ -0,0 +1,14 @@
+import("Keyword_lib");
+import("system.vars");
+import("system.result");
+
+
+var subject = KeywordUtils.getViewValue("TICKETCONCLUSION", vars.get("$field.CONCLUSION"));
+if (!subject)
+{
+ result.string("-");
+}
+else
+{
+ result.string(subject);
+}
\ No newline at end of file
diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/mandatoryProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4147675923951e3dd12d802aa5bd8044a5cd7cf4
--- /dev/null
+++ b/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/mandatoryProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+
+
+
+if (vars.get ("$field.STATUS") != $KeywordRegistry.taskStatus$ended())
+{
+ result.string("false");
+}
+else
+{
+ result.string("true");
+}
\ No newline at end of file
diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/stateProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8a8894566f092594ea56b3f54fcb5ccd15066004
--- /dev/null
+++ b/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/stateProcess.js
@@ -0,0 +1,14 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+import("KeywordRegistry_basic");
+
+
+var str_ret = neon.COMPONENTSTATE_INVISIBLE;
+var str_status = vars.get( "$field.STATUS");
+
+if( [ $KeywordRegistry.taskStatus$ended(), $KeywordRegistry.taskStatus$endedDone(), $KeywordRegistry.taskStatus$endedAbandoned()].includes( str_status))
+{
+ str_ret = neon.COMPONENTSTATE_EDITABLE;
+}
+result.string( str_ret);
\ No newline at end of file
diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/valueProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d5e191ffdbee7d8428d18f99fed8d0cfd5d27b5
--- /dev/null
+++ b/entity/SupportTicketMultiSelect_entity/entityfields/conclusion/valueProcess.js
@@ -0,0 +1,10 @@
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (!vars.get("$this.value") && vars.get("$field.STATUS") == $KeywordRegistry.taskStatus$ended())
+{
+ result.string($KeywordRegistry.ticketConclusion$success());
+}
\ No newline at end of file
diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/keywordticketconclusion/children/containername_param/valueProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/keywordticketconclusion/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..aac3b38f48946a1e010bf845ed0f789709f9e832
--- /dev/null
+++ b/entity/SupportTicketMultiSelect_entity/entityfields/keywordticketconclusion/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+
+result.string( $KeywordRegistry.ticketConclusion())
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod b/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod
index 355b20d2d6c8c1f1919de2498ea5bba4e7d35d6e..3be511ca9e18e41d4535ae5011c9784eb3a7710f 100644
--- a/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod
+++ b/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod
@@ -26,6 +26,7 @@
<name>NAME</name>
<title>Name</title>
<mandatory v="true" />
+ <onValidation>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/name/onValidation.js</onValidation>
</entityField>
<entityField>
<name>INBOX_ID</name>
@@ -91,9 +92,8 @@
<name>TEMPLATENO</name>
<title>Template No.</title>
<contentType>NUMBER</contentType>
+ <maxValue v="999" />
<minValue v="1" />
- <outputFormat>000</outputFormat>
- <inputFormat>000</inputFormat>
<mandatory v="true" />
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/templateno/valueProcess.js</valueProcess>
diff --git a/entity/SupportTicketTemplate_entity/entityfields/name/onValidation.js b/entity/SupportTicketTemplate_entity/entityfields/name/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b6d36c1fa248ae56bd1fbac857ae1ea3dd7479a
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/name/onValidation.js
@@ -0,0 +1,16 @@
+import("system.neon");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var sql = new SqlBuilder()
+ .selectCount("TEMPLATENAME")
+ .from("TICKETTEMPLATE")
+ .where("TICKETTEMPLATE.TEMPLATENAME", vars.get("$field.NAME"))
+ .andIfSet("TICKETTEMPLATE.TICKETTEMPLATEID", vars.get("$field.TEMPLATE_ID"),SqlBuilder.NOT_EQUAL())
+ .cell();
+if (sql > 0)
+{
+ result.string(translate.text("Name has to be unique") + ".");
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 09b4e657147e68251bedb97e5d305b1c94f0b4e3..2a2933e68495dca2ec5179f3001e3838b9ffc35b 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -16,27 +16,6 @@
<titlePlural>Service tickets</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionGroup>
- <name>observeActionGroup</name>
- <children>
- <entityActionField>
- <name>observe</name>
- <title>Observe</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
- <isObjectAction v="true" />
- <iconId>VAADIN:EYE</iconId>
- <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
- </entityActionField>
- <entityActionField>
- <name>cancelObservation</name>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:EYE_SLASH</iconId>
- <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
@@ -57,7 +36,7 @@
</entityField>
<entityField>
<name>TASK_STATUS</name>
- <title>{$TICKET_STATUS}</title>
+ <title>{$TASK_STATUS}</title>
<consumer>KeywordTaskState</consumer>
<groupable v="true" />
<mandatory v="true" />
@@ -363,22 +342,6 @@
<fieldName>Contact</fieldName>
</dependency>
</entityConsumer>
- <entityActionField>
- <name>newActivity</name>
- <title>New activity</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:HOURGLASS_END</iconId>
- <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newactivity/stateProcess.js</stateProcess>
- <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- <entityActionField>
- <name>newTask</name>
- <title>New task</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:TASKS</iconId>
- </entityActionField>
<entityConsumer>
<name>ModuleTrees</name>
<dependency>
@@ -517,8 +480,8 @@
<expose v="true" />
</entityParameter>
<entityProvider>
- <name>TicketsProvider</name>
- <documentation>%aditoprj%/entity/SupportTicket_entity/entityfields/ticketsprovider/documentation.adoc</documentation>
+ <name>SupportTickets</name>
+ <documentation>%aditoprj%/entity/SupportTicket_entity/entityfields/supporttickets/documentation.adoc</documentation>
</entityProvider>
<entityParameter>
<name>InboxId_param</name>
@@ -576,29 +539,11 @@
<name>EMAILMAILSIGNATURE</name>
<state>READONLY</state>
</entityField>
- <entityActionField>
- <name>replyEmail</name>
- <title>Reply</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/replyemail/onActionProcess.js</onActionProcess>
- <isObjectAction v="false" />
- <iconId>VAADIN:AT</iconId>
- <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/replyemail/stateProcess.js</stateProcess>
- <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/replyemail/tooltipProcess.js</tooltipProcess>
- </entityActionField>
<entityField>
<name>SENDEREMAIL</name>
<title>Sender</title>
<groupable v="true" />
</entityField>
- <entityActionField>
- <name>forwardTicket</name>
- <title>Forward</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/forwardticket/onActionProcess.js</onActionProcess>
- <isObjectAction v="false" />
- <iconId>NEON:EXPORT</iconId>
- <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/forwardticket/stateProcess.js</stateProcess>
- <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/forwardticket/tooltipProcess.js</tooltipProcess>
- </entityActionField>
<entityField>
<name>CC_RECIPIENTS</name>
</entityField>
@@ -608,14 +553,6 @@
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/ticket_title/valueProcess.js</valueProcess>
</entityField>
- <entityActionField>
- <name>pullNextTicket</name>
- <title>Pull tickets</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/pullnextticket/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="false" />
- <iconId>VAADIN:ARCHIVE</iconId>
- </entityActionField>
<entityParameter>
<name>BasedOnRoles_param</name>
<expose v="true" />
@@ -660,19 +597,6 @@
<titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/date_edit_status/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/date_edit_status/valueProcess.js</valueProcess>
</entityField>
- <entityActionGroup>
- <name>FilterActionsGroup</name>
- <children>
- <entityActionField>
- <name>changeMultiple</name>
- <title>Change selected</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/filteractionsgroup/children/changemultiple/onActionProcess.js</onActionProcess>
- <isObjectAction v="false" />
- <selectionType>MULTI</selectionType>
- <iconId>VAADIN:PENCIL</iconId>
- </entityActionField>
- </children>
- </entityActionGroup>
<entityConsumer>
<name>KeywordTicketCategory</name>
<dependency>
@@ -692,26 +616,6 @@
<title>Activities</title>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/counteractivities/valueProcess.js</valueProcess>
</entityField>
- <entityActionField>
- <name>newNote</name>
- <title>New note</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newnote/onActionProcess.js</onActionProcess>
- <isObjectAction v="false" />
- <iconId>VAADIN:NOTEBOOK</iconId>
- <tooltip></tooltip>
- <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newnote/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- <entityActionField>
- <name>returnTicket</name>
- <title>Return Ticket</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/returnticket/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="false" />
- <iconId>VAADIN:INBOX</iconId>
- <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/returnticket/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/returnticket/titleProcess.js</titleProcess>
- <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/returnticket/tooltipProcess.js</tooltipProcess>
- </entityActionField>
<entityParameter>
<name>TaskRequestorContactId_param</name>
<expose v="true" />
@@ -741,12 +645,6 @@
<entityName>Inbox_entity</entityName>
<fieldName>Indexes</fieldName>
</dependency>
- <children>
- <entityParameter>
- <name>ExcludedInboxes_param</name>
- <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/inboxes/children/excludedinboxes_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
</entityConsumer>
<entityConsumer>
<name>Activities</name>
@@ -836,20 +734,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
- <entityActionField>
- <name>duplicateTicket</name>
- <title>Duplicate Ticket</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/duplicateticket/onActionProcess.js</onActionProcess>
- <selectionType>UNBOUND</selectionType>
- <iconId>VAADIN:COPY</iconId>
- </entityActionField>
<entityParameter>
<name>TicketCategory_param</name>
<expose v="true" />
@@ -862,22 +746,6 @@
<name>TicketConclusion_param</name>
<expose v="true" />
</entityParameter>
- <entityActionField>
- <name>reopenTicket</name>
- <title>Re-open</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/reopenticket/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:TIME_BACKWARD</iconId>
- <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/reopenticket/stateProcess.js</stateProcess>
- </entityActionField>
- <entityActionField>
- <name>resubmitTicket</name>
- <title>Follow-Up</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/resubmitticket/onActionProcess.js</onActionProcess>
- <selectionType>UNBOUND</selectionType>
- <isSaveAction v="false" />
- <iconId>NEON:RECURRING_APPOINTMENT</iconId>
- <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/resubmitticket/stateProcess.js</stateProcess>
- </entityActionField>
<entityField>
<name>IS_OVERDUE_SYMBOL</name>
<title></title>
@@ -886,14 +754,6 @@
<groupable v="false" />
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/is_overdue_symbol/valueProcess.js</valueProcess>
</entityField>
- <entityActionField>
- <name>newTicket</name>
- <title>Enter new Ticket</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newticket/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="false" />
- <iconId>VAADIN:CHAT</iconId>
- </entityActionField>
<entityField>
<name>NEW_TICKET</name>
<title>Enter new Ticket</title>
@@ -906,13 +766,6 @@
<color>priority-low-color</color>
<titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/new_ticketcontact/titleProcess.js</titleProcess>
</entityField>
- <entityActionField>
- <name>newTicketContact</name>
- <title>Enter new Ticket & Contact</title>
- <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newticketcontact/onActionProcess.js</onActionProcess>
- <isObjectAction v="false" />
- <iconId>VAADIN:CHAT</iconId>
- </entityActionField>
<entityField>
<name>isoverdue</name>
<contentType>TEXT</contentType>
@@ -933,6 +786,144 @@
<name>TicketNo_param</name>
<expose v="true" />
</entityParameter>
+ <entityField>
+ <name>EMAILMAILSIGNATURE_ANSWER</name>
+ </entityField>
+ <entityActionGroup>
+ <name>observeActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>observe</name>
+ <title>Observe</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
+ <isObjectAction v="true" />
+ <iconId>VAADIN:EYE</iconId>
+ <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>cancelObservation</name>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:EYE_SLASH</iconId>
+ <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityActionField>
+ <name>newActivity</name>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="true" />
+ <iconId>VAADIN:HOURGLASS_END</iconId>
+ <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newactivity/stateProcess.js</stateProcess>
+ <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>newTask</name>
+ <title>New task</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TASKS</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>replyEmail</name>
+ <title>Reply</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/replyemail/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <iconId>VAADIN:AT</iconId>
+ <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/replyemail/stateProcess.js</stateProcess>
+ <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/replyemail/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>forwardTicket</name>
+ <title>Forward</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/forwardticket/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <iconId>NEON:EXPORT</iconId>
+ <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/forwardticket/stateProcess.js</stateProcess>
+ <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/forwardticket/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>pullNextTicket</name>
+ <title>Pull tickets</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/pullnextticket/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <iconId>VAADIN:ARCHIVE</iconId>
+ </entityActionField>
+ <entityActionGroup>
+ <name>FilterActionsGroup</name>
+ <children>
+ <entityActionField>
+ <name>changeMultiple</name>
+ <title>Change selected</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/filteractionsgroup/children/changemultiple/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <selectionType>MULTI</selectionType>
+ <iconId>VAADIN:PENCIL</iconId>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityActionField>
+ <name>newNote</name>
+ <title>New note</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newnote/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <iconId>VAADIN:NOTEBOOK</iconId>
+ <tooltip></tooltip>
+ <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newnote/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>returnTicket</name>
+ <title>Return Ticket</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/returnticket/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <iconId>VAADIN:INBOX</iconId>
+ <state>EDITABLE</state>
+ <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/returnticket/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/returnticket/titleProcess.js</titleProcess>
+ <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/returnticket/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>duplicateTicket</name>
+ <title>Duplicate Ticket</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/duplicateticket/onActionProcess.js</onActionProcess>
+ <selectionType>UNBOUND</selectionType>
+ <iconId>VAADIN:COPY</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>reopenTicket</name>
+ <title>Re-open</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/reopenticket/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TIME_BACKWARD</iconId>
+ <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/reopenticket/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>resubmitTicket</name>
+ <title>Follow-Up</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/resubmitticket/onActionProcess.js</onActionProcess>
+ <selectionType>UNBOUND</selectionType>
+ <isSaveAction v="false" />
+ <iconId>NEON:RECURRING_APPOINTMENT</iconId>
+ <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/resubmitticket/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>newTicket</name>
+ <title>Enter new Ticket</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newticket/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <iconId>VAADIN:CHAT</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>newTicketContact</name>
+ <title>Enter new Ticket & Contact</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newticketcontact/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <iconId>VAADIN:CHAT</iconId>
+ </entityActionField>
<entityActionField>
<name>newLetter</name>
<title>New letter</title>
@@ -940,8 +931,16 @@
<iconId>VAADIN:ENVELOPE</iconId>
<stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newletter/stateProcess.js</stateProcess>
</entityActionField>
+ <entityActionField>
+ <name>openAdminView</name>
+ <title>Open admin view</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CURLY_BRACKETS</iconId>
+ <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/openadminview/stateProcess.js</stateProcess>
+ </entityActionField>
<entityField>
- <name>EMAILMAILSIGNATURE_ANSWER</name>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
@@ -1176,6 +1175,10 @@
<name>EMAILMAILSIGNATURE_ANSWER.value</name>
<recordfield>MAILSIGNATURE.ANSWER_MAIL_ADDRESS</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>TASK.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/SupportTicket_entity/contentDescriptionProcess.js b/entity/SupportTicket_entity/contentDescriptionProcess.js
index 1f7017d97a63a7920c8af208b0940f731f99c3d1..b7c56c40086f4501fe27a729df1441449c186e65 100644
--- a/entity/SupportTicket_entity/contentDescriptionProcess.js
+++ b/entity/SupportTicket_entity/contentDescriptionProcess.js
@@ -12,7 +12,6 @@ if(vars.get("$field.TICKET_EDITOR_CONTACT_ID"))
res = [translate.text("{$TICKET_EDITOR}") + ": " + vars.get("$field.TICKET_EDITOR_CONTACT_ID.displayValue")];
}
res.push(translate.text("Maturity") + ": " + datetime.toDate(vars.get("$field.TASK_MATURITY_DATE"), translate.text("dd.MM.yyyy")));
-res.push(translate.text("Progress") + ": " + KeywordUtils.getViewValue($KeywordRegistry.taskProgress(), vars.get("$field.TASK_PROGRESS")));
res.push(translate.text("Creation date") + ": " + datetime.toDate(vars.get("$field.TASK_START_DATE"), translate.text("dd.MM.yyyy")));
result.string(res.join(" | "));
diff --git a/entity/SupportTicket_entity/entityfields/date_new/valueProcess.js b/entity/SupportTicket_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6835658dc430852893df25cf22145e1c6aae259e
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/inboxes/children/excludedinboxes_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/inboxes/children/excludedinboxes_param/valueProcess.js
deleted file mode 100644
index 92147d3453d5ee06e7d309e10ce145653776797d..0000000000000000000000000000000000000000
--- a/entity/SupportTicket_entity/entityfields/inboxes/children/excludedinboxes_param/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if(vars.exists("$param.InitialInboxId_param"))
-{
- result.object([vars.get("$param.InitialInboxId_param")]);
-}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js
index 33db9e5f8b0b112fd0d6c28ba63538f7821a7a35..c6ec8ba2a666a0a6e6d9d0743a607ca2c2bd25b3 100644
--- a/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js
+++ b/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js
@@ -1,5 +1,5 @@
-import("system.vars");
import("system.result");
import("Ticket_lib");
+import("KeywordRegistry_basic");
-result.object(TicketUtils.begin(vars.get("$field.TICKETTYPE")).getAvailableStatus())
\ No newline at end of file
+result.object(TicketUtils.begin($KeywordRegistry.ticketType$supportTicket()).getAvailableStatus());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/newtask/onActionProcess.js b/entity/SupportTicket_entity/entityfields/newtask/onActionProcess.js
index be994af3d1ae682b70b4dacdd41dd60805761258..96b6c1edd7ea6029338d30b1191dbc8b7d950ef4 100644
--- a/entity/SupportTicket_entity/entityfields/newtask/onActionProcess.js
+++ b/entity/SupportTicket_entity/entityfields/newtask/onActionProcess.js
@@ -2,4 +2,6 @@ import("system.vars");
import("ActivityTask_lib");
import("Context_lib");
-TaskUtils.createNewTask(undefined, undefined, ContextUtils.getCurrentContextId(), vars.get("$field.TICKETID"));
\ No newline at end of file
+var TicketLink = [ContextUtils.getCurrentContextId(),vars.get("$field.TICKETID")];
+
+TaskUtils.createNewTask(vars.get("$field.TICKETID"),[TicketLink]);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/reopenticket/onActionProcess.js b/entity/SupportTicket_entity/entityfields/reopenticket/onActionProcess.js
index 58807b50dc20764ac06abde46ef2c3e32a33518e..fe5cf5667d6d68f766d7d2de3cb97f8b70dfbf7b 100644
--- a/entity/SupportTicket_entity/entityfields/reopenticket/onActionProcess.js
+++ b/entity/SupportTicket_entity/entityfields/reopenticket/onActionProcess.js
@@ -1,3 +1,4 @@
+import("Context_lib");
import("ActivityTask_lib");
import("system.translate");
import("KeywordRegistry_basic");
@@ -13,8 +14,8 @@ var TicketfieldValues = {};
var TaskfieldValues = {};
var obj_toolsUser = tools.getCurrentUser()[tools.PARAMS],
- str_ticketId = vars.get( "$field.TICKETID"),
- str_taskId = vars.get( "$field.TASK_ID");
+ ticketID = vars.get( "$field.TICKETID"),
+ taskID = vars.get( "$field.TASK_ID");
// insert ACTIVITY
@@ -22,24 +23,20 @@ var DataPreset =
{
"directionKeywordId" : $KeywordRegistry.activityDirection$internal(),
"subject" : translate.text("Ticket reopen"),
- "content" : translate.text("Ticket was reopen.") + "/n"
- + translate.text("Reopen by") + ": "+ obj_toolsUser[tools.FIRSTNAME] +" "
+ "content" : translate.text("Ticket was reopen by") + ": "+ obj_toolsUser[tools.FIRSTNAME] +" "
+ obj_toolsUser[tools.LASTNAME],
"categoryKeywordId" : $KeywordRegistry.activityCategory$sys()
}
- var ActivityLink =
- {
- "SupportTicket" : ticketID
- }
-
- ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+ var ActivityLink = [ContextUtils.getCurrentContextId(), ticketID];
+
+ ActivityUtils.insertNewActivity(DataPreset, [ActivityLink]);
//change Ticketstatus, editor & DATE_EDIT_STATUS
TaskfieldValues["STATUS"] = $KeywordRegistry.taskStatus$reopen();
TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date");
-TicketfieldValues["DATE_END_"] = "";
+TicketfieldValues["DATE_END"] = "";
//Update task & Ticket
-newWhereIfSet("TASK.TASKID", str_taskId).updateFields(TaskfieldValues);
-newWhereIfSet("TICKET.TICKETID", vars.get("field.TICKETID")).updateFields(TicketfieldValues);
+newWhereIfSet("TASK.TASKID", taskID).updateFields(TaskfieldValues);
+newWhereIfSet("TICKET.TICKETID", ticketID).updateFields(TicketfieldValues);
neon.refresh();
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/replyemail/onActionProcess.js b/entity/SupportTicket_entity/entityfields/replyemail/onActionProcess.js
index 468a96ed35c76eff31308686e71be8ea50cfe9ca..1b8ba2a613f47f46625ccbadb58632dbb51d4f68 100644
--- a/entity/SupportTicket_entity/entityfields/replyemail/onActionProcess.js
+++ b/entity/SupportTicket_entity/entityfields/replyemail/onActionProcess.js
@@ -6,8 +6,7 @@ import("Ticket_lib")
var params =
{
- "SignatureId_param": vars.get("$field.MAILSIGNATURE_ID"),
- "SenderEmail_param": vars.get("$field.SENDEREMAIL"),
+ "SignatureId_param": vars.get("$field.MAILSIGNATURE_ID"),
"RequestorContactId_param": vars.get("$field.TASK_REQUESTOR_CONTACT_ID"),
"TicketCode_param": vars.get("$field.CODE"),
"TicketSubject_param": vars.get("$field.TASK_SUBJECT"),
@@ -29,5 +28,15 @@ else
{
params["From_param"] = vars.get("$field.EMAILMAILSIGNATURE");
}
-
+
+// if alternative email address is set use it
+if (vars.get("$field.ALTERNATIVE_EMAILADDR"))
+{
+ params["SenderEmail_param"] = vars.get("$field.ALTERNATIVE_EMAILADDR");
+}
+else
+{
+ params["SenderEmail_param"] = vars.get("$field.SENDEREMAIL");
+}
+
neon.openContext("ServiceEmail", "ServiceEmailEdit_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/returnticket/stateProcess.js b/entity/SupportTicket_entity/entityfields/returnticket/stateProcess.js
index dfde7549fffe1602ce975d6b0cdd6fef262ced37..17de559118b4e70dc5114c02057c01c48e12770d 100644
--- a/entity/SupportTicket_entity/entityfields/returnticket/stateProcess.js
+++ b/entity/SupportTicket_entity/entityfields/returnticket/stateProcess.js
@@ -4,11 +4,11 @@ import("system.vars");
import("KeywordRegistry_basic");
-if(vars.get ("$field.TASK_STATUS") != $KeywordRegistry.taskStatus$ended())
+if(vars.get ("$field.TASK_STATUS") == $KeywordRegistry.taskStatus$ended())
{
- result.string(neon.COMPONENTSTATE_EDITABLE);
+ result.string(neon.COMPONENTSTATE_DISABLED);
}
else
{
- result.string(neon.COMPONENTSTATE_READONLY);
+ result.string(neon.COMPONENTSTATE_EDITABLE);
}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/supportticket_template/onValueChange.js b/entity/SupportTicket_entity/entityfields/supportticket_template/onValueChange.js
index 0bfa5683866c31a427b31d11bb6ccee317a0dec7..df8422d97e2be3a7d52d495b900803ea7f238e1d 100644
--- a/entity/SupportTicket_entity/entityfields/supportticket_template/onValueChange.js
+++ b/entity/SupportTicket_entity/entityfields/supportticket_template/onValueChange.js
@@ -38,12 +38,16 @@ function _setTicketData( pStr_ticketTemplateId)
obj_fieldMap["$field.ticket_title"] = str_currentVal;
break;
case "DESCRIPTION":
+ obj_fieldMap["$field.TASK_DESCRIPTION"] = str_currentVal;
+ break;
case "PRIORITY":
+ obj_fieldMap["$field.TASK_PRIORITY"] = str_currentVal;
+ break;
case "STATUS":
- obj_fieldMap["$field.TASK_"+ str_col] = str_currentVal;
+ obj_fieldMap["$field.TASK_STATUS"] = str_currentVal;
break;
case "CATEGORY":
- obj_fieldMap["$field.TICKET"+ str_col] = str_currentVal;
+ obj_fieldMap["$field.TICKETCATEGORY"] = str_currentVal;
break;
default:
obj_fieldMap["$field."+ str_col] = str_currentVal;
diff --git a/entity/SupportTicket_entity/entityfields/ticketsprovider/documentation.adoc b/entity/SupportTicket_entity/entityfields/supporttickets/documentation.adoc
similarity index 100%
rename from entity/SupportTicket_entity/entityfields/ticketsprovider/documentation.adoc
rename to entity/SupportTicket_entity/entityfields/supporttickets/documentation.adoc
diff --git a/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js b/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js
index 8ae23d7885712c2c8f3a094df18fb69b2cfe574b..e784400a7d15d7e863a776e3904c51df6d506e5a 100644
--- a/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js
+++ b/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js
@@ -3,22 +3,29 @@ import("KeywordRegistry_basic");
import("system.result");
import("system.neon");
-
-switch(vars.getString("$field.TASK_PRIORITY"))
+if(vars.get("$field.TASK_PRIORITY"))
+{
+ switch(vars.get("$field.TASK_PRIORITY"))
+ {
+ case $KeywordRegistry.taskPriority$none():
+ result.string(neon.PRIORITY_NONE_COLOR);
+ break;
+ case $KeywordRegistry.taskPriority$low():
+ result.string(neon.PRIORITY_LOW_COLOR);
+ break;
+ case $KeywordRegistry.taskPriority$medium():
+ result.string(neon.PRIORITY_MEDIUM_COLOR);
+ break;
+ case $KeywordRegistry.taskPriority$high():
+ result.string(neon.PRIORITY_HIGH_COLOR);
+ break;
+ default:
+ result.string(neon.PRIORITY_NONE_COLOR);
+ break;
+ }
+}
+else
{
- case $KeywordRegistry.taskPriority$none():
- result.string(neon.PRIORITY_NONE_COLOR);
- break;
- case $KeywordRegistry.taskPriority$low():
- result.string(neon.PRIORITY_LOW_COLOR);
- break;
- case $KeywordRegistry.taskPriority$medium():
- result.string(neon.PRIORITY_MEDIUM_COLOR);
- break;
- case $KeywordRegistry.taskPriority$high():
- result.string(neon.PRIORITY_HIGH_COLOR);
- break;
- default:
- result.string(neon.PRIORITY_NONE_COLOR);
- break;
-}
+ result.string(neon.PRIORITY_NONE_COLOR);
+}
+
diff --git a/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js b/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js
index b0e2ba2318e43059a467e4ccc505c9f0d5645a34..bbefca4cd2eb1a7bbe1447d55bfd7a7dd19f7650 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js
@@ -1,3 +1,4 @@
+import("Context_lib");
import("Sql_lib");
import("system.translate");
import("system.util");
@@ -62,12 +63,9 @@ if( actionName == "duplicateTicket")
+ translate.text("Ticket number of the original ticket") + ': ' + codeold,
"categoryKeywordId" : $KeywordRegistry.activityCategory$sys()
}
- var ActivityLink =
- {
- "SupportTicket" : ticketID
- }
-
- ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+ var ActivityLink = [ContextUtils.getCurrentContextId(), ticketID];
+
+ ActivityUtils.insertNewActivity(DataPreset, [ActivityLink]);
///CREATE ACTIVITY for old Ticket
DataPreset =
@@ -79,12 +77,9 @@ if( actionName == "duplicateTicket")
+ translate.text("Ticket number of the created ticket") + ': ' + code,
"categoryKeywordId" : $KeywordRegistry.activityCategory$sys()
}
- ActivityLink =
- {
- "SupportTicket" : ticketIDold
- }
-
- ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+ var ActivityLink = [ContextUtils.getCurrentContextId(), ticketIDold];
+
+ ActivityUtils.insertNewActivity(DataPreset, [ActivityLink]);
// end ACTIVITY
}
diff --git a/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js b/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js
index 619577da197540f995cccb42345dff94ee24f4e9..b80e95042cc1410c3b480ff3f4873c8355191fbb 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js
@@ -68,12 +68,9 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ datetime.toDate(vars.get("$field.TASK_MATURITY_DATE"), "dd.MM.yyyy"),
"categoryKeywordId" : $KeywordRegistry.activityCategory$sys()
}
- var ActivityLink =
- {
- "SupportTicket" : ticketID
- }
-
- ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+ var ActivityLink = [ContextUtils.getCurrentContextId(), ticketID];
+
+ ActivityUtils.insertNewActivity(DataPreset, [ActivityLink]);
// end ACTIVITY
}
@@ -91,19 +88,16 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+"\n"+ translate.text("Returned by") + ": "+ obj_toolsUser[tools.FIRSTNAME] +" "+ obj_toolsUser[tools.LASTNAME],
"categoryKeywordId" : $KeywordRegistry.activityCategory$sys()
}
- ActivityLink =
- {
- "SupportTicket" : ticketID
- }
-
- ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+ var ActivityLink = [ContextUtils.getCurrentContextId(), ticketID];
+
+ ActivityUtils.insertNewActivity(DataPreset, [ActivityLink]);
//change Ticketstatus, editor & DATE_EDIT_STATUS
TaskfieldValues["STATUS"] = $KeywordRegistry.taskStatus$unassigned();
TicketfieldValues["EDITOR_CONTACT_ID"] = "";
TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date");
TicketfieldValues["INBOX_ID"] = vars.get("$field.INBOX_ID");
- TicketfieldValues["CATEGORY"] = vars.get("$field.INBOX_ID");
+ TicketfieldValues["CATEGORY"] = vars.get("$field.TICKETCATEGORY");
}
newWhere("TICKET.TICKETID","$field.TICKETID").updateFields(TicketfieldValues);
newWhere("TASK.TASKID", "$field.TASK_ID").updateFields(TaskfieldValues);
diff --git a/entity/TopicTree_entity/recordcontainers/jdito/onUpdate.js b/entity/TopicTree_entity/recordcontainers/jdito/onUpdate.js
index a024420d4f06f08e6447d8b629b34965ab1f2b0d..db9702cd5121b62701b94fcd464eec1b1106c0f0 100644
--- a/entity/TopicTree_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/TopicTree_entity/recordcontainers/jdito/onUpdate.js
@@ -7,12 +7,14 @@ var topicTreeId = vars.get("$local.uid");
var columns = ["DATE_EDIT"
, "USER_EDIT"
, "ACTIVE"
- , "TOPIC"];
+ , "TOPIC"
+ , "DESCRIPTION"];
var values = [rowData["DATE_EDIT.value"]
, rowData["USER_EDIT.value"]
, rowData["ACTIVE.value"]
- , rowData["TOPIC.value"]];
+ , rowData["TOPIC.value"]
+ , rowData["DESCRIPTION.value"]];
var assignedTo = rowData["ASSIGNEDTO.value"];
if(assignedTo && assignedTo != "")
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 837b56aa6696c5c7482a8b2667e9a913705c6df2..c0dec5cc101010be254693ba27a95db96b9ec379 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -10784,6 +10784,39 @@
<entry>
<key>Answer Address</key>
</entry>
+ <entry>
+ <key>Employee for Employee groups</key>
+ </entry>
+ <entry>
+ <key>Employee group already selected.</key>
+ </entry>
+ <entry>
+ <key>Employee already selected.</key>
+ </entry>
+ <entry>
+ <key>Name has to be unique.</key>
+ </entry>
+ <entry>
+ <key>Ticket returned</key>
+ </entry>
+ <entry>
+ <key>Returned by</key>
+ </entry>
+ <entry>
+ <key>Ticket returned to pool</key>
+ </entry>
+ <entry>
+ <key>Original editor</key>
+ </entry>
+ <entry>
+ <key>Ticket was reopen by</key>
+ </entry>
+ <entry>
+ <key>Ticket reopen</key>
+ </entry>
+ <entry>
+ <key>Email address has to be unique.</key>
+ </entry>
<entry>
<key>Synchronized with Outlook</key>
</entry>
@@ -10799,9 +10832,6 @@
<entry>
<key>Search synchronisations</key>
</entry>
- <entry>
- <key>Calling the abbyy webservice failed</key>
- </entry>
<entry>
<key>Remove synchronization</key>
</entry>
@@ -10826,18 +10856,12 @@
<entry>
<key>Shows all synchronized contacts</key>
</entry>
- <entry>
- <key>within one Month</key>
- </entry>
<entry>
<key>Last process start: synchronize to Outlook</key>
</entry>
<entry>
<key>Show filter in contacts</key>
</entry>
- <entry>
- <key>Valuation</key>
- </entry>
<entry>
<key>Search synchronisation</key>
</entry>
@@ -10908,25 +10932,145 @@
<key>Contigent exhausted, please buy some new one to continue.</key>
</entry>
<entry>
- <key>Fullfilled</key>
+ <key>All synchronized datasets</key>
</entry>
<entry>
- <key>Calling the abbyy webservice failed</key>
+ <key>Pending datasets</key>
</entry>
<entry>
- <key>Checklists</key>
+ <key>Email address has to be unique</key>
</entry>
<entry>
- <key>within one Month</key>
+ <key>My synchronized datasets</key>
</entry>
<entry>
- <key>Valuation</key>
+ <key>Do you really want to resynchronize the user completely?\nThe synchronisation in ADITO will be deleted.\nThe outlook contacts must be cleared manually.</key>
</entry>
<entry>
- <key>A Phase filter has to be set when creating a checklistentry for the Salesproject context.</key>
+ <key>Shows my synchronized datasets</key>
</entry>
<entry>
- <key>Volume Weighted(€)</key>
+ <key>Rulegroup already selected</key>
+ </entry>
+ <entry>
+ <key>Shows all synchronized datasets</key>
+ </entry>
+ <entry>
+ <key>Shows the number of datasets still to be synchronized</key>
+ </entry>
+ <entry>
+ <key>Contact synchronisation</key>
+ </entry>
+ <entry>
+ <key>Datasets in Outlook</key>
+ </entry>
+ <entry>
+ <key>Employee already selected</key>
+ </entry>
+ <entry>
+ <key>Contact synchronisations</key>
+ </entry>
+ <entry>
+ <key>Dataset in Outlook</key>
+ </entry>
+ <entry>
+ <key>Remove from synchronization</key>
+ </entry>
+ <entry>
+ <key>Contact synchronisation dashboard</key>
+ </entry>
+ <entry>
+ <key>Name has to be unique</key>
+ </entry>
+ <entry>
+ <key>Show filter result</key>
+ </entry>
+ <entry>
+ <key>Add to synchronisation</key>
+ </entry>
+ <entry>
+ <key>Sales project responsibility set</key>
+ </entry>
+ <entry>
+ <key>Do you really want to delete \"%0\"? If tickets still use this inbox, this might cause problems.</key>
+ </entry>
+ <entry>
+ <key>Delete Inbox</key>
+ </entry>
+ <entry>
+ <key>Finished Tickets last 4 weeks</key>
+ </entry>
+ <entry>
+ <key>Inbox \"%0\" has been deleted.</key>
+ </entry>
+ <entry>
+ <key>Move</key>
+ </entry>
+ <entry>
+ <key>Dependencies</key>
+ </entry>
+ <entry>
+ <key>ExportTemplateDependency</key>
+ </entry>
+ <entry>
+ <key>Employee for Employee groups</key>
+ </entry>
+ <entry>
+ <key>testfilter</key>
+ </entry>
+ <entry>
+ <key>Adito Versafix</key>
+ </entry>
+ <entry>
+ <key>Charset</key>
+ </entry>
+ <entry>
+ <key>Unique click rate (in %)</key>
+ </entry>
+ <entry>
+ <key>Employees for Employee groups</key>
+ </entry>
+ <entry>
+ <key>Last Click</key>
+ </entry>
+ <entry>
+ <key>Opener rate (in %)</key>
+ </entry>
+ <entry>
+ <key>Evaluation type</key>
+ </entry>
+ <entry>
+ <key>remove hashtags from favorite titles</key>
+ </entry>
+ <entry>
+ <key>Valid district contacts</key>
+ </entry>
+ <entry>
+ <key>default</key>
+ </entry>
+ <entry>
+ <key>Verknuepfungen</key>
+ </entry>
+ <entry>
+ <key>Action mail</key>
+ </entry>
+ <entry>
+ <key>unsubscribe</key>
+ </entry>
+ <entry>
+ <key>Copy Participants</key>
+ </entry>
+ <entry>
+ <key>Technical email</key>
+ </entry>
+ <entry>
+ <key>ignore</key>
+ </entry>
+ <entry>
+ <key>Click rate (in %)</key>
+ </entry>
+ <entry>
+ <key>Dependency</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 4f7959ac78444da822da9dae881afca4b70eee00..e87c99efc3226b85b833b9cc34a2eb00945b80af 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6,6 +6,9 @@
<country></country>
<variant></variant>
<keyValueMap>
+ <entry>
+ <key>Ticket was reopen by</key>
+ </entry>
<entry>
<key>Create new campaign step</key>
<value>Neue Kampagnenstufe erstellen</value>
@@ -22,6 +25,9 @@
<key>Single (Service/Internal)</key>
<value>Einzel (Service/Intern)</value>
</entry>
+ <entry>
+ <key>Original editor</key>
+ </entry>
<entry>
<key>Single (Service/External)</key>
<value>Einzel (Service/Extern)</value>
@@ -34,6 +40,10 @@
<key>Ticket was duplicated by</key>
<value>Ticket wurde dupliziert. Anwender</value>
</entry>
+ <entry>
+ <key>Do you really want to delete \"%0\"? If tickets still use this inbox, this might cause problems.</key>
+ <value>Postkorb \"%0\" wirklich löschen? Wenn noch Tickets mit diesem Postkorb existieren, kann das zu Problemen führen.</value>
+ </entry>
<entry>
<key>Ticket duplicated (duplicate)</key>
<value>Ticket dupliziert (Duplikat)</value>
@@ -42,6 +52,10 @@
<key>processing time</key>
<value>Bearbeitungszeit</value>
</entry>
+ <entry>
+ <key>Finished Tickets last 4 weeks</key>
+ <value>Abgeschlossene Tickets der letzten 4 Wochen</value>
+ </entry>
<entry>
<key>Ticket number of the original ticket</key>
<value>Ticketnummer des originalen Tickets</value>
@@ -86,6 +100,10 @@
<key>Return Ticket</key>
<value>Zurückgeben</value>
</entry>
+ <entry>
+ <key>Employee already selected</key>
+ <value>Mitarbeiter bereits selektiert</value>
+ </entry>
<entry>
<key>Service ticket template</key>
<value>Serviceticket-Vorlagen</value>
@@ -145,6 +163,10 @@
<key>Open Visitrecommendation</key>
<value>Offener Besuchsvorschlag</value>
</entry>
+ <entry>
+ <key>Sales project responsibility set</key>
+ <value>Vertriebsprojekt Verantwortlichen gesetzt</value>
+ </entry>
<entry>
<key>Number of openers</key>
<value>Anzahl Openers</value>
@@ -291,7 +313,7 @@
</entry>
<entry>
<key>Move down</key>
- <value>Nach unten verschieben</value>
+ <value>Nach unten verschieben</value>
</entry>
<entry>
<key>Value is too big, the maximum is %0</key>
@@ -1020,6 +1042,10 @@
<key>Object selection</key>
<value>Objektauswahl</value>
</entry>
+ <entry>
+ <key>Delete Inbox</key>
+ <value>Postkorb löschen</value>
+ </entry>
<entry>
<key>All of the chosen records are already in the campaign</key>
<value>Alle ausgewählten Datensätze sind schon in der Kampagne.</value>
@@ -1747,6 +1773,10 @@
<key>Phone</key>
<value>Telefon</value>
</entry>
+ <entry>
+ <key>Name has to be unique</key>
+ <value>Name muss einzigartig sein</value>
+ </entry>
<entry>
<key>360 Degree</key>
<value>360 Grad</value>
@@ -3329,6 +3359,9 @@
<key>Comoros</key>
<value>Komoren</value>
</entry>
+ <entry>
+ <key>Employee for Employee groups</key>
+ </entry>
<entry>
<key>Office Properties</key>
<value>Büroimmobilien</value>
@@ -4143,7 +4176,7 @@
</entry>
<entry>
<key>Email address</key>
- <value>E-Mail Adresse</value>
+ <value>E-Mail-Adresse</value>
</entry>
<entry>
<key>Australia</key>
@@ -4497,6 +4530,10 @@
<key>Show all Favorites</key>
<value>Alle Favoriten anzeigen</value>
</entry>
+ <entry>
+ <key>Inbox \"%0\" has been deleted.</key>
+ <value>Postkorb \"%0\ wurde gelöscht.</value>
+ </entry>
<entry>
<key>Venezuela (Bolivarian Republic of)</key>
<value>Venezuela (Bolivarische Republik)</value>
@@ -4749,6 +4786,10 @@
<key>NQC</key>
<value>NQC</value>
</entry>
+ <entry>
+ <key>Email address has to be unique</key>
+ <value>E-Mail-Addresse muss einzigartig sein</value>
+ </entry>
<entry>
<key>MQL</key>
<value>MQL</value>
@@ -4829,6 +4870,10 @@
<key>String value</key>
<value>String-Wert</value>
</entry>
+ <entry>
+ <key>Rulegroup already selected</key>
+ <value>Filtergruppe bereits selektiert.</value>
+ </entry>
<entry>
<key>The code number is not a valid number.</key>
<value>Die Kennnummer ist keine gültige Nummer</value>
@@ -4877,6 +4922,10 @@
<key>Relationtype</key>
<value>Beziehungsart</value>
</entry>
+ <entry>
+ <key>Employee group already selected</key>
+ <value>Mitarbeitergruppe wurde bereits selektiert.</value>
+ </entry>
<entry>
<key>Tree</key>
<value>Baum</value>
@@ -7963,7 +8012,7 @@
</entry>
<entry>
<key>Email address does not exist</key>
- <value>E-Mail Adresse existiert nicht</value>
+ <value>E-Mail-Adresse existiert nicht</value>
</entry>
<entry>
<key>Receipt Header Text</key>
@@ -9094,6 +9143,9 @@ Bitte Datumseingabe prüfen</value>
<key>My Workflow Tasks</key>
<value>Meine Workflow Aufgaben</value>
</entry>
+ <entry>
+ <key>Returned by</key>
+ </entry>
<entry>
<key>My workflow tasks</key>
<value>Meine Workflow Aufgaben</value>
@@ -11176,11 +11228,11 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Standard Country</key>
- <value>Standartland</value>
+ <value>Standardland</value>
</entry>
<entry>
<key>Standard Zip</key>
- <value>Standart Plz</value>
+ <value>Standard Plz</value>
</entry>
<entry>
<key>Outstanding Amount</key>
@@ -13102,6 +13154,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Open Admin View</key>
+ <value>Admin-Ansicht öffnen</value>
</entry>
<entry>
<key>Attendees</key>
@@ -13128,6 +13181,9 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>KeywordTest4</key>
</entry>
+ <entry>
+ <key>Ticket reopen</key>
+ </entry>
<entry>
<key>KeywordTest5</key>
</entry>
@@ -13151,6 +13207,9 @@ Bitte Datumseingabe prüfen</value>
<key>%0 companies were newley assigned. \n%1 companies are no longer assigned (these assignments got the status 'review'). \n%2 valid assignments were unchanged.\nThe Process took %3 seconds.</key>
<value>%0 Firmen wurden neu zugewiesen. \n%1 Firmen sind nicht länger zugewiesen (diese Zuweisungen haben den Status 'in Prüfung' erhalten). \n%2 gültige Zuweisungen blieben unverändert.\nDer Prozess brauchte %3 seconds.</value>
</entry>
+ <entry>
+ <key>Ticket returned to pool</key>
+ </entry>
<entry>
<key>Contigent exhausted, please buy some new one to continue</key>
</entry>
@@ -14084,6 +14143,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Save changes</key>
+ <value>Änderungen speichern</value>
</entry>
<entry>
<key>Individual Reply Template</key>
@@ -14126,7 +14186,7 @@ Bitte Datumseingabe prüfen</value>
<key>getTicketDetails</key>
</entry>
<entry>
- <key>Ticket return</key>
+ <key>Ticket returned</key>
</entry>
<entry>
<key>Ticket filter</key>
@@ -14278,6 +14338,81 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>We save your data until</key>
</entry>
+ <entry>
+ <key>Dependencies</key>
+ <value>Abhängigkeiten</value>
+ </entry>
+ <entry>
+ <key>Dependency</key>
+ <value>Abhängigkeit</value>
+ </entry>
+ <entry>
+ <key>ExportTemplateDependency</key>
+ <value>Export Vorlage Abhängigkeit</value>
+ </entry>
+ <entry>
+ <key>Employee for Employee groups</key>
+ </entry>
+ <entry>
+ <key>testfilter</key>
+ </entry>
+ <entry>
+ <key>Adito Versafix</key>
+ </entry>
+ <entry>
+ <key>Charset</key>
+ </entry>
+ <entry>
+ <key>Unique click rate (in %)</key>
+ </entry>
+ <entry>
+ <key>Employees for Employee groups</key>
+ </entry>
+ <entry>
+ <key>Last Click</key>
+ </entry>
+ <entry>
+ <key>Opener rate (in %)</key>
+ </entry>
+ <entry>
+ <key>Evaluation type</key>
+ </entry>
+ <entry>
+ <key>remove hashtags from favorite titles</key>
+ </entry>
+ <entry>
+ <key>Valid district contacts</key>
+ </entry>
+ <entry>
+ <key>default</key>
+ </entry>
+ <entry>
+ <key>Verknuepfungen</key>
+ </entry>
+ <entry>
+ <key>Action mail</key>
+ </entry>
+ <entry>
+ <key>unsubscribe</key>
+ </entry>
+ <entry>
+ <key>Move</key>
+ </entry>
+ <entry>
+ <key>Copy Participants</key>
+ </entry>
+ <entry>
+ <key>Technical email</key>
+ </entry>
+ <entry>
+ <key>ignore</key>
+ </entry>
+ <entry>
+ <key>Click rate (in %)</key>
+ </entry>
+ <entry>
+ <key>Ticket return</key>
+ </entry>
<entry>
<key>Remove synchronization</key>
</entry>
@@ -14303,7 +14438,19 @@ Bitte Datumseingabe prüfen</value>
<key>Shows my synchronized contacts</key>
</entry>
<entry>
- <key>Weighted(€)</key>
+ <key>Email address has to be unique.</key>
+ </entry>
+ <entry>
+ <key>Employee already selected.</key>
+ </entry>
+ <entry>
+ <key>Open new mosaico template</key>
+ </entry>
+ <entry>
+ <key>Name has to be unique.</key>
+ </entry>
+ <entry>
+ <key>Do you really want to resynchronize the user completely?\nThe data in ADITO will be deleted.\nThe outlook contacts must be cleared manually.</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index ffbb7ff571eb014169e08f655ebc9f7248d94226..ec3bdcc2ffb7a9d70102288e28736633c99ac921 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -10874,6 +10874,39 @@
<entry>
<key>Answer Address</key>
</entry>
+ <entry>
+ <key>Employee for Employee groups</key>
+ </entry>
+ <entry>
+ <key>Employee group already selected.</key>
+ </entry>
+ <entry>
+ <key>Employee already selected.</key>
+ </entry>
+ <entry>
+ <key>Name has to be unique.</key>
+ </entry>
+ <entry>
+ <key>Ticket returned</key>
+ </entry>
+ <entry>
+ <key>Returned by</key>
+ </entry>
+ <entry>
+ <key>Ticket returned to pool</key>
+ </entry>
+ <entry>
+ <key>Original editor</key>
+ </entry>
+ <entry>
+ <key>Ticket was reopen by</key>
+ </entry>
+ <entry>
+ <key>Ticket reopen</key>
+ </entry>
+ <entry>
+ <key>Email address has to be unique.</key>
+ </entry>
<entry>
<key>Open new mosaico template</key>
</entry>
@@ -10916,9 +10949,6 @@
<entry>
<key>Search synchronisations</key>
</entry>
- <entry>
- <key>Calling the abbyy webservice failed</key>
- </entry>
<entry>
<key>Remove synchronization</key>
</entry>
@@ -10992,19 +11022,146 @@
<key>Synced searches</key>
</entry>
<entry>
- <key>Fullfilled</key>
+ <key>All synchronized datasets</key>
</entry>
<entry>
- <key>Calling the abbyy webservice failed</key>
+ <key>Pending datasets</key>
</entry>
<entry>
- <key>Checklists</key>
+ <key>Email address has to be unique</key>
</entry>
<entry>
- <key>A Phase filter has to be set when creating a checklistentry for the Salesproject context.</key>
+ <key>My synchronized datasets</key>
</entry>
<entry>
- <key>Volume Weighted(€)</key>
+ <key>Do you really want to resynchronize the user completely?\nThe synchronisation in ADITO will be deleted.\nThe outlook contacts must be cleared manually.</key>
+ </entry>
+ <entry>
+ <key>Shows my synchronized datasets</key>
+ </entry>
+ <entry>
+ <key>Rulegroup already selected</key>
+ </entry>
+ <entry>
+ <key>Shows all synchronized datasets</key>
+ </entry>
+ <entry>
+ <key>Shows the number of datasets still to be synchronized</key>
+ </entry>
+ <entry>
+ <key>Contact synchronisation</key>
+ </entry>
+ <entry>
+ <key>Datasets in Outlook</key>
+ </entry>
+ <entry>
+ <key>Employee already selected</key>
+ </entry>
+ <entry>
+ <key>Contact synchronisations</key>
+ </entry>
+ <entry>
+ <key>Dataset in Outlook</key>
+ </entry>
+ <entry>
+ <key>Remove from synchronization</key>
+ </entry>
+ <entry>
+ <key>Contact synchronisation dashboard</key>
+ </entry>
+ <entry>
+ <key>Name has to be unique</key>
+ </entry>
+ <entry>
+ <key>Show filter result</key>
+ </entry>
+ <entry>
+ <key>Add to synchronisation</key>
+ </entry>
+ <entry>
+ <key>Sales project responsibility set</key>
+ </entry>
+ <entry>
+ <key>Do you really want to delete \"%0\"? If tickets still use this inbox, this might cause problems.</key>
+ </entry>
+ <entry>
+ <key>Delete Inbox</key>
+ </entry>
+ <entry>
+ <key>Finished Tickets last 4 weeks</key>
+ </entry>
+ <entry>
+ <key>Inbox \"%0\" has been deleted.</key>
+ </entry>
+ <entry>
+ <key>Move</key>
+ </entry>
+ <entry>
+ <key>Dependencies</key>
+ </entry>
+ <entry>
+ <key>ExportTemplateDependency</key>
+ <value>Export Template Dependency</value>
+ </entry>
+ <entry>
+ <key>Employee for Employee groups</key>
+ </entry>
+ <entry>
+ <key>testfilter</key>
+ </entry>
+ <entry>
+ <key>Adito Versafix</key>
+ </entry>
+ <entry>
+ <key>Charset</key>
+ </entry>
+ <entry>
+ <key>Unique click rate (in %)</key>
+ </entry>
+ <entry>
+ <key>Employees for Employee groups</key>
+ </entry>
+ <entry>
+ <key>Last Click</key>
+ </entry>
+ <entry>
+ <key>Opener rate (in %)</key>
+ </entry>
+ <entry>
+ <key>Evaluation type</key>
+ </entry>
+ <entry>
+ <key>remove hashtags from favorite titles</key>
+ </entry>
+ <entry>
+ <key>Valid district contacts</key>
+ </entry>
+ <entry>
+ <key>default</key>
+ </entry>
+ <entry>
+ <key>Verknuepfungen</key>
+ </entry>
+ <entry>
+ <key>Action mail</key>
+ </entry>
+ <entry>
+ <key>unsubscribe</key>
+ </entry>
+ <entry>
+ <key>Copy Participants</key>
+ </entry>
+ <entry>
+ <key>Technical email</key>
+ </entry>
+ <entry>
+ <key>ignore</key>
+ </entry>
+ <entry>
+ <key>Click rate (in %)</key>
+ </entry>
+ <entry>
+ <key>Dependency</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/neonContext/Address/Address.aod b/neonContext/Address/Address.aod
index d52b486fe764514b9aca06652f49d2b8ab1751e9..b42dae903069a6ad26e584a866ac7feb06484ba4 100644
--- a/neonContext/Address/Address.aod
+++ b/neonContext/Address/Address.aod
@@ -4,6 +4,7 @@
<title>Addresses</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/neonContext/Address/documentation.adoc</documentation>
+ <filterView>AdressFilter_view</filterView>
<lookupView>AddressLookup_view</lookupView>
<entity>Address_entity</entity>
<references>
@@ -23,5 +24,9 @@
<name>fffe7dd0-6f32-4b4f-865b-501f48813c6d</name>
<view>AddressOrgMultiEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>ffbf7b96-30bb-497a-95bf-b2d1c53ef711</name>
+ <view>AdressFilter_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/ExportTemplate/ExportTemplate.aod b/neonContext/ExportTemplate/ExportTemplate.aod
index 40c9ea289209b23bad28b2eb33ebc1c65fd1273e..103e413ba1e0de90e5317354838d43b82ebc325e 100644
--- a/neonContext/ExportTemplate/ExportTemplate.aod
+++ b/neonContext/ExportTemplate/ExportTemplate.aod
@@ -4,10 +4,11 @@
<title>Export Template</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>NEON:EXPORT</icon>
+ <mainView>ExportTemplateMain_view</mainView>
<filterView>ExportTemplateFilter_view</filterView>
<editView>ExportTemplateEdit_view</editView>
<previewView>ExportTemplatePreview_view</previewView>
- <lookupView>ExportTemplateFilter_view</lookupView>
+ <lookupView>ExportTemplateLookup_view</lookupView>
<entity>ExportTemplate_entity</entity>
<references>
<neonViewReference>
@@ -22,5 +23,17 @@
<name>6986af0d-95a1-4e6c-8687-da99296b9c7d</name>
<view>ExportTemplateEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>611cd4fc-5403-49c6-bf96-c0784e7efdcd</name>
+ <view>ExportTemplateMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>56f482d6-db40-4558-a9d9-71760b511d72</name>
+ <view>ExportTemplateDetail_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6e3d459f-b15f-4f2a-8266-8e43a6e4b965</name>
+ <view>ExportTemplateLookup_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/ExportTemplateField/ExportTemplateField.aod b/neonContext/ExportTemplateField/ExportTemplateField.aod
index 155383faabb6c58f1d4a3f0356aad7965ee7cc46..9168b0ab2c5166fbd10fb3514a6a7e8b4854faf5 100644
--- a/neonContext/ExportTemplateField/ExportTemplateField.aod
+++ b/neonContext/ExportTemplateField/ExportTemplateField.aod
@@ -3,7 +3,7 @@
<name>ExportTemplateField</name>
<title>Export Template Field</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <editView>ExportTemplateFieldMultiEdit_view</editView>
+ <editView>ExportTemplateFieldEdit_view</editView>
<entity>ExportTemplateField_entity</entity>
<references>
<neonViewReference>
@@ -14,5 +14,13 @@
<name>f015edb3-3dd0-431f-ac6f-3f23a350e36c</name>
<view>ExportTemplateFieldList_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>cc2174d0-cb70-461d-b1f6-8862f3233440</name>
+ <view>ExportTemplateFieldFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c93b35f9-ede0-4b32-8852-cd3131fc87bb</name>
+ <view>ExportTemplateFieldEdit_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/ExportTemplatePlaceOfUse/ExportTemplatePlaceOfUse.aod b/neonContext/ExportTemplatePlaceOfUse/ExportTemplatePlaceOfUse.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c146ccbfcc22d5bffbdd6e9e0c412494e618ebc4
--- /dev/null
+++ b/neonContext/ExportTemplatePlaceOfUse/ExportTemplatePlaceOfUse.aod
@@ -0,0 +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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>ExportTemplatePlaceOfUse</name>
+ <title>ExportTemplateDependency</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <editView>ExportTemplatePlaceOfUseEdit_view</editView>
+ <previewView>ExportTemplatePlaceOfUsePreview_view</previewView>
+ <lookupView>ExportTemplatePlaceOfUseFilter_view</lookupView>
+ <entity>ExportTemplatePlaceOfUse_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>ebd784ea-ffb3-4502-9ebb-3bb6f056c923</name>
+ <view>ExportTemplatePlaceOfUseEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>3439407e-24dc-414a-9035-c6ef2aae32c1</name>
+ <view>ExportTemplatePlaceOfUseFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ed73d79d-c3ef-4c8e-8257-49e94c9a7392</name>
+ <view>ExportTemplatePlaceOfUsePreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>f8b7db8a-d6c1-49f9-9734-d455254b811a</name>
+ <view>ExportTemplatePlaceOfUseGeneric_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/ExportTemplatePlaceofUse/ExportTemplatePlaceofUse.aod b/neonContext/ExportTemplatePlaceofUse/ExportTemplatePlaceofUse.aod
deleted file mode 100644
index 3b3b7eeb6424a266cff34a2711b89e67d1cb17f4..0000000000000000000000000000000000000000
--- a/neonContext/ExportTemplatePlaceofUse/ExportTemplatePlaceofUse.aod
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
- <name>ExportTemplatePlaceofUse</name>
- <title>Export Template PlaceOfUse</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>ExportTemplatePlaceOfUse_entity</entity>
- <references>
- <neonViewReference>
- <name>99e2e84f-a46a-4dd4-a312-254eb2d4c935</name>
- <view>ExportTemplatePlaceOfUseList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>5b1a0851-93c8-451e-b10e-ef3defa1e9f4</name>
- <view>ExportTemplatePlaceOfUseMultiEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
diff --git a/neonContext/KnowledgeManagement/KnowledgeManagement.aod b/neonContext/KnowledgeManagement/KnowledgeManagement.aod
index 392aeb6cef2557a829bdbf58b76fe76597e5061f..2066d68f3e0f3685e830398f152e2a5c1b2c2780 100644
--- a/neonContext/KnowledgeManagement/KnowledgeManagement.aod
+++ b/neonContext/KnowledgeManagement/KnowledgeManagement.aod
@@ -22,7 +22,6 @@
</neonViewReference>
<neonViewReference>
<name>1c97f522-d463-42ce-ae31-2973b48f9be4</name>
- <view>KnowledgeManagementPreview_view</view>
</neonViewReference>
<neonViewReference>
<name>3977743f-ab3a-472e-bb80-cea475f48aaa</name>
@@ -30,7 +29,7 @@
</neonViewReference>
<neonViewReference>
<name>d6960882-2d57-40e1-b5bf-bf317e0ca9f4</name>
- <view>KnowledgeManagementDetails_view</view>
+ <view>KnowledgeManagementPreview_view</view>
</neonViewReference>
<neonViewReference>
<name>d94d09f3-b02c-4b8d-849e-c15d3fcbb393</name>
diff --git a/neonContext/SupportTicket/SupportTicket.aod b/neonContext/SupportTicket/SupportTicket.aod
index f3e1f36d9313f8facdabf966730e8fb9b7119233..8146a7dda5d33c21b2e8745152f143fea7535e33 100644
--- a/neonContext/SupportTicket/SupportTicket.aod
+++ b/neonContext/SupportTicket/SupportTicket.aod
@@ -60,7 +60,6 @@
</neonViewReference>
<neonViewReference>
<name>fc7b698f-ded0-49f8-b5e3-7f7b0c63ea93</name>
- <view>SupportTicketEditQuickEntry_view</view>
</neonViewReference>
<neonViewReference>
<name>f70692c0-7ea0-423b-9d65-f47ea0e093f5</name>
@@ -95,6 +94,9 @@
</neonViewReference>
<neonViewReference>
<name>3bcf18a8-1f3c-4841-ad31-01867b17d187</name>
+ </neonViewReference>
+ <neonViewReference>
+ <name>b3c473d4-20f1-4e4c-b026-3e7abf4c6199</name>
<view>SupportTicketMultiEdit_view</view>
</neonViewReference>
</references>
diff --git a/neonDashboard/Service/Service.aod b/neonDashboard/Service/Service.aod
index 87d9b5766d6414b9869669fe1cc0d5d521275567..e04750eb2fefb2ba2020e124a44e97e5273abe76 100644
--- a/neonDashboard/Service/Service.aod
+++ b/neonDashboard/Service/Service.aod
@@ -6,6 +6,9 @@
<icon>VAADIN:AREA_SELECT</icon>
<dashboardType>PUBLIC</dashboardType>
<editRoles>
+ <element>PROJECT_ServiceAdmin</element>
+ <element>PROJECT_ServiceAgent</element>
+ <element>INTERNAL_ADMINISTRATOR</element>
<element>INTERNAL_DESIGNER</element>
</editRoles>
<fixedDashlets v="true" />
@@ -22,24 +25,54 @@
<colspan v="1" />
<rowspan v="4" />
</uiConfiguration>
- <parameters>
- <neonDashletParameter>
- <name>BasedOnRoles_param</name>
- <value>true</value>
- </neonDashletParameter>
- </parameters>
</neonDashlet>
<neonDashlet>
<name>Dashlet3</name>
- <viewName>SupportTicketFilter_view</viewName>
- <configName>mytickets</configName>
+ <viewName>InboxTicketChart_view</viewName>
+ <configName>InboxTicketsChart</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="2" />
- <yPos v="5" />
+ <yPos v="0" />
<colspan v="1" />
<rowspan v="4" />
</uiConfiguration>
</neonDashlet>
+ <neonDashlet>
+ <name>Dashlet4</name>
+ <viewName>TaskFilter_view</viewName>
+ <configName>DashletConfig</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="1" />
+ <yPos v="0" />
+ <colspan v="1" />
+ <rowspan v="4" />
+ </uiConfiguration>
+ </neonDashlet>
+ <neonDashlet>
+ <name>Dashlet5</name>
+ <viewName>SupportTicketFilter_view</viewName>
+ <configName>myUnfinishedTickets</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="0" />
+ <yPos v="4" />
+ <colspan v="3" />
+ <rowspan v="4" />
+ </uiConfiguration>
+ </neonDashlet>
+ <neonDashlet>
+ <name>Dashlet6</name>
+ <viewName>SupportTicketFilter_view</viewName>
+ <configName>myFinishedTickets4Weeks</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="0" />
+ <yPos v="8" />
+ <colspan v="3" />
+ <rowspan v="4" />
+ </uiConfiguration>
+ </neonDashlet>
</defaultDashlets>
</neonDashboard>
diff --git a/neonDashboard/TeamLeader_Dashboard/TeamLeader_Dashboard.aod b/neonDashboard/TeamLeader_Dashboard/TeamLeader_Dashboard.aod
index 0254dcd151082f13187a0f2cb2173976f25cad8c..aa07f7be590bac5cc90cdcee42a29f781724bf88 100644
--- a/neonDashboard/TeamLeader_Dashboard/TeamLeader_Dashboard.aod
+++ b/neonDashboard/TeamLeader_Dashboard/TeamLeader_Dashboard.aod
@@ -6,7 +6,8 @@
<icon>VAADIN:CHART_TIMELINE</icon>
<dashboardType>PUBLIC</dashboardType>
<editRoles>
- <element>PROJECT_FieldStaff</element>
+ <element>PROJECT_ServiceAdmin</element>
+ <element>PROJECT_ServiceAgent</element>
<element>INTERNAL_ADMINISTRATOR</element>
<element>INTERNAL_DESIGNER</element>
</editRoles>
@@ -16,22 +17,12 @@
<name>DashletInboxList</name>
<viewName>InboxFilter_view</viewName>
<configName>InboxList</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="2" />
- <yPos v="0" />
- <colspan v="1" />
- <rowspan v="6" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>DashletReporting</name>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="0" />
- <yPos v="0" />
- <colspan v="2" />
- <rowspan v="6" />
+ <yPos v="6" />
+ <colspan v="3" />
+ <rowspan v="4" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
@@ -41,7 +32,7 @@
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="0" />
- <yPos v="6" />
+ <yPos v="0" />
<colspan v="1" />
<rowspan v="6" />
</uiConfiguration>
@@ -53,7 +44,7 @@
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="1" />
- <yPos v="6" />
+ <yPos v="0" />
<colspan v="1" />
<rowspan v="6" />
</uiConfiguration>
@@ -65,7 +56,7 @@
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="2" />
- <yPos v="6" />
+ <yPos v="0" />
<colspan v="1" />
<rowspan v="6" />
</uiConfiguration>
diff --git a/neonView/ExportTemplatePlaceOfUseList_view/ExportTemplatePlaceOfUseList_view.aod b/neonView/AdressFilter_view/AdressFilter_view.aod
similarity index 57%
rename from neonView/ExportTemplatePlaceOfUseList_view/ExportTemplatePlaceOfUseList_view.aod
rename to neonView/AdressFilter_view/AdressFilter_view.aod
index 9b4d6a978b1032e991dbc8cc4fbc4b483a6b76d7..7243a0108c3886d3a276f80feafd84363756550d 100644
--- a/neonView/ExportTemplatePlaceOfUseList_view/ExportTemplatePlaceOfUseList_view.aod
+++ b/neonView/AdressFilter_view/AdressFilter_view.aod
@@ -1,18 +1,11 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>ExportTemplatePlaceOfUseList_view</name>
+ <name>AdressFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/neonView/AdressFilter_view/documentation.adoc</documentation>
<layout>
<noneLayout>
<name>layout</name>
</noneLayout>
</layout>
- <children>
- <titledListViewTemplate>
- <name>titledList</name>
- <titleField>PLACEOFUSE</titleField>
- <titleFieldFullWidth v="true" />
- <entityField>#ENTITY</entityField>
- </titledListViewTemplate>
- </children>
</neonView>
diff --git a/neonView/AdressFilter_view/documentation.adoc b/neonView/AdressFilter_view/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..c8cdf10d9697de841ff9219318e1b83008637b6f
--- /dev/null
+++ b/neonView/AdressFilter_view/documentation.adoc
@@ -0,0 +1 @@
+This View is only need for selecting the filter for export and observations
\ No newline at end of file
diff --git a/neonView/AdvertisingFilter_view/AdvertisingFilter_view.aod b/neonView/AdvertisingFilter_view/AdvertisingFilter_view.aod
index 793cd634f5dc7dfa77ad751f5596030d0e191217..842cca711c454cab53db8971345bc76d9d167929 100644
--- a/neonView/AdvertisingFilter_view/AdvertisingFilter_view.aod
+++ b/neonView/AdvertisingFilter_view/AdvertisingFilter_view.aod
@@ -12,6 +12,7 @@
<tableViewTemplate>
<name>Table</name>
<maxDBRow v="100" />
+ <isCreatable v="false" />
<columns>
<neonTableColumn>
<name>8c3e1048-7f7a-4210-a849-198f5b569c04</name>
diff --git a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
index e8fa1aac44a68bdec6c873b71a6ca6b1e221d568..be218839b16e9580285be895409ed28ac4b9ce06 100644
--- a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
+++ b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
@@ -124,5 +124,10 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>b98604e3-4b54-4cb2-8231-4668cf4cf3dd</name>
+ <entityField>DocumentTemplatePlaceOfUse</entityField>
+ <view>DocumentTemplatePlaceOfUseMultiEdit_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/ExportTemplateDetail_view/ExportTemplateDetail_view.aod b/neonView/ExportTemplateDetail_view/ExportTemplateDetail_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4398139911202280c568d7307193faafd21d9aee
--- /dev/null
+++ b/neonView/ExportTemplateDetail_view/ExportTemplateDetail_view.aod
@@ -0,0 +1,41 @@
+<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>ExportTemplateDetail_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <drawerLayout>
+ <name>layout</name>
+ <layoutCaption>Details</layoutCaption>
+ <fixedDrawer v="false" />
+ </drawerLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>generic</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>7666c443-e85c-43ce-bfc0-0541c2855f93</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>50d494c5-268a-4991-a399-36ccd2083b37</name>
+ <entityField>SENTENCESEPARATOR</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4894f791-3a6a-494c-a765-10cf4341035d</name>
+ <entityField>FIELDSEPARATOR</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>63ba6855-4109-424a-87a7-215921d9d794</name>
+ <entityField>FIELDDELIMITER</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>1c205be8-ecf4-4a12-93d7-d9edbf03fe3c</name>
+ <entityField>ExportTemplateMainPlaceOfUse</entityField>
+ <view>ExportTemplatePlaceOfUseGeneric_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplateEdit_view/ExportTemplateEdit_view.aod b/neonView/ExportTemplateEdit_view/ExportTemplateEdit_view.aod
index a821121f1aeb066c44b02cc36a7428411d46f07b..4d28a36f9339d95416a511f218743ced58ad5c72 100644
--- a/neonView/ExportTemplateEdit_view/ExportTemplateEdit_view.aod
+++ b/neonView/ExportTemplateEdit_view/ExportTemplateEdit_view.aod
@@ -24,17 +24,13 @@
<entityField>DESCRIPTION</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>dcca079e-66b5-4b12-b7f7-60b53966bb43</name>
- <entityField>ISOLANGUAGE</entityField>
+ <name>805a801e-d030-4ad9-9a9b-26e279c1d0fc</name>
+ <entityField>SENTENCESEPARATOR</entityField>
</entityFieldLink>
<entityFieldLink>
<name>2d720c5a-f5a6-4689-8bc7-45e3f5e979ca</name>
<entityField>FIELDSEPARATOR</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>805a801e-d030-4ad9-9a9b-26e279c1d0fc</name>
- <entityField>SENTENCESEPARATOR</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>a9041865-cadf-4ebf-8e14-ca1ae445a0cf</name>
<entityField>FIELDDELIMITER</entityField>
@@ -42,14 +38,9 @@
</fields>
</genericViewTemplate>
<neonViewReference>
- <name>d4fc40d7-96c2-4260-b749-dd0fee481b52</name>
- <entityField>ExportTemplateFields</entityField>
- <view>ExportTemplateFieldMultiEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>115345f0-5b8a-4a94-ad7d-bf5bf986da7a</name>
- <entityField>ExportTemplateplaceOfUseCon</entityField>
- <view>ExportTemplatePlaceOfUseMultiEdit_view</view>
+ <name>7e29d4e4-86a0-4a39-9a80-24d2b4a657a9</name>
+ <entityField>ExportTemplateMainPlaceOfUse</entityField>
+ <view>ExportTemplatePlaceOfUseEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/ExportTemplateFieldEdit_view/ExportTemplateFieldEdit_view.aod b/neonView/ExportTemplateFieldEdit_view/ExportTemplateFieldEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..51a62980047cd59cd591cad2e430988b364df757
--- /dev/null
+++ b/neonView/ExportTemplateFieldEdit_view/ExportTemplateFieldEdit_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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>ExportTemplateFieldEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>ExportTemplateFieldEditGeneric</name>
+ <editMode v="true" />
+ <hideEmptyFields v="false" />
+ <fields>
+ <entityFieldLink>
+ <name>9377c104-4a58-4739-9582-9827b0097729</name>
+ <entityField>EXPORTTEMPLATEPLACEOFUSE_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bd6b4681-d616-4b02-a8d0-35f386640588</name>
+ <entityField>FIELD</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplateFieldFilter_view/ExportTemplateFieldFilter_view.aod b/neonView/ExportTemplateFieldFilter_view/ExportTemplateFieldFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..8a1b6a7188932352a6810269920a7271eaad8d51
--- /dev/null
+++ b/neonView/ExportTemplateFieldFilter_view/ExportTemplateFieldFilter_view.aod
@@ -0,0 +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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>ExportTemplateFieldFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <treeTableViewTemplate>
+ <name>ExportTemplateFieldTreeTable</name>
+ <entityField>#ENTITY</entityField>
+ <favoriteActionGroup1>MoveActions</favoriteActionGroup1>
+ <isEditable v="false" />
+ <columns>
+ <neonTreeTableColumn>
+ <name>5fa75992-8d07-4f59-8780-defbe0472910</name>
+ <entityField>SORTING</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>5b943bef-e70a-4110-a6be-dc7bba96b4eb</name>
+ <entityField>FIELD</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>8dc1f2c1-6351-4b66-aafa-fa8149690e6c</name>
+ <entityField>placeOfUse</entityField>
+ </neonTreeTableColumn>
+ </columns>
+ </treeTableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplateFieldList_view/ExportTemplateFieldList_view.aod b/neonView/ExportTemplateFieldList_view/ExportTemplateFieldList_view.aod
index 28f8da32d3a8828c0f658129fdf81ae91e298b01..29c0373073449768c1d1582751f40a335445d7b5 100644
--- a/neonView/ExportTemplateFieldList_view/ExportTemplateFieldList_view.aod
+++ b/neonView/ExportTemplateFieldList_view/ExportTemplateFieldList_view.aod
@@ -12,13 +12,14 @@
<children>
<titledListViewTemplate>
<name>titledList</name>
- <titleField>FIELD</titleField>
+ <titleField>SORTING</titleField>
<entityField>#ENTITY</entityField>
<title>Field and Position</title>
+ <isEditable v="true" />
<columns>
<neonTitledListTableColumn>
<name>a0e7e2ce-b8fc-417c-bf7e-9907b75fec59</name>
- <entityField>SORTING</entityField>
+ <entityField>FIELD</entityField>
<fullWidth v="false" />
</neonTitledListTableColumn>
</columns>
diff --git a/neonView/ExportTemplateFieldMultiEdit_view/ExportTemplateFieldMultiEdit_view.aod b/neonView/ExportTemplateFieldMultiEdit_view/ExportTemplateFieldMultiEdit_view.aod
index d568ca27848e106958e132471cd1b85b44f96f48..e7ef3b7160487c6924d3094bd2a3e29a5eb76237 100644
--- a/neonView/ExportTemplateFieldMultiEdit_view/ExportTemplateFieldMultiEdit_view.aod
+++ b/neonView/ExportTemplateFieldMultiEdit_view/ExportTemplateFieldMultiEdit_view.aod
@@ -11,6 +11,9 @@
<genericMultipleViewTemplate>
<name>genericMultiple</name>
<entityField>#ENTITY</entityField>
+ <isCreatable v="false" />
+ <isDeletable v="false" />
+ <isEditable v="false" />
<columns>
<neonGenericMultipleTableColumn>
<name>6e30e825-4fd4-4503-b81c-ac1a9971275d</name>
diff --git a/neonView/ExportTemplateFilter_view/ExportTemplateFilter_view.aod b/neonView/ExportTemplateFilter_view/ExportTemplateFilter_view.aod
index ecfe1548157a26a029eb9d6ca3dabd552485cadc..a33b96878aa90a70f95fb5a6146d2dcb6df3e6cf 100644
--- a/neonView/ExportTemplateFilter_view/ExportTemplateFilter_view.aod
+++ b/neonView/ExportTemplateFilter_view/ExportTemplateFilter_view.aod
@@ -18,10 +18,6 @@
<name>76bc9ab0-8294-4df1-bdcb-6a86daef2170</name>
<entityField>TITLE</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>29cd8f19-a002-40be-b91b-9c0eab447129</name>
- <entityField>ISOLANGUAGE</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>e598db0e-f2d9-43d4-97c4-f1122edf6751</name>
<entityField>DESCRIPTION</entityField>
@@ -48,10 +44,6 @@
<name>bf2f11c2-8cf0-40da-9692-d09bf8391679</name>
<entityField>TITLE</entityField>
</neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>53869967-de33-4f9e-aa36-a11475892322</name>
- <entityField>ISOLANGUAGE</entityField>
- </neonTreeTableColumn>
<neonTreeTableColumn>
<name>6c25b35a-c655-4840-a9a7-37a7ac309e1b</name>
<entityField>DESCRIPTION</entityField>
diff --git a/neonView/ExportTemplateLookup_view/ExportTemplateLookup_view.aod b/neonView/ExportTemplateLookup_view/ExportTemplateLookup_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..a1f2c8f4f1accd5137cb8c02a04df2b35f25a179
--- /dev/null
+++ b/neonView/ExportTemplateLookup_view/ExportTemplateLookup_view.aod
@@ -0,0 +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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>ExportTemplateLookup_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>table</name>
+ <entityField>#ENTITY</entityField>
+ <isEditable v="true" />
+ <columns>
+ <neonTableColumn>
+ <name>76bc9ab0-8294-4df1-bdcb-6a86daef2170</name>
+ <entityField>TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>e598db0e-f2d9-43d4-97c4-f1122edf6751</name>
+ <entityField>DESCRIPTION</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplateMain_view/ExportTemplateMain_view.aod b/neonView/ExportTemplateMain_view/ExportTemplateMain_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..62d38aa680dc82d8656d31cb66cc138a8510daac
--- /dev/null
+++ b/neonView/ExportTemplateMain_view/ExportTemplateMain_view.aod
@@ -0,0 +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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>ExportTemplateMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>36db0218-9ae4-4ddd-8405-8ce9e874a31c</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>36db0218-9ae4-4ddd-8405-8ce9e874a31c</name>
+ <entityField>#ENTITY</entityField>
+ <view>ExportTemplatePreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>34d357ec-7421-4fc6-9f66-eed0e95bc2f7</name>
+ <entityField>ExportTemplatePlacesOfUse</entityField>
+ <view>ExportTemplatePlaceOfUseFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>4a77b26f-e83c-4988-b925-ecc227a1fd09</name>
+ <entityField>ExportTemplateFields</entityField>
+ <view>ExportTemplateFieldFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplatePlaceOfUseEdit_view/ExportTemplatePlaceOfUseEdit_view.aod b/neonView/ExportTemplatePlaceOfUseEdit_view/ExportTemplatePlaceOfUseEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..54c54551b68d108d2428ded56de3574e53026086
--- /dev/null
+++ b/neonView/ExportTemplatePlaceOfUseEdit_view/ExportTemplatePlaceOfUseEdit_view.aod
@@ -0,0 +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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>ExportTemplatePlaceOfUseEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <size>SMALL</size>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>ExportTemplateDependencyEditGeneric</name>
+ <editMode v="true" />
+ <hideEmptyFields v="false" />
+ <fields>
+ <entityFieldLink>
+ <name>41964c70-2475-4989-a717-caae3c470674</name>
+ <entityField>EXPORTTEMPLATEPLACEOFUSE_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ee620cbf-5c85-4d1a-9a81-b14a55247afc</name>
+ <entityField>PLACEOFUSE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>a47f76e7-8860-414b-b78c-ea2f4d0b65d4</name>
+ <entityField>OBJECT_FILTER</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplatePlaceOfUseFilter_view/ExportTemplatePlaceOfUseFilter_view.aod b/neonView/ExportTemplatePlaceOfUseFilter_view/ExportTemplatePlaceOfUseFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1c4a06528e1798184325f53eb3e925f7eee43604
--- /dev/null
+++ b/neonView/ExportTemplatePlaceOfUseFilter_view/ExportTemplatePlaceOfUseFilter_view.aod
@@ -0,0 +1,25 @@
+<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>ExportTemplatePlaceOfUseFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <treeTableViewTemplate>
+ <name>ExportTemplateDependencyFilterTreeTable</name>
+ <parentField>EXPORTTEMPLATEPLACEOFUSE_ID</parentField>
+ <showChildrenCount v="false" />
+ <isEditable v="false" />
+ <columns>
+ <neonTreeTableColumn>
+ <name>d261955e-81db-41dd-9dd3-57f07f92cfc2</name>
+ <entityField>PLACEOFUSE</entityField>
+ </neonTreeTableColumn>
+ </columns>
+ </treeTableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplatePlaceOfUseMultiEdit_view/ExportTemplatePlaceOfUseMultiEdit_view.aod b/neonView/ExportTemplatePlaceOfUseGeneric_view/ExportTemplatePlaceOfUseGeneric_view.aod
similarity index 53%
rename from neonView/ExportTemplatePlaceOfUseMultiEdit_view/ExportTemplatePlaceOfUseMultiEdit_view.aod
rename to neonView/ExportTemplatePlaceOfUseGeneric_view/ExportTemplatePlaceOfUseGeneric_view.aod
index c32a8477c19869f6a34cce18c963b2a590aca365..443c2f5a0ff3ebfc4382af97d7178f18852e552c 100644
--- a/neonView/ExportTemplatePlaceOfUseMultiEdit_view/ExportTemplatePlaceOfUseMultiEdit_view.aod
+++ b/neonView/ExportTemplatePlaceOfUseGeneric_view/ExportTemplatePlaceOfUseGeneric_view.aod
@@ -1,6 +1,6 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>ExportTemplatePlaceOfUseMultiEdit_view</name>
+ <name>ExportTemplatePlaceOfUseGeneric_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<noneLayout>
@@ -8,16 +8,14 @@
</noneLayout>
</layout>
<children>
- <genericMultipleViewTemplate>
- <name>genericmultiple</name>
- <entityField>#ENTITY</entityField>
- <title>Place of Use</title>
- <columns>
- <neonGenericMultipleTableColumn>
- <name>faec9114-95cf-4d47-8f0e-d7d392bff188</name>
+ <genericViewTemplate>
+ <name>ExportTemplatePlaceOfUseGenericGeneric</name>
+ <fields>
+ <entityFieldLink>
+ <name>20243d2b-d773-4daf-b0cd-9ac0b762f1fc</name>
<entityField>PLACEOFUSE</entityField>
- </neonGenericMultipleTableColumn>
- </columns>
- </genericMultipleViewTemplate>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
</children>
</neonView>
diff --git a/neonView/ExportTemplatePlaceOfUsePreview_view/ExportTemplatePlaceOfUsePreview_view.aod b/neonView/ExportTemplatePlaceOfUsePreview_view/ExportTemplatePlaceOfUsePreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..08b9078db3e9ac7ad5eb50bef25606c3a36a19a6
--- /dev/null
+++ b/neonView/ExportTemplatePlaceOfUsePreview_view/ExportTemplatePlaceOfUsePreview_view.aod
@@ -0,0 +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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>ExportTemplatePlaceOfUsePreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>ExportTemplateDependencyPreviewCard</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>ExportTemplateDependencyPreviewCard</name>
+ <titleField>PLACEOFUSE</titleField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>ExportTemplateDependencyPreviewGeneric</name>
+ <fields>
+ <entityFieldLink>
+ <name>a5946581-6806-499b-b402-bd2c06bb01d8</name>
+ <entityField>OBJECT_FILTER</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod b/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod
index 4a0bbc8895e323d34c9c8f3a8ff7b770382651c5..04c2068b8cf4a454e73479479090dbf319318cfb 100644
--- a/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod
+++ b/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod
@@ -12,49 +12,24 @@
<cardViewTemplate>
<name>card</name>
<titleField>TITLE</titleField>
- <subtitleField>ISOLANGUAGE</subtitleField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<favoriteViewTemplate>
<name>Favorites</name>
- <objectType>EXPORTTEMPLATE_OBJECTTYPE</objectType>
+ <objectType>exportTemplateObjectType</objectType>
<rowId>#UID</rowId>
<entityField>#ENTITY</entityField>
<title>favorites</title>
</favoriteViewTemplate>
- <genericViewTemplate>
- <name>generic</name>
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>7666c443-e85c-43ce-bfc0-0541c2855f93</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>50d494c5-268a-4991-a399-36ccd2083b37</name>
- <entityField>SENTENCESEPARATOR</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4894f791-3a6a-494c-a765-10cf4341035d</name>
- <entityField>FIELDSEPARATOR</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>63ba6855-4109-424a-87a7-215921d9d794</name>
- <entityField>FIELDDELIMITER</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
<neonViewReference>
- <name>44ad5c03-ae3d-495f-b0ff-141a64e256e4</name>
- <entityField>ExportTemplateFields</entityField>
- <view>ExportTemplateFieldList_view</view>
+ <name>12c0fc60-6634-44d0-b0d8-811fa6f91280</name>
+ <entityField>#ENTITY</entityField>
+ <view>ExportTemplateDetail_view</view>
</neonViewReference>
<neonViewReference>
- <name>97e15126-23f9-474d-8dec-8c9175214b92</name>
- <entityField>ExportTemplateplaceOfUseCon</entityField>
- <view>ExportTemplatePlaceOfUseList_view</view>
+ <name>9a555ec7-b777-4ace-821a-f849c0d87b73</name>
+ <entityField>ExportTemplateFieldsPreview</entityField>
+ <view>ExportTemplateFieldList_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod b/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod
index 709d825158f14edab0ab418f8b1ed45b4ebcf352..c8a38d3a70239df08c4eb4f5180086a6d50d32fd 100644
--- a/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod
+++ b/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod
@@ -31,10 +31,18 @@
<name>35ff004c-98a7-43fe-8739-3e74adb30a1a</name>
<entityField>EXPORTTEMPLATE_ID</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>0db87299-5c4d-4365-97be-294a8a422da2</name>
+ <entityField>ISOLANGUAGE</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>afcb5cf1-7c78-4649-9178-1635226620ad</name>
<entityField>FILENAME</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>04231c92-8a5e-4b73-b9e6-b316865f443e</name>
+ <entityField>charset</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
<actionsViewTemplate>
diff --git a/neonView/InboxEdit_view/InboxEdit_view.aod b/neonView/InboxEdit_view/InboxEdit_view.aod
index 3dce41fc57d0757e7ab1ab86fc12bfb77f7a40db..5623b8664f1f313311b2d9afc3f8dbc1933cfa8d 100644
--- a/neonView/InboxEdit_view/InboxEdit_view.aod
+++ b/neonView/InboxEdit_view/InboxEdit_view.aod
@@ -40,10 +40,6 @@
<name>c6a43bc9-666b-4395-942b-0e5aeecfed89</name>
<entityField>REOPENDELAY</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>8dea443c-d327-484f-8a2b-0f1e2765105e</name>
- <entityField>CLOSURE_DAYS</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/InboxFilter_view/InboxFilter_view.aod b/neonView/InboxFilter_view/InboxFilter_view.aod
index cf8707b5038dc41e20a00f57d5bbb14809810f4a..79c992653619e285899aed81ed66f754c4acbe02 100644
--- a/neonView/InboxFilter_view/InboxFilter_view.aod
+++ b/neonView/InboxFilter_view/InboxFilter_view.aod
@@ -11,7 +11,10 @@
<fragment>Inbox/filter</fragment>
<singleton v="false" />
<storeRoles>
- <element>PROJECT_ProjectManagement</element>
+ <element>PROJECT_ServiceAdmin</element>
+ <element>PROJECT_ServiceAgent</element>
+ <element>INTERNAL_ADMINISTRATOR</element>
+ <element>INTERNAL_DESIGNER</element>
</storeRoles>
<icon>VAADIN:ENVELOPES_O</icon>
<categories>
@@ -31,6 +34,7 @@
<tableViewTemplate>
<name>Table</name>
<entityField>#ENTITY</entityField>
+ <favoriteActionGroup1>deleteActionGroup</favoriteActionGroup1>
<columns>
<neonTableColumn>
<name>bcdbaede-e2df-4351-9df2-fd2cd30cfd8e</name>
@@ -48,10 +52,6 @@
<name>f1378d7e-9187-4a52-8e73-64fa6d3047ca</name>
<entityField>REOPENDELAY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>2fc3d43b-84a1-43c4-926b-b8c8951d5349</name>
- <entityField>CLOSURE_DAYS</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>f7369cab-4379-4c23-96f0-2ec944896c5e</name>
<entityField>STATUS</entityField>
diff --git a/neonView/InboxPreview_view/InboxPreview_view.aod b/neonView/InboxPreview_view/InboxPreview_view.aod
index d52c0e4d31dfbd4424ef1daff54f9dcdfcfb1a67..967049aa83399a3bafef0ebd68d708e86dff84ca 100644
--- a/neonView/InboxPreview_view/InboxPreview_view.aod
+++ b/neonView/InboxPreview_view/InboxPreview_view.aod
@@ -47,10 +47,6 @@
<name>afabc1a1-df95-441b-9afa-fe49c61a91f6</name>
<entityField>ReopenDelayPreview</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>2d4bad74-461a-4890-9bd8-f47b9fc1d705</name>
- <entityField>Closure_daysPreview</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/KnowledgeManagementDetails_view/KnowledgeManagementDetails_view.aod b/neonView/KnowledgeManagementDetails_view/KnowledgeManagementDetails_view.aod
deleted file mode 100644
index 37c914fe2abf1efa2feb67148bacf3cb1f396e89..0000000000000000000000000000000000000000
--- a/neonView/KnowledgeManagementDetails_view/KnowledgeManagementDetails_view.aod
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>KnowledgeManagementDetails_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>KnowledgeDetails</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>KnowledgeDetails</name>
- <iconField>#ICON</iconField>
- <titleField>TITLE</titleField>
- <subtitleField>LastChange</subtitleField>
- <entityField>#ENTITY</entityField>
- <isEditable v="false" />
- </cardViewTemplate>
- <favoriteViewTemplate>
- <name>favorites</name>
- <objectType>KNOWLEDGEMANAGEMENT_OBJECTTYPE</objectType>
- <rowId>#UID</rowId>
- <entityField>#ENTITY</entityField>
- <title>Favorites</title>
- </favoriteViewTemplate>
- <genericViewTemplate>
- <name>Details</name>
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>2ed87edf-4aed-42cd-9ebe-f206810c86a7</name>
- <entityField>AUTHOR_CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>e9d5fe54-9261-4ca4-9c20-c839c8d26395</name>
- <entityField>RESPONSIBLE_CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>1248f0fc-e370-42e5-8d64-6d89da366580</name>
- <entityField>DATE_NEW</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>59c020ac-3b20-45b4-83ce-d0e7bb9372ad</name>
- <entityField>DATE_EDIT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>6252c147-e35f-4c54-8e9c-f65eee2d5283</name>
- <entityField>PUBLISH</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>9322369a-d82b-402e-aaff-dedac00d1971</name>
- <entityField>TagsByKnowledgeId</entityField>
- <view>KnowledgeTagList_view</view>
- </neonViewReference>
- </children>
-</neonView>
diff --git a/neonView/KnowledgeManagementMain_view/KnowledgeManagementMain_view.aod b/neonView/KnowledgeManagementMain_view/KnowledgeManagementMain_view.aod
index e7fb17e2a97a9994ddeb3e6db779ccc69d7df214..8faaca286101beadb276e8e2e075b1c4c0726087 100644
--- a/neonView/KnowledgeManagementMain_view/KnowledgeManagementMain_view.aod
+++ b/neonView/KnowledgeManagementMain_view/KnowledgeManagementMain_view.aod
@@ -12,7 +12,7 @@
<neonViewReference>
<name>88686b9f-0333-4f8b-a24d-c1018bcf394b</name>
<entityField>#ENTITY</entityField>
- <view>KnowledgeManagementDetails_view</view>
+ <view>KnowledgeManagementPreview_view</view>
</neonViewReference>
<neonViewReference>
<name>0c32cd6f-82a6-466a-9a71-16eeeb9c6890</name>
diff --git a/neonView/KnowledgeManagementPreview_view/KnowledgeManagementPreview_view.aod b/neonView/KnowledgeManagementPreview_view/KnowledgeManagementPreview_view.aod
index 934dbdb3b9951697a1ae5005b492e9fd211393c3..a71dc1b4a0e81a1043a6c3f25cfbd679ecd87ee9 100644
--- a/neonView/KnowledgeManagementPreview_view/KnowledgeManagementPreview_view.aod
+++ b/neonView/KnowledgeManagementPreview_view/KnowledgeManagementPreview_view.aod
@@ -5,13 +5,57 @@
<layout>
<headerFooterLayout>
<name>layout</name>
+ <header>KnowledgeDetails</header>
</headerFooterLayout>
</layout>
<children>
- <webContentViewTemplate>
- <name>PreviewHTML</name>
- <height v="6000" />
- <entityField>htmlView</entityField>
- </webContentViewTemplate>
+ <cardViewTemplate>
+ <name>KnowledgeDetails</name>
+ <iconField>#ICON</iconField>
+ <titleField>TITLE</titleField>
+ <subtitleField>LastChange</subtitleField>
+ <entityField>#ENTITY</entityField>
+ <isEditable v="false" />
+ </cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>favorites</name>
+ <objectType>KNOWLEDGEMANAGEMENT_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>Favorites</title>
+ </favoriteViewTemplate>
+ <genericViewTemplate>
+ <name>Details</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>2ed87edf-4aed-42cd-9ebe-f206810c86a7</name>
+ <entityField>AUTHOR_CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e9d5fe54-9261-4ca4-9c20-c839c8d26395</name>
+ <entityField>RESPONSIBLE_CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>1248f0fc-e370-42e5-8d64-6d89da366580</name>
+ <entityField>DATE_NEW</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>59c020ac-3b20-45b4-83ce-d0e7bb9372ad</name>
+ <entityField>DATE_EDIT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6252c147-e35f-4c54-8e9c-f65eee2d5283</name>
+ <entityField>PUBLISH</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>9322369a-d82b-402e-aaff-dedac00d1971</name>
+ <entityField>TagsByKnowledgeId</entityField>
+ <view>KnowledgeTagList_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod b/neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod
index 0ae9e8fad3bae097887df5d2bb364da3d0bccdef..6a4016ee43e0333bc490dbb74dc4a47bae9722f1 100644
--- a/neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod
+++ b/neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod
@@ -92,7 +92,7 @@
<neonViewReference>
<name>dff4c15b-27f6-4c54-921a-d7bb8498a08f</name>
<entityField>Serviceticket</entityField>
- <view>SupportTicketEditQuickEntry_view</view>
+ <view>SupportTicketMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/SupportTicketEditQuickEntry_view/SupportTicketEditQuickEntry_view.aod b/neonView/SupportTicketEditQuickEntry_view/SupportTicketEditQuickEntry_view.aod
deleted file mode 100644
index 2d2ee694f0f8f3d9a9d82592102c2ae518c834a6..0000000000000000000000000000000000000000
--- a/neonView/SupportTicketEditQuickEntry_view/SupportTicketEditQuickEntry_view.aod
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>SupportTicketEditQuickEntry_view</name>
- <title>Service ticket</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:TICKET</icon>
- <layout>
- <boxLayout>
- <name>layout</name>
- <autoHeight v="true" />
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>SupportTicketGeneric</name>
- <editMode v="true" />
- <showDrawer v="true" />
- <drawerCaption>Service ticket</drawerCaption>
- <fixedDrawer v="true" />
- <hideEmptyFields v="false" />
- <fields>
- <entityFieldLink>
- <name>50583440-b40f-4d6e-a775-5541c94be5d5</name>
- <entityField>ALTERNATIVE_EMAILADDR</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>d51b05bd-5f2e-4959-b9f3-5d9706585a51</name>
- <entityField>ALTERNATIVE_PHONEADDR</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>d10b9c94-d222-417c-91a5-3f3e50dfe80e</name>
- <entityField>SupportTicket_template</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>33027237-1177-4f8b-abe6-ea3d9d036077</name>
- <entityField>INBOX_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ebce5913-6628-4a08-afb0-caea5d7c274f</name>
- <entityField>TICKETCATEGORY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>19d6d30f-4d11-490a-94f6-b930b3b0d6e9</name>
- <entityField>TASK_SUBJECT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>1a7438bf-7690-470b-a69b-ca119ac64b59</name>
- <entityField>TASK_DESCRIPTION</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>db509854-3041-4d77-9ec2-651842d1a9f1</name>
- <entityField>TASK_MATURITY_DATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3784edd5-03b8-47aa-a31f-ee95ef55d033</name>
- <entityField>TASK_STATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c52866d5-f6e6-42b9-9cdd-4eeb970fab18</name>
- <entityField>TICKET_EDITOR_CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>15311428-d390-436c-8c44-92102ffa0431</name>
- <entityField>TASK_PRIORITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>9debbeab-8a99-46fe-a736-b7074acc9e3a</name>
- <entityField>MEDIUM</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
index b37bfa90c06298d9f9b23811471aeb239f891195..ab371d63c5e2f39a307788f0eb9904435a1bce72 100644
--- a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
+++ b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
@@ -5,25 +5,14 @@
<filterable v="true" />
<dashletConfigurations>
<neonDashletConfiguration>
- <name>myTicketsInWork</name>
+ <name>myUnfinishedTickets</name>
<title>Tickets in process</title>
- <description>Show my tickets that are in process</description>
- <fragment>SupportTicket/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJhYmdlc2NobG9zc2VuIiwia2V5IjoiRU5ERUQiLCJjb250ZW50dHlwZSI6IlRFWFQifSx7InR5cGUiOiJyb3ciLCJuYW1lIjoiVEFTS19FRElUT1JfQ09OVEFDVF9JRCIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZSI6IkljaCIsImtleSI6IiQkJGdsb2JhbC51c2VyLmNvbnRhY3RJZCQkJCIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9XX0%3D</fragment>
+ <description>Show my tickets that are in process.</description>
+ <fragment>SupportTicket/filter?hidden-columns=%23GROUPING&search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJhYmdlc2NobG9zc2VuIiwia2V5IjoiRU5ERUQiLCJjb250ZW50dHlwZSI6IlRFWFQifSx7InR5cGUiOiJyb3ciLCJuYW1lIjoiVElDS0VUX0VESVRPUl9DT05UQUNUX0lEIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiSWNoIiwia2V5IjoiJCQkZ2xvYmFsLnVzZXIuY29udGFjdElkJCQkIiwiY29udGVudHR5cGUiOiJURVhUIn1dfQ%3D%3D</fragment>
<singleton v="true" />
<storeRoles>
- <element>PROJECT_FieldStaff</element>
- <element>PROJECT_HumanResources</element>
- <element>PROJECT_Marketing</element>
- <element>PROJECT_OfficeStaff</element>
- <element>PROJECT_ProjectManagement</element>
+ <element>PROJECT_ServiceAdmin</element>
<element>PROJECT_ServiceAgent</element>
- <element>INTERNAL_ADMINISTRATOR</element>
- <element>INTERNAL_DASHBOARDSTOREADMIN</element>
- <element>INTERNAL_DESIGNER</element>
- <element>INTERNAL_GROUPWARE</element>
- <element>INTERNAL_SNMP</element>
- <element>INTERNAL_TECHNICAL</element>
- <element>INTERNAL_WEBSERVICE</element>
</storeRoles>
<icon>VAADIN:EDIT</icon>
<categories>
@@ -34,123 +23,16 @@
</categories>
</neonDashletConfiguration>
<neonDashletConfiguration>
- <name>myWorkedTickets</name>
- <title>Resolved tickets</title>
- <description>Show resolved tickets</description>
- <fragment>SupportTicket/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZSI6ImFiZ2VzY2hsb3NzZW4iLCJrZXkiOiJFTkRFRCIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9LHsidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX0VESVRPUl9DT05UQUNUX0lEIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiSWNoIiwia2V5IjoiJCQkZ2xvYmFsLnVzZXIuY29udGFjdElkJCQkIiwiY29udGVudHR5cGUiOiJURVhUIn1dfQ%3D%3D</fragment>
+ <name>myFinishedTickets4Weeks</name>
+ <title>Finished Tickets last 4 weeks</title>
+ <description>Show the finished Tickets in the last 4 weeks</description>
+ <fragment>SupportTicket/filter?hidden-columns=%23GROUPING&search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUSUNLRVRfRURJVE9SX0NPTlRBQ1RfSUQiLCJvcGVyYXRvciI6IkVRVUFMIiwidmFsdWUiOiJJY2giLCJrZXkiOiIkJCRnbG9iYWwudXNlci5jb250YWN0SWQkJCQiLCJjb250ZW50dHlwZSI6IlRFWFQifSx7InR5cGUiOiJyb3ciLCJuYW1lIjoiVEFTS19TVEFUVVMiLCJvcGVyYXRvciI6IkVRVUFMIiwidmFsdWUiOiJhYmdlc2NobG9zc2VuIiwia2V5IjoiRU5ERUQiLCJjb250ZW50dHlwZSI6IlRFWFQifSx7InR5cGUiOiJyb3ciLCJuYW1lIjoiREFURV9FTkQiLCJvcGVyYXRvciI6IlRJTUVGUkFNRV9QQVNUIiwidmFsdWUiOiI0IFdvY2hlbiIsImtleSI6IlJFTD1GSVhFRDtTVEFSVD1QLTI4RCIsImNvbnRlbnR0eXBlIjoiREFURSJ9XX0%3D</fragment>
<singleton v="true" />
- <requiresConfiguration v="false" />
<storeRoles>
- <element>PROJECT_FieldStaff</element>
- <element>PROJECT_HumanResources</element>
- <element>PROJECT_Marketing</element>
- <element>PROJECT_OfficeStaff</element>
- <element>PROJECT_ProjectManagement</element>
+ <element>PROJECT_ServiceAdmin</element>
<element>PROJECT_ServiceAgent</element>
- <element>INTERNAL_ADMINISTRATOR</element>
- <element>INTERNAL_DASHBOARDSTOREADMIN</element>
- <element>INTERNAL_DESIGNER</element>
- <element>INTERNAL_GROUPWARE</element>
- <element>INTERNAL_SNMP</element>
- <element>INTERNAL_TECHNICAL</element>
- <element>INTERNAL_WEBSERVICE</element>
</storeRoles>
- <icon>NEON:MQC</icon>
- <categories>
- <neonDashletCategory>
- <name>service</name>
- <title>Service</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>notFinishedTickets</name>
- <title>Unresolved tickets</title>
- <description>Show unresolved tickets</description>
- <fragment>SupportTicket/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJFcmxlZGlndCIsImtleSI6IkRPTkUgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9LHsidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJSw7xja2ZyYWdlIEludGVybiIsImtleSI6IklOVEVOQUxSRVBMWSAgICAgICAgICAgICAgICAgICAgICAgICIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9LHsidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJSw7xja2ZyYWdlIiwia2V5IjoiUkVRVUVTVCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiwiY29udGVudHR5cGUiOiJURVhUIn1dfQ%3D%3D</fragment>
- <singleton v="true" />
- <storeRoles>
- <element>PROJECT_FieldStaff</element>
- <element>PROJECT_HumanResources</element>
- <element>PROJECT_Marketing</element>
- <element>PROJECT_OfficeStaff</element>
- <element>PROJECT_ProjectManagement</element>
- <element>PROJECT_ServiceAgent</element>
- <element>INTERNAL_ADMINISTRATOR</element>
- <element>INTERNAL_DASHBOARDSTOREADMIN</element>
- <element>INTERNAL_DESIGNER</element>
- <element>INTERNAL_GROUPWARE</element>
- <element>INTERNAL_SNMP</element>
- <element>INTERNAL_TECHNICAL</element>
- <element>INTERNAL_WEBSERVICE</element>
- </storeRoles>
- <icon>VAADIN:EDIT</icon>
- <categories>
- <neonDashletCategory>
- <name>service</name>
- <title>Service</title>
- </neonDashletCategory>
- </categories>
- <parameters>
- <neonDashletParameter>
- <name>BasedOnRoles_param</name>
- <value>true</value>
- </neonDashletParameter>
- <neonDashletParameter>
- <name>InboxId_param</name>
- <value></value>
- </neonDashletParameter>
- </parameters>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>mytickets</name>
- <title>My Tickets</title>
- <description>Show tickets I am the editor of</description>
- <fragment>SupportTicket/filter</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <storeRoles>
- <element>PROJECT_ServiceAgent</element>
- </storeRoles>
- <icon>VAADIN:TASKS</icon>
- <categories>
- <neonDashletCategory>
- <name>service</name>
- <title>Service</title>
- </neonDashletCategory>
- </categories>
- <parameters>
- <neonDashletParameter>
- <name>FilterOnlyOwnTicket_param</name>
- <value>true</value>
- </neonDashletParameter>
- </parameters>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>myOpenTickets</name>
- <title>Open Tickets</title>
- <description>Show Tickets in process</description>
- <fragment>SupportTicket/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZSI6IkVpbmdhbmciLCJrZXkiOiJFTlRSWSIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9XX0%3D</fragment>
- <singleton v="true" />
- <storeRoles>
- <element>PROJECT_FieldStaff</element>
- <element>PROJECT_HumanResources</element>
- <element>PROJECT_Marketing</element>
- <element>PROJECT_OfficeStaff</element>
- <element>PROJECT_ProjectManagement</element>
- <element>PROJECT_ServiceAgent</element>
- <element>PROJECT_Workflow</element>
- <element>INTERNAL_ADMINISTRATOR</element>
- <element>INTERNAL_CANARY</element>
- <element>INTERNAL_DASHBOARDSTOREADMIN</element>
- <element>INTERNAL_DESIGNER</element>
- <element>INTERNAL_GROUPWARE</element>
- <element>INTERNAL_SNMP</element>
- <element>INTERNAL_TECHNICAL</element>
- <element>INTERNAL_WEBSERVICE</element>
- </storeRoles>
- <provider></provider>
- <icon>VAADIN:ENVELOPE_OPEN</icon>
+ <icon>VAADIN:CHECK_SQUARE_O</icon>
<categories>
<neonDashletCategory>
<name>service</name>
@@ -173,6 +55,7 @@
<descriptionField>TASK_REQUESTOR_CONTACT_ID</descriptionField>
<entityField>#ENTITY</entityField>
<favoriteActionGroup1>FilterActionsGroup</favoriteActionGroup1>
+ <favoriteActionGroup2>observeActionGroup</favoriteActionGroup2>
<linkedColumns>
<element>TASK_SUBJECT</element>
</linkedColumns>
@@ -243,12 +126,14 @@
<additionalInfoField>CODE</additionalInfoField>
<orderByDate v="true" />
<entityField>#ENTITY</entityField>
- <favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
+ <favoriteActionGroup1>FilterActionsGroup</favoriteActionGroup1>
+ <favoriteActionGroup2>observeActionGroup</favoriteActionGroup2>
</timelineViewTemplate>
<treeTableViewTemplate>
<name>Treetable</name>
<entityField>#ENTITY</entityField>
- <favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
+ <favoriteActionGroup1>FilterActionsGroup</favoriteActionGroup1>
+ <favoriteActionGroup2>observeActionGroup</favoriteActionGroup2>
<linkedColumns>
<element>TASK_SUBJECT</element>
</linkedColumns>
diff --git a/neonView/SupportTicketMultiSelectEdit_view/SupportTicketMultiSelectEdit_view.aod b/neonView/SupportTicketMultiSelectEdit_view/SupportTicketMultiSelectEdit_view.aod
index adc58ed6e5d95ad62cb45fc90842441aff4a356d..e9a9765dfaf1def090765e65fba9c87c4d088f27 100644
--- a/neonView/SupportTicketMultiSelectEdit_view/SupportTicketMultiSelectEdit_view.aod
+++ b/neonView/SupportTicketMultiSelectEdit_view/SupportTicketMultiSelectEdit_view.aod
@@ -18,6 +18,10 @@
<name>361b2337-0c41-4b0b-b156-c1f7ffeaaa79</name>
<entityField>STATUS</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>d2e6adfd-6c7d-4fdd-9fba-14574d6a6934</name>
+ <entityField>CONCLUSION</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>df94341d-8c4d-4de6-9681-cc5983eacf35</name>
<entityField>CATEGORY</entityField>
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index 722d202ca01ad29224b88d4917f703b5b0a03065..70137006164da591b43ccd20a98b57c9423e16e6 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -885,6 +885,7 @@ TaskUtils.createNewTaskSilent = function(pDataPreset, pTaskLinks, pDbAlias)
var taskId = dataPreset.taskId || util.getNewUUID();
var startDate = dataPreset.startDate || datetime.date();
var marturityDate = dataPreset.marturityDate || marturityDate;
+ var attendees = dataPreset.attendees || [];
var fieldValues = {
"TASKID": taskId
@@ -917,7 +918,7 @@ TaskUtils.createNewTaskSilent = function(pDataPreset, pTaskLinks, pDbAlias)
if (pTaskLinks)
{
- for (var i = 0, l = pTaskLinks.length; i < l; i++)
+ for (let i = 0, l = pTaskLinks.length; i < l; i++)
{
insertStatements.push(new SqlBuilder().buildInsertStatement({"TASKLINKID": util.getNewUUID()
, "TASK_ID": taskId
@@ -925,6 +926,12 @@ TaskUtils.createNewTaskSilent = function(pDataPreset, pTaskLinks, pDbAlias)
, "OBJECT_ROWID": pTaskLinks[i][1]}, "TASKLINK"));
}
}
+ for (let i = 0; i < attendees.length; i++)
+ {
+ insertStatements.push(new SqlBuilder().buildInsertStatement({"TASKATTENDEESID": util.getNewUUID()
+ , "TASK_ID": taskId
+ , "CONTACT_ID": attendees[i]}, "TASKATTENDEES"));
+ }
db.execute(insertStatements, dbAlias);
diff --git a/process/ChecklistEntryRegistry_basic/process.js b/process/ChecklistEntryRegistry_basic/process.js
index da8f41fb3320484eebd24bfac8558c88d00b9c1e..92714d631873da6ded5af46ef5c7b066081caeb7 100644
--- a/process/ChecklistEntryRegistry_basic/process.js
+++ b/process/ChecklistEntryRegistry_basic/process.js
@@ -170,7 +170,7 @@ $ChecklistEntryRegistry.salesprojectVolume = function(){
verifierFn: function(pSalesprojectId){
var spRows = $ChecklistEntryRegistry._getRows(pSalesprojectId, "Salesproject_entity", ["VOLUME"], null, "NoPhaseRequirementLoading");
- if(spRows[0]["VOLUME"] && spRows[0]["VOLUME"] != "")
+ if(spRows && spRows[0] && spRows[0]["VOLUME"] && spRows[0]["VOLUME"] != "")
{
return true;
}
@@ -191,7 +191,7 @@ $ChecklistEntryRegistry.salesprojectProjStart = function(){
verifierFn: function(pSalesprojectId){
var spRows = $ChecklistEntryRegistry._getRows(pSalesprojectId, "Salesproject_entity", ["STARTDATE"], null, "NoPhaseRequirementLoading");
- if(spRows[0]["STARTDATE"] && spRows[0]["STARTDATE"] != "")
+ if(spRows && spRows[0] && spRows[0]["STARTDATE"] && spRows[0]["STARTDATE"] != "")
{
return true;
}
@@ -404,7 +404,7 @@ $ChecklistEntryRegistry.salesprojectStatusWon = function(){
verifierFn: function(pSalesprojectId){
var spRows = $ChecklistEntryRegistry._getRows(pSalesprojectId, "Salesproject_entity", ["STATUS"], null, "NoPhaseRequirementLoading");
- if(spRows[0]["STATUS"] && (spRows[0]["STATUS"] == $KeywordRegistry.salesprojectState$partialOrder() ||
+ if(spRows && spRows[0] && spRows[0]["STATUS"] && (spRows[0]["STATUS"] == $KeywordRegistry.salesprojectState$partialOrder() ||
spRows[0]["STATUS"] == $KeywordRegistry.salesprojectState$order()))
{
return true;
@@ -450,21 +450,28 @@ $ChecklistEntryRegistry.salesprojectRoleProjectteam = function(){
title: translate.text("Project team"),
verifierFn: function(pSalesprojectId){
var spRows = $ChecklistEntryRegistry._getRows(pSalesprojectId, "Salesproject_entity", ["SALESPROJECTID", "MST_TEAM_ID", "PROJECTCODE"], null, "NoPhaseRequirementLoading");
- var memberRows = $ChecklistEntryRegistry._getRows(null, "Member_entity", ["MEMBERROLE"], [["EnableMSTeams_param", spRows[0]["MST_TEAM_ID"]],
- ["ObjectRowId_param", spRows[0]["SALESPROJECTID"]]], "WithDistrictResponsibles");
- var roles = ["MEMROLEINITIATOR", "MEMROLEDECISIONMAKER", "MEMROLEADVISE", "MEMROLEUSER", "MEMROLEEXSALEMANAG"];
- var halfLength = Math.floor(roles.length / 2);
-
- for (let i = 0; i < memberRows.length; i++)
+ if(spRows && spRows.length > 0)
{
- var role = memberRows[i]["MEMBERROLE"];
- var index = roles.indexOf(role);
- if (index !== -1)
+ var memberRows = $ChecklistEntryRegistry._getRows(null, "Member_entity", ["MEMBERROLE"], [["EnableMSTeams_param", spRows[0]["MST_TEAM_ID"]],
+ ["ObjectRowId_param", spRows[0]["SALESPROJECTID"]]], "WithDistrictResponsibles");
+ var roles = ["MEMROLEINITIATOR", "MEMROLEDECISIONMAKER", "MEMROLEADVISE", "MEMROLEUSER", "MEMROLEEXSALEMANAG"];
+ var halfLength = Math.floor(roles.length / 2);
+
+ for (let i = 0; i < memberRows.length; i++)
{
- roles.splice(index, 1);
+ var role = memberRows[i]["MEMBERROLE"];
+ var index = roles.indexOf(role);
+ if (index !== -1)
+ {
+ roles.splice(index, 1);
+ }
}
+ return roles.length <= halfLength;
+ }
+ else
+ {
+ return false;
}
- return roles.length <= halfLength;
}
};
}
@@ -665,12 +672,13 @@ $ChecklistEntryRegistry.filter = function(){
*/
$ChecklistEntryRegistry.salesprojectResponsible = function(){
return{
- title: translate.text("Sales project responibility set"),
+ context: ["Salesproject"],
+ title: translate.text("Sales project responsibility set"),
verifierFn: function(pSalesprojectId){
var memberRows = $ChecklistEntryRegistry._getRows(null, "Member_entity", ["RESPONSIBLE"], [["EnableMSTeams_param", ""],
["ObjectRowId_param", pSalesprojectId]], "WithDistrictResponsibles");
- memberRows.some(function (row) { return row["RESPONSIBLE"] == 1; });
+ return memberRows.some(function (row) { return Utils.toBoolean(row["RESPONSIBLE"]); });
}
};
}
\ No newline at end of file
diff --git a/process/ClassificationUpdate_lib/process.js b/process/ClassificationUpdate_lib/process.js
index cb4515b6be416b89907026dd33133444266e7823..73c181e1f7a1401cead2f88a95e8671503e98766 100644
--- a/process/ClassificationUpdate_lib/process.js
+++ b/process/ClassificationUpdate_lib/process.js
@@ -684,18 +684,24 @@ ClassificationUpdateHelper._getEntityFields = function(pCurrentObjectType)
|| pClassificationTypes[type]["fieldType"] == $ClassificationFieldTypes.DATE())
{
var numberValue;
+ var valueForDisplayValue;
+ var isDate = false;
if (pClassificationTypes[type]["fieldType"] == $ClassificationFieldTypes.DATE())
{
- numberValue = ClassificationUpdateHelper._getCorrectNumberValue(false, pClassificationTypes[type], false, null, parseInt(achievedValueArray), true);
+ valueForDisplayValue = numberValue["key"].toString();
+ isDate = true;
}
else
{
- numberValue = ClassificationUpdateHelper._getCorrectNumberValue(false, pClassificationTypes[type], false, null, parseInt(achievedValueArray));
+ valueForDisplayValue = parseInt(achievedValueArray).toString();
}
-
+
+ numberValue = ClassificationUpdateHelper._getCorrectNumberValue(false, pClassificationTypes[type], false, null, parseInt(achievedValueArray), isDate);
+ pAchievedScoresObject[pUid][pClassificationTypes[type]["classificationGroupId"]][type]["value"] = $ClassificationComplexIndicatorRegistry[pClassificationTypes[type]["field"]]().getDisplayValueFn(valueForDisplayValue);
+
pAchievedScoresObject[pUid][pClassificationTypes[type]["classificationGroupId"]][type]["key"] = numberValue["key"];
- pAchievedScoresObject[pUid][pClassificationTypes[type]["classificationGroupId"]][type]["value"] = $ClassificationComplexIndicatorRegistry[pClassificationTypes[type]["field"]]().getDisplayValueFn(numberValue["key"].toString());
+
pAchievedScoresObject[pUid][pClassificationTypes[type]["classificationGroupId"]][type]["maxPoints"] = numberValue["maxPoints"];
pAchievedScoresObject[pUid][pClassificationTypes[type]["classificationGroupId"]][type]["points"] = numberValue["points"];
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 224b5a77583e0cbc17257477e700a4e99b48ed89..40cbdbeaaeb4c3de77866c99dd5d03fed9bf4472 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -1,3 +1,4 @@
+import("JditoFilter_lib");
import("system.logging");
import("Util_lib");
import("system.entities");
diff --git a/process/Dependency_lib/process.js b/process/Dependency_lib/process.js
index 0a46b676d5fd6268abaac897730ab76ce7e6b48d..efe81c43ef8249475a569c9732b3fe96a3149a33 100644
--- a/process/Dependency_lib/process.js
+++ b/process/Dependency_lib/process.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("Sql_lib");
import("system.favorite");
@@ -16,10 +17,17 @@ Dependency.defaultFunctionForField = function (pTableField)
return function (pNewData, pOldData)
{
let res = [];
- if (pNewData[pTableField])
+ if (!Utils.isNullOrEmpty(pNewData)
+ && Utils.isNotNullOrEmptyString(pNewData[pTableField]))
+ {
res.push(pNewData[pTableField])
- if (pOldData[pTableField] && pOldData[pTableField] != pNewData[pTableField])
+ }
+ if (!Utils.isNullOrEmpty(pOldData)
+ && Utils.isNotNullOrEmptyString(pOldData[pTableField])
+ && pOldData[pTableField] != pNewData[pTableField])
+ {
res.push(pOldData[pTableField])
+ }
return res;
};
}
@@ -55,7 +63,10 @@ Dependency.defaultFunctionForFields = function (pTableFields)
* @param {String} [pDataTable] The Tablename of the UID Field of the Entity. Is only need for the DB-Recordcontainer.
* @param {String} [pSourceField] The Field which one contains the UID of the dependent entity in the relation rable.
*
- * @example "Person_entity": { "Activity_entity" : { "options" : { "isObservable" : true }, "getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "OBJECT_ROWID", "CONTACTID", "Person", "CONTACT", "ACTIVITY_ID")}}
+ * @example "Person_entity":
+{ "Activity_entity" :
+{ "options" :
+{ "isObservable" : true }, "getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "OBJECT_ROWID", "CONTACTID", "Person", "CONTACT", "ACTIVITY_ID")}}
*
* @return {function} function (pNewData, pOldData) {...}
*/
@@ -73,6 +84,8 @@ Dependency.defaultFunctionForRelation = function (pRelationTable, pRelationField
relationFieldValue = pNewData[pDataTable + "." + pDataField];
}
+ relationFieldValue = relationFieldValue || pNewData[pDataField];
+
return newSelect(pRelationTable + "." + (pSourceField || "OBJECT_ROWID"))
.from(pRelationTable)
.groupBy(pRelationTable + "." + (pSourceField || "OBJECT_ROWID"))
@@ -123,117 +136,214 @@ Dependency.defaultFunctionForFavorites = function (pTableField, pContext)
* <br>
* The mapping is structured as follows: <br>
*
- * @example { "Entity_entity" : { "Dependency_entity": { "options" : { "option" : true}, "getUIDsfn" : function (pNewData, pOldData) {return //the IDs of the EntityField } } } }
+ * @example { "Entity_entity" :
+{ "Dependency_entity":
+{ "options" :
+{ "option" : true}, "getUIDsfn" : function (pNewData, pOldData) {return //the IDs of the EntityField } } } }
*
* @return {Object}
*/
Dependency.mapping = function ()
{
return {
- "Person_entity": {
- "Activity_entity" : {
- "options" : {
+ "BulkMail_entity" :
+ {
+ "BulkMailRecipient_entity" :
+ {
+ "options" :
+ {
+ "isExportable" : true,
+ "isObservable" : false
+ },
+ "getUIDsfn" : Dependency.defaultFunctionForRelation("BULKMAILRECIPIENT", "BULKMAIL_ID", "BULKMAILID", null, "BULKMAIL", "BULKMAILRECIPIENTID"),
+ "fieldsToLoad" : ["BULKMAILID"]
+ }
+ },
+ "BulkMailRecipient_entity" :
+ {
+ "Person_entity" :
+ {
+ "options" :
+ {
+ "isExportable" : true,
+ "isObservable" : false
+ },
+ "getUIDsfn" : Dependency.defaultFunctionForField("CONTACT_ID"),
+ "fieldsToLoad" : ["CONTACT_ID"]
+ }
+ },
+ "Person_entity":
+ {
+ "Activity_entity" :
+ {
+ "options" :
+ {
"isObservable" : true,
"isOwnNotified" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "OBJECT_ROWID", "CONTACTID", "Person", "CONTACT", "ACTIVITY_ID")
},
- "Task_entity" : {
- "options" : {
+ "Task_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("TASKLINK", "OBJECT_ROWID", "CONTACTID", "Person", "CONTACT", "TASK_ID")
},
- "Favorite_entity" : {
- "options" : {
+ "Favorite_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFavorites("CONTACT.CONTACTID", "Person")
+ },
+ "Address_entity" :
+ {
+ "options" :
+ {
+ "isExportable" : true,
+ "isObservable" : false
+ },
+ "getUIDsfn" : Dependency.defaultFunctionForRelation("ADDRESS", "CONTACT_ID", "CONTACTID", null, "CONTACT", "ADDRESSID"),
+ "fieldsToLoad" : ["CONTACTID"]
}
},
- "PrivatePerson_entity": {
- "Activity_entity" : {
- "options" : {
+ "PrivatePerson_entity":
+ {
+ "Activity_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "OBJECT_ROWID", "PERSONID", "PrivatePerson", "PERSON", "ACTIVITY_ID")
},
- "Task_entity" : {
- "options" : {
+ "Task_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("TASKLINK", "OBJECT_ROWID", "PERSONID", "PrivatePerson", "PERSON", "TASK_ID")
}
},
- "Organisation_entity": {
- "Activity_entity" : {
- "options" : {
+ "Organisation_entity":
+ {
+ "Activity_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "OBJECT_ROWID", "CONTACTID", "Organisation", "CONTACT", "ACTIVITY_ID")
},
- "Task_entity" : {
- "options" : {
+ "Task_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("TASKLINK", "OBJECT_ROWID", "CONTACTID", "Organisation", "CONTACT", "TASK_ID")
},
- "Favorite_entity" : {
- "options" : {
+ "Favorite_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFavorites("CONTACT.CONTACTID", "Organisation")
+ },
+ "Address_entity" :
+ {
+ "options" :
+ {
+ "isExportable" : true,
+ "isObservable" : false
+ },
+ "getUIDsfn" : Dependency.defaultFunctionForRelation("ADDRESS", "CONTACT_ID", "CONTACTID", null, "CONTACT", "ADDRESSID"),
+ "fieldsToLoad" : ["CONTACTID"]
+ },
+ "Offer_entity" :
+ {
+ "options" :
+ {
+ "isExportable" : true,
+ "isObservable" : false
+ },
+ "getUIDsfn" : Dependency.defaultFunctionForRelation("OFFER", "CONTACT_ID", "CONTACTID", null, "CONTACT", "OFFERID"),
+ "fieldsToLoad" : ["CONTACTID"]
}
},
- "Salesproject_entity": {
- "Activity_entity" : {
- "options" : {
+ "Salesproject_entity":
+ {
+ "Activity_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "OBJECT_ROWID", "SALESPROJECTID", "Salesproject", "SALESPROJECT", "ACTIVITY_ID")
},
- "Task_entity" : {
- "options" : {
+ "Task_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("TASKLINK", "OBJECT_ROWID", "SALESPROJECTID", "Salesproject", "SALESPROJECT", "TASK_ID")
},
- "Favorite_entity" : {
- "options" : {
+ "Favorite_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFavorites("SALESPROJECT.SALESPROJECTID", "Salesproject")
}
},
- "KnowledgeManagement_entity": {
- "Favorite_entity" : {
- "options" : {
+ "KnowledgeManagement_entity":
+ {
+ "Favorite_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFavorites("KNOWLEDGEMANAGEMENT.KNOWLEDGEMANAGEMENTID", "KnowledgeManagement")
}
},
- "ExportTemplate_entity": {
- "Favorite_entity" : {
- "options" : {
+ "ExportTemplate_entity":
+ {
+ "Favorite_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFavorites("EXPORTTEMPLATE.EXPORTTEMPLATEID", "ExportTemplate")
}
},
- "Order_entity": {
- "Activity_entity" : {
- "options" : {
+ "Order_entity":
+ {
+ "Activity_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "OBJECT_ROWID", "SALESORDERID", "Order", "SALESORDER", "ACTIVITY_ID")
},
- "Organisation_entity" : {
- "options" : {
+ "Organisation_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
- "getUIDsfn" : function (pRowData, pChangedData) {
+ "getUIDsfn" : function (pRowData, pChangedData)
+ {
var tableField = "SALESORDER.CONTACT_ID";
var res = [];
if (pRowData[tableField])
@@ -243,481 +353,692 @@ Dependency.mapping = function ()
return res;
}
},
- "Task_entity" : {
- "options" : {
+ "Task_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("TASKLINK", "OBJECT_ROWID", "SALESORDERID", "Order", "SALESORDER", "TASK_ID")
},
- "Favorite_entity" : {
- "options" : {
+ "Favorite_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFavorites("SALESORDER.SALESORDERID", "Order")
}
},
- "Contract_entity": {
- "Activity_entity" : {
- "options" : {
+ "Contract_entity":
+ {
+ "Activity_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "OBJECT_ROWID", "CONTRACTID", "Contract", "CONTRACT", "ACTIVITY_ID")
},
- "Task_entity" : {
- "options" : {
+ "Task_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("TASKLINK", "OBJECT_ROWID", "CONTRACTID", "Contract", "CONTRACT", "TASK_ID")
},
- "Favorite_entity" : {
- "options" : {
+ "Favorite_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFavorites("CONTRACT.CONTRACTID", "Contract")
}
},
- "Product_entity": {
- "Activity_entity" : {
- "options" : {
+ "Product_entity":
+ {
+ "Activity_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "OBJECT_ROWID", "PRODUCTID", "Product", "PRODUCT", "ACTIVITY_ID")
},
- "Task_entity" : {
- "options" : {
+ "Task_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("TASKLINK", "OBJECT_ROWID", "PRODUCTID", "Product", "PRODUCT", "TASK_ID")
},
- "Favorite_entity" : {
- "options" : {
+ "Favorite_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFavorites("PRODUCT.PRODUCTID", "Product")
}
},
- "Campaign_entity": {
- "Activity_entity" : {
- "options" : {
+ "Campaign_entity":
+ {
+ "Activity_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "OBJECT_ROWID", "CAMPAIGNID", "Campaign", "CAMPAIGN", "ACTIVITY_ID")
},
- "Task_entity" : {
- "options" : {
+ "CampaignStep_entity" :
+ {
+ "options" :
+ {
+ "isExportable" : true,
+ "isObservable" : false
+ },
+ "getUIDsfn" : Dependency.defaultFunctionForRelation("CAMPAIGNSTEP", "CAMPAIGN_ID", "CAMPAIGNID", null, "CAMPAIGN", "CAMPAIGNSTEPID"),
+ "fieldsToLoad" : ["CAMPAIGNID"]
+ },
+ "CampaignParticipant_entity" :
+ {
+ "options" :
+ {
+ "isExportable" : true,
+ "isObservable" : false
+ },
+ "getUIDsfn" : Dependency.defaultFunctionForRelation("CAMPAIGNPARTICIPANT", "CAMPAIGN_ID", "CAMPAIGNID", null, "CAMPAIGN", "CAMPAIGNPARTICIPANTID"),
+ "fieldsToLoad" : ["CAMPAIGNID"]
+ },
+ "Task_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("TASKLINK", "OBJECT_ROWID", "CAMPAIGNID", "Campaign", "CAMPAIGN", "TASK_ID")
},
- "Favorite_entity" : {
- "options" : {
+ "Favorite_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFavorites("CAMPAIGN.CAMPAIGNID", "Campaign")
}
},
- "SupportTicket_entity" : {
- "Activity_entity" : {
- "options" : {
+ "SupportTicket_entity" :
+ {
+ "Activity_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "OBJECT_ROWID", "TICKETID", "SupportTicket", "TICKET", "ACTIVITY_ID")
},
- "Task_entity" : {
- "options" : {
+ "Task_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("TASKLINK", "OBJECT_ROWID", "TICKETID", "SupportTicket", "TICKET", "TASK_ID")
},
- "Favorite_entity" : {
- "options" : {
+ "Favorite_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFavorites("TASK.TASKID", "SupportTicket")
}
},
- "Activity_entity" : {
- "Person_entity" : {
- "options" : {
+ "CampaignParticipant_entity" :
+ {
+ "Person_entity" :
+ {
+ "options" :
+ {
+ "isExportable" : true,
+ "isObservable" : false
+ },
+ "getUIDsfn" : Dependency.defaultFunctionForField("PERSON_CONTACT_ID"),
+ "fieldsToLoad" : ["PERSON_CONTACT_ID"]
+ }
+ },
+ "Activity_entity" :
+ {
+ "Person_entity" :
+ {
+ "options" :
+ {
"isObservable" : true,
"isOwnNotified" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "ACTIVITY_ID", "ACTIVITYID", "Person", "ACTIVITY")
},
- "Organisation_entity" : {
- "options" : {
+ "Organisation_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "ACTIVITY_ID", "ACTIVITYID", "Organisation", "ACTIVITY")
},
- "Salesproject_entity" : {
- "options" : {
+ "Salesproject_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "ACTIVITY_ID", "ACTIVITYID", "Salesproject", "ACTIVITY")
},
- "Offer_entity" : {
- "options" : {
+ "Offer_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "ACTIVITY_ID", "ACTIVITYID", "Offer", "ACTIVITY")
},
- "Order_entity" : {
- "options" : {
+ "Order_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "ACTIVITY_ID", "ACTIVITYID", "Order", "ACTIVITY")
},
- "Contract_entity" : {
- "options" : {
+ "Contract_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "ACTIVITY_ID", "ACTIVITYID", "Contract", "ACTIVITY")
},
- "Product_entity" : {
- "options" : {
+ "Product_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "ACTIVITY_ID", "ACTIVITYID", "Product", "ACTIVITY")
},
- "Campaign_entity" : {
- "options" : {
+ "Campaign_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "ACTIVITY_ID", "ACTIVITYID", "Campaign", "ACTIVITY")
}
},
- "Address_entity": {
- "Organisation_entity" : {
- "options" : {
+ "Address_entity":
+ {
+ "Organisation_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("ADDRESS.CONTACT_ID")
},
- "Person_entity" : {
- "options" : {
+ "Person_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("ADDRESS.CONTACT_ID")
}
},
- "AttributeRelation_entity" : {
- "Person_entity" : {
- "options" : {
+ "AttributeRelation_entity" :
+ {
+ "Person_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("AB_ATTRIBUTERELATION", "AB_ATTRIBUTERELATIONID", "AB_ATTRIBUTERELATIONID", "Person")
},
- "Organisation_entity" : {
- "options" : {
+ "Organisation_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("AB_ATTRIBUTERELATION", "AB_ATTRIBUTERELATIONID", "AB_ATTRIBUTERELATIONID", "Organisation")
},
- "Activity_entity" : {
- "options" : {
+ "Activity_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("AB_ATTRIBUTERELATION", "AB_ATTRIBUTERELATIONID", "AB_ATTRIBUTERELATIONID", "Activity")
},
- "Salesproject_entity" : {
- "options" : {
+ "Salesproject_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("AB_ATTRIBUTERELATION", "AB_ATTRIBUTERELATIONID", "AB_ATTRIBUTERELATIONID", "Salesproject")
},
- "Product_entity" : {
- "options" : {
+ "Product_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("AB_ATTRIBUTERELATION", "AB_ATTRIBUTERELATIONID", "AB_ATTRIBUTERELATIONID", "Product")
},
- "Employee_entity" : {
- "options" : {
+ "Employee_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("AB_ATTRIBUTERELATION", "AB_ATTRIBUTERELATIONID", "AB_ATTRIBUTERELATIONID", "Employee")
},
- "SupportTicket_entity" : {
- "options" : {
+ "SupportTicket_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("AB_ATTRIBUTERELATION", "AB_ATTRIBUTERELATIONID", "AB_ATTRIBUTERELATIONID", "SupportTicket")
}
},
- "Communication_entity": {
- "Person_entity" : {
- "options" : {
+ "Communication_entity":
+ {
+ "Person_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("COMMUNICATION.OBJECT_ROWID")
},
- "Organisation_entity" : {
- "options" : {
+ "Organisation_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("COMMUNICATION.OBJECT_ROWID")
}
},
- "CommRestriction_Entity" : {
- "Person_entity" : {
- "options" : {
+ "CommRestriction_Entity" :
+ {
+ "Person_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("COMMRESTRICTION.CONTACT_ID")
},
- "Organisation_entity" : {
- "options" : {
+ "Organisation_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("COMMRESTRICTION.CONTACT_ID")
}
},
- "Contact_entity" : {
- "Person_entity" : {
- "options" : {
+ "Contact_entity" :
+ {
+ "Person_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("CONTACT.CONTACTID")
}
},
- "Document_entity" : {
- "Person_entity" : {
- "options" : {
+ "Document_entity" :
+ {
+ "Person_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("assignmentRowID.value")
},
- "Organisation_entity" : {
- "options" : {
+ "Organisation_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("assignmentRowID.value")
},
- "Activity_entity" : {
- "options" : {
+ "Activity_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("assignmentRowID.value")
},
- "Task_entity" : {
- "options" : {
+ "Task_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("assignmentRowID.value")
},
- "Salesproject_entity" : {
- "options" : {
+ "Salesproject_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("assignmentRowID.value")
},
- "Offer_entity" : {
- "options" : {
+ "Offer_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("assignmentRowID.value")
},
- "Order_entity" : {
- "options" : {
+ "Order_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("assignmentRowID.value")
},
- "Contract_entity" : {
- "options" : {
+ "Contract_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("assignmentRowID.value")
},
- "Product_entity" : {
- "options" : {
+ "Product_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("assignmentRowID.value")
},
- "Employee_entity" : {
- "options" : {
+ "Employee_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("assignmentRowID.value")
},
- "SupportTicket_entity" : {
- "options" : {
+ "SupportTicket_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("assignmentRowID.value")
},
- "Campaign_entity" : {
- "options" : {
+ "Campaign_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("assignmentRowID.value")
}
},
- "ObjectTree_entity": {
- "Person_entity" : {
- "options" : {
+ "ObjectTree_entity":
+ {
+ "Person_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFields(["PARENT_ID.value", "TARGET_ID.value"])
},
- "Organisation_entity" : {
- "options" : {
+ "Organisation_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFields(["PARENT_ID.value", "TARGET_ID.value"])
}
},
- "Member_entity" : {
- "Campaign_entity" : {
- "options" : {
+ "Member_entity" :
+ {
+ "Campaign_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("OBJECTMEMBER.OBJECT_ROWID") // Evtl einschränken auf Type
},
- "Salesproject_entity" : {
- "options" : {
+ "Salesproject_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("OBJECTMEMBER.OBJECT_ROWID") // Evtl einschränken auf Type
}
},
- "SalesprojectSource_entity" : {
- "Salesproject_entity" : {
- "options" : {
+ "SalesprojectSource_entity" :
+ {
+ "Salesproject_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("SALESPROJECT_TOUCHPOINT.SALESPROJECT_ID")
}
},
- "Forecast_entity" : {
- "Salesproject_entity" : {
- "options" : {
+ "Forecast_entity" :
+ {
+ "Salesproject_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("FORECAST.OBJECT_ROWID") // Evtl einschränken auf Type
}
},
- "Offer_entity" : {
- "Salesproject_entity" : {
- "options" : {
+ "Offer_entity" :
+ {
+ "Salesproject_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("OFFER.OBJECT_ROWID") // Evtl einschränken auf Type
},
- "Activity_entity" : {
- "options" : {
+ "Activity_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "OBJECT_ROWID", "OFFERID", "Offer", "OFFER", "ACTIVITY_ID")
},
- "Task_entity" : {
- "options" : {
+ "Task_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("TASKLINK", "OBJECT_ROWID", "OFFERID", "Offer", "OFFER", "TASK_ID")
},
- "Favorite_entity" : {
- "options" : {
+ "Favorite_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFavorites("OFFER.OFFERID", "Offer")
+ },
+ "Offeritem_entity" :
+ {
+ "options" :
+ {
+ "isExportable" : true,
+ "isObservable" : false
+ },
+ "getUIDsfn" : Dependency.defaultFunctionForRelation("OFFERITEM", "OFFER_ID", "OFFERID", null, "OFFER", "OFFERITEMID"),
+ "fieldsToLoad" : ["OFFERID"]
}
},
- "DocumentTemplate_entity": {
- "Favorite_entity" : {
- "options" : {
+ "DocumentTemplate_entity":
+ {
+ "Favorite_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFavorites("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", "DocumentTemplate")
}
},
- "WorkflowDefinition_entity": {
- "Favorite_entity" : {
- "options" : {
+ "WorkflowDefinition_entity":
+ {
+ "Favorite_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFavorites("UID.value", "WorkflowDefinition")
}
},
- "Competition_entity" : {
- "Salesproject_entity" : {
- "options" : {
+ "Competition_entity" :
+ {
+ "Salesproject_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("COMPETITION.OBJECT_ROWID") // Evtl einschränken auf Type
}
},
- "Offeritem_entity" : {
- "Offer_entity" : {
- "options" : {
+ "Offeritem_entity" :
+ {
+ "Offer_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("OFFERITEM.OFFER_ID")
}
},
- "Orderitem_entity" : {
- "Order_entity" : {
- "options" : {
+ "Orderitem_entity" :
+ {
+ "Order_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("SALESORDERITEM.SALESORDER_ID")
}
},
- "Productprice_entity" : {
- "Product_entity" : {
- "options" : {
+ "Productprice_entity" :
+ {
+ "Product_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("PRODUCTPRICE.PRODUCT_ID")
},
- "Favorite_entity" : {
- "options" : {
+ "Favorite_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForFavorites("PRODUCTPRICE.PRODUCTPRICEID", "Productprice")
}
},
- "Prod2prod_entity" : {
- "Product_entity" : {
- "options" : {
+ "Prod2prod_entity" :
+ {
+ "Product_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("SOURCE_ID.value")
}
},
- "CampaignCost_entity" : {
- "Campaign_entity" : {
- "options" : {
+ "CampaignCost_entity" :
+ {
+ "Campaign_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("CAMPAIGNCOST.CAMPAIGN_ID")
}
},
- "CampaignStep_entity" : {
- "Campaign_entity" : {
- "options" : {
+ "CampaignStep_entity" :
+ {
+ "Campaign_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("CAMPAIGNSTEP.CAMPAIGN_ID")
},
- "Activity_entity" : {
- "options" : {
+ "Activity_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "OBJECT_ROWID", "CAMPAIGNSTEPID", "CampaignStep", "CAMPAIGNSTEP")
},
- "Task_entity" : {
- "options" : {
+ "Task_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForRelation("TASKLINK", "OBJECT_ROWID", "CAMPAIGNSTEPID", "CampaignStep", "CAMPAIGNSTEP")
}
},
- "Lead_entity" : {
- "Leadimport_entity" : {
- "options" : {
+ "Lead_entity" :
+ {
+ "Leadimport_entity" :
+ {
+ "options" :
+ {
"isObservable" : true
},
"getUIDsfn" : Dependency.defaultFunctionForField("LEADS.LEADIMPORT_ID")
diff --git a/process/ExportTemplate_lib/process.js b/process/ExportTemplate_lib/process.js
index 07ed68ab7557f351d24df31578bb97187cc7544d..0dc59363f125d7bd5cc256acfefe337008c86b34 100644
--- a/process/ExportTemplate_lib/process.js
+++ b/process/ExportTemplate_lib/process.js
@@ -1,3 +1,7 @@
+import("system.project");
+import("Dependency_lib");
+import("Context_lib");
+import("system.entities");
import("system.neon");
import("system.vars");
import("Address_lib");
@@ -9,6 +13,7 @@ import("system.datetime");
import("system.text");
import("system.translate");
import("system.util");
+import("Util_lib");
/**
* Methods used for ExportTemplates and exporting Fieldvalues using those templates
@@ -23,70 +28,293 @@ function ExportTemplateUtils() {}
*
* @param {String} pExportTemplateId export template id
* @param {Array} pSelection Contacts/Organisations you want to export (either via selecion by filterconditions)
- * @param {String} pComingFrom source from where you started (e.g. "PERSON", "ORGANISATION" )
* @param {String} pFilename (opt.) name of the exported file (if left blank -> "templateTitle_dd.MM.yyyy.HH:mm:ss")
+ * @param {String} pCharset the charset of the exported base64-encoded CSV
*
* @return {Object} {content: base64-encoded CSV;
* filename: filename}
- *
*/
-ExportTemplateUtils.buildExport = function (pExportTemplateId, pSelection, pComingFrom, pFilename)
+ExportTemplateUtils.buildExport = function (pExportTemplateId, pSelection, pFilename, pCharset)
{
//Gets all the relevant data from the chosen template
- var templateId = pExportTemplateId;
- var templateData = ExportTemplateUtils.getTemplateData(templateId);
+ var templateData = ExportTemplateUtils.getTemplateData(pExportTemplateId);
var templateTitle = templateData[0];
var language = templateData[1];
var sentenceSeparator = ExportTemplateUtils.getSentenceSeparator(templateData[2]);
var fieldSeparator = ExportTemplateUtils.getFieldSeparator(templateData[3]);
var fieldDeLimiter = ExportTemplateUtils.getFieldDeLimiter(templateData[4]);
var filename = pFilename;
- var fields = ExportTemplateUtils.getTemplateFields(templateId);
- var comingFrom = pComingFrom;
var selection = pSelection;
- var filteredIdcondition;
var csvTable;
- var fieldtitles = [];
if(!selection.includes("{", 0)) //checks if data is selected
{
selection = [];
selection = JSON.parse(pSelection); //makes an array of the ContactIds/OrganisationIds of the selected data
- }
+ }
- if(filename == null || filename == undefined || filename.trim() == "") //if the user didn't choose a filename => generate one automatically
+ if(Utils.isNullOrEmptyString(filename))//if the user didn't choose a filename => generate one automatically
+ {
filename = ExportTemplateUtils.getExportFileName(templateTitle, "UTC");
- filename += ".csv";
-
- //selects all the placeholders needed in the correct order
- var placeholders = PlaceholderUtils.getPlaceholders(language); //selects all placeholders
- var affectedPlaceholders = [];
- for (let i = 0; i < fields.length; i++) {
- var placeholderField = placeholders.find(function(placeholder){
- return placeholder.getFormattedName() == fields[i];
- })
- if(placeholderField)
- affectedPlaceholders.push(placeholderField);
}
+
+ filename += ".csv";
+
+ let data = new ExportTemplateData(pExportTemplateId).getMainExportData(selection);
+
+ csvTable = text.toCSV(data, sentenceSeparator, fieldSeparator, fieldDeLimiter); //generates the CSV with the correct separators
+ csvTable = util.encodeBase64String(csvTable, pCharset || "UTF-8"); //converts to Base64 (for neon.Download)
+
+ return {
+ content : csvTable,
+ filename : filename,
+ title : templateTitle
+ };
+}
+
+/**
+ * This class takes over the creation of the data for the export.
+ *
+ * @param {String} pExportTemplateId export template id
+ */
+function ExportTemplateData(pExportTemplateId)
+{
+ this.exportTemplateId = pExportTemplateId;
+
+ this.placesOfUse =
+ newSelect([
+ "EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATEPLACEOFUSEID",
+ "EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATEPLACEOFUSE_ID",
+ "EXPORTTEMPLATEPLACEOFUSE.OBJECT_FILTER",
+ "EXPORTTEMPLATEPLACEOFUSE.PLACEOFUSE"
+ ])
+ .from("EXPORTTEMPLATEPLACEOFUSE")
+ .where("EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATE_ID", this.exportTemplateId)
+ .orderBy("EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATEPLACEOFUSE_ID DESC")
+ .table();
+
+ this.placesOfUseFields = {
+ "EXPORTTEMPLATEPLACEOFUSEID" : 0,
+ "EXPORTTEMPLATEPLACEOFUSE_ID" : 1,
+ "OBJECT_FILTER" : 2,
+ "PLACEOFUSE" : 3
+ };
+
+ let fields = newSelect([
+ "EXPORTTEMPLATEFIELD.EXPORTTEMPLATEPLACEOFUSE_ID",
+ "EXPORTTEMPLATEFIELD.FIELD",
+ "EXPORTTEMPLATEPLACEOFUSE.PLACEOFUSE"
+ ])
+ .from("EXPORTTEMPLATEFIELD")
+ .rightJoin("EXPORTTEMPLATEPLACEOFUSE",
+ newWhere("EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATE_ID", this.exportTemplateId)
+ .and("EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATEPLACEOFUSEID = EXPORTTEMPLATEFIELD.EXPORTTEMPLATEPLACEOFUSE_ID"))
+ .where("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", this.exportTemplateId)
+ .orderBy("EXPORTTEMPLATEFIELD.SORTING")
+ .table();
+
+ let fieldsObjectFields = {};
+ fieldsObjectFields.EXPORTTEMPLATEPLACEOFUSE_ID = 0;
+ fieldsObjectFields.FIELD = 1;
+ fieldsObjectFields.PLACEOFUSE = 2;
+
+ this.fields = {};
+ this.exportData = [];
+ let exportHeader = [];
+
+ fields.forEach(function (pField, pIndex)
+ {
+
+ if (Utils.isNullOrEmpty(this.fields[pField[fieldsObjectFields.EXPORTTEMPLATEPLACEOFUSE_ID]]))
+ {
+ this.fields[pField[fieldsObjectFields.EXPORTTEMPLATEPLACEOFUSE_ID]] = {};
+ }
+
+ let field = this.fields[pField[fieldsObjectFields.EXPORTTEMPLATEPLACEOFUSE_ID]];
+
+ field[pField[fieldsObjectFields.FIELD]] = pIndex;
+ // Override the value with the displayValue if exists
+ field[pField[fieldsObjectFields.FIELD]+ ".displayValue"] = pIndex;
+
+ let entity = ContextUtils.getEntity(pField[fieldsObjectFields.PLACEOFUSE]);
+ let fields = project.getEntityStructure(entity).fields;
+
+ exportHeader.push(fields[pField[fieldsObjectFields.FIELD]].title);
+
+ }, this);
+
+ this.exportData.push(exportHeader);
+ // starts at one, because the headers of the columns were inserted before the content.
+ this.exportIndex = 1;
+}
+
+/**
+ * Starts the recursion with the main place of use.
+ *
+ * @param {String} pSelection stringified filter or a array of ids
+ */
+ExportTemplateData.prototype.getMainExportData = function (pSelection)
+{
+ this.placesOfUse.forEach(function (pPlaceOfUse, pIndex, pPlacesOfUse) {
+ // get the MainPlaceOfUse to start the recrusion
+ if (Utils.isNullOrEmptyString(pPlaceOfUse[this.placesOfUseFields.EXPORTTEMPLATEPLACEOFUSE_ID]))
+ {
+ let placeOfUse = pPlacesOfUse.splice(pIndex, 1)[0];
+ placeOfUse[this.placesOfUseFields.OBJECT_FILTER] = JSON.stringify(pSelection);
+ this.getExportData(placeOfUse, [], 0);
+ return; // Currently there can only be one MainPlaceOfUse.
+ }
+ }, this);
+ return this.exportData;
+}
- var replaced = getAddressesData(selection, affectedPlaceholders, null, null); //replaces all the placeholders with values
- replaced = replaced.slice(1,replaced.length); //needed in order to remove the weird first line of the Array
+/**
+ * Get and process recursive data.
+ *
+ * @param {String} pPlaceOfUse the place of use object with the filter object
+ * @param {Number} pParentCurrentIndex the index of the parrent place of use
+ * @param {Array} pIDs the ids to filter on
+ */
+ExportTemplateData.prototype.getExportData = function (pPlaceOfUse, pIDs, pParentCurrentIndex)
+{
+ let currentIndex = pParentCurrentIndex;
+ var placeOfUseEntity = ContextUtils.getEntity(pPlaceOfUse[this.placesOfUseFields.PLACEOFUSE]);
+
- for (let i = 0; i < affectedPlaceholders.length; i++)
+ if (Utils.isNullOrEmpty(this.fields[pPlaceOfUse[this.placesOfUseFields.EXPORTTEMPLATEPLACEOFUSEID]]))
{
- fieldtitles[i] = affectedPlaceholders[i].title; //gets the translations for the Labelling
+ return 0;
}
+ // get only the fields of the current PlaceOfUse
+ let placeOfUseFields = Object.keys(this.fields[pPlaceOfUse[this.placesOfUseFields.EXPORTTEMPLATEPLACEOFUSEID]]);
+
+ let dependentFieldsToLoad = [];
+ let dependentPlaceOfUse = [];
+
+ this.placesOfUse.forEach(function (pPotentialChildPlaceOfUse, pIndex, pPlacesOfUse)
+ {
+ // if pPotentialChildPlaceOfUse is a child of pPlaceOfUse
+ if (pPotentialChildPlaceOfUse[this.placesOfUseFields.EXPORTTEMPLATEPLACEOFUSE_ID] === pPlaceOfUse[this.placesOfUseFields.EXPORTTEMPLATEPLACEOFUSEID])
+ {
+ // Remove PlaceOfUse of this.placesOfUse
+ //let placeOfUse = pPlacesOfUse.splice(pIndex, 1)[0];
+ dependentPlaceOfUse.push(pPotentialChildPlaceOfUse);
+
+ let dependency = ContextUtils.getEntity(pPotentialChildPlaceOfUse[this.placesOfUseFields.PLACEOFUSE]);
+ dependentFieldsToLoad = dependentFieldsToLoad.concat(Dependency.mapping()[placeOfUseEntity][dependency]["fieldsToLoad"]); // Dependency.mapping()[placeOfUseEntity][dependency]["fieldsToLoad"][0] == "PERSON_CONTACT_ID"
+ }
+ }, this);
+
+ var data = this.getFilterData(pPlaceOfUse, placeOfUseEntity, placeOfUseFields, dependentFieldsToLoad, pIDs);
+
+ let placeOfUseId = pPlaceOfUse[this.placesOfUseFields.EXPORTTEMPLATEPLACEOFUSEID];
+ var maxCount = 0;
+ let sumcount = 0;
+ data.forEach(function (pRow, pIndex)
+ {
+ maxCount = 1;
+ dependentPlaceOfUse.forEach(function (pDependentPlaceOfUse)
+ {
+ let dependency = ContextUtils.getEntity(pDependentPlaceOfUse[this.placesOfUseFields.PLACEOFUSE]);
+ let dependentIds = Dependency.mapping()[placeOfUseEntity][dependency].getUIDsfn(pRow);
+
+ maxCount = Math.max(this.getExportData(pDependentPlaceOfUse, dependentIds, currentIndex), maxCount);
+ }, this);
+
+ if (!Utils.toBoolean(dependentPlaceOfUse.length))
+ {
+ // Last Level
+ this.setExportData(pRow, maxCount, placeOfUseId, currentIndex + pIndex);
+ }
+ else
+ {
+ // After all Levels are finish
+ this.setExportData(pRow, maxCount, placeOfUseId, currentIndex);
+ currentIndex += maxCount;
+ if (Utils.isNullOrEmptyString(pPlaceOfUse[this.placesOfUseFields.EXPORTTEMPLATEPLACEOFUSE_ID]))
+ {
+ currentIndex = pParentCurrentIndex;
+ this.exportIndex += maxCount;
+ }
+ }
+ sumcount += maxCount;
+
+ }, this);
+
+ return Math.max(sumcount, maxCount);
+}
- replaced.unshift(fieldtitles); //adds the translated Titles at the top of the table (columnHeadlines basically)
-
- csvTable = text.toCSV(replaced, sentenceSeparator, fieldSeparator, fieldDeLimiter); //generates the CSV with the correct separators
- csvTable = util.encodeBase64String(csvTable); //converts to Base64 (for neon.Download)
+
+/**
+ * Set the overtaken data into the export array.
+ *
+ * @param {Object} pPlaceOfUse the place of use object with the filter object
+ * @param {String} pPlaceOfUseEntity the entity through which the data is loaded
+ * @param {Array} pPlaceOfUseFileds the place of use id of the current place of use
+ * @param {Array} pDependentFieldsToLoad fields of the dependencies to get the conection between the enties
+ * @param {Array} pIDs the ids to filter on
+ */
+ExportTemplateData.prototype.getFilterData = function (pPlaceOfUse, pPlaceOfUseEntity, pPlaceOfUseFileds, pDependentFieldsToLoad, pIDs)
+{
+ let fields = pPlaceOfUseFileds.concat(pDependentFieldsToLoad);
+ // remove duplicate fields
+ fields = Array.from(new Set(fields));
+ var filter = JSON.parse(pPlaceOfUse[this.placesOfUseFields.OBJECT_FILTER]);
+ var config = entities.createConfigForLoadingRows()
+ .entity(pPlaceOfUseEntity)
+ .fields(fields);
- return {content : csvTable,
- filename : filename
- };
-};
+ if (Utils.isObject(filter) && Array.isArray(filter))
+ {
+ pIDs = pIDs.concat(filter);
+ }
+ else
+ {
+ config.filter(JSON.stringify(filter.filter));
+ }
+
+ config.uids(pIDs);
+
+ let rows = [];
+
+ if (pIDs.length > 0)
+ {
+ rows = entities.getRows(config);
+ }
+
+ return rows;
+}
+
+/**
+ * Set the overtaken data into the export array.
+ *
+ * @param {Array} pDataRow the data, which will be inserted
+ * @param {Number} pMaxCount the number of repeated data insertion
+ * @param {String} pPlaceOfUseId the place of use id of the current place of use
+ * @param {Number} pIndex the index of the current row
+ */
+ExportTemplateData.prototype.setExportData = function (pDataRow, pMaxCount, pPlaceOfUseId, pIndex)
+{
+ let fieldsPlaceOfUse = this.fields[pPlaceOfUseId];
+ for (let i = 0; i < pMaxCount; i++)
+ {
+ let index = this.exportIndex + i + pIndex;
+ if (Utils.isNullOrEmpty(this.exportData[index]))
+ {
+ // Create an empty array the length of the header with empty strings
+ this.exportData[index] = new Array(this.exportData[0].length).fill("");
+ }
+
+ for (let field in fieldsPlaceOfUse)
+ {
+ if (!Utils.isNullOrEmptyString(pDataRow[field]))
+ {
+ this.exportData[index][fieldsPlaceOfUse[field]] = pDataRow[field];
+ }
+ }
+ }
+}
/**
* Gets an Array of all the Fields of a ExportTemplate using it's unique exportTemplateId.
@@ -99,10 +327,10 @@ ExportTemplateUtils.buildExport = function (pExportTemplateId, pSelection, pComi
ExportTemplateUtils.getTemplateFields = function (pExportTemplateId)
{
return newSelect("EXPORTTEMPLATEFIELD.FIELD")
- .from("EXPORTTEMPLATEFIELD")
- .where("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", pExportTemplateId)
- .orderBy("EXPORTTEMPLATEFIELD.SORTING")
- .arrayColumn();
+ .from("EXPORTTEMPLATEFIELD")
+ .where("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", pExportTemplateId)
+ .orderBy("EXPORTTEMPLATEFIELD.SORTING")
+ .arrayColumn();
};
/**
@@ -116,7 +344,10 @@ ExportTemplateUtils.getTemplateFields = function (pExportTemplateId)
ExportTemplateUtils.getExportFileName = function (pTemplateTitle, pTimeZone)
{
if(pTimeZone == null || pTimeZone == undefined)
+ {
pTimeZone = "UTC";
+ }
+
var exportFileName = pTemplateTitle + "_" + datetime.toDate(datetime.date(), "dd.MM.yyyy.HH:mm:ss", pTimeZone);
return exportFileName;
@@ -132,10 +363,10 @@ ExportTemplateUtils.getExportFileName = function (pTemplateTitle, pTimeZone)
ExportTemplateUtils.getTemplateData = function (pExportTemplateId)
{
var data = newSelect(["EXPORTTEMPLATE.TITLE", "EXPORTTEMPLATE.ISOLANGUAGE", "EXPORTTEMPLATE.SENTENCESEPARATOR",
- "EXPORTTEMPLATE.FIELDSEPARATOR", "EXPORTTEMPLATE.FIELDDELIMITER"])
- .from("EXPORTTEMPLATE")
- .where("EXPORTTEMPLATE.EXPORTTEMPLATEID", pExportTemplateId)
- .arrayRow();
+ "EXPORTTEMPLATE.FIELDSEPARATOR", "EXPORTTEMPLATE.FIELDDELIMITER"])
+ .from("EXPORTTEMPLATE")
+ .where("EXPORTTEMPLATE.EXPORTTEMPLATEID", pExportTemplateId)
+ .arrayRow();
data[1] = LanguageKeywordUtils.Iso2FromIso3(data[1]) //needed to get the language in the right format
return data;
};
@@ -152,10 +383,16 @@ ExportTemplateUtils.getTemplateData = function (pExportTemplateId)
*/
ExportTemplateUtils.getSentenceSeparator = function (pSentenceSeparator)
{
- if(pSentenceSeparator == "carriage return and line feed")
- return "\r\n";
- else
- return pSentenceSeparator;
+ if(pSentenceSeparator == "carriage return and line feed")
+ {
+ return "\r\n";
+ }
+
+ else
+ {
+ return pSentenceSeparator;
+ }
+
};
/**
@@ -170,14 +407,20 @@ ExportTemplateUtils.getSentenceSeparator = function (pSentenceSeparator)
*/
ExportTemplateUtils.getFieldSeparator = function (pFieldSeparator)
{
- if(pFieldSeparator == "tabulator")
- return "\t";
- else if(pFieldSeparator == "comma")
+ if(pFieldSeparator == "tabulator")
+ {
+ return "\t";
+ }
+ else if(pFieldSeparator == "comma")
+ {
return ",";
- else if(pFieldSeparator == "semicolon")
+ }
+ else if(pFieldSeparator == "semicolon")
+ {
return ";";
- else
- return pFieldSeparator;
+ }
+
+ return pFieldSeparator;
};
/**
@@ -192,10 +435,12 @@ ExportTemplateUtils.getFieldSeparator = function (pFieldSeparator)
*/
ExportTemplateUtils.getFieldDeLimiter = function (pFieldDeLimiter)
{
- if(pFieldDeLimiter == "quotation mark")
- return "\"";
- else
- return pFieldDeLimiter;
+ if(pFieldDeLimiter == "quotation mark")
+ {
+ return "\"";
+ }
+
+ return pFieldDeLimiter;
};
/**
@@ -208,39 +453,52 @@ ExportTemplateUtils.getFieldDeLimiter = function (pFieldDeLimiter)
ExportTemplateUtils.getExportTemplateTitle = function (pExportTemplateId)
{
return newSelect("EXPORTTEMPLATE.TITLE")
- .from("EXPORTTEMPLATE")
- .where("EXPORTTEMPLATE.EXPORTTEMPLATEID", pExportTemplateId)
- .cell(true);
+ .from("EXPORTTEMPLATE")
+ .where("EXPORTTEMPLATE.EXPORTTEMPLATEID", pExportTemplateId)
+ .cell(true);
};
/**
- * Export contacts or organistaions by contactIds.<br>
+ * Export contacts or organistaions by selection (filter or a array of ids).<br>
*
- * @param {String} pRowIds <p>
- * The contact ids as JSON array.<br>
+ * @param {String} pSelection <p>
+ * filter or a array of ids
* @param {String} pSourceTableName <p>
* The source table.<br>
*/
-ExportTemplateUtils.addParticipantsByRowIds = function (pRowIds, pSourceTableName)
+ExportTemplateUtils.addParticipants = function (pSelection, pSourceTableName)
{
- var params = {
- "selectedData_param" : pRowIds,
- "comingFrom_param" : pSourceTableName}
+ var params = {
+ "selectedData_param" : pSelection,
+ "comingFrom_param" : pSourceTableName
+ }
neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
-};
+}
/**
- * Export contacts or organistaions by condition (filter).<br>
+ * Returns the exculed fields of the export entity. These fields cannot be exported.
*
- * @param {String} pCondition <p>
- * Contact ids.
- * @param {String} pSourceTableName <p>
- * The source table.<br>
+ * @return {Object} {"Entity_entity" : ["exculdedFieldName",...], ...}
*/
-ExportTemplateUtils.addParticipantsByCondition = function (pCondition, pSourceTableName)
+ExportTemplateUtils.excludedFields = function ()
{
- var params = {
- "selectedData_param" : pCondition,
- "comingFrom_param" : pSourceTableName}
- neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
-};
\ No newline at end of file
+ return {
+ "Offer_entity":["OFFER_ID"],
+ "Offeritem_entity":["ASSIGNEDTO", "ITEMSORT", "OFFER_ID"]
+ };
+}
+
+/**
+ * Thees are the Entities which can be selected in the ExportTemplatePlaceOfUseFilter_view.
+ */
+ExportTemplateUtils.exportableEntities = function ()
+{
+ return [
+ "BulkMail_entity",
+ "Campaign_entity",
+ "Offer_entity",
+ "Organisation_entity",
+ "Person_entity",
+ "Salesproject_entity"
+ ];
+}
\ No newline at end of file
diff --git a/process/JditoFilter_lib/process.js b/process/JditoFilter_lib/process.js
index 3369e0cfd4840368d4dc47adaa9380ab9ae90214..29b6ee9e6a0d8cd49e647ca37e00d095929ba85a 100644
--- a/process/JditoFilter_lib/process.js
+++ b/process/JditoFilter_lib/process.js
@@ -1,3 +1,4 @@
+import("Context_lib");
import("system.vars");
import("system.tools");
import("system.logging");
@@ -512,6 +513,44 @@ JditoFilterUtils.getEmptyFilter = function (pEntity)
return JSON.stringify(emptyFilter);
}
+/**
+ * Returns an object with the entity and filter as string.
+ * If filter or entity are not set, they are set to an empty filter and the current entity.
+ *
+ * @param {String} [pEntity]
+ * @param {Object} [pFilterObj]
+ *
+ * @return {String} Object in Format: {"filter": {"type":"group","operator":"AND","childs":[...]}, "entity": "Entity_entity"}
+ */
+JditoFilterUtils.getEntityFilter = function (pEntity, pFilterObj)
+{
+ if (!pEntity)
+ pEntity = ContextUtils.getEntity(ContextUtils.getCurrentContextId());
+ if (!pFilterObj)
+ {
+ return JditoFilterUtils.getEmptyFilter(pEntity);
+ }
+
+ return JSON.stringify({
+ "filter":pFilterObj,
+ "entity":pEntity
+ });
+}
+
+/**
+ * Returns an object with the entity and filter as string.
+ * If filter or context are not set, they are set to an empty filter and the context of the current entity.
+ *
+ * @param {String} [pContext]
+ * @param {Object} [pFilter]
+ *
+ * @return {String} Object in Format: {"filter": {"type":"group","operator":"AND","childs":[...]}, "entity": "Entity_entity"}
+ */
+JditoFilterUtils.getContextFilter = function (pContext, pFilter)
+{
+ return JditoFilterUtils.getEntityFilter(ContextUtils.getEntity(pContext), pFilter);
+}
+
/**
* Object for translating a filter object to a sql condition.
diff --git a/process/Observation_lib/process.js b/process/Observation_lib/process.js
index 7037b65adf630093f6efb2d95493cdc30aa1fffc..b90768b91d3fc9479af4ebda50b97d225408bb96 100644
--- a/process/Observation_lib/process.js
+++ b/process/Observation_lib/process.js
@@ -1,3 +1,4 @@
+import("JditoFilter_lib");
import("Keyword_lib");
import("Util_lib");
import("system.neon");
@@ -803,7 +804,7 @@ Observation.insertAction = function ()
}
else
{
- let filter = Observation.getContextFilter(contextId,vars.get("$sys.filter").filter);
+ let filter = JditoFilterUtils.getContextFilter(contextId,vars.get("$sys.filter").filter);
params["ObjectFilter_param"] = filter;
}
@@ -824,11 +825,14 @@ Observation.cancelAction = function ()
let cond = newWhere("OBSERVATION.OBJECT_TYPE", contextID)
.and("OBSERVATION.OBSERVER", observer);
- if (selectedUIDs.length){
+ if (selectedUIDs.length)
+ {
cond.and("OBSERVATION.OBJECT_ID", selectedUIDs, SqlBuilder.IN())
.deleteData(true, "OBSERVATION");
- } else {
- let filter = Observation.getContextFilter(contextID,vars.get("$sys.filter").filter);
+ }
+ else
+ {
+ let filter = JditoFilterUtils.getContextFilter(contextID,vars.get("$sys.filter").filter);
cond.and("OBSERVATION.OBJECT_FILTER", filter, SqlBuilder.LIKE())
.deleteData(true, "OBSERVATION");
@@ -930,7 +934,7 @@ Observation.countObservations = function (pSelectedUIDs)
if (pSelectedUIDs && pSelectedUIDs.length){
rowCount.and("OBSERVATION.OBJECT_ID", pSelectedUIDs, SqlBuilder.IN());
} else {
- rowCount.and("OBSERVATION.OBJECT_FILTER", Observation.getContextFilter(contextID,vars.get("$sys.filter").filter), SqlBuilder.LIKE());
+ rowCount.and("OBSERVATION.OBJECT_FILTER", JditoFilterUtils.getContextFilter(contextID,vars.get("$sys.filter").filter), SqlBuilder.LIKE());
}
return parseInt(rowCount.cell());
}
@@ -968,46 +972,6 @@ Observation.actionState = function (pSelectedUIDs, pIsCancelAction)
}
}
-/**
- * Returns an object with the entity and filter.
- * If filter or entity are not set, they are set to an empty filter and the current entity.
- *
- * @param {String} [pEntity]
- * @param {Object} [pFilterObj]
- * @return {Object} Object in Format: {"filter": {"type":"group","operator":"AND","childs":[...]}, "entity": "Entity_entity"}
- */
-Observation.getEntityFilter = function (pEntity, pFilterObj)
-{
- if (!pEntity)
- pEntity = ContextUtils.getEntity(ContextUtils.getCurrentContextId());
- if (!pFilterObj)
- {
- pFilterObj = {
- "type":"group",
- "operator":"AND",
- "childs":[]
- };
- }
-
- return JSON.stringify({
- "filter":pFilterObj,
- "entity":pEntity
- });
-}
-
-/**
- * Returns an object with the entity and filter.
- * If filter or context are not set, they are set to an empty filter and the context of the current entity.
- *
- * @param {String} [pContext]
- * @param {Object} [pFilter]
- * @return {Object} Object in Format: {"filter": {"type":"group","operator":"AND","childs":[...]}, "entity": "Entity_entity"}
- */
-Observation.getContextFilter = function (pContext, pFilter)
-{
- return Observation.getEntityFilter(ContextUtils.getEntity(pContext), pFilter);
-}
-
/**
* Gives all possible fields which can be observed.
*
diff --git a/process/Person_lib/process.js b/process/Person_lib/process.js
index 1b32bd44ec0ebc5ceab3ab8843d51a253e64c8e0..e297a0c89f1e7fea3089fe3d1bdae6597ee9d197 100644
--- a/process/Person_lib/process.js
+++ b/process/Person_lib/process.js
@@ -74,13 +74,20 @@ PersUtils.getResolvingDisplaySubSql = function(pRelationIdField, pResponsible)
/**
* creates a sql-part for resolving a person into one string of text (for example the name of a person)
* useful for example in an displayValue-expression to resolave a references which is already joined within the record-container
-
+ *
+ * @param {String} [pOptions] additional options for rendering; use values of ContactTitleRenderer.OPTIONS and pass them by bitwise OR concatination; e.g.: OPTION_1 | OPTION_2 | OPTION_5
+ *
* @return {String} a sql-part that can be placed within an SQL
*/
-PersUtils.getDisplaySqlExpression = function()
+PersUtils.getDisplaySqlExpression = function(pOptions)
{
var contact = Contact.createWithColumnPreset();
- var renderer = new ContactTitleRenderer(contact, null);
+ var options = null;
+ if(pOptions)
+ {
+ options = pOptions;
+ }
+ var renderer = new ContactTitleRenderer(contact, options);
var expression = renderer.asSql();
return expression;
}
\ No newline at end of file
diff --git a/process/Salesproject_lib/process.js b/process/Salesproject_lib/process.js
index d08cc206010cdb3dad364606ff30ed0acc7fa76b..79246a7b3dc35d3602432b0e8ff70fd87dd2e4b8 100644
--- a/process/Salesproject_lib/process.js
+++ b/process/Salesproject_lib/process.js
@@ -1,3 +1,5 @@
+import("Contact_lib");
+import("Person_lib");
import("system.datetime");
import("system.logging");
import("Sql_lib");
@@ -154,6 +156,48 @@ Salesproject.updateSalesprojectPhase = function(pSalesprojectId, pPhase)
.updateData(true, "SALESPROJECT", ["PHASE"], null, [pPhase]);
}
+/**
+ * Returns the groupQueryProcess for Responsible_filter
+ */
+Salesproject.responsibleGroupQueryProcess = function()
+{
+ var condition = vars.get("$local.condition");
+ var stmt = new SqlBuilder()
+ .from("SALESPROJECT")
+ .leftJoin("OBJECTMEMBER", newWhere("OBJECTMEMBER.OBJECT_ROWID = SALESPROJECT.SALESPROJECTID")
+ .and("OBJECTMEMBER.RESPONSIBLE", "1"))
+ .leftJoin("CONTACT", "OBJECTMEMBER.CONTACT_ID = CONTACT.CONTACTID")
+ .leftJoin("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
+ .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID");
+
+ if(Utils.isNotNullOrEmptyString(condition.trim()))
+ {
+ stmt.where(condition);
+ }
+ stmt.groupBy(["OBJECTMEMBER.CONTACT_ID", PersUtils.getDisplaySqlExpression(ContactTitleRenderer.OPTIONS.IncludeOrganisation)])
+ .orderBy(SqlBuilder.caseWhen("OBJECTMEMBER.CONTACT_ID is not null")
+ .then("OBJECTMEMBER.CONTACT_ID")
+ .elseString(translate.text("unassigned")));
+
+ if (vars.get("$local.count")) // TRUE if the count of the records is needed
+ {
+ stmt.select("1");
+ }
+ else
+ {
+ var caseWhen = SqlBuilder.caseWhen("OBJECTMEMBER.CONTACT_ID is not null")
+ .then(PersUtils.getDisplaySqlExpression(ContactTitleRenderer.OPTIONS.IncludeOrganisation))
+ .elseString(translate.text("unassigned"));
+
+ var columnlist = vars.get("$local.columnlist");
+
+ columnlist = StringUtils.replaceAll(columnlist, "$$$TITLERECORDFIELD_PLACEHOLDER$$$", caseWhen.toString());
+ stmt.select([columnlist]);
+ }
+
+ return stmt.toString();
+}
+
/**
* Methods used by the SalesprojectConversionRate.
* Do not create an instance of this!
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 39f55bb0383f83739af5f1e0db179ffe6d4b47e5..6926f5ec35b7aea6d9d61c3e69b829531885a786 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -4256,14 +4256,15 @@ SqlMaskingUtils.prototype.limit = function(pRowAmount)
switch(this.dbType)
{
case db.DBTYPE_POSTGRESQL8:
- case db.DBTYPE_ORACLE10_CLUSTER:
- case db.DBTYPE_ORACLE10_THIN:
- case db.DBTYPE_ORACLE10_OCI:
case db.DBTYPE_MARIADB10:
case db.DBTYPE_MYSQL4:
- case db.DBTYPE_SQLSERVER2000:
return "LIMIT " + pRowAmount;
+ case db.DBTYPE_SQLSERVER2000:
+ return "offset 0 rows fetch first " + pRowAmount + " rows only";
case db.DBTYPE_DERBY10:
+ case db.DBTYPE_ORACLE10_CLUSTER:
+ case db.DBTYPE_ORACLE10_THIN:
+ case db.DBTYPE_ORACLE10_OCI:
return "fetch first " + pRowAmount + " rows only";
}
}
diff --git a/process/TicketTemplate_lib/process.js b/process/TicketTemplate_lib/process.js
index 0555f45acc7bc2d9405d7879fa83045702e03ca0..6d1a536b747424c28057da93fe0ab89da967a54e 100644
--- a/process/TicketTemplate_lib/process.js
+++ b/process/TicketTemplate_lib/process.js
@@ -114,7 +114,7 @@ TicketTemplateUtils.checkIndividualAnswer = function (pTemplateId)
var sql = newSelect("DOCUMENTTEMPLATE.TEMPLATECONTENT")
.from("TICKETTEMPLATE")
.join("DOCUMENTTEMPLATE","TICKETTEMPLATE.DOCUMENTTEMPLATE_ID = DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID")
- .whereIfset("TICKETTEMPLATE.TICKETTEMPLATEID",pTemplateId)
+ .whereIfSet("TICKETTEMPLATE.TICKETTEMPLATEID",pTemplateId)
.cell()
return sql;
}
\ No newline at end of file
diff --git a/process/buildExport_serverProcess/buildExport_serverProcess.aod b/process/buildExport_serverProcess/buildExport_serverProcess.aod
new file mode 100644
index 0000000000000000000000000000000000000000..845ca703843de1c8c9732b551712e616ae8af35a
--- /dev/null
+++ b/process/buildExport_serverProcess/buildExport_serverProcess.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.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+ <name>buildExport_serverProcess</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/buildExport_serverProcess/process.js</process>
+ <variants>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/process/buildExport_serverProcess/process.js b/process/buildExport_serverProcess/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..19f950b047f91924a1d4a966a7e76122a15f4bb9
--- /dev/null
+++ b/process/buildExport_serverProcess/process.js
@@ -0,0 +1,42 @@
+import("Util_lib");
+import("ExportTemplate_lib");
+import("Document_lib");
+import("system.text");
+import("system.translate");
+import("Binary_lib");
+import("system.util");
+import("Bulkmail_lib");
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.notification");
+
+var user = vars.get("$local.user");
+var selection = JSON.parse(vars.get("$local.selection"));
+var exportTemplateId = vars.get("$local.exportTemplateId");
+var charset = vars.get("$local.charset");
+var filename = vars.get("$local.filename");
+
+var document = ExportTemplateUtils.buildExport(exportTemplateId, selection, filename, charset);
+
+let id = SingleBinaryUtils.set("EXPORTTEMPLATE", "EXPORTFILE", exportTemplateId, document.content, document.filename, "");
+
+if (id === true)
+{
+ id = SingleBinaryUtils.getMetadata("EXPORTTEMPLATE", "EXPORTFILE", exportTemplateId, null, null).id;
+}
+
+var message = translate.text("Download ready");
+var description = translate.withArguments("Export CSV \"%0\" can now be downloaded", [document.title]);
+
+var notificationConfig = notification.createConfig()
+.initialState(notification.STATE_UNSEEN)
+.forcedPriority(notification.PRIO_NORMAL)
+.linkInfo(text.encodeMS(["Document", id]))
+.daysToLive(2)
+.addUserWithId(user)
+.notificationType("DownloadReady")
+.caption(message)
+.description(description);
+
+notification.addNotificationWith(notificationConfig);
\ No newline at end of file
diff --git a/process/mailbridge_service/process.js b/process/mailbridge_service/process.js
index 28c37df7476c35dfedcc1af130e0cb0f0bd8e56a..8fb7bd912497800f9542370491a59c0b8eef62ec 100644
--- a/process/mailbridge_service/process.js
+++ b/process/mailbridge_service/process.js
@@ -60,7 +60,7 @@ ticketMailbridgeUtils.getInboxInformation = function(pRecipients, pSender, possi
.select(["INBOX.INBOXID","INBOX.REOPEN_DELAY", "INBOX.EMAIL_ADDRESS"])
.from("INBOX")
.leftJoin("MAILSIGNATURE", "INBOX.INBOXID = MAILSIGNATURE.INBOX_ID")
- .whereIfSet("EMAIL_ADDRESS", pRecipients, SqlBuilder.IN())
+ .whereIfSet("INBOX.EMAIL_ADDRESS", pRecipients, SqlBuilder.IN())
.arrayRow();
// found an INbox?
@@ -89,7 +89,7 @@ ticketMailbridgeUtils.getInboxInformation = function(pRecipients, pSender, possi
.select(["INBOX.INBOXID","INBOX.REOPEN_DELAY", "INBOX.EMAIL_ADDRESS"])
.from("INBOX")
.leftJoin("MAILSIGNATURE", "INBOX.INBOXID = MAILSIGNATURE.INBOX_ID")
- .whereIfSet("EMAIL_ADDRESS", possibleBCC, SqlBuilder.IN())
+ .whereIfSet("INBOX.EMAIL_ADDRESS", possibleBCC, SqlBuilder.IN())
.arrayRow();
if(inboxObj.inboxID.length > 0)
@@ -118,7 +118,7 @@ ticketMailbridgeUtils.getInboxInformation = function(pRecipients, pSender, possi
.select(["INBOX.INBOXID","INBOX.REOPEN_DELAY", "INBOX.EMAIL_ADDRESS"])
.from("INBOX")
.leftJoin("MAILSIGNATURE", "INBOX.INBOXID = MAILSIGNATURE.INBOX_ID")
- .whereIfSet("EMAIL_ADDRESS", possibleBCCUnfiltered, SqlBuilder.IN())
+ .whereIfSet("INBOX.EMAIL_ADDRESS", possibleBCCUnfiltered, SqlBuilder.IN())
.arrayRow();
if(inboxObj.inboxID.length > 0)
diff --git a/process/migrate_themesAsTopics_serverProcess/process.js b/process/migrate_themesAsTopics_serverProcess/process.js
index 52496b2230dc44fd3cc41656f834a8f7b8f1f7fd..f451dc6ab10d39afbadd91fb4d5261cfead041d9 100644
--- a/process/migrate_themesAsTopics_serverProcess/process.js
+++ b/process/migrate_themesAsTopics_serverProcess/process.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("system.eMath");
import("TopicTree_lib");
import("system.logging");
@@ -111,7 +112,7 @@ function _migrateTopicTree(pThemes)
topicObj[themeId]["insertHelper"]["columns"].push("DATE_NEW");
topicObj[themeId]["insertHelper"]["values"].push(date_new);
- if(theme_id && Utils.isNotNullOrEmpty(theme_id))
+ if(theme_id && Utils.isNotNullOrEmptyString(theme_id))
{
topicObj[themeId]["assignedTo"] = theme_id;
topicsToLoopTrough.push(themeId);
@@ -169,8 +170,11 @@ function _migrateTopicTree(pThemes)
previousLayer = TopicTreeUtils.getPreviousLayerName(previousLayer);
if(previousLayer != "SORTING_LAYER_0")
{
- topicObj[themeId]["insertHelper"]["columns"].push(previousLayer);
- topicObj[themeId]["insertHelper"]["values"].push(-1);//value doesn't matter here
+ if(!topicObj[themeId]["insertHelper"]["columns"].includes(previousLayer))
+ {
+ topicObj[themeId]["insertHelper"]["columns"].push(previousLayer);
+ topicObj[themeId]["insertHelper"]["values"].push("-1");//value doesn't matter here
+ }
}
else
{
@@ -210,8 +214,7 @@ function _migrateTopicTree(pThemes)
//we don't change the original order tho, since we used the stored sortingValue to sort said array that we are now looping trough
var sortingValue = eMath.addInt(i, 1);
- topicTreeColumns.push(topicObj[ownTopicId]["layer"]);
- topicTreeValues.push(sortingValue);
+ topicTreeValues[topicTreeColumns.indexOf(topicObj[ownTopicId]["layer"])] = sortingValue;
statements.push(["TOPICTREE", topicTreeColumns, null, topicTreeValues]);
}
}