From 5111e530ec0b6fae1007aee4557ca5c4573ed341 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 28 May 2019 16:51:05 +0200
Subject: [PATCH] Show Type-selector in Task
---
.../basic/2019.2/update_TaskType_Task.xml | 12 +-
entity/Task_entity/Task_entity.aod | 6 +-
.../entityfields/code/documentation.adoc | 1 -
.../entityfields/code/stateProcess.js | 13 ++
.../entityfields/type/valueProcess.js | 9 +-
.../_____LANGUAGE_EXTRA.aod | 9 +-
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 10 +-
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 9 +-
neonView/TaskEdit_view/TaskEdit_view.aod | 132 ++++++++-------
.../TaskPreview_view/TaskPreview_view.aod | 158 +++++++++---------
process/KeywordRegistry_basic/process.js | 1 +
11 files changed, 192 insertions(+), 168 deletions(-)
delete mode 100644 entity/Task_entity/entityfields/code/documentation.adoc
create mode 100644 entity/Task_entity/entityfields/code/stateProcess.js
diff --git a/.liquibase/Data_alias/basic/2019.2/update_TaskType_Task.xml b/.liquibase/Data_alias/basic/2019.2/update_TaskType_Task.xml
index 6e9186ce3f..5bb414d9ea 100644
--- a/.liquibase/Data_alias/basic/2019.2/update_TaskType_Task.xml
+++ b/.liquibase/Data_alias/basic/2019.2/update_TaskType_Task.xml
@@ -8,7 +8,17 @@
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="2ef84e0e-988a-44b4-9d14-3461555d2f18"/>
+ <column name="KEYID" value="f3da0edd-49d9-4061-98c1-8fda8631be7e"/>
+ <column name="TITLE" value="Ticket"/>
+ <column name="CONTAINER" value="TaskType"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
<delete tableName="AB_KEYWORD_ENTRY">
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index b769a9dc97..e920655f2a 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -17,13 +17,13 @@
</entityProvider>
<entityField>
<name>CODE</name>
- <documentation>%aditoprj%/entity/Task_entity/entityfields/code/documentation.adoc</documentation>
<title>task number</title>
<contentType>NUMBER</contentType>
<outputFormat>0000000</outputFormat>
<inputFormat>0000000</inputFormat>
<searchable v="false" />
<state>DISABLED</state>
+ <stateProcess>%aditoprj%/entity/Task_entity/entityfields/code/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>SUBJECT</name>
@@ -88,8 +88,8 @@
<name>TYPE</name>
<title>type</title>
<consumer>KeywordTypes</consumer>
- <searchable v="false" />
- <groupable v="false" />
+ <searchable v="true" />
+ <groupable v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/type/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
</entityField>
diff --git a/entity/Task_entity/entityfields/code/documentation.adoc b/entity/Task_entity/entityfields/code/documentation.adoc
deleted file mode 100644
index 23f0e1f507..0000000000
--- a/entity/Task_entity/entityfields/code/documentation.adoc
+++ /dev/null
@@ -1 +0,0 @@
-The `CODE` field is reserved for future implementations. It's in no view and does not store any value or has any other interaction.
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/code/stateProcess.js b/entity/Task_entity/entityfields/code/stateProcess.js
new file mode 100644
index 0000000000..385d44b6aa
--- /dev/null
+++ b/entity/Task_entity/entityfields/code/stateProcess.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic")
+import("system.neon")
+
+if (vars.get("$field.TYPE") == $KeywordRegistry.taskType$Ticket())
+{
+ result.string(neon.COMPONENTSTATE_READONLY);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/type/valueProcess.js b/entity/Task_entity/entityfields/type/valueProcess.js
index e1331380ae..acfedf9c89 100644
--- a/entity/Task_entity/entityfields/type/valueProcess.js
+++ b/entity/Task_entity/entityfields/type/valueProcess.js
@@ -1,5 +1,10 @@
import("system.result");
+import("system.vars");
+import("system.neon");
import("KeywordRegistry_basic");
-// Sets the type to "Task" as default value.
-result.string($KeywordRegistry.taskType$Task());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ // Sets the type to "Task" as default value.
+ result.string($KeywordRegistry.taskType$Task());
+}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 3677fbf3e5..a6a01ddd75 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2421,9 +2421,6 @@
<entry>
<key>hoch</key>
</entry>
- <entry>
- <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
- </entry>
<entry>
<key>Zurückgestellt</key>
</entry>
@@ -2451,9 +2448,6 @@
<entry>
<key>frei</key>
</entry>
- <entry>
- <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
- </entry>
<entry>
<key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
</entry>
@@ -3948,6 +3942,9 @@
<entry>
<key>${SQL_LIB_FIELD_WRONG_FORMAT} field: %0</key>
</entry>
+ <entry>
+ <key>Ticket</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index e2443a290d..897fe07e38 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3466,9 +3466,6 @@
<entry>
<key>hoch</key>
</entry>
- <entry>
- <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
- </entry>
<entry>
<key>Zurückgestellt</key>
</entry>
@@ -3496,9 +3493,6 @@
<entry>
<key>frei</key>
</entry>
- <entry>
- <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
- </entry>
<entry>
<key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
</entry>
@@ -4905,6 +4899,10 @@
<entry>
<key>Email Template</key>
</entry>
+ <entry>
+ <key>Ticket</key>
+ <value>Ticket</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 609b7b9229..63a17fcf83 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2422,9 +2422,6 @@
<entry>
<key>hoch</key>
</entry>
- <entry>
- <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
- </entry>
<entry>
<key>Erledigt</key>
</entry>
@@ -2633,9 +2630,6 @@
<entry>
<key>Ã…land Islands</key>
</entry>
- <entry>
- <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
- </entry>
<entry>
<key>Curaçao</key>
</entry>
@@ -4001,6 +3995,9 @@
<key>${SQL_LIB_FIELD_WRONG_FORMAT} field: %0</key>
<value>Field %0 is in an incorrect format. The database field has to be like "tablename.columnname" ("ORGANISATION.NAME") or as array with column-alias: ["ORGANISATION", "NAME", "myorgAlias"]</value>
</entry>
+ <entry>
+ <key>Ticket</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/TaskEdit_view/TaskEdit_view.aod b/neonView/TaskEdit_view/TaskEdit_view.aod
index 11e5be41cb..828ade1dff 100644
--- a/neonView/TaskEdit_view/TaskEdit_view.aod
+++ b/neonView/TaskEdit_view/TaskEdit_view.aod
@@ -1,64 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>TaskEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>fb5768fe-2dd2-45cd-8d21-f20af279f409</name>
- <entityField>SUBJECT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>b31bb2ab-22a6-4bc6-8b6c-d73a1c43283f</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>b5d6e9ea-355f-49f8-bcc2-f3efd44adb19</name>
- <entityField>START_DATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>511acbd5-4ab6-44a9-932d-df4f201896a5</name>
- <entityField>MATURITY_DATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>05c54fab-56b8-4cea-8b66-ba26e5dd16cd</name>
- <entityField>STATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>5fd464a1-d394-4f83-ba6a-386984a5df49</name>
- <entityField>PROGRESS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0f600024-eb83-445c-8eb9-62bcf9e95313</name>
- <entityField>PRIORITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>71d2b122-1687-454a-ae60-7e68aa83106c</name>
- <entityField>PROTECTIONLEVEL</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>fd41b0ee-cae4-40b5-8aad-45740f4d6268</name>
- <entityField>REQUESTOR_CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8428cbf6-7df0-4f7e-b6d6-5ab17e266028</name>
- <entityField>EDITOR_CONTACT_ID</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>ee35d86f-aef9-4ebd-b90a-d31b32cc3d5f</name>
- <entityField>Links</entityField>
- <view>TaskLinkMultiEdit_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>TaskEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>4029f673-e740-426c-8b02-cbc7c5aa128b</name>
+ <entityField>TYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>fb5768fe-2dd2-45cd-8d21-f20af279f409</name>
+ <entityField>SUBJECT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>b31bb2ab-22a6-4bc6-8b6c-d73a1c43283f</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>b5d6e9ea-355f-49f8-bcc2-f3efd44adb19</name>
+ <entityField>START_DATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>511acbd5-4ab6-44a9-932d-df4f201896a5</name>
+ <entityField>MATURITY_DATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>05c54fab-56b8-4cea-8b66-ba26e5dd16cd</name>
+ <entityField>STATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>5fd464a1-d394-4f83-ba6a-386984a5df49</name>
+ <entityField>PROGRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0f600024-eb83-445c-8eb9-62bcf9e95313</name>
+ <entityField>PRIORITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>71d2b122-1687-454a-ae60-7e68aa83106c</name>
+ <entityField>PROTECTIONLEVEL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>fd41b0ee-cae4-40b5-8aad-45740f4d6268</name>
+ <entityField>REQUESTOR_CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8428cbf6-7df0-4f7e-b6d6-5ab17e266028</name>
+ <entityField>EDITOR_CONTACT_ID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>ee35d86f-aef9-4ebd-b90a-d31b32cc3d5f</name>
+ <entityField>Links</entityField>
+ <view>TaskLinkMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod
index c12e4abf78..b6f5fff16a 100644
--- a/neonView/TaskPreview_view/TaskPreview_view.aod
+++ b/neonView/TaskPreview_view/TaskPreview_view.aod
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>TaskPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>PRIORITY_ICON</iconField>
- <titleField>SUBJECT</titleField>
- <descriptionField>STATUS</descriptionField>
- <favoriteAction1>newActivity</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>f988850e-53ed-443d-bd3d-16946eba656e</name>
- <entityField>START_DATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>dda6aefc-9d4f-4d93-9a45-bc97a278c050</name>
- <entityField>MATURITY_DATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3c7f0603-f659-47ea-adbf-4a4b0b0c6b37</name>
- <entityField>PROGRESS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ebdffed8-4999-4ec1-ac4d-c22514dfed0c</name>
- <entityField>PRIORITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>d9e4daef-84df-415c-9be7-3238c2760c07</name>
- <entityField>PROTECTIONLEVEL</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
- <entityField>REQUESTOR_CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>bbf1a736-acf9-4b41-9df9-5675fc6d8943</name>
- <entityField>EDITOR_CONTACT_ID</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>8cf85386-d25f-459a-a2a1-991c9e3287b6</name>
- <entityField>Links</entityField>
- <view>TaskLinkPreviewList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>2941084f-b72c-4cb2-9d73-5e6827795be2</name>
- <entityField>MainDocuments</entityField>
- <view>DocumentList_view</view>
- </neonViewReference>
- <genericViewTemplate>
- <name>Description</name>
- <showDrawer v="true" />
- <drawerCaption>Description</drawerCaption>
- <hideLabels v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>65933f93-96fc-4bfe-9297-7e185868ec77</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>TaskPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Header</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>PRIORITY_ICON</iconField>
+ <titleField>SUBJECT</titleField>
+ <descriptionField>STATUS</descriptionField>
+ <favoriteAction1>newActivity</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>f988850e-53ed-443d-bd3d-16946eba656e</name>
+ <entityField>START_DATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>dda6aefc-9d4f-4d93-9a45-bc97a278c050</name>
+ <entityField>MATURITY_DATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3c7f0603-f659-47ea-adbf-4a4b0b0c6b37</name>
+ <entityField>PROGRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ebdffed8-4999-4ec1-ac4d-c22514dfed0c</name>
+ <entityField>PRIORITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d9e4daef-84df-415c-9be7-3238c2760c07</name>
+ <entityField>PROTECTIONLEVEL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
+ <entityField>REQUESTOR_CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bbf1a736-acf9-4b41-9df9-5675fc6d8943</name>
+ <entityField>EDITOR_CONTACT_ID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>8cf85386-d25f-459a-a2a1-991c9e3287b6</name>
+ <entityField>Links</entityField>
+ <view>TaskLinkPreviewList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>2941084f-b72c-4cb2-9d73-5e6827795be2</name>
+ <entityField>MainDocuments</entityField>
+ <genericViewTemplate>
+ <name>Description</name>
+ <showDrawer v="true" />
+ <drawerCaption>Description</drawerCaption>
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>65933f93-96fc-4bfe-9297-7e185868ec77</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 4dd5100155..807d14d148 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -48,6 +48,7 @@ $KeywordRegistry.taskStatus$ended = function(){return "7c9d6681-6cf5-4395-b276-3
$KeywordRegistry.taskType = function(){return "TaskType";};
$KeywordRegistry.taskType$Task = function(){return "4dee8727-8299-422e-ae41-6cdf9de2dfd7";};
+$KeywordRegistry.taskType$Ticket = function(){return "f3da0edd-49d9-4061-98c1-8fda8631be7e";};
$KeywordRegistry.productPricelist = function(){return "ProductPricelist";};
$KeywordRegistry.productPricelist$standardList = function(){return "02553fc7-4611-4914-8ff5-0b7c4e7531c9";};
--
GitLab