sebastian/timemanager
Template
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

issue-25 #27

Merged
sebastian merged 32 commits from issue-25 into issue-18 2023-10-28 19:33:06 +02:00
Conversation 0 Commits 32 Files Changed 51 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bd90907bb8 - Show all commits

3
backend/src/main/java/core/services/TaskScheduleService.java
View File

@ -83,6 +83,7 @@ public class TaskScheduleService {
return new ServiceResult<>(ServiceExitCode.ENTITY_ALREADY_EXIST); return new ServiceResult<>(ServiceExitCode.ENTITY_ALREADY_EXIST);
} else { } else {
BasicTaskSchedule basicTaskSchedule = new BasicTaskSchedule(task, LocalDate.now()); BasicTaskSchedule basicTaskSchedule = new BasicTaskSchedule(task, LocalDate.now());
basicTaskSchedule.setStartTime(LocalDateTime.now());
task.getBasicTaskSchedules().add(basicTaskSchedule); task.getBasicTaskSchedules().add(basicTaskSchedule);
basicTaskScheduleRepository.save(basicTaskSchedule); basicTaskScheduleRepository.save(basicTaskSchedule);
taskRepository.save(task); taskRepository.save(task);
@ -126,6 +127,6 @@ public class TaskScheduleService {
taskSchedule.getTask().setWorkTime(workTime_i); taskSchedule.getTask().setWorkTime(workTime_i);
basicTaskScheduleRepository.save(taskSchedule); basicTaskScheduleRepository.save(taskSchedule);
taskRepository.save(taskSchedule.getTask()); taskRepository.save(taskSchedule.getTask());
return new ServiceResult<>(workTime_i); return new ServiceResult<>((int) activeTime);
} }
} }