Merge master

2929cbca · Johannes Hörmann · 9befcb73 · 2929cbca · 2929cbca · 2929cbca
Commit 2929cbca authored 6 years ago by Johannes Hörmann
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -16,7 +16,6 @@
      <name>OBJECT_TYPE</name>
      <title>Object type</title>
      <consumer>Context</consumer>
-      <linkedContext>Context</linkedContext>
      <displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
    </entityField>
    <entityField>
@@ -63,6 +62,7 @@
        <entityParameter>
          <name>ObjectType_param</name>
          <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+          <expose v="true" />
          <triggerRecalculation v="true" />
        </entityParameter>
      </children>

--- a/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js
+++ b/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js
+import("system.logging");
 import("system.result");
 import("system.vars");
-
+logging.log("set " + vars.get("$field.OBJECT_TYPE"))
 result.string(vars.get("$field.OBJECT_TYPE"));
\ No newline at end of file
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -148,11 +148,6 @@
        <element>PROCESS</element>
      </onValueChangeTypes>
    </entityField>
-    <entityParameter>
-      <name>ActivityId_param</name>
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
    <entityConsumer>
      <name>Links</name>
      <title>Connections</title>
@@ -166,7 +161,6 @@
        <entityParameter>
          <name>ActivityId_param</name>
          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/links/children/activityid_param/valueProcess.js</valueProcess>
-          <expose v="true" />
        </entityParameter>
      </children>
    </entityConsumer>
@@ -236,10 +230,6 @@
        </entityDependency>
      </dependencies>
      <children>
-        <entityParameter>
-          <name>ActivityId_param</name>
-          <expose v="false" />
-        </entityParameter>
        <entityParameter>
          <name>OnlyInnate_param</name>
          <expose v="false" />
@@ -276,8 +266,6 @@
        <entityParameter>
          <name>ContextName_param</name>
          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/contextname_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <mandatory v="false" />
        </entityParameter>
        <entityParameter>
          <name>ID_param</name>

--- a/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/valueProcess.js
+++ b/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/valueProcess.js
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.activityCategory());
\ No newline at end of file
--- a/entity/Activity_entity/entityfields/moduletrees/children/contextname/valueProcess.js
+++ b/entity/Activity_entity/entityfields/moduletrees/children/contextname/valueProcess.js
+import("system.result");
+
+result.string("Activity");
\ No newline at end of file
--- a/entity/Activity_entity/entityfields/moduletrees/children/contextname_param/valueProcess.js
+++ b/entity/Activity_entity/entityfields/moduletrees/children/contextname_param/valueProcess.js
 import("system.result");
+import("Context_lib")

-result.string("Activity");
\ No newline at end of file
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
--- a/entity/Activity_entity/entityfields/moduletrees/children/id/valueProcess.js
+++ b/entity/Activity_entity/entityfields/moduletrees/children/id/valueProcess.js
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
--- a/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js
+++ b/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js
+import("system.result");
+
+result.object(1);
\ No newline at end of file
--- a/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js
+++ b/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js
+import("system.result");
+
+result.object(1);
\ No newline at end of file
--- a/entity/AnyContact_entity/entityfields/contact/children/contactid_param/valueProcess.js
+++ b/entity/AnyContact_entity/entityfields/contact/children/contactid_param/valueProcess.js
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
--- a/entity/AnyContact_entity/entityfields/organisation/children/contactid_param/valueProcess.js
+++ b/entity/AnyContact_entity/entityfields/organisation/children/contactid_param/valueProcess.js
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -60,7 +60,7 @@
      <dependency>
        <name>dependency</name>
        <entityName>Context_entity</entityName>
-        <fieldName>Context</fieldName>
+        <fieldName>#PROVIDER</fieldName>
      </dependency>
    </entityConsumer>
    <entityConsumer>

--- a/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js
+import("system.logging");
+import("system.result");
+import("system.vars");
+
+logging.log("SET: -" + vars.get("$field.UID") + "-")
+result.string(vars.get("$field.UID"));
\ No newline at end of file
--- a/entity/Appointment_entity/entityfields/contexts/children/contextid_param/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/contexts/children/contextid_param/valueProcess.js
--- a/entity/Appointment_entity/entityfields/objects/children/objecttype_param/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/objects/children/objecttype_param/valueProcess.js
--- a/entity/AttributeRelation_entity/entityfields/keyword/children/containername_param/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/keyword/children/containername_param/valueProcess.js
+import("system.db");
+import("system.result");
+import("Sql_lib")
+
+var attrKeywordSelect = "select KEYWORD_CONTAINER from AB_ATTRIBUTE";
+attrKeywordSelect = SqlCondition.begin()
+    .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
+    .buildSql(attrKeywordSelect);
+result.string(db.cell(attrKeywordSelect));
\ No newline at end of file
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -62,7 +62,7 @@
      <dependency>
        <name>dependency</name>
        <entityName>Context_entity</entityName>
-        <fieldName>Context</fieldName>
+        <fieldName>#PROVIDER</fieldName>
      </dependency>
    </entityConsumer>
  </entityFields>

--- a/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.attributeType());
\ No newline at end of file
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -28,6 +28,18 @@
          <fieldName>Contexts</fieldName>
          <isConsumer v="false" />
        </entityDependency>
+        <entityDependency>
+          <name>37559258-24f1-4c8c-b462-23ddf8de4e1e</name>
+          <entityName>AppointmentLink_entity</entityName>
+          <fieldName>Context</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>f1eebe8c-93d2-4977-b619-b6315f843f7a</name>
+          <entityName>AttributeUsage_entity</entityName>
+          <fieldName>Context</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
      </dependencies>
    </entityProvider>
    <entityField>
@@ -38,38 +50,9 @@
      <name>CONTEXT_NAME</name>
      <title>Context name</title>
    </entityField>
-    <entityParameter>
-      <name>ContextId_param</name>
-      <expose v="true" />
-      <mandatory v="false" />
-      <documentation>%aditoprj%/entity/Context_entity/entityfields/contextid_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
    <entityProvider>
      <name>Context</name>
      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>628bd4db-3b31-4337-88ac-1c000307836f</name>
-          <entityName>AttributeUsage_entity</entityName>
-          <fieldName>Context</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>64f5aca8-e756-4a6d-a7a3-89bdc67ddfb3</name>
-          <entityName>AppointmentLink_entity</entityName>
-          <fieldName>Context</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContextId_param</name>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
    </entityProvider>
  </entityFields>
  <recordContainers>

--- a/entity/Context_entity/entityfields/contextid_param/documentation.adoc
+++ b/entity/Context_entity/entityfields/contextid_param/documentation.adoc
-If you provide the ContextId_param only this context is provided.
\ No newline at end of file