From bfde9d359b3e9cbc0f27968f6ae8fb8fa921cb8e Mon Sep 17 00:00:00 2001 From: "j.goderbauer" <j.goderbauer@adito.de> Date: Wed, 20 Mar 2019 14:38:28 +0100 Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1035771][Kontaktmanagement - Firma / Kontaktperson + Adressen / Kommunikation - Nutzung des kompletten Moduls sicherstellen] --- entity/Communication_entity/Communication_entity.aod | 1 + .../entityfields/medium_id/displayValueProcess.js | 11 +++++++++++ .../entityfields/gender/displayValueProcess.js | 7 +++---- 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 entity/Communication_entity/entityfields/medium_id/displayValueProcess.js diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod index a27095f385..3116e19426 100644 --- a/entity/Communication_entity/Communication_entity.aod +++ b/entity/Communication_entity/Communication_entity.aod @@ -24,6 +24,7 @@ <title>Medium</title> <consumer>KeywordMediums</consumer> <mandatory v="true" /> + <displayValueProcess>%aditoprj%/entity/Communication_entity/entityfields/medium_id/displayValueProcess.js</displayValueProcess> </entityField> <entityField> <name>CONTACT_ID</name> diff --git a/entity/Communication_entity/entityfields/medium_id/displayValueProcess.js b/entity/Communication_entity/entityfields/medium_id/displayValueProcess.js new file mode 100644 index 0000000000..a4059dfe2c --- /dev/null +++ b/entity/Communication_entity/entityfields/medium_id/displayValueProcess.js @@ -0,0 +1,11 @@ +import("system.result"); +import("system.vars"); +import("KeywordRegistry_basic"); +import("Keyword_lib"); + +var key = vars.get("$field.MEDIUM_ID"); +if (key) +{ + var res = KeywordUtils.getViewValue($KeywordRegistry.communicationMedium(), key); + result.string(res); +} \ No newline at end of file diff --git a/entity/Person_entity/entityfields/gender/displayValueProcess.js b/entity/Person_entity/entityfields/gender/displayValueProcess.js index d59364952c..d2680b5757 100644 --- a/entity/Person_entity/entityfields/gender/displayValueProcess.js +++ b/entity/Person_entity/entityfields/gender/displayValueProcess.js @@ -5,16 +5,15 @@ import("system.db"); import("system.vars"); import("system.neon"); import("Sql_lib"); +import("KeywordRegistry_basic"); +import("Keyword_lib"); var cond = SqlCondition.begin() - var sex = db.cell(cond.andPrepareVars("SALUTATION.SALUTATION", "$field.SALUTATION").buildSql("select SEX from SALUTATION", "1=2")) - if (sex) { - var keyword = KeywordUtils.getViewValue("PersonGender", sex); - + var keyword = KeywordUtils.getViewValue($KeywordRegistry.personGender(), sex); result.string(keyword) } \ No newline at end of file -- GitLab