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

fix-issue-81 #88

Merged
sebastian merged 3 commits from fix-issue-81 into master 2023-12-20 10:54:27 +01:00
Conversation 0 Commits 3 Files Changed 5 +17 -5
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1337bbb6ab - Show all commits

14
backend/src/main/java/core/api/controller/ScheduleController.java
View File

@ -3,10 +3,7 @@ package core.api.controller;
import core.api.models.auth.SimpleStatusResponse; import core.api.models.auth.SimpleStatusResponse;
import core.api.models.timemanager.taskSchedule.*; import core.api.models.timemanager.taskSchedule.*;
import core.api.models.timemanager.taskSchedule.scheduleInfos.AdvancedScheduleFieldInfo; import core.api.models.timemanager.taskSchedule.scheduleInfos.*;
import core.api.models.timemanager.taskSchedule.scheduleInfos.AdvancedScheduleInfo;
import core.api.models.timemanager.taskSchedule.scheduleInfos.BasicScheduleFieldInfo;
import core.api.models.timemanager.taskSchedule.scheduleInfos.ScheduleFieldInfo;
import core.entities.timemanager.AbstractSchedule; import core.entities.timemanager.AbstractSchedule;
import core.entities.timemanager.AdvancedTaskSchedule; import core.entities.timemanager.AdvancedTaskSchedule;
import core.entities.timemanager.BasicTaskSchedule; import core.entities.timemanager.BasicTaskSchedule;
@ -50,7 +47,14 @@ public class ScheduleController {
} }
List<AbstractSchedule> taskSchedules = permissionResult.getResult().getBasicTaskSchedules(); List<AbstractSchedule> taskSchedules = permissionResult.getResult().getBasicTaskSchedules();
return ResponseEntity.ok(taskSchedules.stream().map(AbstractSchedule::toScheduleInfo).toList()); List<ScheduleInfo> scheduleInfos = new ArrayList<>();
for(AbstractSchedule schedule : taskSchedules) {
//Filter completed schedules out
if(!schedule.isCompleted()) {
scheduleInfos.add(schedule.toScheduleInfo());
}
}
return ResponseEntity.ok(scheduleInfos);
} }
@PutMapping("/schedules/{taskID}/basic") @PutMapping("/schedules/{taskID}/basic")

4
backend/src/main/java/core/entities/timemanager/Task.java
View File

@ -207,4 +207,8 @@ public class Task {
} }
return false; return false;
} }
public void increaseWorkTime(long minutes) {
this.workTime += (int) minutes;
}
} }

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

@ -14,6 +14,7 @@ import core.repositories.timemanager.TaskRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.Duration;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
@ -164,6 +165,9 @@ public class TaskScheduleService {
if(schedule.getStartTime() != null && schedule.getStopTime() == null) { if(schedule.getStartTime() != null && schedule.getStopTime() == null) {
schedule.setStopTime(LocalDateTime.now()); schedule.setStopTime(LocalDateTime.now());
scheduleRepository.save(schedule); scheduleRepository.save(schedule);
Duration scheduleDuration = Duration.between(schedule.getStartTime(), schedule.getStopTime());
schedule.getTask().increaseWorkTime(scheduleDuration.toMinutes());
taskRepository.save(schedule.getTask());
} }
if(finish) { if(finish) {