update

2026-03-31 18:09:15 +02:00
parent b6a4548732
commit b998940caa
48 changed files with 717 additions and 816 deletions
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -12,36 +12,42 @@

 ## Domain-Modell

-**TaskSchema** — Vorlage/Template für Aufgaben
- Felder: name, status, taskType, category, deadline, startDate, endDate, weekdays, monthDays, yearDays
- TaskSchemaStatus: Active (`aktiv`), Completed (`erledigt`), Inactive (`inaktiv`)
- TaskSchemaType: Single (`einzel`), Daily (`taeglich`), Multi (`multi`), Weekly (`woechentlich`), Monthly (`monatlich`), Yearly (`jaehrlich`)
+**Task** — Einzelne Aufgabe
+- Felder: id, name, status, date, schema (nullable FK), category (nullable FK), createdAt
+- TaskStatus: Active (`active`), Done (`done`)
+- Tasks mit schema=null sind standalone (z.B. aus Single-Schemas erstellt)
+- Tasks mit schema!=null gehören zu einem wiederkehrenden Schema

-**Task** — Einzelne Aufgabe (Instanz eines Schemas)
- Felder: schema (FK), name (Override), category (Override), categoryOverridden, date, status, createdAt
- TaskStatus: Active (`aktiv`), Completed (`erledigt`)
- Kann Name und Kategorie pro Instanz überschreiben (`getEffectiveName()`, `getEffectiveCategory()`)
- Unique Constraint: (schema_id, date)
+**TaskSchema** — Template für wiederkehrende Aufgaben
+- Felder: id, name, status, taskType, category, startDate, endDate, days, createdAt
+- TaskSchemaStatus: Active (`active`), Disabled (`disabled`)
+- TaskSchemaType: Single (`single`), Daily (`daily`), Custom (`custom`)
+- `days`: JSON-Feld mit optionalen Keys: `week` (1-7), `month` (1-31), `year` ([{month, day}])
+- Single: Erstellt Tasks via YearPicker, Tasks werden detached (schema=null), Schema löscht sich automatisch
+- Daily: Erstellt Tasks für jeden Tag im Zeitraum start–end
+- Custom: Erstellt Tasks basierend auf days-Konfiguration im Zeitraum start–end
+- Disabled: Generiert keine neuen Tasks, bestehende bleiben

 **Category** — Farbkodierte Kategorie
 - Felder: id, name, color (Hex #RRGGBB)

-Enum-Case-Namen sind Englisch, String-Werte bleiben Deutsch (in DB gespeichert).
+Enum-Case-Namen und DB-Werte sind Englisch.

 ## Architektur (Backend)

 ```
 Controller → Service (Manager) → Repository → Entity
              ↓
-            DTO (Request/Response)
+            DTO (Request)
 ```

 **Prinzipien:**
 - Controller: nur Routing + Response, keine Geschäftslogik
 - Manager-Services: Geschäftslogik (CRUD, Validierung, Toggle)
- DTOs: typisierter Input (Request) und Output (Response)
+- DTOs: typisierter Input (Request)
 - Validierung: nur auf Request-DTOs (`#[Assert\...]`), nicht auf Entities
- Entities: Doctrine-Mapping + Getter/Setter + berechnete Felder via Serializer-Groups
+- Entities: Doctrine-Mapping + Getter/Setter, Serializer-Groups für API-Output
+- Task-Generierung: Lazy beim Aufruf von GET /api/tasks (nicht per Cronjob)

 ## Verzeichnisstruktur (Backend)

@@ -49,13 +55,12 @@ Controller → Service (Manager) → Repository → Entity
 backend/src/
  Controller/Api/
    CategoryController.php      — Category CRUD
-    TaskController.php          — Task show/update/delete
-    TaskSchemaController.php    — Schema CRUD + week view + toggle
+    TaskController.php          — Task CRUD + index + toggle
+    TaskSchemaController.php    — Schema CRUD
  DTO/
-    Request/                    — CreateSchemaRequest, UpdateSchemaRequest, UpdateTaskRequest,
-                                  ToggleRequest, CreateCategoryRequest, UpdateCategoryRequest,
+    Request/                    — CreateSchemaRequest, UpdateSchemaRequest, CreateTaskRequest,
+                                  UpdateTaskRequest, CreateCategoryRequest, UpdateCategoryRequest,
                                  SchemaValidationTrait
-    Response/                   — WeekViewResponse, DayResponse, ToggleResponse
  Entity/
    Category.php, Task.php, TaskSchema.php
  Enum/
@@ -64,16 +69,34 @@ backend/src/
    CategoryRepository.php, TaskRepository.php, TaskSchemaRepository.php
  Service/
    CategoryManager.php         — Category CRUD-Logik
-    TaskManager.php             — Task Update/Delete/Toggle
-    TaskSchemaManager.php       — Schema CRUD + Sync-Auslösung
-    TaskGenerator.php           — Erzeugt Task-Instanzen für Zeiträume
+    TaskManager.php             — Task Create/Update/Delete/Toggle
+    TaskSchemaManager.php       — Schema CRUD + Single-Flow + Sync-Auslösung
+    TaskGenerator.php           — Erzeugt Task-Instanzen für Zeiträume (lazy)
    TaskSynchronizer.php        — Sync nach Schema-Update (löschen/erstellen/reset)
-    DeadlineCalculator.php      — Berechnet Fälligkeitsdaten für ein Schema
-    TaskViewBuilder.php         — Baut Wochenansicht + Alle-Aufgaben-View
+    DeadlineCalculator.php      — Berechnet Fälligkeitsdaten für Daily/Custom-Schemas
 ```

 ## API-Routen

+### Tasks (`/api/tasks`)
+```
+GET    /                   — Alle Tasks (triggert Task-Generierung)
+GET    /{id}               — Task-Details
+POST   /                   — Task direkt erstellen (schema=null)
+PUT    /{id}               — Task aktualisieren
+DELETE /{id}               — Task löschen
+PATCH  /{id}/toggle        — Status Active↔Done umschalten
+```
+
+### Schemas (`/api/schemas`)
+```
+GET    /                   — Alle Schemas
+GET    /{id}               — Einzelnes Schema
+POST   /                   — Erstellen (Single: erstellt Tasks + löscht Schema)
+PUT    /{id}               — Aktualisieren (synchronisiert zukünftige Tasks)
+DELETE /{id}               — Löschen (?deleteTasks=1 für Task-Löschung)
+```
+
 ### Categories (`/api/categories`)
 ```
 GET    /                   — Alle Kategorien
@@ -83,34 +106,14 @@ PUT    /{id}               — Aktualisieren
 DELETE /{id}               — Löschen
 ```

-### Schemas (`/api/schemas`)
-```
-GET    /                   — Alle Schemas
-GET    /week?start=DATE    — Wochenansicht (7 Tage)
-GET    /all                — Alle Schemas sortiert
-GET    /all-tasks          — Alle Tasks über alle Schemas
-GET    /{id}               — Einzelnes Schema
-POST   /                   — Erstellen
-PUT    /{id}               — Aktualisieren (synchronisiert Tasks)
-DELETE /{id}               — Löschen
-PATCH  /{id}/toggle        — Task-Status umschalten
-```
-
-### Tasks (`/api/tasks`)
-```
-GET    /{id}               — Task-Details
-PUT    /{id}               — Task aktualisieren
-DELETE /{id}               — Task löschen
-```
-
 ## Verzeichnisstruktur (Frontend)

 ```
 frontend/src/
  views/
-    HomeView.vue            — Startseite, Wochenansicht
+    HomeView.vue            — Startseite, Wochenansicht (client-seitig berechnet)
    AllTasksView.vue        — Übersicht aller Schemas/Tasks
-    SchemaView.vue          — Schema erstellen/bearbeiten
+    SchemaView.vue          — Schema erstellen/bearbeiten (3 Typen)
    TaskDetailView.vue      — Einzelne Aufgabe bearbeiten
    CategoriesView.vue      — Kategorien verwalten
  components/
@@ -144,11 +147,12 @@ frontend/src/

 - **Sprache Code**: Englisch (Klassen, Methoden, Variablen, CSS-Klassen)
 - **Sprache UI**: Deutsch (Labels, Fehlermeldungen, Platzhalter)
- **Enum-Werte**: Deutsch in DB (`aktiv`, `erledigt`, `einzel` etc.), Englisch als PHP-Case-Namen (`Active`, `Completed`, `Single`)
- **API-Serialisierung**: Symfony Serializer-Groups auf allen Entities (`schema:read`, `task:read`, `category:read`)
+- **Enum-Werte**: Englisch in DB und Code (`active`, `done`, `single`, `daily`, `custom`, `disabled`)
+- **API-Serialisierung**: Symfony Serializer-Groups auf Entities (`schema:read`, `task:read`, `category:read`)
 - **Validierung**: Auf Request-DTOs, nicht auf Entities
 - **Error-Handling**: `HttpException` → Symfony built-in
 - **Frontend**: Vue 3 Composition API mit `<script setup>`, fetch-basierter API-Client
+- **Wochenansicht**: Frontend berechnet Mo-So client-seitig aus allen Tasks

 ## Development

--- a/backend/migrations/Version20260331150000.php
+++ b/backend/migrations/Version20260331150000.php
@@ -0,0 +1,111 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260331150000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Major refactoring: English enums, unified days field, nullable task.schema, detach single tasks';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // 1. Migrate enum values to English
+        $this->addSql("UPDATE task SET status = 'active' WHERE status = 'aktiv'");
+        $this->addSql("UPDATE task SET status = 'done' WHERE status = 'erledigt'");
+
+        $this->addSql("UPDATE task_schema SET status = 'active' WHERE status = 'aktiv'");
+        $this->addSql("UPDATE task_schema SET status = 'disabled' WHERE status IN ('erledigt', 'inaktiv')");
+
+        $this->addSql("UPDATE task_schema SET task_type = 'single' WHERE task_type = 'einzel'");
+        $this->addSql("UPDATE task_schema SET task_type = 'daily' WHERE task_type = 'taeglich'");
+        $this->addSql("UPDATE task_schema SET task_type = 'custom' WHERE task_type IN ('multi', 'woechentlich', 'monatlich', 'jaehrlich')");
+
+        // 2. Add unified days column
+        $this->addSql('ALTER TABLE task_schema ADD days JSON DEFAULT NULL');
+
+        // 3. Migrate weekdays/monthDays/yearDays into days JSON via PHP
+        $this->migrateDaysData();
+
+        // 4. Drop old columns from task_schema
+        $this->addSql('ALTER TABLE task_schema DROP deadline, DROP weekdays, DROP month_days, DROP year_days');
+
+        // 5. Backfill task names/categories from schema (for all tasks that relied on getEffectiveName fallback)
+        $this->addSql("UPDATE task t INNER JOIN task_schema ts ON t.task_id = ts.id SET t.name = ts.name WHERE t.name IS NULL");
+        $this->addSql("UPDATE task t INNER JOIN task_schema ts ON t.task_id = ts.id SET t.category_id = ts.category_id WHERE t.category_id IS NULL AND ts.category_id IS NOT NULL");
+
+        // 6. Detach single tasks
+        $this->addSql("UPDATE task t INNER JOIN task_schema ts ON t.task_id = ts.id SET t.name = ts.name WHERE ts.task_type = 'single' AND t.name IS NULL");
+        $this->addSql("UPDATE task t INNER JOIN task_schema ts ON t.task_id = ts.id SET t.category_id = ts.category_id WHERE ts.task_type = 'single' AND t.category_id IS NULL");
+
+        // Drop FK + unique constraint before modifying task_id
+        $this->addSql('ALTER TABLE task DROP FOREIGN KEY FK_527EDB258DB60186');
+        $this->addSql('DROP INDEX UNIQ_527EDB258DB60186AA9E377A ON task');
+
+        // Detach single tasks
+        $this->addSql("UPDATE task t INNER JOIN task_schema ts ON t.task_id = ts.id SET t.task_id = NULL WHERE ts.task_type = 'single'");
+
+        // Delete single schemas
+        $this->addSql("DELETE FROM task_schema WHERE task_type = 'single'");
+
+        // Make task_id nullable with SET NULL on delete
+        $this->addSql('ALTER TABLE task MODIFY task_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE task ADD CONSTRAINT FK_527EDB258DB60186 FOREIGN KEY (task_id) REFERENCES task_schema (id) ON DELETE SET NULL');
+    }
+
+    private function migrateDaysData(): void
+    {
+        $rows = $this->connection->fetchAllAssociative(
+            'SELECT id, weekdays, month_days, year_days FROM task_schema'
+        );
+
+        foreach ($rows as $row) {
+            $days = [];
+
+            $weekdays = $row['weekdays'] ? json_decode($row['weekdays'], true) : null;
+            $monthDays = $row['month_days'] ? json_decode($row['month_days'], true) : null;
+            $yearDays = $row['year_days'] ? json_decode($row['year_days'], true) : null;
+
+            if (!empty($weekdays)) {
+                $days['week'] = $weekdays;
+            }
+            if (!empty($monthDays)) {
+                $days['month'] = $monthDays;
+            }
+            if (!empty($yearDays)) {
+                $days['year'] = $yearDays;
+            }
+
+            if (!empty($days)) {
+                $this->connection->executeStatement(
+                    'UPDATE task_schema SET days = ? WHERE id = ?',
+                    [json_encode($days), $row['id']]
+                );
+            }
+        }
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE task_schema ADD deadline DATE DEFAULT NULL, ADD weekdays JSON DEFAULT NULL, ADD month_days JSON DEFAULT NULL, ADD year_days JSON DEFAULT NULL');
+        $this->addSql('ALTER TABLE task_schema DROP days');
+
+        $this->addSql('ALTER TABLE task DROP FOREIGN KEY FK_527EDB258DB60186');
+        $this->addSql('ALTER TABLE task MODIFY task_id INT NOT NULL');
+        $this->addSql('ALTER TABLE task ADD CONSTRAINT FK_527EDB258DB60186 FOREIGN KEY (task_id) REFERENCES task_schema (id) ON DELETE CASCADE');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_527EDB258DB60186AA9E377A ON task (task_id, date)');
+
+        $this->addSql("UPDATE task SET status = 'aktiv' WHERE status = 'active'");
+        $this->addSql("UPDATE task SET status = 'erledigt' WHERE status = 'done'");
+        $this->addSql("UPDATE task_schema SET status = 'aktiv' WHERE status = 'active'");
+        $this->addSql("UPDATE task_schema SET status = 'inaktiv' WHERE status = 'disabled'");
+        $this->addSql("UPDATE task_schema SET task_type = 'einzel' WHERE task_type = 'single'");
+        $this->addSql("UPDATE task_schema SET task_type = 'taeglich' WHERE task_type = 'daily'");
+    }
+}
--- a/backend/plan2.md
+++ b/backend/plan2.md
@@ -5,7 +5,7 @@
 - Wird verwendet um Aufgaben anzuzeigen
 - Entity
    - name - Name der Aufgabe
-    - status - Status (active, done), null is disabled
+    - status - Status der Aufgabe (active, done)
    - date - Deadline, null for no deadline
    - schema - schemaId, null no schema
    - category - categoryId, null no category
@@ -15,6 +15,7 @@
    - create() - Task erstellen
    - update(id) - Task aktualisieren
    - delete(id) - Task entfernen
+    - toggle(id) - Status switchen (active, done)
 - Werden durch Schemas erstellt
 -

@@ -36,14 +37,15 @@
 - Template um Aufgaben zu erstellen
 - Entity
    - name - Name für erstellte Aufgaben
-    - status - Status für erstellte Aufgaben
+    - status - Status für Schema (active, disabled)
    - category - Kategorie für erstellte Aufgaben
    - type
        - single - Einmal erstellt, schema = null
-        - repeat - Wiederholt erstellt, schema = id
-    - start - Startdatum für type=repeat
-    - end - Enddatum für type=repeat
-    - days - Tage für Muster für die Erstellung der Aufgaben
+        - daily - Für jeden Tag erstellt, schema = id
+        - custom - Benutzerdefiniert erstellt, schema = id
+    - start - Startdatum für type=daily,custom
+    - end - Enddatum für type=daily, custom
+    - days - Tage für type=custom
        - week - Array für Wochentage (1-7)
        - month - Array für Monatstage (1-31)
        - year - Array für Jahrestage (1-365/366)
--- a/backend/src/Controller/Api/TaskController.php
+++ b/backend/src/Controller/Api/TaskController.php
@@ -2,8 +2,11 @@

 namespace App\Controller\Api;

+use App\DTO\Request\CreateTaskRequest;
 use App\DTO\Request\UpdateTaskRequest;
 use App\Entity\Task;
+use App\Repository\TaskRepository;
+use App\Service\TaskGenerator;
 use App\Service\TaskManager;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -11,20 +14,42 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;
 use Symfony\Component\Routing\Attribute\Route;

-#[Route('/api/tasks', name: 'tasks.')]
+#[Route('/api/tasks')]
 class TaskController extends AbstractController
 {
    public function __construct(
        private TaskManager $taskManager,
+        private TaskGenerator $taskGenerator,
+        private TaskRepository $taskRepository,
    ) {}

-    #[Route('/{id}', name: 'show', methods: ['GET'])]
+    #[Route('', name: 'tasks.index', methods: ['GET'])]
+    public function index(): JsonResponse
+    {
+        $today = new \DateTimeImmutable('today');
+        $end = $today->modify('+6 days');
+        $this->taskGenerator->generateForRange($today, $end);
+
+        $tasks = $this->taskRepository->findAllWithRelations();
+
+        return $this->json($tasks, context: ['groups' => ['task:read', 'category:read']]);
+    }
+
+    #[Route('/{id}', name: 'tasks.show', methods: ['GET'])]
    public function show(Task $task): JsonResponse
    {
        return $this->json($task, context: ['groups' => ['task:read', 'category:read']]);
    }

-    #[Route('/{id}', name: 'update', methods: ['PUT'])]
+    #[Route('', name: 'tasks.create', methods: ['POST'])]
+    public function create(#[MapRequestPayload] CreateTaskRequest $dto): JsonResponse
+    {
+        $task = $this->taskManager->createTask($dto);
+
+        return $this->json($task, Response::HTTP_CREATED, context: ['groups' => ['task:read', 'category:read']]);
+    }
+
+    #[Route('/{id}', name: 'tasks.update', methods: ['PUT'])]
    public function update(#[MapRequestPayload] UpdateTaskRequest $dto, Task $task): JsonResponse
    {
        $task = $this->taskManager->updateTask($task, $dto);
@@ -32,11 +57,19 @@ class TaskController extends AbstractController
        return $this->json($task, context: ['groups' => ['task:read', 'category:read']]);
    }

-    #[Route('/{id}', name: 'delete', methods: ['DELETE'])]
+    #[Route('/{id}', name: 'tasks.delete', methods: ['DELETE'])]
    public function delete(Task $task): JsonResponse
    {
        $this->taskManager->deleteTask($task);

        return $this->json(null, Response::HTTP_NO_CONTENT);
    }
+
+    #[Route('/{id}/toggle', name: 'tasks.toggle', methods: ['PATCH'])]
+    public function toggle(Task $task): JsonResponse
+    {
+        $task = $this->taskManager->toggleTask($task);
+
+        return $this->json($task, context: ['groups' => ['task:read', 'category:read']]);
+    }
 }
--- a/backend/src/Controller/Api/TaskSchemaController.php
+++ b/backend/src/Controller/Api/TaskSchemaController.php
@@ -3,13 +3,10 @@
 namespace App\Controller\Api;

 use App\DTO\Request\CreateSchemaRequest;
-use App\DTO\Request\ToggleRequest;
 use App\DTO\Request\UpdateSchemaRequest;
 use App\Entity\TaskSchema;
 use App\Repository\TaskSchemaRepository;
-use App\Service\TaskManager;
 use App\Service\TaskSchemaManager;
-use App\Service\TaskViewBuilder;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -23,41 +20,16 @@ class TaskSchemaController extends AbstractController
    public function __construct(
        private TaskSchemaRepository $schemaRepository,
        private TaskSchemaManager $schemaManager,
-        private TaskManager $taskManager,
-        private TaskViewBuilder $taskViewBuilder,
    ) {}

    #[Route('', name: 'schemas.index', methods: ['GET'])]
    public function index(): JsonResponse
-    {
-        $schemas = $this->schemaRepository->findAll();
-
-        return $this->json($schemas, context: ['groups' => ['schema:read', 'category:read']]);
-    }
-
-    #[Route('/week', name: 'schemas.week', methods: ['GET'])]
-    public function week(Request $request): JsonResponse
-    {
-        $startParam = $request->query->get('start');
-        $start = $startParam ? new \DateTimeImmutable($startParam) : new \DateTimeImmutable('today');
-
-        return $this->json($this->taskViewBuilder->buildWeekView($start), context: ['groups' => ['task:read', 'category:read']]);
-    }
-
-    #[Route('/all', name: 'schemas.all', methods: ['GET'])]
-    public function allSchemas(): JsonResponse
    {
        $schemas = $this->schemaRepository->findBy([], ['createdAt' => 'DESC']);

        return $this->json($schemas, context: ['groups' => ['schema:read', 'category:read']]);
    }

-    #[Route('/all-tasks', name: 'schemas.allTasks', methods: ['GET'])]
-    public function allTasks(): JsonResponse
-    {
-        return $this->json($this->taskViewBuilder->buildAllTasksView(), context: ['groups' => ['task:read', 'category:read']]);
-    }
-
    #[Route('/{id}', name: 'schemas.show', methods: ['GET'])]
    public function show(TaskSchema $schema): JsonResponse
    {
@@ -67,9 +39,13 @@ class TaskSchemaController extends AbstractController
    #[Route('', name: 'schemas.create', methods: ['POST'])]
    public function create(#[MapRequestPayload] CreateSchemaRequest $dto): JsonResponse
    {
-        $schema = $this->schemaManager->createSchema($dto);
+        $result = $this->schemaManager->createSchema($dto);

-        return $this->json($schema, Response::HTTP_CREATED, context: ['groups' => ['schema:read', 'category:read']]);
+        if (is_array($result)) {
+            return $this->json($result, Response::HTTP_CREATED, context: ['groups' => ['task:read', 'category:read']]);
+        }
+
+        return $this->json($result, Response::HTTP_CREATED, context: ['groups' => ['schema:read', 'category:read']]);
    }

    #[Route('/{id}', name: 'schemas.update', methods: ['PUT'])]
@@ -81,18 +57,11 @@ class TaskSchemaController extends AbstractController
    }

    #[Route('/{id}', name: 'schemas.delete', methods: ['DELETE'])]
-    public function delete(TaskSchema $schema): JsonResponse
+    public function delete(TaskSchema $schema, Request $request): JsonResponse
    {
-        $this->schemaManager->deleteSchema($schema);
+        $deleteTasks = (bool) $request->query->get('deleteTasks', false);
+        $this->schemaManager->deleteSchema($schema, $deleteTasks);

        return $this->json(null, Response::HTTP_NO_CONTENT);
    }
-
-    #[Route('/{id}/toggle', name: 'schemas.toggle', methods: ['PATCH'])]
-    public function toggle(TaskSchema $schema, #[MapRequestPayload] ToggleRequest $dto): JsonResponse
-    {
-        $result = $this->taskManager->toggleTaskStatus($schema, $dto);
-
-        return $this->json($result);
-    }
 }
--- a/backend/src/DTO/Request/CreateSchemaRequest.php
+++ b/backend/src/DTO/Request/CreateSchemaRequest.php
@@ -14,11 +14,8 @@ class CreateSchemaRequest

    public ?int $categoryId = null;
    public ?string $status = null;
-    public ?string $taskType = null;
-    public ?string $deadline = null;
+    public ?string $type = null;
    public ?string $startDate = null;
    public ?string $endDate = null;
-    public ?array $weekdays = null;
-    public ?array $monthDays = null;
-    public ?array $yearDays = null;
+    public ?array $days = null;
 }
--- a/backend/src/DTO/Request/CreateTaskRequest.php
+++ b/backend/src/DTO/Request/CreateTaskRequest.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\DTO\Request;
+
+use Symfony\Component\Validator\Constraints as Assert;
+
+class CreateTaskRequest
+{
+    #[Assert\NotBlank]
+    #[Assert\Length(max: 255)]
+    public ?string $name = null;
+
+    public ?int $categoryId = null;
+    public ?string $date = null;
+}
--- a/backend/src/DTO/Request/SchemaValidationTrait.php
+++ b/backend/src/DTO/Request/SchemaValidationTrait.php
@@ -8,7 +8,7 @@ trait SchemaValidationTrait
 {
    public function validate(ExecutionContextInterface $context): void
    {
-        if ($this->taskType !== null && $this->taskType !== 'einzel') {
+        if ($this->type !== null && $this->type !== 'single') {
            if ($this->startDate !== null && $this->endDate !== null && $this->endDate < $this->startDate) {
                $context->buildViolation('endDate muss >= startDate sein.')
                    ->atPath('endDate')
@@ -16,26 +16,19 @@ trait SchemaValidationTrait
            }
        }

-        if ($this->taskType === 'woechentlich') {
-            if (empty($this->weekdays)) {
-                $context->buildViolation('weekdays darf nicht leer sein.')
-                    ->atPath('weekdays')
+        if ($this->type === 'single') {
+            $year = $this->days['year'] ?? null;
+            if (empty($year)) {
+                $context->buildViolation('Mindestens ein Datum muss ausgewählt werden.')
+                    ->atPath('days')
                    ->addViolation();
            }
        }

-        if ($this->taskType === 'monatlich') {
-            if (empty($this->monthDays)) {
-                $context->buildViolation('monthDays darf nicht leer sein.')
-                    ->atPath('monthDays')
-                    ->addViolation();
-            }
-        }
-
-        if ($this->taskType === 'multi' || $this->taskType === 'jaehrlich') {
-            if (empty($this->yearDays)) {
-                $context->buildViolation('yearDays darf nicht leer sein.')
-                    ->atPath('yearDays')
+        if ($this->type === 'custom') {
+            if (empty($this->days)) {
+                $context->buildViolation('days darf nicht leer sein.')
+                    ->atPath('days')
                    ->addViolation();
            }
        }
--- a/backend/src/DTO/Request/ToggleRequest.php
+++ b/backend/src/DTO/Request/ToggleRequest.php
@@ -1,8 +0,0 @@
-<?php
-
-namespace App\DTO\Request;
-
-class ToggleRequest
-{
-    public ?string $date = null;
-}
--- a/backend/src/DTO/Request/UpdateSchemaRequest.php
+++ b/backend/src/DTO/Request/UpdateSchemaRequest.php
@@ -15,11 +15,8 @@ class UpdateSchemaRequest
    public ?int $categoryId = null;
    public bool $hasCategoryId = false;
    public ?string $status = null;
-    public ?string $taskType = null;
-    public ?string $deadline = null;
+    public ?string $type = null;
    public ?string $startDate = null;
    public ?string $endDate = null;
-    public ?array $weekdays = null;
-    public ?array $monthDays = null;
-    public ?array $yearDays = null;
+    public ?array $days = null;
 }
--- a/backend/src/DTO/Response/DayResponse.php
+++ b/backend/src/DTO/Response/DayResponse.php
@@ -1,16 +0,0 @@
-<?php
-
-namespace App\DTO\Response;
-
-use Symfony\Component\Serializer\Attribute\Groups;
-
-class DayResponse
-{
-    public function __construct(
-        #[Groups(['task:read'])]
-        public readonly string $date,
-        /** @var \App\Entity\Task[] */
-        #[Groups(['task:read'])]
-        public readonly array $tasks,
-    ) {}
-}
--- a/backend/src/DTO/Response/ToggleResponse.php
+++ b/backend/src/DTO/Response/ToggleResponse.php
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\DTO\Response;
-
-class ToggleResponse
-{
-    public function __construct(
-        public readonly bool $completed,
-    ) {}
-}
--- a/backend/src/DTO/Response/WeekViewResponse.php
+++ b/backend/src/DTO/Response/WeekViewResponse.php
@@ -1,17 +0,0 @@
-<?php
-
-namespace App\DTO\Response;
-
-use Symfony\Component\Serializer\Attribute\Groups;
-
-class WeekViewResponse
-{
-    public function __construct(
-        /** @var \App\Entity\Task[] */
-        #[Groups(['task:read'])]
-        public readonly array $tasksWithoutDeadline,
-        /** @var DayResponse[] */
-        #[Groups(['task:read'])]
-        public readonly array $days,
-    ) {}
-}
--- a/backend/src/Entity/Task.php
+++ b/backend/src/Entity/Task.php
@@ -10,7 +10,6 @@ use Symfony\Component\Serializer\Attribute\Groups;
 use Symfony\Component\Serializer\Attribute\SerializedName;

 #[ORM\Entity(repositoryClass: TaskRepository::class)]
-#[ORM\UniqueConstraint(columns: ['task_id', 'date'])]
 class Task
 {
    public function __construct()
@@ -21,30 +20,33 @@ class Task
    #[ORM\Id]
    #[ORM\GeneratedValue]
    #[ORM\Column]
+    #[Groups(['task:read'])]
    private ?int $id = null;

    #[ORM\ManyToOne]
-    #[ORM\JoinColumn(name: 'task_id', nullable: false, onDelete: 'CASCADE')]
-    private TaskSchema $schema;
+    #[ORM\JoinColumn(name: 'task_id', nullable: true, onDelete: 'SET NULL')]
+    private ?TaskSchema $schema = null;

    #[ORM\Column(length: 255, nullable: true)]
+    #[Groups(['task:read'])]
    private ?string $name = null;

    #[ORM\ManyToOne]
    #[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
+    #[Groups(['task:read'])]
    private ?Category $category = null;

    #[ORM\Column(type: Types::DATE_MUTABLE, nullable: true)]
+    #[Groups(['task:read'])]
    private ?\DateTimeInterface $date = null;

    #[ORM\Column(length: 20, enumType: TaskStatus::class)]
+    #[Groups(['task:read'])]
    private TaskStatus $status = TaskStatus::Active;

    #[ORM\Column(type: Types::DATETIME_MUTABLE)]
    private \DateTimeInterface $createdAt;

-    #[Groups(['task:read'])]
-    #[SerializedName('taskId')]
    public function getId(): ?int
    {
        return $this->id;
@@ -52,17 +54,17 @@ class Task

    #[Groups(['task:read'])]
    #[SerializedName('schemaId')]
-    public function getSchemaId(): int
+    public function getSchemaId(): ?int
    {
-        return $this->schema->getId();
+        return $this->schema?->getId();
    }

-    public function getSchema(): TaskSchema
+    public function getSchema(): ?TaskSchema
    {
        return $this->schema;
    }

-    public function setSchema(TaskSchema $schema): static
+    public function setSchema(?TaskSchema $schema): static
    {
        $this->schema = $schema;
        return $this;
@@ -79,7 +81,6 @@ class Task
        return $this;
    }

-    #[Groups(['task:read'])]
    public function getCategory(): ?Category
    {
        return $this->category;
@@ -91,32 +92,17 @@ class Task
        return $this;
    }

-    #[Groups(['task:read'])]
-    #[SerializedName('name')]
-    public function getEffectiveName(): string
-    {
-        return $this->name ?? $this->schema->getName();
-    }
-
-    #[Groups(['task:read'])]
    public function getDate(): ?\DateTimeInterface
    {
        return $this->date;
    }

-    #[Groups(['task:read'])]
-    public function getDeadline(): ?\DateTimeInterface
-    {
-        return $this->date;
-    }
-
    public function setDate(?\DateTimeInterface $date): static
    {
        $this->date = $date;
        return $this;
    }

-    #[Groups(['task:read'])]
    public function getStatus(): TaskStatus
    {
        return $this->status;
@@ -128,13 +114,6 @@ class Task
        return $this;
    }

-    #[Groups(['task:read'])]
-    #[SerializedName('taskType')]
-    public function getTaskType(): string
-    {
-        return $this->schema->getTaskType()->value;
-    }
-
    #[Groups(['task:read'])]
    #[SerializedName('isPast')]
    public function isPast(): bool
--- a/backend/src/Entity/TaskSchema.php
+++ b/backend/src/Entity/TaskSchema.php
@@ -8,6 +8,7 @@ use App\Repository\TaskSchemaRepository;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Serializer\Attribute\SerializedName;

 #[ORM\Entity(repositoryClass: TaskSchemaRepository::class)]
 class TaskSchema
@@ -26,8 +27,9 @@ class TaskSchema
    #[Groups(['schema:read', 'schema:write'])]
    private TaskSchemaStatus $status = TaskSchemaStatus::Active;

-    #[ORM\Column(length: 20, enumType: TaskSchemaType::class)]
+    #[ORM\Column(name: 'task_type', length: 20, enumType: TaskSchemaType::class)]
    #[Groups(['schema:read', 'schema:write'])]
+    #[SerializedName('type')]
    private TaskSchemaType $taskType = TaskSchemaType::Single;

    #[ORM\ManyToOne]
@@ -35,10 +37,6 @@ class TaskSchema
    #[Groups(['schema:read'])]
    private ?Category $category = null;

-    #[ORM\Column(type: Types::DATE_MUTABLE, nullable: true)]
-    #[Groups(['schema:read', 'schema:write'])]
-    private ?\DateTimeInterface $deadline = null;
-
    #[ORM\Column(type: Types::DATE_MUTABLE, nullable: true)]
    #[Groups(['schema:read', 'schema:write'])]
    private ?\DateTimeInterface $startDate = null;
@@ -49,15 +47,7 @@ class TaskSchema

    #[ORM\Column(type: Types::JSON, nullable: true)]
    #[Groups(['schema:read', 'schema:write'])]
-    private ?array $weekdays = null;
-
-    #[ORM\Column(type: Types::JSON, nullable: true)]
-    #[Groups(['schema:read', 'schema:write'])]
-    private ?array $monthDays = null;
-
-    #[ORM\Column(type: Types::JSON, nullable: true)]
-    #[Groups(['schema:read', 'schema:write'])]
-    private ?array $yearDays = null;
+    private ?array $days = null;

    #[ORM\Column(type: Types::DATETIME_MUTABLE)]
    #[Groups(['schema:read'])]
@@ -117,17 +107,6 @@ class TaskSchema
        return $this;
    }

-    public function getDeadline(): ?\DateTimeInterface
-    {
-        return $this->deadline;
-    }
-
-    public function setDeadline(?\DateTimeInterface $deadline): static
-    {
-        $this->deadline = $deadline;
-        return $this;
-    }
-
    public function getStartDate(): ?\DateTimeInterface
    {
        return $this->startDate;
@@ -150,36 +129,14 @@ class TaskSchema
        return $this;
    }

-    public function getWeekdays(): ?array
+    public function getDays(): ?array
    {
-        return $this->weekdays;
+        return $this->days;
    }

-    public function setWeekdays(?array $weekdays): static
+    public function setDays(?array $days): static
    {
-        $this->weekdays = $weekdays;
-        return $this;
-    }
-
-    public function getMonthDays(): ?array
-    {
-        return $this->monthDays;
-    }
-
-    public function setMonthDays(?array $monthDays): static
-    {
-        $this->monthDays = $monthDays;
-        return $this;
-    }
-
-    public function getYearDays(): ?array
-    {
-        return $this->yearDays;
-    }
-
-    public function setYearDays(?array $yearDays): static
-    {
-        $this->yearDays = $yearDays;
+        $this->days = $days;
        return $this;
    }

--- a/backend/src/Enum/TaskSchemaStatus.php
+++ b/backend/src/Enum/TaskSchemaStatus.php
@@ -4,7 +4,6 @@ namespace App\Enum;

 enum TaskSchemaStatus: string
 {
-    case Active = 'aktiv';
-    case Completed = 'erledigt';
-    case Inactive = 'inaktiv';
+    case Active = 'active';
+    case Disabled = 'disabled';
 }
--- a/backend/src/Enum/TaskSchemaType.php
+++ b/backend/src/Enum/TaskSchemaType.php
@@ -4,10 +4,7 @@ namespace App\Enum;

 enum TaskSchemaType: string
 {
-    case Single = 'einzel';
-    case Daily = 'taeglich';
-    case Multi = 'multi';
-    case Weekly = 'woechentlich';
-    case Monthly = 'monatlich';
-    case Yearly = 'jaehrlich';
+    case Single = 'single';
+    case Daily = 'daily';
+    case Custom = 'custom';
 }
--- a/backend/src/Enum/TaskStatus.php
+++ b/backend/src/Enum/TaskStatus.php
@@ -4,6 +4,6 @@ namespace App\Enum;

 enum TaskStatus: string
 {
-    case Active = 'aktiv';
-    case Completed = 'erledigt';
+    case Active = 'active';
+    case Done = 'done';
 }
--- a/backend/src/Repository/TaskRepository.php
+++ b/backend/src/Repository/TaskRepository.php
@@ -4,7 +4,6 @@ namespace App\Repository;

 use App\Entity\Task;
 use App\Entity\TaskSchema;
-use App\Enum\TaskStatus;
 use App\Enum\TaskSchemaStatus;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
@@ -19,6 +18,22 @@ class TaskRepository extends ServiceEntityRepository
        parent::__construct($registry, Task::class);
    }

+    /**
+     * @return Task[]
+     */
+    public function findAllWithRelations(): array
+    {
+        return $this->createQueryBuilder('task')
+            ->leftJoin('task.schema', 'schema')
+            ->leftJoin('task.category', 'category')
+            ->addSelect('schema', 'category')
+            ->where('task.schema IS NULL OR schema.status != :disabled')
+            ->setParameter('disabled', TaskSchemaStatus::Disabled)
+            ->orderBy('task.date', 'ASC')
+            ->getQuery()
+            ->getResult();
+    }
+
    public function findBySchemaAndDate(TaskSchema $schema, \DateTimeInterface $date): ?Task
    {
        return $this->createQueryBuilder('task')
@@ -36,15 +51,15 @@ class TaskRepository extends ServiceEntityRepository
    public function findInRange(\DateTimeInterface $from, \DateTimeInterface $to): array
    {
        return $this->createQueryBuilder('task')
-            ->join('task.schema', 'schema')
+            ->leftJoin('task.schema', 'schema')
            ->leftJoin('task.category', 'category')
            ->addSelect('schema', 'category')
            ->where('task.date >= :from')
            ->andWhere('task.date <= :to')
-            ->andWhere('schema.status != :excluded')
+            ->andWhere('task.schema IS NULL OR schema.status != :disabled')
            ->setParameter('from', $from)
            ->setParameter('to', $to)
-            ->setParameter('excluded', TaskSchemaStatus::Inactive)
+            ->setParameter('disabled', TaskSchemaStatus::Disabled)
            ->orderBy('task.date', 'ASC')
            ->getQuery()
            ->getResult();
@@ -59,6 +74,7 @@ class TaskRepository extends ServiceEntityRepository
            ->select('IDENTITY(task.schema) AS schemaId', 'task.date')
            ->where('task.date >= :from')
            ->andWhere('task.date <= :to')
+            ->andWhere('task.schema IS NOT NULL')
            ->setParameter('from', $from)
            ->setParameter('to', $to)
            ->getQuery()
@@ -88,62 +104,4 @@ class TaskRepository extends ServiceEntityRepository
            ->getQuery()
            ->getResult();
    }
-
-    public function deleteFutureBySchema(TaskSchema $schema, \DateTimeInterface $fromDate): void
-    {
-        $this->createQueryBuilder('task')
-            ->delete()
-            ->where('task.schema = :schema')
-            ->andWhere('task.date >= :from')
-            ->setParameter('schema', $schema)
-            ->setParameter('from', $fromDate)
-            ->getQuery()
-            ->execute();
-    }
-
-    public function deleteFutureActiveBySchema(TaskSchema $schema, \DateTimeInterface $fromDate): void
-    {
-        $this->createQueryBuilder('task')
-            ->delete()
-            ->where('task.schema = :schema')
-            ->andWhere('task.date >= :from')
-            ->andWhere('task.status = :status')
-            ->setParameter('schema', $schema)
-            ->setParameter('from', $fromDate)
-            ->setParameter('status', TaskStatus::Active)
-            ->getQuery()
-            ->execute();
-    }
-
-    /**
-     * @return Task[]
-     */
-    public function findAllSorted(): array
-    {
-        return $this->createQueryBuilder('task')
-            ->join('task.schema', 'schema')
-            ->leftJoin('task.category', 'category')
-            ->addSelect('schema', 'category')
-            ->where('task.date IS NOT NULL')
-            ->orderBy('task.date', 'DESC')
-            ->getQuery()
-            ->getResult();
-    }
-
-    /**
-     * @return Task[]
-     */
-    public function findWithoutDate(): array
-    {
-        return $this->createQueryBuilder('task')
-            ->join('task.schema', 'schema')
-            ->leftJoin('task.category', 'category')
-            ->addSelect('schema', 'category')
-            ->where('task.date IS NULL')
-            ->andWhere('schema.status != :excluded')
-            ->setParameter('excluded', TaskSchemaStatus::Inactive)
-            ->orderBy('task.createdAt', 'DESC')
-            ->getQuery()
-            ->getResult();
-    }
 }
--- a/backend/src/Repository/TaskSchemaRepository.php
+++ b/backend/src/Repository/TaskSchemaRepository.php
@@ -24,14 +24,12 @@ class TaskSchemaRepository extends ServiceEntityRepository
    public function findActiveSchemasInRange(\DateTimeInterface $from, \DateTimeInterface $to): array
    {
        return $this->createQueryBuilder('t')
-            ->where('t.status != :excluded')
-            ->andWhere(
-                '(t.taskType = :einzel AND (t.deadline IS NULL OR (t.deadline >= :from AND t.deadline <= :to)))'
-                . ' OR '
-                . '(t.taskType != :einzel AND t.startDate <= :to AND (t.endDate IS NULL OR t.endDate >= :from))'
-            )
-            ->setParameter('excluded', TaskSchemaStatus::Inactive)
-            ->setParameter('einzel', TaskSchemaType::Single->value)
+            ->where('t.status = :active')
+            ->andWhere('t.taskType IN (:types)')
+            ->andWhere('t.startDate <= :to')
+            ->andWhere('t.endDate IS NULL OR t.endDate >= :from')
+            ->setParameter('active', TaskSchemaStatus::Active)
+            ->setParameter('types', [TaskSchemaType::Daily, TaskSchemaType::Custom])
            ->setParameter('from', $from)
            ->setParameter('to', $to)
            ->getQuery()
--- a/backend/src/Service/DeadlineCalculator.php
+++ b/backend/src/Service/DeadlineCalculator.php
@@ -11,22 +11,6 @@ class DeadlineCalculator
     * @return \DateTimeInterface[]
     */
    public function getDeadlinesForRange(TaskSchema $schema, \DateTimeInterface $from, \DateTimeInterface $to): array
-    {
-        if ($schema->getTaskType() === TaskSchemaType::Single) {
-            $deadline = $schema->getDeadline();
-            if ($deadline === null) {
-                return [];
-            }
-            return ($deadline >= $from && $deadline <= $to) ? [$deadline] : [];
-        }
-
-        return $this->getRecurringDeadlines($schema, $from, $to);
-    }
-
-    /**
-     * @return \DateTimeInterface[]
-     */
-    private function getRecurringDeadlines(TaskSchema $schema, \DateTimeInterface $from, \DateTimeInterface $to): array
    {
        $startDate = $schema->getStartDate();
        if ($startDate === null) {
@@ -59,23 +43,32 @@ class DeadlineCalculator
    {
        return match ($schema->getTaskType()) {
            TaskSchemaType::Daily => true,
-            TaskSchemaType::Weekly => in_array((int) $date->format('N'), $schema->getWeekdays() ?? [], true),
-            TaskSchemaType::Monthly => in_array((int) $date->format('j'), $schema->getMonthDays() ?? [], true),
-            TaskSchemaType::Multi, TaskSchemaType::Yearly => $this->matchesYearDays($schema, $date),
+            TaskSchemaType::Custom => $this->matchesDays($schema, $date),
            default => false,
        };
    }

-    private function matchesYearDays(TaskSchema $schema, \DateTimeImmutable $date): bool
+    private function matchesDays(TaskSchema $schema, \DateTimeImmutable $date): bool
    {
+        $days = $schema->getDays() ?? [];
+
+        if (!empty($days['week']) && in_array((int) $date->format('N'), $days['week'], true)) {
+            return true;
+        }
+
+        if (!empty($days['month']) && in_array((int) $date->format('j'), $days['month'], true)) {
+            return true;
+        }
+
+        if (!empty($days['year'])) {
            $month = (int) $date->format('n');
            $day = (int) $date->format('j');
-
-        foreach ($schema->getYearDays() ?? [] as $yd) {
+            foreach ($days['year'] as $yd) {
                if (($yd['month'] ?? 0) === $month && ($yd['day'] ?? 0) === $day) {
                    return true;
                }
            }
+        }

        return false;
    }
--- a/backend/src/Service/TaskGenerator.php
+++ b/backend/src/Service/TaskGenerator.php
@@ -3,8 +3,6 @@
 namespace App\Service;

 use App\Entity\Task;
-use App\Enum\TaskSchemaType;
-use App\Enum\TaskSchemaStatus;
 use App\Repository\TaskRepository;
 use App\Repository\TaskSchemaRepository;
 use Doctrine\ORM\EntityManagerInterface;
@@ -34,6 +32,7 @@ class TaskGenerator
                    $task = new Task();
                    $task->setSchema($schema);
                    $task->setDate(new \DateTime($deadline->format('Y-m-d')));
+                    $task->setName($schema->getName());
                    $task->setCategory($schema->getCategory());

                    $this->em->persist($task);
@@ -47,31 +46,4 @@ class TaskGenerator
            $this->em->flush();
        }
    }
-
-    public function generateForTasksWithoutDate(): void
-    {
-        $schemas = $this->schemaRepository->findBy([
-            'taskType' => TaskSchemaType::Single,
-            'deadline' => null,
-            'status' => TaskSchemaStatus::Active,
-        ]);
-
-        $hasNew = false;
-
-        foreach ($schemas as $schema) {
-            $existing = $this->taskRepository->findOneBy(['schema' => $schema]);
-            if (!$existing) {
-                $task = new Task();
-                $task->setSchema($schema);
-                $task->setDate(null);
-                $task->setCategory($schema->getCategory());
-                $this->em->persist($task);
-                $hasNew = true;
-            }
-        }
-
-        if ($hasNew) {
-            $this->em->flush();
-        }
-    }
 }
--- a/backend/src/Service/TaskManager.php
+++ b/backend/src/Service/TaskManager.php
@@ -2,26 +2,40 @@

 namespace App\Service;

-use App\DTO\Request\ToggleRequest;
+use App\DTO\Request\CreateTaskRequest;
 use App\DTO\Request\UpdateTaskRequest;
-use App\DTO\Response\ToggleResponse;
 use App\Entity\Task;
-use App\Entity\TaskSchema;
-use App\Enum\TaskSchemaStatus;
 use App\Enum\TaskStatus;
 use App\Repository\CategoryRepository;
-use App\Repository\TaskRepository;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpKernel\Exception\HttpException;

 class TaskManager
 {
    public function __construct(
        private EntityManagerInterface $em,
        private CategoryRepository $categoryRepository,
-        private TaskRepository $taskRepository,
    ) {}

+    public function createTask(CreateTaskRequest $request): Task
+    {
+        $task = new Task();
+        $task->setName($request->name);
+
+        if ($request->categoryId !== null) {
+            $category = $this->categoryRepository->find($request->categoryId);
+            $task->setCategory($category);
+        }
+
+        if ($request->date !== null) {
+            $task->setDate(new \DateTime($request->date));
+        }
+
+        $this->em->persist($task);
+        $this->em->flush();
+
+        return $task;
+    }
+
    public function updateTask(Task $task, UpdateTaskRequest $request): Task
    {
        $task->setName($request->name);
@@ -43,27 +57,15 @@ class TaskManager
        return $task;
    }

-    public function toggleTaskStatus(TaskSchema $schema, ToggleRequest $request): ToggleResponse
+    public function toggleTask(Task $task): Task
    {
-        if ($schema->getStatus() === TaskSchemaStatus::Inactive) {
-            throw new HttpException(422, 'Inaktive Aufgaben können nicht umgeschaltet werden.');
-        }
-
-        $task = $request->date !== null
-            ? $this->taskRepository->findBySchemaAndDate($schema, new \DateTime($request->date))
-            : $this->taskRepository->findOneBy(['schema' => $schema, 'date' => null]);
-
-        if (!$task) {
-            throw new HttpException(404, 'Task nicht gefunden.');
-        }
-
        $newStatus = $task->getStatus() === TaskStatus::Active
-            ? TaskStatus::Completed
+            ? TaskStatus::Done
            : TaskStatus::Active;
        $task->setStatus($newStatus);
        $this->em->flush();

-        return new ToggleResponse(completed: $newStatus === TaskStatus::Completed);
+        return $task;
    }

    public function deleteTask(Task $task): void
--- a/backend/src/Service/TaskSchemaManager.php
+++ b/backend/src/Service/TaskSchemaManager.php
@@ -4,10 +4,12 @@ namespace App\Service;

 use App\DTO\Request\CreateSchemaRequest;
 use App\DTO\Request\UpdateSchemaRequest;
+use App\Entity\Task;
 use App\Entity\TaskSchema;
 use App\Enum\TaskSchemaStatus;
 use App\Enum\TaskSchemaType;
 use App\Repository\CategoryRepository;
+use App\Repository\TaskRepository;
 use Doctrine\ORM\EntityManagerInterface;

 class TaskSchemaManager
@@ -15,10 +17,11 @@ class TaskSchemaManager
    public function __construct(
        private EntityManagerInterface $em,
        private CategoryRepository $categoryRepository,
+        private TaskRepository $taskRepository,
        private TaskSynchronizer $taskSynchronizer,
    ) {}

-    public function createSchema(CreateSchemaRequest $request): TaskSchema
+    public function createSchema(CreateSchemaRequest $request): TaskSchema|array
    {
        $schema = new TaskSchema();
        $schema->setName($request->name ?? '');
@@ -30,6 +33,14 @@ class TaskSchemaManager
        $this->em->persist($schema);
        $this->em->flush();

+        if ($schema->getTaskType() === TaskSchemaType::Single) {
+            $tasks = $this->createSingleTasks($schema);
+            $this->em->remove($schema);
+            $this->em->flush();
+
+            return $tasks;
+        }
+
        return $schema;
    }

@@ -50,6 +61,19 @@ class TaskSchemaManager
        return $schema;
    }

+    public function deleteSchema(TaskSchema $schema, bool $deleteTasks = false): void
+    {
+        if ($deleteTasks) {
+            $tasks = $this->taskRepository->findBy(['schema' => $schema]);
+            foreach ($tasks as $task) {
+                $this->em->remove($task);
+            }
+        }
+
+        $this->em->remove($schema);
+        $this->em->flush();
+    }
+
    private function applyFields(TaskSchema $schema, CreateSchemaRequest|UpdateSchemaRequest $request): void
    {
        if ($request->status !== null) {
@@ -59,19 +83,16 @@ class TaskSchemaManager
            }
        }

-        if ($request->taskType !== null) {
-            $taskType = TaskSchemaType::tryFrom($request->taskType);
+        if ($request->type !== null) {
+            $taskType = TaskSchemaType::tryFrom($request->type);
            if ($taskType !== null) {
                $schema->setTaskType($taskType);
            }
        }

-        $schema->setDeadline($request->deadline !== null ? new \DateTime($request->deadline) : null);
        $schema->setStartDate($request->startDate !== null ? new \DateTime($request->startDate) : null);
        $schema->setEndDate($request->endDate !== null ? new \DateTime($request->endDate) : null);
-        $schema->setWeekdays($request->weekdays);
-        $schema->setMonthDays($request->monthDays);
-        $schema->setYearDays($request->yearDays);
+        $schema->setDays($request->days);
    }

    private function resolveCategory(TaskSchema $schema, UpdateSchemaRequest|CreateSchemaRequest $request): void
@@ -93,16 +114,37 @@ class TaskSchemaManager
        }
    }

-    public function deleteSchema(TaskSchema $schema): void
-    {
-        $this->em->remove($schema);
-        $this->em->flush();
-    }
-
    private function applyDefaults(TaskSchema $schema): void
    {
        if ($schema->getTaskType() !== TaskSchemaType::Single && $schema->getStartDate() === null) {
            $schema->setStartDate(new \DateTime('today'));
        }
    }
+
+    /**
+     * @return Task[]
+     */
+    private function createSingleTasks(TaskSchema $schema): array
+    {
+        $days = $schema->getDays()['year'] ?? [];
+        $tasks = [];
+
+        foreach ($days as $yd) {
+            $month = $yd['month'] ?? 1;
+            $day = $yd['day'] ?? 1;
+            $date = new \DateTime(sprintf('%d-%02d-%02d', (int) date('Y'), $month, $day));
+
+            $task = new Task();
+            $task->setName($schema->getName());
+            $task->setCategory($schema->getCategory());
+            $task->setDate($date);
+
+            $this->em->persist($task);
+            $tasks[] = $task;
+        }
+
+        $this->em->flush();
+
+        return $tasks;
+    }
 }
--- a/backend/src/Service/TaskSynchronizer.php
+++ b/backend/src/Service/TaskSynchronizer.php
@@ -4,7 +4,6 @@ namespace App\Service;

 use App\Entity\Task;
 use App\Entity\TaskSchema;
-use App\Enum\TaskSchemaType;
 use App\Repository\TaskRepository;
 use Doctrine\ORM\EntityManagerInterface;

@@ -30,8 +29,7 @@ class TaskSynchronizer
        $existingByDate = $this->loadExistingByDate($schema, $today);

        $this->removeObsoleteTasks($existingByDate, $shouldExist);
-        $this->handleNullDateTasks($schema);
-        $this->resetFutureOverrides($existingByDate);
+        $this->resetFutureOverrides($schema, $existingByDate);
        $this->createMissingTasks($schema, $deadlines, $existingByDate);

        $this->em->flush();
@@ -75,30 +73,14 @@ class TaskSynchronizer
        }
    }

-    private function handleNullDateTasks(TaskSchema $schema): void
-    {
-        $nullDateTasks = $this->taskRepository->findBy(['schema' => $schema, 'date' => null]);
-
-        if ($schema->getTaskType() === TaskSchemaType::Single && $schema->getDeadline() === null) {
-            foreach ($nullDateTasks as $task) {
-                $task->setName(null);
-                $task->setCategory($schema->getCategory());
-            }
-        } else {
-            foreach ($nullDateTasks as $task) {
-                $this->em->remove($task);
-            }
-        }
-    }
-
    /**
     * @param array<string, Task> $existingByDate
     */
-    private function resetFutureOverrides(array $existingByDate): void
+    private function resetFutureOverrides(TaskSchema $schema, array $existingByDate): void
    {
        foreach ($existingByDate as $task) {
-            $task->setName(null);
-            $task->setCategory($task->getSchema()->getCategory());
+            $task->setName($schema->getName());
+            $task->setCategory($schema->getCategory());
        }
    }

@@ -114,6 +96,7 @@ class TaskSynchronizer
                $task = new Task();
                $task->setSchema($schema);
                $task->setDate(new \DateTime($dateKey));
+                $task->setName($schema->getName());
                $task->setCategory($schema->getCategory());

                $this->em->persist($task);
--- a/backend/src/Service/TaskViewBuilder.php
+++ b/backend/src/Service/TaskViewBuilder.php
@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Service;
-
-use App\DTO\Response\DayResponse;
-use App\DTO\Response\WeekViewResponse;
-use App\Entity\Task;
-use App\Repository\TaskRepository;
-
-class TaskViewBuilder
-{
-    public function __construct(
-        private TaskGenerator $taskGenerator,
-        private TaskRepository $taskRepository,
-    ) {}
-
-    public function buildWeekView(?\DateTimeImmutable $start = null): WeekViewResponse
-    {
-        $start = $start ?? new \DateTimeImmutable('today');
-        $end = $start->modify('+6 days');
-
-        $this->taskGenerator->generateForRange($start, $end);
-        $this->taskGenerator->generateForTasksWithoutDate();
-
-        $tasks = $this->taskRepository->findInRange($start, $end);
-
-        $days = [];
-        $current = $start;
-        while ($current <= $end) {
-            $days[$current->format('Y-m-d')] = [];
-            $current = $current->modify('+1 day');
-        }
-
-        foreach ($tasks as $task) {
-            $dateKey = $task->getDate()->format('Y-m-d');
-            if (isset($days[$dateKey])) {
-                $days[$dateKey][] = $task;
-            }
-        }
-
-        $tasksWithoutDeadline = $this->taskRepository->findWithoutDate();
-
-        $dayResponses = [];
-        foreach ($days as $date => $dayTasks) {
-            usort($dayTasks, fn(Task $a, Task $b) => strcmp($a->getEffectiveName(), $b->getEffectiveName()));
-            $dayResponses[] = new DayResponse(
-                date: $date,
-                tasks: $dayTasks,
-            );
-        }
-
-        return new WeekViewResponse(
-            tasksWithoutDeadline: $tasksWithoutDeadline,
-            days: $dayResponses,
-        );
-    }
-
-    /**
-     * @return Task[]
-     */
-    public function buildAllTasksView(): array
-    {
-        $this->taskGenerator->generateForTasksWithoutDate();
-        $result = [];
-
-        $noDate = $this->taskRepository->findWithoutDate();
-        foreach ($noDate as $task) {
-            $result[] = $task;
-        }
-
-        $tasks = $this->taskRepository->findAllSorted();
-        foreach ($tasks as $task) {
-            $result[] = $task;
-        }
-
-        return $result;
-    }
-}
--- a/backend/var/cache/dev/App_KernelDevDebugContainer.php
+++ b/backend/var/cache/dev/App_KernelDevDebugContainer.php
@@ -2,21 +2,21 @@

 // This file has been auto-generated by the Symfony Dependency Injection Component for internal use.

-if (\class_exists(\Container9vrsx4S\App_KernelDevDebugContainer::class, false)) {
+if (\class_exists(\ContainerOjoHrrb\App_KernelDevDebugContainer::class, false)) {
    // no-op
-} elseif (!include __DIR__.'/Container9vrsx4S/App_KernelDevDebugContainer.php') {
-    touch(__DIR__.'/Container9vrsx4S.legacy');
+} elseif (!include __DIR__.'/ContainerOjoHrrb/App_KernelDevDebugContainer.php') {
+    touch(__DIR__.'/ContainerOjoHrrb.legacy');

    return;
 }

 if (!\class_exists(App_KernelDevDebugContainer::class, false)) {
-    \class_alias(\Container9vrsx4S\App_KernelDevDebugContainer::class, App_KernelDevDebugContainer::class, false);
+    \class_alias(\ContainerOjoHrrb\App_KernelDevDebugContainer::class, App_KernelDevDebugContainer::class, false);
 }

-return new \Container9vrsx4S\App_KernelDevDebugContainer([
-    'container.build_hash' => '9vrsx4S',
-    'container.build_id' => '109f11e1',
-    'container.build_time' => 1774968178,
+return new \ContainerOjoHrrb\App_KernelDevDebugContainer([
+    'container.build_hash' => 'OjoHrrb',
+    'container.build_id' => '4d546b94',
+    'container.build_time' => 1774972568,
    'container.runtime_mode' => \in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true) ? 'web=0' : 'web=1',
-], __DIR__.\DIRECTORY_SEPARATOR.'Container9vrsx4S');
+], __DIR__.\DIRECTORY_SEPARATOR.'ContainerOjoHrrb');
--- a/backend/var/cache/dev/App_KernelDevDebugContainer.php.meta
+++ b/backend/var/cache/dev/App_KernelDevDebugContainer.php.meta
--- a/backend/var/cache/dev/App_KernelDevDebugContainer.php.meta.json
+++ b/backend/var/cache/dev/App_KernelDevDebugContainer.php.meta.json
--- a/backend/var/cache/dev/App_KernelDevDebugContainer.preload.php
+++ b/backend/var/cache/dev/App_KernelDevDebugContainer.preload.php
@@ -10,91 +10,91 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
 }

 require dirname(__DIR__, 3).'/vendor/autoload.php';
-(require __DIR__.'/App_KernelDevDebugContainer.php')->set(\Container9vrsx4S\App_KernelDevDebugContainer::class, null);
-require __DIR__.'/Container9vrsx4S/UriSignerGhostB68a0a1.php';
-require __DIR__.'/Container9vrsx4S/EntityManagerGhost614a58f.php';
-require __DIR__.'/Container9vrsx4S/RequestPayloadValueResolverGhost01ca9cc.php';
-require __DIR__.'/Container9vrsx4S/getValidator_WhenService.php';
-require __DIR__.'/Container9vrsx4S/getValidator_NotCompromisedPasswordService.php';
-require __DIR__.'/Container9vrsx4S/getValidator_NoSuspiciousCharactersService.php';
-require __DIR__.'/Container9vrsx4S/getValidator_ExpressionService.php';
-require __DIR__.'/Container9vrsx4S/getValidator_EmailService.php';
-require __DIR__.'/Container9vrsx4S/getSession_Handler_NativeService.php';
-require __DIR__.'/Container9vrsx4S/getSession_FactoryService.php';
-require __DIR__.'/Container9vrsx4S/getServicesResetterService.php';
-require __DIR__.'/Container9vrsx4S/getSecrets_VaultService.php';
-require __DIR__.'/Container9vrsx4S/getSecrets_EnvVarLoaderService.php';
-require __DIR__.'/Container9vrsx4S/getRouting_LoaderService.php';
-require __DIR__.'/Container9vrsx4S/getPropertyInfo_SerializerExtractorService.php';
-require __DIR__.'/Container9vrsx4S/getPropertyInfo_ConstructorExtractorService.php';
-require __DIR__.'/Container9vrsx4S/getErrorHandler_ErrorRenderer_HtmlService.php';
-require __DIR__.'/Container9vrsx4S/getErrorControllerService.php';
-require __DIR__.'/Container9vrsx4S/getDoctrine_UuidGeneratorService.php';
-require __DIR__.'/Container9vrsx4S/getDoctrine_UlidGeneratorService.php';
-require __DIR__.'/Container9vrsx4S/getDoctrine_Orm_Validator_UniqueService.php';
-require __DIR__.'/Container9vrsx4S/getDoctrine_Orm_Listeners_PdoSessionHandlerSchemaListenerService.php';
-require __DIR__.'/Container9vrsx4S/getDoctrine_Orm_Listeners_LockStoreSchemaListenerService.php';
-require __DIR__.'/Container9vrsx4S/getDoctrine_Orm_Listeners_DoctrineTokenProviderSchemaListenerService.php';
-require __DIR__.'/Container9vrsx4S/getDoctrine_Orm_Listeners_DoctrineDbalCacheAdapterSchemaListenerService.php';
-require __DIR__.'/Container9vrsx4S/getDoctrine_Orm_DefaultListeners_AttachEntityListenersService.php';
-require __DIR__.'/Container9vrsx4S/getDoctrine_Orm_DefaultEntityManager_PropertyInfoExtractorService.php';
-require __DIR__.'/Container9vrsx4S/getDebug_ErrorHandlerConfiguratorService.php';
-require __DIR__.'/Container9vrsx4S/getContainer_GetRoutingConditionServiceService.php';
-require __DIR__.'/Container9vrsx4S/getContainer_EnvVarProcessorsLocatorService.php';
-require __DIR__.'/Container9vrsx4S/getContainer_EnvVarProcessorService.php';
-require __DIR__.'/Container9vrsx4S/getCache_ValidatorExpressionLanguageService.php';
-require __DIR__.'/Container9vrsx4S/getCache_SystemClearerService.php';
-require __DIR__.'/Container9vrsx4S/getCache_SystemService.php';
-require __DIR__.'/Container9vrsx4S/getCache_GlobalClearerService.php';
-require __DIR__.'/Container9vrsx4S/getCache_AppClearerService.php';
-require __DIR__.'/Container9vrsx4S/getCache_AppService.php';
-require __DIR__.'/Container9vrsx4S/getTemplateControllerService.php';
-require __DIR__.'/Container9vrsx4S/getRedirectControllerService.php';
-require __DIR__.'/Container9vrsx4S/getTaskManagerService.php';
-require __DIR__.'/Container9vrsx4S/getTaskSchemaRepositoryService.php';
-require __DIR__.'/Container9vrsx4S/getTaskRepositoryService.php';
-require __DIR__.'/Container9vrsx4S/getCategoryRepositoryService.php';
-require __DIR__.'/Container9vrsx4S/getUpdateTaskRequestService.php';
-require __DIR__.'/Container9vrsx4S/getUpdateSchemaRequestService.php';
-require __DIR__.'/Container9vrsx4S/getUpdateCategoryRequestService.php';
-require __DIR__.'/Container9vrsx4S/getToggleRequestService.php';
-require __DIR__.'/Container9vrsx4S/getCreateSchemaRequestService.php';
-require __DIR__.'/Container9vrsx4S/getCreateCategoryRequestService.php';
-require __DIR__.'/Container9vrsx4S/getTaskSchemaControllerService.php';
-require __DIR__.'/Container9vrsx4S/getTaskControllerService.php';
-require __DIR__.'/Container9vrsx4S/getCategoryControllerService.php';
-require __DIR__.'/Container9vrsx4S/getTaskSchemaControllercreateService.php';
-require __DIR__.'/Container9vrsx4S/getTaskSchemaControllerupdateService.php';
-require __DIR__.'/Container9vrsx4S/getTaskControllershowService.php';
-require __DIR__.'/Container9vrsx4S/getTaskControllerdeleteService.php';
-require __DIR__.'/Container9vrsx4S/get_ServiceLocator_XkkbYmService.php';
-require __DIR__.'/Container9vrsx4S/getTaskControllerupdateService.php';
-require __DIR__.'/Container9vrsx4S/get_ServiceLocator_TJNRSaVService.php';
-require __DIR__.'/Container9vrsx4S/getTaskSchemaControllershowService.php';
-require __DIR__.'/Container9vrsx4S/getTaskSchemaControllerdeleteService.php';
-require __DIR__.'/Container9vrsx4S/get_ServiceLocator_R5gwLrSService.php';
-require __DIR__.'/Container9vrsx4S/get_ServiceLocator_LiUCm3nService.php';
-require __DIR__.'/Container9vrsx4S/getCategoryControllercreateService.php';
-require __DIR__.'/Container9vrsx4S/getCategoryControllershowService.php';
-require __DIR__.'/Container9vrsx4S/getCategoryControllerdeleteService.php';
-require __DIR__.'/Container9vrsx4S/get_ServiceLocator_Cm49tF9Service.php';
-require __DIR__.'/Container9vrsx4S/getTaskSchemaControllertoggleService.php';
-require __DIR__.'/Container9vrsx4S/getCategoryControllerupdateService.php';
-require __DIR__.'/Container9vrsx4S/get_ServiceLocator_1vYpZ1B_KernelregisterContainerConfigurationService.php';
-require __DIR__.'/Container9vrsx4S/get_ServiceLocator_1vYpZ1B_KernelloadRoutesService.php';
-require __DIR__.'/Container9vrsx4S/get_ServiceLocator_1vYpZ1BService.php';
-require __DIR__.'/Container9vrsx4S/get_Debug_ValueResolver_Doctrine_Orm_EntityValueResolverService.php';
-require __DIR__.'/Container9vrsx4S/get_Debug_ValueResolver_ArgumentResolver_VariadicService.php';
-require __DIR__.'/Container9vrsx4S/get_Debug_ValueResolver_ArgumentResolver_SessionService.php';
-require __DIR__.'/Container9vrsx4S/get_Debug_ValueResolver_ArgumentResolver_ServiceService.php';
-require __DIR__.'/Container9vrsx4S/get_Debug_ValueResolver_ArgumentResolver_RequestPayloadService.php';
-require __DIR__.'/Container9vrsx4S/get_Debug_ValueResolver_ArgumentResolver_RequestAttributeService.php';
-require __DIR__.'/Container9vrsx4S/get_Debug_ValueResolver_ArgumentResolver_RequestService.php';
-require __DIR__.'/Container9vrsx4S/get_Debug_ValueResolver_ArgumentResolver_QueryParameterValueResolverService.php';
-require __DIR__.'/Container9vrsx4S/get_Debug_ValueResolver_ArgumentResolver_NotTaggedControllerService.php';
-require __DIR__.'/Container9vrsx4S/get_Debug_ValueResolver_ArgumentResolver_DefaultService.php';
-require __DIR__.'/Container9vrsx4S/get_Debug_ValueResolver_ArgumentResolver_DatetimeService.php';
-require __DIR__.'/Container9vrsx4S/get_Debug_ValueResolver_ArgumentResolver_BackedEnumResolverService.php';
+(require __DIR__.'/App_KernelDevDebugContainer.php')->set(\ContainerOjoHrrb\App_KernelDevDebugContainer::class, null);
+require __DIR__.'/ContainerOjoHrrb/UriSignerGhostB68a0a1.php';
+require __DIR__.'/ContainerOjoHrrb/EntityManagerGhost614a58f.php';
+require __DIR__.'/ContainerOjoHrrb/RequestPayloadValueResolverGhost01ca9cc.php';
+require __DIR__.'/ContainerOjoHrrb/getValidator_WhenService.php';
+require __DIR__.'/ContainerOjoHrrb/getValidator_NotCompromisedPasswordService.php';
+require __DIR__.'/ContainerOjoHrrb/getValidator_NoSuspiciousCharactersService.php';
+require __DIR__.'/ContainerOjoHrrb/getValidator_ExpressionService.php';
+require __DIR__.'/ContainerOjoHrrb/getValidator_EmailService.php';
+require __DIR__.'/ContainerOjoHrrb/getSession_Handler_NativeService.php';
+require __DIR__.'/ContainerOjoHrrb/getSession_FactoryService.php';
+require __DIR__.'/ContainerOjoHrrb/getServicesResetterService.php';
+require __DIR__.'/ContainerOjoHrrb/getSecrets_VaultService.php';
+require __DIR__.'/ContainerOjoHrrb/getSecrets_EnvVarLoaderService.php';
+require __DIR__.'/ContainerOjoHrrb/getRouting_LoaderService.php';
+require __DIR__.'/ContainerOjoHrrb/getPropertyInfo_SerializerExtractorService.php';
+require __DIR__.'/ContainerOjoHrrb/getPropertyInfo_ConstructorExtractorService.php';
+require __DIR__.'/ContainerOjoHrrb/getErrorHandler_ErrorRenderer_HtmlService.php';
+require __DIR__.'/ContainerOjoHrrb/getErrorControllerService.php';
+require __DIR__.'/ContainerOjoHrrb/getDoctrine_UuidGeneratorService.php';
+require __DIR__.'/ContainerOjoHrrb/getDoctrine_UlidGeneratorService.php';
+require __DIR__.'/ContainerOjoHrrb/getDoctrine_Orm_Validator_UniqueService.php';
+require __DIR__.'/ContainerOjoHrrb/getDoctrine_Orm_Listeners_PdoSessionHandlerSchemaListenerService.php';
+require __DIR__.'/ContainerOjoHrrb/getDoctrine_Orm_Listeners_LockStoreSchemaListenerService.php';
+require __DIR__.'/ContainerOjoHrrb/getDoctrine_Orm_Listeners_DoctrineTokenProviderSchemaListenerService.php';
+require __DIR__.'/ContainerOjoHrrb/getDoctrine_Orm_Listeners_DoctrineDbalCacheAdapterSchemaListenerService.php';
+require __DIR__.'/ContainerOjoHrrb/getDoctrine_Orm_DefaultListeners_AttachEntityListenersService.php';
+require __DIR__.'/ContainerOjoHrrb/getDoctrine_Orm_DefaultEntityManager_PropertyInfoExtractorService.php';
+require __DIR__.'/ContainerOjoHrrb/getDebug_ErrorHandlerConfiguratorService.php';
+require __DIR__.'/ContainerOjoHrrb/getContainer_GetRoutingConditionServiceService.php';
+require __DIR__.'/ContainerOjoHrrb/getContainer_EnvVarProcessorsLocatorService.php';
+require __DIR__.'/ContainerOjoHrrb/getContainer_EnvVarProcessorService.php';
+require __DIR__.'/ContainerOjoHrrb/getCache_ValidatorExpressionLanguageService.php';
+require __DIR__.'/ContainerOjoHrrb/getCache_SystemClearerService.php';
+require __DIR__.'/ContainerOjoHrrb/getCache_SystemService.php';
+require __DIR__.'/ContainerOjoHrrb/getCache_GlobalClearerService.php';
+require __DIR__.'/ContainerOjoHrrb/getCache_AppClearerService.php';
+require __DIR__.'/ContainerOjoHrrb/getCache_AppService.php';
+require __DIR__.'/ContainerOjoHrrb/getTemplateControllerService.php';
+require __DIR__.'/ContainerOjoHrrb/getRedirectControllerService.php';
+require __DIR__.'/ContainerOjoHrrb/getTaskSchemaRepositoryService.php';
+require __DIR__.'/ContainerOjoHrrb/getTaskRepositoryService.php';
+require __DIR__.'/ContainerOjoHrrb/getCategoryRepositoryService.php';
+require __DIR__.'/ContainerOjoHrrb/getUpdateTaskRequestService.php';
+require __DIR__.'/ContainerOjoHrrb/getUpdateSchemaRequestService.php';
+require __DIR__.'/ContainerOjoHrrb/getUpdateCategoryRequestService.php';
+require __DIR__.'/ContainerOjoHrrb/getCreateTaskRequestService.php';
+require __DIR__.'/ContainerOjoHrrb/getCreateSchemaRequestService.php';
+require __DIR__.'/ContainerOjoHrrb/getCreateCategoryRequestService.php';
+require __DIR__.'/ContainerOjoHrrb/getTaskSchemaControllerService.php';
+require __DIR__.'/ContainerOjoHrrb/getTaskControllerService.php';
+require __DIR__.'/ContainerOjoHrrb/getCategoryControllerService.php';
+require __DIR__.'/ContainerOjoHrrb/getTaskSchemaControllercreateService.php';
+require __DIR__.'/ContainerOjoHrrb/getTaskSchemaControllerupdateService.php';
+require __DIR__.'/ContainerOjoHrrb/getTaskControllertoggleService.php';
+require __DIR__.'/ContainerOjoHrrb/getTaskControllershowService.php';
+require __DIR__.'/ContainerOjoHrrb/getTaskControllerdeleteService.php';
+require __DIR__.'/ContainerOjoHrrb/get_ServiceLocator_XkkbYmService.php';
+require __DIR__.'/ContainerOjoHrrb/getTaskControllercreateService.php';
+require __DIR__.'/ContainerOjoHrrb/getTaskControllerupdateService.php';
+require __DIR__.'/ContainerOjoHrrb/get_ServiceLocator_TJNRSaVService.php';
+require __DIR__.'/ContainerOjoHrrb/getTaskSchemaControllershowService.php';
+require __DIR__.'/ContainerOjoHrrb/getTaskSchemaControllerdeleteService.php';
+require __DIR__.'/ContainerOjoHrrb/get_ServiceLocator_R5gwLrSService.php';
+require __DIR__.'/ContainerOjoHrrb/get_ServiceLocator_PLwxDhJService.php';
+require __DIR__.'/ContainerOjoHrrb/getCategoryControllercreateService.php';
+require __DIR__.'/ContainerOjoHrrb/getCategoryControllershowService.php';
+require __DIR__.'/ContainerOjoHrrb/getCategoryControllerdeleteService.php';
+require __DIR__.'/ContainerOjoHrrb/get_ServiceLocator_Cm49tF9Service.php';
+require __DIR__.'/ContainerOjoHrrb/getCategoryControllerupdateService.php';
+require __DIR__.'/ContainerOjoHrrb/get_ServiceLocator_1vYpZ1B_KernelregisterContainerConfigurationService.php';
+require __DIR__.'/ContainerOjoHrrb/get_ServiceLocator_1vYpZ1B_KernelloadRoutesService.php';
+require __DIR__.'/ContainerOjoHrrb/get_ServiceLocator_1vYpZ1BService.php';
+require __DIR__.'/ContainerOjoHrrb/get_Debug_ValueResolver_Doctrine_Orm_EntityValueResolverService.php';
+require __DIR__.'/ContainerOjoHrrb/get_Debug_ValueResolver_ArgumentResolver_VariadicService.php';
+require __DIR__.'/ContainerOjoHrrb/get_Debug_ValueResolver_ArgumentResolver_SessionService.php';
+require __DIR__.'/ContainerOjoHrrb/get_Debug_ValueResolver_ArgumentResolver_ServiceService.php';
+require __DIR__.'/ContainerOjoHrrb/get_Debug_ValueResolver_ArgumentResolver_RequestPayloadService.php';
+require __DIR__.'/ContainerOjoHrrb/get_Debug_ValueResolver_ArgumentResolver_RequestAttributeService.php';
+require __DIR__.'/ContainerOjoHrrb/get_Debug_ValueResolver_ArgumentResolver_RequestService.php';
+require __DIR__.'/ContainerOjoHrrb/get_Debug_ValueResolver_ArgumentResolver_QueryParameterValueResolverService.php';
+require __DIR__.'/ContainerOjoHrrb/get_Debug_ValueResolver_ArgumentResolver_NotTaggedControllerService.php';
+require __DIR__.'/ContainerOjoHrrb/get_Debug_ValueResolver_ArgumentResolver_DefaultService.php';
+require __DIR__.'/ContainerOjoHrrb/get_Debug_ValueResolver_ArgumentResolver_DatetimeService.php';
+require __DIR__.'/ContainerOjoHrrb/get_Debug_ValueResolver_ArgumentResolver_BackedEnumResolverService.php';

 $classes = [];
 $classes[] = 'Symfony\Bundle\FrameworkBundle\FrameworkBundle';
@@ -119,22 +119,21 @@ $classes[] = 'Symfony\Component\DependencyInjection\ServiceLocator';
 $classes[] = 'App\Controller\Api\CategoryController';
 $classes[] = 'App\Service\CategoryManager';
 $classes[] = 'App\Controller\Api\TaskController';
+$classes[] = 'App\Service\TaskManager';
+$classes[] = 'App\Service\TaskGenerator';
 $classes[] = 'App\Controller\Api\TaskSchemaController';
 $classes[] = 'App\Service\TaskSchemaManager';
 $classes[] = 'App\Service\TaskSynchronizer';
-$classes[] = 'App\Service\DeadlineCalculator';
-$classes[] = 'App\Service\TaskViewBuilder';
-$classes[] = 'App\Service\TaskGenerator';
 $classes[] = 'App\DTO\Request\CreateCategoryRequest';
 $classes[] = 'App\DTO\Request\CreateSchemaRequest';
-$classes[] = 'App\DTO\Request\ToggleRequest';
+$classes[] = 'App\DTO\Request\CreateTaskRequest';
 $classes[] = 'App\DTO\Request\UpdateCategoryRequest';
 $classes[] = 'App\DTO\Request\UpdateSchemaRequest';
 $classes[] = 'App\DTO\Request\UpdateTaskRequest';
 $classes[] = 'App\Repository\CategoryRepository';
 $classes[] = 'App\Repository\TaskRepository';
 $classes[] = 'App\Repository\TaskSchemaRepository';
-$classes[] = 'App\Service\TaskManager';
+$classes[] = 'App\Service\DeadlineCalculator';
 $classes[] = 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController';
 $classes[] = 'Symfony\Bundle\FrameworkBundle\Controller\TemplateController';
 $classes[] = 'Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestPayloadValueResolver';
--- a/backend/var/cache/dev/App_KernelDevDebugContainer.ser
+++ b/backend/var/cache/dev/App_KernelDevDebugContainer.ser
--- a/backend/var/cache/dev/App_KernelDevDebugContainer.xml
+++ b/backend/var/cache/dev/App_KernelDevDebugContainer.xml
@@ -245,6 +245,8 @@
      <tag name="routing.controller"/>
      <tag name="container.service_subscriber"/>
      <argument type="service" id="App\Service\TaskManager"/>
+      <argument type="service" id="App\Service\TaskGenerator"/>
+      <argument type="service" id="App\Repository\TaskRepository"/>
      <call method="setContainer">
        <argument type="service" id=".service_locator.TJNRSaV.App\Controller\Api\TaskController"/>
      </call>
@@ -255,27 +257,16 @@
      <tag name="container.service_subscriber"/>
      <argument type="service" id="App\Repository\TaskSchemaRepository"/>
      <argument type="service" id="App\Service\TaskSchemaManager"/>
-      <argument type="service" id="App\Service\TaskManager"/>
-      <argument type="service" id="App\Service\TaskViewBuilder"/>
      <call method="setContainer">
        <argument type="service" id=".service_locator.TJNRSaV.App\Controller\Api\TaskSchemaController"/>
      </call>
    </service>
    <service id="App\DTO\Request\CreateCategoryRequest" class="App\DTO\Request\CreateCategoryRequest" autowire="true" autoconfigure="true"/>
    <service id="App\DTO\Request\CreateSchemaRequest" class="App\DTO\Request\CreateSchemaRequest" autowire="true" autoconfigure="true"/>
-    <service id="App\DTO\Request\ToggleRequest" class="App\DTO\Request\ToggleRequest" autowire="true" autoconfigure="true"/>
+    <service id="App\DTO\Request\CreateTaskRequest" class="App\DTO\Request\CreateTaskRequest" autowire="true" autoconfigure="true"/>
    <service id="App\DTO\Request\UpdateCategoryRequest" class="App\DTO\Request\UpdateCategoryRequest" autowire="true" autoconfigure="true"/>
    <service id="App\DTO\Request\UpdateSchemaRequest" class="App\DTO\Request\UpdateSchemaRequest" autowire="true" autoconfigure="true"/>
    <service id="App\DTO\Request\UpdateTaskRequest" class="App\DTO\Request\UpdateTaskRequest" autowire="true" autoconfigure="true"/>
-    <service id="App\DTO\Response\DayResponse" class="App\DTO\Response\DayResponse" autowire="true" autoconfigure="true">
-      <tag name="container.error" message="Cannot autowire service &quot;App\DTO\Response\DayResponse&quot;: argument &quot;$date&quot; of method &quot;__construct()&quot; is type-hinted &quot;string&quot;, you should configure its value explicitly."/>
-    </service>
-    <service id="App\DTO\Response\ToggleResponse" class="App\DTO\Response\ToggleResponse" autowire="true" autoconfigure="true">
-      <tag name="container.error" message="Cannot autowire service &quot;App\DTO\Response\ToggleResponse&quot;: argument &quot;$completed&quot; of method &quot;__construct()&quot; is type-hinted &quot;bool&quot;, you should configure its value explicitly."/>
-    </service>
-    <service id="App\DTO\Response\WeekViewResponse" class="App\DTO\Response\WeekViewResponse" autowire="true" autoconfigure="true">
-      <tag name="container.error" message="Cannot autowire service &quot;App\DTO\Response\WeekViewResponse&quot;: argument &quot;$tasksWithoutDeadline&quot; of method &quot;__construct()&quot; is type-hinted &quot;array&quot;, you should configure its value explicitly."/>
-    </service>
    <service id="App\Entity\Category" class="App\Entity\Category" autowire="true" autoconfigure="true">
      <tag name="container.excluded" source="because it's a Doctrine entity"/>
      <tag name="container.excluded" source="with #[Doctrine\ORM\Mapping\Entity] attribute"/>
@@ -322,11 +313,11 @@
    <service id="App\Service\TaskManager" class="App\Service\TaskManager" autowire="true" autoconfigure="true">
      <argument type="service" id="doctrine.orm.default_entity_manager"/>
      <argument type="service" id="App\Repository\CategoryRepository"/>
-      <argument type="service" id="App\Repository\TaskRepository"/>
    </service>
    <service id="App\Service\TaskSchemaManager" class="App\Service\TaskSchemaManager" autowire="true" autoconfigure="true">
      <argument type="service" id="doctrine.orm.default_entity_manager"/>
      <argument type="service" id="App\Repository\CategoryRepository"/>
+      <argument type="service" id="App\Repository\TaskRepository"/>
      <argument type="service" id="App\Service\TaskSynchronizer"/>
    </service>
    <service id="App\Service\TaskSynchronizer" class="App\Service\TaskSynchronizer" autowire="true" autoconfigure="true">
@@ -334,10 +325,6 @@
      <argument type="service" id="App\Repository\TaskRepository"/>
      <argument type="service" id="App\Service\DeadlineCalculator"/>
    </service>
-    <service id="App\Service\TaskViewBuilder" class="App\Service\TaskViewBuilder" autowire="true" autoconfigure="true">
-      <argument type="service" id="App\Service\TaskGenerator"/>
-      <argument type="service" id="App\Repository\TaskRepository"/>
-    </service>
    <service id="argument_metadata_factory" class="Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory"/>
    <service id="argument_resolver.backed_enum_resolver" class="Symfony\Component\HttpKernel\Controller\ArgumentResolver\BackedEnumValueResolver">
      <tag name="Symfony\Component\HttpKernel\Controller\ArgumentResolver\BackedEnumValueResolver" priority="100">controller.argument_value_resolver</tag>
@@ -366,7 +353,7 @@
    </service>
    <service id="argument_resolver.service" class="Symfony\Component\HttpKernel\Controller\ArgumentResolver\ServiceValueResolver">
      <tag name="Symfony\Component\HttpKernel\Controller\ArgumentResolver\ServiceValueResolver" priority="-50">controller.argument_value_resolver</tag>
-      <argument type="service" id=".service_locator.LiUCm3n"/>
+      <argument type="service" id=".service_locator.PLwxDhJ"/>
    </service>
    <service id="argument_resolver.default" class="Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver">
      <tag name="Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver" priority="-100">controller.argument_value_resolver</tag>
@@ -1542,7 +1529,7 @@
    </service>
    <service id="argument_resolver.not_tagged_controller" class="Symfony\Component\HttpKernel\Controller\ArgumentResolver\NotTaggedControllerValueResolver">
      <tag name="controller.argument_value_resolver" priority="-200"/>
-      <argument type="service" id=".service_locator.LiUCm3n"/>
+      <argument type="service" id=".service_locator.PLwxDhJ"/>
    </service>
    <service id="routing.resolver" class="Symfony\Component\Config\Loader\LoaderResolver">
      <call method="addLoader">
@@ -3891,6 +3878,18 @@
      <argument type="service" id="service_container"/>
      <factory service=".service_locator._xkkbYm" method="withContext"/>
    </service>
+    <service id=".service_locator._bycKQ1" class="Symfony\Component\DependencyInjection\ServiceLocator">
+      <tag name="container.service_locator"/>
+      <argument type="collection">
+        <argument key="dto" type="service_closure" id="App\DTO\Request\CreateTaskRequest"/>
+      </argument>
+    </service>
+    <service id=".service_locator._bycKQ1.App\Controller\Api\TaskController::create()" class="Symfony\Component\DependencyInjection\ServiceLocator">
+      <tag name="container.service_locator_context" id="App\Controller\Api\TaskController::create()"/>
+      <argument>App\Controller\Api\TaskController::create()</argument>
+      <argument type="service" id="service_container"/>
+      <factory service=".service_locator._bycKQ1" method="withContext"/>
+    </service>
    <service id=".service_locator._XrPYo." class="Symfony\Component\DependencyInjection\ServiceLocator">
      <tag name="container.service_locator"/>
      <argument type="collection">
@@ -3910,6 +3909,12 @@
      <argument type="service" id="service_container"/>
      <factory service=".service_locator._xkkbYm" method="withContext"/>
    </service>
+    <service id=".service_locator._xkkbYm.App\Controller\Api\TaskController::toggle()" class="Symfony\Component\DependencyInjection\ServiceLocator">
+      <tag name="container.service_locator_context" id="App\Controller\Api\TaskController::toggle()"/>
+      <argument>App\Controller\Api\TaskController::toggle()</argument>
+      <argument type="service" id="service_container"/>
+      <factory service=".service_locator._xkkbYm" method="withContext"/>
+    </service>
    <service id=".service_locator.R5gwLrS" class="Symfony\Component\DependencyInjection\ServiceLocator">
      <tag name="container.service_locator"/>
      <argument type="collection">
@@ -3953,20 +3958,7 @@
      <argument type="service" id="service_container"/>
      <factory service=".service_locator.R5gwLrS" method="withContext"/>
    </service>
-    <service id=".service_locator.CXMQIWj" class="Symfony\Component\DependencyInjection\ServiceLocator">
-      <tag name="container.service_locator"/>
-      <argument type="collection">
-        <argument key="schema" type="service_closure" id=".errored..service_locator.CXMQIWj.App\Entity\TaskSchema"/>
-        <argument key="dto" type="service_closure" id="App\DTO\Request\ToggleRequest"/>
-      </argument>
-    </service>
-    <service id=".service_locator.CXMQIWj.App\Controller\Api\TaskSchemaController::toggle()" class="Symfony\Component\DependencyInjection\ServiceLocator">
-      <tag name="container.service_locator_context" id="App\Controller\Api\TaskSchemaController::toggle()"/>
-      <argument>App\Controller\Api\TaskSchemaController::toggle()</argument>
-      <argument type="service" id="service_container"/>
-      <factory service=".service_locator.CXMQIWj" method="withContext"/>
-    </service>
-    <service id=".service_locator.LiUCm3n" class="Symfony\Component\DependencyInjection\ServiceLocator">
+    <service id=".service_locator.PLwxDhJ" class="Symfony\Component\DependencyInjection\ServiceLocator">
      <tag name="container.service_locator"/>
      <argument type="collection">
        <argument key="kernel::registerContainerConfiguration" type="service_closure" id=".service_locator.1vYpZ1B.kernel::registerContainerConfiguration()"/>
@@ -3978,13 +3970,14 @@
        <argument key="App\Controller\Api\CategoryController::update" type="service_closure" id=".service_locator.C59M2XG.App\Controller\Api\CategoryController::update()"/>
        <argument key="App\Controller\Api\CategoryController::delete" type="service_closure" id=".service_locator.Cm49tF9.App\Controller\Api\CategoryController::delete()"/>
        <argument key="App\Controller\Api\TaskController::show" type="service_closure" id=".service_locator._xkkbYm.App\Controller\Api\TaskController::show()"/>
+        <argument key="App\Controller\Api\TaskController::create" type="service_closure" id=".service_locator._bycKQ1.App\Controller\Api\TaskController::create()"/>
        <argument key="App\Controller\Api\TaskController::update" type="service_closure" id=".service_locator._XrPYo..App\Controller\Api\TaskController::update()"/>
        <argument key="App\Controller\Api\TaskController::delete" type="service_closure" id=".service_locator._xkkbYm.App\Controller\Api\TaskController::delete()"/>
+        <argument key="App\Controller\Api\TaskController::toggle" type="service_closure" id=".service_locator._xkkbYm.App\Controller\Api\TaskController::toggle()"/>
        <argument key="App\Controller\Api\TaskSchemaController::show" type="service_closure" id=".service_locator.R5gwLrS.App\Controller\Api\TaskSchemaController::show()"/>
        <argument key="App\Controller\Api\TaskSchemaController::create" type="service_closure" id=".service_locator.tfbRPsC.App\Controller\Api\TaskSchemaController::create()"/>
        <argument key="App\Controller\Api\TaskSchemaController::update" type="service_closure" id=".service_locator.bAGXt8j.App\Controller\Api\TaskSchemaController::update()"/>
        <argument key="App\Controller\Api\TaskSchemaController::delete" type="service_closure" id=".service_locator.R5gwLrS.App\Controller\Api\TaskSchemaController::delete()"/>
-        <argument key="App\Controller\Api\TaskSchemaController::toggle" type="service_closure" id=".service_locator.CXMQIWj.App\Controller\Api\TaskSchemaController::toggle()"/>
        <argument key="kernel:registerContainerConfiguration" type="service_closure" id=".service_locator.1vYpZ1B.kernel::registerContainerConfiguration()"/>
        <argument key="kernel:loadRoutes" type="service_closure" id=".service_locator.1vYpZ1B.kernel::loadRoutes()"/>
        <argument key="App\Controller\Api\CategoryController:show" type="service_closure" id=".service_locator.Cm49tF9.App\Controller\Api\CategoryController::show()"/>
@@ -3992,13 +3985,14 @@
        <argument key="App\Controller\Api\CategoryController:update" type="service_closure" id=".service_locator.C59M2XG.App\Controller\Api\CategoryController::update()"/>
        <argument key="App\Controller\Api\CategoryController:delete" type="service_closure" id=".service_locator.Cm49tF9.App\Controller\Api\CategoryController::delete()"/>
        <argument key="App\Controller\Api\TaskController:show" type="service_closure" id=".service_locator._xkkbYm.App\Controller\Api\TaskController::show()"/>
+        <argument key="App\Controller\Api\TaskController:create" type="service_closure" id=".service_locator._bycKQ1.App\Controller\Api\TaskController::create()"/>
        <argument key="App\Controller\Api\TaskController:update" type="service_closure" id=".service_locator._XrPYo..App\Controller\Api\TaskController::update()"/>
        <argument key="App\Controller\Api\TaskController:delete" type="service_closure" id=".service_locator._xkkbYm.App\Controller\Api\TaskController::delete()"/>
+        <argument key="App\Controller\Api\TaskController:toggle" type="service_closure" id=".service_locator._xkkbYm.App\Controller\Api\TaskController::toggle()"/>
        <argument key="App\Controller\Api\TaskSchemaController:show" type="service_closure" id=".service_locator.R5gwLrS.App\Controller\Api\TaskSchemaController::show()"/>
        <argument key="App\Controller\Api\TaskSchemaController:create" type="service_closure" id=".service_locator.tfbRPsC.App\Controller\Api\TaskSchemaController::create()"/>
        <argument key="App\Controller\Api\TaskSchemaController:update" type="service_closure" id=".service_locator.bAGXt8j.App\Controller\Api\TaskSchemaController::update()"/>
        <argument key="App\Controller\Api\TaskSchemaController:delete" type="service_closure" id=".service_locator.R5gwLrS.App\Controller\Api\TaskSchemaController::delete()"/>
-        <argument key="App\Controller\Api\TaskSchemaController:toggle" type="service_closure" id=".service_locator.CXMQIWj.App\Controller\Api\TaskSchemaController::toggle()"/>
      </argument>
    </service>
    <service id=".service_locator.ezu51To" class="Symfony\Component\DependencyInjection\ServiceLocator">
@@ -4310,9 +4304,6 @@
    <service id=".errored..service_locator.bAGXt8j.App\Entity\TaskSchema" class="App\Entity\TaskSchema">
      <tag name="container.error" message="Cannot autowire service &quot;.service_locator.bAGXt8j&quot;: it needs an instance of &quot;App\Entity\TaskSchema&quot; but this type has been excluded because it's a Doctrine entity."/>
    </service>
-    <service id=".errored..service_locator.CXMQIWj.App\Entity\TaskSchema" class="App\Entity\TaskSchema">
-      <tag name="container.error" message="Cannot autowire service &quot;.service_locator.CXMQIWj&quot;: it needs an instance of &quot;App\Entity\TaskSchema&quot; but this type has been excluded because it's a Doctrine entity."/>
-    </service>
    <service id=".console.command.about.lazy" class="Symfony\Component\Console\Command\LazyCommand">
      <argument>about</argument>
      <argument type="collection"/>
@@ -5072,7 +5063,7 @@
    <service id="doctrine.orm.default_entity_manager.event_manager" alias="doctrine.dbal.default_connection.event_manager"/>
    <service id="doctrine.migrations.metadata_storage" alias="doctrine.migrations.storage.table_storage"/>
    <service id="container.env_var_processors_locator" alias=".service_locator.ryAvHi4" public="true"/>
-    <service id="argument_resolver.controller_locator" alias=".service_locator.LiUCm3n"/>
+    <service id="argument_resolver.controller_locator" alias=".service_locator.PLwxDhJ"/>
    <service id="doctrine.id_generator_locator" alias=".service_locator.W55Po6X"/>
    <service id="Psr\Log\LoggerInterface" alias="logger"/>
    <service id=".service_locator.n0.zoXR" alias=".service_locator.ezu51To"/>
@@ -5085,11 +5076,11 @@
    <service id=".service_locator.oqR54WJ" alias=".service_locator.KtG.01U"/>
    <service id=".service_locator.PMEz_6r" alias=".service_locator.C59M2XG"/>
    <service id=".service_locator..TdxQYe" alias=".service_locator._xkkbYm"/>
+    <service id=".service_locator.hAig9Fo" alias=".service_locator._bycKQ1"/>
    <service id=".service_locator.IJp4oV0" alias=".service_locator._XrPYo."/>
    <service id=".service_locator.GLW8.9C" alias=".service_locator.R5gwLrS"/>
    <service id=".service_locator.I6TWVKY" alias=".service_locator.tfbRPsC"/>
    <service id=".service_locator.JV7jUAi" alias=".service_locator.bAGXt8j"/>
-    <service id=".service_locator.wKUiJ9I" alias=".service_locator.CXMQIWj"/>
    <service id=".service_locator.SPA6NDT" alias=".service_locator.TJNRSaV"/>
  </services>
 </container>
--- a/backend/var/cache/dev/App_KernelDevDebugContainer.xml.meta
+++ b/backend/var/cache/dev/App_KernelDevDebugContainer.xml.meta
--- a/backend/var/cache/dev/App_KernelDevDebugContainer.xml.meta.json
+++ b/backend/var/cache/dev/App_KernelDevDebugContainer.xml.meta.json
--- a/backend/var/cache/dev/App_KernelDevDebugContainerCompiler.log
+++ b/backend/var/cache/dev/App_KernelDevDebugContainerCompiler.log
@@ -159,11 +159,11 @@ Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed
 Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service ".service_locator.oqR54WJ"; reason: private alias.
 Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service ".service_locator.PMEz_6r"; reason: private alias.
 Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service ".service_locator..TdxQYe"; reason: private alias.
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service ".service_locator.hAig9Fo"; reason: private alias.
 Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service ".service_locator.IJp4oV0"; reason: private alias.
 Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service ".service_locator.GLW8.9C"; reason: private alias.
 Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service ".service_locator.I6TWVKY"; reason: private alias.
 Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service ".service_locator.JV7jUAi"; reason: private alias.
-Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service ".service_locator.wKUiJ9I"; reason: private alias.
 Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service ".service_locator.SPA6NDT"; reason: private alias.
 Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "locale_listener" previously pointing to "router.default" to "router".
 Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "http_kernel" previously pointing to "debug.event_dispatcher" to "event_dispatcher".
@@ -306,9 +306,6 @@ Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Re
 Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service ".abstract.instanceof.App\Repository\TaskRepository"; reason: abstract.
 Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service ".instanceof.Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepositoryInterface.0.App\Repository\TaskSchemaRepository"; reason: abstract.
 Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service ".abstract.instanceof.App\Repository\TaskSchemaRepository"; reason: abstract.
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "App\DTO\Response\DayResponse"; reason: unused.
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "App\DTO\Response\ToggleResponse"; reason: unused.
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "App\DTO\Response\WeekViewResponse"; reason: unused.
 Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "App\Entity\Category"; reason: unused.
 Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "App\Entity\Task"; reason: unused.
 Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "App\Entity\TaskSchema"; reason: unused.
@@ -374,12 +371,12 @@ Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Remo
 Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service ".service_locator.zfRA4vz"; reason: unused.
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "App\Service\CategoryManager" to "App\Controller\Api\CategoryController".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service ".service_locator.TJNRSaV.App\Controller\Api\CategoryController" to "App\Controller\Api\CategoryController".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "App\Service\TaskManager" to "App\Controller\Api\TaskController".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "App\Service\TaskGenerator" to "App\Controller\Api\TaskController".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service ".service_locator.TJNRSaV.App\Controller\Api\TaskController" to "App\Controller\Api\TaskController".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "App\Service\TaskSchemaManager" to "App\Controller\Api\TaskSchemaController".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "App\Service\TaskViewBuilder" to "App\Controller\Api\TaskSchemaController".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service ".service_locator.TJNRSaV.App\Controller\Api\TaskSchemaController" to "App\Controller\Api\TaskSchemaController".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "App\Service\TaskSynchronizer" to "App\Service\TaskSchemaManager".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "App\Service\TaskGenerator" to "App\Service\TaskViewBuilder".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "error_handler.error_renderer.serializer" to "error_controller".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "debug.controller_resolver" to "http_kernel".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "debug.argument_resolver" to "http_kernel".
@@ -489,10 +486,10 @@ Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inl
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "maker.maker.make_webhook" to "maker.auto_command.make_webhook".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service ".service_locator.KtG.01U" to ".service_locator.KtG.01U.App\Controller\Api\CategoryController::create()".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service ".service_locator.C59M2XG" to ".service_locator.C59M2XG.App\Controller\Api\CategoryController::update()".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service ".service_locator._bycKQ1" to ".service_locator._bycKQ1.App\Controller\Api\TaskController::create()".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service ".service_locator._XrPYo." to ".service_locator._XrPYo..App\Controller\Api\TaskController::update()".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service ".service_locator.tfbRPsC" to ".service_locator.tfbRPsC.App\Controller\Api\TaskSchemaController::create()".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service ".service_locator.bAGXt8j" to ".service_locator.bAGXt8j.App\Controller\Api\TaskSchemaController::update()".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service ".service_locator.CXMQIWj" to ".service_locator.CXMQIWj.App\Controller\Api\TaskSchemaController::toggle()".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.entity_value_resolver" to ".debug.value_resolver.doctrine.orm.entity_value_resolver".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "argument_resolver.backed_enum_resolver" to ".debug.value_resolver.argument_resolver.backed_enum_resolver".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "argument_resolver.datetime" to ".debug.value_resolver.argument_resolver.datetime".
@@ -514,8 +511,6 @@ Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inl
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service ".service_locator.TVmQFtt.router.default" to "router".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "config_cache_factory" to "router".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "debug.event_dispatcher.inner" to "event_dispatcher".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "App\Service\DeadlineCalculator" to "App\Controller\Api\TaskSchemaController".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "App\Service\DeadlineCalculator" to "App\Controller\Api\TaskSchemaController".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "file_locator" to "routing.loader".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "file_locator" to "routing.loader".
 Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "file_locator" to "routing.loader".
--- a/backend/var/cache/dev/url_generating_routes.php
+++ b/backend/var/cache/dev/url_generating_routes.php
@@ -9,33 +9,31 @@ return [
    'categories.create' => [[], ['_controller' => 'App\\Controller\\Api\\CategoryController::create'], [], [['text', '/api/categories']], [], [], []],
    'categories.update' => [['id'], ['_controller' => 'App\\Controller\\Api\\CategoryController::update'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/categories']], [], [], []],
    'categories.delete' => [['id'], ['_controller' => 'App\\Controller\\Api\\CategoryController::delete'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/categories']], [], [], []],
+    'tasks.index' => [[], ['_controller' => 'App\\Controller\\Api\\TaskController::index'], [], [['text', '/api/tasks']], [], [], []],
    'tasks.show' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskController::show'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/tasks']], [], [], []],
+    'tasks.create' => [[], ['_controller' => 'App\\Controller\\Api\\TaskController::create'], [], [['text', '/api/tasks']], [], [], []],
    'tasks.update' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskController::update'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/tasks']], [], [], []],
    'tasks.delete' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskController::delete'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/tasks']], [], [], []],
