From d78b0fbbe08c51d8d870c11a7a99a649a92c7bb9 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 13 May 2019 11:45:22 +0200
Subject: [PATCH] Classification refactorings / fixes
---
.../Classification_entity.aod | 1 +
.../classificationscore_id/titleProcess.js | 6 +++++-
.../_____LANGUAGE_EXTRA.aod | 14 +++++++++++++-
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 13 +++++++++++--
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 12 ++++++++++++
.../ClassificationTree_view.aod | 18 +++++++++++++-----
6 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index f7bcb256a8e..cfb15466178 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -16,6 +16,7 @@
</entityField>
<entityField>
<name>CLASSIFICATIONSCORE_ID</name>
+ <title>Selection</title>
<consumer>ClassificationScores</consumer>
<titleProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js</titleProcess>
<displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js</displayValueProcess>
diff --git a/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js b/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js
index 8100cef278f..5cf0ef8986f 100644
--- a/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js
+++ b/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js
@@ -1,5 +1,9 @@
+import("system.neon");
import("system.result");
import("system.vars");
import("system.translate");
-result.string(translate.text(vars.get("$field.SCORETYPE")))
\ No newline at end of file
+if (vars.get("$sys.recordstate") && vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW)
+{
+ result.string(translate.text(vars.get("$field.SCORETYPE")))
+}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 37bc92a9719..c0bd72a9fd4 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -3840,6 +3840,9 @@
<entry>
<key>Possible Values</key>
</entry>
+ <entry>
+ <key>251 to 1,000</key>
+ </entry>
<entry>
<key>a</key>
</entry>
@@ -3847,7 +3850,16 @@
<key>${SCORETYPE_ALREADY_EXISTS}</key>
</entry>
<entry>
- <key>251 to 1,000</key>
+ <key>1</key>
+ </entry>
+ <entry>
+ <key>Selection</key>
+ </entry>
+ <entry>
+ <key>aasfd</key>
+ </entry>
+ <entry>
+ <key>123</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 070be9b2219..2ea688f9083 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -4797,8 +4797,17 @@
<value>Der eingegebene Bewertungstyp existiert bereits in irgend einer Klassifizierung.</value>
</entry>
<entry>
- <key>New step</key>
- <value>Neue Stufe</value>
+ <key>1</key>
+ </entry>
+ <entry>
+ <key>Selection</key>
+ <value>Auswahl</value>
+ </entry>
+ <entry>
+ <key>aasfd</key>
+ </entry>
+ <entry>
+ <key>123</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 524bc32ce50..7a526bc2bd1 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -3901,6 +3901,18 @@
<entry>
<key>251 to 1,000</key>
</entry>
+ <entry>
+ <key>1</key>
+ </entry>
+ <entry>
+ <key>Selection</key>
+ </entry>
+ <entry>
+ <key>aasfd</key>
+ </entry>
+ <entry>
+ <key>123</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/ClassificationTree_view/ClassificationTree_view.aod b/neonView/ClassificationTree_view/ClassificationTree_view.aod
index 9458284d2a8..1e510bc616b 100644
--- a/neonView/ClassificationTree_view/ClassificationTree_view.aod
+++ b/neonView/ClassificationTree_view/ClassificationTree_view.aod
@@ -8,10 +8,8 @@
</boxLayout>
</layout>
<children>
- <treeViewTemplate>
- <name>classificationTree</name>
- <titleField>SCORETYPE</titleField>
- <descriptionField>CLASSIFICATIONSCORE_ID</descriptionField>
+ <treeTableViewTemplate>
+ <name>ClassificationTreeTable</name>
<defaultGroupFields>
<element>CLASSIFICATIONNUMBER</element>
</defaultGroupFields>
@@ -19,6 +17,16 @@
<showChildrenCount v="false" />
<entryAction>edit</entryAction>
<entityField>#ENTITY</entityField>
- </treeViewTemplate>
+ <columns>
+ <neonTableColumn>
+ <name>246c0212-dadb-4d71-9567-ceab37e9ef10</name>
+ <entityField>SCORETYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9a62baa4-71cf-4b9d-8cd6-883b233a9b84</name>
+ <entityField>CLASSIFICATIONSCORE_ID</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
</children>
</neonView>
--
GitLab