#1035095: Object tree

3ba61ecf · Andre Loreth · 01736915 · 3ba61ecf · 3ba61ecf · 3ba61ecf
Commit 3ba61ecf authored 6 years ago by Andre Loreth
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
 <?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1">
  <name>ObjectTree_entity</name>
+  <title>Object tree</title>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <recordContainer>jdito</recordContainer>
  <entityFields>
@@ -12,11 +13,17 @@
      <fieldType>DEPENDENCY_IN</fieldType>
      <dependencies>
        <entityDependency>
-          <name>b92be69f-056c-41fb-8367-9f235bfe66e0</name>
+          <name>f4c0605f-3ccb-4ff1-b460-7268e8553857</name>
          <entityName>Organisation_entity</entityName>
          <fieldName>ObjectTrees</fieldName>
          <isConsumer v="false" />
        </entityDependency>
+        <entityDependency>
+          <name>423acf79-e2c5-46e4-9fb5-7b1a7078d4f4</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>ObjectTrees</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
      </dependencies>
    </entityProvider>
    <entityParameter>
@@ -52,8 +59,6 @@
        <element>UID.value</element>
        <element>PARENT_ID.value</element>
        <element>TITLE.value</element>
-        <element>DESCRIPTION.value</element>
-        <element>ICON.value</element>
      </recordFields>
    </jDitoRecordContainer>
  </recordContainers>

--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
-import("system.logging");
 import("system.db");
 import("system.vars");
 import("system.result");
@@ -13,7 +12,6 @@ var mappedObjectRelations = mapObjectRelations(objectRelations);

 var treeData = buildTreeData(mappedObjectRelations);

-logging.log(JSON.stringify(treeData));

 result.object(treeData);

@@ -92,9 +90,7 @@ function buildTreeData (pObjectRelations) {
   var treeRows = []
   for (i = 0; i < pObjectRelations.length; i++) {
       var currentRelation = pObjectRelations[i];
-       
-       logging.log(JSON.stringify(currentRelation))
-       
+              
       treeRows.push([currentRelation[3], currentRelation[0], currentRelation[4]]);
   }
   

--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -537,7 +537,7 @@
    </entityConsumer>
    <entityConsumer>
      <name>ObjectTrees</name>
-      <title>Beziehungsbaum</title>
+      <title>Relation tree</title>
      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
@@ -547,7 +547,6 @@
      <children>
        <entityParameter>
          <name>ObjectId_param</name>
-          <title></title>
          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objecttrees/children/objectid_param/valueProcess.js</valueProcess>
        </entityParameter>
      </children>

--- a/entity/Organisation_entity/entityfields/objecttrees/children/objectid_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/objecttrees/children/objectid_param/valueProcess.js
-import("system.result");
 import("system.vars");
-
+import("system.result");
 result.string(vars.get("$field.ORGANISATION_ID"));
\ No newline at end of file
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -182,7 +182,7 @@
          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
          <expose v="false" />
          <triggerRecalculation v="true" />
-          <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry. 
+          <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry.
 Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
        </entityParameter>
        <entityParameter>
@@ -435,7 +435,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
          <name>ContactId_param</name>
          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js</valueProcess>
          <expose v="false" />
-          <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry. 
+          <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry.
 Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
        </entityParameter>
      </children>
@@ -454,7 +454,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
          <name>ContactId_param</name>
          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js</valueProcess>
          <expose v="false" />
-          <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry. 
+          <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry.
 Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
        </entityParameter>
      </children>
@@ -563,6 +563,22 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
      <iconId>VAADIN:TASKS</iconId>
    </entityActionField>
+    <entityConsumer>
+      <name>ObjectTrees</name>
+      <title>Relation tree</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ObjectTree_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objecttrees/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
  </entityFields>
  <recordContainers>
    <dbRecordContainer>

--- a/neonContext/ObjectRelation/ObjectRelation.aod
+++ b/neonContext/ObjectRelation/ObjectRelation.aod
@@ -15,10 +15,6 @@
      <name>30334c84-5e46-4a4e-a5c4-3c42d1cb109b</name>
      <view>ObjectRelationEdit_view</view>
    </neonViewReference>
-    <neonViewReference>
-      <name>a1efaa32-2313-40b5-9cd0-715b9c635036</name>
-      <view>ObjectRelationTree_view</view>
-    </neonViewReference>
    <neonViewReference>
      <name>ec83a8eb-11a5-4544-8a06-47789704a626</name>
      <view>ObjectRelationFilter_view</view>

--- a/neonView/ObjectRelationTree_view/ObjectRelationTree_view.aod
+++ b/neonView/ObjectRelationTree_view/ObjectRelationTree_view.aod
-<?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>ObjectRelationTree_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <treetableViewTemplate>
-      <name>objectRelations</name>
-      <entityField>#ENTITY</entityField>
-    </treetableViewTemplate>
-  </children>
-</neonView>
--- a/neonView/ObjectTree_view/ObjectTree_view.aod
+++ b/neonView/ObjectTree_view/ObjectTree_view.aod
 <?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>ObjectTree_view</name>
+  <title>Asdf</title>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <layout>
    <boxLayout>

--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -45,6 +45,11 @@
      <entityField>ObjectRelations</entityField>
      <view>ObjectRelationFilter_view</view>
    </neonViewReference>
+    <neonViewReference>
+      <name>c82aff98-ede5-4d9e-a902-89f71ed7dbb0</name>
+      <entityField>ObjectTrees</entityField>
+      <view>ObjectTree_view</view>
+    </neonViewReference>
    <neonViewReference>
      <name>39c98ccb-7f77-4df0-818f-1f302f69fec4</name>
      <entityField>Attributes</entityField>
@@ -55,10 +60,5 @@
      <entityField>Salesprojects</entityField>
      <view>SalesprojectFilter_view</view>
    </neonViewReference>
-    <neonViewReference>
-      <name>c54ae5b7-7e9e-40c7-8d64-b1d75fbafa57</name>
-      <entityField>ObjectTrees</entityField>
-      <view>ObjectTree_view</view>
-    </neonViewReference>
  </children>
 </neonView>
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -39,6 +39,11 @@
      <entityField>ObjectRelations</entityField>
      <view>ObjectRelationFilter_view</view>
    </neonViewReference>
+    <neonViewReference>
+      <name>cb8ff3df-772b-4c12-8814-f9101295b1ba</name>
+      <entityField>ObjectTrees</entityField>
+      <view>ObjectTree_view</view>
+    </neonViewReference>
    <neonViewReference>
      <name>be48c6fe-1837-4c40-aef1-130fc1a5c544</name>
      <entityField>Attributes</entityField>