Merge branch '1059109_FixVisitrecommendationDeDate' into '2020.1'

[Projekt: Entwicklung - Neon][TicketNr.: 1059109][VisitplanRecommendation Fälligkeits Datum Fix]

See merge request xrm/basic!268

entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js

@@ -6,7 +6,7 @@ import("system.vars");
 
 var rowData = vars.get("$local.rowdata");
 
-var valuesEntry = [
+var values = [
     rowData["ENTRYDATE.value"],
     rowData["BEGIN_TIME.value"],
     rowData["END_TIME.value"],
@@ -24,6 +24,6 @@ var columns = [
 
 var columnTypes = db.getColumnTypes("VISITPLANENTRY", columns, db.getCurrentAlias());
 
-var cond = newWhere("VISITPLANENTRY.VISITPLANENTRYID", vars.get("$field.UID"));
+var cond = newWhere("VISITPLANENTRY.VISITPLANENTRYID", vars.get("$field.UID")).toString();
 
 db.updateData("VISITPLANENTRY", columns, columnTypes, values, cond);

entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js

+import("system.eMath");
 import("system.tools");
 import("PostalAddress_lib");
 import("system.translate");
@@ -17,15 +18,14 @@ import("Util_lib");
 import("Address_lib");
 
 var recommendationData = [];
-
+var tmpData = [];
 var activitySubQuery = "";
 
-activitySubQuery = newSelect("ENTRYDATE")
+activitySubQuery = newSelect("max(ENTRYDATE)")
                                 .from("ACTIVITY")
                                 .join("ACTIVITYLINK", "ACTIVITYID = ACTIVITY_ID")
-                                .where("ACTIVITYLINK.OBJECT_ROWID", "CONTACTID")
+                                .where("ACTIVITYLINK.OBJECT_ROWID = org.ORGANISATIONID")
                                 .and("ACTIVITY.CATEGORY", "VISIT")
-                                .orderBy("ENTRYDATE desc").cell()
 
 var idValues = false;
 if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
@@ -106,7 +106,7 @@ recommendationSQLData = recommendationSQLData.table();
 
 for( let i = 0; i < recommendationSQLData.length; i++)
 {
-    var tmpData = [];
+    tmpData = [];
 
     var organisationName = ContactUtils.getFullTitleByContactId(recommendationSQLData[i][1])
     if(recommendationSQLData[i][2])
@@ -139,14 +139,14 @@ for( let i = 0; i < recommendationSQLData.length; i++)
     recommendationData.push(tmpData);
 }
 
-var monthly = datetime.ONE_DAY * 31;
-var semiannually = datetime.ONE_DAY * 183;
-var quarterly = datetime.ONE_DAY * 93;
-var yearly = datetime.ONE_DAY * 365;
+var monthly = parseInt(datetime.ONE_DAY * 31);
+var semiannually = parseInt(datetime.ONE_DAY * 183);
+var quarterly = parseInt(datetime.ONE_DAY * 93);
+var yearly = parseInt(datetime.ONE_DAY * 365);
 
-for (let i = 0; i < visitFrequencyData.length; i++)
+for (var i = 0; i < visitFrequencyData.length; i++)
 {
-    let tmpData = [];
+    tmpData = [];
     
     let title = "";
    
@@ -161,44 +161,45 @@ for (let i = 0; i < visitFrequencyData.length; i++)
     tmpData[3] = visitFrequencyData[i][2];                 //Address
     tmpData[5] = visitFrequencyData[i][4];                 //Source of Priority
     tmpData[8] = "";
-    tmpData[9] = visitFrequencyData[i][5];                 //CONTACT_ID
-    tmpData[2] = visitFrequencyData[i][6];                 //Date_Planned
+    tmpData[9] = visitFrequencyData[i][5];                 //last visit
+    tmpData[2] = visitFrequencyData[i][6];                 //CONTACT_ID
     var dueDate = "";
     var lastVisitDate = "";
 
-    if((visitFrequencyData[i][6]).length == 0)
+    if((visitFrequencyData[i][5]).length == 0)
     {
         dueDate = datetime.date();
     }
     else
     {
-        lastVisitDate = parseInt(visitFrequencyData[i][6]);
-        switch(visitFrequencyData[i][4])
+        lastVisitDate = visitFrequencyData[i][5];
+        switch(visitFrequencyData[i][3])
         {
             case $AttributeRegistry.visitPlanFrequency$monthly():
             {
-                dueDate = lastVisitDate + monthly;
+                dueDate = eMath.addInt(lastVisitDate, monthly);
                 break;
             }
             case $AttributeRegistry.visitPlanFrequency$quarterly():
             {
-                dueDate = lastVisitDate + quarterly;
+                dueDate = eMath.addInt(lastVisitDate, quarterly);
                 break;
             }
             case $AttributeRegistry.visitPlanFrequency$semiannually():
             {
-                dueDate = lastVisitDate + semiannually;
+                dueDate = eMath.addInt(lastVisitDate, semiannually);
                 break;
             }
             case $AttributeRegistry.visitPlanFrequency$yearly():
             {
-                dueDate = lastVisitDate + yearly;
+                dueDate = eMath.addInt(lastVisitDate, yearly);
                 break;
             }
             default:
             {
                 break;
             }
+
         }
     }