Unfinish task and allow unfinishable tasks

backend/src/main/java/core/api/models/timemanager/tasks/TaskEntityInfo.java

@@ -22,6 +22,8 @@ public class TaskEntityInfo {
 
     private int workTime;
 
+    private boolean finishable;
+
     public TaskEntityInfo(Task task) {
         this.taskID = task.getTaskID();
         this.taskName = task.getTaskName();
@@ -33,6 +35,7 @@ public class TaskEntityInfo {
         }
         this.finished = task.isFinished();
         this.workTime = task.getWorkTime();
+        this.finishable = task.isFinishable();
     }
 
     public long getTaskID() {
@@ -98,4 +101,12 @@ public class TaskEntityInfo {
     public void setWorkTime(int workTime) {
         this.workTime = workTime;
     }
+
+    public boolean isFinishable() {
+        return finishable;
+    }
+
+    public void setFinishable(boolean finishable) {
+        this.finishable = finishable;
+    }
 }

backend/src/main/java/core/api/models/timemanager/tasks/TaskFieldInfo.java

@@ -20,6 +20,8 @@ public class TaskFieldInfo {
     @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
     private LocalDate deadline;
 
+    private boolean finishable;
+
     public TaskFieldInfo() {
     }
 
@@ -61,4 +63,12 @@ public class TaskFieldInfo {
     public void setDeadline(LocalDate deadline) {
         this.deadline = deadline;
     }
+
+    public boolean isFinishable() {
+        return finishable;
+    }
+
+    public void setFinishable(boolean finishable) {
+        this.finishable = finishable;
+    }
 }

backend/src/main/java/core/api/models/timemanager/tasks/TaskOverviewInfo.java

@@ -16,6 +16,7 @@ public class TaskOverviewInfo {
     private LocalDate limit;
     private boolean overdue;
 
+    private boolean finishable;
 
     public TaskOverviewInfo(Task task) {
         this.taskID = task.getTaskID();
@@ -26,6 +27,7 @@ public class TaskOverviewInfo {
         if(task.getDeadline() != null) {
             this.overdue = LocalDate.now().isAfter(task.getDeadline());
         }
+        this.finishable = task.isFinishable();
     }
 
     public long getTaskID() {
@@ -75,4 +77,12 @@ public class TaskOverviewInfo {
     public void setOverdue(boolean overdue) {
         this.overdue = overdue;
     }
+
+    public boolean isFinishable() {
+        return finishable;
+    }
+
+    public void setFinishable(boolean finishable) {
+        this.finishable = finishable;
+    }
 }

backend/src/main/java/core/api/models/timemanager/tasks/TaskShortInfo.java

@@ -7,9 +7,12 @@ public class TaskShortInfo {
     private long taskID;
     private String taskName;
 
+    private boolean finishable;
+
     public TaskShortInfo(Task task) {
         this.taskID = task.getTaskID();
         this.taskName = task.getTaskName();
+        this.finishable = task.isFinishable();
     }
 
     public TaskShortInfo(long taskID, String taskName) {
@@ -32,4 +35,12 @@ public class TaskShortInfo {
     public void setTaskName(String taskName) {
         this.taskName = taskName;
     }
+
+    public boolean isFinishable() {
+        return finishable;
+    }
+
+    public void setFinishable(boolean finishable) {
+        this.finishable = finishable;
+    }
 }

backend/src/main/java/core/api/models/timemanager/tasks/TaskTaskgroupInfo.java

@@ -27,6 +27,8 @@ public class TaskTaskgroupInfo {
 
     private List<TaskgroupEntityInfo> taskgroups;
 
+    private boolean finishable;
+
     public TaskTaskgroupInfo(Task task) {
         this.taskID = task.getTaskID();
         this.taskName = task.getTaskName();
@@ -42,6 +44,7 @@ public class TaskTaskgroupInfo {
         List<Taskgroup> taskgroupList = Taskgroup.getAncestorList(task.getTaskgroup());
         taskgroupList.add(task.getTaskgroup());
         this.taskgroups = taskgroupList.stream().map(TaskgroupEntityInfo::new).toList();
+        this.finishable = task.isFinishable();
     }
 
     public long getTaskID() {
@@ -115,4 +118,12 @@ public class TaskTaskgroupInfo {
     public void setTaskgroups(List<TaskgroupEntityInfo> taskgroups) {
         this.taskgroups = taskgroups;
     }
+
+    public boolean isFinishable() {
+        return finishable;
+    }
+
+    public void setFinishable(boolean finishable) {
+        this.finishable = finishable;
+    }
 }

backend/src/main/java/core/entities/timemanager/Task.java

@@ -1,5 +1,7 @@
 package core.entities.timemanager;
 
+import core.api.models.timemanager.tasks.TaskFieldInfo;
+
 import javax.persistence.*;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -29,21 +31,25 @@ public class Task {
 
     private boolean finished;
 
+    private boolean finishable;
+
     @OneToMany(mappedBy = "task", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     private List<AbstractSchedule> basicTaskSchedules;
 
     private int workTime;
 
-    public Task(Taskgroup taskgroup, String taskName, LocalDate startDate, LocalDate deadline, int eta) {
+    public Task() {
-        this.taskgroup = taskgroup;
-        this.taskName = taskName;
-        this.startDate = startDate;
-        this.deadline = deadline;
-        this.eta = eta;
-        this.finished = false;
     }
 
-    public Task() {
+    public Task(Taskgroup taskgroup, TaskFieldInfo taskFieldInfo) {
+        this.taskgroup = taskgroup;
+        this.taskName = taskFieldInfo.getTaskName();
+        this.startDate = taskFieldInfo.getStartDate();
+        this.deadline = taskFieldInfo.getDeadline();
+        this.eta = taskFieldInfo.getEta();
+        this.finished = false;
+        this.finishable = taskFieldInfo.isFinishable();
+        System.err.println(this.finishable);
     }
 
     public long getTaskID() {
@@ -91,7 +97,7 @@ public class Task {
     }
 
     public void finish() {
-        this.finished = true;
+        this.finished = !this.finished;
     }
 
     public boolean isFinished() {
@@ -171,4 +177,12 @@ public class Task {
         }
         return abstractSchedules;
     }
+
+    public boolean isFinishable() {
+        return finishable;
+    }
+
+    public void setFinishable(boolean finishable) {
+        this.finishable = finishable;
+    }
 }

backend/src/main/java/core/services/TaskService.java

@@ -40,7 +40,7 @@ public class TaskService {
             return new ServiceResult<>(ServiceExitCode.INVALID_PARAMETER);
         }
 
-        Task task = new Task(taskgroup, taskFieldInfo.getTaskName(), taskFieldInfo.getStartDate(), taskFieldInfo.getDeadline(), taskFieldInfo.getEta());
+        Task task = new Task(taskgroup, taskFieldInfo);
         taskgroup.getTasks().add(task);
         taskRepository.save(task);
 

frontend/src/api/model/taskEntityInfo.ts

@@ -44,5 +44,9 @@ export interface TaskEntityInfo {
      * number in minutes that was already worked on this task
      */
     workTime: number;
+    /**
+     * determines whether the task can be finished
+     */
+    finishable: boolean;
 }
 

frontend/src/api/model/taskFieldInfo.ts

@@ -28,5 +28,9 @@ export interface TaskFieldInfo {
      * date until the task has to be finished
      */
     deadline?: string;
+    /**
+     * determines whether the task can be finished
+     */
+    finishable: boolean;
 }
 

frontend/src/api/model/taskOverviewInfo.ts

@@ -38,5 +38,9 @@ export interface TaskOverviewInfo {
      */
     activeTime?: number;
     taskgroupPath: Array<TaskgroupEntityInfo>;
+    /**
+     * determines whether the task can be finished
+     */
+    finishable: boolean;
 }
 

frontend/src/api/model/taskShortInfo.ts

@@ -20,5 +20,9 @@ export interface TaskShortInfo {
      * name of task
      */
     taskName: string;
+    /**
+     * determines whether the task can be finished
+     */
+    finishable: boolean;
 }
 

frontend/src/api/model/taskTaskgroupInfo.ts

@@ -46,5 +46,9 @@ export interface TaskTaskgroupInfo {
      */
     workTime: number;
     taskgroups: Array<TaskgroupEntityInfo>;
+    /**
+     * determines whether the task can be finished
+     */
+    finishable: boolean;
 }
 

frontend/src/app/dashboard/active-schedule/active-schedule.component.html

@@ -14,6 +14,6 @@
   </mat-card-content>
   <mat-card-actions>
     <button mat-raised-button class="grayBtn" (click)="stopTask(false)">Stop</button>
-    <button mat-raised-button class="greenBtn" (click)="stopTask(true)">Finish</button>
+    <button mat-raised-button class="greenBtn" *ngIf="activeSchedule!.task.finishable" (click)="stopTask(true)">Finish</button>
   </mat-card-actions>
 </mat-card>

frontend/src/app/dashboard/task-overview/task-overview.component.html

@@ -10,7 +10,7 @@
     <mat-card-actions>
       <button mat-raised-button color="primary" class="btn-without-radius" (click)="startTaskNow(task)">Start now</button>
       <button *ngIf="taskgroupID != undefined" mat-raised-button class="yellowBtn btn-without-radius" [routerLink]="['/taskgroups', taskgroupID!, 'tasks', task.taskID, 'schedule']">Schedule</button>
-      <button mat-raised-button class="greenBtn btn-without-radius" (click)="finishTask(task)">Finish</button>
+      <button *ngIf="task.finishable" mat-raised-button class="greenBtn btn-without-radius" (click)="finishTask(task)">Finish</button>
     </mat-card-actions>
   </mat-card>
 

frontend/src/app/dashboard/task-overview/task-overview.component.ts

@@ -87,7 +87,8 @@ export class TaskOverviewComponent {
           taskName: res.taskName,
           activeTime: 0,
           overdue: res.overdue,
-          taskgroupPath: []
+          taskgroupPath: [],
+          finishable: res.finishable
         }
         this.creationEmitter.emit({
           task: taskOverviewInfo,

frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html

@@ -23,7 +23,7 @@
           <button mat-flat-button class="yellowBtn" (click)="startTaskNow()">Start now</button>
           <button mat-flat-button class="grayBtn" (click)="openTaskEditor()">Edit</button>
           <!--<button mat-raised-button>Copy</button>-->
-          <button mat-flat-button class="greenBtn" >Finished</button>
+          <button mat-flat-button class="greenBtn"  *ngIf="task!.finishable" (click)="finishTask()">{{task!.finished ? 'Reopen':'Finish'}}</button>
         </div>
 
         <div style="float:right;">

frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.ts

@@ -101,4 +101,12 @@ export class TaskDetailOverviewComponent implements OnInit {
       });
     }
   }
+
+  finishTask() {
+    this.taskService.tasksTaskIDFinishPost(this.task!.taskID).subscribe({
+      next: resp => {
+        this.task!.finished = !this.task!.finished;
+      }
+    })
+  }
 }

frontend/src/app/tasks/task-editor/task-editor.component.html

@@ -24,6 +24,8 @@
     <mat-datepicker-toggle matIconSuffix [for]="deadlinepicker"></mat-datepicker-toggle>
     <mat-datepicker #deadlinepicker></mat-datepicker>
   </mat-form-field>
+
+  <mat-slide-toggle [(ngModel)]="finishable">Finishable</mat-slide-toggle>
 </div>
 
 <div mat-dialog-actions align="end">

frontend/src/app/tasks/task-editor/task-editor.component.ts

@@ -20,6 +20,8 @@ export class TaskEditorComponent implements OnInit {
   nameCtrl: FormControl = new FormControl('', [Validators.required, Validators.maxLength(255)])
   etaCtrl: FormControl = new FormControl(0, [Validators.required, Validators.min(0)])
   startDate: FormControl = new FormControl(Date.now(), [Validators.required])
+
+  finishable: boolean = true;
   endDate: FormControl = new FormControl('');
   constructor(private dialog: MatDialogRef<TaskEditorComponent>,
               private taskService: TaskService,
@@ -58,12 +60,12 @@ export class TaskEditorComponent implements OnInit {
     if(this.startDate.value.length > 0) {
       startDate_formatted = moment(this.startDate.value).format('YYYY-MM-DDTHH:mm:ss.SSSZ');
     }
-
     this.taskService.tasksTaskgroupIDPut(this.editorData.taskgroupID, {
       taskName: this.nameCtrl.value,
       eta: this.etaCtrl.value,
       startDate: startDate_formatted,
-      deadline: endDate_formatted
+      deadline: endDate_formatted,
+      finishable: this.finishable
     }).subscribe({
       next: resp => {
         this.dialog.close(resp);
@@ -89,7 +91,8 @@ export class TaskEditorComponent implements OnInit {
       taskName: this.nameCtrl.value,
       eta: this.etaCtrl.value,
       startDate: startingDate,
-      deadline: deadline
+      deadline: deadline,
+      finishable: this.finishable
     }).subscribe({
       next: resp => {
         this.editorData.task!.taskName = this.nameCtrl.value;

openapi.yaml

@@ -2147,6 +2147,7 @@ components:
         - overdue
         - finished
         - workTime
+        - finishable
       additionalProperties: false
       properties:
         taskID:
@@ -2182,6 +2183,9 @@ components:
           type: number
           description: number in minutes that was already worked on this task
           example: 10
+        finishable:
+          type: boolean
+          description: determines whether the task can be finished
     TaskTaskgroupInfo:
       required:
         - taskID
@@ -2193,6 +2197,7 @@ components:
         - finished
         - workTime
         - taskgroups
+        - finishable
       additionalProperties: false
       properties:
         taskID:
@@ -2232,10 +2237,14 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/TaskgroupEntityInfo'
+        finishable:
+          type: boolean
+          description: determines whether the task can be finished
     TaskFieldInfo:
       required:
         - taskName
         - eta
+        - finishable
       additionalProperties: false
       properties:
         taskName:
@@ -2255,6 +2264,9 @@ components:
           type: string
           format: date
           description: date until the task has to be finished
+        finishable:
+          type: boolean
+          description: determines whether the task can be finished
     BasicScheduleEntityInfo:
       required:
         - scheduleID
@@ -2347,6 +2359,7 @@ components:
       required:
         - taskID
         - taskName
+        - finishable
       additionalProperties: false
       properties:
         taskID:
@@ -2357,6 +2370,9 @@ components:
           type: string
           description: name of task
           example: "Vorlesung zusammenfassen"
+        finishable:
+          type: boolean
+          description: determines whether the task can be finished
     ScheduleActivateInfo:
       required:
         - startTime
@@ -2420,6 +2436,7 @@ components:
         - limit
         - overdue
         - taskgroupPath
+        - finishable
       additionalProperties: false
       properties:
         taskID:
@@ -2451,6 +2468,9 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/TaskgroupEntityInfo'
+        finishable:
+          type: boolean
+          description: determines whether the task can be finished
     ScheduleStatus:
       required:
         - activeMinutes