From ac871be8c5f24693e67a51f391b7ce461bba90bc Mon Sep 17 00:00:00 2001
From: "f.maier" <f.maier@adito.de>
Date: Thu, 21 Oct 2021 14:47:45 +0200
Subject: [PATCH] --Performance Organisation/Person [Projekt:
xRM-ContactManagement][TicketNr.: 2001187][Es folgt keine Benachrichtigung
wenn eine Aufgabe mittels "Erledigt Setzen"-Button abgeschlossen wird]
---
.../address_id/displayValueProcess.js | 11 ++++++---
.../language/displayValueProcess.js | 6 ++++-
.../status/displayValueProcess.js | 6 ++++-
.../entityfields/type/displayValueProcess.js | 6 ++++-
entity/Person_entity/Person_entity.aod | 2 --
.../gender/displayValueProcess.js | 3 ++-
.../language/displayValueProcess.js | 6 ++++-
.../displayValueProcess.js | 6 +++--
.../salutation/displayValueProcess.js | 5 ----
.../status/displayValueProcess.js | 3 ++-
.../entityfields/title/displayValueProcess.js | 5 ----
.../children/setcomplete/onActionProcess.js | 23 +++++++++++--------
.../_____LANGUAGE_EXTRA.aod | 3 +++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 +++
15 files changed, 60 insertions(+), 32 deletions(-)
delete mode 100644 entity/Person_entity/entityfields/salutation/displayValueProcess.js
delete mode 100644 entity/Person_entity/entityfields/title/displayValueProcess.js
diff --git a/entity/Organisation_entity/entityfields/address_id/displayValueProcess.js b/entity/Organisation_entity/entityfields/address_id/displayValueProcess.js
index f212ec24e7..9fe94ad2b2 100644
--- a/entity/Organisation_entity/entityfields/address_id/displayValueProcess.js
+++ b/entity/Organisation_entity/entityfields/address_id/displayValueProcess.js
@@ -1,8 +1,13 @@
+import("system.neon");
import("system.db");
import("system.vars");
import("system.result");
import("PostalAddress_lib");
-var addrId = vars.get("$field.ADDRESS_ID");
-var addr = AddressUtils.getFormattedOnlineAddressById(addrId);
-result.string(addr);
\ No newline at end of file
+
+if(vars.get("$sys.viewmode") != neon.FRAME_VIEWMODE_TABLE)
+{
+ var addrId = vars.get("$field.ADDRESS_ID");
+ var addr = AddressUtils.getFormattedOnlineAddressById(addrId);
+ result.string(addr);
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/language/displayValueProcess.js b/entity/Organisation_entity/entityfields/language/displayValueProcess.js
index fbcdba886a..e3f0ad22bd 100644
--- a/entity/Organisation_entity/entityfields/language/displayValueProcess.js
+++ b/entity/Organisation_entity/entityfields/language/displayValueProcess.js
@@ -1,5 +1,9 @@
+import("system.neon");
import("system.vars");
import("system.result");
import("Context_lib");
-result.string(ContextUtils.loadContentTitle("Language_entity", vars.get("$field.LANGUAGE")));
\ No newline at end of file
+if(vars.get("$sys.viewmode") != neon.FRAME_VIEWMODE_TABLE)
+{
+ result.string(ContextUtils.loadContentTitle("Language_entity", vars.get("$field.LANGUAGE")));
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/status/displayValueProcess.js b/entity/Organisation_entity/entityfields/status/displayValueProcess.js
index cc03068b7c..4af59c46e1 100644
--- a/entity/Organisation_entity/entityfields/status/displayValueProcess.js
+++ b/entity/Organisation_entity/entityfields/status/displayValueProcess.js
@@ -1,6 +1,10 @@
+import("system.neon");
import("system.result");
import("system.vars");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string(KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), vars.get("$field.STATUS")));
+if(vars.get("$sys.viewmode") != neon.FRAME_VIEWMODE_TABLE)
+{
+ result.string(KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), vars.get("$field.STATUS")));
+}
diff --git a/entity/Organisation_entity/entityfields/type/displayValueProcess.js b/entity/Organisation_entity/entityfields/type/displayValueProcess.js
index 06795c5d70..8ec1ffbf98 100644
--- a/entity/Organisation_entity/entityfields/type/displayValueProcess.js
+++ b/entity/Organisation_entity/entityfields/type/displayValueProcess.js
@@ -1,6 +1,10 @@
+import("system.neon");
import("system.result");
import("system.vars");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string(KeywordUtils.getViewValue($KeywordRegistry.organisationType(), vars.get("$field.TYPE")));
+if(vars.get("$sys.viewmode") != neon.FRAME_VIEWMODE_TABLE)
+{
+ result.string(KeywordUtils.getViewValue($KeywordRegistry.organisationType(), vars.get("$field.TYPE")));
+}
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 9fe6cb1d66..0e71f6701c 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -87,13 +87,11 @@
<consumer>Salutations</consumer>
<mandatory v="true" />
<mandatoryProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/mandatoryProcess.js</mandatoryProcess>
- <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>TITLE</name>
<title>Title</title>
<consumer>SalutationTitles</consumer>
- <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/title/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>TITLESUFFIX</name>
diff --git a/entity/Person_entity/entityfields/gender/displayValueProcess.js b/entity/Person_entity/entityfields/gender/displayValueProcess.js
index 734a0b1410..bd75bed0d0 100644
--- a/entity/Person_entity/entityfields/gender/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/gender/displayValueProcess.js
@@ -1,3 +1,4 @@
+import("system.neon");
import("system.vars");
import("KeywordRegistry_basic");
import("system.result");
@@ -6,7 +7,7 @@ import("Sql_lib");
var sex = vars.get("$field.GENDER");
-if (sex)
+if (sex && vars.get("$sys.viewmode") != neon.FRAME_VIEWMODE_TABLE)
{
var keyword = KeywordUtils.getViewValue($KeywordRegistry.personGender(), sex);
result.string(keyword)
diff --git a/entity/Person_entity/entityfields/language/displayValueProcess.js b/entity/Person_entity/entityfields/language/displayValueProcess.js
index fbcdba886a..d3a07fff8b 100644
--- a/entity/Person_entity/entityfields/language/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/language/displayValueProcess.js
@@ -1,5 +1,9 @@
+import("system.neon");
import("system.vars");
import("system.result");
import("Context_lib");
-result.string(ContextUtils.loadContentTitle("Language_entity", vars.get("$field.LANGUAGE")));
\ No newline at end of file
+if(vars.get("$sys.viewmode") != neon.FRAME_VIEWMODE_TABLE)
+{
+ result.string(ContextUtils.loadContentTitle("Language_entity", vars.get("$field.LANGUAGE")));
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/organisation_contactid/displayValueProcess.js b/entity/Person_entity/entityfields/organisation_contactid/displayValueProcess.js
index cc01289380..30512466e9 100644
--- a/entity/Person_entity/entityfields/organisation_contactid/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/organisation_contactid/displayValueProcess.js
@@ -3,5 +3,7 @@ import("system.result");
import("system.neon");
import("system.vars");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value"))
- result.string(OrganisationUtils.getNameByContactId(vars.get("$this.value")));
\ No newline at end of file
+if (vars.get("$sys.viewmode") != neon.FRAME_VIEWMODE_TABLE)
+{
+ result.string(OrganisationUtils.getNameByContactId(vars.get("$field.ORGANISATION_CONTACTID")));
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/salutation/displayValueProcess.js b/entity/Person_entity/entityfields/salutation/displayValueProcess.js
deleted file mode 100644
index 275e5fb9a5..0000000000
--- a/entity/Person_entity/entityfields/salutation/displayValueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.vars");
-import("system.result");
-
-if(vars.get("$field.SALUTATION"))
- result.string(vars.get("$field.SALUTATION"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/status/displayValueProcess.js b/entity/Person_entity/entityfields/status/displayValueProcess.js
index b9185cff9e..c5555df134 100644
--- a/entity/Person_entity/entityfields/status/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/status/displayValueProcess.js
@@ -1,10 +1,11 @@
+import("system.neon");
import("system.result");
import("system.vars");
import("KeywordRegistry_basic");
import("Keyword_lib");
var key = vars.get("$field.STATUS");
-if (key)
+if (key && vars.get("$sys.viewmode") != neon.FRAME_VIEWMODE_TABLE)
{
var res = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), key);
result.string(res);
diff --git a/entity/Person_entity/entityfields/title/displayValueProcess.js b/entity/Person_entity/entityfields/title/displayValueProcess.js
deleted file mode 100644
index 9023d1aa7e..0000000000
--- a/entity/Person_entity/entityfields/title/displayValueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if (vars.get("$field.TITLE"))
- result.string(vars.get("$field.TITLE"));
diff --git a/entity/Task_entity/entityfields/filteractiongroup/children/setcomplete/onActionProcess.js b/entity/Task_entity/entityfields/filteractiongroup/children/setcomplete/onActionProcess.js
index 3a57f271c6..824095f07f 100644
--- a/entity/Task_entity/entityfields/filteractiongroup/children/setcomplete/onActionProcess.js
+++ b/entity/Task_entity/entityfields/filteractiongroup/children/setcomplete/onActionProcess.js
@@ -1,12 +1,17 @@
-import("system.neon");
-import("Sql_lib");
+import("KeywordRegistry_basic");
+import("system.entities");
import("system.vars");
-import("system.db");
-import("KeywordRegistry_basic")
-var data = vars.get("$sys.selection")
+var data = vars.get("$sys.selection");
-var cond = newWhere("TASK.TASKID", data, SqlBuilder.IN()).toString();
-db.updateData("TASK", ["STATUS"], null, [$KeywordRegistry.taskStatus$ended()], cond)
-
-neon.refreshAll()
\ No newline at end of file
+var updateConfig = entities.createConfigForUpdatingRows()
+.entity("Task_entity")
+.fieldValues({
+ "STATUS": $KeywordRegistry.taskStatus$ended()
+});
+
+data.forEach(function (dataRow)
+{
+ updateConfig.uid(dataRow);
+ entities.updateRow(updateConfig);
+});
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index cc2ff42c79..7b6aee941f 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -11129,6 +11129,9 @@
<entry>
<key>Deleting the dependency also deletes its fields.</key>
</entry>
+ <entry>
+ <key>dd/MM/yyyy HH:mm</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 b794447646..c84e649cf8 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -81,6 +81,10 @@
<key>Ticket number of the original ticket</key>
<value>Ticketnummer des originalen Tickets</value>
</entry>
+ <entry>
+ <key>Datasets are exported</key>
+ <value>Datensätze werden exportiert</value>
+ </entry>
<entry>
<key>Ticket duplicated (original)</key>
<value>Ticket dupliziert (Original)</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 09fc8aece6..99650096f7 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -11225,6 +11225,9 @@
<entry>
<key>Deleting the dependency also deletes its fields.</key>
</entry>
+ <entry>
+ <key>dd/MM/yyyy HH:mm</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab