Bugfixes!

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()
     {

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());

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;

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;

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>

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);
         
     }