From b4c7331475ae56b08626a736b5a03a40140d9c6a Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 5 Dec 2018 09:30:36 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1029618][Neuanlage
funktioniert nicht]
---
entity/Offer_entity/Offer_entity.aod | 18 +++++++++++++++---
.../valueProcess.js | 8 ++++++++
.../offercode_versnr/valueProcess.js | 5 -----
.../valueProcess.js | 4 ++++
entity/Offeritem_entity/Offeritem_entity.aod | 1 -
.../Offeritem_entity/beforeOperatingState.js | 3 ---
.../entityfields/rel_user_new/valueProcess.js | 5 +----
neonView/OfferEdit_view/OfferEdit_view.aod | 4 ++--
.../OfferPreview_view/OfferPreview_view.aod | 2 +-
9 files changed, 31 insertions(+), 19 deletions(-)
create mode 100644 entity/Offer_entity/entityfields/offer_offercode_versnr_fieldgroup/valueProcess.js
delete mode 100644 entity/Offer_entity/entityfields/offercode_versnr/valueProcess.js
create mode 100644 entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js
delete mode 100644 entity/Offeritem_entity/beforeOperatingState.js
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 6ed85459de..378062eae5 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -254,9 +254,21 @@
<documentation>%aditoprj%/entity/Offer_entity/entityfields/offer_id/documentation.adoc</documentation>
</entityField>
<entityFieldGroup>
- <name>OfferCode_VersNr</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offercode_versnr/valueProcess.js</valueProcess>
- <description>FIELDGROUP</description>
+ <name>OfferCode_VersNr_fieldgroup</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js</valueProcess>
+ <title>Offer number</title>
+ <description>Offercode + VersNr</description>
+ <state>READONLY</state>
+ <fields>
+ <element>OFFERCODE</element>
+ <element>VERSNR</element>
+ </fields>
+ </entityFieldGroup>
+ <entityFieldGroup>
+ <name>Offer_OfferCode_VersNr_fieldgroup</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offer_offercode_versnr_fieldgroup/valueProcess.js</valueProcess>
+ <title>Offer number</title>
+ <description>&quot;Offer &quot; + OfferCode + VersNr</description>
<state>READONLY</state>
<fields>
<element>OFFERCODE</element>
diff --git a/entity/Offer_entity/entityfields/offer_offercode_versnr_fieldgroup/valueProcess.js b/entity/Offer_entity/entityfields/offer_offercode_versnr_fieldgroup/valueProcess.js
new file mode 100644
index 0000000000..6b1c8c5bef
--- /dev/null
+++ b/entity/Offer_entity/entityfields/offer_offercode_versnr_fieldgroup/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+// TODO: Kern-Fix, VersNr wird bei indirektem Aufruf nicht geladen, wenn kein "$field.VERSNR" hier ist:
+"$field.VERSNR"
+
+result.string(translate.text("Offer") + " " + vars.get("$field.OfferCode_VersNr_fieldgroup"));
diff --git a/entity/Offer_entity/entityfields/offercode_versnr/valueProcess.js b/entity/Offer_entity/entityfields/offercode_versnr/valueProcess.js
deleted file mode 100644
index 12a2f7a02a..0000000000
--- a/entity/Offer_entity/entityfields/offercode_versnr/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-result.string(translate.text("Offer") + " " + vars.get("$field.OFFERCODE") + "-" + vars.get("$field.VERSNR"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js b/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js
new file mode 100644
index 0000000000..c7fab6e323
--- /dev/null
+++ b/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.OFFERCODE") + "-" + vars.get("$field.VERSNR"));
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 2c71861a1c..dc75e10e5e 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -8,7 +8,6 @@
<grantUpdateProcess>%aditoprj%/entity/Offeritem_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/Offeritem_entity/grantDeleteProcess.js</grantDeleteProcess>
<recordContainerType>DB</recordContainerType>
- <beforeOperatingState>%aditoprj%/entity/Offeritem_entity/beforeOperatingState.js</beforeOperatingState>
<afterOperatingState>%aditoprj%/entity/Offeritem_entity/afterOperatingState.js</afterOperatingState>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Offeritem_entity/conditionProcess.js</conditionProcess>
diff --git a/entity/Offeritem_entity/beforeOperatingState.js b/entity/Offeritem_entity/beforeOperatingState.js
deleted file mode 100644
index fa203ce318..0000000000
--- a/entity/Offeritem_entity/beforeOperatingState.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.logging");
-logging.log(vars.get("$field.OFFER_ID"))
\ No newline at end of file
diff --git a/entity/Org_entity/entityfields/rel_user_new/valueProcess.js b/entity/Org_entity/entityfields/rel_user_new/valueProcess.js
index 05a19b61b2..81966a3fbc 100644
--- a/entity/Org_entity/entityfields/rel_user_new/valueProcess.js
+++ b/entity/Org_entity/entityfields/rel_user_new/valueProcess.js
@@ -1,9 +1,6 @@
-import("system.logging");
import("system.vars");
import("system.result");
import("system.neon");
-logging.log("NOOOOW")
-logging.log(vars.get("$sys.operatingstate"))
-logging.log(vars.getString("$sys.user"))
+
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index 01e2fb9729..9c05ff39cc 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -14,8 +14,8 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>58534f77-5c6d-4bd5-bae4-14750eac335b</name>
- <entityField>OfferCode_VersNr</entityField>
+ <name>839c51a5-f628-4feb-a267-967342e547ef</name>
+ <entityField>OfferCode_VersNr_fieldgroup</entityField>
</entityFieldLink>
<entityFieldLink>
<name>768683f3-08c8-4e85-bb4c-7e5c74a8dec0</name>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index c09f491ad0..cc149e6d70 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -11,7 +11,7 @@
<cardViewTemplate>
<name>OfferHeader_template</name>
<iconField>IMAGE</iconField>
- <titleField>OfferCode_VersNr</titleField>
+ <titleField>Offer_OfferCode_VersNr_fieldgroup</titleField>
<descriptionField>RELATION_ID</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
--
GitLab