diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java index b58dbecda..81bf85205 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java @@ -32,6 +32,7 @@ public class DataManagementPlanListingModel implements DataModel datasets; private List associatedProfiles; + private List users; public String getId() { return id; @@ -117,6 +118,13 @@ public class DataManagementPlanListingModel implements DataModel getUsers() { + return users; + } + public void setUsers(List users) { + this.users = users; + } + @Override public DataManagementPlanListingModel fromDataModel(DMP entity) { this.id = entity.getId().toString(); @@ -135,6 +143,7 @@ public class DataManagementPlanListingModel implements DataModel new Organisation().fromDataModel(item)).collect(Collectors.toList())); this.datasets = entity.getDataset().stream().map(x-> new DatasetUrlListing().fromDataModel(x)).collect(Collectors.toList()); + this.users = entity.getUsers().stream().map(x -> new UserInfoListingModel().fromDataModel(x)).collect(Collectors.toList()); if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) { Document viewStyleDoc = XmlBuilder.fromXml(entity.getAssociatedDmps()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/UserInfoListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/UserInfoListingModel.java new file mode 100644 index 000000000..f7c71558c --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/UserInfoListingModel.java @@ -0,0 +1,43 @@ +package eu.eudat.models.data.listingmodels; + +import eu.eudat.data.entities.UserInfo; +import eu.eudat.models.DataModel; + +import java.util.UUID; + +public class UserInfoListingModel implements DataModel { + + private UUID id; + private String name; + + public UUID getId() { + return id; + } + public void setId(UUID id) { + this.id = id; + } + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + @Override + public UserInfoListingModel fromDataModel(UserInfo entity) { + this.id = entity.getId(); + this.name = entity.getName(); + return this; + } + + @Override + public UserInfo toDataModel() throws Exception { + return null; + } + + @Override + public String getHint() { + return "UserInfoListingModel"; + } +} diff --git a/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts b/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts index dbd2b0f02..791e459b1 100644 --- a/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts +++ b/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts @@ -13,4 +13,5 @@ export interface DmpListingModel { version: number; datasets: any[]; associatedProfiles: any[]; + users: any[]; }