From 41eb029a57525d3182a6e831f9cc690490522228 Mon Sep 17 00:00:00 2001
From: Maria Hofmann <m.hofmann@adito.de>
Date: Mon, 29 Apr 2019 15:34:27 +0200
Subject: [PATCH] LogHistory
---
entity/Contract_entity/Contract_entity.aod | 16 ++++++++++
.../children/tablenames_param/valueProcess.js | 10 +++++++
.../LogHistory_entity/LogHistory_entity.aod | 30 +++++++++++++++++++
entity/Offer_entity/Offer_entity.aod | 16 ++++++++++
.../children/tablenames_param/valueProcess.js | 10 +++++++
entity/Order_entity/Order_entity.aod | 16 ++++++++++
.../children/tablenames_param/valueProcess.js | 10 +++++++
entity/Product_entity/Product_entity.aod | 16 ++++++++++
.../children/tablenames_param/valueProcess.js | 10 +++++++
.../Salesproject_entity.aod | 16 ++++++++++
.../children/tablenames_param/valueProcess.js | 10 +++++++
.../_____LANGUAGE_EXTRA.aod | 3 ++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 ++
neonView/OrderMain_view/OrderMain_view.aod | 5 ++++
14 files changed, 171 insertions(+)
create mode 100644 entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
create mode 100644 entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
create mode 100644 entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
create mode 100644 entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index fcac2f5cbf..03a74be026 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -371,6 +371,22 @@
<onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
<iconId>VAADIN:TASKS</iconId>
</entityActionField>
+ <entityConsumer>
+ <name>LogHistoryConsumer</name>
+ <title>LogHistory</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000..f3a33022dd
--- /dev/null
+++ b/entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.CONTRACTID"), tableNames: ["AB_ATTRIBUTERELATION"]});
+res.push({id: vars.get("$field.CONTRACTID"), tableNames: ["CONTRACT"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index d1a9470c67..98452a68ce 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -47,6 +47,36 @@
<fieldName>LogHistoryConsumer</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>58532bc9-e789-403d-91a5-832ac40d6a6e</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>6caadcde-8fda-40cb-97e0-ae507beab9d7</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f49eacab-f62c-4354-88eb-359cc92c2d44</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>de473d92-dbd3-4300-8887-163c997fcd62</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>1c941565-b8ca-4805-a9d6-d49eb26a9801</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityParameter>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index d8d4f2b4d1..755f0ba735 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -710,6 +710,22 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>LogHistoryConsumer</name>
+ <title>LogHistory</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000..f6fdb0fbfa
--- /dev/null
+++ b/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.OFFERID"), tableNames: ["AB_ATTRIBUTERELATION", "OFFERITEM"]});
+res.push({id: vars.get("$field.OFFERID"), tableNames: ["OFFER"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 197dad83f6..8a4cf52a03 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -476,6 +476,22 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>LogHistoryConsumer</name>
+ <title>LogHistory</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000..b5acc0e5c7
--- /dev/null
+++ b/entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.SALESORDERID"), tableNames: ["AB_ATTRIBUTERELATION", "SALESORDERITEM", "PRODUCT"]});
+res.push({id: vars.get("$field.SALESORDERID"), tableNames: ["SALESORDER"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index d90fa0affa..b54bd697da 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -452,6 +452,22 @@
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
+ <entityConsumer>
+ <name>LogHistoryConsumer</name>
+ <title>LogHistory</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000..7ba31ad1ef
--- /dev/null
+++ b/entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.PRODUCTID"), tableNames: ["AB_ATTRIBUTERELATION", "PRODUCTPRICE", "ORGANISATION"]}); // TEXTBLOCK missing
+res.push({id: vars.get("$field.PRODUCTID"), tableNames: ["PRODUCT"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index cf5b6fcfaf..a2d4867480 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -599,6 +599,22 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>LogHistoryConsumer</name>
+ <title>LogHistory</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000..97523412f9
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.SALESPROJECTID"), tableNames: ["AB_ATTRIBUTERELATION", "ACTIVITY"]});
+res.push({id: vars.get("$field.SALESPROJECTID"), tableNames: ["SALESPROJECT"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 7d36afb0e9..07ad9a57cc 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -3087,6 +3087,9 @@
<entry>
<key>per</key>
</entry>
+ <entry>
+ <key>The minimal count can't be larger than the maximal count!</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 9cf86e4d19..c603e51282 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -3122,6 +3122,9 @@
<entry>
<key>per</key>
</entry>
+ <entry>
+ <key>The minimal count can't be larger than the maximal count!</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod
index bc76e90e06..540b3053f6 100644
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
@@ -44,5 +44,10 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>b0dea506-7dd9-4de9-9ebe-ecad9965c300</name>
+ <entityField>LogHistoryConsumer</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
--
GitLab