From aad8f553a280a6c3a8c84163e93d48d2009143a4 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Mon, 11 May 2020 13:42:39 +0200
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1055453][To-Do
Dashlet Kennzahlen fehlerhaft]
---
aliasDefinition/Data_alias/Data_alias.aod | 16 +++++++++++++++-
.../entityfields/new_tasks/valueProcess.js | 1 +
.../entityfields/overdue_tasks/valueProcess.js | 1 +
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 3cf0386dfd..5bc48bf160 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1686,7 +1686,7 @@
<name>GROUPCODEID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
+ <columnType v="12" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
@@ -14925,6 +14925,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CONTACT_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
</entities>
diff --git a/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js b/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
index 510afae5b2..3e2e63befe 100644
--- a/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
+++ b/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
@@ -7,6 +7,7 @@ import("KeywordRegistry_basic");
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();
diff --git a/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js b/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
index a143770f57..98e88dd158 100644
--- a/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
+++ b/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
@@ -7,6 +7,7 @@ import("system.result");
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())
.and("TASK.STATUS", TaskUtils.getEndedStatuses(), SqlBuilder.NOT_IN())
.cell()
--
GitLab