Skip to content
Snippets Groups Projects
Commit 808a38c5 authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong:
Browse files

Merge branch '2021.2_2000760_TaskDuplicateUser_mw' into '2021.2.1'

[Projekt: xRM-ContactManagement][TicketNr.: 2000760][Aufgaben - Doppelte...

See merge request xrm/basic!1373
parents 80a9511d 430be1a3
No related branches found
No related tags found
No related merge requests found
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment