From ba7feab291af35fa96b191c34d2f8bd8947d98a5 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Tue, 26 Mar 2019 17:31:13 +0100
Subject: [PATCH] 360 degree in person and icons
---
entity/360Degree_entity/360Degree_entity.aod | 19 ++++++++++++++++++-
.../entityfields/icon/valueProcess.js | 17 +++++++++++++++++
.../children/newcontract/stateProcess.js | 16 ++++++++++++++++
.../children/newoffer/stateProcess.js | 15 +++++++++++++++
.../children/newsalesproject/stateProcess.js | 15 +++++++++++++++
.../children/objecttype_param/valueProcess.js | 2 +-
entity/Person_entity/Person_entity.aod | 16 ++++++++++++++++
.../objectrowid_param/valueProcess.js | 4 ++++
.../360DegreeFilter_view.aod | 1 +
neonView/PersonMain_view/PersonMain_view.aod | 5 +++++
10 files changed, 108 insertions(+), 2 deletions(-)
create mode 100644 entity/360Degree_entity/entityfields/icon/valueProcess.js
create mode 100644 entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js
create mode 100644 entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js
create mode 100644 entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js
create mode 100644 entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 810f78a70c..13f96a0d0a 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -68,6 +68,14 @@
<entityProvider>
<name>PersonObjects</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>1d931ae6-137a-4db3-b02c-eb8872d349c6</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>360DegreeObjects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -84,7 +92,7 @@
<entityActionGroup>
<name>newModule</name>
<title>New module</title>
- <iconId>VAADIN:PLUS</iconId>
+ <iconId>VAADIN:PLUS_CIRCLE</iconId>
<children>
<entityActionField>
<name>newOffer</name>
@@ -92,6 +100,7 @@
<title>Offer</title>
<onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newoffer/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CART</iconId>
+ <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js</stateProcess>
</entityActionField>
<entityActionField>
<name>newSalesproject</name>
@@ -99,6 +108,7 @@
<title>Salesproject</title>
<onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/onActionProcess.js</onActionProcess>
<iconId>VAADIN:BOOK_DOLLAR</iconId>
+ <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js</stateProcess>
</entityActionField>
<entityActionField>
<name>newContract</name>
@@ -107,9 +117,16 @@
<onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js</onActionProcess>
<iconId>VAADIN:FILE_TEXT</iconId>
<iconIdProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/iconIdProcess.js</iconIdProcess>
+ <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js</stateProcess>
</entityActionField>
</children>
</entityActionGroup>
+ <entityField>
+ <name>ICON</name>
+ <contentType>IMAGE</contentType>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/icon/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/360Degree_entity/entityfields/icon/valueProcess.js b/entity/360Degree_entity/entityfields/icon/valueProcess.js
new file mode 100644
index 0000000000..6b0bb83e3c
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/icon/valueProcess.js
@@ -0,0 +1,17 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var context = vars.getString("$field.TARGET_CONTEXT");
+switch (context)
+{
+ case "Salesproject":
+ result.string("VAADIN:BOOK_DOLLAR");
+ break;
+ case "Offer":
+ result.string("VAADIN:CART");
+ break;
+ case "Contract":
+ result.string("VAADIN:FILE_TEXT");
+ break;
+}
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js
new file mode 100644
index 0000000000..45d4c0d1ca
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js
@@ -0,0 +1,16 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("system.logging");
+
+var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
+var found = false;
+contextList.forEach(function (context)
+{
+ if(context == "Contract")
+ found = true;
+});
+if(found)
+ result.string(neon.COMPONENTSTATE_AUTO);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js
new file mode 100644
index 0000000000..43eff24495
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js
@@ -0,0 +1,15 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
+var found = false;
+contextList.forEach(function (context)
+{
+ if(context == "Offer")
+ found = true;
+});
+if(found)
+ result.string(neon.COMPONENTSTATE_AUTO);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js
new file mode 100644
index 0000000000..faec2ba794
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js
@@ -0,0 +1,15 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
+var found = false;
+contextList.forEach(function (context)
+{
+ if(context == "Salesproject")
+ found = true;
+});
+if(found)
+ result.string(neon.COMPONENTSTATE_AUTO);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
index bb07a1ee2e..15de0e1ae4 100644
--- a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.object(["Salesproject", "Offer", "Contract"]);
\ No newline at end of file
+result.object(["Offer", "Contract"]);
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 744aac134e..cbf15c42b4 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -742,6 +742,22 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<entityField>
<name>ORGANISATION_NAME</name>
</entityField>
+ <entityConsumer>
+ <name>360DegreeObjects</name>
+ <title>360 Degree</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>360Degree_entity</entityName>
+ <fieldName>PersonObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js b/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000..bdc67e9f84
--- /dev/null
+++ b/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.getString("$field.PERSONID"));
\ No newline at end of file
diff --git a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
index 46a3db16a6..49cd28ef68 100644
--- a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
+++ b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
@@ -14,6 +14,7 @@
<favoriteActionGroup2>newModule</favoriteActionGroup2>
<titleField>TITLE</titleField>
<descriptionField>DATE</descriptionField>
+ <iconField>ICON</iconField>
<defaultGroupFields>
<element>CONTEXT_NAME</element>
</defaultGroupFields>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index c27980a4d2..dd6165d8f3 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -19,6 +19,11 @@
<entityField>Activities</entityField>
<view>ActivityFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>e7b8c90f-dc8d-40f1-b4db-1493f845026f</name>
+ <entityField>360DegreeObjects</entityField>
+ <view>360DegreeFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>573d2b77-f948-47bc-bac1-621dd824c697</name>
<entityField>Tasks</entityField>
--
GitLab