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 bde7a3eda0709993ca8d40955b378b0adbc3d5f1..4d8337422c95018cb4fa04cb089ab6e36ec6ef25 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties @@ -1081,3 +1081,4 @@ unregisteredUser=Unregistered user downloadedTime=Time of download observationCount=Observation count +weatherDatasource=Weather datasource 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 a9b44ce07122a6969226b89c41b1e1c4410d5756..d1c69ca3a734c120ceb398c07768270103d3d01b 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 @@ -70,7 +70,7 @@ VIPSLogicTitle = Administrasjonssystem active = Aktiv -activeWeatherStations = Aktive m\u00e5lestasjoner +activeWeatherStations = Aktive v\u00e6rstasjoner addMultipleNew = Legg til nye @@ -244,9 +244,9 @@ deleteUser = Slett bruker deleteUserDescription = Du m\u00e5 overf\u00f8re brukerens ressurser til en annen bruker f\u00f8r brukeren kan slettes -deleteWeatherStation = Slett m\u00e5lestasjon +deleteWeatherStation = Slett v\u00e6rstasjon -deleteWeatherStationPreviewExplanation = M\u00e5lestasjonen du \u00f8nsker \u00e5 slette har knyttet til seg de ressursene som er nevnt nedenfor. N\u00e5r du sletter m\u00e5lestasjonen, vil ogs\u00e5 disse ressursene bli slettet. +deleteWeatherStationPreviewExplanation = V\u00e6rstasjonen du \u00f8nsker \u00e5 slette har knyttet til seg de ressursene som er nevnt nedenfor. N\u00e5r du sletter v\u00e6rstasjonen, vil ogs\u00e5 disse ressursene bli slettet. denominator = Denominator @@ -272,9 +272,9 @@ editOrganization = Rediger organisasjon editPoi = Rediger sted -editWeatherStation = Rediger m\u00e5lestasjon +editWeatherStation = Rediger v\u00e6rstasjon -elementMeasurementTypes = M\u00e5leparametre +elementMeasurementTypes = V\u00e6rparametre email = E-post @@ -366,11 +366,11 @@ higherThanMaximum = Kan ikke v\u00e6re h\u00f8yere enn {0} illustration = Illustrasjon -inactiveWeatherStations = Inaktive m\u00e5lestasjoner +inactiveWeatherStations = Inaktive v\u00e6rstasjoner includeAllChildCrops = Inkluder alle underarter, sorter og varianter -indexText = VIPSLogic er felles administrasjonssystem for VIPS. Her konfigurerer du brukere, m\u00e5lestasjoner og varsler, og her registrerer du observasjoner og skriver meldinger, med mere. Bruk menyen i toppen for \u00e5 komme i gang. +indexText = VIPSLogic er felles administrasjonssystem for VIPS. Her konfigurerer du brukere, v\u00e6rstasjoner og varsler, og her registrerer du observasjoner og skriver meldinger, med mere. Bruk menyen i toppen for \u00e5 komme i gang. informAdminOfConfirmedEmailBody = Brukerens etternavn er {0}. Oppgitt brukerinformasjon er som f\u00f8lger: {1} F\u00f8lg denne lenken for \u00e5 redigere og godkjenne: {2}. \\nF\u00f8lg denne lenken for \u00e5 godkjenne automatisk: {3} @@ -518,7 +518,7 @@ newUser = Ny bruker newUserCredentialsHelpText = \nVennligst skriv inn et brukernavn for den nye brukeren. Et autogenerert passord sendes til brukerens epostadresse. -newWeatherStation = Ny m\u00e5lestasjon +newWeatherStation = Ny v\u00e6rstasjon noDescriptionFound = Ingen beskrivelse funnet @@ -682,7 +682,7 @@ pointOfInterestType = Stedstype pointOfInterestType_0 = Uspesifisert -pointOfInterestType_1 = M\u00e5lestasjon +pointOfInterestType_1 = V\u00e6rstasjon pointOfInterestType_2 = G\u00e5rd @@ -1016,21 +1016,21 @@ warning_fieldNotFoundInFormDefinition = Advarsel: feltet {0} ble ikke funnet i s weatherForecastProvider = V\u00e6rvarslingstjeneste -weatherStationDeleted = M\u00e5lestasjonen ble slettet +weatherStationDeleted = V\u00e6rstasjonen ble slettet -weatherStationForecastConfigurations = Varsler knyttet til m\u00e5lestasjonen +weatherStationForecastConfigurations = Varsler knyttet til v\u00e6rstasjonen -weatherStationPointOfInterestId = M\u00e5lestasjon +weatherStationPointOfInterestId = V\u00e6rstasjon -weatherStationPointOfInterestIds = M\u00e5lestasjoner +weatherStationPointOfInterestIds = V\u00e6rstasjoner -weatherStationRemoteId = Fjern-Id for m\u00e5lestasjon +weatherStationRemoteId = Fjern-Id for v\u00e6rstasjon -weatherStationRemoteIdMissing = Fjern-Id for m\u00e5lestasjon mangler +weatherStationRemoteIdMissing = Fjern-Id for v\u00e6rstasjon mangler -weatherStationStored = Informasjon om m\u00e5lestasjon ble lagret +weatherStationStored = Informasjon om v\u00e6rstasjon ble lagret -weatherStations = M\u00e5lestasjoner +weatherStations = V\u00e6rstasjoner xIsNotAfterY = {0} er ikke etter {1} @@ -1080,3 +1080,4 @@ unregisteredUser=Uregistrert bruker downloadedTime=Tidspunkt for nedlasting observationCount=Antall observasjoner +weatherDatasource=V\u00e6rdatakilde 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 a914181f176776529e06f8cd633d7bdfced87c07..95fe7db3c85e8c12870f4dd9128eeba1fc4cb909 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 @@ -1069,3 +1069,4 @@ infoUriExpression=Template for request for station information isGridWeatherDataSource=This is a grid based weather data source weatherStationDataSourceStored=Weather (station) data source was successfully stored weatherStationDataSourceDeleted=The weather (station) data source was successfully deleted +weatherDatasource=Weather datasource diff --git a/src/main/webapp/templates/forecastConfigurationForm.ftl b/src/main/webapp/templates/forecastConfigurationForm.ftl index 9152e42d11b5d09e790ef901a0d7351c44b47a33..44dc7132b709102f6a889d4e93587f81cd138f5c 100755 --- a/src/main/webapp/templates/forecastConfigurationForm.ftl +++ b/src/main/webapp/templates/forecastConfigurationForm.ftl @@ -360,6 +360,14 @@ handleUseGridWeatherDataClicked(document.getElementById("useGridWeatherData")<#if forecastConfiguration.weatherStationPointOfInterestId?has_content && forecastConfiguration.weatherStationPointOfInterestId.pointOfInterestId?has_content>,${forecastConfiguration.weatherStationPointOfInterestId.pointOfInterestId}</#if>); </#if> + let handleLocationChanged = function(){ + // Enable the weather datasource fieldset + document.getElementById("weatherDatasourceFieldset").disabled=false; + // Which location has been selected? + // If weather station -> Preselect weather station, set grid checkbox to false + // Else: Deselect weather station (if any), set grid checkbox to true + + } </script> </#macro> <#macro custom_css> @@ -444,40 +452,44 @@ <div class="form-group"> <label for="locationPointOfInterestId">${i18nBundle.locationPointOfInterestId}</label> <div class="select-container" style="flex: 1; display: flex; align-items: center;"> - <select class="form-control" id="locationPointOfInterestId" name="locationPointOfInterestId" onblur="validateField(this);" style="width: calc(100% - 30px);"> + <select class="form-control" id="locationPointOfInterestId" name="locationPointOfInterestId" onchange="handleLocationChanged();" onblur="validateField(this);" style="width: calc(100% - 30px);"> </select> <i id="open-map-modal-icon" class="fa fa-map-marker" onclick="openLocationMap()"></i> <div id="location-map" class="map-modal"></div> </div> <span class="help-block" id="${formId}_locationPointOfInterestId_validation"></span> </div> - <div class="form-group"> - <label for="weatherStationPointOfInterestId">${i18nBundle.weatherStationPointOfInterestId}</label> - <select class="form-control" id="weatherStationPointOfInterestId" name="weatherStationPointOfInterestId" onblur="if(!document.getElementById('useGridWeatherData').checked) {validateField(this);}"> - <#if isGridForecastSupported> - <option value="-2">${i18nBundle.doNotUse} ${i18nBundle.weatherStationPointOfInterestId?lower_case}</option> - </#if> - <option value="-1"<#if !forecastConfiguration.weatherStationPointOfInterestId?has_content && !forecastConfiguration.useGridWeatherData> selected="selected"</#if>>${i18nBundle.pleaseSelect} ${i18nBundle.weatherStationPointOfInterestId?lower_case}</option> - <#list weatherStationPointOfInterests?sort_by("name") as poi> - <option value="${poi.pointOfInterestId}"<#if - forecastConfiguration.weatherStationPointOfInterestId?has_content - && forecastConfiguration.weatherStationPointOfInterestId.pointOfInterestId?has_content - && poi.pointOfInterestId == forecastConfiguration.weatherStationPointOfInterestId.pointOfInterestId> selected="selected"</#if>>${poi.name}</option> - </#list> - </select> - <span class="help-block" id="${formId}_weatherStationPointOfInterestId_validation"></span> - </div> - <#if isGridForecastSupported> - <input type="hidden" id="weatherStationPointOfInterestIdHidden" name="weatherStationPointOfInterestIdDisabled" value="-2" disabled="disabled"/> + <fieldset id="weatherDatasourceFieldset" disabled> + <legend>${i18nBundle.weatherDatasource}</legend> + <p>Velg sted ovenfor først, og velg deretter værdatakilde.</p> <div class="form-group"> - <div class="checkbox"> - <label> - <input type="checkbox" id="useGridWeatherData" name="useGridWeatherData"<#if forecastConfiguration.useGridWeatherData?has_content && forecastConfiguration.useGridWeatherData == true> checked="checked"</#if> onclick="handleUseGridWeatherDataClicked(this);"/> - </label> - ${i18nBundle.useGridWeatherData} - <span class="help-block" id="${formId}_useGridWeatherData_validation"></span> + <label for="weatherStationPointOfInterestId">${i18nBundle.weatherStationPointOfInterestId}</label> + <select class="form-control" id="weatherStationPointOfInterestId" name="weatherStationPointOfInterestId" onblur="if(!document.getElementById('useGridWeatherData').checked) {validateField(this);}"> + <#if isGridForecastSupported> + <option value="-2">${i18nBundle.doNotUse} ${i18nBundle.weatherStationPointOfInterestId?lower_case}</option> + </#if> + <option value="-1"<#if !forecastConfiguration.weatherStationPointOfInterestId?has_content && !forecastConfiguration.useGridWeatherData> selected="selected"</#if>>${i18nBundle.pleaseSelect} ${i18nBundle.weatherStationPointOfInterestId?lower_case}</option> + <#list weatherStationPointOfInterests?sort_by("name") as poi> + <option value="${poi.pointOfInterestId}"<#if + forecastConfiguration.weatherStationPointOfInterestId?has_content + && forecastConfiguration.weatherStationPointOfInterestId.pointOfInterestId?has_content + && poi.pointOfInterestId == forecastConfiguration.weatherStationPointOfInterestId.pointOfInterestId> selected="selected"</#if>>${poi.name}</option> + </#list> + </select> + <span class="help-block" id="${formId}_weatherStationPointOfInterestId_validation"></span> </div> - </#if> + <#if isGridForecastSupported> + <input type="hidden" id="weatherStationPointOfInterestIdHidden" name="weatherStationPointOfInterestIdDisabled" value="-2" disabled="disabled"/> + <div class="form-group"> + <div class="checkbox"> + <label> + <input type="checkbox" id="useGridWeatherData" name="useGridWeatherData"<#if forecastConfiguration.useGridWeatherData?has_content && forecastConfiguration.useGridWeatherData == true> checked="checked"</#if> onclick="handleUseGridWeatherDataClicked(this);"/> + </label> + ${i18nBundle.useGridWeatherData} + <span class="help-block" id="${formId}_useGridWeatherData_validation"></span> + </div> + </#if> + </fieldset> <#else> <input type="hidden" name="multipleNew" value="true"/> <div class="form-group"> diff --git a/src/test/java/no/nibio/vips/logic/forms/HTMLFormGeneratorTest.java b/src/test/java/no/nibio/vips/logic/forms/HTMLFormGeneratorTest.java index e915e328a07c80238764e6bd4a5cd41c8ebba298..5c38d92f9104df1d97c4fd96b6db08823859c212 100755 --- a/src/test/java/no/nibio/vips/logic/forms/HTMLFormGeneratorTest.java +++ b/src/test/java/no/nibio/vips/logic/forms/HTMLFormGeneratorTest.java @@ -1,83 +1,81 @@ /* - * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. + * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General + * Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more + * details. * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <https://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Affero General Public License along with this program. If not, see + * <https://www.gnu.org/licenses/>. * */ package no.nibio.vips.logic.forms; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import no.nibio.web.forms.HTMLFormGenerator; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import no.nibio.web.forms.HTMLFormGenerator; /** * * @author Tor-Einar Skog <tor-einar.skog@nibio.no> */ public class HTMLFormGeneratorTest { - - public HTMLFormGeneratorTest() { - } - + + public HTMLFormGeneratorTest() {} + @BeforeClass - public static void setUpClass() { - } - + public static void setUpClass() {} + @AfterClass - public static void tearDownClass() { - } - + public static void tearDownClass() {} + @Before - public void setUp() { - } - + public void setUp() {} + @After - public void tearDown() { - } + public void tearDown() {} @Test public void testGetHTMLForm() { try { - String language="no"; + String language = "no"; HTMLFormGenerator t = new HTMLFormGenerator(); assertNotNull(t); - InputStream in = this.getClass().getResourceAsStream("/HTMLFormGeneratorTest/forecastConfigurationForm.json"); - InputStreamReader reader = new InputStreamReader(in,"UTF-8"); + InputStream in = + this.getClass().getResourceAsStream("/HTMLFormGeneratorTest/forecastConfigurationForm.json"); + InputStreamReader reader = new InputStreamReader(in, "UTF-8"); ObjectMapper mapper = new ObjectMapper(); JsonFactory factory = mapper.getFactory(); JsonParser parser = factory.createParser(reader); JsonNode formDefinition = mapper.readTree(parser); - InputStream in2 = this.getClass().getResourceAsStream("/HTMLFormGeneratorTest/forecastConfigurationForm_result.html"); + InputStream in2 = + this.getClass().getResourceAsStream("/HTMLFormGeneratorTest/forecastConfigurationForm_result.html"); InputStreamReader reader2 = new InputStreamReader(in2, "UTF-8"); java.util.Scanner s = new java.util.Scanner(reader2).useDelimiter("\\A"); String result = s.hasNext() ? s.next() : ""; - //System.out.println("expectedResult=\n" + result); - String HTMLForm = t.getHTMLFormFields(formDefinition,"forecastConfigurationForm",language); - //System.out.println("HTMLForm=\n" + HTMLForm); - assertEquals(result,HTMLForm); + // System.out.println("expectedResult=\n" + result); + String HTMLForm = t.getHTMLFormFields(formDefinition, "forecastConfigurationForm", language); + System.out.println("HTMLForm=\n" + HTMLForm); + assertEquals(HTMLForm, result); + } catch (IOException ex) { fail(ex.getMessage()); } diff --git a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.json b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.json index c5c4bb56d4d553486dbae47afa27f5b5b2d598cc..690b874fcbe92abc5e67ffdc873437c20d84ec8c 100755 --- a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.json +++ b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.json @@ -1,73 +1,122 @@ { - "_comment" : "Structure of the forecastConfigurationForm and how to validate it", + "_comment": "Structure of the forecastConfigurationForm and how to validate it", "fields": [ { - "name" : "forecastConfigurationId", - "fieldType" : "HIDDEN", - "dataType" : "INTEGER", - "webValue" : ["7"], - "required" : true + "name": "forecastConfigurationId", + "fieldType": "HIDDEN", + "dataType": "INTEGER", + "webValue": [ + "7" + ], + "required": true }, { - "name" : "vipsLogicUserId", - "dataType" : "INTEGER", - "fieldType" : "SELECT_SINGLE", + "name": "vipsLogicUserId", + "dataType": "INTEGER", + "fieldType": "SELECT_SINGLE", "nullValue": "-1", - "required" : true, - "options":[ - {"value":"-1","label":"Vennligst velg bruker","selected":false}, - {"value":"1","label":"Skog, Tor-Einar","selected":true} - ] + "required": true, + "options": [ + { + "value": "-1", + "label": "Vennligst velg bruker", + "selected": false + }, + { + "value": "1", + "label": "Skog, Tor-Einar", + "selected": true + } + ] }, { - "name" : "modelId", - "fieldType" : "SELECT_SINGLE", - "dataType" : "INTEGER", + "name": "modelId", + "fieldType": "SELECT_SINGLE", + "dataType": "INTEGER", "nullValue": "-1", - "required" : true, - "options":[ - {"value":"-1","label":"Vennligst velg varslingsmodell","selected":false}, - {"value":"NAERSTADMO","label":"Nærstads modell","selected":true}, - {"value":"APPLESCABM","label":"Epleskurvmodell","selected":false} - ] + "required": true, + "options": [ + { + "value": "-1", + "label": "Vennligst velg varslingsmodell", + "selected": false + }, + { + "value": "NAERSTADMO", + "label": "Nærstads modell", + "selected": true + }, + { + "value": "APPLESCABM", + "label": "Epleskurvmodell", + "selected": false + } + ] }, { - "name" : "locationPointOfInterestId", - "dataType" : "INTEGER", - "fieldType" : "SELECT_SINGLE", + "name": "locationPointOfInterestId", + "dataType": "INTEGER", + "fieldType": "SELECT_SINGLE", "nullValue": "-1", - "required" : true, - "options":[ - {"value":"-1","label":"Vennligst velg målestasjon","selected":false}, - {"value":"38","label":"Ullensvang","selected":false}, - {"value":"72","label":"Ås","selected":true} - ] + "required": true, + "options": [ + { + "value": "-1", + "label": "Vennligst velg værstasjon", + "selected": false + }, + { + "value": "38", + "label": "Ullensvang", + "selected": false + }, + { + "value": "72", + "label": "Ås", + "selected": true + } + ] }, { - "name" : "weatherStationPointOfInterestId", - "dataType" : "INTEGER", - "fieldType" : "SELECT_SINGLE", + "name": "weatherStationPointOfInterestId", + "dataType": "INTEGER", + "fieldType": "SELECT_SINGLE", "nullValue": "-1", - "required" : true, - "options":[ - {"value":"-1","label":"Vennligst velg lokalitet","selected":false}, - {"value":"38","label":"Ullensvang","selected":false}, - {"value":"72","label":"Ås","selected":true} - ] + "required": true, + "options": [ + { + "value": "-1", + "label": "Vennligst velg lokalitet", + "selected": false + }, + { + "value": "38", + "label": "Ullensvang", + "selected": false + }, + { + "value": "72", + "label": "Ås", + "selected": true + } + ] }, { - "name" : "dateStart", - "dataType" : "DATE", - "required" : true + "name": "dateStart", + "dataType": "DATE", + "required": true }, { - "name" : "dateEnd", - "dataType" : "DATE", - "required" : true + "name": "dateEnd", + "dataType": "DATE", + "required": true } - ], - "relations":[ - {"primaryField":"dateEnd","secondaryField":"dateStart", "relationType": "AFTER"} + "relations": [ + { + "primaryField": "dateEnd", + "secondaryField": "dateStart", + "relationType": "AFTER" + } ] -} +} \ No newline at end of file diff --git a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.output b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.output index ce39fc6dbe56f6d38a0b44ad4ba33d4921ad9003..fcd948a78e6b1fdb71deb7122742bb3e0bb2f617 100755 --- a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.output +++ b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.output @@ -26,7 +26,7 @@ <span class="help-block" id="forecastConfigurationForm_locationPointOfInterestId_validation"></span> </div> <div class="form-group"> -<label for="weatherStationPointOfInterestId">Målestasjon</label> +<label for="weatherStationPointOfInterestId">Værstasjon</label> <select class="form-control" name="weatherStationPointOfInterestId" onblur="validateField(this);"> <option value="-1">Vennligst velg lokalitet</option> <option value="38">Ullensvang</option> diff --git a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result index b09a9bb9259d82f9a2ce1f90c63783058b6eff9c..6fc69f7535dd88fd4844e4213ea0062fb4323524 100755 --- a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result +++ b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result @@ -130,9 +130,9 @@ <span class="help-block" id="forecastConfigurationForm_locationPointOfInterestId_validation"></span> </div> <div class="form-group"> - <label for="weatherStationPointOfInterestId">Målestasjon</label> + <label for="weatherStationPointOfInterestId">Værstasjon</label> <select class="form-control" name="weatherStationPointOfInterestId" onblur="validateField(this);"> - <option value="-1">Vennligst velg målestasjon</option> + <option value="-1">Vennligst velg værstasjon</option> <option value="54">Alvdal</option> <option value="91" selected="selected">Apelsvoll</option> <option value="30">Balestrand</option> diff --git a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.html b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.html index 4b2e97c64a691fd9ffe8d896aba1cf56feb0c8cb..1295df57636ab29e1f8a23d77b9f40808220267e 100755 --- a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.html +++ b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.html @@ -19,14 +19,14 @@ <div class="form-group"> <label for="locationPointOfInterestId">Sted</label> <select class="form-control" name="locationPointOfInterestId" onblur="validateField(this);"> -<option value="-1">Vennligst velg målestasjon</option> +<option value="-1">Vennligst velg værstasjon</option> <option value="38">Ullensvang</option> <option value="72" selected="selected">Ås</option> </select> <span class="help-block" id="forecastConfigurationForm_locationPointOfInterestId_validation"></span> </div> <div class="form-group"> -<label for="weatherStationPointOfInterestId">Målestasjon</label> +<label for="weatherStationPointOfInterestId">Værstasjon</label> <select class="form-control" name="weatherStationPointOfInterestId" onblur="validateField(this);"> <option value="-1">Vennligst velg lokalitet</option> <option value="38">Ullensvang</option> diff --git a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.txt b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.txt index b09a9bb9259d82f9a2ce1f90c63783058b6eff9c..6fc69f7535dd88fd4844e4213ea0062fb4323524 100755 --- a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.txt +++ b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.txt @@ -130,9 +130,9 @@ <span class="help-block" id="forecastConfigurationForm_locationPointOfInterestId_validation"></span> </div> <div class="form-group"> - <label for="weatherStationPointOfInterestId">Målestasjon</label> + <label for="weatherStationPointOfInterestId">Værstasjon</label> <select class="form-control" name="weatherStationPointOfInterestId" onblur="validateField(this);"> - <option value="-1">Vennligst velg målestasjon</option> + <option value="-1">Vennligst velg værstasjon</option> <option value="54">Alvdal</option> <option value="91" selected="selected">Apelsvoll</option> <option value="30">Balestrand</option>