diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java index e3970b381..e70689d92 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java @@ -606,7 +606,20 @@ public class DataManagementPlanManager { associatedProfiles.add(associatedProfile); } List< eu.eudat.models.data.dmp.Organisation > organisations = new ArrayList<>(); + for(OrganisationImportModel org : dataManagementPlans.get(0).getOrganisationImportModels()) { + eu.eudat.models.data.dmp.Organisation organisation = new eu.eudat.models.data.dmp.Organisation(); + organisation.setLabel(org.getOrganaisationNameImport()); + organisation.setId(org.getOrganaisationReferenceImport()); + organisations.add(organisation); + } List researchers = new LinkedList<>(); + for(ResearcherImportModels res : dataManagementPlans.get(0).getResearchersImportModels()) { + eu.eudat.models.data.dmp.Researcher researcher = new eu.eudat.models.data.dmp.Researcher(); + researcher.setLabel(res.getResearcherImportName()); + researcher.setId(res.getResearcherImportReference()); + researchers.add(researcher); + } + List associatedUsers = new LinkedList<>(); List dynamicFields = new LinkedList<>(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/OrganisationImportModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/OrganisationImportModel.java index 015ed47a8..9dc4c6233 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/OrganisationImportModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/OrganisationImportModel.java @@ -8,6 +8,7 @@ public class OrganisationImportModel { private String source; private String name; private String id; + private String reference; @XmlElement(name = "source") public String getOrganaisationSourceImport() { @@ -32,4 +33,8 @@ public class OrganisationImportModel { public void setOrganaisationIdImport(String id) { this.id = id; } + + @XmlElement(name = "reference") + public String getOrganaisationReferenceImport() { return reference; } + public void setOrganaisationReferenceImport(String reference) { this.reference = reference; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/ResearcherImportModels.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/ResearcherImportModels.java index 2a64228fa..1eafef77e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/ResearcherImportModels.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/ResearcherImportModels.java @@ -9,36 +9,41 @@ public class ResearcherImportModels { private String name; private String id; private int status; + private String reference; @XmlElement(name = "label") - public String getLabel() { + public String getResearcherImportLabel() { return label; } - public void setLabel(String label) { + public void setResearcherImportLabel(String label) { this.label = label; } @XmlElement(name = "name") - public String getName() { + public String getResearcherImportName() { return name; } - public void setName(String name) { + public void setResearcherImportName(String name) { this.name = name; } @XmlElement(name = "id") - public String getId() { + public String getResearcherImportId() { return id; } - public void setId(String id) { + public void setResearcherImportId(String id) { this.id = id; } @XmlElement(name = "status") - public int getStatus() { + public int getResearcherImportStatus() { return status; } - public void setStatus(int status) { + public void setResearcherImportStatus(int status) { this.status = status; } + + @XmlElement(name = "reference") + public String getResearcherImportReference() { return reference; } + public void setResearcherImportReference(String reference) { this.reference = reference; } }