From b04437c8c9f3e3a2e6597607c425de3869bfe3c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Schr=C3=B6ger?= <m.schroeger@adito.de>
Date: Tue, 16 Oct 2018 15:17:36 +0200
Subject: [PATCH] Vertrag, Produkt, Produktpreis, Lagerbestand: Images
---
entity/Contract_entity/Contract_entity.aod | 2 +-
entity/Contract_entity/entityfields/image/valueProcess.js | 5 ++++-
entity/Product_entity/Product_entity.aod | 5 +++++
entity/Product_entity/entityfields/image/valueProcess.js | 7 +++++++
entity/Productprice_entity/Productprice_entity.aod | 5 +++++
.../Productprice_entity/entityfields/image/valueProcess.js | 5 +++++
entity/Stock_entity/Stock_entity.aod | 5 +++++
entity/Stock_entity/entityfields/image/valueProcess.js | 5 +++++
neonView/ContractFilter_view/ContractFilter_view.aod | 4 ++++
neonView/ProductFilter_view/ProductFilter_view.aod | 4 ++++
neonView/ProductPreview_view/ProductPreview_view.aod | 1 +
.../ProductpriceFilter_view/ProductpriceFilter_view.aod | 4 ++++
.../ProductpriceRelation_view.aod | 4 ++++
neonView/StockFilter_view/StockFilter_view.aod | 4 ++++
14 files changed, 58 insertions(+), 2 deletions(-)
create mode 100644 entity/Product_entity/entityfields/image/valueProcess.js
create mode 100644 entity/Productprice_entity/entityfields/image/valueProcess.js
create mode 100644 entity/Stock_entity/entityfields/image/valueProcess.js
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 24d0ce85178..36d276aaa76 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -96,7 +96,6 @@
<mandatory v="true" />
<outgoingField>ContractOrg_dfo</outgoingField>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/relation_id/valueProcess.js</valueProcess>
- <valueMappingProcess>%aditoprj%/entity/Contract_entity/entityfields/relation_id/valueMappingProcess.js</valueMappingProcess>
<fieldIdProcess>%aditoprj%/entity/Contract_entity/entityfields/relation_id/fieldIdProcess.js</fieldIdProcess>
</entityField>
<entityField>
@@ -163,6 +162,7 @@
</entityFieldGroup>
<entityOutgoingField>
<name>ContractHistory_dfo</name>
+ <title>Histories</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Contract_entity/entityfields/image/valueProcess.js b/entity/Contract_entity/entityfields/image/valueProcess.js
index 33ce1c060c8..d57bf169099 100644
--- a/entity/Contract_entity/entityfields/image/valueProcess.js
+++ b/entity/Contract_entity/entityfields/image/valueProcess.js
@@ -1,4 +1,7 @@
import("system.vars");
import("system.result");
+import("Keyword_lib");
-result.string("TEXT:" + vars.getString("$field.CONTRACTCODE"));
\ No newline at end of file
+var KeywUtils = new KeywordUtils();
+
+result.string("TEXT:" + KeywUtils.getViewValue("CONTRACT.CONTRACTTYPE", vars.getString("$field.CONTRACTTYPE")) );
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 1d63cd564ef..aa032a1370c 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -206,6 +206,11 @@
</entityParameter>
</children>
</entityOutgoingField>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<linkInformation>
<linkInformation>
diff --git a/entity/Product_entity/entityfields/image/valueProcess.js b/entity/Product_entity/entityfields/image/valueProcess.js
new file mode 100644
index 00000000000..a47886f94ef
--- /dev/null
+++ b/entity/Product_entity/entityfields/image/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+
+var KeywUtils = new KeywordUtils();
+
+result.string("TEXT:" + KeywUtils.getViewValue("GROUPCODE", vars.getString("$field.GROUPCODEID")) );
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 1358998db1f..299f24da7e5 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -206,6 +206,11 @@
<fieldName>Product_dfi</fieldName>
</dependency>
</entityOutgoingField>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<linkInformation>
<linkInformation>
diff --git a/entity/Productprice_entity/entityfields/image/valueProcess.js b/entity/Productprice_entity/entityfields/image/valueProcess.js
new file mode 100644
index 00000000000..1a61d32b892
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/image/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+
+result.string("TEXT:" + vars.get("$field.BUYSELL") );
\ No newline at end of file
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index 695e012d544..f17071d579c 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -102,6 +102,11 @@
</entityDependency>
</dependencies>
</entityIncomingField>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<linkInformation>
<linkInformation>
diff --git a/entity/Stock_entity/entityfields/image/valueProcess.js b/entity/Stock_entity/entityfields/image/valueProcess.js
new file mode 100644
index 00000000000..1f34aaa19ad
--- /dev/null
+++ b/entity/Stock_entity/entityfields/image/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+
+result.string("TEXT:" + vars.get("$field.IN_OUT") );
\ No newline at end of file
diff --git a/neonView/ContractFilter_view/ContractFilter_view.aod b/neonView/ContractFilter_view/ContractFilter_view.aod
index 7942908de6f..ed763f0e58b 100644
--- a/neonView/ContractFilter_view/ContractFilter_view.aod
+++ b/neonView/ContractFilter_view/ContractFilter_view.aod
@@ -12,6 +12,10 @@
<name>Table_template</name>
<entityField>#ENTITY</entityField>
<columns>
+ <neonTableColumn>
+ <name>67ceacc5-6238-496a-9bc6-ccc52ce91cd3</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>1a610a45-8c8c-48d4-bc0b-905655afa016</name>
<entityField>CONTRACTCODE</entityField>
diff --git a/neonView/ProductFilter_view/ProductFilter_view.aod b/neonView/ProductFilter_view/ProductFilter_view.aod
index 946718cd876..0707b56301c 100644
--- a/neonView/ProductFilter_view/ProductFilter_view.aod
+++ b/neonView/ProductFilter_view/ProductFilter_view.aod
@@ -12,6 +12,10 @@
<name>Table_template</name>
<entityField>#ENTITY</entityField>
<columns>
+ <neonTableColumn>
+ <name>bf58edbf-0708-41a7-a092-ebc87a60c3c2</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>346eab87-8fea-4828-8ea6-86af61f973ce</name>
<entityField>GROUPCODEID</entityField>
diff --git a/neonView/ProductPreview_view/ProductPreview_view.aod b/neonView/ProductPreview_view/ProductPreview_view.aod
index 612ead7d150..ae462158858 100644
--- a/neonView/ProductPreview_view/ProductPreview_view.aod
+++ b/neonView/ProductPreview_view/ProductPreview_view.aod
@@ -10,6 +10,7 @@
<children>
<cardViewTemplate>
<name>ProductHeader_template</name>
+ <iconField>IMAGE</iconField>
<titleField>PRODUCTCODE</titleField>
<descriptionField>GROUPCODEID</descriptionField>
<entityField>#ENTITY</entityField>
diff --git a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
index c3b1ebfd15c..1c56c25712b 100644
--- a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
+++ b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
@@ -14,6 +14,10 @@
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
+ <neonTableColumn>
+ <name>44311686-a24a-4cf0-87a0-6e354b3f457a</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>695ce7be-d738-48a9-833d-e8815c6eff74</name>
<entityField>Pricelist_Relation</entityField>
diff --git a/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod b/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
index f9b2431be4c..3d65425be7d 100644
--- a/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
+++ b/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
@@ -14,6 +14,10 @@
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
+ <neonTableColumn>
+ <name>bc7ca35e-c454-4cc0-9b2e-0656e03f1f65</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>0b2271ca-f55f-4339-b63f-f6f95d1d18e6</name>
<entityField>PRODUCT_GROUPCODEID</entityField>
diff --git a/neonView/StockFilter_view/StockFilter_view.aod b/neonView/StockFilter_view/StockFilter_view.aod
index 65c6327aa9c..cfd4529e654 100644
--- a/neonView/StockFilter_view/StockFilter_view.aod
+++ b/neonView/StockFilter_view/StockFilter_view.aod
@@ -13,6 +13,10 @@
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
+ <neonTableColumn>
+ <name>c57eed89-267a-4df6-9ac9-e9b5c5e49794</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>135080e7-1d91-4be2-8bdb-8368e247127d</name>
<entityField>WAREHOUSE</entityField>
--
GitLab