Adds the property of last modified on Dmps and Datasets.

This commit is contained in:
gkolokythas 2019-04-25 18:12:08 +03:00
parent 7388cb479b
commit 9d4c3fca60
4 changed files with 20 additions and 11 deletions

View File

@ -18,6 +18,7 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
private String project; private String project;
private String profile; private String profile;
private Date creationTime; private Date creationTime;
private Date modifiedTime;
private String organisations; private String organisations;
private int version; private int version;
private int status; private int status;
@ -27,7 +28,6 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
public String getId() { public String getId() {
return id; return id;
} }
public void setId(String id) { public void setId(String id) {
this.id = id; this.id = id;
} }
@ -35,7 +35,6 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
public String getLabel() { public String getLabel() {
return label; return label;
} }
public void setLabel(String label) { public void setLabel(String label) {
this.label = label; this.label = label;
} }
@ -43,7 +42,6 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
public String getProject() { public String getProject() {
return project; return project;
} }
public void setProject(String project) { public void setProject(String project) {
this.project = project; this.project = project;
} }
@ -51,7 +49,6 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
public String getProfile() { public String getProfile() {
return profile; return profile;
} }
public void setProfile(String profile) { public void setProfile(String profile) {
this.profile = profile; this.profile = profile;
} }
@ -59,15 +56,20 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
public Date getCreationTime() { public Date getCreationTime() {
return creationTime; return creationTime;
} }
public void setCreationTime(Date creationTime) { public void setCreationTime(Date creationTime) {
this.creationTime = creationTime; this.creationTime = creationTime;
} }
public Date getModifiedTime() {
return modifiedTime;
}
public void setModifiedTime(Date modifiedTime) {
this.modifiedTime = modifiedTime;
}
public String getOrganisations() { public String getOrganisations() {
return organisations; return organisations;
} }
public void setOrganisations(String organisations) { public void setOrganisations(String organisations) {
this.organisations = organisations; this.organisations = organisations;
} }
@ -75,7 +77,6 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
public int getVersion() { public int getVersion() {
return version; return version;
} }
public void setVersion(int version) { public void setVersion(int version) {
this.version = version; this.version = version;
} }
@ -83,7 +84,6 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
public UUID getGroupId() { public UUID getGroupId() {
return groupId; return groupId;
} }
public void setGroupId(UUID groupId) { public void setGroupId(UUID groupId) {
this.groupId = groupId; this.groupId = groupId;
} }
@ -91,7 +91,6 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
public List<DatasetUrlListing> getDatasets() { public List<DatasetUrlListing> getDatasets() {
return datasets; return datasets;
} }
public void setDatasets(List<DatasetUrlListing> datasets) { public void setDatasets(List<DatasetUrlListing> datasets) {
this.datasets = datasets; this.datasets = datasets;
} }
@ -99,7 +98,6 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
public int getStatus() { public int getStatus() {
return status; return status;
} }
public void setStatus(int status) { public void setStatus(int status) {
this.status = status; this.status = status;
} }
@ -119,12 +117,12 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
this.project = entity.getProject().getLabel(); this.project = entity.getProject().getLabel();
if (entity.getProfile() != null) this.profile = entity.getProfile().getLabel(); if (entity.getProfile() != null) this.profile = entity.getProfile().getLabel();
this.creationTime = entity.getCreated(); this.creationTime = entity.getCreated();
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());
return this; return this;
} }
@Override @Override
public DMP toDataModel() { public DMP toDataModel() {
return null; return null;

View File

@ -22,6 +22,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
private String services; private String services;
private int status; private int status;
private Date created; private Date created;
private Date modified;
private String description; private String description;
public String getId() { public String getId() {
@ -101,6 +102,13 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
this.created = created; this.created = created;
} }
public Date getModified() {
return modified;
}
public void setModified(Date modified) {
this.modified = modified;
}
public String getDescription() { public String getDescription() {
return description; return description;
} }
@ -113,6 +121,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
this.id = entity.getId().toString(); this.id = entity.getId().toString();
this.label = entity.getLabel(); this.label = entity.getLabel();
this.created = entity.getCreated(); this.created = entity.getCreated();
this.modified = entity.getModified();
this.project = entity.getDmp().getProject().getLabel(); this.project = entity.getDmp().getProject().getLabel();
this.dmp = entity.getDmp() != null ? entity.getDmp().getLabel() : ""; this.dmp = entity.getDmp() != null ? entity.getDmp().getLabel() : "";
this.dmpId = entity.getDmp() != null ? entity.getDmp().getId().toString() : ""; this.dmpId = entity.getDmp() != null ? entity.getDmp().getId().toString() : "";

View File

@ -11,4 +11,5 @@ export interface DatasetListingModel {
description: String; description: String;
status: Number; status: Number;
created: Date; created: Date;
modified: Date;
} }

View File

@ -7,6 +7,7 @@ export interface DmpListingModel {
project: String; project: String;
profile: String; profile: String;
creationTime: String; creationTime: String;
modifiedTime: String;
organisations: String; organisations: String;
groupId: string; groupId: string;
version: number; version: number;