diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java index e21c1a42e..b385401ae 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java @@ -155,10 +155,13 @@ public class DMP implements DataEntity { @Convert(converter = DateToUTCConverter.class) private Date modified = new Date(); - @Column(name = "\"Description\"") private String description; + @Column(name= "\"FinalizedDat\"") + @Convert(converter = DateToUTCConverter.class) + private Date finalizedDat; + public String getDescription() { return description; @@ -286,6 +289,13 @@ public class DMP implements DataEntity { this.dmpProperties = dmpProperties; } + public Date getFinalizedDat() { + return finalizedDat; + } + public void setFinalizedDat(Date finalizedDat) { + this.finalizedDat = finalizedDat; + } + @Override public void update(DMP entity) { this.associatedDmps = entity.associatedDmps; @@ -300,6 +310,7 @@ public class DMP implements DataEntity { this.organisations = entity.getOrganisations(); this.dmpProperties = entity.getDmpProperties(); this.setModified(new Date()); + if (entity.getStatus().equals(DMPStatus.FINALISED.getValue())) this.setFinalizedDat(new Date()); if (entity.getUsers() != null) this.users = entity.getUsers(); } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java index ce84aca11..7c93fd081 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java @@ -140,11 +140,14 @@ public class Dataset implements DataEntity { @Column(name = "\"Description\"") private String description; + @Column(name= "\"FinalizedDat\"") + @Convert(converter = DateToUTCConverter.class) + private Date finalizedDat; + public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } @@ -153,7 +156,6 @@ public class Dataset implements DataEntity { public UserInfo getCreator() { return creator; } - public void setCreator(UserInfo creator) { this.creator = creator; } @@ -161,8 +163,6 @@ public class Dataset implements DataEntity { public Short getStatus() { return status; } - - public void setStatus(Short status) { this.status = status; } @@ -171,8 +171,6 @@ public class Dataset implements DataEntity { public Date getCreated() { return created; } - - public void setCreated(Date created) { this.created = created; } @@ -181,8 +179,6 @@ public class Dataset implements DataEntity { public Date getModified() { return modified; } - - public void setModified(Date modified) { this.modified = modified; } @@ -191,8 +187,6 @@ public class Dataset implements DataEntity { public Set getRegistries() { return registries; } - - public void setRegistries(Set registries) { this.registries = registries; } @@ -200,7 +194,6 @@ public class Dataset implements DataEntity { public Set getServices() { return services; } - public void setServices(Set services) { this.services = services; } @@ -208,8 +201,6 @@ public class Dataset implements DataEntity { public UUID getId() { return id; } - - public void setId(UUID id) { this.id = id; } @@ -218,8 +209,6 @@ public class Dataset implements DataEntity { public String getLabel() { return label; } - - public void setLabel(String label) { this.label = label; } @@ -228,8 +217,6 @@ public class Dataset implements DataEntity { public DMP getDmp() { return dmp; } - - public void setDmp(DMP dmp) { this.dmp = dmp; } @@ -238,8 +225,6 @@ public class Dataset implements DataEntity { public String getUri() { return uri; } - - public void setUri(String uri) { this.uri = uri; } @@ -248,8 +233,6 @@ public class Dataset implements DataEntity { public String getProperties() { return properties; } - - public void setProperties(String properties) { this.properties = properties; } @@ -258,8 +241,6 @@ public class Dataset implements DataEntity { public DatasetProfile getProfile() { return profile; } - - public void setProfile(DatasetProfile profile) { this.profile = profile; } @@ -268,7 +249,6 @@ public class Dataset implements DataEntity { public Set getDatasetDataRepositories() { return datasetDataRepositories; } - public void setDatasetDataRepositories(Set datasetDataRepositories) { this.datasetDataRepositories = datasetDataRepositories; } @@ -276,8 +256,6 @@ public class Dataset implements DataEntity { public String getReference() { return reference; } - - public void setReference(String reference) { this.reference = reference; } @@ -285,7 +263,6 @@ public class Dataset implements DataEntity { public Set getDatasetExternalDatasets() { return datasetExternalDatasets; } - public void setDatasetExternalDatasets(Set datasetExternalDatasets) { this.datasetExternalDatasets = datasetExternalDatasets; } @@ -293,11 +270,17 @@ public class Dataset implements DataEntity { public boolean isPublic() { return isPublic; } - public void setPublic(boolean aPublic) { isPublic = aPublic; } + public Date getFinalizedDat() { + return finalizedDat; + } + public void setFinalizedDat(Date finalizedDat) { + this.finalizedDat = finalizedDat; + } + @Override public void update(Dataset entity) { this.setRegistries(entity.getRegistries()); @@ -324,6 +307,7 @@ public class Dataset implements DataEntity { this.setStatus(entity.getStatus()); this.setProfile(entity.getProfile()); this.setModified(new Date()); + if (entity.getStatus().equals(Status.FINALISED.getValue())) this.setFinalizedDat(new Date()); if (entity.getCreator() != null) this.creator = entity.getCreator(); } 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 7a2b37422..bf50c1ca7 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 @@ -37,6 +37,7 @@ public class DataManagementPlanListingModel implements DataModel(); @@ -180,19 +190,6 @@ public class DataManagementPlanListingModel implements DataModel(); - if (item != null) { - NodeList associatedProfilesElement = item.getChildNodes(); - for (int temp = 0; temp < associatedProfilesElement.getLength(); temp++) { - Node associatedProfileElement = associatedProfilesElement.item(temp); - if (associatedProfileElement.getNodeType() == Node.ELEMENT_NODE) { - this.associatedProfiles.add(new AssociatedProfile().fromXml((Element) associatedProfileElement)); - } - } - }*/ } return this; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java index 473cbeb22..717c7940e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java @@ -26,6 +26,7 @@ public class DatasetListingModel implements DataModel new eu.eudat.models.data.dataset.Registry().fromDataModel(item)).collect(Collectors.toList())); this.dataRepositories = LabelBuilder.getLabel(entity.getDatasetDataRepositories().stream().map(item -> new DataRepository().fromDataModel(item.getDataRepository())).collect(Collectors.toList())); this.services = LabelBuilder.getLabel(entity.getServices().stream().map(item -> new Service().fromDataModel(item.getService())).collect(Collectors.toList())); + this.finalizedDat = entity.getFinalizedDat(); return this; }