From 9d9d336a9a1380f43452ccbc445066cb419f66a0 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 20 Feb 2020 11:26:31 +0100
Subject: [PATCH] Fixed forecast search for multiple orgs in previous seasons
---
.../vips/logic/service/LogicService.java | 25 +++++++++++++------
1 file changed, 18 insertions(+), 7 deletions(-)
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 359cd31d..3b57ecf2 100755
--- a/src/main/java/no/nibio/vips/logic/service/LogicService.java
+++ b/src/main/java/no/nibio/vips/logic/service/LogicService.java
@@ -395,15 +395,26 @@ public class LogicService {
@Produces("application/json;charset=UTF-8")
public Response getActiveForecastConfigurationsWithIncludeOrganizations(
@PathParam("organizationId") Integer organizationId,
- @QueryParam("includeOrganizationIds") String includeOrganizationIds
+ @QueryParam("includeOrganizationIds") String includeOrganizationIds,
+ @QueryParam("from") String fromStr,
+ @QueryParam("to") String toStr
)
{
- Calendar cal = Calendar.getInstance();
- cal.setTime(SystemTime.getSystemTime());
- cal.set(cal.get(Calendar.YEAR), Calendar.JANUARY, 1, 0, 0, 0);
- Date from = cal.getTime();
- cal.set(cal.get(Calendar.YEAR), Calendar.DECEMBER, 31, 23, 0, 0);
- Date to = cal.getTime();
+ Date from, to;
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ try{
+ from = format.parse(fromStr);
+ to = format.parse(toStr);
+ }
+ catch(ParseException | NullPointerException ex)
+ {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(SystemTime.getSystemTime());
+ cal.set(cal.get(Calendar.YEAR), Calendar.JANUARY, 1, 0, 0, 0);
+ from = cal.getTime();
+ cal.set(cal.get(Calendar.YEAR), Calendar.DECEMBER, 31, 23, 0, 0);
+ to = cal.getTime();
+ }
List<Integer> orgIds = new ArrayList<>();
--
GitLab