diff --git a/src/main/java/no/nibio/vips/logic/service/LogicService.java b/src/main/java/no/nibio/vips/logic/service/LogicService.java index 83acad10e4c102b622ebf29bad989bd769d03888..5140cd36e2fd905cfa9030541863ba09d9ce5ed7 100755 --- a/src/main/java/no/nibio/vips/logic/service/LogicService.java +++ b/src/main/java/no/nibio/vips/logic/service/LogicService.java @@ -232,10 +232,24 @@ public class LogicService { @Facet("restricted") public Response getForecastSummaries( @PathParam("organizationId") Integer organizationId, - @QueryParam("cropOrganismId") List<Integer> cropOrganismIds + @QueryParam("cropOrganismId") List<Integer> cropOrganismIds, + @QueryParam("includeOrganizationIds") String includeOrganizationIds ) { List<ForecastConfiguration> summaries = SessionControllerGetter.getForecastBean().getForecastConfigurationSummaries(organizationId); + if(includeOrganizationIds != null) + { + String[] includeOrgIdStrs = includeOrganizationIds.split(","); + for(String orgId:includeOrgIdStrs) + { + try + { + Integer includeOrgId = Integer.valueOf(orgId); + summaries.addAll(SessionControllerGetter.getForecastBean().getForecastConfigurationSummaries(includeOrgId)); + } + catch(NumberFormatException ex){} + } + } return Response.ok().entity(summaries).build(); }