Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Website
Commits
0e728c03
Commit
0e728c03
authored
Feb 21, 2019
by
Viacheslav Pavlov
Committed by
Matija Obreza
Feb 21, 2019
Browse files
Accession location map
parent
f7f78c8e
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/accessions/ui/DisplayPage.tsx
View file @
0e728c03
...
...
@@ -323,7 +323,7 @@ class BrowsePage extends React.Component<IBrowsePageProps, any> {
</
PageSection
>
}
{
accession
.
coll
&&
{
(
accession
.
coll
||
accession
.
countryOfOrigin
||
accession
.
geo
)
&&
<
PageSection
title
=
{
t
(
'
accessions.public.p.display.collectingInformation
'
)
}
>
<
Properties
>
{
accession
.
countryOfOrigin
&&
...
...
@@ -332,13 +332,13 @@ class BrowsePage extends React.Component<IBrowsePageProps, any> {
<
AuditedInfo
info
=
{
auditAccessionCollect
.
countryOfOrigin
}
/>
</
PropertiesItem
>
}
{
accession
.
coll
.
collDate
&&
{
accession
.
coll
&&
accession
.
coll
.
collDate
&&
<
PropertiesItem
key
=
"collDate"
title
=
{
t
(
`accessions.common.coll.collDate`
)
}
>
<
McpdDate
value
=
{
accession
.
coll
.
collDate
}
/>
<
AuditedInfo
info
=
{
auditAccessionCollect
.
collDate
}
/>
</
PropertiesItem
>
}
{
accession
.
coll
.
collSrc
&&
{
accession
.
coll
&&
accession
.
coll
.
collSrc
&&
<
PropertiesItem
key
=
"collSrc"
title
=
{
t
(
`accessions.common.coll.collSrc`
)
}
>
{
t
(
`accessions.common.collectingSource.
${
accession
.
coll
.
collSrc
}
`
)
}
<
AuditedInfo
info
=
{
auditAccessionCollect
.
collSrc
}
tPrefix
=
"accessions.common.collectingSource"
/>
...
...
src/accessions/ui/MapPage.tsx
View file @
0e728c03
...
...
@@ -18,7 +18,6 @@ import PrettyFilters from 'ui/common/filter/PrettyFilters';
import
ButtonBar
from
'
ui/common/buttons/ButtonBar
'
;
import
ContentLayout
from
'
ui/layout/ContentLayout
'
;
import
MapConfigSection
from
'
./c/MapConfigSection
'
;
import
Control
from
'
react-leaflet-control
'
;
import
MapAccessionsFilters
from
'
accessions/ui/c/MapAccessionsFilters
'
;
import
BioClimateDisplay
from
'
accessions/ui/c/BioClimateDisplay
'
;
...
...
@@ -37,6 +36,7 @@ let Map;
let
TileLayer
;
let
Popup
;
let
Rectangle
;
let
Control
;
const
popupContentLimit
=
11
;
...
...
@@ -166,6 +166,7 @@ class BrowsePage extends React.Component<IMapPageProps, any> {
TileLayer
=
require
(
'
react-leaflet
'
).
TileLayer
;
Popup
=
require
(
'
react-leaflet
'
).
Popup
;
Rectangle
=
require
(
'
react-leaflet
'
).
Rectangle
;
Control
=
require
(
'
react-leaflet-control
'
).
default
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment