diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 8a080c5eca80fb100cb811713e88f4cc50be8b50..02c4894a77d937c4b0072d79aa7d92bb98f19a6e 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -149,9 +149,9 @@
</entityFields>
</entityDb>
<entityDb>
- <name>RELATION</name>
+ <name>CONTACT</name>
<dbName></dbName>
- <idColumn>RELATIONID</idColumn>
+ <idColumn>CONTACTID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<title></title>
@@ -179,7 +179,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RELATIONID</name>
+ <name>CONTACTID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
@@ -218,7 +218,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>PERS_ID</name>
+ <name>PERSON_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -260,9 +260,9 @@
</entityFields>
</entityDb>
<entityDb>
- <name>PERS</name>
+ <name>PERSON</name>
<dbName></dbName>
- <idColumn>PERSID</idColumn>
+ <idColumn>PERSONID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<title></title>
@@ -290,7 +290,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>PERSID</name>
+ <name>PERSONID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
@@ -304,8 +304,8 @@
<dependencies>
<entityDependency>
<name>2daca400-8bad-4bad-9df3-98c4ca023c19</name>
- <entityName>RELATION</entityName>
- <fieldName>PERS_ID</fieldName>
+ <entityName>CONTACT</entityName>
+ <fieldName>PERSON_ID</fieldName>
</entityDependency>
</dependencies>
</entityFieldDb>
@@ -563,7 +563,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -577,8 +577,8 @@
<dependencies>
<entityDependency>
<name>b0a6bcf2-246e-475e-a4f0-b25553e1e27f</name>
- <entityName>RELATION</entityName>
- <fieldName>RELATIONID</fieldName>
+ <entityName>CONTACT</entityName>
+ <fieldName>CONTACTID</fieldName>
</entityDependency>
</dependencies>
</entityFieldDb>
@@ -641,7 +641,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -655,8 +655,8 @@
<dependencies>
<entityDependency>
<name>c42dcb6e-6771-4fd0-80e8-86359c417051</name>
- <entityName>RELATION</entityName>
- <fieldName>RELATIONID</fieldName>
+ <entityName>CONTACT</entityName>
+ <fieldName>CONTACTID</fieldName>
</entityDependency>
</dependencies>
</entityFieldDb>
@@ -797,7 +797,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -972,7 +972,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -1241,7 +1241,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -1662,7 +1662,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -1687,19 +1687,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>FOOTER</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2005" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>HEADER</name>
<dbName></dbName>
@@ -2107,7 +2094,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -2428,7 +2415,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -2587,7 +2574,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -2648,7 +2635,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -2868,7 +2855,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -3200,7 +3187,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -3532,7 +3519,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>EDITOR_RELATION_ID</name>
+ <name>EDITOR_CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -3602,7 +3589,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>REQUESTOR_RELATION_ID</name>
+ <name>REQUESTOR_CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -3978,7 +3965,7 @@
<columnType v="5" />
<size v="5" />
<scale v="0" />
- <notNull v="true" />
+ <notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -4254,7 +4241,7 @@
<columnType v="5" />
<size v="5" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -4301,7 +4288,7 @@
<columnType v="12" />
<size v="100" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -4343,7 +4330,7 @@
<columnType v="5" />
<size v="5" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -4375,38 +4362,38 @@
<name>ORGANISATION</name>
<title>Company</title>
<icon>VAADIN:BUILDING</icon>
- <idColumn>RELATIONID</idColumn>
+ <idColumn>CONTACTID</idColumn>
<titleColumn>TITLECOLUMN</titleColumn>
<descriptionColumn>DESCCOLUMN</descriptionColumn>
- <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/query.js</query>
- <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js</subQueries>
+ <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js</query>
+ <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js</subQueries>
<resultContextNeon>Organisation_context</resultContextNeon>
<affectedTables>
<element>ADDRESS</element>
<element>COMMUNICATION</element>
- <element>RELATION</element>
+ <element>CONTACT</element>
<element>ORGANISATION</element>
</affectedTables>
- <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/affectedIds.js</affectedIds>
+ <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js</affectedIds>
</indexSearchGroup>
<indexSearchGroup>
- <name>PERS</name>
+ <name>PERSON</name>
<title>Contact</title>
<icon>VAADIN:USERS</icon>
- <idColumn>RELATIONID</idColumn>
+ <idColumn>CONTACTID</idColumn>
<titleColumn>TITLECOLUMN</titleColumn>
<descriptionColumn>DESCCOLUMN</descriptionColumn>
- <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js</query>
- <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js</subQueries>
- <resultContextNeon>Contact_context</resultContextNeon>
+ <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/query.js</query>
+ <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/subQueries.js</subQueries>
+ <resultContextNeon>Person_context</resultContextNeon>
<affectedTables>
<element>ADDRESS</element>
<element>COMMUNICATION</element>
- <element>PERS</element>
- <element>RELATION</element>
+ <element>PERSON</element>
+ <element>CONTACT</element>
<element>ORGANISATION</element>
</affectedTables>
- <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/affectedIds.js</affectedIds>
+ <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js</affectedIds>
</indexSearchGroup>
</indexSearchGroups>
</aliasDefinition>
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/org/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js
similarity index 61%
rename from aliasDefinition/Data_alias/indexsearchgroups/org/affectedIds.js
rename to aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js
index f4d6194acd087a3a2cebccda5f7cdf0e5c5f1d84..a9593f23e2ddc424480e55bfc8cc81ae03c7f766 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/org/affectedIds.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js
@@ -15,22 +15,22 @@ infoContainer = IndexsearchUtils.createAffectedInfoContainer(idValue, null, var
switch (tableName)
{
- case "RELATION":
+ case "CONTACT":
res = [idValue];
break;
case "ORGANISATION":
- res = db.array(db.COLUMN, "select RELATION.RELATIONID from RELATION where RELATION.PERS_ID is null and RELATION.ORGANISATION_ID = '" + idValue + "'");
+ res = db.array(db.COLUMN, "select CONTACT.CONTACTID from CONTACT where CONTACT.PERSON_ID is null and CONTACT.ORGANISATION_ID = '" + idValue + "'");
break;
case "ADDRESS":
- res = IndexsearchUtils.getAffectedIdValues("RELATION_ID", infoContainer, function (id){
- return db.array(db.COLUMN, ["select ADDRESS.RELATION_ID from ADDRESS where ADDRESS.ADDRESSID = ?", [
+ res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
+ return db.array(db.COLUMN, ["select ADDRESS.CONTACT_ID from ADDRESS where ADDRESS.ADDRESSID = ?", [
[id, SqlUtils.getSingleColumnType("ADDRESS", "ADDRESSID")]
]]);
});
break;
case "COMMUNICATION":
- res = IndexsearchUtils.getAffectedIdValues("RELATION_ID", infoContainer, function (id){
- return db.array(db.COLUMN, ["select ADDRESS.RELATION_ID from COMMUNICATION where COMMUNICATIONID = ?", [
+ res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
+ return db.array(db.COLUMN, ["select ADDRESS.CONTACT_ID from COMMUNICATION where COMMUNICATIONID = ?", [
[id, SqlUtils.getSingleColumnType("COMMUNICATION", "COMMUNICATIONID")]
]]);
});
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/org/query.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
similarity index 68%
rename from aliasDefinition/Data_alias/indexsearchgroups/org/query.js
rename to aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
index a1418d7fa721bbfb6e8dc7280ce114bdce2cbd86..6f0d3f548e9cb49e63269e194ce8ad186a425298 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/org/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
@@ -8,11 +8,11 @@ import("Sql_lib");
var sqlQuery, sqlHelper, queryCondition, affectedIds;
if (vars.exists("$local.idvalue")) {
affectedIds = vars.get("$local.idvalue");
- queryCondition = "where RELATION.RELATIONID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
+ queryCondition = "where CONTACT.CONTACTID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
//TODO: refactor this for incremental indexer (injections?)
}
sqlHelper = new SqlMaskingUtils();
-sqlQuery = "select RELATION.RELATIONID "
+sqlQuery = "select CONTACT.CONTACTID "
+ "," + sqlHelper.concat(["ORGANISATION.NAME", "ORGANISATION.CUSTOMERCODE"])
+ " as TITLECOLUMN "
+ "," + sqlHelper.concat([
@@ -22,9 +22,9 @@ sqlQuery = "select RELATION.RELATIONID "
//additional indexed fields
+ ",ORGANISATION.NAME, COMMUNICATION.ADDR "
+ " from ORGANISATION "
- + " join RELATION on RELATION.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and RELATION.PERS_ID is null "
- + " left join ADDRESS defaultAddress on defaultAddress.ADDRESSID = RELATION.ADDRESS_ID "
- + " left join COMMUNICATION on COMMUNICATION.RELATION_ID = RELATION.RELATIONID "
+ + " join CONTACT on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null "
+ + " left join ADDRESS defaultAddress on defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID "
+ + " left join COMMUNICATION on COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID "
+ (queryCondition || "")
- + " order by RELATION.RELATIONID ";
+ + " order by CONTACT.CONTACTID ";
result.string(sqlQuery);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js
similarity index 57%
rename from aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js
rename to aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js
index 6e5a9c19f3c5b4a5b5a492baf5710f3fde309757..17a37f0ca6aa9488c56d0bd230066e8fd35e77c2 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("select ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.COUNTRY, ADDRESS.ADDRESS from ADDRESS where ADDRESS.RELATION_ID = '@@@'");
\ No newline at end of file
+result.string("select ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.COUNTRY, ADDRESS.ADDRESS from ADDRESS where ADDRESS.CONTACT_ID = '@@@'");
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/pers/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/pers/affectedIds.js
index 1b4bb8a597d8c09dd38e953f9d781386257b62f6..d8a51cd604e383035c7b1045fa73c24d1394267c 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/pers/affectedIds.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/pers/affectedIds.js
@@ -15,25 +15,25 @@ infoContainer = IndexsearchUtils.createAffectedInfoContainer(idValue, null, var
switch (tableName)
{
- case "RELATION":
+ case "CONTACT":
res = [idValue];
break;
- case "PERS":
- res = db.array(db.COLUMN, "select RELATION.RELATIONID from RELATION where RELATION.PERS_ID = '" + idValue + "'");
+ case "PERSON":
+ res = db.array(db.COLUMN, "select CONTACT.CONTACTID from CONTACT where CONTACT.PERSON_ID = '" + idValue + "'");
break;
case "ORGANISATION":
- res = db.array(db.COLUMN, "select RELATION.RELATIONID from RELATION where RELATION.PERS_ID is not null and RELATION.ORGANISATION_ID = '" + idValue + "'");
+ res = db.array(db.COLUMN, "select CONTACT.CONTACTID from CONTACT where CONTACT.PERSON_ID is not null and CONTACT.ORGANISATION_ID = '" + idValue + "'");
break;
case "ADDRESS":
- res = IndexsearchUtils.getAffectedIdValues("RELATION_ID", infoContainer, function (id){
- return db.array(db.COLUMN, ["select ADDRESS.RELATION_ID from ADDRESS where ADDRESS.ADDRESSID = ?", [
+ res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
+ return db.array(db.COLUMN, ["select ADDRESS.CONTACT_ID from ADDRESS where ADDRESS.ADDRESSID = ?", [
[id, SqlUtils.getSingleColumnType("ADDRESS", "ADDRESSID")]
]]);
});
break;
case "COMMUNICATION":
- res = IndexsearchUtils.getAffectedIdValues("RELATION_ID", infoContainer, function (id){
- return db.array(db.COLUMN, ["select ADDRESS.RELATION_ID from COMMUNICATION where COMMUNICATIONID = ?", [
+ res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
+ return db.array(db.COLUMN, ["select ADDRESS.CONTACT_ID from COMMUNICATION where COMMUNICATIONID = ?", [
[id, SqlUtils.getSingleColumnType("COMMUNICATION", "COMMUNICATIONID")]
]]);
});
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js b/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js
index cadb22b3fe2532311ca9dd5fc31cd8cb4728207e..8dd398447fea4415f16fb1817371b839119b6221 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js
@@ -7,12 +7,12 @@ import("Sql_lib");
var sqlQuery, sqlHelper, queryCondition, affectedIds;
if (vars.exists("$local.idvalue")) {
affectedIds = vars.get("$local.idvalue");
- queryCondition = "where RELATION.RELATIONID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
+ queryCondition = "where CONTACT.CONTACTID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
//TODO: refactor this for incremental indexer (injections?)
}
sqlHelper = new SqlMaskingUtils();
-sqlQuery = "select RELATION.RELATIONID "
- + "," + sqlHelper.concat(["PERS.SALUTATION", "PERS.FIRSTNAME", "PERS.LASTNAME", "ORGANISATION.NAME"])
+sqlQuery = "select CONTACT.CONTACTID "
+ + "," + sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "ORGANISATION.NAME"])
+ " as TITLECOLUMN "
+ "," + sqlHelper.concat([
sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
@@ -20,11 +20,11 @@ sqlQuery = "select RELATION.RELATIONID "
,"defaultAddress.COUNTRY"], ", ") + " as DESCCOLUMN "
//additional indexed fields
+ ",ORGANISATION.NAME, COMMUNICATION.ADDR "
- + " from PERS "
- + " join RELATION on RELATION.PERS_ID = PERS.PERSID "
- + " join ORGANISATION on RELATION.ORGANISATION_ID = ORGANISATION.ORGANISATIONID "
- + " left join ADDRESS defaultAddress on defaultAddress.ADDRESSID = RELATION.ADDRESS_ID "
- + " left join COMMUNICATION on COMMUNICATION.RELATION_ID = RELATION.RELATIONID "
+ + " from PERSON "
+ + " join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID "
+ + " join ORGANISATION on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID "
+ + " left join ADDRESS defaultAddress on defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID "
+ + " left join COMMUNICATION on COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID "
+ (queryCondition || "")
- + " order by RELATION.RELATIONID ";
+ + " order by CONTACT.CONTACTID ";
result.string(sqlQuery);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js b/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js
index 6e5a9c19f3c5b4a5b5a492baf5710f3fde309757..17a37f0ca6aa9488c56d0bd230066e8fd35e77c2 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("select ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.COUNTRY, ADDRESS.ADDRESS from ADDRESS where ADDRESS.RELATION_ID = '@@@'");
\ No newline at end of file
+result.string("select ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.COUNTRY, ADDRESS.ADDRESS from ADDRESS where ADDRESS.CONTACT_ID = '@@@'");
\ No newline at end of file
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index a6d7ef279293bbd90ea240b4fc5358f59e057f8a..62ece4463e7ca38fba4d6f66e7412ff80dd73082 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -6,7 +6,7 @@
<node name="CONTACTS" kind="123" title="Contactmanagement">
<icon>VAADIN:STAR</icon>
<node name="Group1" kind="123" title="">
- <node name="Contact_context" kind="10077" />
+ <node name="Person_context" kind="10077" />
<node name="Organisation_context" kind="10077" />
<node name="Activity_context" kind="10077" />
<node name="Task_context" kind="10077" />
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 33574f7d6ee4eeb2dca06096235586936b7781e3..4b805447c3d3797be103b52807919804974b8df1 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -13,10 +13,14 @@
</entityField>
<entityField>
<name>OBJECT_TYPE</name>
+ <consumer>Contexts</consumer>
+ <linkedContext>Context_context</linkedContext>
+ <displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
<title>Beziehung</title>
+ <consumer>Objects</consumer>
<linkedContextProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
</entityField>
<entityField>
@@ -37,6 +41,8 @@
<entityProvider>
<name>Link</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>OBJECT_TYPE</targetContextField>
+ <targetIdField>OBJECT_ROWID</targetIdField>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -47,6 +53,31 @@
</entityDependency>
</dependencies>
</entityProvider>
+ <entityConsumer>
+ <name>Objects</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <code>%aditoprj%/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/code.js</code>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Contexts</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js b/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c629c088234b606e7ea7872787dbb004b886e4ff
--- /dev/null
+++ b/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("system.project");
+
+if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE"))
+{
+ result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"))[1]);
+}
\ No newline at end of file
diff --git a/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/code.js b/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1bb16711d793d92bca8f72231ad9c0f745c064d
--- /dev/null
+++ b/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.OBJECT_TYPE"));
\ No newline at end of file
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 87dacb27f606eb9b5f2aa183be5606a18a12595f..f22dc2b0ba9577b37bb87a743bc3a40a8449e573 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -164,10 +164,12 @@
<entityParameter>
<name>Object1Rowid_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/objectrelations/children/object1rowid_param/code.js</code>
+ <triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>Object1Type_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/objectrelations/children/object1type_param/code.js</code>
+ <triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
@@ -232,7 +234,7 @@
</entityDependency>
<entityDependency>
<name>6461d7f4-182f-4e5c-9453-49c145e15476</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
diff --git a/entity/Activity_entity/entityfields/activitylink_dfo/children/objectrowid_param/code.js b/entity/Activity_entity/entityfields/activitylink_dfo/children/objectrowid_param/code.js
deleted file mode 100644
index a9bde0df6a88dc18ec9c7ad62dd7ddd179d96c17..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/entityfields/activitylink_dfo/children/objectrowid_param/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Context_lib");
-
-result.string(vars.get("$param.RowId_param"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitylink_dfo/children/objecttype_param/code.js b/entity/Activity_entity/entityfields/activitylink_dfo/children/objecttype_param/code.js
deleted file mode 100644
index 0cf8e0d3ad6f5feb42529d42014b09645996bcf4..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/entityfields/activitylink_dfo/children/objecttype_param/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Context_lib");
-
-result.string(vars.get("$param.ObjectId_param"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js
deleted file mode 100644
index f39bb16bbc16cc7a0d9f39a6bc549c63a0f16d02..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("ACTIVITY");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js b/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js
deleted file mode 100644
index c99cd53587f59c7e10dfab8541e38e7fdb6611d7..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.vars");
-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/objectid_param/documentation.adoc b/entity/Activity_entity/entityfields/objectid_param/documentation.adoc
index 004d34fa79b5bd7c213ddd5935ecf9dca4c5ac28..52057b7b5ccb5a737ef926c76dab9deb1b908048 100644
--- a/entity/Activity_entity/entityfields/objectid_param/documentation.adoc
+++ b/entity/Activity_entity/entityfields/objectid_param/documentation.adoc
@@ -1,3 +1,3 @@
The `ObjectId_param`-param specifies the object type of a `RowId_param`.
-For example if you pass a `RELATIONID` [of a contactperson] as `RowId_param` you've to specify the type[the `ObjObjectId_param`] as contactperson.
+For example if you pass a `CONTACTID` [of a contactperson] as `RowId_param` you've to specify the type[the `ObjObjectId_param`] as contactperson.
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index cdfe628b64bb3c834366b8b0ed29a5ae2d20a79d..c55d9dd0b875f02d4361e6a46eccece15e89eb16 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -53,9 +53,9 @@
<title>Region</title>
</entityField>
<entityField>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/relation_id/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/contact_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>STATE</name>
@@ -82,8 +82,8 @@
</dependencies>
<children>
<entityParameter>
- <name>RelationType_param</name>
- <code>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/relationtype_param/code.js</code>
+ <name>ContactType_param</name>
+ <code>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/code.js</code>
<expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
@@ -102,15 +102,15 @@
<dependencies>
<entityDependency>
<name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>PersAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
- <name>RelationType_param</name>
- <code>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/relationtype_param/code.js</code>
+ <name>ContactType_param</name>
+ <code>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
@@ -137,15 +137,15 @@
<dependencies>
<entityDependency>
<name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>OrgAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
- <name>RelationType_param</name>
- <code>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/relationtype_param/code.js</code>
+ <name>ContactType_param</name>
+ <code>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/code.js</code>
<expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
@@ -162,13 +162,13 @@
<expose v="true" />
<mandatory v="false" />
<documentation>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc</documentation>
- <description>provide a ADDRESSID-value of the standard address (of a RELATION)</description>
+ <description>provide a ADDRESSID-value of the standard address (of a CONTACT)</description>
</entityParameter>
<entityParameter>
- <name>RelationType_param</name>
+ <name>ContactType_param</name>
<expose v="true" />
<mandatory v="true" />
- <documentation>%aditoprj%/entity/Address_entity/entityfields/relationtype_param/documentation.adoc</documentation>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/contacttype_param/documentation.adoc</documentation>
<description>PARAMETER</description>
</entityParameter>
</entityFields>
@@ -227,8 +227,8 @@
<recordfield>ADDRESS.REGION</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.value</name>
- <recordfield>ADDRESS.RELATION_ID</recordfield>
+ <name>CONTACT_ID.value</name>
+ <recordfield>ADDRESS.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATE.value</name>
diff --git a/entity/Address_entity/conditionProcess.js b/entity/Address_entity/conditionProcess.js
index 5dbe85a8dfa3a58ad5b497cabd1ff873ba36a2cb..62ada302eb217d55cd56b4a8a4e72b7f99874d8b 100644
--- a/entity/Address_entity/conditionProcess.js
+++ b/entity/Address_entity/conditionProcess.js
@@ -2,6 +2,6 @@ import("system.result");
import("system.vars");
if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null && vars.get("$param.RelId_param") != "")
- result.string("ADDRESS.RELATION_ID = ('" + vars.getString("$param.RelId_param") + "')");
+ result.string("ADDRESS.CONTACT_ID = ('" + vars.getString("$param.RelId_param") + "')");
else
result.string("1 = 1");
diff --git a/entity/Address_entity/documentation.adoc b/entity/Address_entity/documentation.adoc
index 77153fad79299fdb3bb56c8e7ffa291708283488..220e9378c43c2adb918743d0164aca799b0604a4 100644
--- a/entity/Address_entity/documentation.adoc
+++ b/entity/Address_entity/documentation.adoc
@@ -7,4 +7,4 @@ an entity for logic behind a postal address
The entity manages storing postal addresses and provides features like validation.
-Every `RELATION` has one standard address value that is used by default for some actions. Keep in mind that this standard address has a special status and therefore may cannot be deleted.
+Every `CONTACT` has one standard address value that is used by default for some actions. Keep in mind that this standard address has a special status and therefore may cannot be deleted.
diff --git a/entity/Address_entity/entityfields/addr_type/documentation.adoc b/entity/Address_entity/entityfields/addr_type/documentation.adoc
index 09d2a04725d29e9db5d208b45fc7d6dc197f0225..ba58622a4b016736576a965edcfb54c79aca8fe3 100644
--- a/entity/Address_entity/entityfields/addr_type/documentation.adoc
+++ b/entity/Address_entity/entityfields/addr_type/documentation.adoc
@@ -5,5 +5,5 @@ The `ADDR_TYPE` field represents the type of address (like "shipping address", "
Possible values depend on the type of object it's connect to since a contactperson has different types than a company (organisation).
-The Keyword ADDRESS.TYPE contains the following custom properties: {org: true, pers: false}
-The types are filtered by the current relation type in the possibleItemsProcess.
\ No newline at end of file
+The Keyword ADDRESS.TYPE contains the following custom properties: {org: true, person: false}
+The types are filtered by the current contact type in the possibleItemsProcess.
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js b/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
index 917d258620aaca4fee4738309b8167820c93a07a..304ab1c8013a634350d75937222f2fccb54dfe6a 100644
--- a/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
+++ b/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
@@ -3,10 +3,10 @@ import("system.vars");
import("system.result");
import("system.neon");
import("Keyword_lib");
-import("Relation_lib");
+import("Contact_lib");
-if (vars.exists("$param.RelationType_param") && parseInt(vars.get("$param.RelationType_param"))) {
- var type = parseInt(vars.get("$param.RelationType_param"));
+if (vars.exists("$param.ContactType_param") && parseInt(vars.get("$param.ContactType_param"))) {
+ var type = parseInt(vars.get("$param.ContactType_param"));
var fields = [];
//logging.log(type)
switch (type) {
@@ -14,9 +14,9 @@ if (vars.exists("$param.RelationType_param") && parseInt(vars.get("$param.Relati
fields = ["org"];
break;
case 2:
- fields = ["pers"];
+ fields = ["person"];
case 3:
- fields = ["pers"];
+ fields = ["person"];
break;
}
diff --git a/entity/Address_entity/entityfields/relation_id/valueProcess.js b/entity/Address_entity/entityfields/contact_id/valueProcess.js
similarity index 100%
rename from entity/Address_entity/entityfields/relation_id/valueProcess.js
rename to entity/Address_entity/entityfields/contact_id/valueProcess.js
diff --git a/entity/Address_entity/entityfields/contactaddresses/children/relationtype_param/code.js b/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/code.js
similarity index 100%
rename from entity/Address_entity/entityfields/contactaddresses/children/relationtype_param/code.js
rename to entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/code.js
diff --git a/entity/Address_entity/entityfields/contacttype_param/documentation.adoc b/entity/Address_entity/entityfields/contacttype_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..f115e904b1cc44ea390bbe3b7007518d922b8f56
--- /dev/null
+++ b/entity/Address_entity/entityfields/contacttype_param/documentation.adoc
@@ -0,0 +1,2 @@
+We could calculate the contactType with the contact, but this does not work if we are in person-new / org-new.
+So we have to provide the contact type...
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/is_standard/documentation.adoc b/entity/Address_entity/entityfields/is_standard/documentation.adoc
index ec3bda82ac9cf8a6658c0c64c697e6bd0fa5da68..fb7d4bac8de251235814acac61084c0f44919064 100644
--- a/entity/Address_entity/entityfields/is_standard/documentation.adoc
+++ b/entity/Address_entity/entityfields/is_standard/documentation.adoc
@@ -1,3 +1,3 @@
The `IS_STANDARD` field specifies if an ADDRESS is the standard address (see Address_entity documentation)
-However that information is not stored directly in the `ADDRESS` database table. Every `RELATION`-record has an own standard address.
\ No newline at end of file
+However that information is not stored directly in the `ADDRESS` database table. Every `CONTACT`-record has an own standard address.
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/orgaddress_dfi/children/relationtype_param/documentation.adoc b/entity/Address_entity/entityfields/orgaddress_dfi/children/relationtype_param/documentation.adoc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Address_entity/entityfields/orgaddresses/children/relationtype_param/code.js b/entity/Address_entity/entityfields/orgaddresses/children/contacttype_param/code.js
similarity index 100%
rename from entity/Address_entity/entityfields/orgaddresses/children/relationtype_param/code.js
rename to entity/Address_entity/entityfields/orgaddresses/children/contacttype_param/code.js
diff --git a/entity/Address_entity/entityfields/organisationaddresses/children/relationtype_param/code.js b/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/code.js
similarity index 100%
rename from entity/Address_entity/entityfields/organisationaddresses/children/relationtype_param/code.js
rename to entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/code.js
diff --git a/entity/Address_entity/entityfields/organisationaddressesbycontact/children/relationtype_param/code.js b/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/code.js
similarity index 100%
rename from entity/Address_entity/entityfields/organisationaddressesbycontact/children/relationtype_param/code.js
rename to entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/code.js
diff --git a/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc b/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc
index 36535f6b0afb8bf406277701cd5dc5593edf5bb3..6eb2a8e848e21a2e53a9f31c53291dbb14a6d10c 100644
--- a/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc
+++ b/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc
@@ -1,4 +1,4 @@
-Get the organisation addresses of a contact. The organisation is loaded by the relation of the contact.
-You have to provide the relation ID from the contact.
+Get the organisation addresses of a contact. The organisation is loaded by the contact of the contact.
+You have to provide the contact ID from the contact.
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/persaddresses/children/relationtype_param/code.js b/entity/Address_entity/entityfields/persaddresses/children/contacttype_param/code.js
similarity index 100%
rename from entity/Address_entity/entityfields/persaddresses/children/relationtype_param/code.js
rename to entity/Address_entity/entityfields/persaddresses/children/contacttype_param/code.js
diff --git a/entity/Address_entity/entityfields/relationtype_param/documentation.adoc b/entity/Address_entity/entityfields/relationtype_param/documentation.adoc
deleted file mode 100644
index fa5746dc1548d47ec5710ac810106501a897710b..0000000000000000000000000000000000000000
--- a/entity/Address_entity/entityfields/relationtype_param/documentation.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-We could calculate the relationtype with the relation, but this does not work if we are in pers-new / org-new.
-So we have to provide the relation type...
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/relid_param/documentation.adoc b/entity/Address_entity/entityfields/relid_param/documentation.adoc
index 9be1a639304863bfa8b23b659c3a9729cb018a55..d38af2e51ab35d503516c6ece3a57acc69573ec2 100644
--- a/entity/Address_entity/entityfields/relid_param/documentation.adoc
+++ b/entity/Address_entity/entityfields/relid_param/documentation.adoc
@@ -1,4 +1,4 @@
-`RELATIONID`-value that is associated with
+`CONTACTID`-value that is associated with
* an existing address (=filtering)
* an address that shall be created (=inserted)
\ No newline at end of file
diff --git a/entity/Address_entity/recordcontainers/db/conditionProcess.js b/entity/Address_entity/recordcontainers/db/conditionProcess.js
index 7ee6a70eb73ceb8666f4e765a793f3cd5ad8ab65..34aa7047635486364e831dd80620fd9921b2e3a0 100644
--- a/entity/Address_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Address_entity/recordcontainers/db/conditionProcess.js
@@ -2,6 +2,6 @@ import("system.result");
import("system.vars");
if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null)
- result.string("ADDRESS.RELATION_ID = ('" + vars.getString("$param.RelId_param") + "')");
+ result.string("ADDRESS.CONTACT_ID = ('" + vars.getString("$param.RelId_param") + "')");
else
result.string("1 = 2");
\ No newline at end of file
diff --git a/entity/Relation_entity/Relation_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
similarity index 73%
rename from entity/Relation_entity/Relation_entity.aod
rename to entity/AnyContact_entity/AnyContact_entity.aod
index 50eee5086794a2e23731a4023c944b9661e87125..94ce55e97ff56c40cee194ea570bdf80eae5db10 100644
--- a/entity/Relation_entity/Relation_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
- <name>Relation_entity</name>
+ <name>AnyContact_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <titleProcess>%aditoprj%/entity/Relation_entity/titleProcess.js</titleProcess>
+ <titleProcess>%aditoprj%/entity/AnyContact_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -41,11 +41,11 @@
<searchable v="false" />
</entityField>
<entityField>
- <name>PERS_ID</name>
+ <name>PERSON_ID</name>
<searchable v="false" />
</entityField>
<entityField>
- <name>RELATIONID</name>
+ <name>CONTACTID</name>
<searchable v="false" />
</entityField>
<entityField>
@@ -53,25 +53,25 @@
<searchable v="false" />
</entityField>
<entityField>
- <name>relationType</name>
- <description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERS_ID.
+ <name>contactType</name>
+ <description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERSON_ID.
See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<contentType>NUMBER</contentType>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Relation_entity/entityfields/relationtype/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>Contact</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>Contact</fieldName>
</dependency>
<children>
<entityParameter>
- <name>RelationId_param</name>
- <code>%aditoprj%/entity/Relation_entity/entityfields/contact/children/relationid_param/code.js</code>
+ <name>ContactId_param</name>
+ <code>%aditoprj%/entity/AnyContact_entity/entityfields/contact/children/ContactId_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -85,8 +85,8 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
</dependency>
<children>
<entityParameter>
- <name>relationId_param</name>
- <code>%aditoprj%/entity/Relation_entity/entityfields/organisation/children/relationid_param/code.js</code>
+ <name>ContactId_param</name>
+ <code>%aditoprj%/entity/AnyContact_entity/entityfields/organisation/children/ContactId_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -95,17 +95,17 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<title>Organisation name</title>
</entityField>
<entityField>
- <name>PERS_FIRSTNAME</name>
+ <name>PERSON_FIRSTNAME</name>
<title>Firstname</title>
</entityField>
<entityField>
- <name>PERS_LASTNAME</name>
+ <name>PERSON_LASTNAME</name>
<title>Lastname</title>
</entityField>
<entityField>
<name>IMAGE</name>
<contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Relation_entity/entityfields/image/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/image/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>EmailCommunications</name>
@@ -118,7 +118,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Relation_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/AnyContact_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -133,7 +133,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Relation_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/AnyContact_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -154,12 +154,12 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
- <fromClauseProcess>%aditoprj%/entity/Relation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <fromClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<linkInformation>
<linkInformation>
<name>7b3fa460-44a1-40f3-89e3-1625ce9c6bb3</name>
- <tableName>RELATION</tableName>
- <primaryKey>RELATIONID</primaryKey>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
@@ -172,8 +172,8 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
</linkInformation>
<linkInformation>
<name>d15ccb84-6928-4c44-b940-0f5d04826b55</name>
- <tableName>PERS</tableName>
- <primaryKey>PERSID</primaryKey>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
@@ -188,51 +188,51 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ADDRESS_ID.value</name>
- <recordfield>RELATION.ADDRESS_ID</recordfield>
+ <recordfield>CONTACT.ADDRESS_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LANGUAGE.value</name>
- <recordfield>RELATION.LANGUAGE</recordfield>
+ <recordfield>CONTACT.LANGUAGE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORGANISATION_ID.value</name>
- <recordfield>RELATION.ORGANISATION_ID</recordfield>
+ <recordfield>CONTACT.ORGANISATION_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>PERS_ID.value</name>
- <recordfield>RELATION.PERS_ID</recordfield>
+ <name>PERSON_ID.value</name>
+ <recordfield>CONTACT.PERSON_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATIONID.value</name>
- <recordfield>RELATION.RELATIONID</recordfield>
+ <name>CONTACTID.value</name>
+ <recordfield>CONTACT.CONTACTID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.value</name>
- <recordfield>RELATION.STATUS</recordfield>
+ <recordfield>CONTACT.STATUS</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_NAME.value</name>
<recordfield>ORGANISATION.NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>PERS_FIRSTNAME.value</name>
- <recordfield>PERS.FIRSTNAME</recordfield>
+ <name>PERSON_FIRSTNAME.value</name>
+ <recordfield>PERSON.FIRSTNAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>PERS_LASTNAME.value</name>
- <recordfield>PERS.LASTNAME</recordfield>
+ <name>PERSON_LASTNAME.value</name>
+ <recordfield>PERSON.LASTNAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_EMAIL_COMMUNICATION.value</name>
- <expression>%aditoprj%/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.value/expression.js</expression>
+ <expression>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_PHONE_COMMUNICATION.value</name>
- <expression>%aditoprj%/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js</expression>
+ <expression>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RELATIONSHIP.value</name>
- <recordfield>RELATION.RELATIONSHIP</recordfield>
+ <recordfield>CONTACT.RELATIONSHIP</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
diff --git a/entity/Activity_entity/entityfields/historylink_dfo/children/historyid_param/code.js b/entity/AnyContact_entity/entityfields/contact/children/contactid_param/code.js
similarity index 52%
rename from entity/Activity_entity/entityfields/historylink_dfo/children/historyid_param/code.js
rename to entity/AnyContact_entity/entityfields/contact/children/contactid_param/code.js
index bdca80f63bfad0ebe63e4c896c70e10005f999d3..7b6137b4d105e9ba592cf8ef6e796fb838a32b09 100644
--- a/entity/Activity_entity/entityfields/historylink_dfo/children/historyid_param/code.js
+++ b/entity/AnyContact_entity/entityfields/contact/children/contactid_param/code.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.ACTIVITYID"))
\ No newline at end of file
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/entityfields/contacttype/valueProcess.js b/entity/AnyContact_entity/entityfields/contacttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..51fe974083978cb392d4f2c281c66687794d2d50
--- /dev/null
+++ b/entity/AnyContact_entity/entityfields/contacttype/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+import("Contact_lib")
+
+result.object(RelationUtils.getRelationType(vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
diff --git a/entity/Relation_entity/entityfields/date_edit/valueProcess.js b/entity/AnyContact_entity/entityfields/date_edit/valueProcess.js
similarity index 100%
rename from entity/Relation_entity/entityfields/date_edit/valueProcess.js
rename to entity/AnyContact_entity/entityfields/date_edit/valueProcess.js
diff --git a/entity/Relation_entity/entityfields/date_new/valueProcess.js b/entity/AnyContact_entity/entityfields/date_new/valueProcess.js
similarity index 100%
rename from entity/Relation_entity/entityfields/date_new/valueProcess.js
rename to entity/AnyContact_entity/entityfields/date_new/valueProcess.js
diff --git a/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js b/entity/AnyContact_entity/entityfields/emailcommunications/children/relid_param/code.js
similarity index 52%
rename from entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js
rename to entity/AnyContact_entity/entityfields/emailcommunications/children/relid_param/code.js
index a8267b62060b4bd30cedaba4713f4421a6e6f9ff..7b6137b4d105e9ba592cf8ef6e796fb838a32b09 100644
--- a/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js
+++ b/entity/AnyContact_entity/entityfields/emailcommunications/children/relid_param/code.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/entityfields/image/valueProcess.js b/entity/AnyContact_entity/entityfields/image/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bc039e74557533bbb18b9efc1a7ebe573abcf3ee
--- /dev/null
+++ b/entity/AnyContact_entity/entityfields/image/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Person_lib");
+import("Organisation_lib");
+import("Contact_lib");
+
+if (vars.get("$field.contactType") == 1) // 1 == org, 2 == person, 3 == person
+{
+ result.string(OrgUtils.getImage(vars.get("$field.ORGANISATION_ID"), vars.getString("$field.ORG_NAME")));
+}
+else
+{
+ result.string(PersUtils.getImage(vars.get("$field.PERSON_ID"), (vars.getString("$field.PERSON_FIRSTNAME") + " " + vars.getString("$field.PERSON_LASTNAME")).trim()));
+}
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/activities/children/rowid_param/code.js b/entity/AnyContact_entity/entityfields/organisation/children/contactid_param/code.js
similarity index 52%
rename from entity/Contact_entity/entityfields/activities/children/rowid_param/code.js
rename to entity/AnyContact_entity/entityfields/organisation/children/contactid_param/code.js
index 9517eee9df12cb0d7f101f8b3d284031228f5cf7..7b6137b4d105e9ba592cf8ef6e796fb838a32b09 100644
--- a/entity/Contact_entity/entityfields/activities/children/rowid_param/code.js
+++ b/entity/AnyContact_entity/entityfields/organisation/children/contactid_param/code.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/entityfields/phonecommunications/children/relid_param/code.js b/entity/AnyContact_entity/entityfields/phonecommunications/children/relid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..7b6137b4d105e9ba592cf8ef6e796fb838a32b09
--- /dev/null
+++ b/entity/AnyContact_entity/entityfields/phonecommunications/children/relid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Relation_entity/entityfields/user_edit/valueProcess.js b/entity/AnyContact_entity/entityfields/user_edit/valueProcess.js
similarity index 100%
rename from entity/Relation_entity/entityfields/user_edit/valueProcess.js
rename to entity/AnyContact_entity/entityfields/user_edit/valueProcess.js
diff --git a/entity/Relation_entity/entityfields/user_new/valueProcess.js b/entity/AnyContact_entity/entityfields/user_new/valueProcess.js
similarity index 100%
rename from entity/Relation_entity/entityfields/user_new/valueProcess.js
rename to entity/AnyContact_entity/entityfields/user_new/valueProcess.js
diff --git a/entity/Relation_entity/recordcontainers/db/fromClauseProcess.js b/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js
similarity index 78%
rename from entity/Relation_entity/recordcontainers/db/fromClauseProcess.js
rename to entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js
index 83aeff7fbfe6119ef6db05ab8809c104d384a650..754b510a9579742a29e6c83c9960e86b34808e25 100644
--- a/entity/Relation_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,4 +1,4 @@
import("system.result");
-import("Relation_lib")
+import("Contact_lib")
result.string(RelationUtils.getFullRelationFromString());
\ No newline at end of file
diff --git a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js b/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js
similarity index 100%
rename from entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
rename to entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js
diff --git a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js b/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js
similarity index 100%
rename from entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
rename to entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js
diff --git a/entity/AnyContact_entity/titleProcess.js b/entity/AnyContact_entity/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..383efef8d5428179a79ee3f5042f8cf5482b3843
--- /dev/null
+++ b/entity/AnyContact_entity/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+
+if(vars.get("$field.PERSON_FIRSTNAME")) {
+ result.string(vars.get("$field.PERSON_FIRSTNAME") + " " + vars.get("$field.PERSON_LASTNAME"));
+} else {
+ result.string(vars.get("$field.ORG_NAME"));
+}
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 6fbc883175d2d8f650c4e6c032372c2ab7810bcc..ec92d7925721750271e121285f12221f88262aed 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -143,11 +143,13 @@
<name>AnyObjectRowid_param</name>
<code>%aditoprj%/entity/Appointment_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js</code>
<expose v="true" />
+ <triggerRecalculation v="true" />
<mandatory v="false" />
</entityParameter>
<entityParameter>
<name>AnyObjectType_param</name>
<code>%aditoprj%/entity/Appointment_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js</code>
+ <triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 80addbafcc8b5d0a60f6e39ac6cfe1642f3ff7ff..d15eed456adbf95057975609e862dbb79e4df192 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -18,7 +18,7 @@
<title>Attribute</title>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/possibleItemsProcess.js</possibleItemsProcess>
- <stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/stateProcess.js</stateProcess>
+ <onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..e641c892888d2ee12cdbf69f722f489e30af0f93
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT ||
+ vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+ neon.setFieldValue("$field.BOOL_VALUE", null);
+ neon.setFieldValue("$field.CHAR_VALUE", null);
+ neon.setFieldValue("$field.DATE_VALUE", null);
+ neon.setFieldValue("$field.ID_VALUE", null);
+ neon.setFieldValue("$field.NUMBER_VALUE", null);
+}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/bool_value/valueProcess.js b/entity/AttributeRelation_entity/entityfields/bool_value/valueProcess.js
index 13b11be60e6ff9abcd2ae44306b70f3367cdb5ed..c5937313ed5351c005fd2f860e5df0cbd2f6cf5d 100644
--- a/entity/AttributeRelation_entity/entityfields/bool_value/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/bool_value/valueProcess.js
@@ -1,3 +1,4 @@
+import("system.vars");
import("system.result");
-
-result.string("0")
\ No newline at end of file
+if(!vars.get("$field.BOOL_VALUE"))
+ result.string("0");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js b/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js
index 83fdc179510373157ac394d755c406adc59e1c43..5f2f5a7b0d369b3b45e91afe9248bfd1660c966a 100644
--- a/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js
@@ -2,5 +2,5 @@ import("system.vars");
import("system.result");
import("system.neon");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.objectRowId_param") && vars.get("$param.objectRowId_param") != null)
+if (vars.exists("$param.objectRowId_param") && vars.get("$param.objectRowId_param") != null)
result.string(vars.get("$param.objectRowId_param"));
\ No newline at end of file
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index a1548f7d853e473527a467b354b53bfb30dc1b86..3e09f37f88e80934bfd8e783a94186b303391355 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -24,8 +24,8 @@
<possibleItemsProcess>%aditoprj%/entity/Communication_entity/entityfields/medium_id/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
- <name>RELATION_ID</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/relation_id/valueProcess.js</valueProcess>
+ <name>CONTACT_ID</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/contact_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>STANDARD</name>
@@ -34,7 +34,7 @@
<entityParameter>
<name>RelId_param</name>
<expose v="true" />
- <description>This parameter is used for specifing a related &quot;RELATIONID&quot; to a COMMUNICATION-entry.
+ <description>This parameter is used for specifing a related &quot;CONTACTID&quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entires by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
<entityField>
@@ -47,8 +47,8 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
<recordContainer>db</recordContainer>
</entityProvider>
<entityParameter>
- <name>RelationsMainCountry_param</name>
- <code>%aditoprj%/entity/Communication_entity/entityfields/relationsmaincountry_param/code.js</code>
+ <name>ContactsMainCountry_param</name>
+ <code>%aditoprj%/entity/Communication_entity/entityfields/contactsmaincountry_param/code.js</code>
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
@@ -65,7 +65,7 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
</entityDependency>
<entityDependency>
<name>22dd8c4d-2081-4547-adbd-929868f23069</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>Communications</fieldName>
<isConsumer v="false" />
</entityDependency>
@@ -91,13 +91,13 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
</entityDependency>
<entityDependency>
<name>0eed17a6-443e-4469-a53b-3ce81440d7d0</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>PhoneCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>ddcd3c3d-f305-4ced-a8ac-ffb510474aa4</name>
- <entityName>Relation_entity</entityName>
+ <entityName>AnyContact_entity</entityName>
<fieldName>PhoneCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
@@ -124,13 +124,13 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
</entityDependency>
<entityDependency>
<name>f8cc4865-ab08-4540-bd02-2b2c92946c84</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>EmailCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>c6e2631a-896f-4689-b254-0091ed25f705</name>
- <entityName>Relation_entity</entityName>
+ <entityName>AnyContact_entity</entityName>
<fieldName>EmailCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
@@ -185,8 +185,8 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
<recordfield>COMMUNICATION.COMMUNICATIONID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.value</name>
- <recordfield>COMMUNICATION.RELATION_ID</recordfield>
+ <name>CONTACT_ID.value</name>
+ <recordfield>COMMUNICATION.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD.value</name>
diff --git a/entity/Communication_entity/entityfields/addr/onValidation.js b/entity/Communication_entity/entityfields/addr/onValidation.js
index 9a76546b124bf22a16326db9db6a6d7b30a49b41..d891aa3a27aa5b3ba45191d69a6121292efbc544 100644
--- a/entity/Communication_entity/entityfields/addr/onValidation.js
+++ b/entity/Communication_entity/entityfields/addr/onValidation.js
@@ -16,7 +16,7 @@ var fn = CommValidationUtil.makeValidationFn(commCategory);
if (fn != null){
var commAddr = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.ADDR"));
var additional = CommValidationUtil.getExtensionsBlueprint();
- additional.countryCode = vars.get("$param.RelationsMainCountry_param");//TODO: try to use users language first and then the companies
+ additional.countryCode = vars.get("$param.ContactsMainCountry_param");//TODO: try to use users language first and then the companies
var res = fn.call(null, commAddr, additional);
if (res != null)
result.string(res);
diff --git a/entity/Communication_entity/entityfields/relation_id/valueProcess.js b/entity/Communication_entity/entityfields/contact_id/valueProcess.js
similarity index 100%
rename from entity/Communication_entity/entityfields/relation_id/valueProcess.js
rename to entity/Communication_entity/entityfields/contact_id/valueProcess.js
diff --git a/entity/Communication_entity/entityfields/relationsmaincountry_param/code.js b/entity/Communication_entity/entityfields/contactsmaincountry_param/code.js
similarity index 68%
rename from entity/Communication_entity/entityfields/relationsmaincountry_param/code.js
rename to entity/Communication_entity/entityfields/contactsmaincountry_param/code.js
index caa4f4f5ca420da6bd45bed23347b5b010d2718d..2d4e7c03d31b755426038ee42e8905e6a42f8457 100644
--- a/entity/Communication_entity/entityfields/relationsmaincountry_param/code.js
+++ b/entity/Communication_entity/entityfields/contactsmaincountry_param/code.js
@@ -5,9 +5,9 @@ import("Sql_lib");
var relId, country, cond;
cond = new SqlCondition();
-cond.andPrepareVars("RELATION.RELATIONID", "$param.RelId_param");
+cond.andPrepareVars("CONTACT.CONTACTID", "$param.RelId_param");
//TODO: this should happen by 1:1 links instead of manually requesting the data by a select
country = db.cell(cond.buildSql("select ADDRESS.COUNTRY from ADDRESS "
- + "join RELATION on RELATION.ADDRESS_ID = ADDRESS.ADDRESSID ", "1 = 1"));
+ + "join CONTACT on CONTACT.ADDRESS_ID = ADDRESS.ADDRESSID ", "1 = 1"));
if (country != "")
result.string(country);
\ No newline at end of file
diff --git a/entity/Communication_entity/recordcontainers/db/conditionProcess.js b/entity/Communication_entity/recordcontainers/db/conditionProcess.js
index 656954acb7a3c683d69472d9c0c522c0febe4f8f..da78467b589dabc627885572fe7a5b3f9411a72e 100644
--- a/entity/Communication_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Communication_entity/recordcontainers/db/conditionProcess.js
@@ -5,7 +5,7 @@ import("Sql_lib");
import("Keyword_lib");
var cond = new SqlCondition();
-cond.andPrepareVars("COMMUNICATION.RELATION_ID", "$param.RelId_param");
+cond.andPrepareVars("COMMUNICATION.CONTACT_ID", "$param.RelId_param");
if (vars.exists("$param.CommMediumIds_param"))
{
diff --git a/entity/Contact_entity/entityfields/communications/children/relid_param/code.js b/entity/Contact_entity/entityfields/communications/children/relid_param/code.js
deleted file mode 100644
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/communications/children/relid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/contracts/children/relid_param/code.js b/entity/Contact_entity/entityfields/contracts/children/relid_param/code.js
deleted file mode 100644
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/contracts/children/relid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/documents/children/assignmentrowid_param/code.js b/entity/Contact_entity/entityfields/documents/children/assignmentrowid_param/code.js
deleted file mode 100644
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/documents/children/assignmentrowid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/documents/children/assignmenttable_param/code.js b/entity/Contact_entity/entityfields/documents/children/assignmenttable_param/code.js
deleted file mode 100644
index 12bc7590c1bd654d67409332f165b2f7a0cd24b6..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/documents/children/assignmenttable_param/code.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("RELATION");
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/emailcommunications/children/relid_param/code.js b/entity/Contact_entity/entityfields/emailcommunications/children/relid_param/code.js
deleted file mode 100644
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/emailcommunications/children/relid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/image/valueProcess.js b/entity/Contact_entity/entityfields/image/valueProcess.js
deleted file mode 100644
index 14213dfae453c841133b9833a6b9a15143a9b865..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/image/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("Pers_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
-{
- result.string(PersUtils.getImage(vars.get("$field.PERSID"), (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME")).trim()));
-}
diff --git a/entity/Contact_entity/entityfields/newactivity/onActionProcess.js b/entity/Contact_entity/entityfields/newactivity/onActionProcess.js
deleted file mode 100644
index 46bf5e11471e87366041e50c488b84d3e7c9bbf6..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/newactivity/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Activity_lib");
-
-ActivityUtils.createNewActivity(vars.getString("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/newoffer/onActionProcess.js b/entity/Contact_entity/entityfields/newoffer/onActionProcess.js
deleted file mode 100644
index fdee58dbfa82c4c75a4482a0df109f56ffd47762..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/newoffer/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Offer_lib");
-
-OfferUtils.createNewOffer(null, vars.getString("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/openeditdefaultsview/onActionProcess.js b/entity/Contact_entity/entityfields/openeditdefaultsview/onActionProcess.js
deleted file mode 100644
index 66caa626fa898493304f86086061d38edce7a07a..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/openeditdefaultsview/onActionProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.neon");
-neon.openContext("Contact_context", "ContactEditDefaults_view", [vars.get("$field.RELATIONID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js b/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
deleted file mode 100644
index 7586ff1cc154f2022c7fa6ae2a128e11a6d39a69..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.neon");
-neon.openContext("Contact_context", "ContactEditDefaults_view", [vars.get("$sys.uid")], neon.OPERATINGSTATE_EDIT, null);
diff --git a/entity/Contact_entity/entityfields/orgaddresses/children/relid_param/code.js b/entity/Contact_entity/entityfields/orgaddresses/children/relid_param/code.js
deleted file mode 100644
index 7e8b67e8a1b60795941a318dafb105ea3a161728..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/orgaddresses/children/relid_param/code.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.result");
-import("system.db");
-import("system.vars");
-import("Sql_lib");
-
-var orgId = vars.get("$field.ORGANISATION_ID");
-if (orgId)
-{
- var cond = SqlCondition.begin().and("RELATION.PERS_ID is null").andPrepare("RELATION.ORGANISATION_ID", orgId);
- var orgRelId = db.cell(cond.buildSql("select RELATION.RELATIONID from RELATION", "1 = 1"));
- result.string(orgRelId);
-}
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/pers_id/documentation.adoc b/entity/Contact_entity/entityfields/pers_id/documentation.adoc
deleted file mode 100644
index e60e1c615bc9bef99e04229d684dc2c9dc0e019f..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/pers_id/documentation.adoc
+++ /dev/null
@@ -1 +0,0 @@
-The main reason why this field is needed is that the `RELATION.PERS_ID` has to be set when a new record is inserted (to keep references correct).
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/pers_id/valueProcess.js b/entity/Contact_entity/entityfields/pers_id/valueProcess.js
deleted file mode 100644
index 7d2324e0ad5514747fa14343ba9e1daea99bf787..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/pers_id/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-//this is needed to set the RELATION-value when a new record is inserted
-result.string(vars.getString("$field.PERSID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/persaddresses/children/relid_param/code.js b/entity/Contact_entity/entityfields/persaddresses/children/relid_param/code.js
deleted file mode 100644
index 1ed22d971208382aa8fe542ab6125706504d74c1..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/persaddresses/children/relid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/phonecommunications/children/relid_param/code.js b/entity/Contact_entity/entityfields/phonecommunications/children/relid_param/code.js
deleted file mode 100644
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/phonecommunications/children/relid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/pricelists/children/relid_param/code.js b/entity/Contact_entity/entityfields/pricelists/children/relid_param/code.js
deleted file mode 100644
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/pricelists/children/relid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/fromClauseProcess.js b/entity/Contact_entity/fromClauseProcess.js
deleted file mode 100644
index c324d6595beeb093dba6386662688f294fc3c8c1..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/fromClauseProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string("PERS join RELATION on (RELATION.PERS_ID = PERS.PERSID) join ORGANISATION on ORGANISATIONID = ORGANISATION_ID ");
\ No newline at end of file
diff --git a/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js b/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js
deleted file mode 100644
index c324d6595beeb093dba6386662688f294fc3c8c1..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string("PERS join RELATION on (RELATION.PERS_ID = PERS.PERSID) join ORGANISATION on ORGANISATIONID = ORGANISATION_ID ");
\ No newline at end of file
diff --git a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js
deleted file mode 100644
index 61020026bb8764a43c6a20ce118d957471d2a95b..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = LanguageKeywordUtils.getResolvedTitleSqlPart("RELATION.LANGUAGE");
-result.string(sql);
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 307bf15c0a2691b069c58d03cfe777b0ad42180a..3ad786b6aac6417947b5bd6ece4748a22e591154 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -2,6 +2,7 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
<name>Context_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation>
<titleProcess>%aditoprj%/entity/Context_entity/titleProcess.js</titleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
@@ -15,6 +16,12 @@
<fieldName>Contexts</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>d713987f-1cf0-4c6c-8373-24d135d22dc8</name>
+ <entityName>ActivityLink_entity</entityName>
+ <fieldName>Contexts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityField>
@@ -29,6 +36,7 @@
<name>ContextId_param</name>
<expose v="true" />
<mandatory v="false" />
+ <documentation>%aditoprj%/entity/Context_entity/entityfields/contextid_param/documentation.adoc</documentation>
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
diff --git a/entity/Context_entity/documentation.adoc b/entity/Context_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..b70499460540837e47eeebbeff55abc8f2243b91
--- /dev/null
+++ b/entity/Context_entity/documentation.adoc
@@ -0,0 +1,9 @@
+== Context_entity ==
+
+This Entity provides access to contexts.
+
+It provides:
+
+- the context ID (currently (12.02.2019) it is the context name)
+- the context name (the name which is used in the designer)
+- the context title (the title of the context which is a property of the context. If it is not defined you get the context name.
\ No newline at end of file
diff --git a/entity/Context_entity/entityfields/contextid_param/documentation.adoc b/entity/Context_entity/entityfields/contextid_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..abbd33cd243ae344ea4722cf0e6a53314f1e0f23
--- /dev/null
+++ b/entity/Context_entity/entityfields/contextid_param/documentation.adoc
@@ -0,0 +1 @@
+If you provide the ContextId_param only this context is provided.
\ No newline at end of file
diff --git a/entity/Context_entity/recordcontainers/jdito/contentProcess.js b/entity/Context_entity/recordcontainers/jdito/contentProcess.js
index e0eac166061c43815765989a34a9d27e89a27fa5..07c0d727b9a576205f390d8abd058be4d540efd3 100644
--- a/entity/Context_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Context_entity/recordcontainers/jdito/contentProcess.js
@@ -1,28 +1,12 @@
import("system.vars");
import("system.result");
-import("system.project");
import("Context_lib");
if (vars.exists("$param.ContextId_param") && vars.get("$param.ContextId_param"))
{
- result.object(_contextDataMapping(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$param.ContextId_param"))));
+ result.object(ContextUtils.getContext(vars.get("$param.ContextId_param")));
}
else
{
- result.object(project.getDataModels(project.DATAMODEL_KIND_CONTEXT).map(_contextDataMapping).sort(function(pContext1, pContext2) {
- if (pContext1[2] > pContext2[2])
- return 1;
-
- if (pContext1[2] < pContext2[2])
- return -1;
-
- return 0;
- }));
-}
-
-function _contextDataMapping(pContext)
-{
- var contextName = ContextUtils.getContextName(pContext[0]);
-
- return [pContext[0], contextName, (pContext[1] ? pContext[1] : contextName)];
+ result.object(ContextUtils.getContexts(true));
}
\ No newline at end of file
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index a92643fed2f50c6cda722eab5fa3db525047ef7e..4a8d32b152669d6efe62f86b8537ee7e500b304e 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -63,13 +63,13 @@
<mandatory v="true" />
</entityField>
<entityField>
- <name>RELATION_ID</name>
- <documentation>%aditoprj%/entity/Contract_entity/entityfields/relation_id/documentation.adoc</documentation>
+ <name>CONTACT_ID</name>
+ <documentation>%aditoprj%/entity/Contract_entity/entityfields/contact_id/documentation.adoc</documentation>
<title>Connection</title>
<consumer>Relations</consumer>
- <linkedContextProcess>%aditoprj%/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js</linkedContextProcess>
+ <linkedContextProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/relation_id/displayValueProcess.js</displayValueProcess>
+ <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>REMARK</name>
@@ -89,7 +89,7 @@
</entityDependency>
<entityDependency>
<name>3698fe59-fd02-427b-8c95-a90c7d8036e5</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>Contracts</fieldName>
<isConsumer v="false" />
</entityDependency>
@@ -137,7 +137,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Relation_entity</entityName>
+ <entityName>AnyContact_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
@@ -146,10 +146,10 @@
<recordContainer>db</recordContainer>
</entityProvider>
<entityField>
- <name>RELATION_ORG_ID</name>
+ <name>CONTACT_ORG_ID</name>
</entityField>
<entityField>
- <name>RELATION_PERS_ID</name>
+ <name>CONTACT_PERSON_ID</name>
</entityField>
<entityConsumer>
<name>Documents</name>
@@ -265,8 +265,8 @@
</linkInformation>
<linkInformation>
<name>0637150d-c535-41ce-85f3-e9a6b980d195</name>
- <tableName>RELATION</tableName>
- <primaryKey>RELATIONID</primaryKey>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
@@ -279,8 +279,8 @@
</linkInformation>
<linkInformation>
<name>748d1280-6dd2-4ada-837e-b331166e78d3</name>
- <tableName>PERS</tableName>
- <primaryKey>PERSID</primaryKey>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
@@ -323,28 +323,28 @@
<recordfield>CONTRACT.REMARK</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.value</name>
- <recordfield>CONTRACT.RELATION_ID</recordfield>
+ <name>CONTACT_ID.value</name>
+ <recordfield>CONTRACT.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ORG_ID.value</name>
- <recordfield>RELATION.ORGANISATION_ID</recordfield>
+ <name>CONTACT_ORG_ID.value</name>
+ <recordfield>CONTACT.ORGANISATION_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_PERS_ID.value</name>
- <recordfield>RELATION.PERS_ID</recordfield>
+ <name>CONTACT_PERSON_ID.value</name>
+ <recordfield>CONTACT.PERSON_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_NAME.value</name>
<recordfield>ORGANISATION.NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>PERS_FIRSTNAME.value</name>
- <recordfield>PERS.FIRSTNAME</recordfield>
+ <name>PERSON_FIRSTNAME.value</name>
+ <recordfield>PERSON.FIRSTNAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>PERS_LASTNAME.value</name>
- <recordfield>PERS.LASTNAME</recordfield>
+ <name>PERSON_LASTNAME.value</name>
+ <recordfield>PERSON.LASTNAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PAYMENT.displayValue</name>
diff --git a/entity/Contract_entity/conditionProcess.js b/entity/Contract_entity/conditionProcess.js
index fea5817cc169aaa1830db0e0d43f8195ce8276d3..5d9f165b795a786af664f50c237b7350dfc24ef4 100644
--- a/entity/Contract_entity/conditionProcess.js
+++ b/entity/Contract_entity/conditionProcess.js
@@ -2,6 +2,6 @@ import("system.result");
import("system.vars");
if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null && vars.get("$param.RelId_param") != "")
- result.string("CONTRACT.RELATION_ID = ('" + vars.getString("$param.RelId_param") + "')");
+ result.string("CONTRACT.CONTACT_ID = ('" + vars.getString("$param.RelId_param") + "')");
else
result.string("1 = 1");
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/relation_id/displayValueProcess.js b/entity/Contract_entity/entityfields/contact_id/displayValueProcess.js
similarity index 70%
rename from entity/Contract_entity/entityfields/relation_id/displayValueProcess.js
rename to entity/Contract_entity/entityfields/contact_id/displayValueProcess.js
index 5159f2ac23951196460df8dea03ebbd65be479f8..5badfc772a90e1e057c0ed3a480063f68de010a9 100644
--- a/entity/Contract_entity/entityfields/relation_id/displayValueProcess.js
+++ b/entity/Contract_entity/entityfields/contact_id/displayValueProcess.js
@@ -1,6 +1,6 @@
import("system.result");
import("system.vars");
-import("Relation_lib");
+import("Contact_lib");
import("system.neon");
-result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
+result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/relation_id/documentation.adoc b/entity/Contract_entity/entityfields/contact_id/documentation.adoc
similarity index 87%
rename from entity/Contract_entity/entityfields/relation_id/documentation.adoc
rename to entity/Contract_entity/entityfields/contact_id/documentation.adoc
index 585132728001b08a3ab192b93c5e0821361babf9..60a4360a9183fb3cabe4f0d0862cd5327f4c504c 100644
--- a/entity/Contract_entity/entityfields/relation_id/documentation.adoc
+++ b/entity/Contract_entity/entityfields/contact_id/documentation.adoc
@@ -1,4 +1,4 @@
-= RELATION_ID
+= CONTACT_ID
:hardbreaks:
Indicates the contract partner.
diff --git a/entity/Contract_entity/entityfields/relation_id/fieldIdProcess.js b/entity/Contract_entity/entityfields/contact_id/fieldIdProcess.js
similarity index 100%
rename from entity/Contract_entity/entityfields/relation_id/fieldIdProcess.js
rename to entity/Contract_entity/entityfields/contact_id/fieldIdProcess.js
diff --git a/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js b/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js
similarity index 69%
rename from entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js
rename to entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js
index 2c8672f45309b0e7948787e30a5e7da698a515e0..242297cdf0e97a6b0a61004ba62ca1301a6cc791 100644
--- a/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js
+++ b/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js
@@ -1,5 +1,5 @@
import("system.vars");
import("system.result");
-import("Relation_lib");
+import("Contact_lib");
-result.string(RelationUtils.getContextByRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
+result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js b/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js
deleted file mode 100644
index 6a986948950be876fd394dc2b62dcf465308140a..0000000000000000000000000000000000000000
--- a/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CONTRACTID"));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js b/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js
deleted file mode 100644
index 008915f61deac19ccdd40fff81701de63eb3b6a2..0000000000000000000000000000000000000000
--- a/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/db/conditionProcess.js b/entity/Contract_entity/recordcontainers/db/conditionProcess.js
index 95d95846c60b07b06c31bd1d75581d83c611ccfc..fc35ae3505e35b73098af771e3ae16ad94f63a11 100644
--- a/entity/Contract_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Contract_entity/recordcontainers/db/conditionProcess.js
@@ -3,7 +3,7 @@ import("system.db");
import("system.result");
import("Sql_lib");
-var cond = SqlCondition.begin().andPrepareVars("CONTRACT.RELATION_ID", "$param.RelId_param");
+var cond = SqlCondition.begin().andPrepareVars("CONTRACT.CONTACT_ID", "$param.RelId_param");
//TODO: use a preparedCondition when available
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/db/fromClauseProcess.js b/entity/Contract_entity/recordcontainers/db/fromClauseProcess.js
index 22f0c57eed89eca958e4402e64087ab8809632ac..d48c1c87c7ab0ff8273e2d7ff400ecb96fe87c1f 100644
--- a/entity/Contract_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Contract_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,4 +1,4 @@
import("system.result");
-result.string("CONTRACT left join RELATION on RELATIONID = RELATION_ID \n\
-left join ORGANISATION on ORGANISATIONID = ORGANISATION_ID left join PERS on PERSID = PERS_ID");
\ No newline at end of file
+result.string("CONTRACT left join CONTACT on CONTACTID = CONTACT_ID \n\
+left join ORGANISATION on ORGANISATIONID = ORGANISATION_ID left join PERSON on PERSONID = PERSON_ID");
\ No newline at end of file
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 2f5da7228ac41f6c928f5451f27fc6e8e4b2c2b9..3ac8d08dd4b294ac7c60753638ce873eba4d14a0 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -154,7 +154,7 @@
</entityDependency>
<entityDependency>
<name>0d8ec167-6db1-4a8b-b1d5-8cba3f050bca</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>Documents</fieldName>
<isConsumer v="false" />
</entityDependency>
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index 6b70296cd3470df70dc16bb43cd285774428607f..e35660701c627def429d76cd585b42a72a1e722f 100644
--- a/entity/Gender_keyword/Gender_keyword.aod
+++ b/entity/Gender_keyword/Gender_keyword.aod
@@ -16,7 +16,7 @@
<dependencies>
<entityDependency>
<name>ede7d623-3709-4d22-85fa-30214e2293e2</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>Genders</fieldName>
<isConsumer v="false" />
</entityDependency>
diff --git a/entity/Keyword_entity/Keyword_entity.aod b/entity/Keyword_entity/Keyword_entity.aod
index dcce9447b41b5c14719d0b7f6110fb8d5636f5e8..9e906046725a5b39a2a2632016d04a4d348e4cbe 100644
--- a/entity/Keyword_entity/Keyword_entity.aod
+++ b/entity/Keyword_entity/Keyword_entity.aod
@@ -73,7 +73,7 @@
<entityDependency>
<name>bb48a3ee-f340-4fd4-8c80-ef73b765ab58</name>
<entityName>Organisation_entity</entityName>
- <fieldName>KeywordRelationStates</fieldName>
+ <fieldName>KeywordContactStates</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
@@ -156,7 +156,7 @@
</entityDependency>
<entityDependency>
<name>0d54d283-f158-4b91-8f6d-026954ed9c50</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>KeywordGenders</fieldName>
<isConsumer v="false" />
</entityDependency>
diff --git a/entity/Keyword_entity/entityfields/generic_dfi/children/onlyactives/code.js b/entity/Keyword_entity/entityfields/generic_dfi/children/onlyactives/code.js
deleted file mode 100644
index 0e7522714af4e73d87e977bb3e83b350461053b6..0000000000000000000000000000000000000000
--- a/entity/Keyword_entity/entityfields/generic_dfi/children/onlyactives/code.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("true");//TODO: provider-code is not executed correct (did not receive the value from here)
\ No newline at end of file
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index fc9ea4230c8308276210d98e5620b39b7a18937a..f6202420add12a3e0c664ead7cc6910e1e87da8e 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -46,7 +46,7 @@
</entityDependency>
<entityDependency>
<name>d2ae2b80-941f-42c5-89a4-67269d9a0411</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>Languages</fieldName>
<isConsumer v="false" />
</entityDependency>
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index 982876760456b570e2746ba2f24a6e354257789c..5aeb94ee24cd2785d4f62caf643360a7904ca453 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -14,6 +14,7 @@
<title>Type 1</title>
<consumer>Contexts</consumer>
<linkedContext>Context_context</linkedContext>
+ <mandatory v="true" />
<stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_type/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_type/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_type/displayValueProcess.js</displayValueProcess>
@@ -23,18 +24,21 @@
<title>Object 1</title>
<consumer>Objects1</consumer>
<linkedContextProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_rowid/linkedContextProcess.js</linkedContextProcess>
+ <mandatory v="true" />
<stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_rowid/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_rowid/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_rowid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>AB_OBJECTRELATIONID</name>
+ <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/ab_objectrelationid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>OBJECT2_ROWID</name>
<title>Object 2</title>
<consumer>Objects2</consumer>
<linkedContextProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/linkedContextProcess.js</linkedContextProcess>
+ <mandatory v="true" />
<stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/valueProcess.js</valueProcess>
</entityField>
@@ -43,6 +47,7 @@
<title>Type 2</title>
<consumer>Contexts</consumer>
<linkedContext>Context_context</linkedContext>
+ <mandatory v="true" />
<stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_type/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_type/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_type/displayValueProcess.js</displayValueProcess>
@@ -56,10 +61,13 @@
<entityProvider>
<name>Object1</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>OBJECT2_TYPE</targetContextField>
+ <targetIdField>OBJECT2_ROWID</targetIdField>
+ <documentation>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
- <name>8eb3187c-07cb-4b51-8b7e-d63e83959bdb</name>
+ <name>637d4127-8eba-42e3-9857-a2869668f94c</name>
<entityName>Activity_entity</entityName>
<fieldName>ObjectRelations</fieldName>
<isConsumer v="false" />
@@ -105,6 +113,9 @@
<entityProvider>
<name>Object2</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>OBJECT1_TYPE</targetContextField>
+ <targetIdField>OBJECT1_ROWID</targetIdField>
+ <documentation>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<children>
<entityParameter>
@@ -136,6 +147,9 @@
<entityProvider>
<name>BothObjects</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>OBJECT2_TYPE</targetContextField>
+ <targetIdField>OBJECT2_ROWID</targetIdField>
+ <documentation>%aditoprj%/entity/ObjectRelation_entity/entityfields/bothobjects/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<children>
<entityParameter>
@@ -191,13 +205,14 @@
<entityProvider>
<name>AnyObject</name>
<fieldType>DEPENDENCY_IN</fieldType>
- <targetContextField>OBJECT1_TYPE</targetContextField>
- <targetIdField>OBJECT1_ROWID</targetIdField>
+ <targetContextField>AnyTargetType</targetContextField>
+ <targetIdField>AnyTargetRowid</targetIdField>
+ <documentation>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobject/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>744259f7-3b08-4147-8376-3311b7a35712</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>ObjectRelations</fieldName>
<isConsumer v="false" />
</entityDependency>
@@ -268,6 +283,7 @@
<entityParameter>
<name>ObjectType_param</name>
<code>%aditoprj%/entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/code.js</code>
+ <triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
@@ -283,9 +299,18 @@
<entityParameter>
<name>ObjectType_param</name>
<code>%aditoprj%/entity/ObjectRelation_entity/entityfields/objects2/children/objecttype_param/code.js</code>
+ <triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>AnyTargetRowid</name>
+ <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anytargetrowid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>AnyTargetType</name>
+ <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/ObjectRelation_entity/documentation.adoc b/entity/ObjectRelation_entity/documentation.adoc
index 5b71000497c34f063da467335164bbd59be609cf..33b4681ecbdb808113aef428f5cd3792a04af1a7 100644
--- a/entity/ObjectRelation_entity/documentation.adoc
+++ b/entity/ObjectRelation_entity/documentation.adoc
@@ -1,7 +1,7 @@
== Object Relation ==
-This entity is for relation between Objects. It should be used if everything can be related to something.
+This entity is for relation between Objects. It should be used if something can be related to something.
If only special objects should be connected where you always know what it is, it is better to create a custom relation table/entity which is only for this purpose. (e.g. Prod2Prod, Relation, ActitvityLink, ...)
The Object type is the ID of the context.
-Use Context_lib for this.
\ No newline at end of file
+Use Context_lib for this.
diff --git a/entity/ObjectRelation_entity/entityfields/ab_objectrelationid/valueProcess.js b/entity/ObjectRelation_entity/entityfields/ab_objectrelationid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f76379296760e9936f42f3cf5a76d9dd62b99931
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/ab_objectrelationid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.util");
+import("system.vars");
+import("system.result");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/anyobject/documentation.adoc b/entity/ObjectRelation_entity/entityfields/anyobject/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..11ee142148f46c766d5cff09a51554b9586ae806
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/anyobject/documentation.adoc
@@ -0,0 +1,10 @@
+== AnyObject provider ==
+
+is for bidirectional Objectrelations.
+
+Example:
+if you provide the contact "Lisa Sommer" as parameters (any..._param) you will get all relations which contain "Lisa Sommer" as Object1 OR Object2.
+
+You will get both:
+Object1 = "Lisa Sommer", Object2 = "GFK"
+Object1 = "GFK", Object2 = "Lisa Sommer"
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/anytargetrowid/valueProcess.js b/entity/ObjectRelation_entity/entityfields/anytargetrowid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..30698cf10e59153bd413ab2cd1a62f6438142a74
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/anytargetrowid/valueProcess.js
@@ -0,0 +1,25 @@
+import("system.result");
+import("system.vars");
+
+var openedType;
+var openedRowid;
+
+// any object
+if (vars.exists("$param.AnyObjectType_param") && vars.get("$param.AnyObjectType_param"))
+{
+ openedType = vars.get("$param.AnyObjectType_param");
+ if (vars.exists("$param.AnyObjectRowid_param") && vars.get("$param.AnyObjectRowid_param"))
+ {
+ openedRowid = vars.get("$param.AnyObjectRowid_param");
+ // anyObject and object 1 == opened object --> target is object2
+ if (vars.get("$field.OBJECT1_ROWID") == openedRowid && vars.get("$field.OBJECT1_TYPE") == openedType)
+ {
+ result.string(vars.get("$field.OBJECT2_ROWID"));
+ }
+ // anyObject and object 2 == opened object --> target is object1
+ else if (vars.get("$field.OBJECT2_ROWID") == openedRowid && vars.get("$field.OBJECT2_TYPE") == openedType)
+ {
+ result.string(vars.get("$field.OBJECT1_ROWID"));
+ }
+ }
+}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js b/entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c8dd2fb8c6fc3fd7d0863719e63411aa5b4564de
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js
@@ -0,0 +1,25 @@
+import("system.result");
+import("system.vars");
+
+var openedType;
+var openedRowid;
+
+// any object
+if (vars.exists("$param.AnyObjectType_param") && vars.get("$param.AnyObjectType_param"))
+{
+ openedType = vars.get("$param.AnyObjectType_param");
+ if (vars.exists("$param.AnyObjectRowid_param") && vars.get("$param.AnyObjectRowid_param"))
+ {
+ openedRowid = vars.get("$param.AnyObjectRowid_param");
+ // anyObject and object 1 == opened object --> target is object2
+ if (vars.get("$field.OBJECT1_ROWID") == openedRowid && vars.get("$field.OBJECT1_TYPE") == openedType)
+ {
+ result.string(vars.get("$field.OBJECT2_TYPE"));
+ }
+ // anyObject and object 2 == opened object --> target is object1
+ else if (vars.get("$field.OBJECT2_ROWID") == openedRowid && vars.get("$field.OBJECT2_TYPE") == openedType)
+ {
+ result.string(vars.get("$field.OBJECT1_TYPE"));
+ }
+ }
+}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/bothobjects/documentation.adoc b/entity/ObjectRelation_entity/entityfields/bothobjects/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..12b757625cd1d43f35571bf502247121fa75bfad
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/bothobjects/documentation.adoc
@@ -0,0 +1,16 @@
+== BothObject provider ==
+
+is for getting relations between TWO SPECIFIC objects.
+
+Example:
+if you provide the contact "Lisa Sommer" and organisation "GFK" as parameters (objectX..._param) you will get all relations which contain "Lisa Sommer" as Object1 and "GFK" as Object2.
+
+You will get only:
+Object1 = "Lisa Sommer", Object2 = "GFK"
+
+
+You WON'T get:
+Object1 = "GFK", Object2 = "Lisa Sommer"
+Object1 = "Peter Pfiffig", Object2 = "Lisa Sommer"
+Object1 = "Peter Pfiffig", Object2 = "GFK"
+...
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/object1/documentation.adoc b/entity/ObjectRelation_entity/entityfields/object1/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..ba1539f3db1bde56a2cbc29def9c110b3402ba82
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/object1/documentation.adoc
@@ -0,0 +1,16 @@
+== Object1 provider ==
+
+is for getting relations between Object1 and something.
+
+Example:
+if you provide the contact "Lisa Sommer" as parameter (object1..._param) you will get all relations which contain "Lisa Sommer" as Object1.
+
+You will get:
+Object1 = "Lisa Sommer", Object2 = "GFK"
+
+
+You WON'T get:
+Object1 = "GFK", Object2 = "Lisa Sommer"
+Object1 = "Peter Pfiffig", Object2 = "Lisa Sommer"
+Object1 = "Peter Pfiffig", Object2 = "GFK"
+...
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/object1_rowid/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/object1_rowid/displayValueProcess.js
index 94cfeeb560e1f78da4a8344b3443a48a5272426c..f82167f8b69e5413ef49fe0d7ce1dc2cbdebc500 100644
--- a/entity/ObjectRelation_entity/entityfields/object1_rowid/displayValueProcess.js
+++ b/entity/ObjectRelation_entity/entityfields/object1_rowid/displayValueProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.neon");
import("system.vars");
import("system.result");
@@ -19,10 +18,8 @@ if (recordstate == neon.OPERATINGSTATE_NEW)
}
else if (recordstate == neon.OPERATINGSTATE_EDIT)
{
- logging.log("edit")
if (vars.exists("$field.OBJECT1_ROWID") && vars.get("$field.OBJECT1_ROWID") && vars.exists("$field.OBJECT1_TYPE") && vars.get("$field.OBJECT1_TYPE"))
{
- logging.log(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT1_TYPE"), vars.get("$field.OBJECT1_ROWID"))))
result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT1_TYPE"), vars.get("$field.OBJECT1_ROWID"))));
}
}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/object1_rowid/valueProcess.js b/entity/ObjectRelation_entity/entityfields/object1_rowid/valueProcess.js
index d189f026bbda9b46e16b64e32c730b00dfc06b52..679db41733d3a5ffa393e371edb985ae2c8dc344 100644
--- a/entity/ObjectRelation_entity/entityfields/object1_rowid/valueProcess.js
+++ b/entity/ObjectRelation_entity/entityfields/object1_rowid/valueProcess.js
@@ -3,6 +3,7 @@ import("system.neon");
import("system.vars");
var recordstate = vars.get("$sys.recordstate");
+
if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)
{
if (vars.exists("$param.AnyObjectRowid_param") && vars.get("$param.AnyObjectRowid_param"))
@@ -13,4 +14,8 @@ if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE
{
result.string(vars.get("$param.Object1Rowid_param"));
}
+ else if (!vars.get("$field.OBJECT2_TYPE"))
+ {
+ result.string("");
+ }
}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/object1_type/stateProcess.js b/entity/ObjectRelation_entity/entityfields/object1_type/stateProcess.js
index 2160ef62efa8f525f4f17659425c717a7e595011..7cbd5a35ac443244ab9d384daab659e8ffc0a4ef 100644
--- a/entity/ObjectRelation_entity/entityfields/object1_type/stateProcess.js
+++ b/entity/ObjectRelation_entity/entityfields/object1_type/stateProcess.js
@@ -10,4 +10,5 @@ if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE
{
result.string(neon.COMPONENTSTATE_READONLY);
}
-}
\ No newline at end of file
+}
+result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/object2/documentation.adoc b/entity/ObjectRelation_entity/entityfields/object2/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..9ce67b8769d5d8f1ae4a0e687d20c756db0572e9
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/object2/documentation.adoc
@@ -0,0 +1,17 @@
+== Object2 provider ==
+
+is for getting relations between something and Object2.
+
+Example:
+if you provide the contact "Lisa Sommer" as parameter (object2..._param) you will get all relations which contain "Lisa Sommer" as Object2.
+
+You will get:
+Object1 = "GFK", Object2 = "Lisa Sommer"
+Object1 = "Peter Pfiffig", Object2 = "Lisa Sommer"
+
+
+You WON'T get:
+Object1 = "Lisa Sommer", Object2 = "GFK"
+Object1 = "Peter Pfiffig", Object2 = "GFK"
+Object1 = "Lisa Sommer", Object2 = "Peter Pfiffig"
+...
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/object2_rowid/stateProcess.js b/entity/ObjectRelation_entity/entityfields/object2_rowid/stateProcess.js
index b78d71076c7c186dd23123bcc8c543266a087d51..51c5fa78a283b5a93d4c88cdf1fa8e8f63b0b5c8 100644
--- a/entity/ObjectRelation_entity/entityfields/object2_rowid/stateProcess.js
+++ b/entity/ObjectRelation_entity/entityfields/object2_rowid/stateProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.result");
import("system.neon");
import("system.vars");
@@ -6,7 +5,6 @@ import("system.vars");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)
{
- logging.log(vars.exists("$param.Object2Rowid_param") && vars.get("$param.Object2Rowid_param"))
if (vars.exists("$param.Object2Rowid_param") && vars.get("$param.Object2Rowid_param"))
result.string(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/object2_rowid/valueProcess.js b/entity/ObjectRelation_entity/entityfields/object2_rowid/valueProcess.js
index 710c40de475bab34407ce49a29c2015c997e9545..907eff1114e5acdd24b9b180372e7059ede6e6db 100644
--- a/entity/ObjectRelation_entity/entityfields/object2_rowid/valueProcess.js
+++ b/entity/ObjectRelation_entity/entityfields/object2_rowid/valueProcess.js
@@ -9,4 +9,8 @@ if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE
{
result.string(vars.get("$param.Object2Rowid_param"));
}
+ else if (!vars.get("$field.OBJECT2_TYPE"))
+ {
+ result.string("");
+ }
}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/code.js b/entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/code.js
index 3b6f82bbcec81a210fd037da6fbef12cb90bfe20..0e35811c9fc30b9f87c3e4dda4235787fb0066f7 100644
--- a/entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/code.js
+++ b/entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/code.js
@@ -1,6 +1,4 @@
-import("system.logging");
import("system.vars");
import("system.result");
-logging.log("set type: " + vars.get("$field.OBJECT1_TYPE"))
result.string(vars.get("$field.OBJECT1_TYPE"))
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/recordcontainers/db/conditionProcess.js b/entity/ObjectRelation_entity/recordcontainers/db/conditionProcess.js
index 0c33f31769cf310c1a69dacfeac893cff0a75b27..fd3608bd8705e0b8cc518d06c4530b32a7e3e589 100644
--- a/entity/ObjectRelation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ObjectRelation_entity/recordcontainers/db/conditionProcess.js
@@ -1,5 +1,4 @@
import("system.vars");
-import("system.logging");
import("system.result");
import("system.db");
import("Sql_lib");
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 09a765c26250eef7fefb1addb900245e0f0b5194..613a2e2e90d967fefebb5ec24f4c9d660f486196 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -2,12 +2,12 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
<name>Object_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Object_entity/documentation.adoc</documentation>
<titleProcess>%aditoprj%/entity/Object_entity/titleProcess.js</titleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <recordContainer>jdito</recordContainer>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -24,19 +24,18 @@
<entityParameter>
<name>ObjectType_param</name>
<expose v="true" />
- <triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>ObjectRowId_param</name>
<expose v="true" />
- <triggerRecalculation v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
<name>OneObject</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <documentation>%aditoprj%/entity/Object_entity/entityfields/oneobject/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer>
<dependencies>
<entityDependency>
@@ -70,6 +69,7 @@
<entityProvider>
<name>AllObjects</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <documentation>%aditoprj%/entity/Object_entity/entityfields/allobjects/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer>
<dependencies>
<entityDependency>
@@ -84,6 +84,12 @@
<fieldName>Objects2</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>1586ace7-8c27-43cc-8288-cc7a68670c09</name>
+ <entityName>ActivityLink_entity</entityName>
+ <fieldName>Objects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -94,7 +100,6 @@
<entityParameter>
<name>ObjectType_param</name>
<expose v="true" />
- <triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
</children>
diff --git a/entity/Object_entity/documentation.adoc b/entity/Object_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..85191c1903e7182355442f72983e1db87b4ece13
--- /dev/null
+++ b/entity/Object_entity/documentation.adoc
@@ -0,0 +1,8 @@
+== Object_entity ==
+
+This Entity provides access to different Objects.
+
+It provides:
+
+- the object ID (the UUID of the object)
+- the object title (the display name. Currently (12.02.2019) it is configured in the Context_lib. This may change!
\ No newline at end of file
diff --git a/entity/Object_entity/entityfields/allobjects/documentation.adoc b/entity/Object_entity/entityfields/allobjects/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..66f07aa06c5d8f91081fd547d1efbb6e5f506b6d
--- /dev/null
+++ b/entity/Object_entity/entityfields/allobjects/documentation.adoc
@@ -0,0 +1,3 @@
+== AllObjects provider ==
+
+This provider returns all objects of one type.
\ No newline at end of file
diff --git a/entity/Object_entity/entityfields/oneobject/documentation.adoc b/entity/Object_entity/entityfields/oneobject/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..628c21478017d70552888637466be8b427010c37
--- /dev/null
+++ b/entity/Object_entity/entityfields/oneobject/documentation.adoc
@@ -0,0 +1,3 @@
+== OneObjects provider ==
+
+This provider returns one specific object.
\ No newline at end of file
diff --git a/entity/Object_entity/recordcontainers/jdito/contentProcess.js b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
index e5a6d3fab4c0cbbbabf3da605240b2036776d25a..fa1404cf0aa5adb9dd28c57581124986ae7deaf5 100644
--- a/entity/Object_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
@@ -1,19 +1,20 @@
import("system.db");
import("system.vars");
-import("system.logging");
import("system.result");
import("Context_lib");
-logging.log(vars.get("$param.ObjectType_param").toSource())
-
if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"))
{
if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
{
result.object(db.table(vars.get("$param.ObjectRowId_param"), ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowId_param"))));
}
-
- result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"))))
-} else {
- result.object([]);
+ else
+ {
+ result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"))))
+ }
}
+else
+{
+ result.object([]);
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index c1c11e8e30422951187b87435e24885457787718..567fd37a4a27084bb0554f5db54c323b18fd6454 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -43,15 +43,15 @@
<possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
- <name>RELATION_ID</name>
- <documentation>%aditoprj%/entity/Offer_entity/entityfields/relation_id/documentation.adoc</documentation>
+ <name>CONTACT_ID</name>
+ <documentation>%aditoprj%/entity/Offer_entity/entityfields/contact_id/documentation.adoc</documentation>
<title>Connection</title>
<consumer>Relations</consumer>
- <linkedContextProcess>%aditoprj%/entity/Offer_entity/entityfields/relation_id/linkedContextProcess.js</linkedContextProcess>
+ <linkedContextProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/relation_id/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/relation_id/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/Offer_entity/entityfields/relation_id/onValueChange.js</onValueChange>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Offer_entity/entityfields/contact_id/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
</onValueChangeTypes>
@@ -113,8 +113,8 @@
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
- <name>RelationId_param</name>
- <code>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/relationid_param/code.js</code>
+ <name>ContactId_param</name>
+ <code>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/ContactId_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
@@ -212,7 +212,7 @@
</fields>
</entityFieldGroup>
<entityParameter>
- <name>RelationId_param</name>
+ <name>ContactId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
@@ -225,11 +225,11 @@
<onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/offerreport/onActionProcess.js</onActionProcess>
</entityActionField>
<entityField>
- <name>RELATION_ORG_ID</name>
+ <name>CONTACT_ORG_ID</name>
<searchable v="false" />
</entityField>
<entityField>
- <name>RELATION_PERS_ID</name>
+ <name>CONTACT_PERSON_ID</name>
<searchable v="false" />
</entityField>
<entityConsumer>
@@ -237,7 +237,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Relation_entity</entityName>
+ <entityName>AnyContact_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
@@ -377,8 +377,8 @@
</linkInformation>
<linkInformation>
<name>1b7e5346-a8ce-4ef6-a227-a4557cba3294</name>
- <tableName>RELATION</tableName>
- <primaryKey>RELATIONID</primaryKey>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
@@ -391,8 +391,8 @@
</linkInformation>
<linkInformation>
<name>35ac875d-66c4-43b0-9293-b034f45260c8</name>
- <tableName>PERS</tableName>
- <primaryKey>PERSID</primaryKey>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
@@ -447,16 +447,16 @@
<recordfield>OFFER.VERSNR</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.value</name>
- <recordfield>OFFER.RELATION_ID</recordfield>
+ <name>CONTACT_ID.value</name>
+ <recordfield>OFFER.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ORG_ID.value</name>
- <recordfield>RELATION.ORGANISATION_ID</recordfield>
+ <name>CONTACT_ORG_ID.value</name>
+ <recordfield>CONTACT.ORGANISATION_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_PERS_ID.value</name>
- <recordfield>RELATION.PERS_ID</recordfield>
+ <name>CONTACT_PERSON_ID.value</name>
+ <recordfield>CONTACT.PERSON_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ADDRESS.value</name>
diff --git a/entity/Offer_entity/entityfields/chosenaddress/possibleItemsProcess.js b/entity/Offer_entity/entityfields/chosenaddress/possibleItemsProcess.js
index 5672ce8b163cbab66339b9c3fb164b65c9ac1995..c45999248fc3f0f12bfe2dcf4987b648fdf4a25a 100644
--- a/entity/Offer_entity/entityfields/chosenaddress/possibleItemsProcess.js
+++ b/entity/Offer_entity/entityfields/chosenaddress/possibleItemsProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("PostalAddress_lib");
-result.object(AddressUtils.getAllPossibleAddresses(vars.get("$field.RELATION_ID")));
\ No newline at end of file
+result.object(AddressUtils.getAllPossibleAddresses(vars.get("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/relation_id/displayValueProcess.js b/entity/Offer_entity/entityfields/contact_id/displayValueProcess.js
similarity index 70%
rename from entity/Offer_entity/entityfields/relation_id/displayValueProcess.js
rename to entity/Offer_entity/entityfields/contact_id/displayValueProcess.js
index 03e388b961d1bf6c9bc3c65c2d15fbf485690a57..ef417d00db927adfdb10354ec3346c74f15bceeb 100644
--- a/entity/Offer_entity/entityfields/relation_id/displayValueProcess.js
+++ b/entity/Offer_entity/entityfields/contact_id/displayValueProcess.js
@@ -1,7 +1,7 @@
import("system.result");
import("system.vars");
-import("Relation_lib");
+import("Contact_lib");
import("system.neon");
-result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
+result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/relation_id/documentation.adoc b/entity/Offer_entity/entityfields/contact_id/documentation.adoc
similarity index 93%
rename from entity/Offer_entity/entityfields/relation_id/documentation.adoc
rename to entity/Offer_entity/entityfields/contact_id/documentation.adoc
index e978c88ef79f2554ac4731f7d4c3eb17aa50ea8b..f8989a2242e89dd5d4eeca7ccb59e9ca0cccedc0 100644
--- a/entity/Offer_entity/entityfields/relation_id/documentation.adoc
+++ b/entity/Offer_entity/entityfields/contact_id/documentation.adoc
@@ -1,4 +1,4 @@
-= RELATION_ID
+= CONTACT_ID
:hardbreaks:
Over this field the company or contact person of customer is linked.
diff --git a/entity/Offer_entity/entityfields/relation_id/linkedContextProcess.js b/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js
similarity index 69%
rename from entity/Offer_entity/entityfields/relation_id/linkedContextProcess.js
rename to entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js
index 2c8672f45309b0e7948787e30a5e7da698a515e0..242297cdf0e97a6b0a61004ba62ca1301a6cc791 100644
--- a/entity/Offer_entity/entityfields/relation_id/linkedContextProcess.js
+++ b/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js
@@ -1,5 +1,5 @@
import("system.vars");
import("system.result");
-import("Relation_lib");
+import("Contact_lib");
-result.string(RelationUtils.getContextByRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
+result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/relation_id/onValueChange.js b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
similarity index 65%
rename from entity/Offer_entity/entityfields/relation_id/onValueChange.js
rename to entity/Offer_entity/entityfields/contact_id/onValueChange.js
index 9e8a557d9112443d5bb050c2df798542b21dbbd4..8a77aa5cf6ae3f4bfc274705e26f033b8e9a9401 100644
--- a/entity/Offer_entity/entityfields/relation_id/onValueChange.js
+++ b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
@@ -3,10 +3,10 @@ import("system.db");
import("Util_lib");
import("Entity_lib");
-var relid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.RELATION_ID"));
+var relid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
if(relid != "")
{
- var relData = db.array(db.ROW, "select LANGUAGE from RELATION where RELATIONID = '" + relid + "'");
+ var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + relid + "'");
if(relData[0] != "") vars.set("$field.LANGUAGE", relData[0]);
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/contact_id/valueProcess.js b/entity/Offer_entity/entityfields/contact_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1127220726ee436e1f878c4467fa29d976d6af80
--- /dev/null
+++ b/entity/Offer_entity/entityfields/contact_id/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.ContactId_param"))
+{
+ result.string(vars.get("$param.ContactId_param"));
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/neworder/onActionProcess.js b/entity/Offer_entity/entityfields/neworder/onActionProcess.js
index edcc92a270023a3b6f308ba2fb4d65f43834b0b6..20fc048a90db93380fadb7f69ca5fb89c2db25bd 100644
--- a/entity/Offer_entity/entityfields/neworder/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/neworder/onActionProcess.js
@@ -1,14 +1,14 @@
-import("system.vars");
-import("system.neon");
-
-var params = {
- "RelationId_param" : vars.getString("$field.RELATION_ID"),
- "SalesprojectId_param" : vars.getString("$field.SALESPROJECT_ID"),
- "OrderCurrency_param" : vars.getString("$field.CURRENCY"),
- "OrderLanguage_param" : vars.getString("$field.LANGUAGE"),
- "OrderHeader_param" : vars.getString("$field.HEADER"),
- "OrderAddress_param" : vars.getString("$field.ADDRESS"),
- "OfferId_param" : vars.getString("$field.OFFERID")
-};
-
-neon.openContext("Order_context", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
+import("system.vars");
+import("system.neon");
+
+var params = {
+ "RelationId_param" : vars.getString("$field.RELATION_ID"),
+ "SalesprojectId_param" : vars.getString("$field.SALESPROJECT_ID"),
+ "OrderCurrency_param" : vars.getString("$field.CURRENCY"),
+ "OrderLanguage_param" : vars.getString("$field.LANGUAGE"),
+ "OrderHeader_param" : vars.getString("$field.HEADER"),
+ "OrderAddress_param" : vars.getString("$field.ADDRESS"),
+ "OfferId_param" : vars.getString("$field.OFFERID")
+};
+
+neon.openContext("Order_context", null, null, neon.OPERATINGSTATE_NEW, params);
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js b/entity/Offer_entity/entityfields/offeritems/children/contactid_param/code.js
similarity index 52%
rename from entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js
rename to entity/Offer_entity/entityfields/offeritems/children/contactid_param/code.js
index 06fe7d36324315ad85bfd6d0099c5aa6b2da98d4..ef0d5bcac51027b862291e5abd61c0c05773a8df 100644
--- a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js
+++ b/entity/Offer_entity/entityfields/offeritems/children/contactid_param/code.js
@@ -1,4 +1,4 @@
-import("system.result");
import("system.vars");
+import("system.result");
-result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
+result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offeritems/children/relationid_param/code.js b/entity/Offer_entity/entityfields/offeritems/children/relationid_param/code.js
deleted file mode 100644
index a5cee65a3ba3e16976d5f7d3952da23c73ef54da..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/offeritems/children/relationid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.RELATION_ID"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offerofferitem_dfo/children/relationid_param/code.js b/entity/Offer_entity/entityfields/offerofferitem_dfo/children/relationid_param/code.js
deleted file mode 100644
index a5cee65a3ba3e16976d5f7d3952da23c73ef54da..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/offerofferitem_dfo/children/relationid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.RELATION_ID"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/relation_id/valueProcess.js b/entity/Offer_entity/entityfields/relation_id/valueProcess.js
deleted file mode 100644
index 3e39bab540d53deba3913bc0d398034ab5bce404..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/relation_id/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.RelationId_param"))
-{
- result.string(vars.get("$param.RelationId_param"));
-}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js b/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
index 55c7c33b4f1bd15f6744b7898672d62723e99106..419ee8c0b688b7f9586fbd5b21184903cc66834c 100644
--- a/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
+++ b/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
@@ -1,8 +1,8 @@
import("system.vars");
import("system.result");
-import("Relation_lib");
+import("Contact_lib");
-var type = RelationUtils.getRelationType(vars.get("$field.RELATION_ID"), vars.get("$field.RELATION_PERS_ID"), vars.get("$field.RELATION_ORG_ID"));
+var type = RelationUtils.getRelationType(vars.get("$field.CONTACT_ID"), vars.get("$field.CONTACT_PERSON_ID"), vars.get("$field.CONTACT_ORG_ID"));
result.string(type != 2);
diff --git a/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js b/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js
index dac8929eff9f057804437ebd5e80db7e58b434d5..2c33b4d7a687c225b0539799cc7262fab4048368 100644
--- a/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,4 +1,4 @@
import("system.result");
-result.string("OFFER left join RELATION on RELATIONID = RELATION_ID \n\
-left join ORGANISATION on ORGANISATIONID = ORGANISATION_ID left join PERS on PERSID = PERS_ID");
\ No newline at end of file
+result.string("OFFER left join CONTACT on CONTACTID = CONTACT_ID \n\
+left join ORGANISATION on ORGANISATIONID = ORGANISATION_ID left join PERSON on PERSONID = PERSON_ID");
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index aa48571dcea468ef8bee8c68fc756f8ecdbc9b47..7978e285ae8184488944ab441653f569df2f4866 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -97,7 +97,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
- <name>RelationId_param</name>
+ <name>ContactId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<description>PARAMETER</description>
diff --git a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
index 35060d8cbea7a066a1b6a8a13304ad3a2ccb4db8..1de14f269dea71585c557cbd6cb9aa3850206cd9 100644
--- a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
@@ -8,7 +8,7 @@ var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"
if(pid != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- var relid = vars.exists("$param.RelationId_param") ? vars.get("$param.RelationId_param") : "";
+ var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), relationId: relid };
diff --git a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
index 6e32e2ec1c940f4d89f5371180874c10ad2329f8..328caec2766fd4b5eb84bb957f75d83194fae420 100644
--- a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
@@ -9,7 +9,7 @@ var newQuantity = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.QUA
if(pid != "" && newQuantity != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- var relid = vars.exists("$param.RelationId_param") ? vars.get("$param.RelationId_param") : "";
+ var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: relid };
diff --git a/entity/Offeritem_entity/onDBInsert.js b/entity/Offeritem_entity/onDBInsert.js
index 048025fe9d93f3c973ca34223f4c06cb4badecc6..1d582401b5c75c0cf7edaa46f541e1dbcb17ead0 100644
--- a/entity/Offeritem_entity/onDBInsert.js
+++ b/entity/Offeritem_entity/onDBInsert.js
@@ -10,7 +10,7 @@ var oid = vars.get("$field.OFFER_ID");
if(oid != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- var relid = vars.exists("$param.RelationId_param") ? vars.get("$param.RelationId_param") : "";
+ var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var oiUtils = new OfferItemUtils(vars.get("$field.OFFER_ID"));
oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.OFFERITEMID"), curr, relid);
diff --git a/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js b/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
index 2b35ec3e2b15707bb4691928c56b0d8ab569a3d4..dbcb731bf907cf77be745faa29260e348e004369 100644
--- a/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
@@ -11,7 +11,7 @@ var oid = vars.get("$field.OFFER_ID");
if(oid != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- var relid = vars.exists("$param.RelationId_param") ? vars.get("$param.RelationId_param") : "";
+ var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var oiUtils = new OfferItemUtils(vars.get("$field.OFFER_ID"));
oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.OFFERITEMID"), curr, relid);
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index b00d8d4aea2035ef4172d51066fa822e146757bb..2d15bd90d6a8c37612d94cb0239ee82bbf2029bf 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -40,15 +40,15 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesorderid/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>RELATION_ID</name>
- <documentation>%aditoprj%/entity/Order_entity/entityfields/relation_id/documentation.adoc</documentation>
+ <name>CONTACT_ID</name>
+ <documentation>%aditoprj%/entity/Order_entity/entityfields/contact_id/documentation.adoc</documentation>
<title>Connection</title>
<consumer>Relations</consumer>
- <linkedContextProcess>%aditoprj%/entity/Order_entity/entityfields/relation_id/linkedContextProcess.js</linkedContextProcess>
+ <linkedContextProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/relation_id/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/relation_id/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/Order_entity/entityfields/relation_id/onValueChange.js</onValueChange>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Order_entity/entityfields/contact_id/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
</onValueChangeTypes>
@@ -114,8 +114,8 @@
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
- <name>RelationId_param</name>
- <code>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/relationid_param/code.js</code>
+ <name>ContactId_param</name>
+ <code>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/ContactId_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
@@ -203,17 +203,17 @@
</fields>
</entityFieldGroup>
<entityParameter>
- <name>RelationId_param</name>
+ <name>ContactId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
- <name>RELATION_ORG_ID</name>
+ <name>CONTACT_ORG_ID</name>
</entityField>
<entityField>
- <name>RELATION_PERS_ID</name>
+ <name>CONTACT_PERSON_ID</name>
</entityField>
<entityConsumer>
<name>Relations</name>
@@ -378,8 +378,8 @@
</linkInformation>
<linkInformation>
<name>2c489a72-00ee-4bad-929f-25ef82dbc714</name>
- <tableName>RELATION</tableName>
- <primaryKey>RELATIONID</primaryKey>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
@@ -392,8 +392,8 @@
</linkInformation>
<linkInformation>
<name>75470798-2097-41a2-95c2-22cf80d2f0c4</name>
- <tableName>PERS</tableName>
- <primaryKey>PERSID</primaryKey>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
@@ -448,16 +448,16 @@
<recordfield>SALESORDER.VERSNR</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.value</name>
- <recordfield>SALESORDER.RELATION_ID</recordfield>
+ <name>CONTACT_ID.value</name>
+ <recordfield>SALESORDER.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ORG_ID.value</name>
- <recordfield>RELATION.ORGANISATION_ID</recordfield>
+ <name>CONTACT_ORG_ID.value</name>
+ <recordfield>CONTACT.ORGANISATION_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_PERS_ID.value</name>
- <recordfield>RELATION.PERS_ID</recordfield>
+ <name>CONTACT_PERSON_ID.value</name>
+ <recordfield>CONTACT.PERSON_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ADDRESS.value</name>
diff --git a/entity/Order_entity/entityfields/relation_id/displayValueProcess.js b/entity/Order_entity/entityfields/contact_id/displayValueProcess.js
similarity index 70%
rename from entity/Order_entity/entityfields/relation_id/displayValueProcess.js
rename to entity/Order_entity/entityfields/contact_id/displayValueProcess.js
index 5159f2ac23951196460df8dea03ebbd65be479f8..5badfc772a90e1e057c0ed3a480063f68de010a9 100644
--- a/entity/Order_entity/entityfields/relation_id/displayValueProcess.js
+++ b/entity/Order_entity/entityfields/contact_id/displayValueProcess.js
@@ -1,6 +1,6 @@
import("system.result");
import("system.vars");
-import("Relation_lib");
+import("Contact_lib");
import("system.neon");
-result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
+result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/relation_id/documentation.adoc b/entity/Order_entity/entityfields/contact_id/documentation.adoc
similarity index 93%
rename from entity/Order_entity/entityfields/relation_id/documentation.adoc
rename to entity/Order_entity/entityfields/contact_id/documentation.adoc
index e978c88ef79f2554ac4731f7d4c3eb17aa50ea8b..f8989a2242e89dd5d4eeca7ccb59e9ca0cccedc0 100644
--- a/entity/Order_entity/entityfields/relation_id/documentation.adoc
+++ b/entity/Order_entity/entityfields/contact_id/documentation.adoc
@@ -1,4 +1,4 @@
-= RELATION_ID
+= CONTACT_ID
:hardbreaks:
Over this field the company or contact person of customer is linked.
diff --git a/entity/Order_entity/entityfields/relation_id/linkedContextProcess.js b/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js
similarity index 69%
rename from entity/Order_entity/entityfields/relation_id/linkedContextProcess.js
rename to entity/Order_entity/entityfields/contact_id/linkedContextProcess.js
index 2c8672f45309b0e7948787e30a5e7da698a515e0..242297cdf0e97a6b0a61004ba62ca1301a6cc791 100644
--- a/entity/Order_entity/entityfields/relation_id/linkedContextProcess.js
+++ b/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js
@@ -1,5 +1,5 @@
import("system.vars");
import("system.result");
-import("Relation_lib");
+import("Contact_lib");
-result.string(RelationUtils.getContextByRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
+result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/relation_id/onValueChange.js b/entity/Order_entity/entityfields/contact_id/onValueChange.js
similarity index 65%
rename from entity/Order_entity/entityfields/relation_id/onValueChange.js
rename to entity/Order_entity/entityfields/contact_id/onValueChange.js
index 9e8a557d9112443d5bb050c2df798542b21dbbd4..8a77aa5cf6ae3f4bfc274705e26f033b8e9a9401 100644
--- a/entity/Order_entity/entityfields/relation_id/onValueChange.js
+++ b/entity/Order_entity/entityfields/contact_id/onValueChange.js
@@ -3,10 +3,10 @@ import("system.db");
import("Util_lib");
import("Entity_lib");
-var relid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.RELATION_ID"));
+var relid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
if(relid != "")
{
- var relData = db.array(db.ROW, "select LANGUAGE from RELATION where RELATIONID = '" + relid + "'");
+ var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + relid + "'");
if(relData[0] != "") vars.set("$field.LANGUAGE", relData[0]);
}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/contact_id/valueProcess.js b/entity/Order_entity/entityfields/contact_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1127220726ee436e1f878c4467fa29d976d6af80
--- /dev/null
+++ b/entity/Order_entity/entityfields/contact_id/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.ContactId_param"))
+{
+ result.string(vars.get("$param.ContactId_param"));
+}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/offerofferitem_dfo/children/relationid_param/code.js b/entity/Order_entity/entityfields/offerofferitem_dfo/children/relationid_param/code.js
deleted file mode 100644
index a5cee65a3ba3e16976d5f7d3952da23c73ef54da..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/offerofferitem_dfo/children/relationid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.RELATION_ID"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderitems/children/contactid_param/code.js b/entity/Order_entity/entityfields/orderitems/children/contactid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..ef0d5bcac51027b862291e5abd61c0c05773a8df
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderitems/children/contactid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderitems/children/relationid_param/code.js b/entity/Order_entity/entityfields/orderitems/children/relationid_param/code.js
deleted file mode 100644
index a5cee65a3ba3e16976d5f7d3952da23c73ef54da..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/orderitems/children/relationid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.RELATION_ID"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderorderitem_dfo/children/offerid_param/code.js b/entity/Order_entity/entityfields/orderorderitem_dfo/children/offerid_param/code.js
deleted file mode 100644
index 2d458f3d3e14b4d4de7e16459e7ca915b9aafa16..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/orderorderitem_dfo/children/offerid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.SALESORDERID"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderorderitem_dfo/children/relationid_param/code.js b/entity/Order_entity/entityfields/orderorderitem_dfo/children/relationid_param/code.js
deleted file mode 100644
index a5cee65a3ba3e16976d5f7d3952da23c73ef54da..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/orderorderitem_dfo/children/relationid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.RELATION_ID"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/relation_id/valueProcess.js b/entity/Order_entity/entityfields/relation_id/valueProcess.js
deleted file mode 100644
index 57ed857e9f64f9c8190e473ee208ffb5717c1408..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/relation_id/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.RelationId_param"))
-{
- result.string(vars.get("$param.RelationId_param"));
-}
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/fromClauseProcess.js b/entity/Order_entity/recordcontainers/db/fromClauseProcess.js
index f74c1f7d026fb39d36277f724b8506f8bedb504a..24ccfcf71b16a96c4d72afc35d8340a254b90baf 100644
--- a/entity/Order_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Order_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("SALESORDER left join RELATION on RELATIONID = RELATION_ID left join ORGANISATION on ORGANISATIONID = ORGANISATION_ID");
\ No newline at end of file
+result.string("SALESORDER left join CONTACT on CONTACTID = CONTACT_ID left join ORGANISATION on ORGANISATIONID = ORGANISATION_ID");
\ No newline at end of file
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 487257e4ae78287ff4a123c8390ca3f40c2fb7d7..e88dd43338ba0e9db5a0618bc1056c16de294f03 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -97,7 +97,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
- <name>RelationId_param</name>
+ <name>ContactId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<description>PARAMETER</description>
diff --git a/entity/Orderitem_entity/entityfields/product_id/onValueChange.js b/entity/Orderitem_entity/entityfields/product_id/onValueChange.js
index 76010b132975ee805ad929e022d59d0f9a5250b4..be1cf0e4b0a34b7dbed2d22473ce2f040f8752fd 100644
--- a/entity/Orderitem_entity/entityfields/product_id/onValueChange.js
+++ b/entity/Orderitem_entity/entityfields/product_id/onValueChange.js
@@ -8,7 +8,7 @@ var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"
if(pid != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- var relid = vars.exists("$param.RelationId_param") ? vars.get("$param.RelationId_param") : "";
+ var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), relationId: relid };
diff --git a/entity/Orderitem_entity/entityfields/quantity/onValueChange.js b/entity/Orderitem_entity/entityfields/quantity/onValueChange.js
index 6e32e2ec1c940f4d89f5371180874c10ad2329f8..328caec2766fd4b5eb84bb957f75d83194fae420 100644
--- a/entity/Orderitem_entity/entityfields/quantity/onValueChange.js
+++ b/entity/Orderitem_entity/entityfields/quantity/onValueChange.js
@@ -9,7 +9,7 @@ var newQuantity = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.QUA
if(pid != "" && newQuantity != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- var relid = vars.exists("$param.RelationId_param") ? vars.get("$param.RelationId_param") : "";
+ var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: relid };
diff --git a/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js b/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
index e564c8123b9d288c2f48b0ef3e49e48fc36286b8..f1f78fd5af769ad274269a6047e8567982311b25 100644
--- a/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
@@ -11,7 +11,7 @@ var oid = vars.get("$field.SALESORDER_ID");
if(oid != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- var relid = vars.exists("$param.RelationId_param") ? vars.get("$param.RelationId_param") : "";
+ var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var oiUtils = new OrderItemUtils(vars.get("$field.SALESORDER_ID"));
oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.SALESORDERITEMID"), curr, relid);
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 5aab13dfcc093b47fc80fbc6018a7200d242c93b..cc6a517a19b67f7df722159dc98c14ae76f5d005 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -27,7 +27,7 @@
<entityField>
<name>ORGANISATIONID</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/orgid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisationid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>LANGUAGE</name>
@@ -38,17 +38,17 @@
<entityField>
<name>ORGANISATION_ID</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/org_id/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>RELATIONID</name>
+ <name>CONTACTID</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/relationid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contactid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>STATUS</name>
<title>Status</title>
- <consumer>KeywordRelationStates</consumer>
+ <consumer>KeywordContactStates</consumer>
<searchable v="false" />
</entityField>
<entityField>
@@ -84,7 +84,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>OrganisationRelated</fieldName>
</dependency>
<children>
@@ -119,7 +119,7 @@
<dependencies>
<entityDependency>
<name>e56d51be-aaf7-4ddc-8bed-7a4a3c42b4dd</name>
- <entityName>Relation_entity</entityName>
+ <entityName>AnyContact_entity</entityName>
<fieldName>Organisation</fieldName>
<isConsumer v="false" />
</entityDependency>
@@ -132,7 +132,7 @@
</dependencies>
<children>
<entityParameter>
- <name>relationId_param</name>
+ <name>ContactId_param</name>
<mandatory v="true" />
</entityParameter>
</children>
@@ -181,7 +181,7 @@
<name>RelId_param</name>
<code>%aditoprj%/entity/Organisation_entity/entityfields/communications/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
- <description>This parameter is used for specifing a related &quot;RELATIONID&quot; to a COMMUNICATION-entry.
+ <description>This parameter is used for specifing a related &quot;CONTACTID&quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entires by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
</children>
@@ -224,7 +224,7 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
<dependencies>
<entityDependency>
<name>72825dbe-c602-4c17-9aa8-546c4b61f2f9</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
@@ -273,7 +273,7 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
</children>
</entityConsumer>
<entityParameter>
- <name>relationId_param</name>
+ <name>ContactId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="false" />
@@ -418,15 +418,17 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
<entityParameter>
<name>AnyObjectRowid_param</name>
<code>%aditoprj%/entity/Organisation_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js</code>
+ <triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>AnyObjectType_param</name>
<code>%aditoprj%/entity/Organisation_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js</code>
+ <triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>KeywordRelationStates</name>
+ <name>KeywordContactStates</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -436,7 +438,7 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
<children>
<entityParameter>
<name>containerName_param</name>
- <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordrelationstates/children/containername_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -482,8 +484,8 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
</linkInformation>
<linkInformation>
<name>e3033b6f-966e-415a-9390-c61d5a1b19fc</name>
- <tableName>RELATION</tableName>
- <primaryKey>RELATIONID</primaryKey>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
<readonly v="false" />
</linkInformation>
@@ -491,7 +493,7 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ADDRESS_ID.value</name>
- <recordfield>RELATION.ADDRESS_ID</recordfield>
+ <recordfield>CONTACT.ADDRESS_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CUSTOMERCODE.value</name>
@@ -503,7 +505,7 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LANGUAGE.value</name>
- <recordfield>RELATION.LANGUAGE</recordfield>
+ <recordfield>CONTACT.LANGUAGE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>NAME.value</name>
@@ -515,15 +517,15 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORGANISATION_ID.value</name>
- <recordfield>RELATION.ORGANISATION_ID</recordfield>
+ <recordfield>CONTACT.ORGANISATION_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATIONID.value</name>
- <recordfield>RELATION.RELATIONID</recordfield>
+ <name>CONTACTID.value</name>
+ <recordfield>CONTACT.CONTACTID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.value</name>
- <recordfield>RELATION.STATUS</recordfield>
+ <recordfield>CONTACT.STATUS</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TYPE.value</name>
diff --git a/entity/Organisation_entity/entityfields/activities/children/rowid_param/code.js b/entity/Organisation_entity/entityfields/activities/children/rowid_param/code.js
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..70a1c0fcc1293fa4bf37109294829055704eeaea 100644
--- a/entity/Organisation_entity/entityfields/activities/children/rowid_param/code.js
+++ b/entity/Organisation_entity/entityfields/activities/children/rowid_param/code.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/addresses/children/relid_param/code.js b/entity/Organisation_entity/entityfields/addresses/children/relid_param/code.js
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..70a1c0fcc1293fa4bf37109294829055704eeaea 100644
--- a/entity/Organisation_entity/entityfields/addresses/children/relid_param/code.js
+++ b/entity/Organisation_entity/entityfields/addresses/children/relid_param/code.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/communications/children/relid_param/code.js b/entity/Organisation_entity/entityfields/communications/children/relid_param/code.js
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..70a1c0fcc1293fa4bf37109294829055704eeaea 100644
--- a/entity/Organisation_entity/entityfields/communications/children/relid_param/code.js
+++ b/entity/Organisation_entity/entityfields/communications/children/relid_param/code.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/relationid/valueProcess.js b/entity/Organisation_entity/entityfields/contactid/valueProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/relationid/valueProcess.js
rename to entity/Organisation_entity/entityfields/contactid/valueProcess.js
diff --git a/entity/Organisation_entity/entityfields/contracts/children/relid_param/code.js b/entity/Organisation_entity/entityfields/contracts/children/relid_param/code.js
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..70a1c0fcc1293fa4bf37109294829055704eeaea 100644
--- a/entity/Organisation_entity/entityfields/contracts/children/relid_param/code.js
+++ b/entity/Organisation_entity/entityfields/contracts/children/relid_param/code.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/documents/children/assignmentrowid_param/code.js b/entity/Organisation_entity/entityfields/documents/children/assignmentrowid_param/code.js
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..70a1c0fcc1293fa4bf37109294829055704eeaea 100644
--- a/entity/Organisation_entity/entityfields/documents/children/assignmentrowid_param/code.js
+++ b/entity/Organisation_entity/entityfields/documents/children/assignmentrowid_param/code.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/documents/children/assignmenttable_param/code.js b/entity/Organisation_entity/entityfields/documents/children/assignmenttable_param/code.js
index 12bc7590c1bd654d67409332f165b2f7a0cd24b6..a899db225e30962dada4ae3d8e0de36d220c767d 100644
--- a/entity/Organisation_entity/entityfields/documents/children/assignmenttable_param/code.js
+++ b/entity/Organisation_entity/entityfields/documents/children/assignmenttable_param/code.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("RELATION");
\ No newline at end of file
+result.string("CONTACT");
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/emailcommunications/children/relid_param/code.js b/entity/Organisation_entity/entityfields/emailcommunications/children/relid_param/code.js
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..70a1c0fcc1293fa4bf37109294829055704eeaea 100644
--- a/entity/Organisation_entity/entityfields/emailcommunications/children/relid_param/code.js
+++ b/entity/Organisation_entity/entityfields/emailcommunications/children/relid_param/code.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..e01caa2834a6c1d27a619ea582b50f8a52f22494
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.ContactStatus);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordrelationstates/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordrelationstates/children/containername_param/code.js
deleted file mode 100644
index 90bd2931483769fae8430e1944c890bae64af196..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/keywordrelationstates/children/containername_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.RelationStatus);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordrelationstatus_dfo/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordrelationstatus_dfo/children/containername_param/code.js
deleted file mode 100644
index 90bd2931483769fae8430e1944c890bae64af196..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/keywordrelationstatus_dfo/children/containername_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.RelationStatus);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/newactivity/onActionProcess.js b/entity/Organisation_entity/entityfields/newactivity/onActionProcess.js
index 46bf5e11471e87366041e50c488b84d3e7c9bbf6..e025c8d032b657210446d7abd7fe56199f01c953 100644
--- a/entity/Organisation_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/newactivity/onActionProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("Activity_lib");
-ActivityUtils.createNewActivity(vars.getString("$field.RELATIONID"));
\ No newline at end of file
+ActivityUtils.createNewActivity(vars.getString("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/newoffer/onActionProcess.js b/entity/Organisation_entity/entityfields/newoffer/onActionProcess.js
index fdee58dbfa82c4c75a4482a0df109f56ffd47762..a7172e4cec347fa3e63060898a4d88f438dcc53d 100644
--- a/entity/Organisation_entity/entityfields/newoffer/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/newoffer/onActionProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("Offer_lib");
-OfferUtils.createNewOffer(null, vars.getString("$field.RELATIONID"));
\ No newline at end of file
+OfferUtils.createNewOffer(null, vars.getString("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/org_id/valueProcess.js b/entity/Organisation_entity/entityfields/organisation_id/valueProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/org_id/valueProcess.js
rename to entity/Organisation_entity/entityfields/organisation_id/valueProcess.js
diff --git a/entity/Organisation_entity/entityfields/orgid/valueProcess.js b/entity/Organisation_entity/entityfields/organisationid/valueProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/orgid/valueProcess.js
rename to entity/Organisation_entity/entityfields/organisationid/valueProcess.js
diff --git a/entity/Organisation_entity/entityfields/orgattr_dfo/children/objecttype_param/code.js b/entity/Organisation_entity/entityfields/orgattr_dfo/children/objecttype_param/code.js
deleted file mode 100644
index 5996e99db232db8df50f155732110608e5abff4e..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/orgattr_dfo/children/objecttype_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/orgproduct_dfo/children/relationid_param/code.js b/entity/Organisation_entity/entityfields/orgproduct_dfo/children/relationid_param/code.js
deleted file mode 100644
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/orgproduct_dfo/children/relationid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/phonecommunications/children/relid_param/code.js b/entity/Organisation_entity/entityfields/phonecommunications/children/relid_param/code.js
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..70a1c0fcc1293fa4bf37109294829055704eeaea 100644
--- a/entity/Organisation_entity/entityfields/phonecommunications/children/relid_param/code.js
+++ b/entity/Organisation_entity/entityfields/phonecommunications/children/relid_param/code.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/productprices/children/relid_param/code.js b/entity/Organisation_entity/entityfields/productprices/children/relid_param/code.js
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..70a1c0fcc1293fa4bf37109294829055704eeaea 100644
--- a/entity/Organisation_entity/entityfields/productprices/children/relid_param/code.js
+++ b/entity/Organisation_entity/entityfields/productprices/children/relid_param/code.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/fromClauseProcess.js b/entity/Organisation_entity/fromClauseProcess.js
index 7ae968af8d14581d03c09bdc4ddd5c61c1ecf175..fd4f9ce328d42a3ef11efbd7b6454d99d6b3f30c 100644
--- a/entity/Organisation_entity/fromClauseProcess.js
+++ b/entity/Organisation_entity/fromClauseProcess.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("ORGANISATION join RELATION on (ORGANISATION.ORGANISATIONID = RELATION.ORGANISATION_ID and RELATION.PERS_ID is null)");
\ No newline at end of file
+result.string("ORGANISATION join CONTACT on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null)");
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
index 54e24d2e57ccb29311750a497ab31b50911c7578..0c6aae84bba48f30903a0a7d7d900d605992280a 100644
--- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
@@ -7,5 +7,5 @@ import("Sql_lib");
//TODO: use a preparedCondition when available
result.string(db.translateCondition(
SqlCondition.begin()
- .andPrepareVars("ORGANISATION.ORGANISATIONID", "$param.relationId_param")
+ .andPrepareVars("ORGANISATION.ORGANISATIONID", "$param.ContactId_param")
.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js b/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
index 7ae968af8d14581d03c09bdc4ddd5c61c1ecf175..fd4f9ce328d42a3ef11efbd7b6454d99d6b3f30c 100644
--- a/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("ORGANISATION join RELATION on (ORGANISATION.ORGANISATIONID = RELATION.ORGANISATION_ID and RELATION.PERS_ID is null)");
\ No newline at end of file
+result.string("ORGANISATION join CONTACT on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null)");
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js
index 61020026bb8764a43c6a20ce118d957471d2a95b..9b7d38b00dc1722f6e6fcc13b7a2b7ffbf0b92fd 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js
@@ -1,5 +1,5 @@
import("system.result");
import("Keyword_lib");
-var sql = LanguageKeywordUtils.getResolvedTitleSqlPart("RELATION.LANGUAGE");
+var sql = LanguageKeywordUtils.getResolvedTitleSqlPart("CONTACT.LANGUAGE");
result.string(sql);
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
index ef80c8f700ce9172b639558bb950256bd609bb71..c831d8b5a5dd945d8017287b41e1577f12407430 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -1,5 +1,5 @@
import("system.result");
import("Keyword_lib");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.RelationStatus, "RELATION.STATUS");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContactStatus, "CONTACT.STATUS");
result.string(sql);
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Person_entity/Person_entity.aod
similarity index 71%
rename from entity/Contact_entity/Contact_entity.aod
rename to entity/Person_entity/Person_entity.aod
index ffdb76a5110d16f1fbf7ef10b3f5e7d7c29676aa..ee2cf9231b3fc17312e126aad4129152e9e42bbc 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
- <name>Contact_entity</name>
+ <name>Person_entity</name>
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<iconId>VAADIN:USERS</iconId>
- <imageProcess>%aditoprj%/entity/Contact_entity/imageProcess.js</imageProcess>
- <titleProcess>%aditoprj%/entity/Contact_entity/titleProcess.js</titleProcess>
+ <imageProcess>%aditoprj%/entity/Person_entity/imageProcess.js</imageProcess>
+ <titleProcess>%aditoprj%/entity/Person_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
@@ -27,16 +27,16 @@
<name>LASTNAME</name>
<title>Lastname</title>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/lastname/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/lastname/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>MIDDLENAME</name>
<title>Middlename</title>
</entityField>
<entityField>
- <name>PERSID</name>
+ <name>PERSONID</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/persid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>SALUTATION</name>
@@ -53,7 +53,7 @@
<entityField>
<name>PREVIEWTITLE</name>
<title></title>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/previewtitle/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/previewtitle/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>OrgId_param</name>
@@ -65,15 +65,15 @@
<entityField>
<name>IMAGE</name>
<contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/image/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Contact_entity/entityfields/image/onValueChange.js</onValueChange>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/image/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Person_entity/entityfields/image/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
</onValueChangeTypes>
</entityField>
<entityFieldGroup>
<name>NAME_fieldGroup</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
<description>FIELDGROUP</description>
<fields>
<element>FIRSTNAME</element>
@@ -92,16 +92,16 @@
<children>
<entityParameter>
<name>RowId_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/activities/children/rowid_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/activities/children/rowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>ObjectId_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/activities/children/objectid_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/activities/children/objectid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityField>
- <name>RELATIONID</name>
+ <name>CONTACTID</name>
<searchable v="false" />
</entityField>
<entityProvider>
@@ -118,20 +118,20 @@
</dependencies>
</entityProvider>
<entityField>
- <name>PERS_ID</name>
- <documentation>%aditoprj%/entity/Contact_entity/entityfields/pers_id/documentation.adoc</documentation>
+ <name>PERSON_ID</name>
+ <documentation>%aditoprj%/entity/Person_entity/entityfields/person_id/documentation.adoc</documentation>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/pers_id/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/person_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ORGANISATION_ID</name>
<title>Firma</title>
<consumer>Organisations</consumer>
- <linkedContextProcess>%aditoprj%/entity/Contact_entity/entityfields/org_id/linkedContextProcess.js</linkedContextProcess>
+ <linkedContextProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="false" />
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/org_id/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Contact_entity/entityfields/org_id/onValueChange.js</onValueChange>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Person_entity/entityfields/organisation_id/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
<name>PersAddresses</name>
@@ -145,12 +145,12 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/persaddresses/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>DefaultAddressId_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -167,7 +167,7 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/communications/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/communications/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -194,7 +194,7 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/contracts/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/contracts/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -204,7 +204,7 @@
<title>Conditions</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<state>AUTO</state>
- <stateProcess>%aditoprj%/entity/Contact_entity/entityfields/pricelists/stateProcess.js</stateProcess>
+ <stateProcess>%aditoprj%/entity/Person_entity/entityfields/pricelists/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Productprice_entity</entityName>
@@ -213,7 +213,7 @@
<children>
<entityParameter>
<name>RelID_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/pricelists/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/pricelists/children/relid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -273,20 +273,20 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/documents/children/assignmentname_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/documents/children/assignmentname_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/documents/children/assignmentrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/documents/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/documents/children/assignmenttable_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/documents/children/assignmenttable_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
- <name>RelationId_param</name>
+ <name>ContactId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="false" />
@@ -294,7 +294,7 @@
</entityParameter>
<entityFieldGroup>
<name>FULL_NAME_fieldGroup</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/full_name_fieldgroup/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/full_name_fieldgroup/valueProcess.js</valueProcess>
<title>Name</title>
<description>FIELDGROUP</description>
<fields>
@@ -313,7 +313,7 @@
<dependencies>
<entityDependency>
<name>0b209ee1-3c13-4660-91c4-4d2a2c6cea77</name>
- <entityName>Relation_entity</entityName>
+ <entityName>AnyContact_entity</entityName>
<fieldName>Contact</fieldName>
<isConsumer v="false" />
</entityDependency>
@@ -330,7 +330,7 @@
<expose v="false" />
</entityParameter>
<entityParameter>
- <name>RelationId_param</name>
+ <name>ContactId_param</name>
<mandatory v="true" />
</entityParameter>
</children>
@@ -348,7 +348,7 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/orgaddresses/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/orgaddresses/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -359,33 +359,33 @@
<description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
<contentType>NUMBER</contentType>
<mandatory v="false" />
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/rel_relationship/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/rel_relationship/valueProcess.js</valueProcess>
</entityField>
<entityActionField>
<name>openEditDefaultsView_action</name>
<fieldType>ACTION</fieldType>
<title>Edit defaults</title>
- <onActionProcess>%aditoprj%/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/openeditdefaultsview_action/onActionProcess.js</onActionProcess>
<iconId>VAADIN:WRENCH</iconId>
</entityActionField>
<entityActionField>
<name>newOffer</name>
<fieldType>ACTION</fieldType>
<title>New offer</title>
- <onActionProcess>%aditoprj%/entity/Contact_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CART</iconId>
</entityActionField>
<entityField>
<name>STANDARD_EMAIL_COMMUNICATION</name>
<title>E-Mail</title>
<consumer>EmailCommunications</consumer>
- <onValueChange>%aditoprj%/entity/Contact_entity/entityfields/standard_email_communication/onValueChange.js</onValueChange>
+ <onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_email_communication/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>STANDARD_PHONE_COMMUNICATION</name>
<title>Phone</title>
<consumer>PhoneCommunications</consumer>
- <onValueChange>%aditoprj%/entity/Contact_entity/entityfields/standard_phone_communication/onValueChange.js</onValueChange>
+ <onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
<name>PhoneCommunications</name>
@@ -399,7 +399,7 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -415,7 +415,7 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -423,13 +423,13 @@
<name>ADDRESS_ID</name>
<title>standard address</title>
<consumer>PersAddresses</consumer>
- <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
+ <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityActionField>
<name>newActivity</name>
<fieldType>ACTION</fieldType>
<title>New activity</title>
- <onActionProcess>%aditoprj%/entity/Contact_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
</entityActionField>
<entityConsumer>
@@ -445,11 +445,13 @@
<entityParameter>
<name>AnyObjectRowid_param</name>
<title></title>
- <code>%aditoprj%/entity/Contact_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js</code>
+ <triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>AnyObjectType_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js</code>
+ <triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
@@ -464,7 +466,7 @@
<children>
<entityParameter>
<name>containerName_param</name>
- <code>%aditoprj%/entity/Contact_entity/entityfields/keywordgenders/children/containername_param/code.js</code>
+ <code>%aditoprj%/entity/Person_entity/entityfields/keywordgenders/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -482,21 +484,21 @@
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
- <fromClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
- <conditionProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <onDBUpdate>%aditoprj%/entity/Contact_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <fromClauseProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <onDBUpdate>%aditoprj%/entity/Person_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
<name>cb2de42b-de48-4543-91d6-8d00af5c5736</name>
- <tableName>PERS</tableName>
- <primaryKey>PERSID</primaryKey>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
<isUIDTable v="false" />
<readonly v="false" />
</linkInformation>
<linkInformation>
<name>23fde8db-a3fe-421d-9e39-f6a0294e6883</name>
- <tableName>RELATION</tableName>
- <primaryKey>RELATIONID</primaryKey>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
@@ -510,74 +512,74 @@
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
- <name>PERSID.value</name>
- <recordfield>PERS.PERSID</recordfield>
+ <name>PERSONID.value</name>
+ <recordfield>PERSON.PERSONID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATEOFBIRTH.value</name>
- <recordfield>PERS.DATEOFBIRTH</recordfield>
+ <recordfield>PERSON.DATEOFBIRTH</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>FIRSTNAME.value</name>
- <recordfield>PERS.FIRSTNAME</recordfield>
+ <recordfield>PERSON.FIRSTNAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>GENDER.value</name>
- <recordfield>PERS.GENDER</recordfield>
+ <recordfield>PERSON.GENDER</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LANGUAGE.value</name>
- <recordfield>RELATION.LANGUAGE</recordfield>
+ <recordfield>CONTACT.LANGUAGE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>PERS_ID.value</name>
- <recordfield>RELATION.PERS_ID</recordfield>
+ <name>PERSON_ID.value</name>
+ <recordfield>CONTACT.PERSON_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LASTNAME.value</name>
- <recordfield>PERS.LASTNAME</recordfield>
+ <recordfield>PERSON.LASTNAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>MIDDLENAME.value</name>
- <recordfield>PERS.MIDDLENAME</recordfield>
+ <recordfield>PERSON.MIDDLENAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATIONID.value</name>
- <recordfield>RELATION.RELATIONID</recordfield>
+ <name>CONTACTID.value</name>
+ <recordfield>CONTACT.CONTACTID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SALUTATION.value</name>
- <recordfield>PERS.SALUTATION</recordfield>
+ <recordfield>PERSON.SALUTATION</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TITLE.value</name>
- <recordfield>PERS.TITLE</recordfield>
+ <recordfield>PERSON.TITLE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TITLESUFFIX.value</name>
- <recordfield>PERS.TITLESUFFIX</recordfield>
+ <recordfield>PERSON.TITLESUFFIX</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORGANISATION_ID.value</name>
- <recordfield>RELATION.ORGANISATION_ID</recordfield>
+ <recordfield>CONTACT.ORGANISATION_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>REL_RELATIONSHIP.value</name>
- <recordfield>RELATION.RELATIONSHIP</recordfield>
+ <recordfield>CONTACT.RELATIONSHIP</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_EMAIL_COMMUNICATION.displayValue</name>
<recordfield></recordfield>
- <expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js</expression>
+ <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_PHONE_COMMUNICATION.displayValue</name>
<recordfield></recordfield>
- <expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js</expression>
+ <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ADDRESS_ID.value</name>
- <recordfield>RELATION.ADDRESS_ID</recordfield>
+ <recordfield>CONTACT.ADDRESS_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORGANISATION_ID.displayValue</name>
@@ -585,11 +587,11 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>GENDER.displayValue</name>
- <expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js</expression>
+ <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LANGUAGE.displayValue</name>
- <expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
+ <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
diff --git a/entity/Contact_entity/conditionProcess.js b/entity/Person_entity/conditionProcess.js
similarity index 65%
rename from entity/Contact_entity/conditionProcess.js
rename to entity/Person_entity/conditionProcess.js
index c9574ac395d609c04e12db77ac3cebe17f437364..a19303b9872d89bd503a36a2a3d9567f77f98868 100644
--- a/entity/Contact_entity/conditionProcess.js
+++ b/entity/Person_entity/conditionProcess.js
@@ -3,8 +3,8 @@ import("system.result");
import("Sql_lib");
var cond = new SqlCondition();
-cond.andPrepareVars("RELATION.ORGANISATION_ID", "$param.OrgId_param");
-cond.andPrepareVars("PERS.RELATION_ID", "$param.RelationId_param");
+cond.andPrepareVars("CONTACT.ORGANISATION_ID", "$param.OrgId_param");
+cond.andPrepareVars("PERSON.CONTACT_ID", "$param.ContactId_param");
//TODO; add OBJECT_ID (probably another param)
//TODO: use a preparedCondition when available
diff --git a/entity/Contact_entity/entityfields/activities/children/objectid_param/code.js b/entity/Person_entity/entityfields/activities/children/objectid_param/code.js
similarity index 100%
rename from entity/Contact_entity/entityfields/activities/children/objectid_param/code.js
rename to entity/Person_entity/entityfields/activities/children/objectid_param/code.js
diff --git a/entity/Person_entity/entityfields/activities/children/rowid_param/code.js b/entity/Person_entity/entityfields/activities/children/rowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..7b6137b4d105e9ba592cf8ef6e796fb838a32b09
--- /dev/null
+++ b/entity/Person_entity/entityfields/activities/children/rowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/address_id/displayValueProcess.js b/entity/Person_entity/entityfields/address_id/displayValueProcess.js
similarity index 100%
rename from entity/Contact_entity/entityfields/address_id/displayValueProcess.js
rename to entity/Person_entity/entityfields/address_id/displayValueProcess.js
diff --git a/entity/Person_entity/entityfields/communications/children/relid_param/code.js b/entity/Person_entity/entityfields/communications/children/relid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..70a1c0fcc1293fa4bf37109294829055704eeaea
--- /dev/null
+++ b/entity/Person_entity/entityfields/communications/children/relid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/contracts/children/relid_param/code.js b/entity/Person_entity/entityfields/contracts/children/relid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..70a1c0fcc1293fa4bf37109294829055704eeaea
--- /dev/null
+++ b/entity/Person_entity/entityfields/contracts/children/relid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js b/entity/Person_entity/entityfields/documents/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js
rename to entity/Person_entity/entityfields/documents/children/assignmentname_param/code.js
diff --git a/entity/Person_entity/entityfields/documents/children/assignmentrowid_param/code.js b/entity/Person_entity/entityfields/documents/children/assignmentrowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..70a1c0fcc1293fa4bf37109294829055704eeaea
--- /dev/null
+++ b/entity/Person_entity/entityfields/documents/children/assignmentrowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/documents/children/assignmentname_param/code.js b/entity/Person_entity/entityfields/documents/children/assignmenttable_param/code.js
similarity index 50%
rename from entity/Contact_entity/entityfields/documents/children/assignmentname_param/code.js
rename to entity/Person_entity/entityfields/documents/children/assignmenttable_param/code.js
index 3e4bf7585b2ca4628118e46818683fc51bfcf1c5..a899db225e30962dada4ae3d8e0de36d220c767d 100644
--- a/entity/Contact_entity/entityfields/documents/children/assignmentname_param/code.js
+++ b/entity/Person_entity/entityfields/documents/children/assignmenttable_param/code.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("DOCUMENT");
\ No newline at end of file
+result.string("CONTACT");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/emailcommunications/children/relid_param/code.js b/entity/Person_entity/entityfields/emailcommunications/children/relid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..70a1c0fcc1293fa4bf37109294829055704eeaea
--- /dev/null
+++ b/entity/Person_entity/entityfields/emailcommunications/children/relid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/full_name_fieldgroup/valueProcess.js b/entity/Person_entity/entityfields/full_name_fieldgroup/valueProcess.js
similarity index 100%
rename from entity/Contact_entity/entityfields/full_name_fieldgroup/valueProcess.js
rename to entity/Person_entity/entityfields/full_name_fieldgroup/valueProcess.js
diff --git a/entity/Contact_entity/entityfields/image/onValueChange.js b/entity/Person_entity/entityfields/image/onValueChange.js
similarity index 100%
rename from entity/Contact_entity/entityfields/image/onValueChange.js
rename to entity/Person_entity/entityfields/image/onValueChange.js
diff --git a/entity/Person_entity/entityfields/image/valueProcess.js b/entity/Person_entity/entityfields/image/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2a70e90ebf7a93f7f0e9f2a1dcca3de0f9695080
--- /dev/null
+++ b/entity/Person_entity/entityfields/image/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Person_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+{
+ result.string(PersUtils.getImage(vars.get("$field.PERSONID"), (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME")).trim()));
+}
diff --git a/entity/Contact_entity/entityfields/keywordgenders/children/containername_param/code.js b/entity/Person_entity/entityfields/keywordgenders/children/containername_param/code.js
similarity index 100%
rename from entity/Contact_entity/entityfields/keywordgenders/children/containername_param/code.js
rename to entity/Person_entity/entityfields/keywordgenders/children/containername_param/code.js
diff --git a/entity/Contact_entity/entityfields/name_fieldgroup/valueProcess.js b/entity/Person_entity/entityfields/name_fieldgroup/valueProcess.js
similarity index 100%
rename from entity/Contact_entity/entityfields/name_fieldgroup/valueProcess.js
rename to entity/Person_entity/entityfields/name_fieldgroup/valueProcess.js
diff --git a/entity/Person_entity/entityfields/newactivity/onActionProcess.js b/entity/Person_entity/entityfields/newactivity/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e025c8d032b657210446d7abd7fe56199f01c953
--- /dev/null
+++ b/entity/Person_entity/entityfields/newactivity/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Activity_lib");
+
+ActivityUtils.createNewActivity(vars.getString("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/newoffer/onActionProcess.js b/entity/Person_entity/entityfields/newoffer/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a7172e4cec347fa3e63060898a4d88f438dcc53d
--- /dev/null
+++ b/entity/Person_entity/entityfields/newoffer/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Offer_lib");
+
+OfferUtils.createNewOffer(null, vars.getString("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js b/entity/Person_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
similarity index 53%
rename from entity/Contact_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
rename to entity/Person_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
index cf4c12ddfb0f6062dd0dab2ba00dbb3f8bd7ff12..032082b609152ed5785d5b376fdd6b6becd7209b 100644
--- a/entity/Contact_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
+++ b/entity/Person_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.PERSID"))
\ No newline at end of file
+result.string(vars.get("$field.PERSONID"))
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js b/entity/Person_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js
similarity index 100%
rename from entity/Contact_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js
rename to entity/Person_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js
diff --git a/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js b/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e0887ba77e67e26490ed3b4250526e895fd7f8e4
--- /dev/null
+++ b/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js
@@ -0,0 +1,3 @@
+import("system.vars");
+import("system.neon");
+neon.openContext("Person_context", "ContactEditDefaults_view", [vars.get("$field.CONTACTID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/openeditdefaultsview_action/onActionProcess.js b/entity/Person_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4b931551d10819fe41de65ca34fb93a61fb76e72
--- /dev/null
+++ b/entity/Person_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
@@ -0,0 +1,3 @@
+import("system.vars");
+import("system.neon");
+neon.openContext("Person_context", "ContactEditDefaults_view", [vars.get("$sys.uid")], neon.OPERATINGSTATE_EDIT, null);
diff --git a/entity/Person_entity/entityfields/orgaddresses/children/relid_param/code.js b/entity/Person_entity/entityfields/orgaddresses/children/relid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..0af516898e01741a99fc1b9e4daed65a6de7c3cd
--- /dev/null
+++ b/entity/Person_entity/entityfields/orgaddresses/children/relid_param/code.js
@@ -0,0 +1,12 @@
+import("system.result");
+import("system.db");
+import("system.vars");
+import("Sql_lib");
+
+var orgId = vars.get("$field.ORGANISATION_ID");
+if (orgId)
+{
+ var cond = SqlCondition.begin().and("CONTACT.PERSON_ID is null").andPrepare("CONTACT.ORGANISATION_ID", orgId);
+ var orgRelId = db.cell(cond.buildSql("select CONTACT.CONTACTID from CONTACT", "1 = 1"));
+ result.string(orgRelId);
+}
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/org_id/linkedContextProcess.js b/entity/Person_entity/entityfields/organisation_id/linkedContextProcess.js
similarity index 100%
rename from entity/Contact_entity/entityfields/org_id/linkedContextProcess.js
rename to entity/Person_entity/entityfields/organisation_id/linkedContextProcess.js
diff --git a/entity/Contact_entity/entityfields/org_id/onValueChange.js b/entity/Person_entity/entityfields/organisation_id/onValueChange.js
similarity index 100%
rename from entity/Contact_entity/entityfields/org_id/onValueChange.js
rename to entity/Person_entity/entityfields/organisation_id/onValueChange.js
diff --git a/entity/Contact_entity/entityfields/org_id/valueProcess.js b/entity/Person_entity/entityfields/organisation_id/valueProcess.js
similarity index 100%
rename from entity/Contact_entity/entityfields/org_id/valueProcess.js
rename to entity/Person_entity/entityfields/organisation_id/valueProcess.js
diff --git a/entity/Contact_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js b/entity/Person_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js
similarity index 100%
rename from entity/Contact_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js
rename to entity/Person_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js
diff --git a/entity/Person_entity/entityfields/persaddresses/children/relid_param/code.js b/entity/Person_entity/entityfields/persaddresses/children/relid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..08da3b121c951607015025c5ed6ea3ea8de1a4cb
--- /dev/null
+++ b/entity/Person_entity/entityfields/persaddresses/children/relid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.getString("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/person_id/documentation.adoc b/entity/Person_entity/entityfields/person_id/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..f066ffaa20e03b34cb77c75f2d87aadea138d8c3
--- /dev/null
+++ b/entity/Person_entity/entityfields/person_id/documentation.adoc
@@ -0,0 +1 @@
+The main reason why this field is needed is that the `CONTACT.PERSON_ID` has to be set when a new record is inserted (to keep references correct).
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/person_id/valueProcess.js b/entity/Person_entity/entityfields/person_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..531475f4c63a5a3af52f430474d35532f4ad0e61
--- /dev/null
+++ b/entity/Person_entity/entityfields/person_id/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+//this is needed to set the CONTACT-value when a new record is inserted
+result.string(vars.getString("$field.PERSONID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/persid/valueProcess.js b/entity/Person_entity/entityfields/personid/valueProcess.js
similarity index 100%
rename from entity/Contact_entity/entityfields/persid/valueProcess.js
rename to entity/Person_entity/entityfields/personid/valueProcess.js
diff --git a/entity/Person_entity/entityfields/phonecommunications/children/relid_param/code.js b/entity/Person_entity/entityfields/phonecommunications/children/relid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..70a1c0fcc1293fa4bf37109294829055704eeaea
--- /dev/null
+++ b/entity/Person_entity/entityfields/phonecommunications/children/relid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/pricelists/children/relid_param/code.js b/entity/Person_entity/entityfields/pricelists/children/relid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..70a1c0fcc1293fa4bf37109294829055704eeaea
--- /dev/null
+++ b/entity/Person_entity/entityfields/pricelists/children/relid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/pricelists/stateProcess.js b/entity/Person_entity/entityfields/pricelists/stateProcess.js
similarity index 100%
rename from entity/Contact_entity/entityfields/pricelists/stateProcess.js
rename to entity/Person_entity/entityfields/pricelists/stateProcess.js
diff --git a/entity/Contact_entity/entityfields/rel_relationship/valueProcess.js b/entity/Person_entity/entityfields/rel_relationship/valueProcess.js
similarity index 100%
rename from entity/Contact_entity/entityfields/rel_relationship/valueProcess.js
rename to entity/Person_entity/entityfields/rel_relationship/valueProcess.js
diff --git a/entity/Contact_entity/entityfields/standard_email_comm/onValueChange.js b/entity/Person_entity/entityfields/standard_email_comm/onValueChange.js
similarity index 100%
rename from entity/Contact_entity/entityfields/standard_email_comm/onValueChange.js
rename to entity/Person_entity/entityfields/standard_email_comm/onValueChange.js
diff --git a/entity/Contact_entity/entityfields/standard_phone_comm/onValueChange.js b/entity/Person_entity/entityfields/standard_phone_comm/onValueChange.js
similarity index 100%
rename from entity/Contact_entity/entityfields/standard_phone_comm/onValueChange.js
rename to entity/Person_entity/entityfields/standard_phone_comm/onValueChange.js
diff --git a/entity/Person_entity/fromClauseProcess.js b/entity/Person_entity/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ce2f7eb850a73316a2aecd84f0ef7c968124d5d9
--- /dev/null
+++ b/entity/Person_entity/fromClauseProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("PERSON join CONTACT on (CONTACT.PERSON_ID = PERSON.PERSONID) join ORGANISATION on ORGANISATIONID = ORGANISATION_ID ");
\ No newline at end of file
diff --git a/entity/Contact_entity/imageProcess.js b/entity/Person_entity/imageProcess.js
similarity index 100%
rename from entity/Contact_entity/imageProcess.js
rename to entity/Person_entity/imageProcess.js
diff --git a/entity/Contact_entity/recordcontainers/db/conditionProcess.js b/entity/Person_entity/recordcontainers/db/conditionProcess.js
similarity index 60%
rename from entity/Contact_entity/recordcontainers/db/conditionProcess.js
rename to entity/Person_entity/recordcontainers/db/conditionProcess.js
index 944ad9a15e3516d838cee9d668252724e71b7c7f..b65379fa6d403b265f33fea2fadb1d19b9cb272c 100644
--- a/entity/Contact_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/conditionProcess.js
@@ -3,8 +3,8 @@ import("system.result");
import("Sql_lib");
var cond = new SqlCondition();
-cond.andPrepareVars("RELATION.ORGANISATION_ID", "$param.OrgId_param");
-cond.andPrepareVars("PERS.RELATION_ID", "$param.RelationId_param");
+cond.andPrepareVars("CONTACT.ORGANISATION_ID", "$param.OrgId_param");
+cond.andPrepareVars("PERSON.CONTACT_ID", "$param.ContactId_param");
//TODO: use a preparedCondition when available
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/fromClauseProcess.js b/entity/Person_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ce2f7eb850a73316a2aecd84f0ef7c968124d5d9
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("PERSON join CONTACT on (CONTACT.PERSON_ID = PERSON.PERSONID) join ORGANISATION on ORGANISATIONID = ORGANISATION_ID ");
\ No newline at end of file
diff --git a/entity/Contact_entity/recordcontainers/db/onDBUpdate.js b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
similarity index 82%
rename from entity/Contact_entity/recordcontainers/db/onDBUpdate.js
rename to entity/Person_entity/recordcontainers/db/onDBUpdate.js
index 2205c50893b4087a774505f507b03588ad93e463..ebda79e51184b78501f01b875ed379b6e70069fb 100644
--- a/entity/Contact_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
@@ -1,14 +1,14 @@
import("system.vars");
-import("Pers_lib");
+import("Person_lib");
import("Communication_lib");
import("Entity_lib");
// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer
FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function(state, value){
if (state == FieldChanges.STATE_CHANGED())
- PersUtils.setImage(vars.get("$field.PERSID"), value);
+ PersUtils.setImage(vars.get("$field.PERSONID"), value);
else
- PersUtils.removeImage(vars.get("$field.PERSID"));
+ PersUtils.removeImage(vars.get("$field.PERSONID"));
});
diff --git a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js
similarity index 78%
rename from entity/Contact_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js
rename to entity/Person_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js
index cb2c32fa461419f02b9b86952589116453e77f92..e6d8ad46e0f687fbab7d9c4dd23d39e1b3520112 100644
--- a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js
@@ -1,5 +1,5 @@
import("system.result");
import("Keyword_lib");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.PersonGender, "PERS.GENDER");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.PersonGender, "PERSON.GENDER");
result.string(sql);
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b7d38b00dc1722f6e6fcc13b7a2b7ffbf0b92fd
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = LanguageKeywordUtils.getResolvedTitleSqlPart("CONTACT.LANGUAGE");
+result.string(sql);
diff --git a/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
similarity index 100%
rename from entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js
rename to entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
diff --git a/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
similarity index 100%
rename from entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js
rename to entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
diff --git a/entity/Contact_entity/titleProcess.js b/entity/Person_entity/titleProcess.js
similarity index 100%
rename from entity/Contact_entity/titleProcess.js
rename to entity/Person_entity/titleProcess.js
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 75d73343fb7cb29020f4383c134deccfef0d6a79..f77b0699c93de2d3bf86384f67be97ae5e18c2d1 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -167,11 +167,11 @@
</children>
</entityConsumer>
<entityField>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<title>Developer</title>
<consumer>Organisations</consumer>
- <linkedContextProcess>%aditoprj%/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js</linkedContextProcess>
- <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/relation_id/displayValueProcess.js</displayValueProcess>
+ <linkedContextProcess>%aditoprj%/entity/Product_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
+ <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
@@ -294,8 +294,8 @@
</linkInformation>
<linkInformation>
<name>774f098d-8c86-4f0a-8eab-de79a43b8609</name>
- <tableName>RELATION</tableName>
- <primaryKey>RELATIONID</primaryKey>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
@@ -345,28 +345,28 @@
<recordfield>PRODUCT.UNIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ORG_ID.value</name>
- <recordfield>RELATION.ORGANISATION_ID</recordfield>
+ <name>CONTACT_ORG_ID.value</name>
+ <recordfield>CONTACT.ORGANISATION_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_PERS_ID.value</name>
- <recordfield>RELATION.PERS_ID</recordfield>
+ <name>CONTACT_PERSON_ID.value</name>
+ <recordfield>CONTACT.PERSON_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.value</name>
- <recordfield>PRODUCT.RELATION_ID</recordfield>
+ <name>CONTACT_ID.value</name>
+ <recordfield>PRODUCT.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_NAME.value</name>
<recordfield>ORGANISATION.NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>PERS_FIRSTNAME.value</name>
- <recordfield>PERS.FIRSTNAME</recordfield>
+ <name>PERSON_FIRSTNAME.value</name>
+ <recordfield>PERSON.FIRSTNAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>PERS_LASTNAME.value</name>
- <recordfield>PERS.LASTNAME</recordfield>
+ <name>PERSON_LASTNAME.value</name>
+ <recordfield>PERSON.LASTNAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>INFO.value</name>
diff --git a/entity/Product_entity/entityfields/relation_id/displayValueProcess.js b/entity/Product_entity/entityfields/contact_id/displayValueProcess.js
similarity index 83%
rename from entity/Product_entity/entityfields/relation_id/displayValueProcess.js
rename to entity/Product_entity/entityfields/contact_id/displayValueProcess.js
index 8dbc1f5a8b87703ad7437138c6d542a78c9d3a9b..6ed363112cd305df2f803bb38ac863d9e7240741 100644
--- a/entity/Product_entity/entityfields/relation_id/displayValueProcess.js
+++ b/entity/Product_entity/entityfields/contact_id/displayValueProcess.js
@@ -1,6 +1,6 @@
import("system.result");
import("system.vars");
-import("Relation_lib");
+import("Contact_lib");
import("system.neon");
result.string(vars.getString("$field.ORG_NAME"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js b/entity/Product_entity/entityfields/contact_id/linkedContextProcess.js
similarity index 60%
rename from entity/Product_entity/entityfields/relation_id/linkedContextProcess.js
rename to entity/Product_entity/entityfields/contact_id/linkedContextProcess.js
index 84a906c21962b4ff8d00fbd90fe9131ec6afecdb..c52e323fc90013dd1039ae3cf0cf32cc14f6c021 100644
--- a/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js
+++ b/entity/Product_entity/entityfields/contact_id/linkedContextProcess.js
@@ -1,6 +1,6 @@
import("system.vars");
import("system.result");
-import("Relation_lib");
+import("Contact_lib");
-if(vars.get("$field.RELATION_ID"))
+if(vars.get("$field.CONTACT_ID"))
result.string("Organisation_context");
\ No newline at end of file
diff --git a/entity/Product_entity/recordcontainers/db/fromClauseProcess.js b/entity/Product_entity/recordcontainers/db/fromClauseProcess.js
index ef97542a8acd554e00025b9bdb7f4b78652d92b8..18cb9431c0932a67570dba8ae0f22b0de85e3e9e 100644
--- a/entity/Product_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Product_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,4 +1,4 @@
import("system.result");
-result.string("PRODUCT left join RELATION on RELATION.RELATIONID = PRODUCT.RELATION_ID \n\
-left join ORGANISATION on ORGANISATION.ORGANISATIONID = RELATION.ORGANISATION_ID");
\ No newline at end of file
+result.string("PRODUCT left join CONTACT on CONTACT.CONTACTID = PRODUCT.CONTACT_ID \n\
+left join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID");
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 98199055d8b2803fbf33efff69093ca0fd7a20f0..671068f90c983e6633381d877eab5fc48a1f6009 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -50,9 +50,9 @@
<displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<title>Company</title>
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/relation_id/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/contact_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>VALID_FROM</name>
@@ -133,7 +133,7 @@
</entityDependency>
<entityDependency>
<name>4efc927f-7441-480c-aaaa-36347e2e60c5</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>Pricelists</fieldName>
<isConsumer v="false" />
</entityDependency>
@@ -221,8 +221,8 @@
<recordfield>PRODUCTPRICE.PRODUCT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.value</name>
- <recordfield>PRODUCTPRICE.RELATION_ID</recordfield>
+ <name>CONTACT_ID.value</name>
+ <recordfield>PRODUCTPRICE.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>VALID_FROM.value</name>
diff --git a/entity/Productprice_entity/conditionProcess.js b/entity/Productprice_entity/conditionProcess.js
index 440dbdb5cb6f0ee33cef992ffd90e9eec0345992..fd616504b32f8857d73fe3a3d697b9234f67aaa9 100644
--- a/entity/Productprice_entity/conditionProcess.js
+++ b/entity/Productprice_entity/conditionProcess.js
@@ -4,6 +4,6 @@ import("system.vars");
if(vars.exists("$param.ProductId_param") && vars.get("$param.ProductId_param") != "")
result.string("PRODUCTPRICE.PRODUCT_ID = ('" + vars.get("$param.ProductId_param") + "')");
else if(vars.exists("$param.RelID_param") && vars.get("$param.RelID_param") != "")
- result.string("PRODUCTPRICE.RELATION_ID = ('" + vars.get("$param.RelID_param") + "')");
+ result.string("PRODUCTPRICE.CONTACT_ID = ('" + vars.get("$param.RelID_param") + "')");
else
result.string("1 = 2");
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/relation_id/valueProcess.js b/entity/Productprice_entity/entityfields/contact_id/valueProcess.js
similarity index 100%
rename from entity/Productprice_entity/entityfields/relation_id/valueProcess.js
rename to entity/Productprice_entity/entityfields/contact_id/valueProcess.js
diff --git a/entity/Productprice_entity/entityfields/pricelist/mandatoryProcess.js b/entity/Productprice_entity/entityfields/pricelist/mandatoryProcess.js
index 6db2c72b17a7335446e477540a3117ae5704fa35..fca349c9c923c73bd2b7dd1bcb655f5e101caa01 100644
--- a/entity/Productprice_entity/entityfields/pricelist/mandatoryProcess.js
+++ b/entity/Productprice_entity/entityfields/pricelist/mandatoryProcess.js
@@ -1,7 +1,7 @@
import("system.vars");
import("system.result");
-if(vars.get("$field.RELATION_ID") != "")
+if(vars.get("$field.CONTACT_ID") != "")
result.string("false");
else
result.string("true");
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/pricelist/stateProcess.js b/entity/Productprice_entity/entityfields/pricelist/stateProcess.js
index 7736f0d63499e5ffdee2b861d1dffb69d961f0ec..dba632f1a40663323e9dfb7296a86364c0172b0e 100644
--- a/entity/Productprice_entity/entityfields/pricelist/stateProcess.js
+++ b/entity/Productprice_entity/entityfields/pricelist/stateProcess.js
@@ -1,7 +1,7 @@
import("system.vars");
import("system.result");
-if(vars.get("$field.RELATION_ID") != "")
+if(vars.get("$field.CONTACT_ID") != "")
result.string("READONLY");
else
result.string("EDITABLE");
\ No newline at end of file
diff --git a/entity/Productprice_entity/recordcontainers/db/conditionProcess.js b/entity/Productprice_entity/recordcontainers/db/conditionProcess.js
index 440dbdb5cb6f0ee33cef992ffd90e9eec0345992..fd616504b32f8857d73fe3a3d697b9234f67aaa9 100644
--- a/entity/Productprice_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Productprice_entity/recordcontainers/db/conditionProcess.js
@@ -4,6 +4,6 @@ import("system.vars");
if(vars.exists("$param.ProductId_param") && vars.get("$param.ProductId_param") != "")
result.string("PRODUCTPRICE.PRODUCT_ID = ('" + vars.get("$param.ProductId_param") + "')");
else if(vars.exists("$param.RelID_param") && vars.get("$param.RelID_param") != "")
- result.string("PRODUCTPRICE.RELATION_ID = ('" + vars.get("$param.RelID_param") + "')");
+ result.string("PRODUCTPRICE.CONTACT_ID = ('" + vars.get("$param.RelID_param") + "')");
else
result.string("1 = 2");
\ No newline at end of file
diff --git a/entity/Relation_entity/entityfields/contact/children/relationid_param/code.js b/entity/Relation_entity/entityfields/contact/children/relationid_param/code.js
deleted file mode 100644
index 9517eee9df12cb0d7f101f8b3d284031228f5cf7..0000000000000000000000000000000000000000
--- a/entity/Relation_entity/entityfields/contact/children/relationid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Relation_entity/entityfields/emailcommunications/children/relid_param/code.js b/entity/Relation_entity/entityfields/emailcommunications/children/relid_param/code.js
deleted file mode 100644
index 9517eee9df12cb0d7f101f8b3d284031228f5cf7..0000000000000000000000000000000000000000
--- a/entity/Relation_entity/entityfields/emailcommunications/children/relid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Relation_entity/entityfields/image/valueProcess.js b/entity/Relation_entity/entityfields/image/valueProcess.js
deleted file mode 100644
index bcd36563dcf25931b58454e00676c82b82b07dfc..0000000000000000000000000000000000000000
--- a/entity/Relation_entity/entityfields/image/valueProcess.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("Pers_lib");
-import("Organisation_lib");
-import("Relation_lib");
-
-if (vars.get("$field.relationType") == 1) // 1 == org, 2 == pers, 3 == pers
-{
- result.string(OrgUtils.getImage(vars.get("$field.ORGANISATION_ID"), vars.getString("$field.ORG_NAME")));
-}
-else
-{
- result.string(PersUtils.getImage(vars.get("$field.PERS_ID"), (vars.getString("$field.PERS_FIRSTNAME") + " " + vars.getString("$field.PERS_LASTNAME")).trim()));
-}
\ No newline at end of file
diff --git a/entity/Relation_entity/entityfields/organisation/children/relationid_param/code.js b/entity/Relation_entity/entityfields/organisation/children/relationid_param/code.js
deleted file mode 100644
index 9517eee9df12cb0d7f101f8b3d284031228f5cf7..0000000000000000000000000000000000000000
--- a/entity/Relation_entity/entityfields/organisation/children/relationid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Relation_entity/entityfields/phonecommunications/children/relid_param/code.js b/entity/Relation_entity/entityfields/phonecommunications/children/relid_param/code.js
deleted file mode 100644
index 9517eee9df12cb0d7f101f8b3d284031228f5cf7..0000000000000000000000000000000000000000
--- a/entity/Relation_entity/entityfields/phonecommunications/children/relid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Relation_entity/entityfields/relationtype/valueProcess.js b/entity/Relation_entity/entityfields/relationtype/valueProcess.js
deleted file mode 100644
index 4f89d753a880ff877c556ebf7d5bdd1500e7c65e..0000000000000000000000000000000000000000
--- a/entity/Relation_entity/entityfields/relationtype/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Relation_lib")
-
-result.object(RelationUtils.getRelationType(vars.get("$field.RELATIONID"), vars.get("$field.PERS_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
diff --git a/entity/Relation_entity/titleProcess.js b/entity/Relation_entity/titleProcess.js
deleted file mode 100644
index c11d77e9098de1cbfae59497c70b5c89f8aa872a..0000000000000000000000000000000000000000
--- a/entity/Relation_entity/titleProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.vars");
-import("system.result");
-
-if(vars.get("$field.PERS_FIRSTNAME")) {
- result.string(vars.get("$field.PERS_FIRSTNAME") + " " + vars.get("$field.PERS_LASTNAME"));
-} else {
- result.string(vars.get("$field.ORG_NAME"));
-}
diff --git a/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentry_dfo/children/salesprojectid_param/code.js b/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentry_dfo/children/salesprojectid_param/code.js
deleted file mode 100644
index 098d87cfa55579898b8da11975f3fb345672247f..0000000000000000000000000000000000000000
--- a/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentry_dfo/children/salesprojectid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$param.SalesprojectId_param"));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 91d2b468f1921a90b5e90ee8788b7f33efada664..4c96838ecec17a5a3a22ba879b5601dc20705c7b 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -59,7 +59,7 @@
</dependencies>
</entityProvider>
<entityField>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<title>Organisation</title>
<consumer>Organisations</consumer>
<linkedContext>Organisation_context</linkedContext>
@@ -86,8 +86,8 @@
</dependency>
<children>
<entityParameter>
- <name>relationId_param</name>
- <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisation/children/relationid_param/code.js</code>
+ <name>ContactId_param</name>
+ <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisation/children/ContactId_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
@@ -182,8 +182,8 @@
<recordfield>SALESPROJECT_COMPETITION.REASON</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.value</name>
- <recordfield>SALESPROJECT_COMPETITION.RELATION_ID</recordfield>
+ <name>CONTACT_ID.value</name>
+ <recordfield>SALESPROJECT_COMPETITION.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SALESPROJECT_COMPETITIONID.value</name>
@@ -210,7 +210,7 @@
<recordfield>ORGANISATION.WEAKNESS</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.displayValue</name>
+ <name>CONTACT_ID.displayValue</name>
<recordfield>ORGANISATION.NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/organisation/children/contactid_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/organisation/children/contactid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..7e0951d02b7c26bc9ff0a84ad34eb2b47aa0ced8
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/organisation/children/contactid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/organisation/children/relationid_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/organisation/children/relationid_param/code.js
deleted file mode 100644
index 92b0b7622da56367d0eba073f0e8bb85fbd1f33d..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/entityfields/organisation/children/relationid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.RELATION_ID"));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/fromClauseProcess.js b/entity/SalesprojectCompetition_entity/fromClauseProcess.js
index 1358649c7ade9c858b3650e98c821e8274f08246..5fa89155c0c694bb2ae1ccc1f14c5188e094885b 100644
--- a/entity/SalesprojectCompetition_entity/fromClauseProcess.js
+++ b/entity/SalesprojectCompetition_entity/fromClauseProcess.js
@@ -1,4 +1,4 @@
import("system.result");
-result.string("SALESPROJECT_COMPETITION left join RELATION on (RELATION.RELATIONID = SALESPROJECT_COMPETITION.RELATION_ID) "
- + "left join ORGANISATION on (ORGANISATION.ORGANISATIONID = RELATION.ORGANISATION_ID)");
\ No newline at end of file
+result.string("SALESPROJECT_COMPETITION left join CONTACT on (CONTACT.CONTACTID = SALESPROJECT_COMPETITION.CONTACT_ID) "
+ + "left join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID)");
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/fromClauseProcess.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/fromClauseProcess.js
index 1ee016682a458a085f3056b42bab9448fc6eddd7..24a551280c717e489950414ef81eee16c3f3217d 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,4 +1,4 @@
import("system.result");
result.string("SALESPROJECT_COMPETITION "
- + "left join ORGANISATION on (ORGANISATION.ORGANISATIONID = SALESPROJECT_COMPETITION.RELATION_ID)");
\ No newline at end of file
+ + "left join ORGANISATION on (ORGANISATION.ORGANISATIONID = SALESPROJECT_COMPETITION.CONTACT_ID)");
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index 7392e4e601226a6b556df3c57109f92b5a539e92..9ccc4d770d2b87d22d02cad7764e9b5244ef832e 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -24,7 +24,7 @@
<title>Info</title>
</entityField>
<entityField>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<mandatory v="true" />
</entityField>
<entityField>
@@ -107,8 +107,8 @@
<recordfield>SALESPROJECT_FORECAST.INFO</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.value</name>
- <recordfield>SALESPROJECT_FORECAST.RELATION_ID</recordfield>
+ <name>CONTACT_ID.value</name>
+ <recordfield>SALESPROJECT_FORECAST.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SALESPROJECT_FORECASTID.value</name>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index f66af5d0b703519b63778823566a8c612d48ef7f..281d55b5ce8339ef63df6acd5e4c019a108f0597 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -9,10 +9,10 @@
<name>#PROVIDER</name>
</entityProvider>
<entityField>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<title>Person</title>
<consumer>Contacts</consumer>
- <linkedContext>Contact_context</linkedContext>
+ <linkedContext>Person_context</linkedContext>
</entityField>
<entityField>
<name>SALESPROJECT_ID</name>
@@ -57,25 +57,25 @@
<state>READONLY</state>
</entityField>
<entityField>
- <name>PERS_FIRSTNAME</name>
+ <name>PERSON_FIRSTNAME</name>
<title>Firstname</title>
<state>READONLY</state>
</entityField>
<entityField>
- <name>PERS_LASTNAME</name>
+ <name>PERSON_LASTNAME</name>
<title>Lastname</title>
<state>READONLY</state>
</entityField>
<entityField>
- <name>PERS_PERSID</name>
+ <name>PERSON_PERSID</name>
<state>READONLY</state>
</entityField>
<entityField>
- <name>PERS_SALUTATION</name>
+ <name>PERSON_SALUTATION</name>
<state>READONLY</state>
</entityField>
<entityField>
- <name>PERS_TITLE</name>
+ <name>PERSON_TITLE</name>
<title>title</title>
<state>READONLY</state>
</entityField>
@@ -84,30 +84,30 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>Contact</fieldName>
</dependency>
<children>
<entityParameter>
- <name>RelationId_param</name>
- <code>%aditoprj%/entity/SalesprojectMember_entity/entityfields/currentcontact/children/relationid_param/code.js</code>
+ <name>ContactId_param</name>
+ <code>%aditoprj%/entity/SalesprojectMember_entity/entityfields/currentcontact/children/ContactId_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityField>
- <name>PERS_FULL_NAME</name>
+ <name>PERSON_FULL_NAME</name>
<title>Name</title>
<consumer>CurrentContact</consumer>
- <linkedContext>Contact_context</linkedContext>
+ <linkedContext>Person_context</linkedContext>
<state>READONLY</state>
- <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/pers_full_name/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/person_full_name/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>RELATIONSHIP</name>
<title>Relationship</title>
- <description>Overrules RELATION_RELATIONSHIP
+ <description>Overrules CONTACT_RELATIONSHIP
-TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... aktuell im edit mode auf leeres Feld, dann wird das aus relation angezeigt</description>
+TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... aktuell im edit mode auf leeres Feld, dann wird das aus contact angezeigt</description>
<contentType>NUMBER</contentType>
<displayValueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/relationship/displayValueProcess.js</displayValueProcess>
<onValueChangeTypes>
@@ -116,7 +116,7 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
</onValueChangeTypes>
</entityField>
<entityField>
- <name>RELATION_RELATIONSHIP</name>
+ <name>CONTACT_RELATIONSHIP</name>
<title>Relationship</title>
<description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
<contentType>NUMBER</contentType>
@@ -126,7 +126,7 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
@@ -169,15 +169,15 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
</linkInformation>
<linkInformation>
<name>d794504f-52b7-4da0-abbe-ea3f6eabe996</name>
- <tableName>PERS</tableName>
- <primaryKey>PERSID</primaryKey>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
<name>6b4e762c-8316-47d2-8ff0-67d8b1ff58bd</name>
- <tableName>RELATION</tableName>
- <primaryKey>RELATIONID</primaryKey>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
@@ -192,28 +192,28 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<recordfield>ORGANISATION.ORGANISATIONID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>PERS_FIRSTNAME.value</name>
- <recordfield>PERS.FIRSTNAME</recordfield>
+ <name>PERSON_FIRSTNAME.value</name>
+ <recordfield>PERSON.FIRSTNAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>PERS_LASTNAME.value</name>
- <recordfield>PERS.LASTNAME</recordfield>
+ <name>PERSON_LASTNAME.value</name>
+ <recordfield>PERSON.LASTNAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>PERS_PERSID.value</name>
- <recordfield>PERS.PERSID</recordfield>
+ <name>PERSON_PERSID.value</name>
+ <recordfield>PERSON.PERSONID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>PERS_SALUTATION.value</name>
- <recordfield>PERS.SALUTATION</recordfield>
+ <name>PERSON_SALUTATION.value</name>
+ <recordfield>PERSON.SALUTATION</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>PERS_TITLE.value</name>
- <recordfield>PERS.TITLE</recordfield>
+ <name>PERSON_TITLE.value</name>
+ <recordfield>PERSON.TITLE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.value</name>
- <recordfield>SALESPROJECT_MEMBER.RELATION_ID</recordfield>
+ <name>CONTACT_ID.value</name>
+ <recordfield>SALESPROJECT_MEMBER.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SALESPROJECT_ID.value</name>
@@ -232,12 +232,12 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<recordfield>SALESPROJECT_MEMBER.RELATIONSHIP</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_RELATIONSHIP.value</name>
- <recordfield>RELATION.RELATIONSHIP</recordfield>
+ <name>CONTACT_RELATIONSHIP.value</name>
+ <recordfield>CONTACT.RELATIONSHIP</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.displayValue</name>
- <expression>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js</expression>
+ <name>CONTACT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SALESPROJECT_ROLE.displayValue</name>
diff --git a/entity/SalesprojectMember_entity/entityfields/currentcontact/children/contactid_param/code.js b/entity/SalesprojectMember_entity/entityfields/currentcontact/children/contactid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..d4c3595ca0b2f3d1cd640a7520d976bf8cf4a35c
--- /dev/null
+++ b/entity/SalesprojectMember_entity/entityfields/currentcontact/children/contactid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.getString("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/currentcontact/children/relationid_param/code.js b/entity/SalesprojectMember_entity/entityfields/currentcontact/children/relationid_param/code.js
deleted file mode 100644
index 3f0b3946afc5e8c9069e02de42cb104840632a39..0000000000000000000000000000000000000000
--- a/entity/SalesprojectMember_entity/entityfields/currentcontact/children/relationid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$field.RELATION_ID"));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/pers_full_name/fieldIdProcess.js b/entity/SalesprojectMember_entity/entityfields/pers_full_name/fieldIdProcess.js
index 9146e0f6dde085619aae9f38397e04418b38110d..d8ff22328f581fd0a82cd486cb8a8985b44968e8 100644
--- a/entity/SalesprojectMember_entity/entityfields/pers_full_name/fieldIdProcess.js
+++ b/entity/SalesprojectMember_entity/entityfields/pers_full_name/fieldIdProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.getString("$field.RELATION_ID"));
\ No newline at end of file
+result.string(vars.getString("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/pers_full_name/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/pers_full_name/valueProcess.js
deleted file mode 100644
index ca036ffd5a295d82f15524afcf18dbf97a4965bc..0000000000000000000000000000000000000000
--- a/entity/SalesprojectMember_entity/entityfields/pers_full_name/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.PERS_FIRSTNAME") + " " + vars.get("$field.PERS_LASTNAME") );
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/person_full_name/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/person_full_name/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f4411a504736511f7e8415dd7f63f053b844a1d4
--- /dev/null
+++ b/entity/SalesprojectMember_entity/entityfields/person_full_name/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.PERSON_FIRSTNAME") + " " + vars.get("$field.PERSON_LASTNAME") );
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/relationship/displayValueProcess.js b/entity/SalesprojectMember_entity/entityfields/relationship/displayValueProcess.js
index 15f3d68ca45227a8ecfaf2ed3ec301ad18c4c83e..5ef77e14cebdda5dc47cdd4ecb1822d56c4e1b5e 100644
--- a/entity/SalesprojectMember_entity/entityfields/relationship/displayValueProcess.js
+++ b/entity/SalesprojectMember_entity/entityfields/relationship/displayValueProcess.js
@@ -10,5 +10,5 @@ if (localRelationship)
}
else
{
- result.string(vars.get("$field.RELATION_RELATIONSHIP"));
+ result.string(vars.get("$field.CONTACT_RELATIONSHIP"));
}
diff --git a/entity/SalesprojectMember_entity/fromClauseProcess.js b/entity/SalesprojectMember_entity/fromClauseProcess.js
index 3155f070ed84e82eada7809cb49a2a60cbbdaeda..93d4323cf0c7708166ac4707bf3a7f023d0e9451 100644
--- a/entity/SalesprojectMember_entity/fromClauseProcess.js
+++ b/entity/SalesprojectMember_entity/fromClauseProcess.js
@@ -1,5 +1,5 @@
import("system.result");
-result.string("SALESPROJECT_MEMBER join RELATION on (RELATION.RELATIONID = SALESPROJECT_MEMBER.RELATION_ID) "
- + "left join ORGANISATION on (ORGANISATION.ORGANISATIONID = RELATION.ORGANISATION_ID) "
- + "left join PERS on (PERS.PERSID = RELATION.PERS_ID)");
\ No newline at end of file
+result.string("SALESPROJECT_MEMBER join CONTACT on (CONTACT.CONTACTID = SALESPROJECT_MEMBER.CONTACT_ID) "
+ + "left join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID) "
+ + "left join PERSON on (PERSON.PERSONID = CONTACT.PERSON_ID)");
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/recordcontainers/db/fromClauseProcess.js b/entity/SalesprojectMember_entity/recordcontainers/db/fromClauseProcess.js
index 3155f070ed84e82eada7809cb49a2a60cbbdaeda..93d4323cf0c7708166ac4707bf3a7f023d0e9451 100644
--- a/entity/SalesprojectMember_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/SalesprojectMember_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,5 +1,5 @@
import("system.result");
-result.string("SALESPROJECT_MEMBER join RELATION on (RELATION.RELATIONID = SALESPROJECT_MEMBER.RELATION_ID) "
- + "left join ORGANISATION on (ORGANISATION.ORGANISATIONID = RELATION.ORGANISATION_ID) "
- + "left join PERS on (PERS.PERSID = RELATION.PERS_ID)");
\ No newline at end of file
+result.string("SALESPROJECT_MEMBER join CONTACT on (CONTACT.CONTACTID = SALESPROJECT_MEMBER.CONTACT_ID) "
+ + "left join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID) "
+ + "left join PERSON on (PERSON.PERSONID = CONTACT.PERSON_ID)");
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js b/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..418c211fe3d6f213831fc5ab04518e71c1fc8910
--- /dev/null
+++ b/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Person_lib");
+
+result.string(PersUtils.getResolvingDisplaySubSql("CONTACT_ID"))
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js b/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js
deleted file mode 100644
index 00b5fa7447a54ccd53c3125e6f9b8081f0157e90..0000000000000000000000000000000000000000
--- a/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Pers_lib");
-
-result.string(PersUtils.getResolvingDisplaySubSql("RELATION_ID"))
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 85832cea86543f8f073fe43dd2cce9e9cc788408..d37f3e61bf2d109b8c4bfdb6a614d502f53956c2 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -65,7 +65,7 @@
<mandatory v="true" />
</entityField>
<entityField>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<title>Company</title>
<consumer>Organisations</consumer>
<linkedContext>Organisation_context</linkedContext>
@@ -253,7 +253,7 @@
<fieldType>ACTION</fieldType>
<documentation>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/documentation.adoc</documentation>
<title>New offer</title>
- <description>Opens the Offer context in NEW-Mode and fills salesproject and relation.</description>
+ <description>Opens the Offer context in NEW-Mode and fills salesproject and contact.</description>
<onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
</entityActionField>
<entityConsumer>
@@ -279,7 +279,7 @@
</children>
</entityConsumer>
<entityParameter>
- <name>relationId_param</name>
+ <name>ContactId_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
@@ -296,10 +296,12 @@
<entityParameter>
<name>AnyObjectRowid_param</name>
<code>%aditoprj%/entity/Salesproject_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js</code>
+ <triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>AnyObjectType_param</name>
<code>%aditoprj%/entity/Salesproject_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js</code>
+ <triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
@@ -445,11 +447,11 @@
<recordfield>SALESPROJECT.ESTIMATIONVALUE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.value</name>
- <recordfield>SALESPROJECT.RELATION_ID</recordfield>
+ <name>CONTACT_ID.value</name>
+ <recordfield>SALESPROJECT.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.displayValue</name>
+ <name>CONTACT_ID.displayValue</name>
<recordfield>ORGANISATION.NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
diff --git a/entity/Salesproject_entity/entityfields/newoffer/documentation.adoc b/entity/Salesproject_entity/entityfields/newoffer/documentation.adoc
index 4335f394386154f4a27208aee22d6ee3534a39b7..37c1e2d26f11d069bf78f9894eac3edaeaffdd32 100644
--- a/entity/Salesproject_entity/entityfields/newoffer/documentation.adoc
+++ b/entity/Salesproject_entity/entityfields/newoffer/documentation.adoc
@@ -1,2 +1,2 @@
== New Offer ==
-Calls Offer_lib.OfferUtils.createNewOffer(pSalesprojectId, pRelationId) which opens the offer_ontext in new-mode and fills salesproject and relation.
\ No newline at end of file
+Calls Offer_lib.OfferUtils.createNewOffer(pSalesprojectId, pRelationId) which opens the offer_ontext in new-mode and fills salesproject and contact.
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/newoffer/onActionProcess.js b/entity/Salesproject_entity/entityfields/newoffer/onActionProcess.js
index 670866d4c60af1d3c1cccb23b2a42b2edd10a227..45f61d0f0e68a2691eb4ab77f9f054293c747ae5 100644
--- a/entity/Salesproject_entity/entityfields/newoffer/onActionProcess.js
+++ b/entity/Salesproject_entity/entityfields/newoffer/onActionProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("Offer_lib");
-OfferUtils.createNewOffer(vars.get("$field.SALESPROJECTID"), vars.get("$field.RELATION_ID"));
\ No newline at end of file
+OfferUtils.createNewOffer(vars.get("$field.SALESPROJECTID"), vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectrating_dfo/children/salesprojectid_param/code.js b/entity/Salesproject_entity/entityfields/salesprojectrating_dfo/children/salesprojectid_param/code.js
deleted file mode 100644
index 2b119ebfa1944164fd2a1cb645511740bec9015e..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/salesprojectrating_dfo/children/salesprojectid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.SALESPROJECTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
index 8602cf6a01c39abdbd8c43c6f3be7de664f4fff2..6500b695cd9fdcd907e1faa86cbcbee9fcadc2ac 100644
--- a/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
result.string(db.translateCondition(
SqlCondition.begin()
- .andPrepareVars("SALESPROJECT.RELATION_ID", "$param.relationId_param")
+ .andPrepareVars("SALESPROJECT.CONTACT_ID", "$param.ContactId_param")
.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js b/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
index 1b94e576afcc45b90b238aa0802e5123b29dce5f..0548f92efeb71ee8742f7b18d5a6a7be24a529a4 100644
--- a/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string("SALESPROJECT join ORGANISATION on RELATION_ID = ORGANISATIONID ");
\ No newline at end of file
+result.string("SALESPROJECT join ORGANISATION on CONTACT_ID = ORGANISATIONID ");
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 0e739e2edaf55b0d7b6f39daea684fc1f6f6fb2d..36cf16b67ba417142c653045ccd53c0c5a00ea2b 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -44,17 +44,17 @@
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>REQUESTOR_RELATION_ID</name>
+ <name>REQUESTOR_CONTACT_ID</name>
<title>{$TASK_REQUESTOR}</title>
<consumer>ContactRequestors</consumer>
- <linkedContext>Contact_context</linkedContext>
+ <linkedContext>Person_context</linkedContext>
<mandatory v="true" />
</entityField>
<entityField>
- <name>EDITOR_RELATION_ID</name>
+ <name>EDITOR_CONTACT_ID</name>
<title>{$TASK_EDITOR}</title>
<consumer>ContactEditors</consumer>
- <linkedContext>Contact_context</linkedContext>
+ <linkedContext>Person_context</linkedContext>
</entityField>
<entityField>
<name>START_DATE</name>
@@ -103,7 +103,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
@@ -112,7 +112,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
@@ -195,8 +195,8 @@
<recordfield>TASK.DESCRIPTION</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>EDITOR_RELATION_ID.value</name>
- <recordfield>TASK.EDITOR_RELATION_ID</recordfield>
+ <name>EDITOR_CONTACT_ID.value</name>
+ <recordfield>TASK.EDITOR_CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>MATURITY_DATE.value</name>
@@ -211,8 +211,8 @@
<recordfield>TASK.PROTECTIONLEVEL</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>REQUESTOR_RELATION_ID.value</name>
- <recordfield>TASK.REQUESTOR_RELATION_ID</recordfield>
+ <name>REQUESTOR_CONTACT_ID.value</name>
+ <recordfield>TASK.REQUESTOR_CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>START_DATE.value</name>
@@ -235,12 +235,12 @@
<recordfield>TASK.TYPE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>EDITOR_RELATION_ID.displayValue</name>
- <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_relation_id.displayvalue/expression.js</expression>
+ <name>EDITOR_CONTACT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>REQUESTOR_RELATION_ID.displayValue</name>
- <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_relation_id.displayvalue/expression.js</expression>
+ <name>REQUESTOR_CONTACT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TYPE.displayValue</name>
diff --git a/entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js b/entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..62f1b9375d35999bdcf8e328c8a6373edddd2df0
--- /dev/null
+++ b/entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Person_lib");
+
+//TODO: try to find a better solution for this
+var subSql = PersUtils.getResolvingDisplaySubSql("TASK.EDITOR_CONTACT_ID");
+result.string(subSql);
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_relation_id.displayvalue/expression.js b/entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_relation_id.displayvalue/expression.js
deleted file mode 100644
index a4f559ec522ca79834fcd95d1270165827d74352..0000000000000000000000000000000000000000
--- a/entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_relation_id.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Pers_lib");
-
-//TODO: try to find a better solution for this
-var subSql = PersUtils.getResolvingDisplaySubSql("TASK.EDITOR_RELATION_ID");
-result.string(subSql);
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_relation_id.displayvalue/expression.js b/entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js
similarity index 81%
rename from entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_relation_id.displayvalue/expression.js
rename to entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js
index dcbdb3df7f18e9c7c17ad99735c20fb675ef6511..b29b24d836dc471cc9153a4fd6ed23c0f3876278 100644
--- a/entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_relation_id.displayvalue/expression.js
+++ b/entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js
@@ -1,6 +1,6 @@
import("system.result");
-import("Pers_lib");
+import("Person_lib");
//TODO: try to find a better solution for this
-var subSql = PersUtils.getResolvingDisplaySubSql("TASK.REQUESTOR_RELATION_ID");
+var subSql = PersUtils.getResolvingDisplaySubSql("TASK.REQUESTOR_CONTACT_ID");
result.string(subSql);
\ No newline at end of file
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 44b92a570f13908c790cceadca99250027155d81..77c0388b7aa46df43baf9c027fac78ee091f4b7f 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -31,10 +31,10 @@
<valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/row_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>RELATION_ID</name>
+ <name>CONTACT_ID</name>
<title>Creator</title>
<consumer>Contacts</consumer>
- <linkedContext>Contact_context</linkedContext>
+ <linkedContext>Person_context</linkedContext>
<mandatory v="true" />
</entityField>
<entityField>
@@ -76,7 +76,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Contact_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
@@ -97,8 +97,8 @@
</linkInformation>
<linkInformation>
<name>c2ef3832-61c5-4d49-8484-f3188b95e277</name>
- <tableName>PERS</tableName>
- <primaryKey>PERSID</primaryKey>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
@@ -121,8 +121,8 @@
<recordfield>TIMETRACKING.OBJECT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.value</name>
- <recordfield>TIMETRACKING.RELATION_ID</recordfield>
+ <name>CONTACT_ID.value</name>
+ <recordfield>TIMETRACKING.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ROW_ID.value</name>
@@ -133,8 +133,8 @@
<recordfield>TIMETRACKING.TIMETRACKINGID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>RELATION_ID.displayValue</name>
- <expression>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js</expression>
+ <name>CONTACT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
diff --git a/entity/Timetracking_entity/recordcontainers/db/fromClauseProcess.js b/entity/Timetracking_entity/recordcontainers/db/fromClauseProcess.js
index 0b96452b78be0380f9f31760bfa4b810824d6b4d..0bc49b5eb8045eceae6eefcf0c5240aa7ed52381 100644
--- a/entity/Timetracking_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Timetracking_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("TIMETRACKING left join RELATION on RELATIONID = RELATION_ID left join PERS on PERSID = PERS_ID");
\ No newline at end of file
+result.string("TIMETRACKING left join CONTACT on CONTACTID = CONTACT_ID left join PERSON on PERSONID = PERSON_ID");
\ No newline at end of file
diff --git a/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js b/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..418c211fe3d6f213831fc5ab04518e71c1fc8910
--- /dev/null
+++ b/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Person_lib");
+
+result.string(PersUtils.getResolvingDisplaySubSql("CONTACT_ID"))
\ No newline at end of file
diff --git a/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js b/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js
deleted file mode 100644
index 00b5fa7447a54ccd53c3125e6f9b8081f0157e90..0000000000000000000000000000000000000000
--- a/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Pers_lib");
-
-result.string(PersUtils.getResolvingDisplaySubSql("RELATION_ID"))
\ No newline at end of file
diff --git a/neonContext/Relation_context/Relation_context.aod b/neonContext/AnyContact_context/AnyContact_context.aod
similarity index 73%
rename from neonContext/Relation_context/Relation_context.aod
rename to neonContext/AnyContact_context/AnyContact_context.aod
index 3362a708b4a8193aea44306772515391c968cde9..333ed113206a61ccdb0f1204d2298e3e5b3c72bd 100644
--- a/neonContext/Relation_context/Relation_context.aod
+++ b/neonContext/AnyContact_context/AnyContact_context.aod
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
- <name>Relation_context</name>
+ <name>AnyContact_context</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <lookupview>RelationLookup_view</lookupview>
- <entity>Relation_entity</entity>
+ <lookupview>AnyContactLookup_view</lookupview>
+ <entity>AnyContact_entity</entity>
<references>
<neonViewReference>
<name>1ea0b1ed-c2b5-4b8c-b359-27ffdef6e5ea</name>
- <view>RelationLookup_view</view>
+ <view>AnyContactLookup_view</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/ObjectRelation_context/ObjectRelation_context.aod b/neonContext/ObjectRelation_context/ObjectRelation_context.aod
index 4e07153b0da1edb8c26414e3b1f13bf990d7f88e..e8d0ed985d84d0c0a6f9f200fd50d3ca56c22755 100644
--- a/neonContext/ObjectRelation_context/ObjectRelation_context.aod
+++ b/neonContext/ObjectRelation_context/ObjectRelation_context.aod
@@ -3,6 +3,7 @@
<name>ObjectRelation_context</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterview>ObjectRelationFilter_view</filterview>
+ <editview>ObjectRelationEdit_view</editview>
<preview>ObjectRelationPreview_view</preview>
<entity>ObjectRelation_entity</entity>
<references>
@@ -14,5 +15,9 @@
<name>dc0bd793-a472-4a7b-8394-06c4bc31258a</name>
<view>ObjectRelationPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>30334c84-5e46-4a4e-a5c4-3c42d1cb109b</name>
+ <view>ObjectRelationEdit_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Contact_context/Contact_context.aod b/neonContext/Person_context/Person_context.aod
similarity index 67%
rename from neonContext/Contact_context/Contact_context.aod
rename to neonContext/Person_context/Person_context.aod
index 1e746b831d5115c6c11531543e579a85e5f3ced0..403cd77106eab81a065a87cf4b617583271777ad 100644
--- a/neonContext/Contact_context/Contact_context.aod
+++ b/neonContext/Person_context/Person_context.aod
@@ -1,46 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
- <name>Contact_context</name>
+ <name>Person_context</name>
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>ContactMain_view</mainview>
- <filterview>ContactFilter_view</filterview>
- <editview>ContactEdit_view</editview>
- <preview>ContactPreview_view</preview>
- <lookupview>ContactLookup_view</lookupview>
- <entity>Contact_entity</entity>
+ <mainview>PersonMain_view</mainview>
+ <filterview>PersonFilter_view</filterview>
+ <editview>PersonEdit_view</editview>
+ <preview>PersonPreview_view</preview>
+ <lookupview>PersonLookup_view</lookupview>
+ <entity>Person_entity</entity>
<references>
<neonViewReference>
<name>901b3b2b-0f39-4d21-89fc-7d3cc7f6f5bc</name>
- <view>ContactMain_view</view>
+ <view>PersonMain_view</view>
</neonViewReference>
<neonViewReference>
<name>44ddbcaa-f5ae-4cf7-a12c-36e0c4fe854d</name>
- <view>ContactFilter_view</view>
+ <view>PersonFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>aa2fef1f-796c-4d00-b37c-0d91e55957a0</name>
- <view>ContactPreview_view</view>
+ <view>PersonPreview_view</view>
</neonViewReference>
<neonViewReference>
<name>ab08dc45-8021-4b9c-8f95-5a515441973f</name>
- <view>ContactEdit_view</view>
+ <view>PersonEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>059b25be-ba0e-43c9-983a-6a6115b3a24c</name>
- <view>ContactDetail_view</view>
+ <view>PersonDetail_view</view>
</neonViewReference>
<neonViewReference>
<name>4192e40d-23f0-45ff-8f2c-3a0694a59582</name>
- <view>ContactEditDefaults_view</view>
+ <view>PersonEditDefaults_view</view>
</neonViewReference>
<neonViewReference>
<name>c597732e-0291-42a1-8edf-20ff701aac5d</name>
- <view>ContactLookup_view</view>
+ <view>PersonLookup_view</view>
</neonViewReference>
<neonViewReference>
<name>d2fe8cd9-e3fc-4f4e-bd61-f762e3315798</name>
- <view>ContactSimpleList_view</view>
+ <view>PersonSimpleList_view</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonDashboard/MeinDashboard/MeinDashboard.aod b/neonDashboard/Home/Home.aod
similarity index 95%
rename from neonDashboard/MeinDashboard/MeinDashboard.aod
rename to neonDashboard/Home/Home.aod
index ae914b0bf01f41e4bb079a727dd558d640c2e42f..0f435793fca0b78d73721ff19fd03c16d51058f6 100644
--- a/neonDashboard/MeinDashboard/MeinDashboard.aod
+++ b/neonDashboard/Home/Home.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonDashboard xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonDashboard/1.0.0">
- <name>MeinDashboard</name>
+ <name>Home</name>
<title>My Dashboard</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<dashboardType>PRIVATE</dashboardType>
@@ -8,7 +8,7 @@
<defaultDashlets>
<neonDashlet>
<name>Dashlet2</name>
- <viewName>ContactFilter_view</viewName>
+ <viewName>PersonFilter_view</viewName>
<configName>AllContactsDashlet</configName>
<uiConfiguration>
<name>uiConfiguration</name>
diff --git a/neonView/RelationLookup_view/RelationLookup_view.aod b/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
similarity index 91%
rename from neonView/RelationLookup_view/RelationLookup_view.aod
rename to neonView/AnyContactLookup_view/AnyContactLookup_view.aod
index 23e38d3fd7e262764fea7d473a4545c41385c291..4273a0ee681dcf1f137be5d18a1b010ffc6b32bb 100644
--- a/neonView/RelationLookup_view/RelationLookup_view.aod
+++ b/neonView/AnyContactLookup_view/AnyContactLookup_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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>RelationLookup_view</name>
+ <name>AnyContactLookup_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
@@ -22,11 +22,11 @@
</neonTableColumn>
<neonTableColumn>
<name>814b3f18-106a-443e-8415-762669f862e6</name>
- <entityField>PERS_FIRSTNAME</entityField>
+ <entityField>PERSON_FIRSTNAME</entityField>
</neonTableColumn>
<neonTableColumn>
<name>4b05d812-aa6c-49a5-afa3-ea5cd99560ef</name>
- <entityField>PERS_LASTNAME</entityField>
+ <entityField>PERSON_LASTNAME</entityField>
<width v="75" />
<expandRatio v="100" />
</neonTableColumn>
diff --git a/neonView/ContractEdit_view/ContractEdit_view.aod b/neonView/ContractEdit_view/ContractEdit_view.aod
index f8129f20ad470a242038c7c17669414695927f3d..1332afb97ccb1dca96ae7bb33dd4cef0d912bbed 100644
--- a/neonView/ContractEdit_view/ContractEdit_view.aod
+++ b/neonView/ContractEdit_view/ContractEdit_view.aod
@@ -19,7 +19,7 @@
</entityFieldLink>
<entityFieldLink>
<name>3177f8e9-24e9-441f-8c19-b004935a86a9</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ac160ded-1a06-4664-b8bd-333e01468f61</name>
diff --git a/neonView/ContractFilter_view/ContractFilter_view.aod b/neonView/ContractFilter_view/ContractFilter_view.aod
index 1407f9678b905499dfcfcb0cf08e6770a1bb8b03..780e3cd38e728326f46e1cc712213d79e300f109 100644
--- a/neonView/ContractFilter_view/ContractFilter_view.aod
+++ b/neonView/ContractFilter_view/ContractFilter_view.aod
@@ -48,7 +48,7 @@
</neonTableColumn>
<neonTableColumn>
<name>0ec4c5ee-4af2-4530-8fc3-fbecef7983b7</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>05f745fe-6f29-4536-9794-8ddfefd2b369</name>
diff --git a/neonView/ContractPreview_view/ContractPreview_view.aod b/neonView/ContractPreview_view/ContractPreview_view.aod
index 797ee9a1036d55d56e5f8a4fdfa26ed4b9010480..a943ec10b2d380d441fa19d88d57eaaaed65c8c8 100644
--- a/neonView/ContractPreview_view/ContractPreview_view.aod
+++ b/neonView/ContractPreview_view/ContractPreview_view.aod
@@ -12,7 +12,7 @@
<name>ContractHeader_template</name>
<iconField>IMAGE</iconField>
<titleField>CONTRACTCODE_DISPLAY_fieldGroup</titleField>
- <descriptionField>RELATION_ID</descriptionField>
+ <descriptionField>CONTACT_ID</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
diff --git a/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod b/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6f701953cc85f6f89e8c69dc54bce9f37638e448
--- /dev/null
+++ b/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+ <name>ObjectRelationEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Objects</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>4bb47cac-47a7-448f-a8e6-ebab641d984f</name>
+ <entityField>OBJECT1_TYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3c548c29-1f77-47e1-bbad-b3063b71224d</name>
+ <entityField>OBJECT1_ROWID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7cfab0c5-06c7-4b1d-84e8-97aa76d5e4f3</name>
+ <entityField>OBJECT2_TYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d0b4d4b6-ab29-478f-9e07-9de07fed0c32</name>
+ <entityField>OBJECT2_ROWID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index 0fdcfc202505fa12c2a1bec17ed37522126d9686..efa572f6220557d0e0756c872f71ff3c4d3ce4ae 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -22,7 +22,7 @@
</entityFieldLink>
<entityFieldLink>
<name>1b323e80-820d-402a-98d2-f3649ec8e91f</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>767a9e6e-596b-4903-aa86-7bc0f66cd037</name>
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index 7a7b9d158200bd4a7b7be0621611caf6b5b51beb..7b026fda86a871982ac04bffbe4a0c82154f215f 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -59,7 +59,7 @@
</neonTableColumn>
<neonTableColumn>
<name>780087e7-ff3c-4592-90be-607357168295</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
<width v="75" />
<expandRatio v="100" />
</neonTableColumn>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index c40c127a0d1075855c220f5090da92de3a8b686e..b0d6cffba7e9073c1cb57e24df9ce892e0e45e79 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -12,7 +12,7 @@
<name>OfferHeader_template</name>
<iconField>IMAGE</iconField>
<titleField>Offer_OfferCode_VersNr_fieldgroup</titleField>
- <descriptionField>RELATION_ID</descriptionField>
+ <descriptionField>CONTACT_ID</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
diff --git a/neonView/OrderEdit_view/OrderEdit_view.aod b/neonView/OrderEdit_view/OrderEdit_view.aod
index 0d8beedd4abc0fdfcada1e50bda23e2a3878b534..dfd1bd1b478b5d88adb1782575b9fa63a9c08ec2 100644
--- a/neonView/OrderEdit_view/OrderEdit_view.aod
+++ b/neonView/OrderEdit_view/OrderEdit_view.aod
@@ -22,7 +22,7 @@
</entityFieldLink>
<entityFieldLink>
<name>1b323e80-820d-402a-98d2-f3649ec8e91f</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>767a9e6e-596b-4903-aa86-7bc0f66cd037</name>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index d27a0673c02acf5c00cf4eb0688dcbce2c2909f6..e6d257d62f00bbb2d6c4f2026adbb7e4d409778c 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -59,7 +59,7 @@
</neonTableColumn>
<neonTableColumn>
<name>5688908f-7c50-46a3-8899-2767ea5b4a90</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
<width v="75" />
<expandRatio v="100" />
</neonTableColumn>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index c46246b466983c716591d3a455f1593131028e97..64b69fb6a161632d7b213c79daac399caadce6bc 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -12,7 +12,7 @@
<name>OrderHeader_template</name>
<iconField>IMAGE</iconField>
<titleField>Order_OrderCode_VersNr_fieldgroup</titleField>
- <descriptionField>RELATION_ID</descriptionField>
+ <descriptionField>CONTACT_ID</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index b9ce1e2697add58f0e5ef93632b317681e4b46f5..c3792a23b39149940505f6d18c917ef02a154461 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -23,7 +23,7 @@
<neonViewReference>
<name>c10533a6-d185-4b13-84ee-53a468544c03</name>
<entityField>Contacts</entityField>
- <view>ContactSimpleList_view</view>
+ <view>PersonSimpleList_view</view>
</neonViewReference>
<neonViewReference>
<name>78aee175-d3ac-4378-8b3b-27f44a529aa5</name>
diff --git a/neonView/ContactDetail_view/ContactDetail_view.aod b/neonView/PersonDetail_view/PersonDetail_view.aod
similarity index 97%
rename from neonView/ContactDetail_view/ContactDetail_view.aod
rename to neonView/PersonDetail_view/PersonDetail_view.aod
index bb8db1a557147c259372a6f899fb707ebf0b894c..bce9f6a15ffdd29da13f0dfd4a4c1ea2215de626 100644
--- a/neonView/ContactDetail_view/ContactDetail_view.aod
+++ b/neonView/PersonDetail_view/PersonDetail_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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>ContactDetail_view</name>
+ <name>PersonDetail_view</name>
<title>Details</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ContactEditDefaults_view/ContactEditDefaults_view.aod b/neonView/PersonEditDefaults_view/PersonEditDefaults_view.aod
similarity index 96%
rename from neonView/ContactEditDefaults_view/ContactEditDefaults_view.aod
rename to neonView/PersonEditDefaults_view/PersonEditDefaults_view.aod
index 78af976470fa562fb1229d6e8ceb0635d06da094..7add841fec2744b73e52c329741a0da133450553 100644
--- a/neonView/ContactEditDefaults_view/ContactEditDefaults_view.aod
+++ b/neonView/PersonEditDefaults_view/PersonEditDefaults_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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>ContactEditDefaults_view</name>
+ <name>PersonEditDefaults_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/ContactEdit_view/ContactEdit_view.aod b/neonView/PersonEdit_view/PersonEdit_view.aod
similarity index 98%
rename from neonView/ContactEdit_view/ContactEdit_view.aod
rename to neonView/PersonEdit_view/PersonEdit_view.aod
index 4d64b8b27dafb44fc31e45a2ccf5f1c7fc80cfee..f846c2c82867c21a3c16c9885c8cac3996c136a6 100644
--- a/neonView/ContactEdit_view/ContactEdit_view.aod
+++ b/neonView/PersonEdit_view/PersonEdit_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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>ContactEdit_view</name>
+ <name>PersonEdit_view</name>
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:USERS</icon>
diff --git a/neonView/ContactFilter_view/ContactFilter_view.aod b/neonView/PersonFilter_view/PersonFilter_view.aod
similarity index 95%
rename from neonView/ContactFilter_view/ContactFilter_view.aod
rename to neonView/PersonFilter_view/PersonFilter_view.aod
index e1e06b7d3421d5e0e9b1c6cf63a2b143710064cd..ed5c9040c702f2a2a14762b8a5b9396a386bdbfb 100644
--- a/neonView/ContactFilter_view/ContactFilter_view.aod
+++ b/neonView/PersonFilter_view/PersonFilter_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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>ContactFilter_view</name>
+ <name>PersonFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<dashletConfigurations>
@@ -8,7 +8,7 @@
<name>AllContactsDashlet</name>
<title>Contacts</title>
<description>Show all contacts</description>
- <fragment>Contact_context/filter</fragment>
+ <fragment>Person_context/filter</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
<icon>vaadin:users</icon>
@@ -18,7 +18,7 @@
<title>Contactmanagement</title>
</neonDashletCategory>
<neonDashletCategory>
- <name>pers</name>
+ <name>person</name>
<title>Contact</title>
</neonDashletCategory>
</categories>
diff --git a/neonView/ContactLookup_view/ContactLookup_view.aod b/neonView/PersonLookup_view/PersonLookup_view.aod
similarity index 97%
rename from neonView/ContactLookup_view/ContactLookup_view.aod
rename to neonView/PersonLookup_view/PersonLookup_view.aod
index ef7ee1a9f45530ecab2c5df00b8b941af7da61a3..f93afb3fdd66e9f9b654d0b7ae378bd3c0447832 100644
--- a/neonView/ContactLookup_view/ContactLookup_view.aod
+++ b/neonView/PersonLookup_view/PersonLookup_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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>ContactLookup_view</name>
+ <name>PersonLookup_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/ContactMain_view/ContactMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
similarity index 95%
rename from neonView/ContactMain_view/ContactMain_view.aod
rename to neonView/PersonMain_view/PersonMain_view.aod
index ecebeb9bb8368704330bffe02560653a1f65a66b..5866999b02e4a20bc73cb92843cead6317af401e 100644
--- a/neonView/ContactMain_view/ContactMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>ContactMain_view</name>
+ <name>PersonMain_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<masterSlaveLayout>
@@ -12,7 +12,7 @@
<neonViewReference>
<name>12865531-5e68-4760-a846-8af7b97f9561</name>
<entityField>#ENTITY</entityField>
- <view>ContactPreview_view</view>
+ <view>PersonPreview_view</view>
</neonViewReference>
<neonViewReference>
<name>d674b32c-0493-47ea-a51f-dff5d13d237d</name>
diff --git a/neonView/ContactPreview_view/ContactPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
similarity index 98%
rename from neonView/ContactPreview_view/ContactPreview_view.aod
rename to neonView/PersonPreview_view/PersonPreview_view.aod
index 4de8f1353804fb551fb164e5b29eb63902cb3483..ae395531ab792a06b8029ee086e108cddee63e3b 100644
--- a/neonView/ContactPreview_view/ContactPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>ContactPreview_view</name>
+ <name>PersonPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/ContactSimpleList_view/ContactSimpleList_view.aod b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
similarity index 97%
rename from neonView/ContactSimpleList_view/ContactSimpleList_view.aod
rename to neonView/PersonSimpleList_view/PersonSimpleList_view.aod
index ad27d60560901b58bfc534350d8cb1bafc65d76f..03023d6a3acf8df1f29f66dd328b0b76ea756645 100644
--- a/neonView/ContactSimpleList_view/ContactSimpleList_view.aod
+++ b/neonView/PersonSimpleList_view/PersonSimpleList_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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>ContactSimpleList_view</name>
+ <name>PersonSimpleList_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/ProductEdit_view/ProductEdit_view.aod b/neonView/ProductEdit_view/ProductEdit_view.aod
index e28062a50d3bd126a261431f394e523477334ef2..30d90fe81d884683367e9e9e9aba42f847e53518 100644
--- a/neonView/ProductEdit_view/ProductEdit_view.aod
+++ b/neonView/ProductEdit_view/ProductEdit_view.aod
@@ -51,7 +51,7 @@
</entityFieldLink>
<entityFieldLink>
<name>0c921c3d-df1a-4794-862b-6d190d6ef04e</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/ProductFilter_view/ProductFilter_view.aod b/neonView/ProductFilter_view/ProductFilter_view.aod
index 61722b79c843b39d3c1f42459fe277cde7406beb..fa2025c5ed63451be69666a50ec3a1867c913efb 100644
--- a/neonView/ProductFilter_view/ProductFilter_view.aod
+++ b/neonView/ProductFilter_view/ProductFilter_view.aod
@@ -62,7 +62,7 @@
</neonTableColumn>
<neonTableColumn>
<name>4f31b5e8-0e09-4417-b9e9-96b69049b3cf</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
<width v="75" />
<expandRatio v="100" />
</neonTableColumn>
diff --git a/neonView/ProductPreview_view/ProductPreview_view.aod b/neonView/ProductPreview_view/ProductPreview_view.aod
index 4fc796171d963159027ff57e6256e0953205a9e0..75bf77deb25d3d8b33e094d93a233772eab28cc3 100644
--- a/neonView/ProductPreview_view/ProductPreview_view.aod
+++ b/neonView/ProductPreview_view/ProductPreview_view.aod
@@ -30,7 +30,7 @@
</entityFieldLink>
<entityFieldLink>
<name>bd8e7e33-6fc6-48fe-b9be-931383f4d859</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>a5a3ecee-059d-4bf2-9654-abe3efd58510</name>
diff --git a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod b/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
index ada62137a135e7ce41d6250012c41b479aaf11cb..858a5b24772af730677e7cadb8659880cdeb9e9d 100644
--- a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
+++ b/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
@@ -15,7 +15,7 @@
<fields>
<entityFieldLink>
<name>8b4c3245-7b3a-4cd0-90f0-09631e2dbde8</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>d6e1eaf9-3269-4350-a1a8-3f6517a167cf</name>
diff --git a/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod b/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
index ab3e8f56c665ea03a2ab287c6628f3e3df1dada3..2e038d42282a35dae05b4170458c63a83482a408 100644
--- a/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
+++ b/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
@@ -16,7 +16,7 @@
<columns>
<neonTableColumn>
<name>511ea459-1b6f-41e8-b35a-0f67361c82eb</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>5d146f0e-f0c7-4e7e-82e6-2b24bc241001</name>
diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
index 8ad250e11b4803257f47cb0614b74e361b4ff049..f6a142047625eaedab8f97543867362361a6c406 100644
--- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
+++ b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
@@ -10,7 +10,7 @@
<children>
<cardViewTemplate>
<name>SalesprojectCompetitionHeader_template</name>
- <titleField>RELATION_ID</titleField>
+ <titleField>CONTACT_ID</titleField>
<descriptionField>INFO</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
diff --git a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
index 7e00228d5807703711bde0130da692bc99276d8d..f6210915219b67e0f623747a3f521d65eb717fba 100644
--- a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
+++ b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
@@ -26,7 +26,7 @@
</entityFieldLink>
<entityFieldLink>
<name>d0a2027b-1796-4c5c-82f5-6fdb8f178ab5</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ceaa6824-a100-4552-a3a7-50a84faadaf9</name>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index 27fef9cb071909a8ee03637d78b83fef0074a4ae..a04cea4869e3d7c295c21a42eb444083378d0a84 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -56,7 +56,7 @@
<columns>
<neonTableColumn>
<name>6702bb75-1c57-42a7-9cf0-acd7cd8515f5</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>9f6b967e-5140-420f-84ca-2273920221bd</name>
diff --git a/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod b/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod
index c215032af8808619deffd893329f70c618e99547..073a35f6fde4101a8a6a5f190cccf2f6c0bca33b 100644
--- a/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod
+++ b/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod
@@ -31,7 +31,7 @@
</entityFieldLink>
<entityFieldLink>
<name>382caf7e-d3db-4bac-af99-a95d62504da7</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod b/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
index d3b975bf9cc805f05fad051b0157d9c6f3ebb93f..879bdb7cd710969745e19a7cb503510656de3e60 100644
--- a/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
+++ b/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
@@ -15,7 +15,7 @@
<fields>
<entityFieldLink>
<name>0f78acf5-bea7-4c91-afe0-0907d20db131</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>b74ab5a3-2d3c-49e6-b7df-219b16ca22fd</name>
diff --git a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod b/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
index 30f8b1acbfe1522c1cd6b40188fc704bdd8ae551..92f1ceaef893e623bd7a02856f5a0a1f7d683298 100644
--- a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
+++ b/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
@@ -19,7 +19,7 @@
</neonTableColumn>
<neonTableColumn>
<name>59e6aea1-9752-48b5-9d91-43edd0c1d670</name>
- <entityField>PERS_FULL_NAME</entityField>
+ <entityField>PERSON_FULL_NAME</entityField>
</neonTableColumn>
<neonTableColumn>
<name>bea82980-0639-405a-ab3f-92e45f97090e</name>
diff --git a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
index f89b89ba2b942d623634d6a7e082996077d0b32a..94da8a83f6260b6d127edfca968580167262ab7e 100644
--- a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
+++ b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
@@ -10,7 +10,7 @@
<children>
<cardViewTemplate>
<name>SalesprojectMemberHeader_template</name>
- <titleField>RELATION_ID</titleField>
+ <titleField>CONTACT_ID</titleField>
<descriptionField>SALESPROJECT_ROLE</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 1fa433506d584d17b0388c1aa38fa138cf2e308a..e0bc20e97a1fcf618f7bc89005c47ade6ac496d0 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -23,7 +23,7 @@
<fields>
<entityFieldLink>
<name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>4e3d7a37-f55b-4c18-9ba1-ab4ab0bbb442</name>
diff --git a/neonView/TaskEdit_view/TaskEdit_view.aod b/neonView/TaskEdit_view/TaskEdit_view.aod
index 3c8995af34a80b7816234bd7fd35b01853d89ca4..17c595d7e5a591a458451e2040eb3ba7ff1c83d6 100644
--- a/neonView/TaskEdit_view/TaskEdit_view.aod
+++ b/neonView/TaskEdit_view/TaskEdit_view.aod
@@ -47,11 +47,11 @@
</entityFieldLink>
<entityFieldLink>
<name>fd41b0ee-cae4-40b5-8aad-45740f4d6268</name>
- <entityField>REQUESTOR_RELATION_ID</entityField>
+ <entityField>REQUESTOR_CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>8428cbf6-7df0-4f7e-b6d6-5ab17e266028</name>
- <entityField>EDITOR_RELATION_ID</entityField>
+ <entityField>EDITOR_CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>b31bb2ab-22a6-4bc6-8b6c-d73a1c43283f</name>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index 7218b02bd500edd32ca1dfc327623865ee39c0c6..685009d266653d324a1b6368fe4d8d75aef30f93 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -45,7 +45,7 @@
</neonTableColumn>
<neonTableColumn>
<name>51190c85-fa03-4022-bc72-063d4b895d5b</name>
- <entityField>EDITOR_RELATION_ID</entityField>
+ <entityField>EDITOR_CONTACT_ID</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
diff --git a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
index 55b3e271dd2ca54553b0b26756528796e93c7b88..c9b298b525883639f21f9e1d86f8e760c1f973ee 100644
--- a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
+++ b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
@@ -41,11 +41,11 @@
</entityFieldLink>
<entityFieldLink>
<name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
- <entityField>REQUESTOR_RELATION_ID</entityField>
+ <entityField>REQUESTOR_CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>bbf1a736-acf9-4b41-9df9-5675fc6d8943</name>
- <entityField>EDITOR_RELATION_ID</entityField>
+ <entityField>EDITOR_CONTACT_ID</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod
index 25d78569e74157bf9a410e89c07a96ff4183a454..5f1e9c767f3c62cd9a462c6ba3d802b129c1dff9 100644
--- a/neonView/TaskPreview_view/TaskPreview_view.aod
+++ b/neonView/TaskPreview_view/TaskPreview_view.aod
@@ -46,11 +46,11 @@
</entityFieldLink>
<entityFieldLink>
<name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
- <entityField>REQUESTOR_RELATION_ID</entityField>
+ <entityField>REQUESTOR_CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>bbf1a736-acf9-4b41-9df9-5675fc6d8943</name>
- <entityField>EDITOR_RELATION_ID</entityField>
+ <entityField>EDITOR_CONTACT_ID</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod b/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
index 9303e0141e1078032f7b971fc44c1273ea80615c..381ab81235e2941933548eac9c33e604932e9085 100644
--- a/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
+++ b/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
@@ -19,7 +19,7 @@
</entityFieldLink>
<entityFieldLink>
<name>8c27f579-543a-484f-ba3d-ba0579e6db12</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ef97d0da-a0d4-4147-b440-96d249ffec73</name>
diff --git a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
index 85c9be6899a3b40f55ac162e6c60d34e5925a5b9..95e719087e9b081ab2f906e03e744cb702a2a2d4 100644
--- a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
+++ b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
@@ -19,7 +19,7 @@
</neonTableColumn>
<neonTableColumn>
<name>63068c6c-1508-47f2-ad2e-bbe66a448af1</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>7e18967d-3c78-4f75-bc03-f6d925553484</name>
diff --git a/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod b/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
index 9212d737ac3063e630f393eaa184272856d9399d..45d85f753ce9f480a167977fdf50ec733a49233c 100644
--- a/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
+++ b/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
@@ -20,7 +20,7 @@
</entityFieldLink>
<entityFieldLink>
<name>835197c0-2e0c-4989-8d5b-80ccd064d55e</name>
- <entityField>RELATION_ID</entityField>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>25921a31-5563-4a74-aa7e-67d660c60f0b</name>
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
index d807e68f219217c732224b18372385d161ea5ec5..2110a2debc17887b01cbf168b76483aa5b027205 100644
--- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
@@ -1,6 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <include relativeToChangelogFile="true" file="ab_keyword_entry/init_RelationStatus.xml"/>
+ <include relativeToChangelogFile="true" file="ab_keyword_entry/init_ContactStatus.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_ActivityDirection.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_ContractPayment.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_ContractStatus.xml"/>
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_RelationStatus.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
similarity index 93%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_RelationStatus.xml
rename to others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
index 3229efb02890e1e4fbd3bf6e54b92b6edee9cd7b..dcc9bdaa4c61075d9adf169dc70ad5df125bf780 100644
--- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_RelationStatus.xml
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
@@ -6,7 +6,7 @@
<column name="KEYID" value="BSIC0rel-stat-iact-b56a-71432dd92e27"/>
<column name="TITLE" value="Inactive"/>
- <column name="CONTAINER" value="RelationStatus"/>
+ <column name="CONTAINER" value="ContactStatus"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
@@ -16,7 +16,7 @@
<column name="KEYID" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
<column name="TITLE" value="Active"/>
- <column name="CONTAINER" value="RelationStatus"/>
+ <column name="CONTAINER" value="ContactStatus"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
@@ -26,7 +26,7 @@
<column name="KEYID" value="BSIC0rel-stat-0673-840d-d3f6a4d4982b"/>
<column name="TITLE" value="In review"/>
- <column name="CONTAINER" value="RelationStatus"/>
+ <column name="CONTAINER" value="ContactStatus"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
diff --git a/others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml b/others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml
index 53a2bc62901e8799e77932e4ada880858c5a9182..ebe9e74919d04ba4b40c15361d8679b32487fe07 100644
--- a/others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml
+++ b/others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml
@@ -19,7 +19,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="83337967-5d58-4b17-88c2-2aeefa130c21"/>
<column name="ACTIVITY_ID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
- <column name="OBJECT_TYPE" value="Contact_context"/>
+ <column name="OBJECT_TYPE" value="Person_context"/>
<column name="OBJECT_ROWID" value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1"/>
</insert>
<insert tableName="ACTIVITY">
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154311.xml b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154311.xml
index 93d3ffebda9f28338ed51e694c26d70ee4138238..f0dbcb7fb2fa47acb5117370288541b86cc55fe8 100644
--- a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154311.xml
+++ b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154311.xml
@@ -3,7 +3,7 @@
<changeSet author="m.schroeger" id="c7ea5e6e-aff2-4cf5-95f1-f5ca1b350dd0">
<insert tableName="CONTRACT">
<column name="CONTRACTID" value="384c9d31-9923-4e6a-8a7f-2d2890470b70"/>
- <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="CONTRACTCODE" value="42154311"/>
<column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
<column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154312.xml b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154312.xml
index 4f12cf293647a1f2e84b62f12606f767a5652436..d097059613e5959da8368d56982d34b9303c41de 100644
--- a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154312.xml
+++ b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154312.xml
@@ -3,7 +3,7 @@
<changeSet author="m.schroeger" id="c7ea5e6e-aff2-4cf5-95f1-f5ca1b350dd0">
<insert tableName="CONTRACT">
<column name="CONTRACTID" value="8b95a074-086e-44c8-bd45-fb8e33803da3"/>
- <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="CONTRACTCODE" value="42154312"/>
<column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
<column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154313.xml b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154313.xml
index 56baa8ffd1e02ada612cc4e969f68eddead56471..c4b7c76337ec5d649ce020ce82059e857749de0e 100644
--- a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154313.xml
+++ b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154313.xml
@@ -3,7 +3,7 @@
<changeSet author="m.schroeger" id="c7ea5e6e-aff2-4cf5-95f1-f5ca1b350dd0">
<insert tableName="CONTRACT">
<column name="CONTRACTID" value="eb182167-1e33-4290-a160-a86d09685cba"/>
- <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="CONTRACTCODE" value="42154313"/>
<column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
<column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154314.xml b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154314.xml
index 34767f8fb5bc530b10e328946b1fe3cad4144c3a..759d52ba01082a983405bbdf641a7323492872d1 100644
--- a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154314.xml
+++ b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154314.xml
@@ -3,7 +3,7 @@
<changeSet author="m.schroeger" id="c7ea5e6e-aff2-4cf5-95f1-f5ca1b350dd0">
<insert tableName="CONTRACT">
<column name="CONTRACTID" value="6fc9483c-fcfc-48fb-b48f-18e6b11f31fc"/>
- <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="CONTRACTCODE" value="42154314"/>
<column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
<column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154315.xml b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154315.xml
index 45579902d5b8fd099b7bcac9b3bac0da504c2fa5..384a9580f825492f3fe919ea4530f0253851f8d3 100644
--- a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154315.xml
+++ b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154315.xml
@@ -3,7 +3,7 @@
<changeSet author="m.schroeger" id="c7ea5e6e-aff2-4cf5-95f1-f5ca1b350dd0">
<insert tableName="CONTRACT">
<column name="CONTRACTID" value="a944b07c-aaed-4bcf-820c-9e6031bc3d6c"/>
- <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="CONTRACTCODE" value="42154315"/>
<column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
<column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml
index fd962fa654ca9b611cc13e588981c2f4e7c76033..d5f2beace64934a0155e9401247be9a22892e04d 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml
@@ -3,7 +3,7 @@
<changeSet author="m.schroeger" id="2b4fb594-d1ad-4057-a695-bff99e49ab40">
<insert tableName="OFFER">
<column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="OFFERDATE" valueDate="2018-11-21T00:00:00"/>
<column name="OFFERCODE" valueNumeric="1000"/>
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml
index a7c8450914dc78786fe0e2c71be7d0533b5208a6..e604de5004b913b688d1b072415d3312bcaed6ac 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml
@@ -3,7 +3,7 @@
<changeSet author="f.feldmann" id="2b4fb666-d1ad-4057-a695-bff99e49ab40">
<insert tableName="OFFER">
<column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="OFFERDATE" valueDate="2018-08-12T00:00:00"/>
<column name="OFFERCODE" valueNumeric="1001"/>
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml
index f085227f3e051340be5226210721277952c7c405..414555f8209c2e1f2030afa0474f3b29aad7b2b9 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml
@@ -3,7 +3,7 @@
<changeSet author="f.feldmann" id="2a4fb666-d1ad-4057-a695-bff99e49ab40">
<insert tableName="OFFER">
<column name="OFFERID" value="5561959c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="OFFERDATE" valueDate="2018-06-14T00:00:00"/>
<column name="OFFERCODE" valueNumeric="1002"/>
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml
index 924204fd299a427a6be6a9db623881ccaa07a3ad..67ef28daa92589254dd8979e710d11f8cc87537f 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml
@@ -3,7 +3,7 @@
<changeSet author="f.feldmann" id="2b321666-d1ad-4057-a695-bff99e49ab40">
<insert tableName="OFFER">
<column name="OFFERID" value="0461959c-11c5-4d79-9ac2-f41f21154dbe"/>
- <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="OFFERDATE" valueDate="2018-02-23T00:00:00"/>
<column name="OFFERCODE" valueNumeric="1003"/>
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml
index 51157c0e39bc7d82c1116928f38514b9676745b6..9c4753ea768df26f0371526429e9d0c64f64e436 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml
@@ -3,7 +3,7 @@
<changeSet author="f.feldmann" id="454fb666-d1ad-4057-a695-bff99e49ab40">
<insert tableName="OFFER">
<column name="OFFERID" value="ab61911c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="OFFERDATE" valueDate="2017-11-09T00:00:00"/>
<column name="OFFERCODE" valueNumeric="1004"/>
diff --git a/others/db_changes/data_alias/data/example_org/ORG_gfk.xml b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_gfk.xml
similarity index 92%
rename from others/db_changes/data_alias/data/example_org/ORG_gfk.xml
rename to others/db_changes/data_alias/data/example_organisation/ORGANISATION_gfk.xml
index d6f9975ce5267f3ac77219351e0c1b54a8a9b174..e3ed48ba82af47d98ce117a3eeaf3d4c73af1524 100644
--- a/others/db_changes/data_alias/data/example_org/ORG_gfk.xml
+++ b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_gfk.xml
@@ -14,11 +14,11 @@
<column name="AB_OBJECTRELATIONID" value="102b5d75-304b-41f4-9426-ba13d4dce1c3"/>
<column name="OBJECT1_TYPE" value="Organisation_context"/>
<column name="OBJECT1_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="OBJECT2_TYPE" value="Contact_context"/>
+ <column name="OBJECT2_TYPE" value="Person_context"/>
<column name="OBJECT2_ROWID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -26,21 +26,21 @@
</insert>
<insert tableName="COMMUNICATION">
<column name="COMMUNICATIONID" value="14a01219-985b-4efe-a634-da71ae482907"/>
- <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="MEDIUM_ID" valueNumeric="1"/>
<column name="ADDR" value="gfk@domain.local"/>
<column name="STANDARD" valueNumeric="1"/>
</insert>
<insert tableName="COMMUNICATION">
<column name="COMMUNICATIONID" value="22d07819-985b-4efe-a634-da71ae482907"/>
- <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="MEDIUM_ID" valueNumeric="2"/>
<column name="ADDR" value="098713332"/>
<column name="STANDARD" valueNumeric="0"/>
</insert>
<insert tableName="COMMUNICATION">
<column name="COMMUNICATIONID" value="00d07819-985b-4efe-a634-da71ae482907"/>
- <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="MEDIUM_ID" valueNumeric="3"/>
<column name="ADDR" value="www.gfk.de"/>
<column name="STANDARD" valueNumeric="0"/>
@@ -50,7 +50,7 @@
<column name="ADDR_TYPE" valueNumeric="1"/>
<column name="CITY" value="München"/>
<column name="COUNTRY" value="DE"/>
- <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="ADDRIDENTIFIER" value="Tor 1"/>
<column name="REGION" value=""/>
<column name="ADDRESSID" value="14d03432-985b-4efe-a634-da71ae482907"/>
@@ -134,8 +134,8 @@
<param value="14a01219-985b-4efe-a634-da71ae482907" />
</whereParams>
</delete>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="b219b58a-f120-42d8-9a64-0b176501eac7" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_org/ORG_kaeltetechnik.xml b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_kaeltetechnik.xml
similarity index 91%
rename from others/db_changes/data_alias/data/example_org/ORG_kaeltetechnik.xml
rename to others/db_changes/data_alias/data/example_organisation/ORGANISATION_kaeltetechnik.xml
index d53c8d530e777e7362a84f4facd49382cd8ffc0e..30488c7b7808bdfea407544162c8af3e4ddd8c9b 100644
--- a/others/db_changes/data_alias/data/example_org/ORG_kaeltetechnik.xml
+++ b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_kaeltetechnik.xml
@@ -9,8 +9,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
<column name="ORGANISATION_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
diff --git a/others/db_changes/data_alias/data/example_org/ORG_lichtenstein.xml b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_lichtenstein.xml
similarity index 91%
rename from others/db_changes/data_alias/data/example_org/ORG_lichtenstein.xml
rename to others/db_changes/data_alias/data/example_organisation/ORGANISATION_lichtenstein.xml
index b667163763704b4dd6a73d29e413d18a7945aae0..96240140152977c78e243c41c358d2fb35013396 100644
--- a/others/db_changes/data_alias/data/example_org/ORG_lichtenstein.xml
+++ b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_lichtenstein.xml
@@ -9,8 +9,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
<column name="ORGANISATION_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
diff --git a/others/db_changes/data_alias/data/example_org/ORG_mass.xml b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_mass.xml
similarity index 85%
rename from others/db_changes/data_alias/data/example_org/ORG_mass.xml
rename to others/db_changes/data_alias/data/example_organisation/ORGANISATION_mass.xml
index 581d8ad3421853665738b10385422073c1fd5634..806289ad7ee1782eac9fa94e9047cab38ee53828 100644
--- a/others/db_changes/data_alias/data/example_org/ORG_mass.xml
+++ b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_mass.xml
@@ -9,8 +9,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="e913fcce-0722-44ee-9964-a91dc90cfefe"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="e913fcce-0722-44ee-9964-a91dc90cfefe"/>
<column name="ORGANISATION_ID" value="f7310676-b0c6-412d-917f-3b21ad80d610"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -23,8 +23,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="e1ee1d84-c9eb-4000-8921-b342db81d534"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="e1ee1d84-c9eb-4000-8921-b342db81d534"/>
<column name="ORGANISATION_ID" value="ded2582c-1c97-4e06-8d12-16ae00b60fb7"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -37,8 +37,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="d8ea5981-ab27-4371-8a8b-65225d00dad9"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="d8ea5981-ab27-4371-8a8b-65225d00dad9"/>
<column name="ORGANISATION_ID" value="f8bf3212-d698-45a5-8270-5b786a83ce28"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -51,8 +51,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="de0ec35f-d123-4cbf-aa76-9089fbe6c3c3"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="de0ec35f-d123-4cbf-aa76-9089fbe6c3c3"/>
<column name="ORGANISATION_ID" value="d7f9af7d-c09b-41dd-88d0-8d66f464be19"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -65,8 +65,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="e16eb8a4-dffd-4a4a-8398-d1de4968f64f"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="e16eb8a4-dffd-4a4a-8398-d1de4968f64f"/>
<column name="ORGANISATION_ID" value="e29b1302-68f6-4326-b9b2-dee3da297bc8"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -79,8 +79,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="ef9b34a6-c930-4ce0-939d-cdc5417f39d3"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="ef9b34a6-c930-4ce0-939d-cdc5417f39d3"/>
<column name="ORGANISATION_ID" value="f304765c-7513-4ad6-89a5-e158c592c8be"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -93,8 +93,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="da3fca12-14ae-4d1e-aece-40f96dae345a"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="da3fca12-14ae-4d1e-aece-40f96dae345a"/>
<column name="ORGANISATION_ID" value="ec6d609f-6623-4589-ae32-9b957a9a0865"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -107,8 +107,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="f462072b-6ead-4d85-aba2-c87573f8a7b8"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="f462072b-6ead-4d85-aba2-c87573f8a7b8"/>
<column name="ORGANISATION_ID" value="d3138d27-4c09-4c0a-b647-ffe62bb7a425"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -121,8 +121,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="d321e2b4-f97e-4754-ba16-ab4853512c3c"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="d321e2b4-f97e-4754-ba16-ab4853512c3c"/>
<column name="ORGANISATION_ID" value="dfcb852d-8730-4fc2-9999-4e5ab86114f7"/>
<column name="LANGUAGE" value="eng"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -135,8 +135,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="ff7978e6-9053-48fc-8dc2-b6ee93f71b32"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="ff7978e6-9053-48fc-8dc2-b6ee93f71b32"/>
<column name="ORGANISATION_ID" value="f0c7b4c7-e9f2-45d0-b823-771483a40c6d"/>
<column name="LANGUAGE" value="eng"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -149,8 +149,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="d9a72273-fe0c-4461-bff0-851c294718c1"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="d9a72273-fe0c-4461-bff0-851c294718c1"/>
<column name="ORGANISATION_ID" value="d9a40db6-7ec7-4271-af7b-649cbc1fd03f"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -163,8 +163,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="d60e2e0d-bf6a-437d-89a8-841b09f4a899"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="d60e2e0d-bf6a-437d-89a8-841b09f4a899"/>
<column name="ORGANISATION_ID" value="d07a6321-ac60-4f58-a35d-80f6c8e4fc59"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -177,8 +177,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="d94ccadb-0022-4eb7-86ae-ba011fd257eb"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="d94ccadb-0022-4eb7-86ae-ba011fd257eb"/>
<column name="ORGANISATION_ID" value="d4b18031-b1ad-4a5f-8c3f-1f483775ede3"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -191,8 +191,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="e867c779-34bd-4659-88dc-eb0ae056c37f"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="e867c779-34bd-4659-88dc-eb0ae056c37f"/>
<column name="ORGANISATION_ID" value="d882e2c8-84bd-411c-84db-81513e8d1918"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -205,8 +205,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="d15f4906-3898-46f8-a039-03d58cfe56a9"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="d15f4906-3898-46f8-a039-03d58cfe56a9"/>
<column name="ORGANISATION_ID" value="d4fbee0e-57ac-47bd-bc62-d41d979d97f1"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -219,8 +219,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="e69a9f1c-1054-4ccf-8c3b-69ee1e8aa99b"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="e69a9f1c-1054-4ccf-8c3b-69ee1e8aa99b"/>
<column name="ORGANISATION_ID" value="d27d05dc-d06b-4cc6-8007-d13c0adff070"/>
<column name="LANGUAGE" value="eng"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -233,8 +233,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="e9ddbdbd-914f-4ade-944a-6de908168d19"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="e9ddbdbd-914f-4ade-944a-6de908168d19"/>
<column name="ORGANISATION_ID" value="e7d22826-8d4c-428b-a45a-02b4257cc7f4"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -247,8 +247,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="de2733d3-e40a-4cb2-8c51-f02f36de0b7d"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="de2733d3-e40a-4cb2-8c51-f02f36de0b7d"/>
<column name="ORGANISATION_ID" value="e6f2aeba-ec06-4ebc-b6b3-43b3c977dc7e"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -261,8 +261,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="da0463a5-10c4-4db1-9521-36c4e8d4894d"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="da0463a5-10c4-4db1-9521-36c4e8d4894d"/>
<column name="ORGANISATION_ID" value="f71d811c-e7be-486f-95c4-6031dc3d8bbd"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -275,8 +275,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="e6b44ceb-2ec6-421f-b50f-33b1d7757cc8"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="e6b44ceb-2ec6-421f-b50f-33b1d7757cc8"/>
<column name="ORGANISATION_ID" value="efe2dc72-f8e9-42ce-858d-af597c66f9fd"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -289,8 +289,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="f97c4822-2157-4033-aa83-31c7704e6015"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="f97c4822-2157-4033-aa83-31c7704e6015"/>
<column name="ORGANISATION_ID" value="ff050ff3-ab15-4381-a911-a741425c73eb"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -303,8 +303,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="d6d540c1-3993-4037-98be-499486021b47"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="d6d540c1-3993-4037-98be-499486021b47"/>
<column name="ORGANISATION_ID" value="f15728d5-acf6-4dd6-b3ee-27df76a3b91f"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -317,8 +317,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="dc63e588-060b-441b-9790-b81574e2c544"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="dc63e588-060b-441b-9790-b81574e2c544"/>
<column name="ORGANISATION_ID" value="fbb39871-02d1-4912-86a7-796d261c88f8"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -331,8 +331,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="f89cbdb4-0dbf-4df0-8625-88cb4cc3fab1"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="f89cbdb4-0dbf-4df0-8625-88cb4cc3fab1"/>
<column name="ORGANISATION_ID" value="d3092cde-649d-4699-b0ae-52c93d639e78"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -345,8 +345,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="f3641d66-a970-49a6-8143-340bc24cb352"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="f3641d66-a970-49a6-8143-340bc24cb352"/>
<column name="ORGANISATION_ID" value="e5c0aa96-e196-4b5e-9e23-718b9bffc5d0"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -359,8 +359,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="fea24840-5504-4c4c-86ba-84f0dc50f10e"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="fea24840-5504-4c4c-86ba-84f0dc50f10e"/>
<column name="ORGANISATION_ID" value="d4f7cf2f-5f4f-4857-9f7c-fe3475b2803c"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -373,8 +373,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="dd0bf580-b86b-43c1-b202-fda20711c903"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="dd0bf580-b86b-43c1-b202-fda20711c903"/>
<column name="ORGANISATION_ID" value="d1aeaca7-96bc-4ef4-9aa5-b52e374df6b9"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -387,8 +387,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="e6ee4479-4f68-4002-a18b-b3cd0109fc18"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="e6ee4479-4f68-4002-a18b-b3cd0109fc18"/>
<column name="ORGANISATION_ID" value="f6763689-5cdc-47e3-97df-a3bdc579a383"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -401,8 +401,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="ecde89ab-4e30-484a-aec2-cff3069d25f6"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="ecde89ab-4e30-484a-aec2-cff3069d25f6"/>
<column name="ORGANISATION_ID" value="f974fcf9-51f9-4469-b772-223ee625f5e2"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -415,8 +415,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="f0360f92-b881-4448-b250-d9f3cf18d9c1"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="f0360f92-b881-4448-b250-d9f3cf18d9c1"/>
<column name="ORGANISATION_ID" value="e58a9160-d480-42c3-8ab3-7ca01f964570"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -429,8 +429,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="f191c170-84c3-4bcd-baf6-4b4b1e99bdf9"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="f191c170-84c3-4bcd-baf6-4b4b1e99bdf9"/>
<column name="ORGANISATION_ID" value="e9c73782-7c8f-492e-8fa0-971b43f02710"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -443,8 +443,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="d5dd7578-868e-4cc6-9c0f-27625c62c0be"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="d5dd7578-868e-4cc6-9c0f-27625c62c0be"/>
<column name="ORGANISATION_ID" value="e717a3d3-9f83-45bc-8779-f17cee22ea5a"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -457,8 +457,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="dae79c22-a04b-4948-97ee-a41d2d4c187b"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="dae79c22-a04b-4948-97ee-a41d2d4c187b"/>
<column name="ORGANISATION_ID" value="fd0da4f9-0898-48f7-bf35-b7d29a2e78d0"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -471,8 +471,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="d1d6c1cd-23d9-46a5-a560-df7f11cc63ea"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="d1d6c1cd-23d9-46a5-a560-df7f11cc63ea"/>
<column name="ORGANISATION_ID" value="f9842336-8544-4c58-9bac-f957e8ef22d6"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -485,8 +485,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="e6b57b4e-3776-4e79-9998-3aba2ee46923"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="e6b57b4e-3776-4e79-9998-3aba2ee46923"/>
<column name="ORGANISATION_ID" value="f7aaa4f6-340a-48e4-874f-7287e440f6e0"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -499,8 +499,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="ed394880-74d7-4b2c-b781-b24b003b6871"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="ed394880-74d7-4b2c-b781-b24b003b6871"/>
<column name="ORGANISATION_ID" value="f61b71b4-9e5f-4fee-929c-c13ded95ece6"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -513,8 +513,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="f4a95bcf-799f-41ab-b77c-8f05e3a66627"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="f4a95bcf-799f-41ab-b77c-8f05e3a66627"/>
<column name="ORGANISATION_ID" value="f4bb9045-7280-4f21-a0f9-c909fac23b23"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -527,8 +527,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="e808ba75-6c12-4b0a-88ae-779fb9894fda"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="e808ba75-6c12-4b0a-88ae-779fb9894fda"/>
<column name="ORGANISATION_ID" value="e54e7d63-6bfc-46a6-a0c7-0fca2478331e"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -541,8 +541,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="e465cc10-0fb9-4a67-a135-e10c72c10f49"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="e465cc10-0fb9-4a67-a135-e10c72c10f49"/>
<column name="ORGANISATION_ID" value="f6f65e33-95b2-4aeb-ac30-6b33ea00f595"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -555,8 +555,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="e6d8384e-4ba1-4784-86b4-18e36e1b33d5"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="e6d8384e-4ba1-4784-86b4-18e36e1b33d5"/>
<column name="ORGANISATION_ID" value="f1eabc20-c1b1-4865-aded-db902c3ab1f5"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -569,8 +569,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="f7179fda-231d-40d4-a7b6-b2dab5cd76cf"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="f7179fda-231d-40d4-a7b6-b2dab5cd76cf"/>
<column name="ORGANISATION_ID" value="dfaf3c29-5317-46e3-be83-cff4a52cd6fd"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
diff --git a/others/db_changes/data_alias/data/example_org/ORG_mnf.xml b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_mnf.xml
similarity index 91%
rename from others/db_changes/data_alias/data/example_org/ORG_mnf.xml
rename to others/db_changes/data_alias/data/example_organisation/ORGANISATION_mnf.xml
index b354f71f1dbe21988c1b37bcac6d7bb48da26fb4..ef8b0ba27475dd68f6b0dfc59e65cc1216df49f2 100644
--- a/others/db_changes/data_alias/data/example_org/ORG_mnf.xml
+++ b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_mnf.xml
@@ -9,8 +9,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="ORGANISATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
diff --git a/others/db_changes/data_alias/data/example_org/ORG_pichelmaier.xml b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_pichelmaier.xml
similarity index 90%
rename from others/db_changes/data_alias/data/example_org/ORG_pichelmaier.xml
rename to others/db_changes/data_alias/data/example_organisation/ORGANISATION_pichelmaier.xml
index 7f40fe085b8fad6a8f9daee5e0a8adaac1388476..89601f64d7acdd5663ec0e9255c16e3ff1544d9a 100644
--- a/others/db_changes/data_alias/data/example_org/ORG_pichelmaier.xml
+++ b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_pichelmaier.xml
@@ -9,8 +9,8 @@
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
- <insert tableName="RELATION">
- <column name="RELATIONID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <insert tableName="CONTACT">
+ <column name="CONTACTID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
<column name="ORGANISATION_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
<column name="LANGUAGE" value="deu"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
diff --git a/others/db_changes/data_alias/data/example_org/ORG_privat.xml b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_privat.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_org/ORG_privat.xml
rename to others/db_changes/data_alias/data/example_organisation/ORGANISATION_privat.xml
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_andre.xml b/others/db_changes/data_alias/data/example_person/PERSON_andre.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_andre.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_andre.xml
index 261cba0ee0b438f0cd2954819cf0d8ad1dba7385..1cd2295f16078c45252599c0a730f6cef626be03 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_andre.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_andre.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="6be1a824-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="6be1a824-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Peter"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Andre"/>
@@ -10,23 +10,23 @@
<column name="TITLE" value="Dr."/>
<column name="DATEOFBIRTH" valueDate="1980-10-14"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="6be1a824-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="6be1a978-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="6be1a824-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="6be1a978-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="6be1a978-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="6be1a824-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_braun.xml b/others/db_changes/data_alias/data/example_person/PERSON_braun.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_braun.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_braun.xml
index 281f295cc6b32c6ca0bec885d35c4d040fa9ceae..d9b3f6058fecfb5ccedc4fdd18899fcef827cc98 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_braun.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_braun.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="73d73c10-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="73d73c10-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Herbert"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Braun"/>
@@ -10,23 +10,23 @@
<column name="DATEOFBIRTH" valueDate="1994-04-08"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="73d73c10-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="73d73d3c-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="73d73c10-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="73d73d3c-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="73d73d3c-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="73d73c10-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_carolin.xml b/others/db_changes/data_alias/data/example_person/PERSON_carolin.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_carolin.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_carolin.xml
index 7f4c7328d1e4b4620940927accce023b4d41b547..5a1cec1c52b17b2b2a927f945b345ec79a85c22c 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_carolin.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_carolin.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="73d739c2-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="73d739c2-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Carolin"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Schmitt"/>
@@ -10,23 +10,23 @@
<column name="DATEOFBIRTH" valueDate="1960-12-16"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="73d739c2-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="73d73aee-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="73d739c2-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="73d73aee-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="73d73aee-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="73d739c2-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_grenzer.xml b/others/db_changes/data_alias/data/example_person/PERSON_grenzer.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_grenzer.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_grenzer.xml
index 56a7bc5fdfbf9d05d91ed57cf514f8cc7e0311b9..ffa0cd46f9e681d69a08b5a081d6036e4be67894 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_grenzer.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_grenzer.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="6be18cf4-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="6be18cf4-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Peter"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Grenzer"/>
@@ -10,23 +10,23 @@
<column name="DATEOFBIRTH" valueDate="1982-08-25"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="6be18cf4-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="6be18e20-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="6be18cf4-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="6be18e20-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="6be18e20-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="6be18cf4-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_gruener.xml b/others/db_changes/data_alias/data/example_person/PERSON_gruener.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_gruener.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_gruener.xml
index cac7baf67f872e3cab9536d9be1e223e6f84e2ad..4c56d28a9fe6ffa708e17108b8a9e735ab4c999b 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_gruener.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_gruener.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="73d732ce-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="73d732ce-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Jerome"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Grüner"/>
@@ -10,23 +10,23 @@
<column name="DATEOFBIRTH" valueDate="1993-01-20"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="73d732ce-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="73d732ce-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="0"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="73d732ce-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_haller.xml b/others/db_changes/data_alias/data/example_person/PERSON_haller.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_haller.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_haller.xml
index 0d6697d7c8145c0f5c1b6fd918ce061de377cf14..8bc9519adaa91bbc29adb66ad4cf830fdaf1c323 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_haller.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_haller.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="73d74d90-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="73d74d90-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Erna"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Haller"/>
@@ -10,23 +10,23 @@
<column name="DATEOFBIRTH" valueDate="1961-09-29"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="73d74d90-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="73d74ec6-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="73d74d90-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="73d74ec6-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="73d74ec6-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="73d74d90-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_hamann.xml b/others/db_changes/data_alias/data/example_person/PERSON_hamann.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_hamann.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_hamann.xml
index 75f44e0b19a469a44e1738f84d9879dcf109355a..a227f859dfcefa9de75e7a60b68f95c99798c036 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_hamann.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_hamann.xml
@@ -1,31 +1,31 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="6be19f82-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="6be19f82-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Suse"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Hamann"/>
<column name="SALUTATION" value="Mrs."/>
<column name="DATEOFBIRTH" valueDate="1985-03-24"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="6be19f82-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="6be1a0ae-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="6be19f82-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="6be1a0ae-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="6be1a0ae-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="6be19f82-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_hausler.xml b/others/db_changes/data_alias/data/example_person/PERSON_hausler.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_hausler.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_hausler.xml
index c0c421b686ab7a406fa217a62a8300dec23773d5..b13f079e828f12dc3c7ff6529a3637e46c277c29 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_hausler.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_hausler.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="73d75236-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="73d75236-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Gerd"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Hausler"/>
@@ -10,23 +10,23 @@
<column name="DATEOFBIRTH" valueDate="1988-12-23"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="73d75236-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="6be17ffc-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="73d75236-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="6be17ffc-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="6be17ffc-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="73d75236-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_hinterecker.xml b/others/db_changes/data_alias/data/example_person/PERSON_hinterecker.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_hinterecker.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_hinterecker.xml
index 43342387e3cdffeee90b6c15c20e017a73467c11..20a783b033e90d9549114ed305c3065b3a2e41cc 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_hinterecker.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_hinterecker.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="6be182a4-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="6be182a4-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Thomas"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Hinterecker"/>
@@ -10,23 +10,23 @@
<column name="DATEOFBIRTH" valueDate="1955-08-15"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="6be182a4-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="6be18402-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="6be182a4-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="6be18402-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="6be18402-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="6be182a4-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_hugenmaier.xml b/others/db_changes/data_alias/data/example_person/PERSON_hugenmaier.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_hugenmaier.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_hugenmaier.xml
index 59b41f1c99cd64b974526e916af52a60494fb84b..ee624ba82d12e745345f4b211eb56614bdfd051c 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_hugenmaier.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_hugenmaier.xml
@@ -1,31 +1,31 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="6be193fc-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="6be193fc-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Josef"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Hugenmaier"/>
<column name="SALUTATION" value="Herr"/>
<column name="DATEOFBIRTH" valueDate="1960-11-13"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="6be193fc-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="6be19532-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="6be193fc-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="6be19532-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="6be19532-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="6be193fc-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_kanzler.xml b/others/db_changes/data_alias/data/example_person/PERSON_kanzler.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_kanzler.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_kanzler.xml
index 08f52b1f86c622128522297fcbdd909974337565..8b82284ee002bdc39792f40c57c34ec6e7f5e9d6 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_kanzler.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_kanzler.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="73d7306c-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="73d7306c-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Ludwig"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Kanzler"/>
@@ -10,23 +10,23 @@
<column name="DATEOFBIRTH" valueDate="1994-08-03"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="73d7306c-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="73d7306c-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="0"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="73d7306c-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_kormann.xml b/others/db_changes/data_alias/data/example_person/PERSON_kormann.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_kormann.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_kormann.xml
index 9eb1286b548064b215210a5835e9101e04e6a225..f67fb96d8fd080672e781616b2ed87dfe34520f2 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_kormann.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_kormann.xml
@@ -1,31 +1,31 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="6be19654-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="6be19654-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Annette"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Kormann"/>
<column name="SALUTATION" value="Madame"/>
<column name="DATEOFBIRTH" valueDate="1986-02-17"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="6be19654-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="6be19780-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="6be19654-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="6be19780-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="6be19780-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="6be19654-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_leicht.xml b/others/db_changes/data_alias/data/example_person/PERSON_leicht.xml
similarity index 82%
rename from others/db_changes/data_alias/data/example_pers/PERS_leicht.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_leicht.xml
index 2ad04ec57b1338dc70105aaba449e1e9d8c4acc8..286d335285d3ba16b61bbc1137c9686c95e6842a 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_leicht.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_leicht.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Birgit"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Leicht"/>
@@ -10,11 +10,11 @@
<column name="DATEOFBIRTH" valueDate="2001-05-07"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
@@ -23,7 +23,7 @@
<column name="ADDR_TYPE" valueNumeric="2"/>
<column name="CITY" value="Landshut"/>
<column name="COUNTRY" value="DE"/>
- <column name="RELATION_ID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACT_ID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ADDRIDENTIFIER" value=""/>
<column name="REGION" value="Niederbayern"/>
<column name="ADDRESSID" value="ce990566-3b86-48fe-bd0c-1167142e584b"/>
@@ -38,7 +38,7 @@
<column name="ADDR_TYPE" valueNumeric="3"/>
<column name="CITY" value="Landshut"/>
<column name="COUNTRY" value="DE"/>
- <column name="RELATION_ID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACT_ID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ADDRIDENTIFIER" value=""/>
<column name="REGION" value="Niederbayern"/>
<column name="ADDRESSID" value="43b8aea1-2444-448f-87c5-f12fe1ef4ca0"/>
@@ -49,20 +49,20 @@
<column name="DISTRICT" value="Niederbayern"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
<delete tableName="ADDRESS">
- <where>RELATION_ID = ?</where>
+ <where>CONTACT_ID = ?</where>
<whereParams>
<param value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_lustig.xml b/others/db_changes/data_alias/data/example_person/PERSON_lustig.xml
similarity index 80%
rename from others/db_changes/data_alias/data/example_pers/PERS_lustig.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_lustig.xml
index 0706f853524daf6ae32482c6fbe7c1c62f31513c..6558287c18b6eccbfb0371c39be60b021900c7e0 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_lustig.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_lustig.xml
@@ -1,18 +1,18 @@
<?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="j.hoermann" id="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8">
- <insert tableName="PERS">
- <column name="PERSID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
<column name="FIRSTNAME" value="Susanne"/>
<column name="LASTNAME" value="Lustig"/>
<column name="SALUTATION" value="Frau"/>
<column name="DATEOFBIRTH" valueDate="1990-04-05"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
- <column name="RELATIONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+ <column name="PERSON_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+ <column name="CONTACTID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
@@ -21,7 +21,7 @@
<column name="ADDR_TYPE" valueNumeric="2"/>
<column name="CITY" value="Windach"/>
<column name="COUNTRY" value="DE"/>
- <column name="RELATION_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+ <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
<column name="ADDRIDENTIFIER" value=""/>
<column name="REGION" value="Landsberg am Lech"/>
<column name="ADDRESSID" value="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8"/>
@@ -32,20 +32,20 @@
<column name="DISTRICT" value="Oberbayern"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7" />
</whereParams>
</delete>
<delete tableName="ADDRESS">
- <where>RELATION_ID = ?</where>
+ <where>CONTACT_ID = ?</where>
<whereParams>
<param value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_miller.xml b/others/db_changes/data_alias/data/example_person/PERSON_miller.xml
similarity index 78%
rename from others/db_changes/data_alias/data/example_pers/PERS_miller.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_miller.xml
index ef6c2961165d87f97d27802e2ad4e93c8d77aba0..4ae837c5b06e8baafb3f3c0d4b79abeec107ff35 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_miller.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_miller.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Berd"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Miller"/>
@@ -11,23 +11,23 @@
<column name="DATEOFBIRTH" valueDate="1971-05-21"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="6be18baa-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="6be18baa-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="6be18baa-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_muller.xml b/others/db_changes/data_alias/data/example_person/PERSON_muller.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_muller.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_muller.xml
index dfbffded01139b17c9f0ad05c770392168fc3a26..92325841d488cb250e60837236ed62834513e74e 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_muller.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_muller.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Franz"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Müller"/>
@@ -10,23 +10,23 @@
<column name="GENDER" value="m"/>
<column name="SALUTATION" value="Herr"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="RELATIONID" value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="PERS_ID" value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_obermeier.xml b/others/db_changes/data_alias/data/example_person/PERSON_obermeier.xml
similarity index 76%
rename from others/db_changes/data_alias/data/example_pers/PERS_obermeier.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_obermeier.xml
index 755c659d51587fd1c5151c946d375ba785ddd81f..33441b73442c10fd356e60597202185526f21520 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_obermeier.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_obermeier.xml
@@ -1,36 +1,36 @@
<?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="j.hoermann" id="067f344d-56b3-491e-9a0e-968511e991fe">
- <insert tableName="PERS">
- <column name="PERSID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
<column name="FIRSTNAME" value="Herbert"/>
<column name="LASTNAME" value="Obermeier"/>
<column name="SALUTATION" value="Herr"/>
<column name="DATEOFBIRTH" valueDate="1996-10-05"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
- <column name="RELATIONID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+ <column name="PERSON_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+ <column name="CONTACTID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="57d524f6-ad66-4550-be83-fee6e31b7a52" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="57d524f6-ad66-4550-be83-fee6e31b7a52" />
</whereParams>
</delete>
<delete tableName="ADDRESS">
- <where>RELATION_ID = ?</where>
+ <where>CONTACT_ID = ?</where>
<whereParams>
<param value="57d524f6-ad66-4550-be83-fee6e31b7a52" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_petersen.xml b/others/db_changes/data_alias/data/example_person/PERSON_petersen.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_petersen.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_petersen.xml
index d431f1c11e0de34c3b853b5822819c5464074dc7..5b8ad4496da078c71f1c2f3ef357131bd0dc12f1 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_petersen.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_petersen.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="73d74ff2-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="73d74ff2-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Peter"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Petersen"/>
@@ -10,23 +10,23 @@
<column name="DATEOFBIRTH" valueDate="1991-03-17"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="73d74ff2-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="73d75114-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="73d74ff2-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="73d75114-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="73d75114-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="73d74ff2-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_pfiffig.xml b/others/db_changes/data_alias/data/example_person/PERSON_pfiffig.xml
similarity index 86%
rename from others/db_changes/data_alias/data/example_pers/PERS_pfiffig.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_pfiffig.xml
index c3dbb800fe841dca00a4e7d21be20a132c3f604e..1c8fb45a8858d3aa41000a69b927962bbdeb4967 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_pfiffig.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_pfiffig.xml
@@ -1,8 +1,8 @@
<?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="t.feldmann" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="DATEOFBIRTH" valueDate="1991-02-01"/>
<column name="FIRSTNAME" value="Peter"/>
<column name="MIDDLENAME" value=""/>
@@ -10,24 +10,24 @@
<column name="GENDER" value="m"/>
<column name="SALUTATION" value="Herr"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="RELATIONID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
- <column name="PERS_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+ <column name="CONTACTID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+ <column name="PERSON_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<insert tableName="COMMUNICATION">
<column name="COMMUNICATIONID" value="14d01219-985b-4efe-a634-da71ae482907"/>
- <column name="RELATION_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+ <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="MEDIUM_ID" valueNumeric="1"/>
<column name="ADDR" value="pfiffig@web.de"/>
<column name="STANDARD" valueNumeric="1"/>
</insert>
<insert tableName="COMMUNICATION">
<column name="COMMUNICATIONID" value="22d01219-985b-4efe-a634-da71ae482907"/>
- <column name="RELATION_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+ <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="MEDIUM_ID" valueNumeric="2"/>
<column name="ADDR" value="08871333"/>
<column name="STANDARD" valueNumeric="0"/>
@@ -37,7 +37,7 @@
<column name="ADDR_TYPE" valueNumeric="2"/>
<column name="CITY" value="Nürnberg"/>
<column name="COUNTRY" value="DE"/>
- <column name="RELATION_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+ <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="ADDRIDENTIFIER" value="Tor 1"/>
<column name="REGION" value="Mittelfranken"/>
<column name="ADDRESSID" value="14d01332-985b-4efe-a634-da71ae482907"/>
@@ -59,7 +59,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="b111a1da-39f2-48ae-93a5-bad704e5ae48"/>
<column name="ACTIVITY_ID" value="de110a35-bcab-407e-9d60-7a65f028159b"/>
- <column name="OBJECT_TYPE" value="Contact_context"/>
+ <column name="OBJECT_TYPE" value="Person_context"/>
<column name="OBJECT_ROWID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
</insert>
<rollback>
@@ -93,14 +93,14 @@
<param value="14d01219-985b-4efe-a634-da71ae482907" />
</whereParams>
</delete>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_reisecker.xml b/others/db_changes/data_alias/data/example_person/PERSON_reisecker.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_reisecker.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_reisecker.xml
index 7931ad56d07be8318ae28780f10d2b6e1182bb4e..3b1bfa89f37252ade6bd69781029489fd8436517 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_reisecker.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_reisecker.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="6be18f42-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="6be18f42-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Claudia"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Reisecker"/>
@@ -10,23 +10,23 @@
<column name="TITLE"/>
<column name="DATEOFBIRTH" valueDate="1967-09-03"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="6be18f42-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="6be1906e-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="6be18f42-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="6be1906e-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="6be1906e-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="6be18f42-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_rieber.xml b/others/db_changes/data_alias/data/example_person/PERSON_rieber.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_rieber.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_rieber.xml
index 60502ab39813e9cf8ee1842aca704372727bfa6c..66b73d866d74cce15f941b214e00eb47d5e01cc5 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_rieber.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_rieber.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="73d743a4-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="73d743a4-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Mark"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Rieber"/>
@@ -10,23 +10,23 @@
<column name="DATEOFBIRTH" valueDate="1948-02-09"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="73d743a4-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="73d744f8-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="73d743a4-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="73d744f8-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="73d744f8-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="73d743a4-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_robert_sommer.xml b/others/db_changes/data_alias/data/example_person/PERSON_robert_sommer.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_robert_sommer.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_robert_sommer.xml
index a7df0af864d1314aa1ae53e1d996df773221d6eb..23abe3cf862f760d8905c726b75a15cc6a9bcce2 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_robert_sommer.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_robert_sommer.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="73d74660-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="73d74660-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Robert"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Sommer"/>
@@ -10,23 +10,23 @@
<column name="DATEOFBIRTH" valueDate="1956-07-02"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="73d74660-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="73d7478c-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="73d74660-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="73d7478c-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="73d7478c-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="73d74660-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_saubermann.xml b/others/db_changes/data_alias/data/example_person/PERSON_saubermann.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_saubermann.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_saubermann.xml
index b81d00e277a0532e97810cc98553016ed6781f9d..fcd1003977eee51351b0e6f9b6f1086344542059 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_saubermann.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_saubermann.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="73d73e68-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="73d73e68-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Walter"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Saubermann"/>
@@ -10,23 +10,23 @@
<column name="DATEOFBIRTH" valueDate="1985-10-22"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="73d73e68-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="73d73f8a-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="73d73e68-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="73d73f8a-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="73d73f8a-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="73d73e68-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_schmitt.xml b/others/db_changes/data_alias/data/example_person/PERSON_schmitt.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_schmitt.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_schmitt.xml
index fcedb5fa9a94cae9d3cc2c796489a975da7307c4..4d55e6d169ec2a21a444deb9aa0276683218d273 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_schmitt.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_schmitt.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="73d73530-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="73d73530-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Paula"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Schmitt"/>
@@ -10,23 +10,23 @@
<column name="DATEOFBIRTH" valueDate="1988-05-06"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="73d73530-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="73d73864-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="73d73530-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="73d73864-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="73d73864-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="73d73530-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_smith.xml b/others/db_changes/data_alias/data/example_person/PERSON_smith.xml
similarity index 76%
rename from others/db_changes/data_alias/data/example_pers/PERS_smith.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_smith.xml
index 9d0bec74a5bb5ca3ed99b428a0a0c828f9057e03..6aa05618c3b9dad0438d658cbd5304854b11f3f8 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_smith.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_smith.xml
@@ -1,36 +1,36 @@
<?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="j.hoermann" id="4e3bee66-c19d-4055-b2fe-88aa39f6eb30">
- <insert tableName="PERS">
- <column name="PERSID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
<column name="FIRSTNAME" value="Harold"/>
<column name="LASTNAME" value="Smith"/>
<column name="SALUTATION" value="Herr"/>
<column name="DATEOFBIRTH" valueDate="1985-05-10"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
- <column name="RELATIONID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+ <column name="PERSON_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+ <column name="CONTACTID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9" />
</whereParams>
</delete>
<delete tableName="ADDRESS">
- <where>RELATION_ID = ?</where>
+ <where>CONTACT_ID = ?</where>
<whereParams>
<param value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_sommer.xml b/others/db_changes/data_alias/data/example_person/PERSON_sommer.xml
similarity index 86%
rename from others/db_changes/data_alias/data/example_pers/PERS_sommer.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_sommer.xml
index 7a158aaf302d4ecbb0e55b8792a1319b17d6a53f..4d9e26806c6a3b552ad394ef0900cf58e091eaf0 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_sommer.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_sommer.xml
@@ -1,8 +1,8 @@
<?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="t.feldmann" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="DATEOFBIRTH" valueDate="1988-13-01"/>
<column name="FIRSTNAME" value="Lisa"/>
<column name="MIDDLENAME" value=""/>
@@ -10,24 +10,24 @@
<column name="GENDER" value="f"/>
<column name="SALUTATION" value="Frau"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="RELATIONID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="PERS_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="CONTACTID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="PERSON_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<insert tableName="COMMUNICATION">
<column name="COMMUNICATIONID" value="14d05619-985b-4efe-a634-da71ae482907"/>
- <column name="RELATION_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="MEDIUM_ID" valueNumeric="1"/>
<column name="ADDR" value="sommer@gfk.de"/>
<column name="STANDARD" valueNumeric="1"/>
</insert>
<insert tableName="COMMUNICATION">
<column name="COMMUNICATIONID" value="58d01219-985b-4efe-a634-da71ae482907"/>
- <column name="RELATION_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="MEDIUM_ID" valueNumeric="2"/>
<column name="ADDR" value="087631333"/>
<column name="STANDARD" valueNumeric="0"/>
@@ -37,7 +37,7 @@
<column name="ADDR_TYPE" valueNumeric="2"/>
<column name="CITY" value="Landshut"/>
<column name="COUNTRY" value="DE"/>
- <column name="RELATION_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="ADDRIDENTIFIER" value=""/>
<column name="REGION" value="Niederbayern"/>
<column name="ADDRESSID" value="11d01332-985b-4efe-a634-da71ae482907"/>
@@ -59,7 +59,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="a331a1da-39f2-48ae-93a5-bad704e5ae48"/>
<column name="ACTIVITY_ID" value="aa110a35-bcab-407e-9d60-7a65f028159b"/>
- <column name="OBJECT_TYPE" value="Contact_context"/>
+ <column name="OBJECT_TYPE" value="Person_context"/>
<column name="OBJECT_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
</insert>
<rollback>
@@ -93,14 +93,14 @@
<param value="14d05619-985b-4efe-a634-da71ae482907" />
</whereParams>
</delete>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="ef345d11-a40d-59e0-a24c-afcb6095d2cb" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="ef345d11-a40d-59e0-a24c-afcb6095d2cb" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_stone.xml b/others/db_changes/data_alias/data/example_person/PERSON_stone.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_stone.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_stone.xml
index 4c1abe40505e2816af0a441bfb58b525e2b5c0ec..83fe11ccd0450b587bed56ffd1adbfce824e5049 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_stone.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_stone.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="6be1852e-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="6be1852e-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Sharon"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Stone"/>
@@ -10,23 +10,23 @@
<column name="TITLE" value="Prof."/>
<column name="DATEOFBIRTH" valueDate="1976-03-15"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="6be1852e-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="6be1892a-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="6be1852e-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="6be1892a-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="6be1892a-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="6be1852e-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_thaler.xml b/others/db_changes/data_alias/data/example_person/PERSON_thaler.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_thaler.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_thaler.xml
index 783094386678d77f59cef769eb9f39fce15a4098..6e7e5dc09220adf13e16a4d7e104531d4d626106 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_thaler.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_thaler.xml
@@ -1,31 +1,31 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="6be198ac-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="6be198ac-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Kristiane"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Thaler"/>
<column name="SALUTATION" value="Frau"/>
<column name="DATEOFBIRTH" valueDate="2001-02-23"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="6be198ac-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="6be199d8-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="6be198ac-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="6be199d8-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="6be199d8-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="6be198ac-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_traum.xml b/others/db_changes/data_alias/data/example_person/PERSON_traum.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_traum.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_traum.xml
index 54b1d59c3b07addecc68a7dc7d3302b742ece2e6..040b5f4e190d81013c3d9beba1a4c20748e00866 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_traum.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_traum.xml
@@ -1,31 +1,31 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="6be19d0c-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="6be19d0c-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Prinz"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Traum"/>
<column name="SALUTATION" value="Herr"/>
<column name="DATEOFBIRTH" valueDate="2002-02-26"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="6be19d0c-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="6be19e60-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="6be19d0c-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="6be19e60-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="6be19e60-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="6be19d0c-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_vogel.xml b/others/db_changes/data_alias/data/example_person/PERSON_vogel.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_vogel.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_vogel.xml
index daa54e693f07aa127b2ff1f9696b434b1f73f798..e0e8207a020c6d38da2ad0aa9b49d1f30bf2e2d1 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_vogel.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_vogel.xml
@@ -1,8 +1,8 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="73d748ae-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="73d748ae-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Franz"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Vogel"/>
@@ -10,23 +10,23 @@
<column name="DATEOFBIRTH" valueDate="2011-10-16"/>
<column name="MIDDLENAME" value=""/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="73d748ae-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="73d74c3c-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="73d748ae-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="73d74c3c-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="73d74c3c-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="73d748ae-e7f5-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_walter.xml b/others/db_changes/data_alias/data/example_person/PERSON_walter.xml
similarity index 77%
rename from others/db_changes/data_alias/data/example_pers/PERS_walter.xml
rename to others/db_changes/data_alias/data/example_person/PERSON_walter.xml
index af36a84f271455f8888ca9cc38add26c56d35289..4b0b2b40869aa665ee5fefc3dfb4cfe7c5f17b18 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_walter.xml
+++ b/others/db_changes/data_alias/data/example_person/PERSON_walter.xml
@@ -1,31 +1,31 @@
<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERS">
- <column name="PERSID" value="6be1a1d0-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <insert tableName="PERSON">
+ <column name="PERSONID" value="6be1a1d0-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="FIRSTNAME" value="Fritz"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Walter"/>
<column name="SALUTATION" value="Herr"/>
<column name="DATEOFBIRTH" valueDate="1957-03-05"/>
</insert>
- <insert tableName="RELATION">
+ <insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERS_ID" value="6be1a1d0-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="RELATIONID" value="6be1a2fc-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="6be1a1d0-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="6be1a2fc-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
<rollback>
- <delete tableName="RELATION">
- <where>RELATIONID = ?</where>
+ <delete tableName="CONTACT">
+ <where>CONTACTID = ?</where>
<whereParams>
<param value="6be1a2fc-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
</delete>
- <delete tableName="PERS">
- <where>PERSID = ?</where>
+ <delete tableName="PERSON">
+ <where>PERSONID = ?</where>
<whereParams>
<param value="6be1a1d0-e7fa-11e8-9f32-f2801f1b9fd1" />
</whereParams>
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml
index e1eae1cb665aa21420c20c3a3ba50f510100cdc5..5867110c106f387ce3ff56d8b7afaca96e8c6dc3 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml
@@ -3,7 +3,7 @@
<changeSet author="m.schroeger" id="6f705338-d9da-4373-a84a-1681d2bd5f7d">
<insert tableName="SALESORDER">
<column name="SALESORDERID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="SALESORDERDATE" valueDate="2017-11-21T00:00:00"/>
<column name="SALESORDERCODE" valueNumeric="1000"/>
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml
index 4b51cf96ec8f9c6d2abb33a296694dbcd5506d7f..45c3d2b182e3535521461664a323c368fa9504eb 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml
@@ -3,7 +3,7 @@
<changeSet author="f.feldmann" id="c48d2c77-9fbe-4fa0-8e17-656393047a82">
<insert tableName="SALESORDER">
<column name="SALESORDERID" value="41197800-027b-47f5-923a-f1004d09a969"/>
- <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="SALESORDERDATE" valueDate="2018-08-12T00:00:00"/>
<column name="SALESORDERCODE" valueNumeric="1001"/>
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml
index 14b3615c729d2bd479e6b4dafafb04ad2a0957f7..b305043be69629483194bc2e17b3b784a9f4d153 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml
@@ -3,7 +3,7 @@
<changeSet author="f.feldmann" id="95dcd356-75d4-45a2-8bda-d564c9c17d97">
<insert tableName="SALESORDER">
<column name="SALESORDERID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
- <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="SALESORDERDATE" valueDate="2016-06-14T00:00:00"/>
<column name="SALESORDERCODE" valueNumeric="1002"/>
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml
index d9f25b4549d1b31f13d4ade208429cf5088b41fa..c65b3595a88008d7d218fee45f35d61f1edd6ab6 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml
@@ -3,7 +3,7 @@
<changeSet author="f.feldmann" id="955b7c8d-3a85-408f-8374-b491a653b5c8">
<insert tableName="SALESORDER">
<column name="SALESORDERID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
- <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="SALESORDERDATE" valueDate="2018-08-23T00:00:00"/>
<column name="SALESORDERCODE" valueNumeric="1003"/>
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml
index 8087ffad02e86ebfc2a480ac9302740e92e2208e..90898dfe0d1a58966782e65a7601f3435b8c949a 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml
@@ -3,7 +3,7 @@
<changeSet author="f.feldmann" id="653af1f7-c0b9-4544-a93c-f3bf1e3ad054">
<insert tableName="SALESORDER">
<column name="SALESORDERID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
- <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="SALESORDERDATE" valueDate="2017-05-09T00:00:00"/>
<column name="SALESORDERCODE" valueNumeric="1004"/>
diff --git a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml b/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
index 9118178c8eec1e18cb92fe766aec445c08e0dceb..d179bd56810c914a513c101078839a56e856335d 100644
--- a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
+++ b/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
@@ -5,7 +5,7 @@
<column name="SALESPROJECTID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="PROJECTCODE" valueNumeric="1000"/>
<column name="PROJECTTITLE" value="GfK"/>
- <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="INFO" value="evtl. noch mit Berater Müller sprechen, ob ihm bekannt"/>
<column name="STATE" valueNumeric="1"/>
<column name="PHASE" valueNumeric="4"/>
@@ -21,7 +21,7 @@
<column name="AB_OBJECTRELATIONID" value="6dd516b2-7887-4a17-930a-d39607c8b626"/>
<column name="OBJECT1_TYPE" value="Salesproject_context"/>
<column name="OBJECT1_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="OBJECT2_TYPE" value="Contact_context"/>
+ <column name="OBJECT2_TYPE" value="Person_context"/>
<column name="OBJECT2_ROWID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
</insert>
<insert tableName="SALESPROJECT_SOURCE">
@@ -44,7 +44,7 @@
<insert tableName="SALESPROJECT_FORECAST">
<column name="SALESPROJECT_FORECASTID" value="affd17db-d925-4e20-81d5-ea9e4ca37c94"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="TYPE" value="PLAN"/>
<column name="GROUPCODE" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
@@ -57,7 +57,7 @@
<insert tableName="SALESPROJECT_FORECAST">
<column name="SALESPROJECT_FORECASTID" value="35f5f997-cc23-4850-8e71-b497bb7d12d6"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="TYPE" value="PLAN"/>
<column name="GROUPCODE" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
@@ -70,7 +70,7 @@
<insert tableName="SALESPROJECT_FORECAST">
<column name="SALESPROJECT_FORECASTID" value="625dd1eb-3d60-4818-8e9a-c55650d7fd87"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="TYPE" value="PLAN"/>
<column name="GROUPCODE" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
@@ -83,7 +83,7 @@
<insert tableName="SALESPROJECT_FORECAST">
<column name="SALESPROJECT_FORECASTID" value="c2b3303e-4a11-455c-b214-16400f9d8c16"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="TYPE" value="PLAN"/>
<column name="GROUPCODE" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
@@ -98,14 +98,14 @@
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="DATE_CANCELLED" valueDate="2016-06-13T09:03:43"/>
<column name="INFO" value="starkes Prozess Know-How, wird gefährlich für uns. Dazu private Verbindungen"/>
- <column name="RELATION_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
<column name="STATUS" valueNumeric="1"/>
</insert>
<insert tableName="SALESPROJECT_MEMBER">
<column name="SALESPROJECT_MEMBERID" value="f9dc15c0-91b8-43d3-ba98-80ca581db3a3"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="RELATION_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="SALESPROJECT_ROLE" value="1d100fff-24ba-43fd-931d-cae24e10b41f"/>
</insert>
diff --git a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_jkl.xml b/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_jkl.xml
index 618488f200671560e838e1f4afcd71084460011b..6f5ae0997e577053bab1b6aa43677db3c86324d8 100644
--- a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_jkl.xml
+++ b/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_jkl.xml
@@ -5,7 +5,7 @@
<column name="SALESPROJECTID" value="eaf8096b-2a1a-4336-932e-716e6c054b80"/>
<column name="PROJECTCODE" valueNumeric="2000"/>
<column name="PROJECTTITLE" value="Jkl"/>
- <column name="RELATION_ID" value="d321e2b4-f97e-4754-ba16-ab4853512c3c"/>
+ <column name="CONTACT_ID" value="d321e2b4-f97e-4754-ba16-ab4853512c3c"/>
<column name="INFO" value="evtl. noch mit Berater Huber sprechen, ob ihm bekannt"/>
<column name="STATE" valueNumeric="1"/>
<column name="PHASE" valueNumeric="4"/>
diff --git a/others/db_changes/data_alias/data/example_task/base.xml b/others/db_changes/data_alias/data/example_task/base.xml
index e52129586bb2ea3d32c6aa60cb81507eea375095..7680d3f8a042b1d4a63335e298f6807899128403 100644
--- a/others/db_changes/data_alias/data/example_task/base.xml
+++ b/others/db_changes/data_alias/data/example_task/base.xml
@@ -5,8 +5,8 @@
<column name="TASKID" value="e9cb198d-c420-4192-9c29-b23682457d8e">
<constraints primaryKey="true" primaryKeyName="PK_TASK_TASKID"/>
</column>
- <column name="REQUESTOR_RELATION_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="EDITOR_RELATION_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="CODE" valueNumeric="10000"/>
<column name="SUBJECT" value="effiziente Wertschöpfungsketten bündeln und anlaysieren"/>
@@ -26,8 +26,8 @@
<column name="TASKID" value="b18558aa-6853-446a-940e-d2f100e21c6d">
<constraints primaryKey="true" primaryKeyName="PK_TASK_TASKID"/>
</column>
- <column name="REQUESTOR_RELATION_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="EDITOR_RELATION_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="CODE" valueNumeric="10001"/>
<column name="SUBJECT" value="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."/>
@@ -47,8 +47,8 @@
<column name="TASKID" value="ee6e7a9c-233b-4ddd-a5f2-00163657a2a6">
<constraints primaryKey="true" primaryKeyName="PK_TASK_TASKID"/>
</column>
- <column name="REQUESTOR_RELATION_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="EDITOR_RELATION_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="CODE" valueNumeric="10002"/>
<column name="SUBJECT" value="Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris"/>
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_attributerelation.xml b/others/db_changes/data_alias/struct/AditoBasic/create_ab_attributerelation.xml
index 260e47f10cced9f2d881daf4059c757b29dc8bed..6050c7975f3ca4e488aa25b19c31945a25df93e3 100644
--- a/others/db_changes/data_alias/struct/AditoBasic/create_ab_attributerelation.xml
+++ b/others/db_changes/data_alias/struct/AditoBasic/create_ab_attributerelation.xml
@@ -18,9 +18,7 @@
<column name="ID_VALUE" type="CHAR(36)"/>
<column name="DATE_VALUE" type="DATETIME"/>
<column name="NUMBER_VALUE" type="NUMERIC(14,2)"/>
- <column name="BOOL_VALUE" type="TINYINT">
- <constraints nullable="false"/>
- </column>
+ <column name="BOOL_VALUE" type="TINYINT"/>
</createTable>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/struct/create_address.xml b/others/db_changes/data_alias/struct/create_address.xml
index 7b5587c73ab507ef8fcb6f424b5a2f9c75086b3a..73309576ecf5dfdd54e072c1b3b3e9f4269a1474 100644
--- a/others/db_changes/data_alias/struct/create_address.xml
+++ b/others/db_changes/data_alias/struct/create_address.xml
@@ -14,14 +14,14 @@
<column name="COUNTRY" type="CHAR(2)"/>
<column name="DISTRICT" type="NVARCHAR(50)"/>
<column name="REGION" type="NVARCHAR(50)"/>
- <column name="RELATION_ID" type="CHAR(36)">
+ <column name="CONTACT_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
<column name="STATE" type="NVARCHAR(50)"/>
<column name="ZIP" type="NVARCHAR(50)"/>
</createTable>
<addColumn
- tableName="RELATION">
+ tableName="CONTACT">
<column name="ADDRESS_ID" type="CHAR(36)" />
</addColumn>
</changeSet>
diff --git a/others/db_changes/data_alias/struct/create_comm.xml b/others/db_changes/data_alias/struct/create_communication.xml
similarity index 95%
rename from others/db_changes/data_alias/struct/create_comm.xml
rename to others/db_changes/data_alias/struct/create_communication.xml
index f052d99af89c61195f424d421c30c5f6fadfc2a6..954f264cfc12cecf80c02f12cf7dad3429dcac8d 100644
--- a/others/db_changes/data_alias/struct/create_comm.xml
+++ b/others/db_changes/data_alias/struct/create_communication.xml
@@ -7,7 +7,7 @@
</column>
<column name="ADDR" type="NVARCHAR(255)"/>
<column name="MEDIUM_ID" type="INTEGER"/>
- <column name="RELATION_ID" type="CHAR(36)"/>
+ <column name="CONTACT_ID" type="CHAR(36)"/>
<column name="STANDARD" type="TINYINT">
<constraints nullable="false"/>
</column>
diff --git a/others/db_changes/data_alias/struct/create_relation.xml b/others/db_changes/data_alias/struct/create_contact.xml
similarity index 83%
rename from others/db_changes/data_alias/struct/create_relation.xml
rename to others/db_changes/data_alias/struct/create_contact.xml
index d47f4cac8481d6bf1fa34bcab0cb2e657c6dd209..2530314f22796fb706e6bcfdcf1ee3a94ce2b4d1 100644
--- a/others/db_changes/data_alias/struct/create_relation.xml
+++ b/others/db_changes/data_alias/struct/create_contact.xml
@@ -1,14 +1,14 @@
<?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="j.hoermann" id="1f8bb402-3dd8-4732-8409-0ffc784f84f4">
- <createTable tableName="RELATION">
+ <createTable tableName="CONTACT">
<column name="STATUS" type="CHAR(36)"/>
<column name="LANGUAGE" type="CHAR(3)"/>
<column name="ORGANISATION_ID" type="CHAR(36)"/>
- <column name="PERS_ID" type="CHAR(36)" />
+ <column name="PERSON_ID" type="CHAR(36)" />
<column name="RELATIONSHIP" type="INTEGER"/>
- <column name="RELATIONID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_RELATION_RELATIONID"/>
+ <column name="CONTACTID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_CONTACT_RELATIONID"/>
</column>
</createTable>
</changeSet>
diff --git a/others/db_changes/data_alias/struct/create_contract.xml b/others/db_changes/data_alias/struct/create_contract.xml
index 6360d51f452e984a79d6889598ea0d2453ba1405..d3fc8754991b79910ca62f0c20283f292bbe5b99 100644
--- a/others/db_changes/data_alias/struct/create_contract.xml
+++ b/others/db_changes/data_alias/struct/create_contract.xml
@@ -15,7 +15,7 @@
<column name="CONTRACTTYPE" type="CHAR(36)"/>
<column name="PAYMENT" type="CHAR(36)"/>
<column name="REMARK" type="NCLOB"/>
- <column name="RELATION_ID" type="CHAR(36)"/>
+ <column name="CONTACT_ID" type="CHAR(36)"/>
</createTable>
</changeSet>
</databaseChangeLog>
diff --git a/others/db_changes/data_alias/struct/create_offer.xml b/others/db_changes/data_alias/struct/create_offer.xml
index 41b75a566a4b7ede00d135d2b01445fd431d08be..eade3b163f6f5d0115e7eaf17f4c5a7eae06d784 100644
--- a/others/db_changes/data_alias/struct/create_offer.xml
+++ b/others/db_changes/data_alias/struct/create_offer.xml
@@ -5,7 +5,7 @@
<column name="OFFERID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_OFFER_OFFERID"/>
</column>
- <column name="RELATION_ID" type="CHAR(36)">
+ <column name="CONTACT_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
<column name="SALESPROJECT_ID" type="CHAR(36)"/>
diff --git a/others/db_changes/data_alias/struct/create_org.xml b/others/db_changes/data_alias/struct/create_organisation.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_org.xml
rename to others/db_changes/data_alias/struct/create_organisation.xml
diff --git a/others/db_changes/data_alias/struct/create_pers.xml b/others/db_changes/data_alias/struct/create_person.xml
similarity index 84%
rename from others/db_changes/data_alias/struct/create_pers.xml
rename to others/db_changes/data_alias/struct/create_person.xml
index 94bc16c8da99dfaa5f4cdf20727e5affb2cacddb..06fec0d99bcc25cd5bcda6bc2e989c9715dec6a2 100644
--- a/others/db_changes/data_alias/struct/create_pers.xml
+++ b/others/db_changes/data_alias/struct/create_person.xml
@@ -1,9 +1,9 @@
<?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="e.pollinger" id="06b5d1ac-08cf-4441-90a2-8cbc1438bfca">
- <createTable tableName="PERS">
- <column name="PERSID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_PERS_PERSID"/>
+ <createTable tableName="PERSON">
+ <column name="PERSONID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_PERSON_PERSONID"/>
</column>
<column name="DATEOFBIRTH" type="DATE"/>
<column name="FIRSTNAME" type="NVARCHAR(50)"/>
@@ -16,7 +16,7 @@
<column name="TITLE" type="NVARCHAR(50)"/>
<column name="TITLESUFFIX" type="NVARCHAR(50)"/>
</createTable>
- <createIndex indexName="IDX_PERS" tableName="PERS">
+ <createIndex indexName="IDX_PERS_NAME" tableName="PERSON">
<column name="FIRSTNAME"/>
<column name="LASTNAME"/>
</createIndex>
diff --git a/others/db_changes/data_alias/struct/create_product.xml b/others/db_changes/data_alias/struct/create_product.xml
index 2356a9ec1e3bacfa2576a3fc542549e1cb0c312a..595fc777817bdab99a36beafbd52391fb4fb01f0 100644
--- a/others/db_changes/data_alias/struct/create_product.xml
+++ b/others/db_changes/data_alias/struct/create_product.xml
@@ -8,7 +8,7 @@
<column name="ADVERTISING" type="CHAR(1)"/>
<column name="GROUPCODEID" type="CHAR(36)"/>
<column name="MINSTOCK" type="INTEGER"/>
- <column name="RELATION_ID" type="CHAR(36)"/>
+ <column name="CONTACT_ID" type="CHAR(36)"/>
<column name="PRODUCTCODE" type="NVARCHAR(50)">
<constraints nullable="false" unique="true" uniqueConstraintName="UNIQUE_PRODUCT_PRODUCTCODE"/>
</column>
diff --git a/others/db_changes/data_alias/struct/create_productprice.xml b/others/db_changes/data_alias/struct/create_productprice.xml
index e8bac0fb84369c2bf6fcb34ef5f3172c96caad08..5e0acf90eadfcfe4fb2060893d4816ba3babfbdb 100644
--- a/others/db_changes/data_alias/struct/create_productprice.xml
+++ b/others/db_changes/data_alias/struct/create_productprice.xml
@@ -8,7 +8,7 @@
<column name="VALID_TO" type="DATETIME"/>
<column name="VALID_FROM" type="DATETIME"/>
- <column name="RELATION_ID" type="CHAR(36)"/>
+ <column name="CONTACT_ID" type="CHAR(36)"/>
<column name="PRICE" type="NUMERIC(14,2)"/>
<column name="VAT" type="NUMERIC(14,2)"/>
<column name="PRODUCT_ID" type="CHAR(36)">
diff --git a/others/db_changes/data_alias/struct/create_salesorder.xml b/others/db_changes/data_alias/struct/create_salesorder.xml
index fdb64287dd7450fec523a3832a1fb809a4575f99..e5b5409e8b77e821c09c4692af22005f7f400f1c 100644
--- a/others/db_changes/data_alias/struct/create_salesorder.xml
+++ b/others/db_changes/data_alias/struct/create_salesorder.xml
@@ -5,7 +5,7 @@
<column name="SALESORDERID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_SALESORDER_SALESORDERID"/>
</column>
- <column name="RELATION_ID" type="CHAR(36)">
+ <column name="CONTACT_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
<column name="SALESPROJECT_ID" type="CHAR(36)"/>
diff --git a/others/db_changes/data_alias/struct/create_salesproject.xml b/others/db_changes/data_alias/struct/create_salesproject.xml
index a8d6612a708a91fd4b92e762ef6a78a67a7f0b63..6fc8e7ce27a514f8f526cc9dcf7529eaac15263d 100644
--- a/others/db_changes/data_alias/struct/create_salesproject.xml
+++ b/others/db_changes/data_alias/struct/create_salesproject.xml
@@ -7,7 +7,7 @@
<constraints nullable="false" unique="true" uniqueConstraintName="UNIQUE_SALESPROJECT_PROJECTCODE" />
</column>
<column name="PROJECTTITLE" type="NVARCHAR(30)"/>
- <column name="RELATION_ID" type="CHAR(36)">
+ <column name="CONTACT_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
<column name="INFO" type="NCLOB"/>
diff --git a/others/db_changes/data_alias/struct/create_salesproject_competition.xml b/others/db_changes/data_alias/struct/create_salesproject_competition.xml
index 8a7b5330faa6f0f4b33a3c93c9c094892249813d..2c2bb70a55d2a249b9ba9b9310e3ef5f77f61ee0 100644
--- a/others/db_changes/data_alias/struct/create_salesproject_competition.xml
+++ b/others/db_changes/data_alias/struct/create_salesproject_competition.xml
@@ -8,7 +8,7 @@
<column name="SALESPROJECT_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
- <column name="RELATION_ID" type="CHAR(36)">
+ <column name="CONTACT_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
<column name="DATE_CANCELLED" type="DATETIME"/>
@@ -19,4 +19,4 @@
</createTable>
</changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/others/db_changes/data_alias/struct/create_salesproject_forecast.xml b/others/db_changes/data_alias/struct/create_salesproject_forecast.xml
index edaa425b76e7ed2af6c17ac4544f0a31f5fa1bb2..72dc20ee0bcb58ae013e9d92c35b4bd38970f7ec 100644
--- a/others/db_changes/data_alias/struct/create_salesproject_forecast.xml
+++ b/others/db_changes/data_alias/struct/create_salesproject_forecast.xml
@@ -8,7 +8,7 @@
<column name="SALESPROJECT_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
- <column name="RELATION_ID" type="CHAR(36)">
+ <column name="CONTACT_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
diff --git a/others/db_changes/data_alias/struct/create_salesproject_member.xml b/others/db_changes/data_alias/struct/create_salesproject_member.xml
index 36645336b533b894790b88317586d176a1da5e9e..6a3207693ed51fb19ea25575c29b0328f80942f9 100644
--- a/others/db_changes/data_alias/struct/create_salesproject_member.xml
+++ b/others/db_changes/data_alias/struct/create_salesproject_member.xml
@@ -8,7 +8,7 @@
<column name="SALESPROJECT_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
- <column name="RELATION_ID" type="CHAR(36)">
+ <column name="CONTACT_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
<column name="RELATIONSHIP" type="INTEGER"/>
diff --git a/others/db_changes/data_alias/struct/create_task.xml b/others/db_changes/data_alias/struct/create_task.xml
index a879b70d6aa0debde81dff0eed6c0e35c4adfc8c..89727f63dfe0eed7747652cdcd10f15803c3f9a3 100644
--- a/others/db_changes/data_alias/struct/create_task.xml
+++ b/others/db_changes/data_alias/struct/create_task.xml
@@ -12,8 +12,8 @@
<column name="SUBJECT" type="NVARCHAR(254)"/>
<column name="STATUS" type="CHAR(36)"/>
<column name="PRIORITY" type="SMALLINT"/>
- <column name="REQUESTOR_RELATION_ID" type="CHAR(36)"/>
- <column name="EDITOR_RELATION_ID" type="CHAR(36)"/>
+ <column name="REQUESTOR_CONTACT_ID" type="CHAR(36)"/>
+ <column name="EDITOR_CONTACT_ID" type="CHAR(36)"/>
<column name="START_DATE" type="DATETIME"/>
<column name="MATURITY_DATE" type="DATETIME"/>
<column name="TYPE" type="CHAR(36)"/>
diff --git a/others/db_changes/data_alias/struct/create_timetracking.xml b/others/db_changes/data_alias/struct/create_timetracking.xml
index f14dfe5e1f57a9b458a68d48dde6443699fb6804..1f7bf1ed6cdd1e12c8c0c0216a92bec0f8fa51a2 100644
--- a/others/db_changes/data_alias/struct/create_timetracking.xml
+++ b/others/db_changes/data_alias/struct/create_timetracking.xml
@@ -15,8 +15,8 @@
<column name="ROW_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
- <column name="RELATION_ID" type="CHAR(36)">
- <constraints foreignKeyName="FK_TIMETRACKING_RELATION_ID" references="RELATION(RELATIONID)"/>
+ <column name="CONTACT_ID" type="CHAR(36)">
+ <constraints foreignKeyName="FK_TIMETRACKING_CONTACT_ID" references="CONTACT(CONTACTID)"/>
</column>
<column name="DATE" type="DATETIME">
diff --git a/others/db_changes/masterChangelog.xml b/others/db_changes/masterChangelog.xml
index a8b5a48a7cd2c131f97a3f3b3d03a33a2d434820..a6438b08fcb232bcdc80530bce93a69702abebb7 100644
--- a/others/db_changes/masterChangelog.xml
+++ b/others/db_changes/masterChangelog.xml
@@ -8,13 +8,13 @@
<include file="data_alias/struct/AditoBasic/create_ab_countryinfo.xml"/>
<include file="data_alias/struct/AditoBasic/create_ab_language.xml"/>
- <include file="data_alias/struct/create_pers.xml"/>
- <include file="data_alias/struct/create_org.xml"/>
- <include file="data_alias/struct/create_relation.xml"/>
+ <include file="data_alias/struct/create_person.xml"/>
+ <include file="data_alias/struct/create_organisation.xml"/>
+ <include file="data_alias/struct/create_contact.xml"/>
<include file="data_alias/struct/create_activity.xml"/>
<include file="data_alias/struct/create_activitylink.xml"/>
<include file="data_alias/struct/create_address.xml"/>
- <include file="data_alias/struct/create_comm.xml"/>
+ <include file="data_alias/struct/create_communication.xml"/>
<include file="data_alias/struct/create_contract.xml"/>
<include file="data_alias/struct/create_product.xml"/>
<include file="data_alias/struct/create_prod2prod.xml"/>
@@ -34,21 +34,21 @@
<include file="data_alias/struct/create_timetracking.xml"/>
<include file="data_alias/struct/create_task.xml"/>
- <include file="data_alias/data/example_org/ORG_privat.xml"/>
- <include file="data_alias/data/example_org/ORG_gfk.xml"/>
- <include file="data_alias/data/example_org/ORG_mnf.xml"/>
- <include file="data_alias/data/example_org/ORG_lichtenstein.xml"/>
- <include file="data_alias/data/example_org/ORG_kaeltetechnik.xml"/>
- <include file="data_alias/data/example_org/ORG_pichelmaier.xml"/>
- <include file="data_alias/data/example_pers/PERS_pfiffig.xml"/>
- <include file="data_alias/data/example_pers/PERS_sommer.xml"/>
- <include file="data_alias/data/example_pers/PERS_muller.xml"/>
- <include file="data_alias/data/example_pers/PERS_leicht.xml"/>
- <include file="data_alias/data/example_pers/PERS_kanzler.xml"/>
- <include file="data_alias/data/example_pers/PERS_gruener.xml"/>
- <include file="data_alias/data/example_pers/PERS_obermeier.xml"/>
- <include file="data_alias/data/example_pers/PERS_smith.xml"/>
- <include file="data_alias/data/example_pers/PERS_lustig.xml"/>
+ <include file="data_alias/data/example_organisation/ORGANISATION_privat.xml"/>
+ <include file="data_alias/data/example_organisation/ORGANISATION_gfk.xml"/>
+ <include file="data_alias/data/example_organisation/ORGANISATION_mnf.xml"/>
+ <include file="data_alias/data/example_organisation/ORGANISATION_lichtenstein.xml"/>
+ <include file="data_alias/data/example_organisation/ORGANISATION_kaeltetechnik.xml"/>
+ <include file="data_alias/data/example_organisation/ORGANISATION_pichelmaier.xml"/>
+ <include file="data_alias/data/example_person/PERSON_pfiffig.xml"/>
+ <include file="data_alias/data/example_person/PERSON_sommer.xml"/>
+ <include file="data_alias/data/example_person/PERSON_muller.xml"/>
+ <include file="data_alias/data/example_person/PERSON_leicht.xml"/>
+ <include file="data_alias/data/example_person/PERSON_kanzler.xml"/>
+ <include file="data_alias/data/example_person/PERSON_gruener.xml"/>
+ <include file="data_alias/data/example_person/PERSON_obermeier.xml"/>
+ <include file="data_alias/data/example_person/PERSON_smith.xml"/>
+ <include file="data_alias/data/example_person/PERSON_lustig.xml"/>
<include file="data_alias/data/example_contract/CONTRACT_42154311.xml"/>
<include file="data_alias/data/example_contract/CONTRACT_42154312.xml"/>
<include file="data_alias/data/example_contract/CONTRACT_42154313.xml"/>
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/Birgit_Leicht_Image.xml b/others/db_changes/system_alias/data/example_asys_binaries/Birgit_Leicht_Image.xml
index 80f2fcff3a4a1a82f7c40cfb59613f92a55388a2..6dbe3e1633fe79c819f48d8377932f4a236bd787 100644
--- a/others/db_changes/system_alias/data/example_asys_binaries/Birgit_Leicht_Image.xml
+++ b/others/db_changes/system_alias/data/example_asys_binaries/Birgit_Leicht_Image.xml
@@ -12,7 +12,7 @@
<column name="ID" value="ca8d0195-db3f-4b04-98be-9c46e060e67b"/>
<column name="MIMETYPE" value="image/png"/>
<column name="ROW_ID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="TABLENAME" value="PERS"/>
+ <column name="TABLENAME" value="PERSON"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="PREVIEW" valueBlobFile="blob/Birgit_Leicht_preview.jpeg"/>
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/Harold_Smith_Image.xml b/others/db_changes/system_alias/data/example_asys_binaries/Harold_Smith_Image.xml
index 911f8bc1459bd2c22317e5133906a377bf994eb1..a2aa0f01844881a37a6bf6cc9fca6a0327f9c5e0 100644
--- a/others/db_changes/system_alias/data/example_asys_binaries/Harold_Smith_Image.xml
+++ b/others/db_changes/system_alias/data/example_asys_binaries/Harold_Smith_Image.xml
@@ -12,7 +12,7 @@
<column name="ID" value="62030aa4-908b-48c7-abc5-6074a3a2e611"/>
<column name="MIMETYPE" value="image/png"/>
<column name="ROW_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
- <column name="TABLENAME" value="PERS"/>
+ <column name="TABLENAME" value="PERSON"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="PREVIEW" valueBlobFile="blob/Harold_Smith_preview.jpeg"/>
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/Herbert_Obermeier_Image.xml b/others/db_changes/system_alias/data/example_asys_binaries/Herbert_Obermeier_Image.xml
index caa80d6282ec76062561ece2216e8cbc8daa062a..a73d213fccb0c2bdbbcdcf228bc26936cc0365e1 100644
--- a/others/db_changes/system_alias/data/example_asys_binaries/Herbert_Obermeier_Image.xml
+++ b/others/db_changes/system_alias/data/example_asys_binaries/Herbert_Obermeier_Image.xml
@@ -12,7 +12,7 @@
<column name="ID" value="ca0db8c3-e51a-45da-8fe4-7c727396d52e"/>
<column name="MIMETYPE" value="image/png"/>
<column name="ROW_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
- <column name="TABLENAME" value="PERS"/>
+ <column name="TABLENAME" value="PERSON"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="PREVIEW" valueBlobFile="blob/Herbert_Obermeier_preview.jpeg"/>
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/Lisa_Sommer_Image.xml b/others/db_changes/system_alias/data/example_asys_binaries/Lisa_Sommer_Image.xml
index be1c0190ed9347e0bfabecd799d9d5818ecb8960..6bea9a50229f6be484f5935cb212ca3be0694f43 100644
--- a/others/db_changes/system_alias/data/example_asys_binaries/Lisa_Sommer_Image.xml
+++ b/others/db_changes/system_alias/data/example_asys_binaries/Lisa_Sommer_Image.xml
@@ -12,7 +12,7 @@
<column name="ID" value="dfb81242-520b-4bd6-95f0-84882f4e61ae"/>
<column name="MIMETYPE" value="image/png"/>
<column name="ROW_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="TABLENAME" value="PERS"/>
+ <column name="TABLENAME" value="PERSON"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="PREVIEW" valueBlobFile="blob/Lisa_Sommer_preview.jpeg"/>
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/Susanne_Lustig_Image.xml b/others/db_changes/system_alias/data/example_asys_binaries/Susanne_Lustig_Image.xml
index ed1af394814b32117ca5a1aeb484d70b3dad1c14..c4e30a29a2c83d170e953f12bf23a0007576e364 100644
--- a/others/db_changes/system_alias/data/example_asys_binaries/Susanne_Lustig_Image.xml
+++ b/others/db_changes/system_alias/data/example_asys_binaries/Susanne_Lustig_Image.xml
@@ -12,7 +12,7 @@
<column name="ID" value="0c9e1a2e-220c-4574-9d04-870b8ee22000"/>
<column name="MIMETYPE" value="image/png"/>
<column name="ROW_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
- <column name="TABLENAME" value="PERS"/>
+ <column name="TABLENAME" value="PERSON"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="PREVIEW" valueBlobFile="blob/Susanne_Lustig_preview.jpeg"/>
diff --git a/others/guide/HowToSqlConditionLib.adoc b/others/guide/HowToSqlConditionLib.adoc
index 5e4bc6394dc56223bff008f88fdd34c5fb16af67..82f29b1b846b875aee80c5eaa7052726dd50c010 100644
--- a/others/guide/HowToSqlConditionLib.adoc
+++ b/others/guide/HowToSqlConditionLib.adoc
@@ -29,8 +29,8 @@ var myDescriptiveNameOfTheCondition = SqlCondition.begin(alias);
* use the object, add conditions
[source,javascript]
----
-myDescriptiveNameOfTheCondition.orPrepare("PERS.FIRSTNAME", "Bob")
- .orPrepare("PERS.LASTNAME", "Meier");
+myDescriptiveNameOfTheCondition.orPrepare("PERSON.FIRSTNAME", "Bob")
+ .orPrepare("PERSON.LASTNAME", "Meier");
----
* You can also use table aliases, if you provide the table, column and alias as array.
The table name has to be provided for loading the data types but the alias is built into the sql.
@@ -38,13 +38,13 @@ myDescriptiveNameOfTheCondition.orPrepare("PERS.FIRSTNAME", "Bob")
This is especially useful if you build a condition for joins. (See example at the end).
[source,javascript]
----
-myDescriptiveNameOfTheCondition.orPrepare(["PERS", "FIRSTNAME", "bob"], "Bob")
- .orPrepare(["PERS", "LASTNAME", "bob"], "Meier");
+myDescriptiveNameOfTheCondition.orPrepare(["PERSON", "FIRSTNAME", "bob"], "Bob")
+ .orPrepare(["PERSON", "LASTNAME", "bob"], "Meier");
----
* build sql
[source,javascript]
----
-var myPreparedSelect = myDescriptiveNameOfTheCondition.buildSql("select PERSID from PERS", "1 = 2", "order by FIRSTNAME");
+var myPreparedSelect = myDescriptiveNameOfTheCondition.buildSql("select PERSONID from PERSON", "1 = 2", "order by FIRSTNAME");
----
* use the select
[source,javascript]
@@ -56,9 +56,9 @@ You can do everything in one command also:
[source,javascript]
----
var bobsId = db.cell(SqlCondition.begin(alias)
- .orPrepare("PERS.FIRSTNAME", "Bob")
- .orPrepare("PERS.LASTNAME", "Meier");
- .buildSql("select PERSID from PERS"));
+ .orPrepare("PERSON.FIRSTNAME", "Bob")
+ .orPrepare("PERSON.LASTNAME", "Meier");
+ .buildSql("select PERSONID from PERSON"));
----
== available methods ==
@@ -86,7 +86,7 @@ So most times it is save to use the first method. Even in loops or if you use th
[source,javascript]
----
-myDescriptiveNameOfTheCondition.orPrepared("PERS.FIRSTNAME", 'Bob', "#<?");
+myDescriptiveNameOfTheCondition.orPrepared("PERSON.FIRSTNAME", 'Bob', "#<?");
----
=== andPreparedVars / orPreparedVars ===
@@ -147,7 +147,7 @@ Same as build and adds a string before and after the condition.
[source,javascript]
----
-var myPreparedStatementArray = myDescriptiveNameOfTheCondition.buildSql("select * from PERS", "1=0", "order by FIRSTNAME");
+var myPreparedStatementArray = myDescriptiveNameOfTheCondition.buildSql("select * from PERSON", "1=0", "order by FIRSTNAME");
----
== real world example ==
diff --git a/process/Communication_lib/process.js b/process/Communication_lib/process.js
index 8be0346dc34c129aa2544f3035e3bd537d59432e..e1c5313d9d54385391c0ad2b11e76f9833521856 100644
--- a/process/Communication_lib/process.js
+++ b/process/Communication_lib/process.js
@@ -33,7 +33,7 @@ CommUtil.getMediumIdsByCategory = function (pCategory)
/**
* sets the standard address for COMMUNICATION entries for a specific category;
* does not verify if the COMMUNICATIONID you provide has the given category
- * @param {String} pAffectedRowId a refencial ID whoes COMMs should be modified (a RELATIONID)
+ * @param {String} pAffectedRowId a refencial ID whoes COMMs should be modified (a CONTACTID)
* @param {String} pNewStandardCommId COMMUNICATIONID of the new STANDARD comm-entry; can be an empty string if no new standard adress shall be set but the old standard removed
* @param {String} pCategory value of the keyword "COMMUNICATION.MEDIUM" custom.category; e.g. "PHONE"; the STANDARD of this category is set
* @return {null} currently returns always null; reserved for future
@@ -52,7 +52,7 @@ CommUtil.setStandardForCategory = function(pAffectedRowId, pNewStandardCommId, p
var types = db.getColumnTypes("COMMUNICATION", cols);
//set current standard comm-record as non-standard
- var cond = SqlCondition.begin().and("STANDARD = 1").andPrepare("COMMUNICATION.RELATION_ID", pAffectedRowId);
+ var cond = SqlCondition.begin().and("STANDARD = 1").andPrepare("COMMUNICATION.CONTACT_ID", pAffectedRowId);
//mediumIds cannot be empty so no need to do further checks (this is checked above)
cond.and("MEDIUM_ID in (" + mediumIds.join(", ") + ")");
statements.push(["COMMUNICATION", cols, types, ["0"], cond.build()]);
@@ -63,7 +63,7 @@ CommUtil.setStandardForCategory = function(pAffectedRowId, pNewStandardCommId, p
//set the new standard comm-record
cond.clear();
//check communicationid, relId and medium to prevent data-inconsistency when bad function params are passed by (e.g communicationid of a different category)
- cond.andPrepare("COMMUNICATION.COMMUNICATIONID", pNewStandardCommId).andPrepare("COMMUNICATION.RELATION_ID", pAffectedRowId);
+ cond.andPrepare("COMMUNICATION.COMMUNICATIONID", pNewStandardCommId).andPrepare("COMMUNICATION.CONTACT_ID", pAffectedRowId);
cond.and("MEDIUM_ID in (" + mediumIds.join(", ") + ")");
statements.push(["COMMUNICATION", cols, types, ["1"], cond.build()]);
}
@@ -75,7 +75,7 @@ CommUtil.setStandardForCategory = function(pAffectedRowId, pNewStandardCommId, p
/**
* sets the standard PHONE-entry for COMMUNICATION
* does not verify if the COMMUNICATIONID you provide is actually PHONE-COMMUNICATION
- * @param {String} pAffectedRowId a refencial ID whoes COMMs should be modified (a RELATIONID)
+ * @param {String} pAffectedRowId a refencial ID whoes COMMs should be modified (a CONTACTID)
* @param {String} pNewStandardCommId COMMUNICATIONID of the new STANDARD comm-entry
* @return {null} currently returns always null; reserved for future
*/
@@ -87,7 +87,7 @@ CommUtil.setStandardPhone = function(pAffectedRowId, pNewStandardCommId)
/**
* sets the standard EMAIL-entry for COMMUNICATION
* does not verify if the COMMUNICATIONID you provide is actually EMAIL-COMMUNICATION
- * @param {String} pAffectedRowId a refencial ID whoes COMMs should be modified (a RELATIONID)
+ * @param {String} pAffectedRowId a refencial ID whoes COMMs should be modified (a CONTACTID)
* @param {String} pNewStandardCommId COMMUNICATIONID of the new STANDARD comm-entry
* @return {null} currently returns always null; reserved for future
*/
@@ -99,7 +99,7 @@ CommUtil.setStandardMail = function(pAffectedRowId, pNewStandardCommId)
/**
* returns a sub sql-string (without bracets) for getting the standard address of a COMMUNICATION
* @param {String} pCategory value of the keyword "COMMUNICATION.MEDIUM" custom.category; e.g. "PHONE"
- * @param {String|SqlCondition} [pRelationField=RELATION.RELATIONID] SQL-fieldname that shall be used for filtering the RELATION_ID, this can be a string(fieldname) or an SqlCondition object
+ * @param {String|SqlCondition} [pRelationField=CONTACT.CONTACTID] SQL-fieldname that shall be used for filtering the CONTACT_ID, this can be a string(fieldname) or an SqlCondition object
* @return {String} sub-sql
*/
CommUtil.getStandardSubSqlForCategory = function(pCategory, pRelationField)
@@ -109,9 +109,9 @@ CommUtil.getStandardSubSqlForCategory = function(pCategory, pRelationField)
var cond = SqlCondition.begin();
if (pRelationField == undefined)
- cond.and("COMMUNICATION.RELATION_ID = RELATION.RELATIONID");
+ cond.and("COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID");
else if (typeof(pRelationField) == "string")
- cond.andPrepare("COMMUNICATION.RELATION_ID", pRelationField);
+ cond.andPrepare("COMMUNICATION.CONTACT_ID", pRelationField);
else if (typeof(pRelationField) == "object")
{
//you may want to sepcify a concrete value
@@ -139,7 +139,7 @@ CommUtil.getStandardSubSqlForCategory = function(pCategory, pRelationField)
/**
* returns a sub sql-string (without bracets) for getting the standard address of a PHONE-COMMUNICATION
- * @param {String|SqlCondition} [pRelationField=RELATION.RELATIONID] SQL-fieldname that shall be used for filtering the RELATION_ID, this can be a string(fieldname) or an SqlCondition object
+ * @param {String|SqlCondition} [pRelationField=CONTACT.CONTACTID] SQL-fieldname that shall be used for filtering the CONTACT_ID, this can be a string(fieldname) or an SqlCondition object
* @return {String} sub-sql
*/
CommUtil.getStandardSubSqlPhone = function(pRelationField)
@@ -149,7 +149,7 @@ CommUtil.getStandardSubSqlPhone = function(pRelationField)
/**
* returns a sub sql-string (without bracets) for getting the standard address of a EMAIL-COMMUNICATION
- * @param {String|SqlCondition} [pRelationField=RELATION.RELATIONID] SQL-fieldname that shall be used for filtering the RELATION_ID, this can be a string(fieldname) or an SqlCondition object
+ * @param {String|SqlCondition} [pRelationField=CONTACT.CONTACTID] SQL-fieldname that shall be used for filtering the CONTACT_ID, this can be a string(fieldname) or an SqlCondition object
* @return {String} sub-sql
*/
CommUtil.getStandardSubSqlMail= function(pRelationField)
diff --git a/process/Relation_lib/Relation_lib.aod b/process/Contact_lib/Contact_lib.aod
similarity index 79%
rename from process/Relation_lib/Relation_lib.aod
rename to process/Contact_lib/Contact_lib.aod
index 730af257292e669e7934ef8a3118194d306f6f57..013ac727a88556d88c62495cd65122e465962918 100644
--- a/process/Relation_lib/Relation_lib.aod
+++ b/process/Contact_lib/Contact_lib.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.1.7">
- <name>Relation_lib</name>
+ <name>Contact_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Relation_lib/process.js</process>
+ <process>%aditoprj%/process/Contact_lib/process.js</process>
<variants>
<element>LIBRARY</element>
</variants>
diff --git a/process/Relation_lib/process.js b/process/Contact_lib/process.js
similarity index 60%
rename from process/Relation_lib/process.js
rename to process/Contact_lib/process.js
index 2a65298872406b227005bab3fca18d5a46c70192..7c171910ff19b8c0579f0957a134ab463e3f1e2e 100644
--- a/process/Relation_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -14,24 +14,24 @@ import("Context_lib");
function RelationUtils() {}
/**
- * Get the type of relation. <br>
- * In recordstate NEW or EDIT it loads the pers- / orgid from the db.<br>
+ * Get the type of contact. <br>
+ * In recordstate NEW or EDIT it loads the person- / orgid from the db.<br>
* But in the other states it uses the values pPersId, pOrgId directly (for performance).<br>
* <br>
* It only checks if pPersId / pOrgId are not empty. <br>
- * Based on which parameter is empty / not empty it return s the type of the relation. <br>
+ * Based on which parameter is empty / not empty it return s the type of the contact. <br>
* <br>
- * !!It does not check if the pers / org ids really exist!! <br>
- * !!And it does not check if really any relation with this pers / org ids exist!! <br>
+ * !!It does not check if the person / org ids really exist!! <br>
+ * !!And it does not check if really any contact with this person / org ids exist!! <br>
* <br>
* <br>
- * It is meant to be used by entitys, where you can load pers and org with the DataRecord. <br>
- * This saves an extra select from RELATION. <br>
+ * It is meant to be used by entitys, where you can load person and org with the DataRecord. <br>
+ * This saves an extra select from CONTACT. <br>
* <br>
* <br>
* @param {String} pRelationId
- * @param {String} pPersId selected from the RELATION table
- * @param {String} pOrgId selected from the RELATION table
+ * @param {String} pPersId selected from the CONTACT table
+ * @param {String} pOrgId selected from the CONTACT table
* <br>
* @return {Integer} <br>0 if both ids are empty <br>
* 1 if organisation <br>
@@ -51,8 +51,8 @@ RelationUtils.getRelationType = function(pRelationId, pPersId, pOrgId)
}
/**
- * get the type of relation for a relationId <br>
- * If you already have persId and orgId from the RELATION table, use getRelationTypeByPersOrg() <br>
+ * get the type of contact for a relationId <br>
+ * If you already have persId and orgId from the CONTACT table, use getRelationTypeByPersOrg() <br>
* @param {String} pRelationId
* <br>
* @return {Integer} 0 if relationId not found <br>
@@ -74,21 +74,21 @@ RelationUtils.getRelationTypeByRelation = function(pRelationId)
}
/**
- * Get the type of relation. <br>
+ * Get the type of contact. <br>
* It only checks if the parameters are not empty. <br>
- * Based on which parameter is empty / not empty it return s the type of the relation. <br>
+ * Based on which parameter is empty / not empty it return s the type of the contact. <br>
* <br>
- * !!It does not check if the pers / org ids really exist!! <br>
- * !!And it does not check if really any relation with this pers / org ids exist!! <br>
+ * !!It does not check if the person / org ids really exist!! <br>
+ * !!And it does not check if really any contact with this person / org ids exist!! <br>
* <br>
* This function is more performant than getRelationTypeByRelation, <br>
* because it doesn't load something from the db. <br>
* <br>
- * It is meant to be used by entitys, where you can load pers and org with the DataRecord. <br>
- * This saves an extra select from RELATION. <br>
+ * It is meant to be used by entitys, where you can load person and org with the DataRecord. <br>
+ * This saves an extra select from CONTACT. <br>
* <br>
- * @param {String} pPersId selected from the RELATION table
- * @param {String} pOrgId selected from the RELATION table
+ * @param {String} pPersId selected from the CONTACT table
+ * @param {String} pOrgId selected from the CONTACT table
* <br>
* @return {Integer} <br>0 if both ids are empty <br>
* 1 if organisation <br>
@@ -102,39 +102,39 @@ RelationUtils.getRelationTypeByPersOrg = function(pPersId, pOrgId)
if (!pOrgId) {
return 0; // both are empty
}
- return 1; // Organisation da PERS_ID leer
+ return 1; // Organisation da PERSON_ID leer
}
else
{
if (pOrgId.replace(/\s/g,"") == "0" )
{
- return 2; // Privatperson da PERS_ID nicht leer und ORGANISATION_ID.trim() = '0'
+ return 2; // Privatperson da PERSON_ID nicht leer und ORGANISATION_ID.trim() = '0'
}
else
{
- return 3; // Person einer Organisation da PERS_ID nicht leer und ORGANISATION_ID nicht '0'
+ return 3; // Person einer Organisation da PERSON_ID nicht leer und ORGANISATION_ID nicht '0'
}
}
}
/**
- * return the corresponding context of the relation
+ * return the corresponding context of the contact
*
* It only checks if the parameters are not empty. <br>
- * Based on which parameter is empty / not empty it return s the type of the relation. <br>
+ * Based on which parameter is empty / not empty it return s the type of the contact. <br>
* <br>
- * !!It does not check if the pers / org ids really exist!! <br>
- * !!And it does not check if really any relation with this pers / org ids exist!! <br>
+ * !!It does not check if the person / org ids really exist!! <br>
+ * !!And it does not check if really any contact with this person / org ids exist!! <br>
* <br>
* This function is more performant than getContextByRelationId, <br>
* because it doesn't load something from the db. <br>
* <br>
- * It is meant to be used by entitys, where you can load pers and org with the DataRecord. <br>
- * This saves an extra select from RELATION. <br>
+ * It is meant to be used by entitys, where you can load person and org with the DataRecord. <br>
+ * This saves an extra select from CONTACT. <br>
* <br>
*
- * @param {String} pPersId selected from the RELATION table
- * @param {String} pOrgId selected from the RELATION table
+ * @param {String} pPersId selected from the CONTACT table
+ * @param {String} pOrgId selected from the CONTACT table
*
* @return {String} contextname or "" if both ids are empty
*/
@@ -144,20 +144,20 @@ RelationUtils.getContextByPersOrg = function(pPersId, pOrgId)
{
case 1: // Org
return ContextUtils.getContextName("Organisation_context");
- case 2: // private Pers
- case 3: // Pers
- return ContextUtils.getContextName("Contact_context");
+ case 2: // private Person
+ case 3: // Person
+ return ContextUtils.getContextName("Person_context");
default:
return "";
}
}
/**
- * return the corresponding context of the relation <br>
- * If you already have persId and orgId from the RELATION table, use getContextByPersOrg() <br>
+ * return the corresponding context of the contact <br>
+ * If you already have persId and orgId from the CONTACT table, use getContextByPersOrg() <br>
*
* @param {String} pRelationId
- * @return {String} contextname or "" if relation not found
+ * @return {String} contextname or "" if contact not found
*/
RelationUtils.getContextByRelationId = function(pRelationId)
{
@@ -166,7 +166,7 @@ RelationUtils.getContextByRelationId = function(pRelationId)
}
/**
- * get the pers- and org-id from a relation as array
+ * get the person- and org-id from a contact as array
*
* @param {String} pRelationId
* @return {String[]} result as [persid, orgid] if one of them is null in the db, "" will be returned as the id.
@@ -176,8 +176,8 @@ RelationUtils.getPersOrgIds = function(pRelationId)
if (pRelationId) {
return db.array(db.ROW,
SqlCondition.begin()
- .andPrepare("RELATION.RELATIONID", pRelationId)
- .buildSql("select RELATIONID, PERS_ID, ORGANISATION_ID from RELATION", "1=0"));
+ .andPrepare("CONTACT.CONTACTID", pRelationId)
+ .buildSql("select CONTACTID, PERSON_ID, ORGANISATION_ID from CONTACT", "1=0"));
}
@@ -186,14 +186,14 @@ RelationUtils.getPersOrgIds = function(pRelationId)
/**
* get the name of the person or organisation
- * The parameters have to be selected from the same relation.
+ * The parameters have to be selected from the same contact.
*
- * @param {String} pPersId value of the pers_id selected from RELATION
- * @param {String} pOrgId value of the org_id selected from RELATION
- * @param {String} pPersFirstname value of the firstname selected from PERS
- * @param {String} pPersLastname value of the lastname selected from PERS
+ * @param {String} pPersId value of the person_id selected from CONTACT
+ * @param {String} pOrgId value of the org_id selected from CONTACT
+ * @param {String} pPersFirstname value of the firstname selected from PERSON
+ * @param {String} pPersLastname value of the lastname selected from PERSON
* @param {String} pOrgname value of the name selected from ORGANISATION
- * @param {String} [pTitle=undefined] value of the title selected from PERS. You can ommit this parameter if you do not want to append the title
+ * @param {String} [pTitle=undefined] value of the title selected from PERSON. You can ommit this parameter if you do not want to append the title
*
* @return {String} the name or ""
*/
@@ -208,8 +208,8 @@ RelationUtils.getNameByPersOrg = function(pPersId, pOrgId, pPersFirstname,
{
case 1: // Org
return pOrgname;
- case 2: // private Pers
- case 3: // Pers
+ case 2: // private Person
+ case 3: // Person
var name = "";
if (pTitle != undefined && pTitle)
@@ -225,7 +225,7 @@ RelationUtils.getNameByPersOrg = function(pPersId, pOrgId, pPersFirstname,
/**
* get the name of the person or organisation
*
- * @param {String} pRelationId the relation id
+ * @param {String} pRelationId the contact id
* @param {Boolean} [pTitle=false] also add the title for persons
*
* @return {String} the name or ""
@@ -234,8 +234,8 @@ RelationUtils.getNameByPersOrgWithRelationId = function(pRelationId, pTitle)
{
if (pRelationId) {
var data = db.array(db.ROW, SqlCondition.begin()
- .andPrepare("RELATION.RELATIONID", pRelationId)
- .buildSql("select RELATION.PERS_ID, RELATION.ORGANISATION_ID, PERS.FIRSTNAME, PERS.LASTNAME, PERS.TITLE, ORGANISATION.NAME from RELATION RELATION join ORGANISATION on ORGANISATION.ORGANISATIONID = RELATION.ORGANISATION_ID left join PERS on PERS.PERSID = RELATION.PERS_ID", "1 = 2"));
+ .andPrepare("CONTACT.CONTACTID", pRelationId)
+ .buildSql("select CONTACT.PERSON_ID, CONTACT.ORGANISATION_ID, PERSON.FIRSTNAME, PERSON.LASTNAME, PERSON.TITLE, ORGANISATION.NAME from CONTACT CONTACT join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID left join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID", "1 = 2"));
return RelationUtils.getNameByPersOrg(data[0], data[1], data[2], data[3], data[5], (pTitle ? data[4] : undefined));
}
@@ -244,19 +244,19 @@ RelationUtils.getNameByPersOrgWithRelationId = function(pRelationId, pTitle)
}
/**
- * returns the from string for the relation joined with org, pers, address
+ * returns the from string for the contact joined with org, person, address
*
* @return {String}
*/
RelationUtils.getFullRelationFromString = function()
{
- return " RELATION join ORGANISATION on ORGANISATION.ORGANISATIONID = RELATION.ORGANISATION_ID"
- + " left join PERS on PERS.PERSID = RELATION.PERS_ID"
- + " left join ADDRESS on ADDRESS.ADDRESSID = RELATION.ADDRESS_ID";
+ return " CONTACT join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID"
+ + " left join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID"
+ + " left join ADDRESS on ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID";
}
/**
- * returns the select string for the relation joined with org, pers, address
+ * returns the select string for the contact joined with org, person, address
*
* @param {String} pIdField field used as id
*
@@ -265,7 +265,7 @@ RelationUtils.getFullRelationFromString = function()
RelationUtils.getFullRelationSelectString = function(pIdField)
{
if(pIdField == undefined)
- pIdField = "RELATIONID";
+ pIdField = "CONTACTID";
var maskingUtils = new SqlMaskingUtils();
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index ea67ede99bb48f642cad5fd8d78803c5d8a62890..c5f2ed932ccfe0dcbe2657fa51340d9d61780a55 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -1,7 +1,6 @@
-import("system.logging");
import("system.project");
-import("system.SQLTYPES");
import("system.vars");
+import("system.SQLTYPES");
import("Sql_lib");
/**
@@ -36,6 +35,69 @@ ContextUtils.getContextName = function(pContextId)
return pContextId;
}
+/**
+ *
+ * @param {Boolean} [pFilter=false] filter only for contexts which have a mapping in ContextUtils._getSelectMap
+ *
+ * @return {String[][]} the contexts [[contextId, contextName, contextTitle], [... ], ...]
+ */
+ContextUtils.getContexts = function(pFilter)
+{
+ if (pFilter == undefined)
+ pFilter = false;
+
+ var contexts = project.getDataModels(project.DATAMODEL_KIND_CONTEXT);
+
+ if (pFilter)
+ {
+ contexts = contexts.filter(function(pContext)
+ {
+ // filter only contexts which have defined mappings in Context_lib
+ return ContextUtils._getSelectMap()[pContext[0]] != undefined;
+ });
+ }
+
+
+ return contexts.map(ContextUtils._contextDataMapping).sort(function(pContext1, pContext2)
+ {
+ // sort after ContextTitle
+ if (pContext1[2] > pContext2[2])
+ return 1;
+
+ if (pContext1[2] < pContext2[2])
+ return -1;
+
+ return 0;
+ });
+}
+
+/**
+ * get the data of a context
+ *
+ * @param {String} pContextId the id of the context
+ *
+ * @return {String[]} the contextdata [contextId, contextName, contextTitle]
+ */
+ContextUtils.getContext = function(pContextId)
+{
+ return ContextUtils._contextDataMapping(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, pContextId));
+}
+
+/**
+ * map the contextData from the system.project-lib to [contextId, contextName, contextTitle]
+ *
+ * @param {String[]} pContext the data of a context (e.g. from project.getDataModel())
+ *
+ * @return {String[]} the contextdata [contextId, contextName, contextTitle]
+ * @ignore
+ */
+ContextUtils._contextDataMapping = function(pContext)
+{
+ var contextName = ContextUtils.getContextName(pContext[0]);
+
+ return [pContext[0], contextName, (pContext[1] ? pContext[1] : contextName)];
+}
+
/**
* TODO: !!!temporary function until you can get fields from another Entity!!!
*/
@@ -45,7 +107,7 @@ ContextUtils._getSelectMap = function()
return {
// contextId nameField Tablename, IDField, isSystemAlias
"Organisation_context": ["\"NAME\"", "ORGANISATION", "ORGANISATIONID", false],
- "Contact_context": [maskingUtils.concat(["FIRSTNAME", "LASTNAME"]), "PERS", "PERSID", false],
+ "Person_context": [maskingUtils.concat(["FIRSTNAME", "LASTNAME"]), "PERSON", "PERSONID", false],
"Activity_context": ["SUBJECT", "ACTIVITY", "ACTIVITYID", false],
"Salesproject_context": [maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]), "SALESPROJECT", "SALESPROJECTID", false],
// TODO: keywords sind noch nicht in der DB somit gibt es nichts ähnliches zu getKeySQL.
@@ -84,7 +146,7 @@ ContextUtils.getNameSql = function(pContextId, pRowId)
}
/**
- * TODO: Evtl ein anderer Weg ohne hard gecodedeten Selects.
+ * TODO: !!!temporary function until you can get fields from another Entity!!!
*/
ContextUtils.getContextDataSql = function(pContextId, pRowId)
{
@@ -96,4 +158,4 @@ ContextUtils.getContextDataSql = function(pContextId, pRowId)
}
return cond.buildSql("select " + selectMap[pContextId][2] + ", " + selectMap[pContextId][0] + " from " + selectMap[pContextId][1], "1=1");
-}
\ No newline at end of file
+}
diff --git a/process/Entity_lib/process.js b/process/Entity_lib/process.js
index 50293fbada3f46619345b0d1d5eacbd9a560ad43..6db3b2deba0ad67d82b693ba8cd5e421a7f547d0 100644
--- a/process/Entity_lib/process.js
+++ b/process/Entity_lib/process.js
@@ -62,10 +62,10 @@ ProcessHandlingUtils.initialParamToResult = function(pParamVarName)
* // check the state like this:
* if (state == FieldChanges.STATE_CHANGED())
* // do something
- * PersUtils.setImage(vars.get("$field.PERSID"), value);
+ * PersUtils.setImage(vars.get("$field.PERSONID"), value);
* else
* // do something else
- * PersUtils.removeImage(vars.get("$field.PERSID"));
+ * PersUtils.removeImage(vars.get("$field.PERSONID"));
* });
*
* do not create an instance of this
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 326abe806d5c47af67f536995f12ffe424678148..3a609a2ca21d6a54bd6e4018b2c8095fe61e7730 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -27,7 +27,7 @@ $KeywordRegistry.get = {
ContractStatus: "ContractStatus",
ContractType: "ContractType",
ActivityDirection: "ActivityDirection",
- RelationStatus: "RelationStatus",
+ ContactStatus: "ContactStatus",
Currency: "Currency",
ProductGroupcode: "ProductGroupcode",
OfferStatus: "OfferStatus",
@@ -229,10 +229,10 @@ LanguageKeywordUtils.getResolvedTitleSqlPart = function(pDbFieldName, pLocale)
break;
case "ADDRESS.TYPE":
valueContainer = _createKeywordEntriesContainer([
- _createKeywordEntry("1", translate.text("Office address", locale), null, {org: true, pers: false})
- ,_createKeywordEntry("2", translate.text("Home address", locale), null, {org: false, pers: true})
- ,_createKeywordEntry("3", translate.text("Delivery address", locale), null, {org: true, pers: true})
- ,_createKeywordEntry("4", translate.text("Post office box", locale), null, {org: true, pers: true})
+ _createKeywordEntry("1", translate.text("Office address", locale), null, {org: true, person: false})
+ ,_createKeywordEntry("2", translate.text("Home address", locale), null, {org: false, person: true})
+ ,_createKeywordEntry("3", translate.text("Delivery address", locale), null, {org: true, person: true})
+ ,_createKeywordEntry("4", translate.text("Post office box", locale), null, {org: true, person: true})
]);
break;
case "GROUPCODE":
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index c7970114ea08dc90d94b04083bf1e871dc4abd11..c4af78a93e33b85be5760a2026ffe4d4c0da557a 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -251,7 +251,7 @@ ItemUtils.prototype.roundPrice = function(price) {
* @param {String} productId req UID of root product (selected product)
* @param {String} assignedTo opt UID of parent item
* @param {String} currency opt currency for price list to use
- * @param {String} relationId opt relationid for price list to use (custom price list)
+ * @param {String} relationId opt contactid for price list to use (custom price list)
* @param {String[][]} additionalProductInfo additional product info, which has to be copied from the product. (e.g. INFO field is only used by offer)
* has to be in the form: [["DESTINATION-DB-FIELD", "PRODUCT-DB-FIELD"], ...]
*
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 6e29c53f60058438770daa74b087e6db3c867f67..0396585e127d4a18b6e0b3bbfb937ef434d8df5e 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -73,7 +73,7 @@ OfferUtils.createNewOffer = function(pSalesprojectId, pRelationId)
params["SalesprojectId_param"] = pSalesprojectId;
if (pRelationId)
- params["RelationId_param"] = pRelationId;
+ params["ContactId_param"] = pRelationId;
neon.openContext("Offer_context", null, null, neon.OPERATINGSTATE_NEW, params);
}
@@ -92,7 +92,7 @@ OfferUtils.openOfferReport = function(pOfferID)
// get data from DB
// TODO: OFFER.ADDRESS
- var fields = [/*"OFFER.ADDRESS"*/ "''", "OFFER.RELATION_ID", "OFFER.LANGUAGE", /*"OFFER.PAYMENTTERMS"*/ "'DUMMY_OFFER.PAYMENTTERMS'", //0 - 3
+ var fields = [/*"OFFER.ADDRESS"*/ "''", "OFFER.CONTACT_ID", "OFFER.LANGUAGE", /*"OFFER.PAYMENTTERMS"*/ "'DUMMY_OFFER.PAYMENTTERMS'", //0 - 3
/*"OFFER.DELIVERYTERMS"*/ "'DUMMY_OFFER.DELIVERYTERMS'", "OFFER.OFFERCODE", "OFFER.CURRENCY", "OFFER.OFFERDATE", // 4 - 7
"OFFER.OFFERID", "OFFERITEM.OFFER_ID", "OFFERITEM.INFO", "OFFERITEM.ASSIGNEDTO", // 11
"OFFERITEM.PRODUCT_ID","OFFERITEM.ITEMNAME" , // 13
@@ -198,8 +198,8 @@ OfferUtils.openOfferReport = function(pOfferID)
var adma = ""
/*var adm = getAddressData( [GetAttributeKey( "Aussendienst", "1", orgrelid, pUser )[0]],
[["Person","function", "concat( ['SALUTATION', 'TITLE', 'FIRSTNAME','LASTNAME'])"],
- ["Telefon", "function", "getCommAddrSQL('Telefon', 'RELATION.RELATIONID')"],
- ["Email", "function", "getCommAddrSQL('E-Mail', 'RELATION.RELATIONID')"]
+ ["Telefon", "function", "getCommAddrSQL('Telefon', 'CONTACT.CONTACTID')"],
+ ["Email", "function", "getCommAddrSQL('E-Mail', 'CONTACT.CONTACTID')"]
] );
var adma = "";
if (adm[1] != undefined) adma = adm[1].join("\n");*/
@@ -309,4 +309,4 @@ OfferItemUtils.prototype.reOrgItems = function() {
this.initItemTree();
ItemUtils.prototype.reOrgItems.apply(this);
-}
\ No newline at end of file
+}
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index 002de28e87aac674ebd2437dfbb118b59fa3f840..88cfa08fd4d7979c1442c1caeb28a0a3a2e6ceaa 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -72,7 +72,7 @@ OrderUtils.createNewOrder = function(pSalesprojectId, pRelationId)
params["SalesprojectId_param"] = pSalesprojectId;
if (pRelationId)
- params["RelationId_param"] = pRelationId;
+ params["ContactId_param"] = pRelationId;
neon.openContext("Order_context", null, neon.OPERATINGSTATE_NEW, params);
}
diff --git a/process/Organisation_lib/process.js b/process/Organisation_lib/process.js
index 661626657f0170d114d181d38fd5dbc9acb7ca9a..9816a157cb98eb7f7baadd145e729edc37f7466e 100644
--- a/process/Organisation_lib/process.js
+++ b/process/Organisation_lib/process.js
@@ -67,7 +67,7 @@ OrgUtils.openOrgReport = function(pOrgId)
//communication data of the organization
var commSql = "select MEDIUM_ID, ADDR from COMMUNICATION";
commSql = SqlCondition.begin()
- .andPrepare("COMMUNICATION.RELATION_ID", relationId)
+ .andPrepare("COMMUNICATION.CONTACT_ID", relationId)
.and("STANDARD = 1")
.buildSql(commSql);
var commData = db.table(commSql);
@@ -81,12 +81,12 @@ OrgUtils.openOrgReport = function(pOrgId)
//select people from the organization
//TODO: Position und Abteilung fehlen noch
- var persSql = "select SALUTATION, TITLE, FIRSTNAME, LASTNAME, '', '', '', ORGANISATION_ID, RELATIONID"
- + " from PERS join RELATION on PERSID = PERS_ID";
+ var persSql = "select SALUTATION, TITLE, FIRSTNAME, LASTNAME, '', '', '', ORGANISATION_ID, CONTACTID"
+ + " from PERSON join CONTACT on PERSONID = PERSON_ID";
persSql = SqlCondition.begin()
- .andPrepare("RELATION.ORGANISATION_ID", pOrgId)
- .and("RELATION.STATUS = 'BSIC0rel-stat-actv-ae03-b6b04430e90b'") //TODO: replace this with something that isn't a hard coded id
- .buildSql(persSql, "", " order by PERS.LASTNAME asc");
+ .andPrepare("CONTACT.ORGANISATION_ID", pOrgId)
+ .and("CONTACT.STATUS = 'BSIC0rel-stat-actv-ae03-b6b04430e90b'") //TODO: replace this with something that isn't a hard coded id
+ .buildSql(persSql, "", " order by PERSON.LASTNAME asc");
var persData = db.table(persSql);
//TODO: get the keywords in another way when keywords are entitys
@@ -104,7 +104,7 @@ OrgUtils.openOrgReport = function(pOrgId)
//select the contact info for every person for phone and mail
var persCommSql = "select MEDIUM_ID, ADDR from COMMUNICATION";
persCommSql = SqlCondition.begin()
- .andPrepare("COMMUNICATION.RELATION_ID", persData[i][5])
+ .andPrepare("COMMUNICATION.CONTACT_ID", persData[i][5])
.and("MEDIUM_ID in (" + mediumIds + ")")
.and("STANDARD = 1")
.buildSql(persCommSql);
@@ -117,14 +117,14 @@ OrgUtils.openOrgReport = function(pOrgId)
}
).join("\n");
}
- persData = ReportData.begin(["PERSNAMECOMPLETE", "PERSFUNCTION", "PERSDEPARTMENT", "PERSCOMM", "ORGANISATION_ID", "RELATION_ID"]).add(persData);
+ persData = ReportData.begin(["PERSNAMECOMPLETE", "PERSFUNCTION", "PERSDEPARTMENT", "PERSCOMM", "ORGANISATION_ID", "CONTACT_ID"]).add(persData);
var histSql = "select ENTRYDATE, CATEGORY, FIRSTNAME, LASTNAME, INFO from ACTIVITY "
+ " join ACTIVITYLINK on ACTIVITYLINK.ACTIVITY_ID = ACTIVITYID "
- + " join RELATION on ACTIVITYLINK.OBJECT_ROWID = RELATIONID"
- + " left join PERS on RELATION.PERS_ID = PERSID";
+ + " join CONTACT on ACTIVITYLINK.OBJECT_ROWID = CONTACTID"
+ + " left join PERSON on CONTACT.PERSON_ID = PERSONID";
histSql = SqlCondition.begin()
- .andPrepare("RELATION.ORGANISATION_ID", pOrgId) //= all activities linked to the organization or an employee
+ .andPrepare("CONTACT.ORGANISATION_ID", pOrgId) //= all activities linked to the organization or an employee
.buildSql(histSql, "", "order by ENTRYDATE desc");
var histData = db.table(histSql);
@@ -142,10 +142,10 @@ OrgUtils.openOrgReport = function(pOrgId)
//tasks
var taskSql = "select TASK.SUBJECT, TASK.DESCRIPTION, TASK.STATUS, FIRSTNAME, LASTNAME from TASK"
- + " join RELATION on EDITOR_RELATION_ID = RELATIONID"
- + " left join PERS on RELATION.PERS_ID = PERSID";
+ + " join CONTACT on EDITOR_CONTACT_ID = CONTACTID"
+ + " left join PERSON on CONTACT.PERSON_ID = PERSONID";
taskSql = SqlCondition.begin()
- .andPrepare("RELATION.ORGANISATION_ID", pOrgId)
+ .andPrepare("CONTACT.ORGANISATION_ID", pOrgId)
.buildSql(taskSql);
var taskData = db.table(taskSql);
diff --git a/process/Pers_lib/Pers_lib.aod b/process/Person_lib/Person_lib.aod
similarity index 81%
rename from process/Pers_lib/Pers_lib.aod
rename to process/Person_lib/Person_lib.aod
index 65777bc1ae60fb02a0de851f1bf7c7272fb9959c..3cfa91d3762b3abe21066b825c1c58670d84267f 100644
--- a/process/Pers_lib/Pers_lib.aod
+++ b/process/Person_lib/Person_lib.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.1.7">
- <name>Pers_lib</name>
+ <name>Person_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Pers_lib/process.js</process>
+ <process>%aditoprj%/process/Person_lib/process.js</process>
<alias>_____SYSTEMALIAS</alias>
<variants>
<element>LIBRARY</element>
diff --git a/process/Pers_lib/process.js b/process/Person_lib/process.js
similarity index 70%
rename from process/Pers_lib/process.js
rename to process/Person_lib/process.js
index 4f303c61be5c4e4c234a1d17390c989dfc1e56ec..cf9ec5340300401943c8b160765b6bfda3b24c31 100644
--- a/process/Pers_lib/process.js
+++ b/process/Person_lib/process.js
@@ -3,7 +3,7 @@ import("Binary_lib");
import("Sql_lib");
/**
- * a static Utility class for the Pers context.
+ * a static Utility class for the Person context.
*
* Do not create an instance of this!
* @class
@@ -19,7 +19,7 @@ function PersUtils() {}
*/
PersUtils.getImage = function(pPersId, pDefaultText)
{
- return ImageUtils.get("PERS", "IMAGE", pPersId, pDefaultText);
+ return ImageUtils.get("PERSON", "IMAGE", pPersId, pDefaultText);
}
/**
@@ -31,7 +31,7 @@ PersUtils.getImage = function(pPersId, pDefaultText)
*/
PersUtils.setImage = function(pPersId, pImageDateBase64)
{
- return ImageUtils.set("PERS", "IMAGE", pPersId, pImageDateBase64, "ProfileImage", "Image of the profile");
+ return ImageUtils.set("PERSON", "IMAGE", pPersId, pImageDateBase64, "ProfileImage", "Image of the profile");
}
/**
@@ -42,7 +42,7 @@ PersUtils.setImage = function(pPersId, pImageDateBase64)
*/
PersUtils.removeImage = function(pPersId)
{
- return ImageUtils.remove("PERS", "IMAGE", pPersId);
+ return ImageUtils.remove("PERSON", "IMAGE", pPersId);
}
/**
@@ -50,14 +50,14 @@ PersUtils.removeImage = function(pPersId)
* useful for example in an displayValue-expression to resolave a references (which is chosen by Lookups)
* does not validate if pRelationIdField exists or is a valid or harmful value
*
- * @param {String} pRelationIdField fieldname for the RELATIONID-condition as TABLEALIAS.COLUMNALIAS; e.g. TASK.EDITOR_RELATION_ID
+ * @param {String} pRelationIdField fieldname for the CONTACTID-condition as TABLEALIAS.COLUMNALIAS; e.g. TASK.EDITOR_CONTACT_ID
* @return {String} a subsql (without bracets) that can be played within an SQL
*/
PersUtils.getResolvingDisplaySubSql = function(pRelationIdField)
{
var maskingHelper = new SqlMaskingUtils();
//TODO: verify if there is a better solution for the usage of this as a displayValueExpression
- return "select " + maskingHelper.concat(["PERS.FIRSTNAME", "PERS.LASTNAME"]) + "from PERS \n\
- join RELATION on (PERS.PERSID = RELATION.PERS_ID) \n\
- where RELATION.RELATIONID = " + pRelationIdField;
+ return "select " + maskingHelper.concat(["PERSON.FIRSTNAME", "PERSON.LASTNAME"]) + "from PERSON \n\
+ join CONTACT on (PERSON.PERSONID = CONTACT.PERSON_ID) \n\
+ where CONTACT.CONTACTID = " + pRelationIdField;
}
\ No newline at end of file
diff --git a/process/PostalAddress_lib/process.js b/process/PostalAddress_lib/process.js
index 2b1af44bc5e87883f30ed08532760c9918049903..2cf3d815717294418fe8642b9e1895ed5025e054 100644
--- a/process/PostalAddress_lib/process.js
+++ b/process/PostalAddress_lib/process.js
@@ -1,6 +1,6 @@
import("system.db");
import("Sql_lib");
-import("Relation_lib");
+import("Contact_lib");
import("Keyword_lib");
/**
* Methods for addresses.
@@ -39,14 +39,14 @@ AddressUtils.formatOneline = function (pCountry, pAddressLine, pBuildingNo, pZip
};
/**
- * Returns the formatted standard address for the relation.
+ * Returns the formatted standard address for the contact.
*
* TODO: Dummy method! Ãœbernahme der Adresslib aus altem Basic
*
* @return {String}
*/
AddressUtils.getAddress = function(pRelationId) {
- var address = db.array(db.ROW, SqlCondition.begin().andPrepare("RELATION.RELATIONID", pRelationId).buildSql('select RELATIONID, ADDRESS, BUILDINGNO, ZIP, CITY, "NAME", FIRSTNAME, LASTNAME, TITLE from' + RelationUtils.getFullRelationFromString(), "1=0"));
+ var address = db.array(db.ROW, SqlCondition.begin().andPrepare("CONTACT.CONTACTID", pRelationId).buildSql('select CONTACTID, ADDRESS, BUILDINGNO, ZIP, CITY, "NAME", FIRSTNAME, LASTNAME, TITLE from' + RelationUtils.getFullRelationFromString(), "1=0"));
// TODO: currently there are some relations without standard address. Use Hardcoded one.
if (!address[1]) {
@@ -72,12 +72,12 @@ AddressUtils.getAddress = function(pRelationId) {
AddressUtils.getAddressById = function(pAddressId) {
var address = db.array(db.ROW, SqlCondition.begin()
.andPrepare("ADDRESS.ADDRESSID", pAddressId)
- .buildSql("select RELATION_ID, ADDRESS, BUILDINGNO, ZIP, CITY from "
+ .buildSql("select CONTACT_ID, ADDRESS, BUILDINGNO, ZIP, CITY from "
+ "ADDRESS", "1=0"));
// TODO: currently there are some relations without standard address. Use Hardcoded one.
if (!address[1]) {
- var dummyAddress = db.array(db.ROW, SqlCondition.begin().andPrepare("ADDRESS.ADDRESSID", '97d37aea-d7f8-4436-bb31-875439f5f7f1').buildSql('select RELATION_ID, ADDRESS, BUILDINGNO, ZIP, CITY from ADDRESS', "1=0"));
+ var dummyAddress = db.array(db.ROW, SqlCondition.begin().andPrepare("ADDRESS.ADDRESSID", '97d37aea-d7f8-4436-bb31-875439f5f7f1').buildSql('select CONTACT_ID, ADDRESS, BUILDINGNO, ZIP, CITY from ADDRESS', "1=0"));
address[0] = dummyAddress[0];
address[1] = dummyAddress[1];
address[2] = dummyAddress[2];
@@ -88,8 +88,8 @@ AddressUtils.getAddressById = function(pAddressId) {
var type = RelationUtils.getRelationTypeByRelation(address[0]);
var names = db.array(db.ROW, SqlCondition.begin()
- .andPrepare("RELATION.RELATIONID", address[0])
- .buildSql("select ORGANISATION.NAME, FIRSTNAME, LASTNAME, TITLE from RELATION left join PERS on PERSID = PERS_ID left join ORGANISATION on ORGANISATIONID = ORGANISATION_ID"
+ .andPrepare("CONTACT.CONTACTID", address[0])
+ .buildSql("select ORGANISATION.NAME, FIRSTNAME, LASTNAME, TITLE from CONTACT left join PERSON on PERSONID = PERSON_ID left join ORGANISATION on ORGANISATIONID = ORGANISATION_ID"
, "1=0"));
return AddressUtils.formatAddress(type, address[1], address[2], address[3], address[4], names[0], names[1], names[2], names[3]);
}
@@ -126,15 +126,15 @@ AddressUtils.formatAddress = function(pAddrType, pAddress, pBuildingno, pZip, pC
}
/**
- * Returns the formatted addresses for the relation.
+ * Returns the formatted addresses for the contact.
*
* TODO: Dummy method! Ãœbernahme der Adresslib aus altem Basic
*
* @return {String}
*/
AddressUtils.getAllPossibleAddresses = function(pRelationId) {
- var addresses = db.table(SqlCondition.begin().andPrepare("RELATION.RELATIONID", pRelationId)
- .buildSql("select ADDRESSID, ADDR_TYPE, ADDRIDENTIFIER from ADDRESS join RELATION on RELATIONID = RELATION_ID or RELATION_ID = ORGANISATION_ID", "1=0"));
+ var addresses = db.table(SqlCondition.begin().andPrepare("CONTACT.CONTACTID", pRelationId)
+ .buildSql("select ADDRESSID, ADDR_TYPE, ADDRIDENTIFIER from ADDRESS join CONTACT on CONTACTID = CONTACT_ID or CONTACT_ID = ORGANISATION_ID", "1=0"));
return addresses.map(function(pAddress) {
return [pAddress[0], KeywordUtils.get("ADDRESS.TYPE", pAddress[1])[1] + " " + pAddress[2]]
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 9287e1b4bbb3b52629d4ca541d6daf888b8e4520..dac426957e4c40b1c8ca842b7362f3fdb98c280d 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -93,7 +93,7 @@ ProductUtils.getStockCount = function(pid) {
* @example //Product_entity, Field: PRODUCT_ID, Process: onValueChange
* var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"));
* var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- * var relid = vars.exists("$param.RelationId_param") ? vars.get("$param.RelationId_param") : "";
+ * var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
* var pUtils = new ProductUtils();
* var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), relationId: relid };
* var ProductDetails = pUtils.getProductDetails(pid, PriceListFilter, ["INFO"]);
@@ -105,7 +105,7 @@ ProductUtils.getStockCount = function(pid) {
* , unit: "keyvalue of keyword 'UNIT'" <br>
* , PriceLists: {$pricelistid$ { <br>
* priceListId: "pricelistid" <br>
- * , relationId: "relationid" when filled -> custom price list <br>
+ * , relationId: "contactid" when filled -> custom price list <br>
* , priceList: "keyvalue of keyword 'PRICELIST'" <br>
* , price: "price" <br>
* , vat: "vat" <br>
@@ -117,7 +117,7 @@ ProductUtils.getStockCount = function(pid) {
* } } <br>
* , CurrentValidPriceLists: {$pricelistid$ { <br>
* priceListId: "pricelistid" <br>
- * , relationId: "relationid" when filled -> custom price list <br>
+ * , relationId: "contactid" when filled -> custom price list <br>
* , priceList: "keyvalue of keyword 'PRICELIST'" <br>
* , price: "price" <br>
* , vat: "vat" <br>
@@ -129,7 +129,7 @@ ProductUtils.getStockCount = function(pid) {
* } } <br>
* , PriceListToUse: {$pricelistid$ { <br>
* priceListId: "pricelistid" <br>
- * , relationId: "relationid" when filled -> custom price list <br>
+ * , relationId: "contactid" when filled -> custom price list <br>
* , priceList: "keyvalue of keyword 'PRICELIST'" <br>
* , price: "price" <br>
* , vat: "vat" <br>
@@ -158,7 +158,7 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
var orderby = ["PRODUCTID"];
//PriceList (all)
- var colsPricelistAll = ["allPP.PRODUCTPRICEID", "allPP.RELATION_ID", "allPP.PRICELIST", "allPP.PRICE", "allPP.VAT"
+ var colsPricelistAll = ["allPP.PRODUCTPRICEID", "allPP.CONTACT_ID", "allPP.PRICELIST", "allPP.PRICE", "allPP.VAT"
, "allPP.VALID_FROM", "allPP.VALID_TO", "allPP.BUYSELL", "allPP.FROMQUANTITY", "allPP.CURRENCY"];
cols = cols.concat(colsPricelistAll);
@@ -171,7 +171,7 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
&& priceListFilter.quantity != undefined && priceListFilter.quantity != "")
{
validPriceLists = true;
- var colsPricelistValid = ["validPP.PRODUCTPRICEID", "validPP.RELATION_ID", "validPP.PRICELIST", "validPP.PRICE", "validPP.VAT"
+ var colsPricelistValid = ["validPP.PRODUCTPRICEID", "validPP.CONTACT_ID", "validPP.PRICELIST", "validPP.PRICE", "validPP.VAT"
, "validPP.VALID_FROM", "validPP.VALID_TO", "validPP.BUYSELL", "validPP.FROMQUANTITY", "validPP.CURRENCY"];
cols = cols.concat(colsPricelistValid);
@@ -182,9 +182,9 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
.andPrepare(["PRODUCTPRICE", "VALID_FROM", "validPP"], datetime.date().toString(), "# <= ?")
.andPrepare(["PRODUCTPRICE", "FROMQUANTITY", "validPP"], priceListFilter.quantity, "# <= ?")
.andSqlCondition(SqlCondition.begin()
- .orPrepare(["PRODUCTPRICE", "RELATION_ID", "validPP"], priceListFilter.relationId, "# <= ?")
+ .orPrepare(["PRODUCTPRICE", "CONTACT_ID", "validPP"], priceListFilter.relationId, "# <= ?")
.orSqlCondition(SqlCondition.begin()
- .and("validPP.RELATION_ID is null")
+ .and("validPP.CONTACT_ID is null")
.andPrepare(["PRODUCTPRICE", "BUYSELL", "validPP"], 'SP'),
"1 = 2"),
"1 = 2")
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 679a0b686a08b376bc36d007a4d3869264d5958e..2e8ad26e765ecbd062a20815ea406085d497c024 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -262,7 +262,7 @@ SqlCondition.prototype.build = function(alternativeCond) {
/**
* ready to use prepared select
- * @param {String} pBeforeCondition Part of the sql before the condition without where (e.g. "select FIRSTNAME from PERS")
+ * @param {String} pBeforeCondition Part of the sql before the condition without where (e.g. "select FIRSTNAME from PERSON")
* @param {String} [pAlternativeCond=""] Condition that is returned when nothing has been appended.
* @param {String} [pAfterCondition=""] Part of the sql after the condition (e.g. "order by FIRSTNAME").
* @param {Boolean} [pWithWere=true] true if where should be added to the bginning
@@ -282,7 +282,7 @@ SqlCondition.prototype.buildSql = function(pBeforeCondition, pAlternativeCond, p
/**
* Check if (adito-)variable exists and vars.getString is not empty
- * @param {String} variable the variable name (e.g. "$field.RELATION_ID")
+ * @param {String} variable the variable name (e.g. "$field.CONTACT_ID")
* @return {String | Boolean} The value of the field as string OR false if it doesn't exist.
*
* @ignore
@@ -1137,7 +1137,7 @@ SqlUtils.getSystemAlias = function()
* Single conditions are concatenated with OR, which can be devastating for performance!
*
* @param {String} pFieldname req name of the field with table alias
- * z.B ORGREL.RELATIONID
+ * z.B ORGREL.CONTACTID
* @param {String[]|String[][]} pData req Data as ID Array
* @param {String} pQuoteSymbol opt symbol for quoting values,
* Strings i.e.: ' default is no symbol
diff --git a/report/RPTJ_OFFER/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js b/report/RPTJ_OFFER/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
index af1a6e61109a4fabc99cb1270a993aa1dad14ca3..475d8abf9eb731b6a8830bb7e81bab59abc81fb9 100644
--- a/report/RPTJ_OFFER/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
+++ b/report/RPTJ_OFFER/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
@@ -7,34 +7,34 @@ import("system.db");
import("lib_email");
var details = vars.get("$global.RptOfferOrderDetails");
-var orgid = db.cell("select ORGANISATION_ID from RELATION where RELATIONID = '" + details[1] + "'");
+var orgid = db.cell("select ORGANISATION_ID from CONTACT where CONTACTID = '" + details[1] + "'");
if (orgid.substr(0, 2) == '0 ') // Privatperson
{
- var count = db.cell("select count(*) from COMMUNICATION where medium_id = 3 and STANDARD = 1 and RELATION_ID = '" + details[1] + "'");
+ var count = db.cell("select count(*) from COMMUNICATION where medium_id = 3 and STANDARD = 1 and CONTACT_ID = '" + details[1] + "'");
if (count == "0") question.showMessage(translate.text("no standard email office"));
else
sendAutoMail( translate.text("Offer") + " " + details[0], details[1], "Email_Angebot", details[2], "AGB", [], [["SPNR", details[5]]] );
}
else // Funktion - Person in Firma
{
- var orgrelid = db.cell("select RELATIONID from RELATION where ORGANISATION_ID = '" + orgid + "'");
- var relobjid = db.array(db.COLUMN, "select ORGANISATION_ID from OBJECTRELATION join RELATION on RELATIONID = DEST_ID where SOURCE_ID = '" + orgrelid + "' and RELVALUE = 9");
- relationid = db.array(db.COLUMN, "select RELATIONID from RELATION left join PERS on PERSID = PERS_ID"
- + " where RELATION.STATUS = 1 and ORGANISATION_ID in ('" + orgid + "', '" + relobjid.join("','") + "')");
+ var orgrelid = db.cell("select CONTACTID from CONTACT where ORGANISATION_ID = '" + orgid + "'");
+ var relobjid = db.array(db.COLUMN, "select ORGANISATION_ID from OBJECTRELATION join CONTACT on CONTACTID = DEST_ID where SOURCE_ID = '" + orgrelid + "' and RELVALUE = 9");
+ contactid = db.array(db.COLUMN, "select CONTACTID from CONTACT left join PERSON on PERSONID = PERSON_ID"
+ + " where CONTACT.STATUS = 1 and ORGANISATION_ID in ('" + orgid + "', '" + relobjid.join("','") + "')");
- vars.set("$local.relids", "'" + relationid.join("','") + "'");
- vars.set("$local.cmb_pers_to", details[1]); //Empfänger vorbelegen
- relationid = swing.askUserQuestion("Email", "DLG_CHOOSE_PERS_FOREMAIL")
- if ( relationid == null ) relationid = ""; //Abbruch geklickt
+ vars.set("$local.relids", "'" + contactid.join("','") + "'");
+ vars.set("$local.cmb_person_to", details[1]); //Empfänger vorbelegen
+ contactid = swing.askUserQuestion("Email", "DLG_CHOOSE_PERSON_FOREMAIL")
+ if ( contactid == null ) contactid = ""; //Abbruch geklickt
else
{
- var reltoid = relationid["DLG_CHOOSE_PERS_FOREMAIL.cmb_pers_to"];
+ var reltoid = contactid["DLG_CHOOSE_PERSON_FOREMAIL.cmb_person_to"];
- var relccid = text.decodeMS(relationid["DLG_CHOOSE_PERS_FOREMAIL.tbl_pers_cc"]);
- if (relccid.length == 0) relationid = ""; // keine Person markiert und OK geklickt
+ var relccid = text.decodeMS(contactid["DLG_CHOOSE_PERSON_FOREMAIL.tbl_person_cc"]);
+ if (relccid.length == 0) contactid = ""; // keine Person markiert und OK geklickt
else
relccid = db.array(db.COLUMN, "select ADDR from COMMUNICATION where MEDIUM_ID = 3 and STANDARD = 1 and "
- + "RELATION_ID in ('" + relccid.join("','") + "') and RELATION_ID <> '" + reltoid + "'");
+ + "CONTACT_ID in ('" + relccid.join("','") + "') and CONTACT_ID <> '" + reltoid + "'");
if ( reltoid != "" )
sendAutoMail( translate.text(details[3]) + " " + details[0], reltoid, "Email_" + details[3], details[2], "AGB", relccid, [["SPNR", details[5]]] );
diff --git a/report/RPTJ_ORGANISATION/Kommunikationsdaten.jrxml b/report/RPTJ_ORGANISATION/Kommunikationsdaten.jrxml
index d70207eb1b858513514ff568cdb485179d3de7a1..ca032c564f9ba7573fa0d3b22177bf97441ac4d6 100644
--- a/report/RPTJ_ORGANISATION/Kommunikationsdaten.jrxml
+++ b/report/RPTJ_ORGANISATION/Kommunikationsdaten.jrxml
@@ -7,7 +7,7 @@
<field name="COMMVALUE" class="java.lang.String"/>
<field name="CLIENTID" class="java.lang.String"/>
<field name="ORGANISATION_ID" class="java.lang.String"/>
- <field name="RELATION_ID" class="java.lang.String"/>
+ <field name="CONTACT_ID" class="java.lang.String"/>
<field name="COMMDATA" class="java.lang.String"/>
<background>
<band splitType="Stretch"/>
diff --git a/report/RPTJ_ORGANISATION/Kontaktpersonen.jrxml b/report/RPTJ_ORGANISATION/Kontaktpersonen.jrxml
index 11897cc66b9bb2ad0ac48cce40d78145893f323e..8ba836d4e48f2a5c809b2d06ea136d8c5d61cfac 100644
--- a/report/RPTJ_ORGANISATION/Kontaktpersonen.jrxml
+++ b/report/RPTJ_ORGANISATION/Kontaktpersonen.jrxml
@@ -9,7 +9,7 @@
<field name="PERSCOMM" class="java.lang.String"/>
<field name="CLIENTID" class="java.lang.String"/>
<field name="ORGANISATION_ID" class="java.lang.String"/>
- <field name="RELATION_ID" class="java.lang.String"/>
+ <field name="CONTACT_ID" class="java.lang.String"/>
<field name="COMMDATA" class="java.lang.String"/>
<background>
<band splitType="Stretch"/>