diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index dfe508af72be3244892f474f446910a0f5832f00..8727d11ea5bb9cc29c5cbf56ed56f3a591bc25a2 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4795,7 +4795,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>SORT</name>
+ <name>SIDE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index cea808a642b701fa7f04eeb4d76db3117184b929..894976d12c5f1c0338817572adf59eba7910e187 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -150,6 +150,7 @@
</entityField>
<entityField>
<name>mySide</name>
+ <description>Is always the side the current Object (from the parameters) is in the currently selected ObjectRelationType</description>
</entityField>
<entityField>
<name>OBJECT1_TYPE</name>
diff --git a/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/onValueChange.js b/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/onValueChange.js
index 125033435a710f0001371f6110c266e08508be6e..0154c7d4a2a3a404ca83c2ec00078ea563ff425d 100644
--- a/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/onValueChange.js
+++ b/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/onValueChange.js
@@ -10,14 +10,14 @@ selectedObjectRelationTypeId = ProcessHandlingUtils.getOnValidationValue(selecte
var relationTypeData = db.array(db.ROW, SqlCondition.begin()
.andPrepare("AB_OBJECTRELATIONTYPE.AB_OBJECTRELATIONTYPEID", selectedObjectRelationTypeId)
- .buildSql("select AB_OBJECTRELATIONTYPEID, OBJECT_TYPE, RELATION_TITLE, RELATION_TYPE, SORT from AB_OBJECTRELATIONTYPE", "1=2"));
+ .buildSql("select AB_OBJECTRELATIONTYPEID, OBJECT_TYPE, RELATION_TITLE, RELATION_TYPE, SIDE from AB_OBJECTRELATIONTYPE", "1=2"));
if (relationTypeData[0])
{
var otherRelationTypeData = db.array(db.ROW, SqlCondition.begin()
.andPrepare("AB_OBJECTRELATIONTYPE.RELATION_TYPE", relationTypeData[3])
- .andPrepare("AB_OBJECTRELATIONTYPE.SORT", (relationTypeData[4] == "1" ? "2" : "1"))
- .buildSql("select AB_OBJECTRELATIONTYPEID, OBJECT_TYPE, RELATION_TITLE, RELATION_TYPE, SORT from AB_OBJECTRELATIONTYPE", "1=2"))
+ .andPrepare("AB_OBJECTRELATIONTYPE.SIDE", (relationTypeData[4] == "1" ? "2" : "1"))
+ .buildSql("select AB_OBJECTRELATIONTYPEID, OBJECT_TYPE, RELATION_TITLE, RELATION_TYPE, SIDE from AB_OBJECTRELATIONTYPE", "1=2"))
if (!otherRelationTypeData[0])
{
otherRelationTypeData = relationTypeData;
diff --git a/others/db_changes/data_alias/basic/2019.2/add_ObjectRelation_type.xml b/others/db_changes/data_alias/basic/2019.2/add_ObjectRelation_type.xml
index 7f09c1e54959b0d76adda8c850a8ade932ffab6b..1fe970cb978fa75867033eedcd40729919b23316 100644
--- a/others/db_changes/data_alias/basic/2019.2/add_ObjectRelation_type.xml
+++ b/others/db_changes/data_alias/basic/2019.2/add_ObjectRelation_type.xml
@@ -14,7 +14,7 @@
<column name="RELATION_TYPE" type="CHAR(36)">
<constraints nullable="false"/>
</column>
- <column name="SORT" type="INTEGER">
+ <column name="SIDE" type="INTEGER">
<constraints nullable="false"/>
</column>
</createTable>
@@ -37,14 +37,14 @@
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="RELATION_TITLE" value="parent company"/>
<column name="RELATION_TYPE" value="a054875d-b9a2-499d-877b-ccec31358324"/>
- <column name="SORT" valueNumeric="1"/>
+ <column name="SIDE" valueNumeric="1"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="RELATION_TITLE" value="subsidiary"/>
<column name="RELATION_TYPE" value="a054875d-b9a2-499d-877b-ccec31358324"/>
- <column name="SORT" valueNumeric="2"/>
+ <column name="SIDE" valueNumeric="2"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -52,14 +52,14 @@
<column name="OBJECT_TYPE" value="Person"/><!-- TODO: use Private, Private -->
<column name="RELATION_TITLE" value="parent of"/>
<column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
- <column name="SORT" valueNumeric="1"/>
+ <column name="SIDE" valueNumeric="1"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
<column name="OBJECT_TYPE" value="Person"/><!-- TODO: use Private, Private -->
<column name="RELATION_TITLE" value="child of"/>
<column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
- <column name="SORT" valueNumeric="2"/>
+ <column name="SIDE" valueNumeric="2"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -67,14 +67,14 @@
<column name="OBJECT_TYPE" value="Person"/>
<column name="RELATION_TITLE" value="supports"/>
<column name="RELATION_TYPE" value="5ab4d256-4220-4c28-88d6-1db01e2f4667"/>
- <column name="SORT" valueNumeric="1"/>
+ <column name="SIDE" valueNumeric="1"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="a51e23c0-d44a-4e39-a79b-7a357fb79cc2"/>
<column name="OBJECT_TYPE" value="Person"/>
<column name="RELATION_TITLE" value="supported by"/>
<column name="RELATION_TYPE" value="5ab4d256-4220-4c28-88d6-1db01e2f4667"/>
- <column name="SORT" valueNumeric="2"/>
+ <column name="SIDE" valueNumeric="2"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -82,14 +82,14 @@
<column name="OBJECT_TYPE" value="Person"/>
<column name="RELATION_TITLE" value="supervisor of"/>
<column name="RELATION_TYPE" value="4df4160d-6efc-43b3-9b02-710ab3d0228c"/>
- <column name="SORT" valueNumeric="1"/>
+ <column name="SIDE" valueNumeric="1"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="0a47c346-9b6f-4cdd-8c38-77800d7012f5"/>
<column name="OBJECT_TYPE" value="Person"/>
<column name="RELATION_TITLE" value="reports to"/>
<column name="RELATION_TYPE" value="4df4160d-6efc-43b3-9b02-710ab3d0228c"/>
- <column name="SORT" valueNumeric="2"/>
+ <column name="SIDE" valueNumeric="2"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -97,14 +97,14 @@
<column name="OBJECT_TYPE" value="Person"/>
<column name="RELATION_TITLE" value="promotion target of"/>
<column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
- <column name="SORT" valueNumeric="1"/>
+ <column name="SIDE" valueNumeric="1"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="e397b595-38ae-4365-908e-75ee388838eb"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="RELATION_TITLE" value="solicits"/>
<column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
- <column name="SORT" valueNumeric="2"/>
+ <column name="SIDE" valueNumeric="2"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -112,7 +112,7 @@
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="RELATION_TITLE" value="competitor"/>
<column name="RELATION_TYPE" value="032ebe0a-7204-4eec-82a2-cb13b65850d7"/>
- <column name="SORT" valueNumeric="1"/>
+ <column name="SIDE" valueNumeric="1"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -120,14 +120,14 @@
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="RELATION_TITLE" value="society"/>
<column name="RELATION_TYPE" value="9f65f915-2767-40c4-9e7b-e818e915648f"/>
- <column name="SORT" valueNumeric="1"/>
+ <column name="SIDE" valueNumeric="1"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="RELATION_TITLE" value="member"/>
<column name="RELATION_TYPE" value="9f65f915-2767-40c4-9e7b-e818e915648f"/>
- <column name="SORT" valueNumeric="2"/>
+ <column name="SIDE" valueNumeric="2"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -135,7 +135,7 @@
<column name="OBJECT_TYPE" value="Person"/>
<column name="RELATION_TITLE" value="acquainted with"/>
<column name="RELATION_TYPE" value="84120fad-e7a2-4961-8c29-d00da41efe48"/>
- <column name="SORT" valueNumeric="1"/>
+ <column name="SIDE" valueNumeric="1"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -143,7 +143,7 @@
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="RELATION_TITLE" value="collaboration with"/>
<column name="RELATION_TYPE" value="091d866f-67e8-4fd6-afdc-e40d0f2be224"/>
- <column name="SORT" valueNumeric="1"/>
+ <column name="SIDE" valueNumeric="1"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -151,14 +151,14 @@
<column name="OBJECT_TYPE" value="Person"/>
<column name="RELATION_TITLE" value="grandparents of"/>
<column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
- <column name="SORT" valueNumeric="1"/>
+ <column name="SIDE" valueNumeric="1"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="a2296f93-2371-4ab8-9f29-ef0795d1e9b2"/>
<column name="OBJECT_TYPE" value="Person"/>
<column name="RELATION_TITLE" value="ankle of"/>
<column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
- <column name="SORT" valueNumeric="2"/>
+ <column name="SIDE" valueNumeric="2"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/process/ObjectRelation_lib/ObjectRelation_lib.aod b/process/ObjectRelation_lib/ObjectRelation_lib.aod
deleted file mode 100644
index 77cc2f184e4c94f8e0a4bde129557dcb4873bb49..0000000000000000000000000000000000000000
--- a/process/ObjectRelation_lib/ObjectRelation_lib.aod
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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>ObjectRelation_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/ObjectRelation_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
diff --git a/process/ObjectRelation_lib/process.js b/process/ObjectRelation_lib/process.js
deleted file mode 100644
index 8535970f447019d9ecb43fd0b499b2818ee59ae7..0000000000000000000000000000000000000000
--- a/process/ObjectRelation_lib/process.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import("system.vars");
-import("system.db");
-import("Keyword_lib");
-import("Sql_lib");
-import("KeywordRegistry_basic")
-/**
- * Methods to manage objectRelations.
- * Do not create an instance of this!
- *
- * @class
- */
-function ObjectRelationUtils() {}
-
-ObjectRelationUtils.getCurrentObjectNum = function(pObjectTypeParamName, pObjectRowidParamName, pObject1TypeFieldName, pObject1RowidFieldName, pObject2TypeFieldName, pObject2RowidFieldName)
-{
- var objectType = vars.get(pObjectTypeParamName);
- var objectRowid = vars.get(pObjectRowidParamName);
-
- var object1Type = vars.get(pObject1TypeFieldName);
- var object1Rowid = vars.get(pObject1RowidFieldName);
-
- var object2Type = vars.get(pObject2TypeFieldName);
- var object2Rowid = vars.get(pObject2RowidFieldName);
-
- if (objectType == object1Type && objectRowid == object1Rowid)
- return 1;
-
- if (objectType == object2Type && objectRowid == object2Rowid)
- return 2;
-
- return -1
-}
\ No newline at end of file