From 9075802a1b771bcd9c0949cee95640d3684e73ec Mon Sep 17 00:00:00 2001
From: Lene Wasskog <lene.wasskog@nibio.no>
Date: Mon, 5 May 2025 12:14:06 +0200
Subject: [PATCH] fix: Display of form for new observation
---
src/main/webapp/templates/observationForm.ftl | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/templates/observationForm.ftl b/src/main/webapp/templates/observationForm.ftl
index 7e650bf2..f02c6284 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) {
--
GitLab