Skip to content
Snippets Groups Projects
Commit 47ba5c1b authored by Lene Wasskog's avatar Lene Wasskog
Browse files

feat(timeseries): Ensure location name is only printed when available

parent 6b4f08ff
No related merge requests found
......@@ -35,8 +35,10 @@
<p id="organismName"></p>
<p class="label">{% trans "Crop" %}</p>
<p id="cropOrganismName"></p>
<p class="label">{% trans "Location" %}</p>
<p id="timeSeriesLocation"></p>
<div id="locationInfo">
<p class="label">{% trans "Location" %}</p>
<p id="timeSeriesLocation"></p>
</div>
<p class="label">{% trans "Number of observations" %}</p>
<p id="observationCount"></p>
</div>
......@@ -74,7 +76,6 @@
document.getElementById("organismName").innerHTML = getLocalizedOrganismName(observationTimeSeries.organism) + " <i>(" + observationTimeSeries.organism.latinName + ")</i>";
document.getElementById("cropOrganismName").innerHTML = getLocalizedOrganismName(observationTimeSeries.cropOrganism) + " <i>(" + observationTimeSeries.cropOrganism.latinName + ")</i>";
document.getElementById("timeSeriesName").innerHTML = observationTimeSeries.name;
document.getElementById("timeSeriesLocation").innerHTML = observationTimeSeries.locationPointOfInterest.name;
if(observationTimeSeries.description && observationTimeSeries.description !== "") {
document.getElementById("timeSeriesDescriptionInfo").hidden = false;
......@@ -91,14 +92,15 @@
if(!observationTimeSeries.locationIsPrivate)
{
if(observationTimeSeries.locationPointOfInterestId > 0)
{
if(observationTimeSeries.locationPointOfInterestId > 0){
document.getElementById("locationInfo").hidden = false;
document.getElementById("timeSeriesLocation").innerHTML = observationTimeSeries.locationPointOfInterest.name;
$.getJSON(settings.vipslogicProtocol + "://" + settings.vipslogicServerName + "/rest/poi/" + observationTimeSeries.locationPointOfInterestId , function( poi ) {
initMap(null,poi,"observationViewMap","{{settings.MAP_ATTRIBUTION|safe}}")
});
}
else
{
else{
document.getElementById("locationInfo").hidden = true;
initMap(observationTimeSeries.geoinfo,null,"observationViewMap","{{settings.MAP_ATTRIBUTION|safe}}");
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment