From d1c04289ce2b1903d904607fdff05cf702839ae8 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
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<Researcher> {
     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<Researcher> {
         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> {
         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<eu.eudat.data.entities.Researcher,
     private String name;
     private String id;
     private int status;
+    private String tag;
 
     public String getLabel() {
         return label;
@@ -43,12 +44,21 @@ public class Researcher implements DataModel<eu.eudat.data.entities.Researcher,
         this.status = status;
     }
 
+    public String getTag() {
+        return tag;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
+
     @Override
     public Researcher fromDataModel(eu.eudat.data.entities.Researcher entity) {
         this.id = entity.getReference();
         this.label = entity.getUri();
         this.name = entity.getLabel();
         this.status = entity.getStatus();
+        this.tag = "Internal";
         return this;
     }
 
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalSourcesItemModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalSourcesItemModel.java
index 0cd10fb7e..0c6f984bf 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalSourcesItemModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalSourcesItemModel.java
@@ -8,6 +8,7 @@ public class ExternalSourcesItemModel {
     private String uri;
     private String remoteId;
     private String abbreviation;
+    private String tag;
 
     public String getId() {
         return id;
@@ -56,4 +57,12 @@ public class ExternalSourcesItemModel {
     public void setAbbreviation(String abbreviation) {
         this.abbreviation = abbreviation;
     }
+
+    public String getTag() {
+        return tag;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/OrganisationsExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/OrganisationsExternalSourcesModel.java
index 8a9afa217..96af5ef06 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/OrganisationsExternalSourcesModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/OrganisationsExternalSourcesModel.java
@@ -14,6 +14,7 @@ public class OrganisationsExternalSourcesModel extends ExternalListingItem<Organ
             model.setId(item.get("pid"));
             model.setUri(item.get("uri"));
             model.setName(item.get("name"));
+            model.setTag(item.get("tag"));
             this.add(model);
         }
         return this;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ResearchersExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ResearchersExternalSourcesModel.java
index 11a34dc49..a23df6663 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ResearchersExternalSourcesModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ResearchersExternalSourcesModel.java
@@ -12,6 +12,7 @@ public class ResearchersExternalSourcesModel extends ExternalListingItem<Researc
             model.setId(item.get("pid"));
             model.setUri(item.get("uri"));
             model.setName(item.get("name"));
+            model.setTag(item.get("tag"));
             this.add(model);
         }
         return this;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ServiceExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ServiceExternalSourcesModel.java
index bb6fd133d..20ff5716d 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ServiceExternalSourcesModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ServiceExternalSourcesModel.java
@@ -12,6 +12,7 @@ public class ServiceExternalSourcesModel extends ExternalListingItem<ServiceExte
             model.setId(item.get("pid"));
             model.setUri(item.get("label"));
             model.setName(item.get("name"));
+            model.setTag(item.get("tag"));
             this.add(model);
         }
         return this;
diff --git a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts
index 2ed2b4218..dd4f63619 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts
@@ -77,14 +77,16 @@ export class GeneralTabComponent extends BaseComponent implements OnInit {
 			filterFn: this.filterOrganisations.bind(this),
 			initialItems: (excludedItems: any[]) => 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
 		};
 	}