fix time +00 error for setting calendar dates
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/rest/CalendarRestService.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/rest/CalendarRestService.java
index 755882d..ea1624a 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/rest/CalendarRestService.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/rest/CalendarRestService.java
@@ -12,6 +12,7 @@
********************************************************************************/
package org.eclipse.openk.sp.rest;
+import java.util.Date;
import java.util.List;
import javax.validation.Valid;
@@ -30,6 +31,7 @@
import org.eclipse.openk.resources.BaseResource;
import org.eclipse.openk.sp.controller.CalendarController;
import org.eclipse.openk.sp.dto.CalendarDayDto;
+import org.eclipse.openk.sp.util.DateHelper;
import org.eclipse.openk.sp.util.FileHelper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -87,6 +89,8 @@
@ApiParam(name = "Authorization", value = "JWT Token", required = true) @HeaderParam(value = Globals.KEYCLOAK_AUTH_TAG) String jwt,
@Valid CalendarDayDto calendarDayDto) {
+ Date d = DateHelper.addHoursToDate(calendarDayDto.getDateIndex(),5);
+ calendarDayDto.setDateIndex(d);
ModifyingInvokable<CalendarDayDto> invokable = modusr -> calendarController.saveCalendarDay(calendarDayDto);
String[] securityRoles = { Globals.KEYCLOAK_ROLE_BP_SACHBEARBEITER, Globals.KEYCLOAK_ROLE_BP_ADMIN };
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/DateHelper.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/DateHelper.java
index 45556c3..e836473 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/DateHelper.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/DateHelper.java
@@ -51,6 +51,12 @@
DateTime result = dateTime.plusYears(years);
return result.toDate();
}
+
+ public static Date addHoursToDate(Date date, Integer hours) {
+ DateTime dateTime = new DateTime(date);
+ DateTime result = dateTime.plusHours(hours);
+ return result.toDate();
+ }
/**
*
