From e44318915a94faf34ca6836c0972b5c6d519f502 Mon Sep 17 00:00:00 2001 From: Nico Bugl <n.bugl@adito.de> Date: Tue, 21 May 2019 11:30:04 +0200 Subject: [PATCH] Member mit Icon fertig --- entity/Member_entity/Member_entity.aod | 2 ++ .../Member_entity/entityfields/icon/valueProcess.js | 13 +++++++++++++ neonView/MemberFilter_view/MemberFilter_view.aod | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod index 686ecaa2f2..3631db3007 100644 --- a/entity/Member_entity/Member_entity.aod +++ b/entity/Member_entity/Member_entity.aod @@ -219,6 +219,8 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt </entityProvider> <entityField> <name>ICON</name> + <contentType>IMAGE</contentType> + <state>READONLY</state> <valueProcess>%aditoprj%/entity/Member_entity/entityfields/icon/valueProcess.js</valueProcess> </entityField> </entityFields> diff --git a/entity/Member_entity/entityfields/icon/valueProcess.js b/entity/Member_entity/entityfields/icon/valueProcess.js index 14ad30b67a..327eecf4cf 100644 --- a/entity/Member_entity/entityfields/icon/valueProcess.js +++ b/entity/Member_entity/entityfields/icon/valueProcess.js @@ -1,6 +1,19 @@ +import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); import("Keyword_lib"); import("KeywordRegistry_basic"); +var role = vars.get("$field.ROLE"); +var isIntern = false, icon; +if(role) +{ + var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(role, $KeywordRegistry.MemberRole()) + if(keywordAttributes != null) + isIntern = keywordAttributes.Intern; +} + +if(isIntern) + result.string("VAADIN:STAR"); +else result.string("VAADIN:AIRPLANE"); \ No newline at end of file diff --git a/neonView/MemberFilter_view/MemberFilter_view.aod b/neonView/MemberFilter_view/MemberFilter_view.aod index a4725bf9ee..cdcb3efba4 100644 --- a/neonView/MemberFilter_view/MemberFilter_view.aod +++ b/neonView/MemberFilter_view/MemberFilter_view.aod @@ -13,6 +13,10 @@ <name>Members</name> <entityField>#ENTITY</entityField> <columns> + <neonTableColumn> + <name>8bdd903b-0cd0-4327-bd24-3643d61d3de0</name> + <entityField>ICON</entityField> + </neonTableColumn> <neonTableColumn> <name>27e658bc-c134-4fef-a3a5-b172852d606e</name> <entityField>ORGANISATION_NAME</entityField> -- GitLab