diff --git a/src/main/webapp/templates/observationForm.ftl b/src/main/webapp/templates/observationForm.ftl index 7e650bf225b3a968b243a9cfbce60f9b6dbcf158..f02c628414084959b4b3c933a3fedab97e55e70c 100755 --- a/src/main/webapp/templates/observationForm.ftl +++ b/src/main/webapp/templates/observationForm.ftl @@ -87,7 +87,7 @@ </#if> <#if observation.observationTimeSeries?has_content> - displayObservationTimeSeriesInfo() + displayObservationTimeSeriesInfo("${observation.cropOrganismId}", "${observation.organismId}", "${observation.locationPointOfInterestId}") </#if> // Activating file selection @@ -143,14 +143,14 @@ * Crop, pest and location should not be editable for observations belonging to time series. We avoid displaying * form elements in these cases, and rather display the values statically. */ - function displayObservationTimeSeriesInfo() { - document.getElementById("cropDisplayName").innerHTML = nameForCropOrganismId("${observation.cropOrganismId}"); - document.getElementById("pestDisplayName").innerHTML = nameForOrganismId("${observation.organismId}"); + function displayObservationTimeSeriesInfo(cropOrganismId, organismId, locationPointOfInterestId) { + document.getElementById("cropDisplayName").innerHTML = nameForCropOrganismId(cropOrganismId); + document.getElementById("pestDisplayName").innerHTML = nameForOrganismId(organismId); fetchPOIs(function (allPois) { - const locationName = nameForLocationPointOfInterestId("${observation.locationPointOfInterestId}", allPois); + const locationName = nameForLocationPointOfInterestId(locationPointOfInterestId, allPois); document.getElementById("locationDisplayName").innerHTML = locationName || null; }); - initLocationMap("${observation.locationPointOfInterestId}") + initLocationMap(locationPointOfInterestId) } function getDataSchema(organismId, organizationId) {