first version of defer/sick mode
This commit is contained in:
@@ -5,10 +5,10 @@ use App\Entity\Settings;
|
||||
use App\Entity\User;
|
||||
|
||||
use App\Entity\Task;
|
||||
use App\Entity\UserSetting;
|
||||
use App\Form\TaskType;
|
||||
use App\Repository\TaskRepository;
|
||||
use App\Service\TaskDeferralService;
|
||||
use App\Service\TaskRecommendationService;
|
||||
use App\Service\TaskSchedulingService;
|
||||
use App\Service\WeatherService;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
@@ -16,12 +16,13 @@ use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
use Symfony\Component\Process\Process;
|
||||
use Symfony\Bundle\SecurityBundle\Security;
|
||||
|
||||
#[Route('/task')]
|
||||
final class TaskController extends AbstractController
|
||||
{
|
||||
#[Route(name: 'app_task_index', methods: ['GET'])]
|
||||
public function index(Request $request, TaskRepository $taskRepository, TaskRecommendationService $taskRecommendationService, WeatherService $weatherService): Response
|
||||
public function index(Request $request, TaskRecommendationService $taskRecommendationService, TaskSchedulingService $taskSchedulingService, WeatherService $weatherService, Security $security): Response
|
||||
{
|
||||
$batteryLevel = $taskRecommendationService->normaliseBatteryLevel($request->getSession()->get('social_battery', 3));
|
||||
$selectedDate = $this->selectedDate($request);
|
||||
@@ -29,9 +30,12 @@ final class TaskController extends AbstractController
|
||||
$newTask->setScheduledFor($selectedDate);
|
||||
$settings = $this->currentSettings();
|
||||
|
||||
/** @var User|null $user */
|
||||
$user = $security->getUser();
|
||||
|
||||
return $this->render('task/index.html.twig', [
|
||||
'tasks' => $taskRecommendationService->sort($taskRepository->findAll(), $batteryLevel, $selectedDate, $settings),
|
||||
'tasks' => $taskSchedulingService->tasksForDate($batteryLevel, $selectedDate, $settings),
|
||||
'user' => $user,
|
||||
'battery_level' => $batteryLevel,
|
||||
'battery_budget' => $taskRecommendationService->budgetFor($batteryLevel),
|
||||
'selected_date' => $selectedDate,
|
||||
@@ -42,7 +46,7 @@ final class TaskController extends AbstractController
|
||||
}
|
||||
|
||||
#[Route('/social-battery', name: 'app_task_social_battery', methods: ['POST'])]
|
||||
public function socialBattery(Request $request, TaskRepository $taskRepository, TaskRecommendationService $taskRecommendationService): Response
|
||||
public function socialBattery(Request $request, TaskSchedulingService $taskSchedulingService, TaskRecommendationService $taskRecommendationService): Response
|
||||
{
|
||||
if (!$this->isCsrfTokenValid('social_battery', $request->getPayload()->getString('_token'))) {
|
||||
throw $this->createAccessDeniedException('Invalid CSRF token.');
|
||||
@@ -51,11 +55,11 @@ final class TaskController extends AbstractController
|
||||
$batteryLevel = $taskRecommendationService->normaliseBatteryLevel($request->getPayload()->getInt('social_battery'));
|
||||
$request->getSession()->set('social_battery', $batteryLevel);
|
||||
|
||||
return $this->renderTaskRecommendations($taskRepository, $taskRecommendationService, $batteryLevel, $this->selectedDate($request));
|
||||
return $this->renderTaskRecommendations($taskSchedulingService, $taskRecommendationService, $batteryLevel, $this->selectedDate($request));
|
||||
}
|
||||
|
||||
#[Route('/new', name: 'app_task_new', methods: ['GET', 'POST'])]
|
||||
public function new(Request $request, EntityManagerInterface $entityManager, TaskRepository $taskRepository, TaskRecommendationService $taskRecommendationService): Response
|
||||
public function new(Request $request, EntityManagerInterface $entityManager, TaskSchedulingService $taskSchedulingService, TaskRecommendationService $taskRecommendationService): Response
|
||||
{
|
||||
$task = new Task();
|
||||
$form = $this->createForm(TaskType::class, $task, ['include_active' => false]);
|
||||
@@ -74,7 +78,7 @@ final class TaskController extends AbstractController
|
||||
|
||||
return $this->render('task/_task_composer_response.html.twig', [
|
||||
'form' => $this->createForm(TaskType::class, $newTask, ['include_active' => false]),
|
||||
'tasks' => $taskRecommendationService->sort($taskRepository->findAll(), $batteryLevel, $selectedDate),
|
||||
'tasks' => $taskSchedulingService->tasksForDate($batteryLevel, $selectedDate, $this->currentSettings()),
|
||||
'selected_date' => $selectedDate,
|
||||
]);
|
||||
}
|
||||
@@ -116,7 +120,7 @@ final class TaskController extends AbstractController
|
||||
}
|
||||
|
||||
#[Route('/{id}/completion', name: 'app_task_toggle_completion', methods: ['POST'])]
|
||||
public function toggleCompletion(Request $request, Task $task, EntityManagerInterface $entityManager, TaskRepository $taskRepository, TaskRecommendationService $taskRecommendationService): Response
|
||||
public function toggleCompletion(Request $request, Task $task, EntityManagerInterface $entityManager, TaskSchedulingService $taskSchedulingService, TaskRecommendationService $taskRecommendationService): Response
|
||||
{
|
||||
if (!$this->isCsrfTokenValid('completion' . $task->getId(), $request->getPayload()->getString('_token'))) {
|
||||
throw $this->createAccessDeniedException('Invalid CSRF token.');
|
||||
@@ -130,9 +134,40 @@ final class TaskController extends AbstractController
|
||||
|
||||
$batteryLevel = $taskRecommendationService->normaliseBatteryLevel($request->getSession()->get('social_battery', 3));
|
||||
|
||||
return $this->renderTaskList($taskRepository, $taskRecommendationService, $batteryLevel, $this->selectedDate($request));
|
||||
return $this->renderTaskList($taskSchedulingService, $taskRecommendationService, $batteryLevel, $this->selectedDate($request));
|
||||
}
|
||||
|
||||
#[Route('/{id}/snooze', name: 'app_task_snooze', methods: ['POST'])]
|
||||
public function snooze(Request $request, Task $task, TaskDeferralService $taskDeferralService, EntityManagerInterface $entityManager, TaskSchedulingService $taskSchedulingService, TaskRecommendationService $taskRecommendationService): Response
|
||||
{
|
||||
if (!$this->isCsrfTokenValid('snooze' . $task->getId(), $request->getPayload()->getString('_token'))) {
|
||||
throw $this->createAccessDeniedException('Invalid CSRF token.');
|
||||
}
|
||||
|
||||
$selectedDate = $this->selectedDate($request);
|
||||
$choice = $request->getPayload()->getString('snooze');
|
||||
$until = match ($choice) {
|
||||
'tomorrow' => $selectedDate->modify('+1 day'),
|
||||
'two_days' => $selectedDate->modify('+2 days'),
|
||||
'week' => $selectedDate->modify('+1 week'),
|
||||
'custom' => \DateTimeImmutable::createFromFormat('!Y-m-d', $request->getPayload()->getString('custom_date')),
|
||||
default => false,
|
||||
};
|
||||
|
||||
if (!$until instanceof \DateTimeImmutable || $until <= $selectedDate) {
|
||||
throw new \Symfony\Component\HttpKernel\Exception\BadRequestHttpException('Choose a future snooze date.');
|
||||
}
|
||||
|
||||
$taskDeferralService->deferUntil($task, $until, TaskDeferralService::SOURCE_MANUAL);
|
||||
$task->setUpdatedAt(new \DateTimeImmutable());
|
||||
$entityManager->flush();
|
||||
|
||||
$batteryLevel = $taskRecommendationService->normaliseBatteryLevel($request->getSession()->get('social_battery', 3));
|
||||
|
||||
return $this->renderTaskList($taskSchedulingService, $taskRecommendationService, $batteryLevel, $selectedDate);
|
||||
}
|
||||
|
||||
|
||||
#[Route('/{id}', name: 'app_task_delete', methods: ['POST'])]
|
||||
public function delete(Request $request, Task $task, EntityManagerInterface $entityManager): Response
|
||||
{
|
||||
@@ -148,18 +183,18 @@ final class TaskController extends AbstractController
|
||||
return $this->redirectToRoute('app_task_index', [], Response::HTTP_SEE_OTHER);
|
||||
}
|
||||
|
||||
private function renderTaskList(TaskRepository $taskRepository, TaskRecommendationService $taskRecommendationService, int $batteryLevel, \DateTimeImmutable $selectedDate): Response
|
||||
private function renderTaskList(TaskSchedulingService $taskSchedulingService, TaskRecommendationService $taskRecommendationService, int $batteryLevel, \DateTimeImmutable $selectedDate): Response
|
||||
{
|
||||
return $this->render('task/_task_list.html.twig', [
|
||||
'tasks' => $taskRecommendationService->sort($taskRepository->findAll(), $batteryLevel, $selectedDate),
|
||||
'tasks' => $taskSchedulingService->tasksForDate($batteryLevel, $selectedDate, $this->currentSettings()),
|
||||
'selected_date' => $selectedDate,
|
||||
]);
|
||||
}
|
||||
|
||||
private function renderTaskRecommendations(TaskRepository $taskRepository, TaskRecommendationService $taskRecommendationService, int $batteryLevel, \DateTimeImmutable $selectedDate): Response
|
||||
private function renderTaskRecommendations(TaskSchedulingService $taskSchedulingService, TaskRecommendationService $taskRecommendationService, int $batteryLevel, \DateTimeImmutable $selectedDate): Response
|
||||
{
|
||||
return $this->render('task/_task_recommendations.html.twig', [
|
||||
'tasks' => $taskRecommendationService->sort($taskRepository->findAll(), $batteryLevel, $selectedDate),
|
||||
'tasks' => $taskSchedulingService->tasksForDate($batteryLevel, $selectedDate, $this->currentSettings()),
|
||||
'battery_level' => $batteryLevel,
|
||||
'battery_budget' => $taskRecommendationService->budgetFor($batteryLevel),
|
||||
'selected_date' => $selectedDate,
|
||||
@@ -204,11 +239,13 @@ final class TaskController extends AbstractController
|
||||
return $this->redirectToRoute('app_task_index');
|
||||
}
|
||||
|
||||
public function getUserSetting(string $label): Settings{
|
||||
public function getUserSetting(string $label): Settings
|
||||
{
|
||||
$user = $this->getUser();
|
||||
$settings = $user->getSettings();
|
||||
|
||||
return $settings;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user