Adds user information on DMP listing.
This commit is contained in:
parent
ffbcd91c54
commit
1edd38c09e
|
@ -32,6 +32,7 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
|
||||||
private UUID groupId;
|
private UUID groupId;
|
||||||
private List<DatasetUrlListing> datasets;
|
private List<DatasetUrlListing> datasets;
|
||||||
private List<AssociatedProfile> associatedProfiles;
|
private List<AssociatedProfile> associatedProfiles;
|
||||||
|
private List<UserInfoListingModel> users;
|
||||||
|
|
||||||
public String getId() {
|
public String getId() {
|
||||||
return id;
|
return id;
|
||||||
|
@ -117,6 +118,13 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
|
||||||
this.associatedProfiles = associatedProfiles;
|
this.associatedProfiles = associatedProfiles;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<UserInfoListingModel> getUsers() {
|
||||||
|
return users;
|
||||||
|
}
|
||||||
|
public void setUsers(List<UserInfoListingModel> users) {
|
||||||
|
this.users = users;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DataManagementPlanListingModel fromDataModel(DMP entity) {
|
public DataManagementPlanListingModel fromDataModel(DMP entity) {
|
||||||
this.id = entity.getId().toString();
|
this.id = entity.getId().toString();
|
||||||
|
@ -135,6 +143,7 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
|
||||||
this.modifiedTime = entity.getModified();
|
this.modifiedTime = entity.getModified();
|
||||||
this.organisations = LabelBuilder.getLabel(entity.getOrganisations().stream().map(item -> new Organisation().fromDataModel(item)).collect(Collectors.toList()));
|
this.organisations = LabelBuilder.getLabel(entity.getOrganisations().stream().map(item -> new Organisation().fromDataModel(item)).collect(Collectors.toList()));
|
||||||
this.datasets = entity.getDataset().stream().map(x-> new DatasetUrlListing().fromDataModel(x)).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()) {
|
if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) {
|
||||||
Document viewStyleDoc = XmlBuilder.fromXml(entity.getAssociatedDmps());
|
Document viewStyleDoc = XmlBuilder.fromXml(entity.getAssociatedDmps());
|
||||||
|
|
|
@ -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<UserInfo, UserInfoListingModel> {
|
||||||
|
|
||||||
|
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";
|
||||||
|
}
|
||||||
|
}
|
|
@ -13,4 +13,5 @@ export interface DmpListingModel {
|
||||||
version: number;
|
version: number;
|
||||||
datasets: any[];
|
datasets: any[];
|
||||||
associatedProfiles: any[];
|
associatedProfiles: any[];
|
||||||
|
users: any[];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue