From 430be1a373cf381fc6cb5da9419d1773a5f4f249 Mon Sep 17 00:00:00 2001
From: "m.wachsmuth" <m.wachsmuth@MWACHSMUTH.aditosoftware.local>
Date: Fri, 24 Sep 2021 14:22:25 +0200
Subject: [PATCH] =?UTF-8?q?[Projekt:=20xRM-ContactManagement][TicketNr.:?=
=?UTF-8?q?=202000760][Aufgaben=20-=20Doppelte=20Verkn=C3=BCpfung=20wenn?=
=?UTF-8?q?=20Person=20und=20Abteilung=20hinterlegt=20ist=20bei=20Einzelau?=
=?UTF-8?q?fgabe]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
entity/Task_entity/afterSave.js | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/entity/Task_entity/afterSave.js b/entity/Task_entity/afterSave.js
index 267d8e8163..a7a8810fcc 100644
--- a/entity/Task_entity/afterSave.js
+++ b/entity/Task_entity/afterSave.js
@@ -13,9 +13,10 @@ var data = vars.get("$local.entitydata")
var contactIds = newSelect("CONTACT_ID")
.from("TASKATTENDEES")
.where("TASKATTENDEES.TASK_ID", data["TASKID"])
+.and("TASKATTENDEES.DEPARTMENT_ID is null")
.arrayColumn();
-var avaiableAttendees = contactIds;
+var avaiableAttendees = contactIds; // all Attendees without department user
if(contactIds.length > 0)
var contactIdsAvaiable = contactIds[0].length > 0;
@@ -67,7 +68,7 @@ if(data["createSingleTasks"] == 1 && vars.get("$local.recordstate") == "NEW" &&
//remove duplicates in contactIds
contactIds = Array.from(new Set(contactIds));
-
+
var colsTask = [
"TASKID",
"KIND",
@@ -133,7 +134,7 @@ if(data["createSingleTasks"] == 1 && vars.get("$local.recordstate") == "NEW" &&
var condAttendees = "TASK_ID = '" + data["TASKID"] + "' and CONTACT_ID = '" + contactIds[i] + "'"
db.insertData("TASK", colsTask, null, valsTask);
-
+
if(avaiableAttendees.includes(contactIds[i]))
db.updateData("TASKATTENDEES", ["TASK_ID"], null, [uuidTask], condAttendees);
else db.insertData("TASKATTENDEES", colsAttendees, null, valsAttendees)
@@ -149,7 +150,7 @@ if(data["createSingleTasks"] == 1 && vars.get("$local.recordstate") == "NEW" &&
newWhere("TASKATTENDEES.TASK_ID", data["TASKID"]).and("TASKATTENDEES.DEPARTMENT_ID is not null")
.and("TASKATTENDEES.TASKATTENDEESID", departmentsAttendees, SqlBuilder.NOT_EQUAL()).deleteData()
-
+
db.updateData("TASKATTENDEES", ["DEPARTMENT_ID", "CONTACT_ID"], null, ["", contactIds[0]], "TASK_ID = '" + data["TASKID"]
+ "' and DEPARTMENT_ID is not null")
@@ -187,6 +188,6 @@ else if(vars.get("$local.recordstate") == "NEW" && contactIds.length == 0) {
data["TASKID"],
EmployeeUtils.getCurrentContactId()
]
-
+
db.insertData("TASKATTENDEES", colsAttendees, null, valsAttendees)
}
\ No newline at end of file
--
GitLab