+    'tasks.toggle' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskController::toggle'], [], [['text', '/toggle'], ['variable', '/', '[^/]++', 'id', true], ['text', '/api/tasks']], [], [], []],
    'schemas.index' => [[], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::index'], [], [['text', '/api/schemas']], [], [], []],
-    'schemas.week' => [[], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::week'], [], [['text', '/api/schemas/week']], [], [], []],
-    'schemas.all' => [[], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::allSchemas'], [], [['text', '/api/schemas/all']], [], [], []],
-    'schemas.allTasks' => [[], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::allTasks'], [], [['text', '/api/schemas/all-tasks']], [], [], []],
    'schemas.show' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::show'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/schemas']], [], [], []],
    'schemas.create' => [[], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::create'], [], [['text', '/api/schemas']], [], [], []],
    'schemas.update' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::update'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/schemas']], [], [], []],
    'schemas.delete' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::delete'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/schemas']], [], [], []],
-    'schemas.toggle' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::toggle'], [], [['text', '/toggle'], ['variable', '/', '[^/]++', 'id', true], ['text', '/api/schemas']], [], [], []],
    'App\Controller\Api\CategoryController::index' => [[], ['_controller' => 'App\\Controller\\Api\\CategoryController::index'], [], [['text', '/api/categories']], [], [], []],
    'App\Controller\Api\CategoryController::show' => [['id'], ['_controller' => 'App\\Controller\\Api\\CategoryController::show'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/categories']], [], [], []],
    'App\Controller\Api\CategoryController::create' => [[], ['_controller' => 'App\\Controller\\Api\\CategoryController::create'], [], [['text', '/api/categories']], [], [], []],
    'App\Controller\Api\CategoryController::update' => [['id'], ['_controller' => 'App\\Controller\\Api\\CategoryController::update'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/categories']], [], [], []],
    'App\Controller\Api\CategoryController::delete' => [['id'], ['_controller' => 'App\\Controller\\Api\\CategoryController::delete'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/categories']], [], [], []],
+    'App\Controller\Api\TaskController::index' => [[], ['_controller' => 'App\\Controller\\Api\\TaskController::index'], [], [['text', '/api/tasks']], [], [], []],
    'App\Controller\Api\TaskController::show' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskController::show'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/tasks']], [], [], []],
+    'App\Controller\Api\TaskController::create' => [[], ['_controller' => 'App\\Controller\\Api\\TaskController::create'], [], [['text', '/api/tasks']], [], [], []],
    'App\Controller\Api\TaskController::update' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskController::update'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/tasks']], [], [], []],
    'App\Controller\Api\TaskController::delete' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskController::delete'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/tasks']], [], [], []],
