From 8916ccc907850a598316ddcd4ffa9dfe58bb5968 Mon Sep 17 00:00:00 2001
From: "m.escher" <m.escher@adito.de>
Date: Fri, 11 Jan 2019 11:08:49 +0100
Subject: [PATCH] #1030750 add Documents/Maindocuments for Activity Context
---
entity/Activity_entity/Activity_entity.aod | 52 +++++++++++++++++++
.../children/assignmentname_param/code.js | 3 ++
.../children/assignmentrowid_param/code.js | 4 ++
.../children/assignmenttable_param/code.js | 3 ++
.../children/assignmentname_param/code.js | 3 ++
.../children/assignmentrowid_param/code.js | 4 ++
.../children/assignmenttable_param/code.js | 3 ++
.../children/keyword_param/code.js | 2 +
entity/Document_entity/Document_entity.aod | 26 ++++++++++
.../ActivityMain_view/ActivityMain_view.aod | 5 ++
.../ActivityPreview_view.aod | 5 ++
11 files changed, 110 insertions(+)
create mode 100644 entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js
create mode 100644 entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js
create mode 100644 entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js
create mode 100644 entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js
create mode 100644 entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js
create mode 100644 entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js
create mode 100644 entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index f794c0c70e..cc8a09c7a9 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -184,6 +184,58 @@
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/rowid/valueProcess.js</valueProcess>
</entityField>
+ <entityOutgoingField>
+ <name>ActivityDocument_dfo</name>
+ <title>Documents</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>ActivityDocument_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
+ <entityOutgoingField>
+ <name>ActivityMainDocument_dfo</name>
+ <title>Maindocuments</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>ActivityMainDocuments_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>Keyword_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js
new file mode 100644
index 0000000000..3e4bf7585b
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js
new file mode 100644
index 0000000000..06fe7d3632
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js
new file mode 100644
index 0000000000..f39bb16bbc
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("ACTIVITY");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js
new file mode 100644
index 0000000000..3e4bf7585b
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js
new file mode 100644
index 0000000000..06fe7d3632
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.ACTIVITYID"));
\ 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
new file mode 100644
index 0000000000..f39bb16bbc
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("ACTIVITY");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js
new file mode 100644
index 0000000000..431fe9d5b2
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("MAINDOCUMENT");
\ No newline at end of file
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 6344e8b46c..6aa6542170 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -231,6 +231,32 @@
</entityDependency>
</dependencies>
</entityIncomingField>
+ <entityIncomingField>
+ <name>ActivityDocument_dfi</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>jdito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>d57c0122-3227-4f98-b6a5-2ae45a0c5571</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>ActivityDocument_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityIncomingField>
+ <entityIncomingField>
+ <name>ActivityMainDocuments_dfi</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>jdito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>056d9a73-c9cd-44f2-828b-e9742b66fa37</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>ActivityMainDocument_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityIncomingField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index bb37953370..983a1dc1ef 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -19,5 +19,10 @@
<entityField>#ENTITY</entityField>
<view>ActivityDetail_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>7bab8dbf-b69e-412d-a604-3a6999658e10</name>
+ <entityField>ActivityDocument_dfo</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index 2542e87167..23802418fa 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -34,5 +34,10 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>43167618-e4dc-429b-a264-3ea95bd647f9</name>
+ <entityField>ActivityMainDocument_dfo</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
</children>
</neonView>
--
GitLab