From 4fe4bd829c79117b874ad9fa09888a2a8b407ee4 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 16 Nov 2017 12:43:47 +0100
Subject: [PATCH] Bugfix: Correct date parsing
---
.../no/nibio/vips/logic/service/LogicService.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 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 eaf953a0..a13b6fb4 100755
--- a/src/main/java/no/nibio/vips/logic/service/LogicService.java
+++ b/src/main/java/no/nibio/vips/logic/service/LogicService.java
@@ -245,12 +245,17 @@ public class LogicService {
public Response getForecastConfigurationsForOrganization(
@PathParam("organizationId") Integer organizationId,
@QueryParam("cropOrganismId") List<Integer> cropOrganismIds,
- @QueryParam("from") Date from,
- @QueryParam("to") Date to
+ @QueryParam("from") String fromStr,
+ @QueryParam("to") String toStr
)
{
-
- if(from == null || to == null)
+ Date from, to;
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ try{
+ from = format.parse(fromStr);
+ to = format.parse(toStr);
+ }
+ catch(ParseException | NullPointerException ex)
{
to = SystemTime.getSystemTime();
Calendar cal = Calendar.getInstance();
@@ -258,6 +263,7 @@ public class LogicService {
cal.add(Calendar.MONTH, -4);
from = cal.getTime();
}
+
// First: Get all users for organization
List<VipsLogicUser> organizationUsers = SessionControllerGetter.getUserBean().getUsersByOrganization(organizationId);
--
GitLab