[Projekt: Crowd-Development / Besuch vor Ort][TicketNr.: 1068872][[Bug]...

[Projekt: Crowd-Development / Besuch vor Ort][TicketNr.: 1068872][[Bug] Wochenplaneintrag Vorbelegung von Kontakt fehlerhaft]

entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod

@@ -36,7 +36,6 @@
       <title>Organisation</title>
       <consumer>Organisations</consumer>
       <mandatory v="true" />
-      <stateProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/displayValueProcess.js</displayValueProcess>
     </entityField>

entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js

+import("Sql_lib");
 import("system.logging");
 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))
-    result.string(vars.get("$param.ContactId_param"));
+{
+    var isPersonContact = newSelect("PERSON.PERSONID").from("PERSON")
+        .join("CONTACT", "PERSON.PERSONID = CONTACT.PERSON_ID")
+        .where("CONTACT.CONTACTID", vars.get("$param.ContactId_param")).cell()
+
+    if(isPersonContact)
+        result.string(vars.get("$param.ContactId_param"));
+}    
 
 

entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/stateProcess.js

-import("system.logging");
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null 
-    && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
-{
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
-}
\ No newline at end of file

entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js

+import("Sql_lib");
 import("system.neon");
 import("system.result");
 import("system.vars");
@@ -5,5 +6,15 @@ import("system.vars");
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null 
     && vars.exists("$param.OrganisationId_param") && vars.get("$param.OrganisationId_param"))
 {
-    result.string(vars.get("$param.OrganisationId_param"));
+    
+    var OrgId = newSelect("CONTACT.ORGANISATION_ID").from("CONTACT")
+        .where("CONTACT.CONTACTID", vars.get("$param.OrganisationId_param"))
+        .cell()
+    
+    var contactIdWithoutPerson = newSelect("CONTACT.CONTACTID").from("CONTACT")
+        .where("CONTACT.ORGANISATION_ID", OrgId)
+        .and("CONTACT.PERSON_ID is null")
+        .cell()
+        
+    result.string(contactIdWithoutPerson);
 }
\ No newline at end of file