Merge branch 'cherry-pick-caac232e' into 'stable2019.3'

QuickEntry

See merge request xrm/basic!66

application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod

@@ -35,13 +35,13 @@
                 <kind v="10077" />
               </entityNode>
               <entityNode>
-                <name>QuickEntry</name>
+                <name>Task</name>
                 <kind v="10077" />
-                <title></title>
               </entityNode>
               <entityNode>
-                <name>Task</name>
+                <name>QuickEntry</name>
                 <kind v="10077" />
+                <title></title>
               </entityNode>
             </childNodes>
           </entityNode>

entity/Activity_entity/Activity_entity.aod

@@ -558,6 +558,11 @@
       <stateProcess>%aditoprj%/entity/Activity_entity/entityfields/bindata/stateProcess.js</stateProcess>
       <onValueChange>%aditoprj%/entity/Activity_entity/entityfields/bindata/onValueChange.js</onValueChange>
     </entityField>
+    <entityParameter>
+      <name>InsertLinks_param</name>
+      <expose v="true" />
+      <description>Links that will be inserted, required in QuickEntry</description>
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Activity_entity/recordcontainers/db/onDBInsert.js

@@ -20,3 +20,14 @@ else
 }
 if (documents)
     ActivityUtils.insertDocuments(vars.get("$local.uid"), documents);
+
+if (vars.exists("$param.InsertLinks_param") && vars.get("$param.InsertLinks_param"))
+{
+    var activityId = vars.get("$local.uid");
+    var insertLinks = vars.get("$param.InsertLinks_param");
+    insertLinks = JSON.parse(insertLinks);
+    insertLinks.forEach(function ([objectType, rowId])
+    {
+        ActivityUtils.insertLink(activityId, objectType, rowId);
+    });
+}
\ No newline at end of file

entity/Person_entity/recordcontainers/db/conditionProcess.js

-import("system.logging");
 import("system.vars");
 import("system.db");
 import("system.result");
@@ -13,6 +12,6 @@ if (vars.exists("$param.ExcludedContactIds_param") && vars.get("$param.ExcludedC
     var excludedContacts = JSON.parse(vars.getString("$param.ExcludedContactIds_param"));
     cond.andIn("CONTACT.CONTACTID", excludedContacts, undefined, true);
 }
-logging.log(cond.translate("1=1"))
+
 //TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
 result.string(cond.translate("1 = 1"));
\ No newline at end of file

entity/QuickEntry_entity/QuickEntry_entity.aod

@@ -107,16 +107,20 @@
       </dependency>
       <children>
         <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+          <name>Direction_param</name>
+          <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/activities/children/direction_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>InsertLinks_param</name>
+          <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/activities/children/insertlinks_param/valueProcess.js</valueProcess>
         </entityParameter>
         <entityParameter>
           <name>RowId_param</name>
           <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
         </entityParameter>
         <entityParameter>
-          <name>Direction_param</name>
-          <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/activities/children/direction_param/valueProcess.js</valueProcess>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
     </entityConsumer>

entity/QuickEntry_entity/entityfields/activities/children/insertlinks_param/valueProcess.js

+import("system.vars");
+import("system.result");
+
+var links = [
+    ["Organisation", vars.get("$field.UID")]
+];
+//var contactLinks = vars.get("$field.Contacts.insertedRows").map(function (row)
+//{
+//    return ["Person", row["#UID"]];
+//});
+
+result.string(JSON.stringify(links.concat(contactLinks)));
\ No newline at end of file

neonContext/QuickEntry/QuickEntry.aod

@@ -3,7 +3,6 @@
   <name>QuickEntry</name>
   <title>Quick entry</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterview>QuickEntryFilter_view</filterview>
   <editview>QuickEntryEdit_view</editview>
   <entity>QuickEntry_entity</entity>
   <references>
@@ -11,9 +10,5 @@
       <name>43a3acbb-82a7-4d86-88f9-0e4265e4898d</name>
       <view>QuickEntryEdit_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>157df225-0a5b-4a54-99bf-29a8c169b8ce</name>
-      <view>QuickEntryFilter_view</view>
-    </neonViewReference>
   </references>
 </neonContext>

neonView/QuickEntryFilter_view/QuickEntryFilter_view.aod

-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.2">
-  <name>QuickEntryFilter_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <tableViewTemplate>
-      <name>Table</name>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>6732391d-7299-4e26-bde0-6be3c5a30916</name>
-          <entityField>UID</entityField>
-        </neonTableColumn>
-      </columns>
-    </tableViewTemplate>
-  </children>
-</neonView>

process/ActivityTask_lib/process.js

@@ -202,6 +202,30 @@ ActivityUtils.hasActivities = function (pRowId, pObjectType)
     return true;
 }
 
+/**
+ * creates links for an activity
+ */
+ActivityUtils.insertLink = function (pActivityId, pObjectType, pRowId)
+{
+    var linkCols = [
+        "ACTIVITYLINKID",
+        "ACTIVITY_ID",
+        "OBJECT_ROWID",
+        "OBJECT_TYPE",
+        "USER_NEW",
+        "DATE_NEW"
+    ];
+    var linkVals = [
+        util.getNewUUID(),
+        pActivityId,
+        pRowId,
+        pObjectType,
+        vars.get("$sys.user"),
+        vars.get("$sys.date")
+    ];
+    db.insertData("ACTIVITYLINK", linkCols, null, linkVals);
+}
+
 /**
  * Methods used by for tasks.
  * Do not create an instance of this!