+    'App\Controller\Api\TaskController::toggle' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskController::toggle'], [], [['text', '/toggle'], ['variable', '/', '[^/]++', 'id', true], ['text', '/api/tasks']], [], [], []],
    'App\Controller\Api\TaskSchemaController::index' => [[], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::index'], [], [['text', '/api/schemas']], [], [], []],
-    'App\Controller\Api\TaskSchemaController::week' => [[], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::week'], [], [['text', '/api/schemas/week']], [], [], []],
-    'App\Controller\Api\TaskSchemaController::allSchemas' => [[], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::allSchemas'], [], [['text', '/api/schemas/all']], [], [], []],
-    'App\Controller\Api\TaskSchemaController::allTasks' => [[], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::allTasks'], [], [['text', '/api/schemas/all-tasks']], [], [], []],
    'App\Controller\Api\TaskSchemaController::show' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::show'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/schemas']], [], [], []],
    'App\Controller\Api\TaskSchemaController::create' => [[], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::create'], [], [['text', '/api/schemas']], [], [], []],
    'App\Controller\Api\TaskSchemaController::update' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::update'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/schemas']], [], [], []],
    'App\Controller\Api\TaskSchemaController::delete' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::delete'], [], [['variable', '/', '[^/]++', 'id', true], ['text', '/api/schemas']], [], [], []],
