From e7283c030df49604256b20083fdc56e6148a5be3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Sat, 16 Mar 2024 09:39:13 +0100 Subject: [PATCH] Disable weekly task repetition when task is already part of a series --- .../src/app/tasks/task-dashboard/task-dashboard.component.html | 3 ++- .../src/app/tasks/task-dashboard/task-dashboard.component.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 4eb2960..9d04aaa 100644 --- a/frontend/src/app/tasks/task-dashboard/task-dashboard.component.html +++ b/frontend/src/app/tasks/task-dashboard/task-dashboard.component.html @@ -19,7 +19,8 @@ + [checked]="selection.isSelected(row)" + [disabled]="row.hasTaskSerie"> 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 e842c3c..49b5e14 100644 --- a/frontend/src/app/tasks/task-dashboard/task-dashboard.component.ts +++ b/frontend/src/app/tasks/task-dashboard/task-dashboard.component.ts @@ -48,7 +48,7 @@ export class TaskDashboardComponent implements OnChanges{ return; } - this.selection.select(...this.datasource.data); + this.selection.select(...this.datasource.data.filter(task => !task.hasTaskSerie)); }