From 47ba5c1bf9c5d6528ac38ba4127f3caac116e649 Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Thu, 27 Jun 2024 15:03:20 +0200
Subject: [PATCH] feat(timeseries): Ensure location name is only printed when
available
---
.../templates/observations/timeseries.html | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/observations/templates/observations/timeseries.html b/observations/templates/observations/timeseries.html
index 12351710..54b388e0 100644
--- a/observations/templates/observations/timeseries.html
+++ b/observations/templates/observations/timeseries.html
@@ -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}}");
}
}
--
GitLab