diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod index 0415c0ddb35f76b323109a18556eeca9b461b035..a871a2e086082ef38d5d48c7fa6f51af35c60fae 100644 --- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod +++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod @@ -313,10 +313,13 @@ <entityField> <name>AnyTargetRowid</name> <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anytargetrowid/valueProcess.js</valueProcess> + <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anytargetrowid/displayValueProcess.js</displayValueProcess> </entityField> <entityField> <name>AnyTargetType</name> + <groupable v="true" /> <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js</valueProcess> + <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anytargettype/displayValueProcess.js</displayValueProcess> </entityField> </entityFields> <recordContainers> diff --git a/entity/ObjectRelation_entity/entityfields/anytargetrowid/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/anytargetrowid/displayValueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..a99df2a0b5971053ef6aa2b7cd19ea0f40d97522 --- /dev/null +++ b/entity/ObjectRelation_entity/entityfields/anytargetrowid/displayValueProcess.js @@ -0,0 +1,9 @@ +import("system.db"); +import("system.result"); +import("system.vars"); +import("Context_lib"); + +if (vars.exists("$field.AnyTargetType") && vars.get("$field.AnyTargetType") && vars.exists("$field.AnyTargetRowid") && vars.get("$field.AnyTargetRowid")) +{ + result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.AnyTargetType"), vars.get("$field.AnyTargetRowid")))); +} diff --git a/entity/ObjectRelation_entity/entityfields/anytargettype/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/anytargettype/displayValueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..f1a57bdf9eb379e0fdf5fc3e450c565e91ca9d58 --- /dev/null +++ b/entity/ObjectRelation_entity/entityfields/anytargettype/displayValueProcess.js @@ -0,0 +1,8 @@ +import("system.project"); +import("system.result"); +import("system.vars"); + +if (vars.exists("$field.AnyTargetType") && vars.get("$field.AnyTargetType")) +{ + result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.AnyTargetType"))[1]); +} \ No newline at end of file diff --git a/entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js b/entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js index c8dd2fb8c6fc3fd7d0863719e63411aa5b4564de..8635bcb6845130b5780e8ee872af7afa2159b97d 100644 --- a/entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js +++ b/entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js @@ -1,3 +1,4 @@ +import("system.logging"); import("system.result"); import("system.vars"); @@ -14,11 +15,13 @@ if (vars.exists("$param.AnyObjectType_param") && vars.get("$param.AnyObjectType_ // anyObject and object 1 == opened object --> target is object2 if (vars.get("$field.OBJECT1_ROWID") == openedRowid && vars.get("$field.OBJECT1_TYPE") == openedType) { + logging.log(vars.get("$field.OBJECT2_TYPE")) result.string(vars.get("$field.OBJECT2_TYPE")); } // anyObject and object 2 == opened object --> target is object1 else if (vars.get("$field.OBJECT2_ROWID") == openedRowid && vars.get("$field.OBJECT2_TYPE") == openedType) { + logging.log(vars.get("$field.OBJECT1_TYPE")) result.string(vars.get("$field.OBJECT1_TYPE")); } } diff --git a/neonContext/ObjectRelation/ObjectRelation.aod b/neonContext/ObjectRelation/ObjectRelation.aod index 386580a64a6b75f1cf013e1a867e830121506fc6..610ecc6e44d59d765957fde0ca29bb669befd723 100644 --- a/neonContext/ObjectRelation/ObjectRelation.aod +++ b/neonContext/ObjectRelation/ObjectRelation.aod @@ -2,14 +2,14 @@ <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0"> <name>ObjectRelation</name> <majorModelMode>DISTRIBUTED</majorModelMode> - <filterview>ObjectRelationFilter_view</filterview> + <filterview>AnyObjectRelationFilter_view</filterview> <editview>ObjectRelationEdit_view</editview> <preview>ObjectRelationPreview_view</preview> <entity>ObjectRelation_entity</entity> <references> <neonViewReference> <name>f6b27aa2-d0a7-479c-812e-8b16400b564b</name> - <view>ObjectRelationFilter_view</view> + <view>AnyObjectRelationFilter_view</view> </neonViewReference> <neonViewReference> <name>dc0bd793-a472-4a7b-8394-06c4bc31258a</name> diff --git a/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod b/neonView/AnyObjectRelationFilter_view/AnyObjectRelationFilter_view.aod similarity index 73% rename from neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod rename to neonView/AnyObjectRelationFilter_view/AnyObjectRelationFilter_view.aod index 167f255e1102c9e0f837cc59888ef0fb3610b8e6..d104f4a2fc5c9d0a9579d154760d61224f5cd29b 100644 --- a/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod +++ b/neonView/AnyObjectRelationFilter_view/AnyObjectRelationFilter_view.aod @@ -1,11 +1,12 @@ <?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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1"> - <name>ObjectRelationFilter_view</name> + <name>AnyObjectRelationFilter_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> + <filterable v="true" /> <layout> - <boxLayout> + <groupLayout> <name>layout</name> - </boxLayout> + </groupLayout> </layout> <children> <tableViewTemplate> @@ -29,12 +30,17 @@ <entityField>OBJECT2_TYPE</entityField> </neonTableColumn> <neonTableColumn> - <name>4495cf75-82d1-4ad3-9a48-86ad44eadc37</name> + <name>027a408e-56bc-4dcd-a0da-57e531954d20</name> <entityField>OBJECT2_ROWID</entityField> - <width v="75" /> - <expandRatio v="100" /> </neonTableColumn> </columns> </tableViewTemplate> + <treetableViewTemplate> + <name>AnyObjectRelations</name> + <favoriteActionGroup2></favoriteActionGroup2> + <titleField>AnyTargetType</titleField> + <descriptionField>AnyTargetRowid</descriptionField> + <entityField>#ENTITY</entityField> + </treetableViewTemplate> </children> </neonView> diff --git a/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod b/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod new file mode 100644 index 0000000000000000000000000000000000000000..dfe764020a852fc3faf8d154d995353cec975d49 --- /dev/null +++ b/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod @@ -0,0 +1,19 @@ +<?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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1"> + <name>AnyObjectRelationTree_view0</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <treetableViewTemplate> + <name>AnyObjectRelations</name> + <parentField>AnyTargetType</parentField> + <titleField>AnyTargetRowid</titleField> + <entityField>#ENTITY</entityField> + <title></title> + </treetableViewTemplate> + </children> +</neonView> diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod index c3792a23b39149940505f6d18c917ef02a154461..804bbee490041b4c9eb72c6ec7b644071ff661bb 100644 --- a/neonView/OrganisationMain_view/OrganisationMain_view.aod +++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod @@ -48,7 +48,7 @@ <neonViewReference> <name>ee7395b9-b787-4662-9021-f6e2d486bd16</name> <entityField>ObjectRelations</entityField> - <view>ObjectRelationFilter_view</view> + <view>AnyObjectRelationFilter_view</view> </neonViewReference> </children> </neonView> diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod index 5866999b02e4a20bc73cb92843cead6317af401e..5cf87beba03510c471fa28c577e490feaacdfed3 100644 --- a/neonView/PersonMain_view/PersonMain_view.aod +++ b/neonView/PersonMain_view/PersonMain_view.aod @@ -32,7 +32,7 @@ <neonViewReference> <name>726f10a6-dad6-4325-a73e-2d6caf0340db</name> <entityField>ObjectRelations</entityField> - <view>ObjectRelationFilter_view</view> + <view>AnyObjectRelationFilter_view</view> </neonViewReference> </children> </neonView> diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod index ae2f4f219ba45ae0143202e4468334785e45cce1..22e91e6848557fd2869630e628c09ae3c7e45bc8 100644 --- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod +++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod @@ -62,7 +62,7 @@ <neonViewReference> <name>d02bf839-1901-4ca1-bcee-245ee9512fe2</name> <entityField>ObjectRelations</entityField> - <view>ObjectRelationFilter_view</view> + <view>AnyObjectRelationFilter_view</view> </neonViewReference> <neonViewReference> <name>0a3f2444-8d91-41e3-8f4d-19a6013c29c5</name>