diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 22d5067..0c2911a 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,10 +4,9 @@
-
-
-
-
+
+
+
@@ -101,7 +100,7 @@
-
+
@@ -199,7 +198,15 @@
1698306442833
-
+
+
+ 1698306889808
+
+
+
+ 1698306889808
+
+
@@ -220,7 +227,8 @@
-
+
+
diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java
index aa64ab9..75ba77f 100644
--- a/backend/src/main/java/core/api/controller/ScheduleController.java
+++ b/backend/src/main/java/core/api/controller/ScheduleController.java
@@ -180,7 +180,7 @@ public class ScheduleController {
return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
}
- ServiceResult stopResult = taskScheduleService.stopSchedule(schedulePermissionResult.getResult());
+ ServiceResult stopResult = taskScheduleService.stopSchedule(schedulePermissionResult.getResult(), finish);
if(stopResult.getExitCode() == ServiceExitCode.INVALID_OPERATION) {
return ResponseEntity.status(400).body(new SimpleStatusResponse("failed"));
} else {
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index 6840d42..b98d444 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -115,7 +115,7 @@ public class TaskScheduleService {
}
}
- public ServiceResult stopSchedule(BasicTaskSchedule taskSchedule) {
+ public ServiceResult stopSchedule(BasicTaskSchedule taskSchedule, boolean finish) {
if(taskSchedule.getStartTime() == null || taskSchedule.getFinishedTime() != null) {
return new ServiceResult<>(ServiceExitCode.INVALID_OPERATION);
}
@@ -125,6 +125,9 @@ public class TaskScheduleService {
long workTime = (taskSchedule.getTask().getWorkTime() + activeTime);
int workTime_i = (int) (workTime);
taskSchedule.getTask().setWorkTime(workTime_i);
+ if(finish) {
+ taskSchedule.getTask().setFinished(true);
+ }
basicTaskScheduleRepository.save(taskSchedule);
taskRepository.save(taskSchedule.getTask());
return new ServiceResult<>((int) activeTime);
diff --git a/frontend/src/app/tasks/task-dashboard/task-dashboard.component.html b/frontend/src/app/tasks/task-dashboard/task-dashboard.component.html
index 030a157..0fc9f75 100644
--- a/frontend/src/app/tasks/task-dashboard/task-dashboard.component.html
+++ b/frontend/src/app/tasks/task-dashboard/task-dashboard.component.html
@@ -29,7 +29,7 @@
Finished |
-
+
|
diff --git a/frontend/src/app/tasks/task-dashboard/task-dashboard.component.ts b/frontend/src/app/tasks/task-dashboard/task-dashboard.component.ts
index ba18818..57357f7 100644
--- a/frontend/src/app/tasks/task-dashboard/task-dashboard.component.ts
+++ b/frontend/src/app/tasks/task-dashboard/task-dashboard.component.ts
@@ -22,6 +22,8 @@ export class TaskDashboardComponent implements OnChanges{
this.datasource = new MatTableDataSource(resp);
this.datasource.paginator = this.paginator!;
this.datasource.sort = this.sort!;
+
+ resp.forEach(task => console.log(task))
}
})
}