Skip to content
Snippets Groups Projects
Commit a724ad4c authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

We filter out all specialized forecasts (id < 0)

parent f0299654
No related branches found
No related tags found
No related merge requests found
...@@ -910,6 +910,10 @@ public class ForecastBean { ...@@ -910,6 +910,10 @@ public class ForecastBean {
Query q = em.createNamedQuery("ForecastSummary.findByForecastConfigurationId"); Query q = em.createNamedQuery("ForecastSummary.findByForecastConfigurationId");
for(ForecastConfiguration config: forecastConfigurations) for(ForecastConfiguration config: forecastConfigurations)
{ {
if(config.getForecastConfigurationId() < 0)
{
continue;
}
config.setForecastSummaries( config.setForecastSummaries(
q.setParameter("forecastConfigurationId", config.getForecastConfigurationId()) q.setParameter("forecastConfigurationId", config.getForecastConfigurationId())
...@@ -965,6 +969,7 @@ public class ForecastBean { ...@@ -965,6 +969,7 @@ public class ForecastBean {
" SELECT forecast_configuration_id \n" + " SELECT forecast_configuration_id \n" +
" FROM forecast_configuration \n" + " FROM forecast_configuration \n" +
" WHERE is_private IS FALSE \n" + " WHERE is_private IS FALSE \n" +
" AND forecast_configuration_id > 0 \n" +
" AND location_point_of_interest_id=:locationPointOfInterestId \n" + " AND location_point_of_interest_id=:locationPointOfInterestId \n" +
(cropOrganismIds != null && ! cropOrganismIds.isEmpty() ? " AND crop_organism_id IN (" + StringUtils.join(cropOrganismIds, ",") + ") " : "") + (cropOrganismIds != null && ! cropOrganismIds.isEmpty() ? " AND crop_organism_id IN (" + StringUtils.join(cropOrganismIds, ",") + ") " : "") +
")\n" + ")\n" +
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment