From b5277bd8d53fc11e0dd87f26c3d77f631a7033fb Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 15 Mar 2019 13:48:30 +0100
Subject: [PATCH] fix task entity display values
---
.../entityfields/reasons/displayValueProcess.js | 4 +---
entity/Task_entity/Task_entity.aod | 3 +++
.../entityfields/priority/displayValueProcess.js | 6 ++++++
entity/Task_entity/entityfields/priority/valueProcess.js | 2 +-
.../entityfields/progress/displayValueProcess.js | 6 ++++++
.../Task_entity/entityfields/status/displayValueProcess.js | 6 ++++++
.../_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod | 2 +-
7 files changed, 24 insertions(+), 5 deletions(-)
create mode 100644 entity/Task_entity/entityfields/priority/displayValueProcess.js
create mode 100644 entity/Task_entity/entityfields/progress/displayValueProcess.js
create mode 100644 entity/Task_entity/entityfields/status/displayValueProcess.js
diff --git a/entity/Salesproject_entity/entityfields/reasons/displayValueProcess.js b/entity/Salesproject_entity/entityfields/reasons/displayValueProcess.js
index bd91d37f12..deb08ee453 100644
--- a/entity/Salesproject_entity/entityfields/reasons/displayValueProcess.js
+++ b/entity/Salesproject_entity/entityfields/reasons/displayValueProcess.js
@@ -3,6 +3,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-
-value = KeywordUtils.getViewValue($KeywordRegistry.salesprojectWonLost(), vars.get("$field.REASONS"));
-result.string(value);
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectWonLost(), vars.get("$field.REASONS")));
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index ad7e7a42a0..d8a80cb345 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -34,6 +34,7 @@
<mandatory v="true" />
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/status/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>PRIORITY</name>
@@ -42,6 +43,7 @@
<mandatory v="true" />
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/priority/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>REQUESTOR_CONTACT_ID</name>
@@ -277,6 +279,7 @@
<consumer>KeywordProgress</consumer>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/progress/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/progress/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>KeywordProgress</name>
diff --git a/entity/Task_entity/entityfields/priority/displayValueProcess.js b/entity/Task_entity/entityfields/priority/displayValueProcess.js
new file mode 100644
index 0000000000..83b9c66a79
--- /dev/null
+++ b/entity/Task_entity/entityfields/priority/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.taskPriority(), vars.get("$field.PRIORITY")));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/priority/valueProcess.js b/entity/Task_entity/entityfields/priority/valueProcess.js
index 81d3400864..97f6684068 100644
--- a/entity/Task_entity/entityfields/priority/valueProcess.js
+++ b/entity/Task_entity/entityfields/priority/valueProcess.js
@@ -4,4 +4,4 @@ import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string("4467b33c-3a68-4c8b-ba4a-1eb666a6c774");
\ No newline at end of file
+ result.string("09072b59-d12f-469b-acbd-18a28232ff70");
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/progress/displayValueProcess.js b/entity/Task_entity/entityfields/progress/displayValueProcess.js
new file mode 100644
index 0000000000..5acf17db5f
--- /dev/null
+++ b/entity/Task_entity/entityfields/progress/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.taskProgress(), vars.get("$field.PROGRESS")));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/status/displayValueProcess.js b/entity/Task_entity/entityfields/status/displayValueProcess.js
new file mode 100644
index 0000000000..759b610257
--- /dev/null
+++ b/entity/Task_entity/entityfields/status/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), vars.get("$field.STATUS")));
\ No newline at end of file
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 581c9d3a68..3da243cd25 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.3">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic2019</projectName>
+ <projectName>xRM-Basic5</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
--
GitLab