MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Adds finalizedAt and publicAt dates on DMP models.

This commit is contained in:
gkolokythas 2019-06-24 17:06:54 +03:00
parent b8977669c6
commit 744942032e
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java
View File

@ -37,7 +37,9 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
private String description;
private String projectAbbreviation;
private String projectId;
private Date finalizedDat;
private Date finalizedAt;
private Boolean isPublic;
private Date publishedAt;
public String getId() {
@ -152,13 +154,26 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
this.projectId = projectId;
}
public Date getFinalizedDat() {
return finalizedDat;
public Date getFinalizedAt() {
return finalizedAt;
}
public void setFinalizedDat(Date finalizedDat) {
this.finalizedDat = finalizedDat;
public void setFinalizedAt(Date finalizedAt) {
this.finalizedAt = finalizedAt;
}
public Boolean getPublic() {
return isPublic;
}
public void setPublic(Boolean aPublic) {
isPublic = aPublic;
}
public Date getPublishedAt() {
return publishedAt;
}
public void setPublishedAt(Date publishedAt) {
this.publishedAt = publishedAt;
}
@Override
public DataManagementPlanListingModel fromDataModel(DMP entity) {
@ -182,7 +197,9 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
this.description = entity.getDescription();
this.projectAbbreviation = entity.getProject().getAbbreviation();
this.projectId = entity.getProject().getId().toString();
this.finalizedDat = entity.getFinalizedDat();
this.finalizedAt = entity.getFinalizedAt();
this.isPublic = entity.isPublic();
this.publishedAt = entity.getPublishedAt();
if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) {
this.associatedProfiles = new LinkedList<>();

12
dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java
View File

@ -26,7 +26,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
private String description;
private String projectAbbreviation;
private String projectId;
private Date finalizedDat;
private Date finalizedAt;
public String getId() {
return id;
@ -133,11 +133,11 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
this.projectId = projectId;
}
public Date getFinalizedDat() {
return finalizedDat;
public Date getFinalizedAt() {
return finalizedAt;
}
public void setFinalizedDat(Date finalizedDat) {
this.finalizedDat = finalizedDat;
public void setFinalizedAt(Date finalizedAt) {
this.finalizedAt = finalizedAt;
}
@Override
@ -157,7 +157,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
this.registries = LabelBuilder.getLabel(entity.getRegistries().stream().map(item -> 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();
this.finalizedAt = entity.getFinalizedAt();
return this;
}