Changes in Analyses_entity - show my Tasks (user-relationid)

entity/Analyses_entity/Analyses_entity.aod

@@ -40,6 +40,15 @@
       <name>openOverdueTasks</name>
       <onActionProcess>%aditoprj%/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js</onActionProcess>
     </entityActionField>
+    <entityField>
+      <name>TURNOVER_FORECAST</name>
+      <title>My Forecast</title>
+      <valueProcess>%aditoprj%/entity/Analyses_entity/entityfields/turnover_forecast/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>MYTURNOVER</name>
+      <title>My Turnover</title>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>

entity/Analyses_entity/documentation.adoc

 = Analyses_entity
 
-Logic and information for the ScoreCard displays openTasks, apointments, ... for the user
\ No newline at end of file
+Logic and information for the ScoreCard displays openTasks, apointments, ... for the logged in user
\ No newline at end of file

entity/Analyses_entity/entityfields/new_tasks/valueProcess.js

-import("system.datetime");
+import("Employee_lib");
 import("system.db");
 import("system.result");
-import("system.vars");
-import("Date_lib");
-import("Sql_lib");
-import("system.SQLTYPES")
 
-var opentask = db.cell("select count(STATUS) from TASK join AB_KEYWORD_ENTRY on KEYID = STATUS and CONTAINER  = 'TaskStatus' and TITLE = 'new' group by KEYID, AB_KEYWORD_ENTRY.TITLE");                             
+var opentask = db.cell("select count(TASKID) "
+             + " from TASK "
+             + " where STATUS = 'NEW' and EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'");                             
                                   
-result.string(opentask);
+result.string(opentask);
\ No newline at end of file

entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js

+import("Employee_lib");
 import("system.db");
 import("system.neon");
 
-var taskIds = db.table("select TASKID from TASK join AB_KEYWORD_ENTRY on KEYID = STATUS and CONTAINER  = 'TaskStatus' and TITLE = 'new'", "Data_alias")
+var taskIds = db.table("select TASKID  "
+             + " from TASK "
+             + " where STATUS = 'NEW' and EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'", "Data_alias");
 
 neon.openContext("Task", "TaskFilter_view", taskIds, neon.OPERATINGSTATE_SEARCH, null);
\ No newline at end of file

entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js

+import("Employee_lib");
 import("system.vars");
 import("system.datetime");
 import("system.db");
@@ -6,7 +7,9 @@ import("Date_lib");
 import("Sql_lib");
 
 var overduetask = db.table(SqlCondition.begin()
-                                   .andPrepare("TASK.MATURITY_DATE", vars.get("$sys.date"), "# < ?")
-                                   .buildSql("select TASKID from TASK", "1=2"), "Data_alias");
+                    .andPrepare("TASK.MATURITY_DATE", vars.get("$sys.date"), "# < ?")
+                    .and("TASK.EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'")
+                    .and("TASK.STATUS NOT IN ('ENDED', 'ENDED-DONE', 'ENDED-ABANDONED')")
+                    .buildSql("select TASKID from TASK", "1=2"));
 
 neon.openContext("Task", "TaskFilter_view", overduetask, neon.OPERATINGSTATE_SEARCH, null);
\ No newline at end of file

entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js

+import("Employee_lib");
 import("system.db");
 import("system.datetime");
 import("system.result");
@@ -5,9 +6,10 @@ import("system.vars");
 import("Date_lib");
 import("Sql_lib");
 
-
 var overduetask = db.cell(SqlCondition.begin()
                                    .andPrepare("TASK.MATURITY_DATE", vars.get("$sys.date"), "# < ?")
+                                   .and("TASK.EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'")
+                                   .and("TASK.STATUS NOT IN ('ENDED', 'ENDED-DONE', 'ENDED-ABANDONED')")
                                    .buildSql("select count(TASKID) from TASK", "1=2"));
                                                                   
 result.string(overduetask);

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -46,6 +46,10 @@
       <key>Open tasks</key>
       <value>Offene Aufgaben</value>
     </entry>
+    <entry>
+      <key>My Forecast</key>
+      <value>Mein Forecast</value>
+    </entry>
     <entry>
       <key>Anonymization</key>
       <value>Anonymisierung</value>
@@ -77,6 +81,10 @@
       <key>LOW</key>
       <value>gering</value>
     </entry>
+    <entry>
+      <key>My Turnover</key>
+      <value>Mein Umsatz</value>
+    </entry>
     <entry>
       <key>NORMAL</key>
       <value>normal</value>