From d1c04289ce2b1903d904607fdff05cf702839ae8 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Mon, 29 Jul 2019 12:04:19 +0300 Subject: [PATCH] Adds subtitles to external dropdowns (Researchers, Organisations). (Issue #139) --- .../builders/model/models/ResearcherBuilder.java | 11 +++++++++++ .../eu/eudat/logic/managers/ResearcherManager.java | 1 + .../java/eu/eudat/models/data/dmp/Researcher.java | 10 ++++++++++ .../data/external/ExternalSourcesItemModel.java | 9 +++++++++ .../external/OrganisationsExternalSourcesModel.java | 1 + .../external/ResearchersExternalSourcesModel.java | 1 + .../data/external/ServiceExternalSourcesModel.java | 1 + .../dmp/editor/general-tab/general-tab.component.ts | 6 ++++-- 8 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/ResearcherBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/ResearcherBuilder.java index b5d924331..ba001431d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/ResearcherBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/ResearcherBuilder.java @@ -11,6 +11,7 @@ public class ResearcherBuilder extends Builder { private String name; private String id; private int status; + private String tag; public String getLabel() { return label; @@ -48,6 +49,15 @@ public class ResearcherBuilder extends Builder { return this; } + public String getTag() { + return tag; + } + + public ResearcherBuilder tag(String tag) { + this.tag = tag; + return this; + } + @Override public Researcher build() { Researcher researcher = new Researcher(); @@ -55,6 +65,7 @@ public class ResearcherBuilder extends Builder { researcher.setLabel(label); researcher.setName(name); researcher.setStatus(status); + researcher.setTag(tag); return researcher; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ResearcherManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ResearcherManager.java index eba923904..4c98de920 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ResearcherManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ResearcherManager.java @@ -48,6 +48,7 @@ public class ResearcherManager { .label(externalListingItem.getAbbreviation()) .id(externalListingItem.getId()) .name(externalListingItem.getName()) + .tag(externalListingItem.getTag()) .build(); researchers.add(researcher); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Researcher.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Researcher.java index 48c4fa974..722d55dac 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Researcher.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Researcher.java @@ -10,6 +10,7 @@ public class Researcher implements DataModel this.filterOrganisations('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), displayFn: (item) => item['name'], - titleFn: (item) => item['name'] + titleFn: (item) => item['name'], + subtitleFn: (item) => item ? item['tag'] : null }; this.researchersAutoCompleteConfiguration = { filterFn: this.filterResearchers.bind(this), initialItems: (excludedItems: any[]) => this.filterResearchers('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), displayFn: (item) => item['name'], - titleFn: (item) => item['name'] + titleFn: (item) => item['name'], + subtitleFn: (item) => item ? item['tag'] : null }; }