Activitäten in alle Haupt-Contexte eingebaut

entity/Activity_entity/Activity_entity.aod

@@ -234,6 +234,24 @@
           <fieldName>Activities</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>207920cd-b4b8-4f40-b6c4-6e25d4df9947</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>Activities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>b086fbf7-aa94-441f-a33c-e2ca8eda5dcd</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>Activities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>00b4f354-5b82-4071-b70c-acab4780a2de</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>Activities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>

entity/Contract_entity/Contract_entity.aod

@@ -138,6 +138,10 @@
           <name>RowId_param</name>
           <code>%aditoprj%/entity/Contract_entity/entityfields/activities/children/rowid_param/code.js</code>
         </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <code>%aditoprj%/entity/Contract_entity/entityfields/activities/children/objectid_param/code.js</code>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityConsumer>

entity/Contract_entity/entityfields/activities/children/objectid_param/code.js

+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file

entity/Offer_entity/Offer_entity.aod

@@ -368,6 +368,26 @@
         <fieldName>LanguagesISO3Code</fieldName>
       </dependency>
     </entityConsumer>
+    <entityConsumer>
+      <name>Activities</name>
+      <title>Activities</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Activity_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <code>%aditoprj%/entity/Offer_entity/entityfields/activities/children/objectid_param/code.js</code>
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <code>%aditoprj%/entity/Offer_entity/entityfields/activities/children/rowid_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Offer_entity/entityfields/activities/children/objectid_param/code.js

+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file

entity/Offer_entity/entityfields/activities/children/rowid_param/code.js

+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.OFFERID"));
\ No newline at end of file

entity/Order_entity/Order_entity.aod

@@ -358,6 +358,26 @@
       <mandatory v="false" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityConsumer>
+      <name>Activities</name>
+      <title>Activity</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Activity_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <code>%aditoprj%/entity/Order_entity/entityfields/activities/children/rowid_param/code.js</code>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <code>%aditoprj%/entity/Order_entity/entityfields/activities/children/objectid_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Order_entity/entityfields/activities/children/objectid_param/code.js

+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file

entity/Order_entity/entityfields/activities/children/rowid_param/code.js

+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.SALESORDERID"));
\ No newline at end of file

entity/Product_entity/Product_entity.aod

@@ -290,6 +290,26 @@
         <fieldName>LanguagesISO3Code</fieldName>
       </dependency>
     </entityConsumer>
+    <entityConsumer>
+      <name>Activities</name>
+      <title>Activity</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Activity_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <code>%aditoprj%/entity/Product_entity/entityfields/activities/children/objectid_param/code.js</code>
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <code>%aditoprj%/entity/Product_entity/entityfields/activities/children/rowid_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Product_entity/entityfields/activities/children/objectid_param/code.js

+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file

entity/Product_entity/entityfields/activities/children/rowid_param/code.js

+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.PRODUCTID"));
\ No newline at end of file

language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod

@@ -2338,10 +2338,13 @@
       <key>Links</key>
     </entry>
     <entry>
-      <key>Linktype</key>
+      <key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
     </entry>
     <entry>
-      <key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
+      <key>Object type</key>
+    </entry>
+    <entry>
+      <key>Level</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -2693,13 +2693,17 @@
     <entry>
       <key>Links</key>
     </entry>
-    <entry>
-      <key>Linktype</key>
-    </entry>
     <entry>
       <key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
       <value>Es wird der Funktion %0 keine Produktid übergeben.</value>
     </entry>
+    <entry>
+      <key>Object type</key>
+      <value>Typ</value>
+    </entry>
+    <entry>
+      <key>Level</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

language/_____LANGUAGE_en/_____LANGUAGE_en.aod

@@ -2360,13 +2360,16 @@
     <entry>
       <key>Links</key>
     </entry>
-    <entry>
-      <key>Linktype</key>
-    </entry>
     <entry>
       <key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
       <value>Missing productId in function %0.</value>
     </entry>
+    <entry>
+      <key>Object type</key>
+    </entry>
+    <entry>
+      <key>Level</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

neonView/OfferMain_view/OfferMain_view.aod

@@ -14,6 +14,11 @@
       <entityField>#ENTITY</entityField>
       <view>OfferPreview_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>a3702740-418d-40d5-9415-788542c14abb</name>
+      <entityField>Activities</entityField>
+      <view>ActivityFilter_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>e6b12eed-d67e-467c-9302-f6340f901235</name>
       <entityField>#ENTITY</entityField>

neonView/OrderMain_view/OrderMain_view.aod

@@ -14,6 +14,11 @@
       <entityField>#ENTITY</entityField>
       <view>OrderPreview_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>7ec102f5-fb45-44a7-9bbf-0eba7f1536d7</name>
+      <entityField>Activities</entityField>
+      <view>ActivityFilter_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>f5455f3f-0743-47d1-bcb7-f2e83526e329</name>
       <entityField>Orderitems</entityField>

neonView/ProductMain_view/ProductMain_view.aod

@@ -14,6 +14,11 @@
       <entityField>#ENTITY</entityField>
       <view>ProductPreview_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>41887933-bb9a-48ce-818d-1db815021a36</name>
+      <entityField>Activities</entityField>
+      <view>ActivityFilter_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>51f37fe5-91e1-4b76-83b3-be0319e871a4</name>
       <entityField>#ENTITY</entityField>

process/Context_lib/process.js

@@ -105,15 +105,18 @@ ContextUtils._getSelectMap = function()
 {
     var maskingUtils = new SqlMaskingUtils();
     return {
-          // contextId             nameField  Tablename, IDField, isSystemAlias
-        "Organisation": ["\"NAME\"", "ORGANISATION", "ORGANISATIONID", false],
-        "Person": [maskingUtils.concat(["FIRSTNAME", "LASTNAME"]), "PERSON", "PERSONID", false],
-        "Activity": ["SUBJECT", "ACTIVITY", "ACTIVITYID", false],
-        "Salesproject": [maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]), "SALESPROJECT", "SALESPROJECTID", false],
+          // contextId             nameField  Tablename, IDField
+        "Organisation": ["\"NAME\"", "ORGANISATION", "ORGANISATIONID"],
+        "Person": [maskingUtils.concat(["FIRSTNAME", "LASTNAME"]), "PERSON", "PERSONID"],
+        "Activity": ["SUBJECT", "ACTIVITY", "ACTIVITYID"],
+        "Salesproject": [maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]), "SALESPROJECT", "SALESPROJECTID"],
         // TODO: keywords sind noch nicht in der DB somit gibt es nichts ähnliches zu getKeySQL.
         // maskingUtils.concat([SqlMaskingUtils.cast("CONTRACTCODE", "varchar", 10), getKeySQL("CONTRACTTYPE", "CONTRACTTYPE" )])
-        "Contract": [maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10), "CONTRACT", "CONTRACTID", false]
-//        "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID", true]
+        "Contract": [maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10), "CONTRACT", "CONTRACTID"],
+//        "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID"]
+        "Offer": [maskingUtils.cast("OFFERCODE", SQLTYPES.VARCHAR, 10), "OFFER", "OFFERID"],
+        "Order": [maskingUtils.cast("SALESORDERCODE", SQLTYPES.VARCHAR, 10), "SALESORDER", "SALESORDERID"],
+        "Product": ["PRODUCTNAME", "PRODUCT", "PRODUCTID"]
     }
 }