Merge branch 'cm_2001570_AnalysesDashboard' into '2021.2'

[Projekt: xRM-ContactManagement][TicketNr.: 2001570][Dashlet ToDo zeigt falsche/keine Aufgaben an]

See merge request xrm/basic!1478

entity/Analyses_entity/entityfields/new_tasks/valueProcess.js

 import("Employee_lib");
-import("system.db");
 import("system.result");
 import("Sql_lib");
 import("KeywordRegistry_basic");
-                     
+
+var contactId = EmployeeUtils.getCurrentContactId();
+var departmentId = EmployeeUtils.getUsersDepartment(contactId, false);
+
 var opentask = newSelect("count(TASKID)")
     .from("TASK")
-    .where("TASK.STATUS", $KeywordRegistry.taskStatus$new())
-    .and ("TASK.KIND", "TASK")
-    .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
-    .cell();
+    .join("TASKATTENDEES","TASKATTENDEES.TASK_ID = TASK.TASKID")
+    .where(
+        newWhere("TASKATTENDEES.CONTACT_ID", contactId)
+        .or("TASKATTENDEES.DEPARTMENT_ID",departmentId)
+    )
+    .and("TASK.STATUS", $KeywordRegistry.taskStatus$new())
+    .cell();  
     
 result.string(opentask || 0);
\ No newline at end of file

entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js

@@ -4,10 +4,17 @@ import("Sql_lib");
 import("Employee_lib");
 import("system.neon");
 
+var contactId = EmployeeUtils.getCurrentContactId();
+var departmentId = EmployeeUtils.getUsersDepartment(contactId, false);
+
 var taskIds = newSelect("TASKID")
     .from("TASK")
-    .where("TASK.STATUS", $KeywordRegistry.taskStatus$new())
-    .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
+    .join("TASKATTENDEES","TASKATTENDEES.TASK_ID = TASK.TASKID")
+    .where(
+        newWhere("TASKATTENDEES.CONTACT_ID", contactId)
+        .or("TASKATTENDEES.DEPARTMENT_ID", departmentId)
+    )
+    .and("TASK.STATUS", $KeywordRegistry.taskStatus$new())
     .arrayColumn();
 
 var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist(taskIds).toString();

entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js

 import("system.neonFilter");
 import("system.neon");
-import("system.db");
 import("ActivityTask_lib");
 import("Employee_lib");
 import("system.vars");
 import("Sql_lib");
 
+var contactId = EmployeeUtils.getCurrentContactId();
+var departmentId = EmployeeUtils.getUsersDepartment(contactId, false);
+
 var overdueTask = newSelect("TASKID")
                     .from("TASK")
-                    .where("TASK.MATURITY_DATE", "$sys.date", SqlBuilder.LESS())
-                    .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
+                    .join("TASKATTENDEES","TASKATTENDEES.TASK_ID = TASK.TASKID")
+                    .where(
+                        newWhere("TASKATTENDEES.CONTACT_ID", contactId)
+                        .or("TASKATTENDEES.DEPARTMENT_ID",departmentId)
+                    )
+                    .and("TASK.MATURITY_DATE", "$sys.date", SqlBuilder.LESS())
                     .and("TASK.STATUS", TaskUtils.getEndedStatuses(), SqlBuilder.NOT_IN())
-                    .array(db.COLUMN)
+                    .arrayColumn();
 
 var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist(overdueTask).toString();
 neon.openContextWithRecipe("Task", "TaskFilter_view", recipe, neon.OPERATINGSTATE_SEARCH);

entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js

-import("system.vars");
+import("system.result");
+import("system.neon");
+import("ActivityTask_lib");
 import("Employee_lib");
+import("system.vars");
 import("Sql_lib");
-import("ActivityTask_lib");
-import("system.result");
+
+var contactId = EmployeeUtils.getCurrentContactId();
+var departmentId = EmployeeUtils.getUsersDepartment(contactId, false);
 
 var overdueTaskCount = newSelect("count(TASKID)")
                     .from("TASK")
-                    .where("TASK.MATURITY_DATE", "$sys.date", SqlBuilder.LESS())
-                    .and ("TASK.KIND", "TASK")
-                    .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
+                    .join("TASKATTENDEES","TASKATTENDEES.TASK_ID = TASK.TASKID")
+                    .where(
+                        newWhere("TASKATTENDEES.CONTACT_ID", contactId)
+                        .or("TASKATTENDEES.DEPARTMENT_ID",departmentId)
+                    )
+                    .and("TASK.MATURITY_DATE", vars.get("$sys.date"), SqlBuilder.LESS())
                     .and("TASK.STATUS", TaskUtils.getEndedStatuses(), SqlBuilder.NOT_IN())
-                    .cell()
+                    .cell();
 
 result.string(overdueTaskCount);
\ No newline at end of file

entity/Task_entity/Task_entity.aod

@@ -490,7 +490,7 @@
     </entityField>
     <entityField>
       <name>connections</name>
-      <title>Verknuepfungen</title>
+      <title>Connections</title>
     </entityField>
     <entityField>
       <name>DATE_EDIT</name>

process/migrateTask/process.js

@@ -24,7 +24,7 @@ oldTasks.forEach(function (pTask) {
     logging.log(text.text2html(pTask[0], true));
     statements.push(newWhereIfSet("TASK.TASKID", pTask[1])
         .buildUpdateStatement({
-            "TASK.DESCRIPTION" : text.text2html(pTask[0], true)
+            "DESCRIPTION" : text.text2html(pTask[0], true)
         }, "TASK"));
         
         statements.push(new SqlBuilder().buildInsertStatement({