From 050da2c5b27828885590b8dc83e66f6dea88708b Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 11 Jun 2019 09:37:58 +0200
Subject: [PATCH] Adding multi org to forecast summaries
---
.../nibio/vips/logic/service/LogicService.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
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 83acad10..5140cd36 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();
}
--
GitLab