From 30c0fd403d99174a6cf521ee103714e49fc2e3fc Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@ASCHINDLBECK.aditosoftware.local>
Date: Thu, 16 Jul 2020 14:34:43 +0200
Subject: [PATCH] #1060647 Favorites: Viewtemplate for Sales contexts
---
entity/Contract_entity/Contract_entity.aod | 4 ++++
.../contract_objecttype/valueProcess.js | 3 +++
entity/Offer_entity/Offer_entity.aod | 4 ++++
.../offer_objecttype/valueProcess.js | 3 +++
entity/Order_entity/Order_entity.aod | 4 ++++
.../order_objecttype/valueProcess.js | 3 +++
entity/Product_entity/Product_entity.aod | 4 ++++
.../product_objecttype/valueProcess.js | 3 +++
.../Productprice_entity.aod | 4 ++++
.../productprice_objecttype/valueProcess.js | 3 +++
.../Salesproject_entity.aod | 4 ++++
.../salesproject_objecttype/valueProcess.js | 3 +++
.../ContractPreview_view.aod | 7 +++++++
.../OfferPreview_view/OfferPreview_view.aod | 7 +++++++
.../OrderPreview_view/OrderPreview_view.aod | 7 +++++++
.../ProductPreview_view.aod | 7 +++++++
.../ProductpricePreview_view.aod | 21 ++++++++++++-------
.../SalesprojectPreview_view.aod | 12 +++++++++++
18 files changed, 96 insertions(+), 7 deletions(-)
create mode 100644 entity/Contract_entity/entityfields/contract_objecttype/valueProcess.js
create mode 100644 entity/Offer_entity/entityfields/offer_objecttype/valueProcess.js
create mode 100644 entity/Order_entity/entityfields/order_objecttype/valueProcess.js
create mode 100644 entity/Product_entity/entityfields/product_objecttype/valueProcess.js
create mode 100644 entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 51dab19fa4..cccbd3df7c 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -383,6 +383,10 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Contract_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityField>
+ <name>CONTRACT_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contract_objecttype/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Contract_entity/entityfields/contract_objecttype/valueProcess.js b/entity/Contract_entity/entityfields/contract_objecttype/valueProcess.js
new file mode 100644
index 0000000000..69af3937a8
--- /dev/null
+++ b/entity/Contract_entity/entityfields/contract_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Contract");
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 48fe414838..11d49333e1 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1023,6 +1023,10 @@
<name>NET_aggregate</name>
<parentField>NET</parentField>
</entityAggregateField>
+ <entityField>
+ <name>OFFER_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offer_objecttype/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Offer_entity/entityfields/offer_objecttype/valueProcess.js b/entity/Offer_entity/entityfields/offer_objecttype/valueProcess.js
new file mode 100644
index 0000000000..cbe3420c98
--- /dev/null
+++ b/entity/Offer_entity/entityfields/offer_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Offer");
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 2c8082ea9f..bf6651801a 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -987,6 +987,10 @@
<fieldName>Contacts</fieldName>
</dependency>
</entityConsumer>
+ <entityField>
+ <name>ORDER_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_objecttype/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Order_entity/entityfields/order_objecttype/valueProcess.js b/entity/Order_entity/entityfields/order_objecttype/valueProcess.js
new file mode 100644
index 0000000000..b7ce74bb79
--- /dev/null
+++ b/entity/Order_entity/entityfields/order_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Order");
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 6b97e94cfb..54a47d4ae7 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -457,6 +457,10 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityField>
+ <name>PRODUCT_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/product_objecttype/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Product_entity/entityfields/product_objecttype/valueProcess.js b/entity/Product_entity/entityfields/product_objecttype/valueProcess.js
new file mode 100644
index 0000000000..879615539d
--- /dev/null
+++ b/entity/Product_entity/entityfields/product_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Product");
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index a6d245878b..4df695970c 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -229,6 +229,10 @@
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
+ <entityField>
+ <name>PRODUCTPRICE_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js b/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js
new file mode 100644
index 0000000000..4296d2e68b
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Productprice");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 33c8be5fa8..0c1444f2e9 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -749,6 +749,10 @@
<iconId>VAADIN:PLAY</iconId>
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startworkflow/stateProcess.js</stateProcess>
</entityActionField>
+ <entityField>
+ <name>SALESPROJECT_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js b/entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js
new file mode 100644
index 0000000000..32bdd9f268
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Salesproject");
\ No newline at end of file
diff --git a/neonView/ContractPreview_view/ContractPreview_view.aod b/neonView/ContractPreview_view/ContractPreview_view.aod
index af1ed3be29..d825a03fee 100644
--- a/neonView/ContractPreview_view/ContractPreview_view.aod
+++ b/neonView/ContractPreview_view/ContractPreview_view.aod
@@ -17,6 +17,13 @@
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>CONTRACT_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>Details</name>
<showDrawer v="true" />
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index 83392a9706..7b78909905 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -17,6 +17,13 @@
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>OFFER_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>Details</name>
<editMode v="false" />
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index d75cf66b97..4cfda28a8b 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -17,6 +17,13 @@
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>ORDER_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>Details</name>
<editMode v="false" />
diff --git a/neonView/ProductPreview_view/ProductPreview_view.aod b/neonView/ProductPreview_view/ProductPreview_view.aod
index cb7e8496aa..61b9a8f77c 100644
--- a/neonView/ProductPreview_view/ProductPreview_view.aod
+++ b/neonView/ProductPreview_view/ProductPreview_view.aod
@@ -17,6 +17,13 @@
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>PRODUCT_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>Info</name>
<showDrawer v="true" />
diff --git a/neonView/ProductpricePreview_view/ProductpricePreview_view.aod b/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
index c5ea3ef98f..78fe704e10 100644
--- a/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
+++ b/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
@@ -9,6 +9,20 @@
</headerFooterLayout>
</layout>
<children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>IMAGE</iconField>
+ <titleField>PRICELIST</titleField>
+ <subtitleField>PRODUCT_ID</subtitleField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>PRODUCTPRICE_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>PriceInfo</name>
<showDrawer v="true" />
@@ -45,12 +59,5 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>IMAGE</iconField>
- <titleField>PRICELIST</titleField>
- <subtitleField>PRODUCT_ID</subtitleField>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
</children>
</neonView>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 393660ef8a..da9674dd3b 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -19,6 +19,18 @@
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <favoriteViewTemplate>
+ <name>Favorites</name>
+ <objectType>SALESPROJECT_OBJECTTYPE</objectType>
+ <rowId>#UID</rowId>
+ <entityField>#ENTITY</entityField>
+ <title>favorites</title>
+ <devices>
+ <element>MOBILE</element>
+ <element>TABLET</element>
+ <element>DESKTOP</element>
+ </devices>
+ </favoriteViewTemplate>
<genericViewTemplate>
<name>Details</name>
<showDrawer v="true" />
--
GitLab