From 020c2f1c4455a5f13c2e2ab480155d0a36b308a7 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 7 Nov 2024 14:14:19 +0100
Subject: [PATCH] feat: Guide users to the correct form

---
 .../no/nibio/vips/logic/i18n/vipslogictexts.properties   | 3 ++-
 .../nibio/vips/logic/i18n/vipslogictexts_nb.properties   | 5 +++--
 .../vips/logic/i18n/vipslogictexts_zh_CN.properties      | 3 ++-
 src/main/webapp/templates/forecastConfigurationForm.ftl  | 9 ++++++---
 src/main/webapp/templates/forecastConfigurationList.ftl  | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
index 6823075a..dd150cdc 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
@@ -72,7 +72,7 @@ active = Active
 
 activeWeatherStations = Active weather stations
 
-addMultipleNew = Add multiple new
+addNewForMultipleWeatherStations=Add new for multiple weather stations
 
 addNew = Add new
 
@@ -1083,3 +1083,4 @@ observationCount=Observation count
 
 weatherDatasource=Weather datasource
 useWeatherStation=Use weather station
+multipleNewWarningMsg=This form is for adding the same forecast configuration to many weather stations simultaneously.
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
index a39491d9..ae2b3ac1 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
@@ -72,9 +72,9 @@ active = Aktiv
 
 activeWeatherStations = Aktive v\u00e6rstasjoner
 
-addMultipleNew = Legg til nye
+addNewForMultipleWeatherStations=Legg til nytt varsel for flere v\u00e6rstasjoner samtidig
 
-addNew = Legg til ny
+addNew = Legg til nytt
 
 address = Adresse
 
@@ -1082,3 +1082,4 @@ observationCount=Antall observasjoner
 
 weatherDatasource=V\u00e6rdatakilde
 useWeatherStation=Bruk v\u00e6rstasjon
+multipleNewWarningMsg=Dette skjemaet er en snarvei for \u00e5 opprette likelydende varsel p\u00e5 flere v\u00e6rstasjoner. <a href="/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=-1">Klikk her</a> hvis du vil opprette bare ett varsel.
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
index 6d4aa910..2807f026 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
@@ -71,7 +71,7 @@ active = \u6709\u6548\u7684
 
 activeWeatherStations = \u6709\u6548\u6c14\u8c61\u7ad9
 
-addMultipleNew = \u6dfb\u52a0\u591a\u4e2a\u65b0\u7684
+addNewForMultipleWeatherStations=\u6dfb\u52a0\u591a\u4e2a\u65b0\u7684
 
 addNew = \u6dfb\u52a0\u65b0\u7684
 
@@ -1071,3 +1071,4 @@ weatherStationDataSourceStored=Weather (station) data source was successfully st
 weatherStationDataSourceDeleted=The weather (station) data source was successfully deleted
 weatherDatasource=Weather datasource
 useWeatherStation=Use weather station
+multipleNewWarningMsg=This form is for adding the same forecast configuration to many weather stations simultaneously.
diff --git a/src/main/webapp/templates/forecastConfigurationForm.ftl b/src/main/webapp/templates/forecastConfigurationForm.ftl
index de850d2d..7d73b049 100755
--- a/src/main/webapp/templates/forecastConfigurationForm.ftl
+++ b/src/main/webapp/templates/forecastConfigurationForm.ftl
@@ -504,10 +504,13 @@
 <#macro page_contents>
 <div class="singleBlockContainer">
 	<p><a href="/forecastConfiguration" class="btn btn-default back" role="button">${i18nBundle.back}</a></p>
-        <h1>${i18nBundle.viewForecastConfiguration}</h1>
-        <div id="errorMsgEl" class="alert alert-danger" <#if !formValidation?has_content> style="display:none;"</#if>>
-		<#if formValidation?has_content>${formValidation.validationMessages?replace("\n", "<br>")}</#if>
+    <h1>${i18nBundle.viewForecastConfiguration}</h1>
+    <div id="errorMsgEl" class="alert alert-danger" <#if !formValidation?has_content> style="display:none;"</#if>>
+    <#if formValidation?has_content>${formValidation.validationMessages?replace("\n", "<br>")}</#if>
 	</div>
+    <#if multipleNew>
+    <div class="alert alert-warning">${i18nBundle.multipleNewWarningMsg}</div>
+    </#if>
 	<#if messageKey?has_content>
 		<div class="alert alert-success">${i18nBundle(messageKey)}</div>
 	</#if>
diff --git a/src/main/webapp/templates/forecastConfigurationList.ftl b/src/main/webapp/templates/forecastConfigurationList.ftl
index 7cc0da09..804aa699 100755
--- a/src/main/webapp/templates/forecastConfigurationList.ftl
+++ b/src/main/webapp/templates/forecastConfigurationList.ftl
@@ -68,7 +68,7 @@
 			</form>
 		</div>
 	</div>
-	<button type="button" class="btn btn-default" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=-1&multipleNew=true'">${i18nBundle.addMultipleNew}</button>
+	<button type="button" class="btn btn-default" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=-1&multipleNew=true'">${i18nBundle.addNewForMultipleWeatherStations}</button>
         </#if>
         <h2>${i18nBundle.privateForecasts}</h2>
         <div class="table-responsive">
-- 
GitLab