From e13ae0ec2bd0b13b946c5f97a144e9c56139433a Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 25 Jan 2019 08:10:12 +0100
Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?=
=?UTF-8?q?=201032242][Gruppierung=20-=20Eingagsdatum=20nur=20nach=20Tag?=
=?UTF-8?q?=20bei=20Aktivit=C3=A4t]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
entity/Activity_entity/Activity_entity.aod | 13 ++-----------
.../entityfields/entrymonth/valueProcess.js | 6 ++++++
.../entrymonth.value/expression.js | 0
3 files changed, 8 insertions(+), 11 deletions(-)
create mode 100644 entity/Activity_entity/entityfields/entrymonth/valueProcess.js
delete mode 100644 entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index f0afe7f83e8..4d2a033ab2b 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -240,10 +240,9 @@
<entityField>
<name>ENTRYMONTH</name>
<title>Month</title>
- <contentType>DATE</contentType>
- <resolution>MONTH</resolution>
- <outputFormat>MMMM yyyy</outputFormat>
+ <contentType>TEXT</contentType>
<groupable v="true" />
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrymonth/valueProcess.js</valueProcess>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
@@ -300,14 +299,6 @@
<name>CATEGORY.value</name>
<recordfield>ACTIVITY.CATEGORY</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ENTRYMONTH.value</name>
- <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ENTRYMONTH.displayValue</name>
- <recordfield>ACTIVITY.ENTRYDATE</recordfield>
- </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Activity_entity/entityfields/entrymonth/valueProcess.js b/entity/Activity_entity/entityfields/entrymonth/valueProcess.js
new file mode 100644
index 00000000000..12df6162c99
--- /dev/null
+++ b/entity/Activity_entity/entityfields/entrymonth/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.datetime");
+import("system.result");
+import("system.vars");
+
+var entryDate = vars.get("$field.ENTRYDATE");
+result.string(datetime.toDate(entryDate, "MMMM yyyy"));
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js
deleted file mode 100644
index e69de29bb2d..00000000000
--
GitLab