-    'App\Controller\Api\TaskSchemaController::toggle' => [['id'], ['_controller' => 'App\\Controller\\Api\\TaskSchemaController::toggle'], [], [['text', '/toggle'], ['variable', '/', '[^/]++', 'id', true], ['text', '/api/schemas']], [], [], []],
 ];
--- a/backend/var/cache/dev/url_generating_routes.php.meta
+++ b/backend/var/cache/dev/url_generating_routes.php.meta
--- a/backend/var/cache/dev/url_generating_routes.php.meta.json
+++ b/backend/var/cache/dev/url_generating_routes.php.meta.json
@@ -1 +1 @@
-{"resources":[{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/config/routes/framework.yaml"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/vendor/symfony/framework-bundle/Resources/config/routing/errors.php"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/config/routes.yaml"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/service-contracts/ServiceSubscriberInterface.php":null,"/var/www/html/backend/src/Controller/Api/CategoryController.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Controller/AbstractController.php":null},"className":"App\\Controller\\Api\\CategoryController","excludedVendors":[],"hash":"ff810c7f3497a6c45a2a4f095c8951cc"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/service-contracts/ServiceSubscriberInterface.php":null,"/var/www/html/backend/src/Controller/Api/TaskController.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Controller/AbstractController.php":null},"className":"App\\Controller\\Api\\TaskController","excludedVendors":[],"hash":"f427358a49f37ce4ee9ead1099f3900b"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/service-contracts/ServiceSubscriberInterface.php":null,"/var/www/html/backend/src/Controller/Api/TaskSchemaController.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Controller/AbstractController.php":null},"className":"App\\Controller\\Api\\TaskSchemaController","excludedVendors":[],"hash":"452a43ea95395c01eb30782451939664"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/http-kernel/HttpKernelInterface.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/TerminableInterface.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/RebootableInterface.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/KernelInterface.php":null,"/var/www/html/backend/src/Kernel.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Kernel/MicroKernelTrait.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/Kernel.php":null},"className":"App\\Kernel","excludedVendors":[],"hash":"e99ca94924fc07b15a24e4777153ceff"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/src/Kernel.php"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/vendor/symfony/http-kernel/Kernel.php"},{"@type":"Symfony\\Component\\DependencyInjection\\Config\\ContainerParametersResource","parameters":[]},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/var/cache/dev/App_KernelDevDebugContainer.php"}]}
+{"resources":[{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/config/routes/framework.yaml"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/vendor/symfony/framework-bundle/Resources/config/routing/errors.php"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/config/routes.yaml"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/service-contracts/ServiceSubscriberInterface.php":null,"/var/www/html/backend/src/Controller/Api/CategoryController.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Controller/AbstractController.php":null},"className":"App\\Controller\\Api\\CategoryController","excludedVendors":[],"hash":"ff810c7f3497a6c45a2a4f095c8951cc"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/service-contracts/ServiceSubscriberInterface.php":null,"/var/www/html/backend/src/Controller/Api/TaskController.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Controller/AbstractController.php":null},"className":"App\\Controller\\Api\\TaskController","excludedVendors":[],"hash":"b70b77f03f131f1b4a743dcaad5891bd"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/service-contracts/ServiceSubscriberInterface.php":null,"/var/www/html/backend/src/Controller/Api/TaskSchemaController.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Controller/AbstractController.php":null},"className":"App\\Controller\\Api\\TaskSchemaController","excludedVendors":[],"hash":"2142868ed98ce59e00608b80e9cb6db1"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/http-kernel/HttpKernelInterface.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/TerminableInterface.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/RebootableInterface.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/KernelInterface.php":null,"/var/www/html/backend/src/Kernel.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Kernel/MicroKernelTrait.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/Kernel.php":null},"className":"App\\Kernel","excludedVendors":[],"hash":"e99ca94924fc07b15a24e4777153ceff"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/src/Kernel.php"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/vendor/symfony/http-kernel/Kernel.php"},{"@type":"Symfony\\Component\\DependencyInjection\\Config\\ContainerParametersResource","parameters":[]},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/var/cache/dev/App_KernelDevDebugContainer.php"}]}
--- a/backend/var/cache/dev/url_matching_routes.php
+++ b/backend/var/cache/dev/url_matching_routes.php
@@ -12,13 +12,14 @@ return [
            [['_route' => 'categories.index', '_controller' => 'App\\Controller\\Api\\CategoryController::index'], null, ['GET' => 0], null, false, false, null],
            [['_route' => 'categories.create', '_controller' => 'App\\Controller\\Api\\CategoryController::create'], null, ['POST' => 0], null, false, false, null],
        ],
