From e661eb84e27cd707f68fb2fe8e02d39dc5e68c85 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Mon, 29 Jun 2020 13:05:00 +0200
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1060332][Visitplan
kleine Fixes]
---
.../recordcontainers/jdito/contentProcess.js | 116 +++++++++---------
.../VisitPlanEmployeeWeekPreview_view.aod | 2 +-
2 files changed, 62 insertions(+), 56 deletions(-)
diff --git a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
index 0019a67dda..26a88f9571 100644
--- a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
@@ -34,6 +34,8 @@ if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
//dynamic Recommendations
//recommended Organisations containing the attribute Visit Frequency
+if(idValues == false)
+{
var visitFrequencyData = newSelect(["org.ORGANISATIONID", "NAME",
newSelect("CONTACT.CONTACTID")
.from("CONTACT")
@@ -64,6 +66,7 @@ if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
.join("AB_ATTRIBUTERELATION", "visitPlanFrequency.OBJECT_ROWID = CONTACT.CONTACTID", "visitPlanFrequency")
.where(["AB_ATTRIBUTERELATION", "AB_ATTRIBUTE_ID", "visitPlanFrequency"], $AttributeRegistry.visitPlanFrequency())
.table();
+ }
var recommendationSQLData = newSelect(["VISITRECOMMENDATIONID", "VISITRECOMMENDATION.CONTACT_ID", "PRIORITY", "DUE_DATE", "SOURCE", "INFO", AddressUtils.formatOnelineSql(),
newSelect("CONTACT.CONTACTID")
@@ -144,70 +147,73 @@ var semiannually = parseInt(datetime.ONE_DAY * 183);
var quarterly = parseInt(datetime.ONE_DAY * 93);
var yearly = parseInt(datetime.ONE_DAY * 365);
-for (var i = 0; i < visitFrequencyData.length; i++)
+if(idValues == false)
{
- tmpData = [];
-
- let title = "";
-
- if(visitFrequencyData[i][9])
+ for (var i = 0; i < visitFrequencyData.length; i++)
{
- let user = tools.getUserByAttribute(tools.CONTACTID, visitFrequencyData[i][9]);
- title = user[tools.TITLE]
- }
+ tmpData = [];
- tmpData[0] = visitFrequencyData[i][0]; //UID
- tmpData[1] = visitFrequencyData[i][1]; //Organisation Name
- tmpData[3] = visitFrequencyData[i][2]; //Address
- tmpData[5] = visitFrequencyData[i][4]; //Source of Priority
- tmpData[8] = "";
- tmpData[9] = visitFrequencyData[i][5]; //last visit
- tmpData[2] = visitFrequencyData[i][6]; //CONTACT_ID
- var dueDate = "";
- var lastVisitDate = "";
-
- if((visitFrequencyData[i][5]).length == 0)
- {
- dueDate = datetime.date();
- }
- else
- {
- lastVisitDate = visitFrequencyData[i][5];
- switch(visitFrequencyData[i][3])
+ let title = "";
+
+ if(visitFrequencyData[i][9])
{
- case $AttributeRegistry.visitPlanFrequency$monthly():
- {
- dueDate = eMath.addInt(lastVisitDate, monthly);
- break;
- }
- case $AttributeRegistry.visitPlanFrequency$quarterly():
- {
- dueDate = eMath.addInt(lastVisitDate, quarterly);
- break;
- }
- case $AttributeRegistry.visitPlanFrequency$semiannually():
- {
- dueDate = eMath.addInt(lastVisitDate, semiannually);
- break;
- }
- case $AttributeRegistry.visitPlanFrequency$yearly():
- {
- dueDate = eMath.addInt(lastVisitDate, yearly);
- break;
- }
- default:
+ let user = tools.getUserByAttribute(tools.CONTACTID, visitFrequencyData[i][9]);
+ title = user[tools.TITLE]
+ }
+
+ tmpData[0] = visitFrequencyData[i][0]; //UID
+ tmpData[1] = visitFrequencyData[i][1]; //Organisation Name
+ tmpData[3] = visitFrequencyData[i][2]; //Address
+ tmpData[5] = visitFrequencyData[i][4]; //Source of Priority
+ tmpData[8] = "";
+ tmpData[9] = visitFrequencyData[i][5]; //last visit
+ tmpData[2] = visitFrequencyData[i][6]; //CONTACT_ID
+ var dueDate = "";
+ var lastVisitDate = "";
+
+ if((visitFrequencyData[i][5]).length == 0)
+ {
+ dueDate = datetime.date();
+ }
+ else
+ {
+ lastVisitDate = visitFrequencyData[i][5];
+ switch(visitFrequencyData[i][3])
{
- break;
- }
+ case $AttributeRegistry.visitPlanFrequency$monthly():
+ {
+ dueDate = eMath.addInt(lastVisitDate, monthly);
+ break;
+ }
+ case $AttributeRegistry.visitPlanFrequency$quarterly():
+ {
+ dueDate = eMath.addInt(lastVisitDate, quarterly);
+ break;
+ }
+ case $AttributeRegistry.visitPlanFrequency$semiannually():
+ {
+ dueDate = eMath.addInt(lastVisitDate, semiannually);
+ break;
+ }
+ case $AttributeRegistry.visitPlanFrequency$yearly():
+ {
+ dueDate = eMath.addInt(lastVisitDate, yearly);
+ break;
+ }
+ default:
+ {
+ break;
+ }
+ }
}
- }
-
- tmpData[7] = dueDate; //Due Date
- tmpData[4] = getPrioByDueDate(dueDate); //Priority
- recommendationData.push(tmpData);
+ tmpData[7] = dueDate; //Due Date
+ tmpData[4] = getPrioByDueDate(dueDate); //Priority
+
+ recommendationData.push(tmpData);
+ }
}
diff --git a/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod b/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod
index f3d4c1d463..7c1d4abf3b 100644
--- a/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod
+++ b/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod
@@ -3,7 +3,7 @@
<name>VisitPlanEmployeeWeekPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<size>SMALL</size>
- <isOverlay v="true" />
+ <isOverlay v="false" />
<overlayOrientation>PORTRAIT</overlayOrientation>
<layout>
<headerFooterLayout>
--
GitLab