From abd7fa405433181bfe45bc2add3504e3f1330c30 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@bioforsk.no> Date: Fri, 18 Mar 2016 16:14:59 +0100 Subject: [PATCH] Bugfixes! --- .../java/no/nibio/vips/logic/controller/session/UserBean.java | 2 +- .../model/preprocessor/CydiaPomonellaModelPreprocessor.java | 1 + .../no/nibio/vips/util/weather/FruitWebDavisDataParser.java | 2 ++ .../no/nibio/vips/util/weather/WeatherDataSourceUtil.java | 1 - src/main/webapp/templates/userForm.ftl | 2 ++ .../nibio/vips/util/weather/FruitWebDavisDataParserTest.java | 4 ++-- 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java index 673b413d..8c2db625 100644 --- a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java +++ b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java @@ -690,7 +690,7 @@ public class UserBean { } // TODO: Put in config file? - private final static String[] USER_COUNTRY_CODES = {"NO","SE","BA"}; + private final static String[] USER_COUNTRY_CODES = {"NO","SE","BA","LV"}; public List<Country> getUserCountries() { diff --git a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/CydiaPomonellaModelPreprocessor.java b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/CydiaPomonellaModelPreprocessor.java index 7f70c41c..af28c4b1 100644 --- a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/CydiaPomonellaModelPreprocessor.java +++ b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/CydiaPomonellaModelPreprocessor.java @@ -126,6 +126,7 @@ public class CydiaPomonellaModelPreprocessor extends ModelRunPreprocessor{ } catch (WeatherDataSourceException ex) { throw new PreprocessorException(ex.getMessage()); } + // Create the complete model configuration object ModelConfiguration retVal = new ModelConfiguration(); retVal.setModelId(this.getModelId()); diff --git a/src/main/java/no/nibio/vips/util/weather/FruitWebDavisDataParser.java b/src/main/java/no/nibio/vips/util/weather/FruitWebDavisDataParser.java index 8f0c239e..ec40674f 100644 --- a/src/main/java/no/nibio/vips/util/weather/FruitWebDavisDataParser.java +++ b/src/main/java/no/nibio/vips/util/weather/FruitWebDavisDataParser.java @@ -58,6 +58,7 @@ public class FruitWebDavisDataParser { * Using output designed for RIMPro, parsing into WeatherObservations * @param stationID the METOS station ID * @param timeZone + * @param startDate * @return */ public List<WeatherObservation> getWeatherObservations(String stationID, TimeZone timeZone, Date startDate) throws ParseWeatherDataException @@ -65,6 +66,7 @@ public class FruitWebDavisDataParser { List<WeatherObservation> retVal = new ArrayList<>(); SimpleDateFormat urlDFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat dFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm"); + urlDFormat.setTimeZone(timeZone); dFormat.setTimeZone(timeZone); // Assuming 1 hour resolution until we find a timestamp that says :30 Integer logIntervalId = WeatherObservation.LOG_INTERVAL_ID_1H; diff --git a/src/main/java/no/nibio/vips/util/weather/WeatherDataSourceUtil.java b/src/main/java/no/nibio/vips/util/weather/WeatherDataSourceUtil.java index 5a25e4cc..0c5fadd3 100644 --- a/src/main/java/no/nibio/vips/util/weather/WeatherDataSourceUtil.java +++ b/src/main/java/no/nibio/vips/util/weather/WeatherDataSourceUtil.java @@ -136,7 +136,6 @@ public class WeatherDataSourceUtil { for (String type : elementMeasurementTypes) { URL.append("&elementMeasurementTypes[]=").append(type); } - //System.out.println("URL: " + URL.toString()); URLConnection URLConn = null; InputStream URLStream = null; InputStream error = null; diff --git a/src/main/webapp/templates/userForm.ftl b/src/main/webapp/templates/userForm.ftl index 9f09eaa8..5251a3da 100644 --- a/src/main/webapp/templates/userForm.ftl +++ b/src/main/webapp/templates/userForm.ftl @@ -129,11 +129,13 @@ <select class="form-control" name="vipsLogicRoles" multiple="multiple" size="5" <#if ! user.isSuperUser() && ! user.isOrganizationAdmin()> readonly="readonly" <#else>onblur="validateField(this);"</#if>> <#if user.isSuperUser() || user.isOrganizationAdmin()> <#list vipsLogicRoles as vipsLogicRole> + <#if vipsLogicRole.vipsLogicRoleId != 1 || user.isSuperUser()> <option value="${vipsLogicRole.vipsLogicRoleId}" <#if viewUser.hasRole(vipsLogicRole)> selected="selected" </#if> >${i18nBundle["vipsLogicRole_" + vipsLogicRole.vipsLogicRoleId]}</option> + </#if> </#list> <#else> <#list vipsLogicRoles as vipsLogicRole> diff --git a/src/test/java/no/nibio/vips/util/weather/FruitWebDavisDataParserTest.java b/src/test/java/no/nibio/vips/util/weather/FruitWebDavisDataParserTest.java index b8d5b300..0b2887c3 100644 --- a/src/test/java/no/nibio/vips/util/weather/FruitWebDavisDataParserTest.java +++ b/src/test/java/no/nibio/vips/util/weather/FruitWebDavisDataParserTest.java @@ -69,10 +69,10 @@ public class FruitWebDavisDataParserTest { FruitWebDavisDataParser instance = new FruitWebDavisDataParser(); List<WeatherObservation> result = instance.getWeatherObservations(stationID, timeZone, startDate); - /*for(WeatherObservation obs:result) + for(WeatherObservation obs:result) { System.out.println(obs); - }*/ + } assertNotNull( result); } -- GitLab