+        '/api/tasks' => [
+            [['_route' => 'tasks.index', '_controller' => 'App\\Controller\\Api\\TaskController::index'], null, ['GET' => 0], null, false, false, null],
+            [['_route' => 'tasks.create', '_controller' => 'App\\Controller\\Api\\TaskController::create'], null, ['POST' => 0], null, false, false, null],
+        ],
        '/api/schemas' => [
            [['_route' => 'schemas.index', '_controller' => 'App\\Controller\\Api\\TaskSchemaController::index'], null, ['GET' => 0], null, false, false, null],
            [['_route' => 'schemas.create', '_controller' => 'App\\Controller\\Api\\TaskSchemaController::create'], null, ['POST' => 0], null, false, false, null],
        ],
-        '/api/schemas/week' => [[['_route' => 'schemas.week', '_controller' => 'App\\Controller\\Api\\TaskSchemaController::week'], null, ['GET' => 0], null, false, false, null]],
-        '/api/schemas/all' => [[['_route' => 'schemas.all', '_controller' => 'App\\Controller\\Api\\TaskSchemaController::allSchemas'], null, ['GET' => 0], null, false, false, null]],
-        '/api/schemas/all-tasks' => [[['_route' => 'schemas.allTasks', '_controller' => 'App\\Controller\\Api\\TaskSchemaController::allTasks'], null, ['GET' => 0], null, false, false, null]],
    ],
    [ // $regexpList
        0 => '{^(?'
@@ -29,10 +30,10 @@ return [
                    .')'
                    .'|tasks/([^/]++)(?'
                        .'|(*:97)'
+                        .'|/toggle(*:111)'
                    .')'
                    .'|schemas/([^/]++)(?'
-                        .'|(*:124)'
-                        .'|/toggle(*:139)'
+                        .'|(*:139)'
                    .')'
                .')'
            .')/?$}sDu',
@@ -49,13 +50,11 @@ return [
            [['_route' => 'tasks.update', '_controller' => 'App\\Controller\\Api\\TaskController::update'], ['id'], ['PUT' => 0], null, false, true, null],
            [['_route' => 'tasks.delete', '_controller' => 'App\\Controller\\Api\\TaskController::delete'], ['id'], ['DELETE' => 0], null, false, true, null],
        ],
-        124 => [
+        111 => [[['_route' => 'tasks.toggle', '_controller' => 'App\\Controller\\Api\\TaskController::toggle'], ['id'], ['PATCH' => 0], null, false, false, null]],
+        139 => [
            [['_route' => 'schemas.show', '_controller' => 'App\\Controller\\Api\\TaskSchemaController::show'], ['id'], ['GET' => 0], null, false, true, null],
            [['_route' => 'schemas.update', '_controller' => 'App\\Controller\\Api\\TaskSchemaController::update'], ['id'], ['PUT' => 0], null, false, true, null],
            [['_route' => 'schemas.delete', '_controller' => 'App\\Controller\\Api\\TaskSchemaController::delete'], ['id'], ['DELETE' => 0], null, false, true, null],
-        ],
-        139 => [
-            [['_route' => 'schemas.toggle', '_controller' => 'App\\Controller\\Api\\TaskSchemaController::toggle'], ['id'], ['PATCH' => 0], null, false, false, null],
            [null, null, null, null, false, false, 0],
        ],
    ],
--- a/backend/var/cache/dev/url_matching_routes.php.meta
+++ b/backend/var/cache/dev/url_matching_routes.php.meta
--- a/backend/var/cache/dev/url_matching_routes.php.meta.json
+++ b/backend/var/cache/dev/url_matching_routes.php.meta.json
@@ -1 +1 @@
-{"resources":[{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/config/routes/framework.yaml"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/vendor/symfony/framework-bundle/Resources/config/routing/errors.php"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/config/routes.yaml"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/service-contracts/ServiceSubscriberInterface.php":null,"/var/www/html/backend/src/Controller/Api/CategoryController.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Controller/AbstractController.php":null},"className":"App\\Controller\\Api\\CategoryController","excludedVendors":[],"hash":"ff810c7f3497a6c45a2a4f095c8951cc"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/service-contracts/ServiceSubscriberInterface.php":null,"/var/www/html/backend/src/Controller/Api/TaskController.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Controller/AbstractController.php":null},"className":"App\\Controller\\Api\\TaskController","excludedVendors":[],"hash":"f427358a49f37ce4ee9ead1099f3900b"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/service-contracts/ServiceSubscriberInterface.php":null,"/var/www/html/backend/src/Controller/Api/TaskSchemaController.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Controller/AbstractController.php":null},"className":"App\\Controller\\Api\\TaskSchemaController","excludedVendors":[],"hash":"452a43ea95395c01eb30782451939664"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/http-kernel/HttpKernelInterface.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/TerminableInterface.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/RebootableInterface.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/KernelInterface.php":null,"/var/www/html/backend/src/Kernel.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Kernel/MicroKernelTrait.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/Kernel.php":null},"className":"App\\Kernel","excludedVendors":[],"hash":"e99ca94924fc07b15a24e4777153ceff"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/src/Kernel.php"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/vendor/symfony/http-kernel/Kernel.php"},{"@type":"Symfony\\Component\\DependencyInjection\\Config\\ContainerParametersResource","parameters":[]},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/var/cache/dev/App_KernelDevDebugContainer.php"}]}
+{"resources":[{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/config/routes/framework.yaml"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/vendor/symfony/framework-bundle/Resources/config/routing/errors.php"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/config/routes.yaml"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/service-contracts/ServiceSubscriberInterface.php":null,"/var/www/html/backend/src/Controller/Api/CategoryController.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Controller/AbstractController.php":null},"className":"App\\Controller\\Api\\CategoryController","excludedVendors":[],"hash":"ff810c7f3497a6c45a2a4f095c8951cc"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/service-contracts/ServiceSubscriberInterface.php":null,"/var/www/html/backend/src/Controller/Api/TaskController.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Controller/AbstractController.php":null},"className":"App\\Controller\\Api\\TaskController","excludedVendors":[],"hash":"b70b77f03f131f1b4a743dcaad5891bd"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/service-contracts/ServiceSubscriberInterface.php":null,"/var/www/html/backend/src/Controller/Api/TaskSchemaController.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Controller/AbstractController.php":null},"className":"App\\Controller\\Api\\TaskSchemaController","excludedVendors":[],"hash":"2142868ed98ce59e00608b80e9cb6db1"},{"@type":"Symfony\\Component\\Config\\Resource\\ReflectionClassResource","files":{"/var/www/html/backend/vendor/symfony/http-kernel/HttpKernelInterface.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/TerminableInterface.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/RebootableInterface.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/KernelInterface.php":null,"/var/www/html/backend/src/Kernel.php":null,"/var/www/html/backend/vendor/symfony/framework-bundle/Kernel/MicroKernelTrait.php":null,"/var/www/html/backend/vendor/symfony/http-kernel/Kernel.php":null},"className":"App\\Kernel","excludedVendors":[],"hash":"e99ca94924fc07b15a24e4777153ceff"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/src/Kernel.php"},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/vendor/symfony/http-kernel/Kernel.php"},{"@type":"Symfony\\Component\\DependencyInjection\\Config\\ContainerParametersResource","parameters":[]},{"@type":"Symfony\\Component\\Config\\Resource\\FileResource","resource":"/var/www/html/backend/var/cache/dev/App_KernelDevDebugContainer.php"}]}
--- a/frontend/src/components/DayColumn.vue
+++ b/frontend/src/components/DayColumn.vue
@@ -24,9 +24,9 @@ function formatDate(dateStr) {
    <div class="day-tasks">
      <TaskCard
        v-for="task in tasks"
-        :key="`${task.id}-${date}`"
+        :key="task.id"
        :task="task"
-        @toggle="(taskId, deadline) => emit('toggle', taskId, deadline || date)"
+        @toggle="(taskId) => emit('toggle', taskId)"
      />
    </div>
  </section>
--- a/frontend/src/components/TaskCard.vue
+++ b/frontend/src/components/TaskCard.vue
@@ -14,17 +14,17 @@ const router = useRouter()
  <div
    class="card"
    :class="{
-      'card--completed': task.status === 'erledigt',
+      'card--completed': task.status === 'done',
      'card--past': task.isPast,
    }"
