diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java index c7351bdd8..d35ab490e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java @@ -6,6 +6,7 @@ import eu.eudat.models.DataModel; import eu.eudat.models.data.dmp.AssociatedProfile; import eu.eudat.models.data.dmp.Organisation; import eu.eudat.models.data.dmp.Researcher; +import eu.eudat.models.data.project.ProjectOverviewModel; import eu.eudat.models.data.urls.DatasetUrlListing; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -21,8 +22,8 @@ import java.util.stream.Collectors; public class DataManagementPlanOverviewModel implements DataModel { private String id; private String label; - private String project; private String profile; + private ProjectOverviewModel project; private Date creationTime; private Date modifiedTime; private List organisations; @@ -31,11 +32,10 @@ public class DataManagementPlanOverviewModel implements DataModel datasets; private List associatedProfiles; + private List researchers; private List users; private String description; - private String projectAbbreviation; - private String projectId; - private List researchers; + public String getId() { @@ -52,13 +52,6 @@ public class DataManagementPlanOverviewModel implements DataModel getResearchers() { return researchers; } @@ -169,7 +155,7 @@ public class DataManagementPlanOverviewModel implements DataModel new DatasetUrlListing().fromDataModel(x)).collect(Collectors.toList()); this.users = entity.getUsers().stream().map(x -> new UserInfoListingModel().fromDataModel(x)).collect(Collectors.toList()); this.description = entity.getDescription(); - this.projectAbbreviation = entity.getProject().getAbbreviation(); - this.projectId = entity.getProject().getId().toString(); this.researchers = entity.getResearchers().stream().map(item -> new Researcher().fromDataModel(item)).collect(Collectors.toList()); if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/ProjectOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/ProjectOverviewModel.java new file mode 100644 index 000000000..3e2efd0e6 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/ProjectOverviewModel.java @@ -0,0 +1,79 @@ +package eu.eudat.models.data.project; + +import eu.eudat.data.entities.Project; +import eu.eudat.models.DataModel; + +import java.util.Date; +import java.util.UUID; + +public class ProjectOverviewModel implements DataModel { + private UUID id; + private String label; + private String abbreviation; + private String definition; + private Date startDate; + private Date endDate; + + public UUID getId() { + return id; + } + public void setId(UUID id) { + this.id = id; + } + + public String getLabel() { + return label; + } + public void setLabel(String label) { + this.label = label; + } + + public String getAbbreviation() { + return abbreviation; + } + public void setAbbreviation(String abbreviation) { + this.abbreviation = abbreviation; + } + + public String getDefinition() { + return definition; + } + public void setDefinition(String definition) { + this.definition = definition; + } + + public Date getStartDate() { + return startDate; + } + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Date getEndDate() { + return endDate; + } + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + @Override + public ProjectOverviewModel fromDataModel(Project entity) { + this.id = entity.getId(); + this.label = entity.getLabel(); + this.abbreviation = entity.getAbbreviation(); + this.definition = entity.getDefinition(); + this.startDate = entity.getStartdate(); + this.endDate = entity.getEnddate(); + return this; + } + + @Override + public Project toDataModel() throws Exception { + return null; + } + + @Override + public String getHint() { + return null; + } +}