From a724ad4cf13086c9179da77c1717050e799d2323 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Wed, 14 Mar 2018 13:11:13 +0100 Subject: [PATCH] We filter out all specialized forecasts (id < 0) --- .../no/nibio/vips/logic/controller/session/ForecastBean.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java index 204a8c28..848a987f 100755 --- a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java +++ b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java @@ -910,6 +910,10 @@ public class ForecastBean { Query q = em.createNamedQuery("ForecastSummary.findByForecastConfigurationId"); for(ForecastConfiguration config: forecastConfigurations) { + if(config.getForecastConfigurationId() < 0) + { + continue; + } config.setForecastSummaries( q.setParameter("forecastConfigurationId", config.getForecastConfigurationId()) @@ -965,6 +969,7 @@ public class ForecastBean { " SELECT forecast_configuration_id \n" + " FROM forecast_configuration \n" + " WHERE is_private IS FALSE \n" + + " AND forecast_configuration_id > 0 \n" + " AND location_point_of_interest_id=:locationPointOfInterestId \n" + (cropOrganismIds != null && ! cropOrganismIds.isEmpty() ? " AND crop_organism_id IN (" + StringUtils.join(cropOrganismIds, ",") + ") " : "") + ")\n" + -- GitLab