fixed task adding bug
This commit is contained in:
@@ -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),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
<div>{{ form_row(form.estimatedDurationMinutes) }}</div>
|
||||
<div>{{ form_row(form.priority) }}</div>
|
||||
<div>{{ form_row(form.category) }}</div>
|
||||
<div class="task-composer__checks">{{ form_row(form.isRecurring) }}{{ form_row(form.isActive) }}</div>
|
||||
<div class="task-composer__checks">{{ form_row(form.isRecurring) }}</div>
|
||||
</div>
|
||||
<details class="task-composer__notes">
|
||||
<summary>Add a note</summary>
|
||||
|
||||
Reference in New Issue
Block a user