From 5c5d6a7a4df13229ebf07fe55ddd4ff54d4a79c5 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 19 Feb 2019 13:09:14 +0100
Subject: [PATCH] =?UTF-8?q?newActivity=20aktionen=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entityfields/subject_details/valueProcess.js | 7 ++-----
entity/Contract_entity/Contract_entity.aod | 7 +++++++
.../entityfields/newactivity/onActionProcess.js | 4 ++++
entity/Offer_entity/Offer_entity.aod | 7 +++++++
.../entityfields/newactivity/onActionProcess.js | 4 ++++
entity/Order_entity/Order_entity.aod | 7 +++++++
.../entityfields/newactivity/onActionProcess.js | 4 ++++
entity/Product_entity/Product_entity.aod | 7 +++++++
.../entityfields/newactivity/onActionProcess.js | 4 ++++
entity/Salesproject_entity/Salesproject_entity.aod | 7 +++++++
.../entityfields/newactivity/onActionProcess.js | 4 ++++
11 files changed, 57 insertions(+), 5 deletions(-)
create mode 100644 entity/Contract_entity/entityfields/newactivity/onActionProcess.js
create mode 100644 entity/Offer_entity/entityfields/newactivity/onActionProcess.js
create mode 100644 entity/Order_entity/entityfields/newactivity/onActionProcess.js
create mode 100644 entity/Product_entity/entityfields/newactivity/onActionProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js
diff --git a/entity/Activity_entity/entityfields/subject_details/valueProcess.js b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
index 54c6e810026..7cecd3b4270 100644
--- a/entity/Activity_entity/entityfields/subject_details/valueProcess.js
+++ b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
@@ -2,8 +2,5 @@ import("system.vars");
import("system.result");
import("Keyword_lib");
-var histMedium;
-histMedium = vars.get("$field.CATEGORY");
-if (histMedium){
- result.string(vars.get("$field.SUBJECT") + " (" + LegacyKeywordUtils.getViewValue("ACTIVITY.CATEGORY", histMedium) + ")");
-}
\ No newline at end of file
+var histMedium = vars.get("$field.CATEGORY");
+result.string(vars.get("$field.SUBJECT") + (histMedium ? " (" + LegacyKeywordUtils.getViewValue("ACTIVITY.CATEGORY", histMedium) + ")" : ""));
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 040d0cff489..028d790dd26 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -259,6 +259,13 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <fieldType>ACTION</fieldType>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>NEON:HISTORY</iconId>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Contract_entity/entityfields/newactivity/onActionProcess.js b/entity/Contract_entity/entityfields/newactivity/onActionProcess.js
new file mode 100644
index 00000000000..5d64774798a
--- /dev/null
+++ b/entity/Contract_entity/entityfields/newactivity/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Activity_lib");
+
+ActivityUtils.createNewActivity(vars.getString("$field.CONTRACTID"));
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 20b766fbc3c..2297b80962e 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -388,6 +388,13 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <fieldType>ACTION</fieldType>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>NEON:HISTORY</iconId>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Offer_entity/entityfields/newactivity/onActionProcess.js b/entity/Offer_entity/entityfields/newactivity/onActionProcess.js
new file mode 100644
index 00000000000..d93e5141598
--- /dev/null
+++ b/entity/Offer_entity/entityfields/newactivity/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Activity_lib");
+
+ActivityUtils.createNewActivity(vars.getString("$field.OFFERID"));
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 45c68993e43..4afb6c516c1 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -378,6 +378,13 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <fieldType>ACTION</fieldType>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>NEON:HISTORY</iconId>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Order_entity/entityfields/newactivity/onActionProcess.js b/entity/Order_entity/entityfields/newactivity/onActionProcess.js
new file mode 100644
index 00000000000..0dfbcbcb9f6
--- /dev/null
+++ b/entity/Order_entity/entityfields/newactivity/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Activity_lib");
+
+ActivityUtils.createNewActivity(vars.getString("$field.SALESORDERID"));
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 674f22c4d72..d2902bb8988 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -310,6 +310,13 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <fieldType>ACTION</fieldType>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>NEON:HISTORY</iconId>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Product_entity/entityfields/newactivity/onActionProcess.js b/entity/Product_entity/entityfields/newactivity/onActionProcess.js
new file mode 100644
index 00000000000..b2be977254a
--- /dev/null
+++ b/entity/Product_entity/entityfields/newactivity/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Activity_lib");
+
+ActivityUtils.createNewActivity(vars.getString("$field.PRODUCTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 187aeefd565..93027687026 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -387,6 +387,13 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <fieldType>ACTION</fieldType>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>NEON:HISTORY</iconId>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js b/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js
new file mode 100644
index 00000000000..0a299b330a3
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Activity_lib");
+
+ActivityUtils.createNewActivity(vars.getString("$field.SALESPROJECTID"));
\ No newline at end of file
--
GitLab