Commit efb18aee authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch 'ui-731-accession-overview-grin-taxonomy' into 'master'

Accession overviews with detected GRIN species

See merge request genesys-pgr/genesys-server!574
parents ae64043a 7393caf7
......@@ -129,7 +129,8 @@ public class AccessionController {
private String[] cdnServers;
private final Set<String> terms = Sets.newHashSet("institute.code", "institute.country.code3", "cropName", "crop.shortName", "taxonomy.genus", "taxonomy.species",
"taxonomy.genusSpecies", "countryOfOrigin.code3", "sampStat", "available", "mlsStatus", "donorCode", "sgsv", "storage", "duplSite", "breederCode", "aegis");
"taxonomy.genusSpecies", "taxonomy.grinTaxonomySpecies.name", "taxonomy.currentTaxonomySpecies.name", "countryOfOrigin.code3", "sampStat", "available", "mlsStatus",
"donorCode", "sgsv", "storage", "duplSite", "breederCode", "aegis");
@GetMapping(value = "/id/{id}", produces = { MediaType.APPLICATION_JSON_VALUE })
public UUID uuidFromId(@PathVariable("id") final long id) {
......
......@@ -123,7 +123,8 @@ public class AccessionController extends ApiBaseController {
private String[] cdnServers;
private final Set<String> terms = Sets.newHashSet("institute.code", "institute.country.code3", "cropName", "crop.shortName", "taxonomy.genus", "taxonomy.species",
"taxonomy.genusSpecies", "countryOfOrigin.code3", "sampStat", "available", "mlsStatus", "donorCode", "sgsv", "storage", "duplSite", "breederCode", "aegis");
"taxonomy.genusSpecies", "taxonomy.grinTaxonomySpecies.name", "taxonomy.currentTaxonomySpecies.name", "countryOfOrigin.code3", "sampStat", "available", "mlsStatus",
"donorCode", "sgsv", "storage", "duplSite", "breederCode", "aegis");
@GetMapping(value = "/id/{id}", produces = { MediaType.APPLICATION_JSON_VALUE })
public UUID uuidFromId(@PathVariable("id") final long id) {
......
......@@ -82,6 +82,7 @@ public class TaxonomyGenus extends CooperatorOwnedModel implements Copyable<Taxo
@Basic
@Column
@Lob
@JsonIgnore
private String note;
@Basic
......
......@@ -39,6 +39,7 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
import com.fasterxml.jackson.annotation.JsonIdentityInfo;
import com.fasterxml.jackson.annotation.JsonIdentityReference;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.ObjectIdGenerators;
......@@ -68,10 +69,12 @@ public class TaxonomySpecies extends CooperatorOwnedModel implements IGrinSpecie
@Basic
@Column(name = "alternate_name", length = 2000)
@JsonIgnore
private String alternateName;
@Basic
@Column(name = "common_fertilization_code", length = 20)
@JsonIgnore
private String commonFertilizationCode;
@ManyToOne(fetch = FetchType.LAZY, cascade = {})
......@@ -140,14 +143,17 @@ public class TaxonomySpecies extends CooperatorOwnedModel implements IGrinSpecie
@Basic
@Column
@Lob
@JsonIgnore
private String note;
@Basic
@Column(length = 500)
@JsonIgnore
private String protologue;
@Basic
@Column(name = "protologue_virtual_path")
@JsonIgnore
private String protologueVirtualPath;
@Basic
......@@ -157,6 +163,7 @@ public class TaxonomySpecies extends CooperatorOwnedModel implements IGrinSpecie
@Basic
@Column(name = "site_note")
@Lob
@JsonIgnore
private String siteNote;
@Basic
......
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