ObjectRelation voresrst entfernt. Muss es anders bauen, ohne Keywords.

aliasDefinition/Data_alias/Data_alias.aod

@@ -94,8 +94,8 @@
                 <name>STRENGTH</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -108,8 +108,8 @@
                 <name>WEAKNESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -122,8 +122,8 @@
                 <name>PRICE_POLITICS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -491,8 +491,8 @@
                 <name>ADDR_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -673,8 +673,8 @@
                 <name>MEDIUM_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -1695,8 +1695,8 @@
                 <name>PROBABILITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -2088,8 +2088,8 @@
                 <name>PHASE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -2167,8 +2167,8 @@
                 <name>STATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -2523,8 +2523,8 @@
                 <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -2621,8 +2621,8 @@
                 <name>PHASE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -3019,8 +3019,8 @@
                 <name>CATEGORY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -3566,8 +3566,8 @@
                 <name>PRIORITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -3847,20 +3847,6 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>RELATION_TYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>

entity/KeywordEntry_entity/KeywordEntry_entity.aod

@@ -252,12 +252,6 @@
           <fieldName>KeywordProbabilties</fieldName>
           <isConsumer v="false" />
         </entityDependency>
-        <entityDependency>
-          <name>49156847-1f96-462c-b914-e3c22f10ba18</name>
-          <entityName>ObjectRelation_entity</entityName>
-          <fieldName>KeywordObjectRelationType</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
         <entityDependency>
           <name>a44375e9-917c-4db8-9aa8-de0625caf78f</name>
           <entityName>Activity_entity</entityName>

entity/ObjectRelation_entity/ObjectRelation_entity.aod

@@ -86,15 +86,11 @@
     <entityField>
       <name>OtherObjectRowid</name>
       <title>Object</title>
-      <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/otherobjectrowid/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/otherobjectrowid/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>OtherObjectType</name>
       <title>Object type</title>
       <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/otherobjecttype/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/otherobjecttype/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>RELATION_TYPE</name>
@@ -123,24 +119,6 @@
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
-      <children>
-        <entityParameter>
-          <name>ProviderType_param</name>
-          <code>%aditoprj%/entity/ObjectRelation_entity/entityfields/objectrelations/children/providertype_param/code.js</code>
-          <expose v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectRowid_param</name>
-          <expose v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <expose v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
     </entityProvider>
     <entityParameter>
       <name>ProviderType_param</name>
@@ -154,8 +132,6 @@
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -180,7 +156,6 @@
     </entityParameter>
     <entityField>
       <name>CurrentObjectNumber</name>
-      <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/currentobjectnumber/valueProcess.js</valueProcess>
     </entityField>
   </entityFields>
   <recordContainers>
@@ -235,10 +210,6 @@
           <name>OBJECT1_ROWID.displayValue</name>
           <expression>%aditoprj%/entity/ObjectRelation_entity/recordcontainers/db/recordfieldmappings/object1_rowid.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>RELATION_TYPE.value</name>
-          <recordfield>AB_OBJECTRELATION.RELATION_TYPE</recordfield>
-        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>

entity/ObjectRelation_entity/entityfields/currentobjectnumber/valueProcess.js

-import("system.result");
-import("ObjectRelation_lib");
-
-result.string(ObjectRelationUtils.getCurrentObjectNum(
-                    "$param.ObjectType_param",
-                    "$param.ObjectRowid_param",
-                    "$field.OBJECT1_TYPE",
-                    "$field.OBJECT1_ROWID",
-                    "$field.OBJECT2_TYPE",
-                    "$field.OBJECT2_ROWID"));
\ No newline at end of file

entity/ObjectRelation_entity/entityfields/keywordobjectrelationtype/children/containername_param/code.js

-import("system.result");
-
-result.string("ObjectRelationType");
\ No newline at end of file

entity/ObjectRelation_entity/entityfields/objectrelations/children/providertype_param/code.js

-import("system.result");
-
-result.string("tree");
\ No newline at end of file

entity/ObjectRelation_entity/entityfields/otherobjectrowid/displayValueProcess.js

-import("system.db");
-import("system.result");
-import("system.vars");
-import("Context_lib");
-
-if (vars.exists("$field.OtherObjectType") && vars.get("$field.OtherObjectType") && (vars.exists("$field.OtherObjectRowid") && vars.get("$field.OtherObjectRowid")))
-    result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OtherObjectType"), vars.get("$field.OtherObjectRowid"))));

entity/ObjectRelation_entity/entityfields/otherobjectrowid/valueProcess.js

-import("system.result");
-import("system.vars");
-
-var currentNum = vars.get("$field.CurrentObjectNumber");
-if (currentNum == "1")
-{
-    result.string(vars.get("$field.OBJECT2_ROWID"));
-}
-else if (currentNum == "2")
-{
-    result.string(vars.get("$field.OBJECT1_ROWID"));
-}
\ No newline at end of file

entity/ObjectRelation_entity/entityfields/otherobjecttype/valueProcess.js

-import("system.result");
-import("system.vars");
-
-var currentNum = vars.get("$field.CurrentObjectNumber");
-if (currentNum == "1")
-{
-    result.string(vars.get("$field.OBJECT2_TYPE"));
-}
-else if (currentNum == "2")
-{
-    result.string(vars.get("$field.OBJECT1_TYPE"));
-}
\ No newline at end of file

others/db_changes/data_alias/basic/2019.2/changelog.xml

@@ -49,11 +49,11 @@
     <include relativeToChangelogFile="true" file="task_add_parent.xml"/>
     
     <include relativeToChangelogFile="true" file="drop_estimation_salesproject.xml"/>
-    
+    <!--
     <include relativeToChangelogFile="true" file="add_ObjectRelationKeyword.xml"/>
     <include relativeToChangelogFile="true" file="ObjectRelation_add_type.xml"/>
     <include relativeToChangelogFile="true" file="ObjectRelation_add_type_exampleData.xml" context="example"/>
-
+    -->
     <!--References to the Keyword Values-->
     <include relativeToChangelogFile="true" file="OfferProbability.xml"/>
     <include relativeToChangelogFile="true" file="ActivityCategory.xml"/>