diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod index afa818a7903f7f3be94f33b51d73894adebcf479..6fbc883175d2d8f650c4e6c032372c2ab7810bcc 100644 --- a/entity/Appointment_entity/Appointment_entity.aod +++ b/entity/Appointment_entity/Appointment_entity.aod @@ -129,6 +129,36 @@ <expose v="true" /> <description>PARAMETER</description> </entityParameter> + <entityConsumer> + <name>ObjectRelations</name> + <title>Relations</title> + <fieldType>DEPENDENCY_OUT</fieldType> + <dependency> + <name>dependency</name> + <entityName>ObjectRelation_entity</entityName> + <fieldName>AnyObject</fieldName> + </dependency> + <children> + <entityParameter> + <name>AnyObjectRowid_param</name> + <code>%aditoprj%/entity/Appointment_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js</code> + <expose v="true" /> + <mandatory v="false" /> + </entityParameter> + <entityParameter> + <name>AnyObjectType_param</name> + <code>%aditoprj%/entity/Appointment_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js</code> + </entityParameter> + </children> + </entityConsumer> + <entityParameter> + <name>AnyObjectRowid_param</name> + <description>PARAMETER</description> + </entityParameter> + <entityParameter> + <name>AnyObjectType_param</name> + <description>PARAMETER</description> + </entityParameter> </entityFields> <recordContainers> <jDitoRecordContainer> diff --git a/entity/Appointment_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js b/entity/Appointment_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js new file mode 100644 index 0000000000000000000000000000000000000000..fa08fc1fd16d270732a297ccfed03b1136701758 --- /dev/null +++ b/entity/Appointment_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js @@ -0,0 +1,4 @@ +import("system.vars"); +import("system.result"); + +result.string(vars.get("$field.UID")) \ No newline at end of file diff --git a/entity/Appointment_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js b/entity/Appointment_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js new file mode 100644 index 0000000000000000000000000000000000000000..efc405cb8b7289310ca284800a6ff50eea9bbe12 --- /dev/null +++ b/entity/Appointment_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js @@ -0,0 +1,4 @@ +import("system.result"); +import("Context_lib"); + +result.string(ContextUtils.getCurrentContextId()) \ No newline at end of file diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js index e6467cae5b4cb5d9a2940ba2d61f710b640159a5..a30df98ad48f6d33ebc392cdd90678dc64ccd15d 100644 --- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js +++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js @@ -6,7 +6,6 @@ import("system.datetime"); import("system.eMath"); import("system.util"); -//logging.log("contentProcess") if(vars.exists("$param.Entry_param")) { var entry = JSON.parse(vars.getString("$param.Entry_param")); diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod index 20aaa80e4901c0f03e1cefa49693e70b3f80a2ce..af84b90dd673c0d7b191dc9fec3a6433033885e4 100644 --- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod +++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod @@ -213,6 +213,12 @@ <fieldName>ObjectRelation_dfo</fieldName> <isConsumer v="false" /> </entityDependency> + <entityDependency> + <name>f3b9bfa5-e04d-45b4-8bd6-baed4c7ceac0</name> + <entityName>Appointment_entity</entityName> + <fieldName>ObjectRelations</fieldName> + <isConsumer v="false" /> + </entityDependency> </dependencies> <children> <entityParameter> diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod index 336d6b092bda8ab38166821c8d50c82ace586ceb..6315a5a483b64d849f5446a849e251ad9c1cb47c 100644 --- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod +++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod @@ -30,3 +30,4 @@ <indexsearchIncrementingIndexerBunchSize v="250" /> <indexsearchMaximumHits v="50000" /> </preferences> + diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js index 0ee031cecc2fb3beca76472d35ca22aafaf41985..1cbfa06eaea3c2d2e05153d7cc5a7702ad797e42 100644 --- a/process/Context_lib/process.js +++ b/process/Context_lib/process.js @@ -63,7 +63,8 @@ ContextUtils._getSelectMap = function() "Salesproject_context": [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_context": [maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10), "CONTRACT", "CONTRACTID"] + "Contract_context": [maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10), "CONTRACT", "CONTRACTID"], + "Appointment_context": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID"] } }