-    @click="emit('toggle', task.schemaId, task.deadline)"
+    @click="emit('toggle', task.id)"
  >
    <div class="card-left">
      <span class="task-name">{{ task.name }}</span>
      <CategoryBadge :category="task.category" />
    </div>
    <div class="card-right" @click.stop>
-      <button @click="router.push({ name: 'task-detail', params: { id: task.taskId } })">
+      <button @click="router.push({ name: 'task-detail', params: { id: task.id } })">
        Anzeigen
      </button>
    </div>
--- a/frontend/src/services/api.js
+++ b/frontend/src/services/api.js
@@ -22,22 +22,19 @@ export const updateCategory = (id, data) => request(`/categories/${id}`, { metho
 export const deleteCategory = (id) => request(`/categories/${id}`, { method: 'DELETE' })

 // Schemas
-export const getWeekTasks = (start) => {
-  const params = start ? `?start=${start}` : ''
-  return request(`/schemas/week${params}`)
-}
+export const getSchemas = () => request('/schemas')
 export const getSchema = (id) => request(`/schemas/${id}`)
 export const createSchema = (data) => request('/schemas', { method: 'POST', body: JSON.stringify(data) })
 export const updateSchema = (id, data) => request(`/schemas/${id}`, { method: 'PUT', body: JSON.stringify(data) })
-export const deleteSchema = (id) => request(`/schemas/${id}`, { method: 'DELETE' })
-export const toggleTask = (id, date) => request(`/schemas/${id}/toggle`, {
-  method: 'PATCH',
-  body: JSON.stringify(date ? { date } : {}),
-})
-export const getAllSchemas = () => request('/schemas/all')
-export const getAllTasks = () => request('/schemas/all-tasks')
+export const deleteSchema = (id, deleteTasks = false) => {
+  const params = deleteTasks ? '?deleteTasks=1' : ''
+  return request(`/schemas/${id}${params}`, { method: 'DELETE' })
+}

 // Tasks
+export const getTasks = () => request('/tasks')
 export const getTask = (id) => request(`/tasks/${id}`)
+export const createTask = (data) => request('/tasks', { method: 'POST', body: JSON.stringify(data) })
 export const updateTask = (id, data) => request(`/tasks/${id}`, { method: 'PUT', body: JSON.stringify(data) })
 export const deleteTask = (id) => request(`/tasks/${id}`, { method: 'DELETE' })
+export const toggleTask = (id) => request(`/tasks/${id}/toggle`, { method: 'PATCH' })
--- a/frontend/src/views/AllTasksView.vue
+++ b/frontend/src/views/AllTasksView.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
-import { getAllSchemas, getAllTasks, toggleTask } from '../services/api'
+import { getSchemas, getTasks, toggleTask } from '../services/api'
 import CategoryBadge from '../components/CategoryBadge.vue'
 import Icon from '../components/Icon.vue'

@@ -13,8 +13,8 @@ const mode = ref('schemas')
 async function fetchData(showLoading = true) {
  if (showLoading) loading.value = true
  items.value = mode.value === 'schemas'
-    ? await getAllSchemas()
-    : await getAllTasks()
+    ? await getSchemas()
+    : await getTasks()
  loading.value = false
 }

@@ -29,17 +29,29 @@ function formatDate(dateStr) {
  })
 }

+function getDateKey(item) {
+  if (!item.date) return null
+  return item.date.split('T')[0]
+}
+
 const groupedItems = computed(() => {
  const today = new Date().toISOString().split('T')[0]
-  const noDate = items.value.filter(i => !i.deadline)
-  const current = items.value.filter(i => i.deadline && i.deadline >= today)
-  const past = items.value.filter(i => i.deadline && i.deadline < today)
+  const noDate = items.value.filter(i => !getDateKey(i))
+  const current = items.value.filter(i => {
+    const d = getDateKey(i)
+    return d && d >= today
+  })
+  const past = items.value.filter(i => {
+    const d = getDateKey(i)
+    return d && d < today
+  })

  const monthMap = {}
  const months = []
  for (const item of past) {
-    const d = new Date(item.deadline + 'T00:00:00')
-    const sortKey = item.deadline.substring(0, 7)
+    const dateKey = getDateKey(item)
+    const d = new Date(dateKey + 'T00:00:00')
+    const sortKey = dateKey.substring(0, 7)
    const label = d.toLocaleDateString('de-DE', { month: 'long', year: 'numeric' })
    if (!monthMap[sortKey]) {
      monthMap[sortKey] = { sortKey, label, items: [] }
@@ -53,7 +65,7 @@ const groupedItems = computed(() => {
 })

 async function handleToggle(item) {
-  await toggleTask(item.schemaId, item.deadline)
+  await toggleTask(item.id)
  await fetchData(false)
 }

@@ -108,11 +120,11 @@ onMounted(fetchData)
          @click="handleToggle(item)"
        >
          <div class="task-left">
-            <span class="task-name" :class="{ 'task--completed': item.status === 'erledigt' }">{{ item.name }}</span>
+            <span class="task-name" :class="{ 'task--completed': item.status === 'done' }">{{ item.name }}</span>
            <CategoryBadge :category="item.category" />
          </div>
          <div class="task-right" @click.stop>
-            <button @click="router.push({ name: 'task-detail', params: { id: item.taskId } })">Anzeigen</button>
+            <button @click="router.push({ name: 'task-detail', params: { id: item.id } })">Anzeigen</button>
          </div>
        </li>

@@ -125,12 +137,12 @@ onMounted(fetchData)
          @click="handleToggle(item)"
        >
          <div class="task-left">
-            <span class="task-name" :class="{ 'task--completed': item.status === 'erledigt' }">{{ item.name }}</span>
+            <span class="task-name" :class="{ 'task--completed': item.status === 'done' }">{{ item.name }}</span>
            <CategoryBadge :category="item.category" />
          </div>
          <div class="task-right" @click.stop>
-            <span class="task-date">{{ formatDate(item.deadline) }}</span>
-            <button @click="router.push({ name: 'task-detail', params: { id: item.taskId } })">Anzeigen</button>
+            <span class="task-date">{{ formatDate(getDateKey(item)) }}</span>
+            <button @click="router.push({ name: 'task-detail', params: { id: item.id } })">Anzeigen</button>
          </div>
        </li>

@@ -144,10 +156,10 @@ onMounted(fetchData)
            @click="handleToggle(item)"
          >
            <div class="task-left">
-              <span class="task-name" :class="{ 'task--completed': item.status === 'erledigt' }">{{ item.name }}</span>
+              <span class="task-name" :class="{ 'task--completed': item.status === 'done' }">{{ item.name }}</span>
              <CategoryBadge :category="item.category" />
            </div>
-            <span class="task-date">{{ formatDate(item.deadline) }}</span>
+            <span class="task-date">{{ formatDate(getDateKey(item)) }}</span>
          </li>
        </template>
      </template>
--- a/frontend/src/views/HomeView.vue
+++ b/frontend/src/views/HomeView.vue
@@ -2,7 +2,7 @@
 import { ref, computed, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import { useCategoriesStore } from '../stores/categories'
-import { getWeekTasks, toggleTask } from '../services/api'
+import { getTasks, toggleTask } from '../services/api'
 import DayColumn from '../components/DayColumn.vue'
 import TaskCard from '../components/TaskCard.vue'
 import Icon from '../components/Icon.vue'
@@ -10,41 +10,63 @@ import Icon from '../components/Icon.vue'
 const router = useRouter()
 const categoriesStore = useCategoriesStore()

-const rawDays = ref([])
-const rawTasksWithoutDeadline = ref([])
+const allTasks = ref([])
 const loading = ref(true)
 const showCompleted = ref(true)

-function filterTasks(tasks) {
-  if (showCompleted.value) return tasks
-  return tasks.filter(t => t.status !== 'erledigt')
+function getWeekDates() {
+  const now = new Date()
+  const day = now.getDay()
+  const monday = new Date(now)
+  monday.setDate(now.getDate() - ((day + 6) % 7))
+  const dates = []
+  for (let i = 0; i < 7; i++) {
+    const d = new Date(monday)
+    d.setDate(monday.getDate() + i)
+    dates.push(d.toISOString().split('T')[0])
+  }
+  return dates
 }

-const tasksWithoutDeadline = computed(() => filterTasks(rawTasksWithoutDeadline.value))
-const days = computed(() => rawDays.value.map(d => ({
-  ...d,
-  tasks: filterTasks(d.tasks),
-})))
+const weekDates = getWeekDates()

-async function fetchWeek(showLoading = true) {
+function filterTasks(tasks) {
+  if (showCompleted.value) return tasks
+  return tasks.filter(t => t.status !== 'done')
+}
+
+const tasksWithoutDeadline = computed(() => {
+  const tasks = allTasks.value.filter(t => t.date === null)
+  return filterTasks(tasks)
+})
+
+const days = computed(() => {
+  return weekDates.map(date => {
+    const tasks = allTasks.value.filter(t => {
+      if (!t.date) return false
+      return t.date.split('T')[0] === date
+    })
+    return { date, tasks: filterTasks(tasks) }
+  })
+})
+
+async function fetchTasks(showLoading = true) {
  if (showLoading) loading.value = true
  try {
-    const data = await getWeekTasks()
-    rawDays.value = data.days
-    rawTasksWithoutDeadline.value = data.tasksWithoutDeadline
+    allTasks.value = await getTasks()
  } finally {
    loading.value = false
  }
 }

-async function handleToggle(taskId, date) {
-  await toggleTask(taskId, date)
-  await fetchWeek(false)
+async function handleToggle(taskId) {
+  await toggleTask(taskId)
+  await fetchTasks(false)
 }

 onMounted(() => {
  categoriesStore.fetchCategories()
-  fetchWeek()
+  fetchTasks()
 })
 </script>

--- a/frontend/src/views/SchemaView.vue
+++ b/frontend/src/views/SchemaView.vue
@@ -17,18 +17,20 @@ const isEdit = computed(() => !!route.params.id)
 const loading = ref(false)
 const saving = ref(false)
 const error = ref(null)
+const deleteTasksOnRemove = ref(false)

 const form = ref({
  name: '',
  categoryId: null,
-  status: 'aktiv',
-  taskType: 'einzel',
-  deadline: null,
+  status: 'active',
+  type: 'single',
  startDate: null,
  endDate: null,
-  weekdays: [],
-  monthDays: [],
-  yearDays: [],
+  days: {
+    week: [],
+    month: [],
+    year: [],
+  },
 })

 function formatDateForInput(dateStr) {
@@ -44,13 +46,14 @@ async function loadTask() {
      name: task.name,
      categoryId: task.category?.id ?? null,
      status: task.status,
-      taskType: task.taskType,
-      deadline: formatDateForInput(task.deadline),
+      type: task.type,
      startDate: formatDateForInput(task.startDate),
      endDate: formatDateForInput(task.endDate),
-      weekdays: task.weekdays || [],
-      monthDays: task.monthDays || [],
-      yearDays: task.yearDays || [],
+      days: {
+        week: task.days?.week || [],
+        month: task.days?.month || [],
+        year: task.days?.year || [],
+      },
    }
    setDynamicLabel(task.name)
  } finally {
@@ -64,23 +67,25 @@ function buildPayload() {
    name: f.name,
    categoryId: f.categoryId,
    status: f.status,
-    taskType: f.taskType,
-    deadline: null,
+    type: f.type,
    startDate: null,
    endDate: null,
-    weekdays: null,
-    monthDays: null,
-    yearDays: null,
+    days: null,
  }

-  if (f.taskType === 'einzel') {
-    payload.deadline = f.deadline
-  } else {
+  if (f.type === 'single') {
+    payload.days = { year: f.days.year }
+  } else if (f.type === 'daily') {
    payload.startDate = f.startDate
    payload.endDate = f.endDate
-    if (f.taskType === 'woechentlich') payload.weekdays = f.weekdays
-    if (f.taskType === 'monatlich') payload.monthDays = f.monthDays
-    if (f.taskType === 'multi' || f.taskType === 'jaehrlich') payload.yearDays = f.yearDays
+  } else if (f.type === 'custom') {
+    payload.startDate = f.startDate
+    payload.endDate = f.endDate
+    const days = {}
+    if (f.days.week.length) days.week = f.days.week
+    if (f.days.month.length) days.month = f.days.month
+    if (f.days.year.length) days.year = f.days.year
+    payload.days = Object.keys(days).length ? days : null
  }

  return payload
@@ -105,8 +110,8 @@ async function save() {
 }

 async function remove() {
-  if (!confirm('Aufgabe wirklich löschen?')) return
-  await deleteSchema(route.params.id)
+  if (!confirm('Schema wirklich löschen?')) return
+  await deleteSchema(route.params.id, deleteTasksOnRemove.value)
  router.back()
 }

@@ -151,9 +156,8 @@ onMounted(() => {
      <div v-if="isEdit" class="form-group">
        <label for="status">Status</label>
        <select id="status" v-model="form.status">
-          <option value="aktiv">Aktiv</option>
-          <option value="erledigt">Erledigt</option>
-          <option value="inaktiv">Inaktiv</option>
+          <option value="active">Aktiv</option>
+          <option value="disabled">Inaktiv</option>
        </select>
      </div>

@@ -162,34 +166,25 @@ onMounted(() => {
        <label>Aufgabentyp</label>
        <div class="radio-group">
          <label class="radio-label">
-            <input type="radio" v-model="form.taskType" value="einzel" /> Einzel
+            <input type="radio" v-model="form.type" value="single" /> Einzel
          </label>
          <label class="radio-label">
-            <input type="radio" v-model="form.taskType" value="taeglich" /> Täglich
+            <input type="radio" v-model="form.type" value="daily" /> Täglich
          </label>
          <label class="radio-label">
-            <input type="radio" v-model="form.taskType" value="multi" /> Multi
-          </label>
-          <label class="radio-label">
-            <input type="radio" v-model="form.taskType" value="woechentlich" /> Wöchentlich
-          </label>
-          <label class="radio-label">
-            <input type="radio" v-model="form.taskType" value="monatlich" /> Monatlich
-          </label>
-          <label class="radio-label">
-            <input type="radio" v-model="form.taskType" value="jaehrlich" /> Jährlich
+            <input type="radio" v-model="form.type" value="custom" /> Benutzerdefiniert
          </label>
        </div>
      </div>

-      <!-- Einzel: Datum -->
-      <div v-if="form.taskType === 'einzel'" class="form-group">
-        <label for="deadline">Datum (optional)</label>
-        <input id="deadline" v-model="form.deadline" type="date" />
+      <!-- Einzel: Jahresansicht -->
+      <div v-if="form.type === 'single'" class="form-group">
+        <label>Tage auswählen</label>
+        <YearPicker v-model="form.days.year" />
      </div>

-      <!-- Alle außer Einzel: Start + Enddatum nebeneinander -->
-      <template v-if="form.taskType !== 'einzel'">
+      <!-- Daily + Custom: Start + Enddatum -->
+      <template v-if="form.type === 'daily' || form.type === 'custom'">
        <div class="form-row">
          <div class="form-group flex-1">
            <label for="startDate">Startdatum (leer = heute)</label>
@@ -202,31 +197,37 @@ onMounted(() => {
        </div>
      </template>

-      <!-- Wöchentlich -->
-      <div v-if="form.taskType === 'woechentlich'" class="form-group">
+      <!-- Custom: Alle Picker -->
+      <template v-if="form.type === 'custom'">
+        <div class="form-group">
          <label>Wochentage</label>
-        <WeekdayPicker v-model="form.weekdays" />
+          <WeekdayPicker v-model="form.days.week" />
        </div>

-      <!-- Monatlich -->
-      <div v-if="form.taskType === 'monatlich'" class="form-group">
+        <div class="form-group">
          <label>Monatstage</label>
-        <MonthdayPicker v-model="form.monthDays" />
+          <MonthdayPicker v-model="form.days.month" />
        </div>

-      <!-- Multi + Jährlich -->
-      <div v-if="form.taskType === 'multi' || form.taskType === 'jaehrlich'" class="form-group">
+        <div class="form-group">
          <label>Jahresansicht</label>
-        <YearPicker v-model="form.yearDays" />
+          <YearPicker v-model="form.days.year" />
        </div>
+      </template>

      <p v-if="error" class="error">{{ error }}</p>

      <div v-if="isEdit" class="form-actions">
+        <div class="delete-section">
+          <label class="checkbox-label">
+            <input type="checkbox" v-model="deleteTasksOnRemove" />
+            Aufgaben löschen
+          </label>
          <button type="button" class="btn-danger" @click="remove">
            <Icon name="trash" />
          </button>
        </div>
+      </div>
    </form>
  </div>
 </template>
@@ -266,6 +267,21 @@ onMounted(() => {
  margin-top: 1.5rem;
 }

+.delete-section {
+  display: flex;
+  align-items: center;
+  gap: 1rem;
+}
+
+.checkbox-label {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.35rem;
+  font-weight: normal;
+  cursor: pointer;
+  font-size: 0.875rem;
+}
+
 .loading {
  text-align: center;
  color: var(--text);
--- a/frontend/src/views/TaskDetailView.vue
+++ b/frontend/src/views/TaskDetailView.vue
@@ -13,7 +13,7 @@ const categoriesStore = useCategoriesStore()
 const loading = ref(true)
 const saving = ref(false)
 const occurrence = ref(null)
-const form = ref({ name: '', status: 'aktiv', date: '', categoryId: null })
+const form = ref({ name: '', status: 'active', date: '', categoryId: null })

 async function load() {
  loading.value = true
@@ -85,8 +85,8 @@ onMounted(() => {
        <div class="form-group flex-1">
          <label for="status">Status</label>
          <select id="status" v-model="form.status">
-            <option value="aktiv">Aktiv</option>
-            <option value="erledigt">Erledigt</option>
+            <option value="active">Aktiv</option>
+            <option value="done">Erledigt</option>
          </select>
        </div>
        <div class="form-group flex-1">