Scan Service problems removed

1b6d7286 · S.Listl · 305fd250 · 1b6d7286 · 1b6d7286 · 1b6d7286
Commit 1b6d7286 authored 4 years ago by S.Listl
--- a/entity/Appointment_entity/entityfields/begin/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/begin/valueProcess.js
@@ -8,7 +8,7 @@ import("system.result");
 */
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
 {
-    var event = JSON.parse(vars.getString("$param.Entry_param"));
+    let event = JSON.parse(vars.getString("$param.Entry_param"));

    if(vars.get("$this.value"))
        result.string(vars.get("$this.value"));
@@ -21,6 +21,6 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
 */
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
 {
-    var event = JSON.parse(vars.getString("$param.Entry_param"));
+    let event = JSON.parse(vars.getString("$param.Entry_param"));
    result.string(event[calendars.DTSTART]);
 }
\ No newline at end of file
--- a/entity/Appointment_entity/entityfields/end/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/end/valueProcess.js
@@ -8,7 +8,7 @@ import("system.result");
 */
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
 {
-    var event = JSON.parse(vars.getString("$param.Entry_param"));
+    let event = JSON.parse(vars.getString("$param.Entry_param"));

    if(vars.get("$this.value"))
        result.string(vars.get("$this.value"));
@@ -21,6 +21,6 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
 */
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
 {
-    var event = JSON.parse(vars.getString("$param.Entry_param"));
+    let event = JSON.parse(vars.getString("$param.Entry_param"));
    result.string(event[calendars.DTEND]);
 }
\ No newline at end of file
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -27,6 +27,7 @@ function EmailWritingUtils () {}
 * @param {String} [pBindata] base64 binary data
 * @param {Array} [pAttachments] attachments in a array (base64 encoded).
 * @param {String} pSubject an optional subject.
+ * @param {String} [pEmailFilename] filename of the email.
 * @return {Array} the eml document as array with [filename, base64]
 */
 EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId, pTemplateId, pRecipientContactId, pBindata, pAttachments, pSubject, pEmailFilename)

--- a/process/updateActivities_serverProzess/process.js
+++ b/process/updateActivities_serverProzess/process.js
@@ -3,9 +3,9 @@ import("system.db");
 import("Sql_lib");

 var activities = new SqlBuilder().select(["ACTIVITY.INFO", "ACTIVITY.ACTIVITYID"]).from("ACTIVITY").where("ACTIVITY.CATEGORY", "MAIL").and("ACTIVITY.INFO", "<%", SqlBuilder.NOT_LIKE()).and("ACTIVITY.INFO","%<html>%", SqlBuilder.LIKE()).table();
-activities.forEach(function (row) {
-    let columnsToUpdate = ["INFO"];
-    let newValue = row[0].split("<br/>\n").map(function (el) 
+activities.forEach(function (row) 
+{
+    var newValue = row[0].split("<br/>\n").map(function (el) 
    {
    	if (el == "")
            return "<br>";
@@ -14,7 +14,6 @@ activities.forEach(function (row) {
        else 
            return "<p>" + el + "</p><br>";
    }).join("\n");
-    let projectIdCondition = SqlCondition.equals("ACTIVITY.ACTIVITYID", row[1], "1=2");
-    
-    db.updateData("ACTIVITY", columnsToUpdate, null, [newValue], projectIdCondition);
+    newWhere("ACTIVITY.ACTIVITYID", row[1])
+        .updateFields({"INFO" : newValue});
 });
\ No newline at end of file