Commit 02408e74 authored by Jeremy Destin's avatar Jeremy Destin Committed by Célia Michotey
Browse files

fix: Fix the display of the donors and the site ids problem.

parent 6fbdce8c
......@@ -11,6 +11,9 @@ public class DonorVO implements Serializable, BrapiGermplasmDonor {
private String donorGermplasmPUI;
private String donorAccessionNumber;
private String donorInstituteCode;
private Integer donationDate;
private InstituteVO donorInstitute;
@Override
public String getDonorGermplasmPUI() {
......@@ -39,4 +42,23 @@ public class DonorVO implements Serializable, BrapiGermplasmDonor {
this.donorInstituteCode = donorInstituteCode;
}
public InstituteVO getDonorInstitute() {
return donorInstitute;
}
public void setDonorInstitute(InstituteVO donorInstitute) {
this.donorInstitute = donorInstitute;
}
public Integer getDonationDate() {
return donationDate;
}
public void setDonationDate(Integer donationDate) {
this.donationDate = donationDate;
}
}
......@@ -8,7 +8,7 @@ import fr.inra.urgi.faidare.domain.JSONView;
*/
public interface Site {
@JsonView(JSONView.GnpISFields.class)
String getLocationDbId();
String getSiteId();
@JsonView(JSONView.GnpISFields.class)
String getSiteName();
......
......@@ -6,20 +6,20 @@ public class SiteVO implements Serializable, Site {
private static final long serialVersionUID = 7058708694739141664L;
private String locationDbId;
private String siteId;
private String siteName;
private Float latitude;
private Float longitude;
private String siteType;
@Override
public String getLocationDbId() {
return locationDbId;
public String getSiteId() {
return siteId;
}
public void setLocationDbId(String locationDbId) {
this.locationDbId = locationDbId;
public void setSiteId(String siteId) {
this.siteId = siteId;
}
@Override
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment