[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/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js

@@ -192,12 +192,20 @@ if(idValues == false)
         .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);
+       var visitEntryExists = visitEntry.cell();
+       
+       visitEntry = visitEntry.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()))
+            .or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Visitreportcreated(), SqlBuilder.EQUAL()).cell()
+       
+       if(!manualRec)
+       {
+           if(!visitEntryExists || visitEntry)
+           {    
+               recommendationData.push(tmpData);
+           }
+       }
     }
 }