Merge branch '1060845_FixVisitplanOrgAsDefaultValue' into '2020.1'

1060845 fix visitplan org as default value

See merge request xrm/basic!332

entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod

@@ -182,9 +182,7 @@
       <title>Contact</title>
       <consumer>Persons</consumer>
       <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
-      <onValidation>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js</onValidation>
     </entityField>
     <entityConsumer>
       <name>Persons</name>
@@ -196,9 +194,12 @@
       <children>
         <entityParameter>
           <name>ExcludedContactIds_param</name>
-          <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js</valueProcess>
           <expose v="true" />
         </entityParameter>
+        <entityParameter>
+          <name>OnlyShowContactIds_param</name>
+          <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityParameter>

entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js

-import("Person_lib");
+import("Contact_lib");
 import("system.db");
 import("system.result");
 import("system.vars");
 
 
 var contactId = vars.get("$field.CONTACT_ID");
-var res = db.cell(PersUtils.getResolvingDisplaySubSql("'" + contactId + "'"));
+var res = ContactUtils.getFullTitleByContactId(contactId);
 
 result.string(res);
\ No newline at end of file

entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js

-import("system.translate");
-import("system.result");
-import("Contact_lib");
-import("system.vars");
-
-var orgId = vars.get("$field.ORGANISATION_CONTACT_ID");
-var contactId = vars.get("$field.CONTACT_ID");
-var orgContactId = ContactUtils.getPersOrgIds(contactId)[2];
-
-if(orgId != orgContactId)
-    result.string(translate.text("Contact has to be employee in the chosen Organisation"))
\ No newline at end of file

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.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
-{
-    var contactId = vars.get("$param.ContactId_param");
-    var orgId = newSelect("CONTACT.ORGANISATION_ID")
-                            .from("CONTACT")
-                            .where("CONTACT.CONTACTID", contactId)
-                            .cell();
-    neon.setFieldValue("$field.ORGANISATION_CONTACT_ID", orgId);
-    result.string(vars.get("$param.ContactId_param"));
-}
\ No newline at end of file

entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js

-import("system.logging");
 import("system.neon");
 import("system.result");
 import("system.vars");

entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js → entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js

+import("Contact_lib");
 import("system.result");
 import("system.vars");
 import("Sql_lib");
 
+var orgContactId = vars.get("$field.ORGANISATION_CONTACT_ID");
 var contactIdArray = newSelect("CONTACT.CONTACTID")
                                 .from("CONTACT")
-                                .where("CONTACT.ORGANISATION_ID", vars.get("$field.ORGANISATION_CONTACT_ID"), SqlBuilder.NOT_EQUAL())
-                                .arrayColumn()
+                                .where("CONTACT.ORGANISATION_ID", ContactUtils.getPersOrgIds(orgContactId)[2], SqlBuilder.EQUAL())
+                                .and("CONTACT.CONTACTID", orgContactId, SqlBuilder.NOT_EQUAL())
+                                .arrayColumn();
+                                
 result.object(contactIdArray)
\ No newline at end of file

entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js

@@ -166,8 +166,9 @@ if(idValues == false)
         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
+        tmpData[4] = visitFrequencyData[i][5];                 //last visit
+        tmpData[9] = visitFrequencyData[i][6];                 //ContactId
+        tmpData[2] = visitFrequencyData[i][1];                 //OrganisationId
         var dueDate = "";
         var lastVisitDate = "";