[Projekt: Crowd-Development / Besuch vor Ort][TicketNr.: 1066742][[aus...

[Projekt: Crowd-Development / Besuch vor Ort][TicketNr.: 1066742][[aus Schmalz] Besuchsvorschlags-Logik unter Berücksichtigung bereits erfolgter Aktivitäten]

entity/Activity_entity/recordcontainers/db/onDBInsert.js

@@ -32,8 +32,8 @@ if(vars.exists("$param.VisitPlanEntryId_param") && vars.get("$param.VisitPlanEnt
                             .updateData(true, "VISITPLANENTRY", columns, null, values);
                             
     var recommendationId = newSelect("VISITPLANENTRY.VISITRECOMMENDATION_ID").from("VISITPLANENTRY").where("VISITPLANENTRY.VISITPLANENTRYID", vars.get("$param.VisitPlanEntryId_param"))
-    var updateRecommendation = newWhere("VISITRECOMMENDATION.VISITRECOMMENDATIONID", recommendationId)
-                                .updateData(true, "VISITRECOMMENDATION", ["STATUS"], null, [$KeywordRegistry.visitPlanEntryStatus$Visitreportcreated()])
+    
+    newWhere("VISITRECOMMENDATION.VISITRECOMMENDATIONID", recommendationId).deleteData(true, "VISITRECOMMENDATION");
 }
 
 if (vars.exists("$param.InsertLinks_param") && vars.get("$param.InsertLinks_param"))

entity/VisitRecommendation_entity/VisitRecommendation_entity.aod

@@ -68,7 +68,7 @@
       <name>DUE_DATE</name>
       <title>Due Date</title>
       <contentType>DATE</contentType>
-      <resolution>MINUTE</resolution>
+      <resolution>DAY</resolution>
       <outputFormat>dd.MM.yyyy</outputFormat>
       <inputFormat>dd.MM.yyyy</inputFormat>
       <groupable v="true" />

entity/VisitRecommendation_entity/entityfields/contact_id/valueProcess.js

@@ -3,5 +3,5 @@ import("system.neon");
 import("system.result");
 import("system.vars");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && (vars.get("$this.value") == null || vars.get("$this.value") == undefined))
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
     result.string(vars.get("$param.ContactId_param"));
\ No newline at end of file

entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js

@@ -182,13 +182,21 @@ if(idValues == false)
             "" //RESPONSIBLE.value
         ];
         
-        var manualRec = newSelect("STATUS")
+        var manualRec = newSelect("VISITRECOMMENDATION.VISITRECOMMENDATIONID")
         .from("VISITRECOMMENDATION")
         .where("VISITRECOMMENDATION.CONTACT_ID", tmpData[0])
         .or("VISITRECOMMENDATION.CONTACT_PERSON_ID", tmpData[0])
         .cell()
-
-        if(manualRec == "VISITSTATUSREPORTCREATED            ")
+        
+        var visitEntry = newSelect("VISITPLANENTRY.VISITPLANENTRYID")
+        .from("VISITPLANENTRY")
+        .where(newWhere("VISITPLANENTRY.CONTACT_ID", tmpData[0])
+            .or("VISITPLANENTRY.ORGANISATION_CONTACT_ID", tmpData[0]))
+        .and(newWhere("VISITPLANENTRY.ENTRYDATE", eMath.subInt(vars.get("$sys.today"), datetime.ONE_DAY * 7), SqlBuilder.LESS_OR_EQUAL())
+            .and("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Visitreportcreated(), SqlBuilder.NOT_EQUAL()))
+            .cell();
+        
+        if(!manualRec || visitEntry)
             recommendationData.push(tmpData);
     }
 }

entity/VisitRecommendation_entity/recordcontainers/jdito/onInsert.js

@@ -3,12 +3,11 @@ import("system.db");
 import("system.vars");
 
 var rowData = vars.get("$local.rowdata");
-var contact_id = rowData["CONTACT_ID.value"];
 var source = $KeywordRegistry.visitRecommendationPrioSource$manual();
 
 var values = [
     rowData["UID.value"],
-    contact_id,
+    rowData["CONTACT_ID.value"],
     rowData["DUE_DATE.value"],
     rowData["PRIORITY.value"],
     source,

entity/VisitRecommendation_entity/recordcontainers/jdito/onUpdate.js

@@ -5,6 +5,7 @@ import("system.vars");
 var rowdata = vars.get("$local.rowdata");
 var dbFields = {
     "ORGANISATION_NAME.value": "ORGANISATION_NAME",
+    "CONTACT_ID.value": "CONTACT_ID",
     "ORGANISATION_POINT_OF_CONTACT.value": "ORGANISATION_POINT_OF_CONTACT",
     "ORGANISATION_ADDRESS.value" : "ORGANISATION_ADDRESS",
     "PRIORITY.value" : "PRIORITY",