Adds finalizedAt and publicAt dates on DMP models.
This commit is contained in:
parent
b8977669c6
commit
744942032e
|
@ -37,7 +37,9 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
|
||||||
private String description;
|
private String description;
|
||||||
private String projectAbbreviation;
|
private String projectAbbreviation;
|
||||||
private String projectId;
|
private String projectId;
|
||||||
private Date finalizedDat;
|
private Date finalizedAt;
|
||||||
|
private Boolean isPublic;
|
||||||
|
private Date publishedAt;
|
||||||
|
|
||||||
|
|
||||||
public String getId() {
|
public String getId() {
|
||||||
|
@ -152,13 +154,26 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
|
||||||
this.projectId = projectId;
|
this.projectId = projectId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Date getFinalizedDat() {
|
public Date getFinalizedAt() {
|
||||||
return finalizedDat;
|
return finalizedAt;
|
||||||
}
|
}
|
||||||
public void setFinalizedDat(Date finalizedDat) {
|
public void setFinalizedAt(Date finalizedAt) {
|
||||||
this.finalizedDat = finalizedDat;
|
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
|
@Override
|
||||||
public DataManagementPlanListingModel fromDataModel(DMP entity) {
|
public DataManagementPlanListingModel fromDataModel(DMP entity) {
|
||||||
|
@ -182,7 +197,9 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
|
||||||
this.description = entity.getDescription();
|
this.description = entity.getDescription();
|
||||||
this.projectAbbreviation = entity.getProject().getAbbreviation();
|
this.projectAbbreviation = entity.getProject().getAbbreviation();
|
||||||
this.projectId = entity.getProject().getId().toString();
|
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()) {
|
if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) {
|
||||||
this.associatedProfiles = new LinkedList<>();
|
this.associatedProfiles = new LinkedList<>();
|
||||||
|
|
|
@ -26,7 +26,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
|
||||||
private String description;
|
private String description;
|
||||||
private String projectAbbreviation;
|
private String projectAbbreviation;
|
||||||
private String projectId;
|
private String projectId;
|
||||||
private Date finalizedDat;
|
private Date finalizedAt;
|
||||||
|
|
||||||
public String getId() {
|
public String getId() {
|
||||||
return id;
|
return id;
|
||||||
|
@ -133,11 +133,11 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
|
||||||
this.projectId = projectId;
|
this.projectId = projectId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Date getFinalizedDat() {
|
public Date getFinalizedAt() {
|
||||||
return finalizedDat;
|
return finalizedAt;
|
||||||
}
|
}
|
||||||
public void setFinalizedDat(Date finalizedDat) {
|
public void setFinalizedAt(Date finalizedAt) {
|
||||||
this.finalizedDat = finalizedDat;
|
this.finalizedAt = finalizedAt;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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.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.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.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;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue