diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod index 7017b33a1e791ee2264e757da1b4345ffabcd39b..5dcd610a00372b14fa37da65cc86c8e649da2b7d 100644 --- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod +++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod @@ -79,20 +79,37 @@ <entityField> <name>ID_VALUE</name> </entityField> + <entityField> + <name>ATTRIBUTE_PARENT_ID</name> + <possibleItemsProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js</possibleItemsProcess> + <groupable v="true" /> + <onValueChangeTypes> + <element>MASK</element> + <element>PROCESS</element> + </onValueChangeTypes> + </entityField> </entityFields> <recordContainers> <dbRecordContainer> <name>db</name> <alias>Data_alias</alias> + <fromClauseProcess>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess> <conditionProcess>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess> <linkInformation> <linkInformation> - <name>1ffc8a7d-56a2-4516-abd9-071e857058e9</name> + <name>14697123-47ee-4ff0-8ab2-2b8d1217f637</name> <tableName>AB_ATTRIBUTERELATION</tableName> <primaryKey>AB_ATTRIBUTERELATIONID</primaryKey> <isUIDTable v="true" /> <readonly v="false" /> </linkInformation> + <linkInformation> + <name>a988b754-86b1-4d27-8406-08712d12766c</name> + <tableName>AB_ATTRIBUTE</tableName> + <primaryKey>AB_ATTRIBUTEID</primaryKey> + <isUIDTable v="false" /> + <readonly v="false" /> + </linkInformation> </linkInformation> <recordFieldMappings> <dbRecordFieldMapping> @@ -131,6 +148,10 @@ <name>ID_VALUE.value</name> <recordfield>AB_ATTRIBUTERELATION.ID_VALUE</recordfield> </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>ATTRIBUTE_PARENT_ID.value</name> + <recordfield>AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID</recordfield> + </dbRecordFieldMapping> </recordFieldMappings> </dbRecordContainer> </recordContainers> diff --git a/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js b/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..2449074c9672b85ce7ddec1e78cfce6710a1e7fb --- /dev/null +++ b/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js @@ -0,0 +1,5 @@ +import("system.vars"); +import("system.result"); +import("Attribute_lib"); + +result.object(AttributeUtil.getPossibleAttributes(vars.get("$param.objectType_param"))); diff --git a/entity/AttributeRelation_entity/recordcontainers/db/fromClauseProcess.js b/entity/AttributeRelation_entity/recordcontainers/db/fromClauseProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..db1937db74e473532997b9f4b6d8307c24518500 --- /dev/null +++ b/entity/AttributeRelation_entity/recordcontainers/db/fromClauseProcess.js @@ -0,0 +1,3 @@ +import("system.result"); + +result.string("AB_ATTRIBUTERELATION join AB_ATTRIBUTE on (AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID)"); \ No newline at end of file diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod index 4ad8c6c93db7ef0a91b1439933c24f19fc4dc9fe..e6c41f191203fca512c4af77ff11b3748243301a 100644 --- a/entity/Attribute_entity/Attribute_entity.aod +++ b/entity/Attribute_entity/Attribute_entity.aod @@ -29,6 +29,7 @@ <entityField> <name>ATTRIBUTE_PARENT_ID</name> <title>Parent Attribute</title> + <groupable v="true" /> </entityField> <entityConsumer> <name>AttributeChildren</name> diff --git a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod index df5ce99c93fe244f3c03b0cc7bb6adc9f2fc7715..45423cf31e4f2d30b60ff93e80946464e93f5cb6 100644 --- a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod +++ b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod @@ -3,26 +3,19 @@ <name>AttributeRelationTree_view</name> <title>Attributes</title> <majorModelMode>DISTRIBUTED</majorModelMode> + <filterable v="true" /> <layout> - <boxLayout> + <groupLayout> <name>layout</name> - </boxLayout> + </groupLayout> </layout> <children> - <tableViewTemplate> - <name>Table</name> - <autoNewRow v="false" /> + <treetableViewTemplate> + <name>Treetable</name> + <titleField>AB_ATTRIBUTE_ID</titleField> + <descriptionField>ATTRIBUTERELATION_VALUE</descriptionField> <entityField>#ENTITY</entityField> - <columns> - <neonTableColumn> - <name>b37d207a-6119-454a-8fc6-073e9d54b1d3</name> - <entityField>AB_ATTRIBUTE_ID</entityField> - </neonTableColumn> - <neonTableColumn> - <name>83a10d52-9eaf-4901-935e-2a7410831861</name> - <entityField>ATTRIBUTERELATION_VALUE</entityField> - </neonTableColumn> - </columns> - </tableViewTemplate> + <title></title> + </treetableViewTemplate> </children> </neonView>