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

Adds dmpId on Dataset Response.

This commit is contained in:
gkolokythas 2019-04-22 13:45:36 +03:00
parent d37efb528c
commit 3e7747455c
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
private String label; private String label;
private String project; private String project;
private String dmp; private String dmp;
private String dmpId;
private String profile; private String profile;
private String dataRepositories; private String dataRepositories;
private String registries; private String registries;
@ -26,7 +27,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
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;
} }
@ -34,7 +34,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
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;
} }
@ -42,7 +41,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
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;
} }
@ -50,15 +48,20 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
public String getDmp() { public String getDmp() {
return dmp; return dmp;
} }
public void setDmp(String dmp) { public void setDmp(String dmp) {
this.dmp = dmp; this.dmp = dmp;
} }
public String getDmpId() {
return dmpId;
}
public void setDmpId(String dmpId) {
this.dmpId = dmpId;
}
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;
} }
@ -66,7 +69,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
public String getDataRepositories() { public String getDataRepositories() {
return dataRepositories; return dataRepositories;
} }
public void setDataRepositories(String dataRepositories) { public void setDataRepositories(String dataRepositories) {
this.dataRepositories = dataRepositories; this.dataRepositories = dataRepositories;
} }
@ -74,7 +76,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
public String getRegistries() { public String getRegistries() {
return registries; return registries;
} }
public void setRegistries(String registries) { public void setRegistries(String registries) {
this.registries = registries; this.registries = registries;
} }
@ -82,7 +83,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
public String getServices() { public String getServices() {
return services; return services;
} }
public void setServices(String services) { public void setServices(String services) {
this.services = services; this.services = services;
} }
@ -90,7 +90,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
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;
} }
@ -98,7 +97,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
public Date getCreated() { public Date getCreated() {
return created; return created;
} }
public void setCreated(Date created) { public void setCreated(Date created) {
this.created = created; this.created = created;
} }
@ -106,7 +104,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
public String getDescription() { public String getDescription() {
return description; return description;
} }
public void setDescription(String description) { public void setDescription(String description) {
this.description = description; this.description = description;
} }
@ -118,6 +115,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
this.created = entity.getCreated(); this.created = entity.getCreated();
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.profile = entity.getProfile() != null ? entity.getProfile().getLabel() : ""; this.profile = entity.getProfile() != null ? entity.getProfile().getLabel() : "";
this.description = entity.getDescription(); this.description = entity.getDescription();
this.status = entity.getStatus(); this.status = entity.getStatus();

1
dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
View File

@ -2,6 +2,7 @@ export interface DatasetListingModel {
id: String; id: String;
label: String; label: String;
dmp: String; dmp: String;
dmpId: String;
project: String; project: String;
profile: String; profile: String;
dataRepositories: String; dataRepositories: String;