From 8406c60182026a033a14bfa4ee4055a251b6e3ae Mon Sep 17 00:00:00 2001 From: Joren de Graaf Date: Tue, 11 Aug 2026 02:07:27 +0200 Subject: [PATCH] add social battery sorting engine --- assets/styles/app.scss | 72 +++++++++++++++++++ src/Controller/TaskController.php | 46 ++++++++++-- src/Service/TaskRecommendationService.php | 70 ++++++++++++++++++ templates/task/_task_item.html.twig | 2 +- templates/task/_task_list.html.twig | 7 ++ .../task/_task_recommendations.html.twig | 39 ++++++++++ templates/task/index.html.twig | 12 ++-- 7 files changed, 234 insertions(+), 14 deletions(-) create mode 100644 src/Service/TaskRecommendationService.php create mode 100644 templates/task/_task_list.html.twig create mode 100644 templates/task/_task_recommendations.html.twig diff --git a/assets/styles/app.scss b/assets/styles/app.scss index 71e178f..3ddc605 100644 --- a/assets/styles/app.scss +++ b/assets/styles/app.scss @@ -44,6 +44,78 @@ body { list-style: none; } +.social-battery { + display: flex; + align-items: center; + justify-content: space-between; + gap: 1.5rem; + padding: 1rem; + margin-bottom: 1.5rem; + color: #07384d; + background: #d9f4ff; + border-radius: 1rem; +} + +.social-battery h2, +.social-battery p { + margin: 0; +} + +.social-battery p { + margin-top: .25rem; +} + +.social-battery__levels { + display: flex; + gap: .25rem; +} + +.social-battery__input { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + white-space: nowrap; + border: 0; +} + +.social-battery__levels label { + display: grid; + place-items: center; + width: 2.25rem; + height: 2.25rem; + cursor: pointer; + color: #4f7280; + border-radius: .5rem; + transition: color .15s ease, background-color .15s ease, transform .15s ease; +} + +.social-battery__levels label:hover { + color: #07384d; + background: #fff; + transform: translateY(-2px); +} + +.social-battery__input:checked + label { + color: #fff; + background: #087aa9; +} + +.social-battery__input:focus-visible + label { + outline: 3px solid #07384d; + outline-offset: 2px; +} + +@media (max-width: 640px) { + .social-battery { + align-items: flex-start; + flex-direction: column; + } +} + .task-list__item form { display: flex; align-items: center; diff --git a/src/Controller/TaskController.php b/src/Controller/TaskController.php index aa38513..65c55e3 100644 --- a/src/Controller/TaskController.php +++ b/src/Controller/TaskController.php @@ -5,6 +5,7 @@ namespace App\Controller; use App\Entity\Task; use App\Form\TaskType; use App\Repository\TaskRepository; +use App\Service\TaskRecommendationService; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -15,13 +16,30 @@ use Symfony\Component\Routing\Attribute\Route; final class TaskController extends AbstractController { #[Route(name: 'app_task_index', methods: ['GET'])] - public function index(TaskRepository $taskRepository): Response + public function index(Request $request, TaskRepository $taskRepository, TaskRecommendationService $taskRecommendationService): Response { + $batteryLevel = $taskRecommendationService->normaliseBatteryLevel($request->getSession()->get('social_battery', 3)); + return $this->render('task/index.html.twig', [ - 'tasks' => $taskRepository->findAll(), + 'tasks' => $taskRecommendationService->sort($taskRepository->findAll(), $batteryLevel), + 'battery_level' => $batteryLevel, + 'battery_budget' => $taskRecommendationService->budgetFor($batteryLevel), ]); } + #[Route('/social-battery', name: 'app_task_social_battery', methods: ['POST'])] + public function socialBattery(Request $request, TaskRepository $taskRepository, TaskRecommendationService $taskRecommendationService): Response + { + if (!$this->isCsrfTokenValid('social_battery', $request->getPayload()->getString('_token'))) { + throw $this->createAccessDeniedException('Invalid CSRF token.'); + } + + $batteryLevel = $taskRecommendationService->normaliseBatteryLevel($request->getPayload()->getInt('social_battery')); + $request->getSession()->set('social_battery', $batteryLevel); + + return $this->renderTaskRecommendations($taskRepository, $taskRecommendationService, $batteryLevel); + } + #[Route('/new', name: 'app_task_new', methods: ['GET', 'POST'])] public function new(Request $request, EntityManagerInterface $entityManager): Response { @@ -69,7 +87,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): Response + public function toggleCompletion(Request $request, Task $task, EntityManagerInterface $entityManager, TaskRepository $taskRepository, TaskRecommendationService $taskRecommendationService): Response { if (!$this->isCsrfTokenValid('completion'.$task->getId(), $request->getPayload()->getString('_token'))) { throw $this->createAccessDeniedException('Invalid CSRF token.'); @@ -81,9 +99,9 @@ final class TaskController extends AbstractController ->setUpdatedAt(new \DateTimeImmutable()); $entityManager->flush(); - return $this->render('task/_task_item.html.twig', [ - 'task' => $task, - ]); + $batteryLevel = $taskRecommendationService->normaliseBatteryLevel($request->getSession()->get('social_battery', 3)); + + return $this->renderTaskList($taskRepository, $taskRecommendationService, $batteryLevel); } #[Route('/{id}', name: 'app_task_delete', methods: ['POST'])] @@ -96,4 +114,20 @@ final class TaskController extends AbstractController return $this->redirectToRoute('app_task_index', [], Response::HTTP_SEE_OTHER); } + + private function renderTaskList(TaskRepository $taskRepository, TaskRecommendationService $taskRecommendationService, int $batteryLevel): Response + { + return $this->render('task/_task_list.html.twig', [ + 'tasks' => $taskRecommendationService->sort($taskRepository->findAll(), $batteryLevel), + ]); + } + + private function renderTaskRecommendations(TaskRepository $taskRepository, TaskRecommendationService $taskRecommendationService, int $batteryLevel): Response + { + return $this->render('task/_task_recommendations.html.twig', [ + 'tasks' => $taskRecommendationService->sort($taskRepository->findAll(), $batteryLevel), + 'battery_level' => $batteryLevel, + 'battery_budget' => $taskRecommendationService->budgetFor($batteryLevel), + ]); + } } diff --git a/src/Service/TaskRecommendationService.php b/src/Service/TaskRecommendationService.php new file mode 100644 index 0000000..a42b4ef --- /dev/null +++ b/src/Service/TaskRecommendationService.php @@ -0,0 +1,70 @@ + */ + private const ENERGY_BUDGET_MINUTES = [ + 1 => 15, + 2 => 30, + 3 => 60, + 4 => 90, + 5 => 180, + ]; + + public function normaliseBatteryLevel(int $batteryLevel): int + { + return max(1, min(5, $batteryLevel)); + } + + public function budgetFor(int $batteryLevel): int + { + return self::ENERGY_BUDGET_MINUTES[$this->normaliseBatteryLevel($batteryLevel)]; + } + + /** + * @param Task[] $tasks + * + * @return Task[] Active tasks that fit the selected energy budget are first. + */ + public function sort(array $tasks, int $batteryLevel): array + { + $batteryLevel = $this->normaliseBatteryLevel($batteryLevel); + $budget = $this->budgetFor($batteryLevel); + + usort($tasks, function (Task $left, Task $right) use ($batteryLevel, $budget): int { + return $this->sortKey($left, $batteryLevel, $budget) <=> $this->sortKey($right, $batteryLevel, $budget); + }); + + return $tasks; + } + + /** @return array */ + private function sortKey(Task $task, int $batteryLevel, int $budget): array + { + $duration = $task->getEstimatedDurationMinutes(); + $hasDuration = null !== $duration; + $duration ??= PHP_INT_MAX; + $fitsBudget = $hasDuration && $duration <= $budget; + + // Low-energy days start with the smallest task. With more energy, + // prefer a task that makes good use of the available time budget. + $durationScore = $batteryLevel <= 2 ? $duration : abs($budget - $duration); + + return [ + $task->isActive() ? 0 : 1, + $hasDuration ? 0 : 1, + $fitsBudget ? 0 : 1, + $durationScore, + $duration, + strtolower($task->getTitle() ?? ''), + ]; + } +} diff --git a/templates/task/_task_item.html.twig b/templates/task/_task_item.html.twig index 06ea323..365dc04 100644 --- a/templates/task/_task_item.html.twig +++ b/templates/task/_task_item.html.twig @@ -11,7 +11,7 @@ aria-label="Mark {{ task.title }} as {{ task.isActive ? 'completed' : 'active' }}" hx-post="{{ path('app_task_toggle_completion', {'id': task.id}) }}" hx-include="closest form" - hx-target="closest .task-list__item" + hx-target="closest .task-list" hx-swap="outerHTML" >