fix field visibility when moving between data levels

ICOS-Carbon-Portal · Jan 31, 2025 · 13e5a0b · 13e5a0b
1 parent 7b6386f
commit 13e5a0b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/main/twirl/views/UploadGuiPage.scala.html b/src/main/twirl/views/UploadGuiPage.scala.html
@@ -604,31 +604,31 @@ <h5 class="modal-title" id="upload-help-modal-title">Help</h5>
 		<select class="form-select" id="@{lbl}geoselect"></select>
 	</div>
 
-	<div class="mb-3 geocov-element latlonbox-element">
+	<div class="mb-3 @{lbl}geocov-element @{lbl}latlonbox-element">
 		<label class="form-label" for="@{lbl}geolbl">Label @optional</label>
 		<input id="@{lbl}geolbl" type="text" class="form-control">
 	</div>
-	<div class="mb-3 geocov-element customgeo-element">
+	<div class="mb-3 @{lbl}geocov-element @{lbl}customgeo-element">
 		<label class="form-label" for="@{lbl}geojson">GeoJSON</label>
 			@helpButton(
 				"Supported GeoJSON types are Point, LineString, Polygon, GeometryCollection, Feature " +
 				"(with 'label' and 'radius' properties recognized), and FeatureCollection."
 			)
 		<input id="@{lbl}geojson" type="text" class="form-control" placeholder="Paste GeoJSON here">
 	</div>
-	<div class="mb-3 geocov-element latlonbox-element">
+	<div class="mb-3 @{lbl}geocov-element @{lbl}latlonbox-element">
 		<label class="form-label" for="@{lbl}geominlat">Min latitude</label>
 		<input id="@{lbl}geominlat" type="text" class="form-control">
 	</div>
-	<div class="mb-3 geocov-element latlonbox-element">
+	<div class="mb-3 @{lbl}geocov-element @{lbl}latlonbox-element">
 		<label class="form-label" for="@{lbl}geominlon">Min longitude</label>
 		<input id="@{lbl}geominlon" type="text" class="form-control">
 	</div>
-	<div class="mb-3 geocov-element latlonbox-element">
+	<div class="mb-3 @{lbl}geocov-element @{lbl}latlonbox-element">
 		<label class="form-label" for="@{lbl}geomaxlat">Max latitude</label>
 		<input id="@{lbl}geomaxlat" type="text" class="form-control">
 	</div>
-	<div class="mb-3 geocov-element latlonbox-element">
+	<div class="mb-3 @{lbl}geocov-element @{lbl}latlonbox-element">
 		<label class="form-label" for="@{lbl}geomaxlon">Max longitude</label>
 		<input id="@{lbl}geomaxlon" type="text" class="form-control">
 	</div>

diff --git a/uploadgui/src/main/scala/se/lu/nateko/cp/meta/upload/subforms/GeoCoverageSelector.scala b/uploadgui/src/main/scala/se/lu/nateko/cp/meta/upload/subforms/GeoCoverageSelector.scala
@@ -24,9 +24,9 @@ import se.lu.nateko.cp.meta.core.data.FeatureWithGeoJson
 
 class GeoCoverageSelector(covs: IndexedSeq[SpatialCoverage], lbl: String)(using PubSubBus) extends PanelSubform(s".geocov-element"):
 	private val spatialCovSelect = new Select[SpatialCoverage](s"${lbl}geoselect", _.label, _.uri.map(_.toString).getOrElse(""), autoselect = false, onSpatCoverSelected)
-	private val geoCovElements = new HtmlElements(s".geocov-element")
-	private val latLonBoxElements = new HtmlElements(s".latlonbox-element")
-	private val geoJsonElements = new HtmlElements(s".customgeo-element")
+	private val geoCovElements = new HtmlElements(s".${lbl}geocov-element")
+	private val latLonBoxElements = new HtmlElements(s".${lbl}latlonbox-element")
+	private val geoJsonElements = new HtmlElements(s".${lbl}customgeo-element")
 
 	private val spatCovLabel = new TextOptInput(s"${lbl}geolbl", () => ())
 	private val geoJsonInput = new JsonInput(s"${lbl}geojson", notifyUpdate, "geocoverage")