diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 3f81d0a..de13d0f 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,9 +4,10 @@
-
+
-
+
+
@@ -558,14 +559,21 @@
1699803821051
-
+
+
+ 1699805283751
+
+
+
+ 1699805283751
+
+
-
@@ -590,7 +598,8 @@
-
+
+
@@ -612,7 +621,7 @@
file://$PROJECT_DIR$/src/main/java/core/services/TaskService.java
- 92
+ 93
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/scheduleInfos/AdvancedScheduleFieldInfo.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/scheduleInfos/AdvancedScheduleFieldInfo.java
index d70250d..c01dee2 100644
--- a/backend/src/main/java/core/api/models/timemanager/taskSchedule/scheduleInfos/AdvancedScheduleFieldInfo.java
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/scheduleInfos/AdvancedScheduleFieldInfo.java
@@ -2,40 +2,44 @@ package core.api.models.timemanager.taskSchedule.scheduleInfos;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
+import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
public class AdvancedScheduleFieldInfo extends ScheduleFieldInfo {
@NotNull
@JsonProperty
- private LocalDateTime scheduleStartTime;
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private ZonedDateTime scheduleStartTime;
@NotNull
@JsonProperty
- private LocalDateTime scheduleStopTime;
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private ZonedDateTime scheduleStopTime;
public AdvancedScheduleFieldInfo(LocalDateTime scheduleStartTime, LocalDateTime scheduleStopTime) {
- this.scheduleStartTime = scheduleStartTime;
- this.scheduleStopTime = scheduleStopTime;
+ this.scheduleStartTime = ZonedDateTime.from(scheduleStartTime);
+ this.scheduleStopTime = ZonedDateTime.from(scheduleStopTime);
}
public AdvancedScheduleFieldInfo() {
}
- public LocalDateTime getScheduleStartTime() {
+ public ZonedDateTime getScheduleStartTime() {
return scheduleStartTime;
}
- public void setScheduleStartTime(LocalDateTime scheduleStartTime) {
+ public void setScheduleStartTime(ZonedDateTime scheduleStartTime) {
this.scheduleStartTime = scheduleStartTime;
}
- public LocalDateTime getScheduleStopTime() {
+ public ZonedDateTime getScheduleStopTime() {
return scheduleStopTime;
}
- public void setScheduleStopTime(LocalDateTime scheduleStopTime) {
+ public void setScheduleStopTime(ZonedDateTime scheduleStopTime) {
this.scheduleStopTime = scheduleStopTime;
}
}
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index 3f970a6..0891a53 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -56,7 +56,7 @@ public class TaskScheduleService {
return new ServiceResult<>(ServiceExitCode.INVALID_PARAMETER);
}
- AdvancedTaskSchedule advancedTaskSchedule = new AdvancedTaskSchedule(task, scheduleFieldInfo.getScheduleStartTime(), scheduleFieldInfo.getScheduleStopTime());
+ AdvancedTaskSchedule advancedTaskSchedule = new AdvancedTaskSchedule(task, scheduleFieldInfo.getScheduleStartTime().toLocalDateTime(), scheduleFieldInfo.getScheduleStopTime().toLocalDateTime());
scheduleRepository.save(advancedTaskSchedule);
return new ServiceResult<>(advancedTaskSchedule);
@@ -89,8 +89,8 @@ public class TaskScheduleService {
return new ServiceResult<>(ServiceExitCode.INVALID_PARAMETER);
}
- schedule.setScheduleStart(scheduleFieldInfo.getScheduleStartTime());
- schedule.setScheduleEnd(scheduleFieldInfo.getScheduleStopTime());
+ schedule.setScheduleStart(scheduleFieldInfo.getScheduleStartTime().toLocalDateTime());
+ schedule.setScheduleEnd(scheduleFieldInfo.getScheduleStopTime().toLocalDateTime());
scheduleRepository.save(schedule);
return new ServiceResult<>(schedule);
}