From a7f57c8a466eff24eb6c45743f4c12f06f2c2e4d Mon Sep 17 00:00:00 2001
From: Vinzent Broens <v.broens@adito.de>
Date: Fri, 3 Dec 2021 15:16:06 +0100
Subject: [PATCH] Service 2002773 polishing
---
.../ServiceEmailRecipients_entity.aod | 1 -
.../email_address/onValidation.js | 2 +-
.../recordcontainers/jdito/onInsert.js | 1 +
.../changedata/onActionProcess.js | 28 ++-----------------
.../_____LANGUAGE_EXTRA.aod | 12 ++++++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 22 ++++++++-------
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 12 ++++++++
7 files changed, 41 insertions(+), 37 deletions(-)
diff --git a/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod b/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod
index e91a4c5f39..f280f65fbc 100644
--- a/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod
+++ b/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod
@@ -38,7 +38,6 @@
<entityField>
<name>email_address</name>
<title>Email address</title>
- <mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/ServiceEmailRecipients_entity/entityfields/email_address/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
<valueProcess>%aditoprj%/entity/ServiceEmailRecipients_entity/entityfields/email_address/valueProcess.js</valueProcess>
diff --git a/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js b/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js
index 70bdc8be7d..cecd4d2fda 100644
--- a/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js
+++ b/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js
@@ -4,7 +4,7 @@ import("Communication_lib");
var fn = CommValidationUtil.makeValidationFn("EMAIL");
-if (fn != null)
+if (fn != null && vars.get("$local.value") != "")
{
var commAddr = vars.get("$local.value");
var res = fn.call(null, commAddr, null);
diff --git a/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js b/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js
index 7bf43f8059..3784f83b59 100644
--- a/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js
@@ -214,6 +214,7 @@ if(returnedMsgAfterSend == true)
if( str_conclusion && [ $KeywordRegistry.taskStatus$ended(),$KeywordRegistry.taskStatus$endedAbandoned(),$KeywordRegistry.taskStatus$endedDone()].includes(str_ticketStatusAfterSend) != -1)
{
TicketfieldValues["CONCLUSION"] = str_conclusion;
+ TicketfieldValues["DATE_END"] = vars.get("sys.date");
}
TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date");
diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js
index cb9344c6c3..fb46c8c318 100644
--- a/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js
+++ b/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js
@@ -1,8 +1,6 @@
import("system.question");
-import("system.logging");
import("system.neon");
import("Employee_lib");
-import("ActivityTask_lib");
import("Sql_lib");
import("Contact_lib");
import("KeywordRegistry_basic");
@@ -17,7 +15,6 @@ var TaskfieldValues = {};
var TaskfieldValueStatus = {};
var TicketfieldValues = {};
var obj_toolsUser = tools.getCurrentUser()[tools.PARAMS];
-var activityContent = [];
var ChangeCounter = 0;
var removedIds;
@@ -25,7 +22,6 @@ var removedIds;
if(vars.exists("$field.PRIORITY") && (vars.get("$field.PRIORITY") != "" ))
{
TaskfieldValues["PRIORITY"] = vars.get("$field.PRIORITY");
- activityContent += translate.text("Priority changed to") + ": " + KeywordUtils.getViewValue($KeywordRegistry.taskPriority(), vars.get("$field.PRIORITY"));
}
/// STATUS
if(vars.exists("$field.STATUS") && (vars.get("$field.STATUS") != "" ))
@@ -65,13 +61,7 @@ if(vars.exists("$field.STATUS") && (vars.get("$field.STATUS") != "" ))
TicketfieldValues["DATE_END"] = vars.get("$sys.date");
TicketfieldValues["CONCLUSION"] = vars.get("$field.CONCLUSION");
}
- if(activityContent != "")
- {
- activityContent += " / "
- }
- activityContent += translate.text("Status changed to") + ": " + KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), vars.get("$field.STATUS"));
-
- TaskfieldValue["STATUS"] = vars.get("$field.STATUS");
+ TaskfieldValues["STATUS"] = vars.get("$field.STATUS");
TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date");
}
}
@@ -79,23 +69,11 @@ if(vars.exists("$field.STATUS") && (vars.get("$field.STATUS") != "" ))
if(vars.exists("$field.EDITOR_CONTACT_ID") && (vars.get("$field.EDITOR_CONTACT_ID") != "" ))
{
TicketfieldValues["EDITOR_CONTACT_ID"] = vars.get("$field.EDITOR_CONTACT_ID");
- if(activityContent != "")
- {
- activityContent += " / "
- }
- activityContent += translate.text("Editor changed to") + ": " + ContactUtils.getFullTitleByContactId(vars.get("$field.EDITOR_CONTACT_ID"),false);
-
}
/// CATEGORY
if(vars.exists("$field.CATEGORY") && (vars.get("$field.CATEGORY") != "" ))
{
TicketfieldValues["CATEGORY"] = vars.get("$field.CATEGORY");
- if(activityContent != "")
- {
- activityContent += " / "
- }
- activityContent += translate.text("Category changed to") + ": " + KeywordUtils.getViewValue($KeywordRegistry.ticketCategory(), vars.get("$field.CATEGORY"));
-
}
/// UPDATE TICKET & TASK
@@ -119,8 +97,8 @@ if (ChangeCounter > 1)
if (ChangeCounter == 1)
{
question.showMessage(translate.text("You tried to change the status of a ticket from 'ended' to another status.")
- + " " + translate.text("The status-change of these tickets was skipped. Any other changes were carried out.")
+ + " " + translate.text("The status-change of the ticket was skipped. Any other changes were carried out.")
+ " " + translate.text("To re-open tickets, please use the corresponding action."), question.INFORMATION, translate.text("Status change skipped!"));
}
neon.closeImage(vars.get("$sys.currentimage"), true)
-neon.refresh();
+neon.refreshAll();
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index efe8e6a961..e79b611198 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -11351,6 +11351,18 @@
<entry>
<key>manually</key>
</entry>
+ <entry>
+ <key>Contact or company</key>
+ </entry>
+ <entry>
+ <key>To re-open tickets, please use the corresponding action.</key>
+ </entry>
+ <entry>
+ <key>The status-change of the ticket was skipped. Any other changes were carried out.</key>
+ </entry>
+ <entry>
+ <key>general</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 e31f2b8927..cbc4b9dfd5 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -58,7 +58,7 @@
<value>Sie müssen mindestens einen Empfänger eintragen.</value>
</entry>
<entry>
- <key>To re-opening tickets, please use the corresponding action.</key>
+ <key>To re-open tickets, please use the corresponding action.</key>
<value>Nutzen Sie bitte die entsprechende Aktion, um Tickets wiederzueröffnen.</value>
</entry>
<entry>
@@ -83,7 +83,7 @@
</entry>
<entry>
<key>You tried to change the status of \"%0\" tickets from 'ended' to another status.</key>
- <value>Sie haben versucht den Status von \"%0\" Tickets von 'abgeschlossen zu einem anderen Status zu ändern.</value>
+ <value>Sie haben versucht den Status von \"%0\" Tickets von 'abgeschlossen' zu einem anderen Status zu ändern.</value>
</entry>
<entry>
<key>Ticket was duplicated by</key>
@@ -6047,6 +6047,10 @@
<key>Tag</key>
<value>Tag</value>
</entry>
+ <entry>
+ <key>general</key>
+ <value>Allgemein</value>
+ </entry>
<entry>
<key>Title suffix</key>
<value>Namenszusatz</value>
@@ -13443,6 +13447,10 @@ Bitte Datumseingabe prüfen</value>
<key>determined in</key>
<value>ermittelt in</value>
</entry>
+ <entry>
+ <key>The status-change of the ticket was skipped. Any other changes were carried out.</key>
+ <value>Die Statusänderungen dieses Tickets wurde übersprungen. Alle anderen Änderungen wurden durchgeführt.</value>
+ </entry>
<entry>
<key>duplicate Ticket</key>
<value>Duplizieren</value>
@@ -14653,6 +14661,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>New Service ticket</key>
+ <value>Neues Serviceticket</value>
</entry>
<entry>
<key>Use all service ticket categories</key>
@@ -14815,14 +14824,7 @@ Bitte Datumseingabe prüfen</value>
<key>Further informations</key>
</entry>
<entry>
- <key>${TASK_PROTECTIONLEVEL}</key>
- <value>Private Aufgabe</value>
- </entry>
- <entry>
- <key>Manually</key>
- </entry>
- <entry>
- <key>Consisted customer</key>
+ <key>Kd.-Nr.</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 c5e651ab5e..f1975b044e 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -11449,6 +11449,18 @@
<entry>
<key>manually</key>
</entry>
+ <entry>
+ <key>Contact or company</key>
+ </entry>
+ <entry>
+ <key>To re-open tickets, please use the corresponding action.</key>
+ </entry>
+ <entry>
+ <key>The status-change of the ticket was skipped. Any other changes were carried out.</key>
+ </entry>
+ <entry>
+ <key>general</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab