From 6e067e387a48eda13c475e11c8ddcee2d5ab41fc Mon Sep 17 00:00:00 2001 From: Joren de Graaf Date: Tue, 11 Aug 2026 14:12:01 +0200 Subject: [PATCH] fixed task adding bug --- src/Controller/TaskController.php | 8 +++++--- src/Form/TaskType.php | 12 ++++++++---- templates/task/_task_composer.html.twig | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Controller/TaskController.php b/src/Controller/TaskController.php index 25c494c..fdaf649 100644 --- a/src/Controller/TaskController.php +++ b/src/Controller/TaskController.php @@ -24,7 +24,7 @@ final class TaskController extends AbstractController 'tasks' => $taskRecommendationService->sort($taskRepository->findAll(), $batteryLevel), 'battery_level' => $batteryLevel, 'battery_budget' => $taskRecommendationService->budgetFor($batteryLevel), - 'form' => $this->createForm(TaskType::class, new Task()), + 'form' => $this->createForm(TaskType::class, new Task(), ['include_active' => false]), ]); } @@ -45,10 +45,12 @@ final class TaskController extends AbstractController public function new(Request $request, EntityManagerInterface $entityManager, TaskRepository $taskRepository, TaskRecommendationService $taskRecommendationService): Response { $task = new Task(); - $form = $this->createForm(TaskType::class, $task); + $form = $this->createForm(TaskType::class, $task, ['include_active' => false]); $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { + // A task is actionable when it is first captured; completion is an edit-state. + $task->setIsActive(true); $entityManager->persist($task); $entityManager->flush(); @@ -56,7 +58,7 @@ final class TaskController extends AbstractController $batteryLevel = $taskRecommendationService->normaliseBatteryLevel($request->getSession()->get('social_battery', 3)); return $this->render('task/_task_composer_response.html.twig', [ - 'form' => $this->createForm(TaskType::class, new Task()), + 'form' => $this->createForm(TaskType::class, new Task(), ['include_active' => false]), 'tasks' => $taskRecommendationService->sort($taskRepository->findAll(), $batteryLevel), ]); } diff --git a/src/Form/TaskType.php b/src/Form/TaskType.php index cac9467..0291bf7 100644 --- a/src/Form/TaskType.php +++ b/src/Form/TaskType.php @@ -43,18 +43,22 @@ class TaskType extends AbstractType ->add('isRecurring', CheckboxType::class, [ 'label' => 'Repeats', 'required' => false, - ]) - ->add('isActive', CheckboxType::class, [ + ]); + + if ($options['include_active']) { + $builder->add('isActive', CheckboxType::class, [ 'label' => 'Active', 'required' => false, - ]) - ; + ]); + } } public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'data_class' => Task::class, + 'include_active' => true, ]); + $resolver->setAllowedTypes('include_active', 'bool'); } } diff --git a/templates/task/_task_composer.html.twig b/templates/task/_task_composer.html.twig index 48ab2c8..e6a10d3 100644 --- a/templates/task/_task_composer.html.twig +++ b/templates/task/_task_composer.html.twig @@ -23,7 +23,7 @@
{{ form_row(form.estimatedDurationMinutes) }}
{{ form_row(form.priority) }}
{{ form_row(form.category) }}
-
{{ form_row(form.isRecurring) }}{{ form_row(form.isActive) }}
+
{{ form_row(form.isRecurring) }}
Add a note