Commit 12b2acfa authored by Viacheslav Pavlov's avatar Viacheslav Pavlov

Merge branch '213-display-accession-data-provider' into 'master'

Resolve "Display accession Data Provider"

Closes #213

See merge request genesys-pgr/genesys-ui!225
parents 953d8f1e 8cdd5058
...@@ -54,6 +54,9 @@ ...@@ -54,6 +54,9 @@
}, },
"holder": { "holder": {
"code": "Holder", "code": "Holder",
"owner": {
"uuid": "Data provider"
},
"country": { "country": {
"iso3": "Holder country", "iso3": "Holder country",
"region": "Holder region" "region": "Holder region"
...@@ -112,6 +115,9 @@ ...@@ -112,6 +115,9 @@
"accessions": "Accessions in Genesys", "accessions": "Accessions in Genesys",
"country": { "country": {
"iso3": "Country code" "iso3": "Country code"
},
"owner": {
"uuid": "Data provider"
} }
}, },
"users": { "users": {
...@@ -403,6 +409,7 @@ ...@@ -403,6 +409,7 @@
"zip": "ZIP", "zip": "ZIP",
"climateAtCollection": "Climate at origin", "climateAtCollection": "Climate at origin",
"additionalInfo": "Bioclimatic variables", "additionalInfo": "Bioclimatic variables",
"partner": "Data provider",
"climateSimilar": { "climateSimilar": {
"title": "Accessions with similar climatic properties", "title": "Accessions with similar climatic properties",
"intro": "Georeferenced accesions in Genesys are linked to their climate data based on worldclim.org datasets. Genesys will try to find similar georeferenced accessions that match the basic climatic parameters: annual mean temperature, seasonality and rainfall.", "intro": "Georeferenced accesions in Genesys are linked to their climate data based on worldclim.org datasets. Genesys will try to find similar georeferenced accessions that match the basic climatic parameters: annual mean temperature, seasonality and rainfall.",
...@@ -1499,7 +1506,8 @@ ...@@ -1499,7 +1506,8 @@
}, },
"f": { "f": {
"title": "Filter institutes", "title": "Filter institutes",
"instituteName": "Institute name" "instituteName": "Institute name",
"partner": "Select data provider"
}, },
"p": { "p": {
"browse": { "browse": {
......
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
"zip": "ZIP", "zip": "ZIP",
"climateAtCollection": "Climate at origin", "climateAtCollection": "Climate at origin",
"additionalInfo": "Bioclimatic variables", "additionalInfo": "Bioclimatic variables",
"partner": "Data provider",
"climateSimilar": { "climateSimilar": {
"title": "Accessions with similar climatic properties", "title": "Accessions with similar climatic properties",
"intro": "Georeferenced accesions in Genesys are linked to their climate data based on worldclim.org datasets. Genesys will try to find similar georeferenced accessions that match the basic climatic parameters: annual mean temperature, seasonality and rainfall.", "intro": "Georeferenced accesions in Genesys are linked to their climate data based on worldclim.org datasets. Genesys will try to find similar georeferenced accessions that match the basic climatic parameters: annual mean temperature, seasonality and rainfall.",
......
...@@ -218,6 +218,11 @@ class BrowsePage extends React.Component<IBrowsePageProps, any> { ...@@ -218,6 +218,11 @@ class BrowsePage extends React.Component<IBrowsePageProps, any> {
{ accession.institute.code } { accession.institute.code }
<AuditedInfo info={ auditAccession.instituteCode }/> <AuditedInfo info={ auditAccession.instituteCode }/>
</PropertiesItem> </PropertiesItem>
{ accession.institute && accession.institute.owner &&
<PropertiesItem title={ t('accessions.public.p.display.partner') }>
<b>{ accession.institute.owner.shortName }</b> { accession.institute.owner.name }
</PropertiesItem>
}
<PropertiesItem title={ t('accessions.public.p.display.acquisitionDate') }> <PropertiesItem title={ t('accessions.public.p.display.acquisitionDate') }>
<McpdDate value={ accession.acquisitionDate } /> <McpdDate value={ accession.acquisitionDate } />
<AuditedInfo info={ auditAccession.acquisitionDate }/> <AuditedInfo info={ auditAccession.acquisitionDate }/>
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
}, },
"f": { "f": {
"title": "Filter institutes", "title": "Filter institutes",
"instituteName": "Institute name" "instituteName": "Institute name",
"partner": "Select data provider"
}, },
"p": { "p": {
"browse": { "browse": {
......
...@@ -9,6 +9,7 @@ import CollapsibleComponentSearch from 'ui/common/filter/CollapsibleComponentSea ...@@ -9,6 +9,7 @@ import CollapsibleComponentSearch from 'ui/common/filter/CollapsibleComponentSea
import StringFilter from 'ui/common/filter/StringFilter'; import StringFilter from 'ui/common/filter/StringFilter';
import StringArrFilter from 'ui/common/filter/StringArrFilter'; import StringArrFilter from 'ui/common/filter/StringArrFilter';
import BooleanFilter from 'ui/common/filter/BooleanFilter'; import BooleanFilter from 'ui/common/filter/BooleanFilter';
import PartnerFilter from 'partners/ui/c/PartnerFilter';
const AccessionFilters = ({handleSubmit, initialValues, initialize, t, ...other}) => { const AccessionFilters = ({handleSubmit, initialValues, initialize, t, ...other}) => {
// console.log('AccessionFilters', initialValues); // console.log('AccessionFilters', initialValues);
...@@ -20,6 +21,7 @@ const AccessionFilters = ({handleSubmit, initialValues, initialize, t, ...other} ...@@ -20,6 +21,7 @@ const AccessionFilters = ({handleSubmit, initialValues, initialize, t, ...other}
<CollapsibleComponentSearch title={ t('common:f.textSearch') }> <CollapsibleComponentSearch title={ t('common:f.textSearch') }>
<StringArrFilter name="code" label={ t('institutes.common.instituteCode') } placeholder="NGA039"/> <StringArrFilter name="code" label={ t('institutes.common.instituteCode') } placeholder="NGA039"/>
<StringFilter name="name" label={ t('institutes.public.f.instituteName') } searchType="contains" placeholder="Plant Genetic Resources Unit"/> <StringFilter name="name" label={ t('institutes.public.f.instituteName') } searchType="contains" placeholder="Plant Genetic Resources Unit"/>
<PartnerFilter name="owner" label="institutes.public.f.partner"/>
</CollapsibleComponentSearch> </CollapsibleComponentSearch>
<CollapsibleComponentSearch title={ t('geo.common.location') }> <CollapsibleComponentSearch title={ t('geo.common.location') }>
<StringArrFilter name="country.iso3" label="geo.common.country" placeholder="SVN"/> <StringArrFilter name="country.iso3" label="geo.common.country" placeholder="SVN"/>
......
...@@ -53,6 +53,9 @@ ...@@ -53,6 +53,9 @@
}, },
"holder": { "holder": {
"code": "Holder", "code": "Holder",
"owner": {
"uuid": "Data provider"
},
"country": { "country": {
"iso3": "Holder country", "iso3": "Holder country",
"region": "Holder region" "region": "Holder region"
...@@ -111,6 +114,9 @@ ...@@ -111,6 +114,9 @@
"accessions": "Accessions in Genesys", "accessions": "Accessions in Genesys",
"country": { "country": {
"iso3": "Country code" "iso3": "Country code"
},
"owner": {
"uuid": "Data provider"
} }
}, },
"users": { "users": {
......
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