diff --git a/assets/styles/app.scss b/assets/styles/app.scss index d77e683..87e39fa 100644 --- a/assets/styles/app.scss +++ b/assets/styles/app.scss @@ -540,4 +540,27 @@ header { .weather-refresh { box-shadow: unset; border: unset; +} +.user { + border-radius: 100%; + height: 50px; + width: 50px; + background-color: #fff; + border-color: #aaa; + display: flex; + align-items: center; + justify-content: center; + text-transform: uppercase; + color: #000; + font-weight: 700; + font-size: 1.6em; + line-height: 1; + // temporary? + position: fixed; + top: 50px; + right: 50px; + &:visited, + &:focus { + color: inherit; + } } \ No newline at end of file diff --git a/migrations/Version20260825212706.php b/migrations/Version20260825212706.php new file mode 100644 index 0000000..4cf8626 --- /dev/null +++ b/migrations/Version20260825212706.php @@ -0,0 +1,31 @@ +addSql('ALTER TABLE user ADD username VARCHAR(255) NOT NULL'); + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('ALTER TABLE `user` DROP username'); + } +} diff --git a/migrations/Version20260825213158.php b/migrations/Version20260825213158.php new file mode 100644 index 0000000..9029d90 --- /dev/null +++ b/migrations/Version20260825213158.php @@ -0,0 +1,31 @@ +addSql('ALTER TABLE user CHANGE username username VARCHAR(255) DEFAULT NULL'); + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('ALTER TABLE `user` CHANGE username username VARCHAR(255) NOT NULL'); + } +} diff --git a/migrations/Version20260907120000.php b/migrations/Version20260907120000.php new file mode 100644 index 0000000..70bec99 --- /dev/null +++ b/migrations/Version20260907120000.php @@ -0,0 +1,51 @@ +connection->getDatabasePlatform() instanceof PostgreSQLPlatform) { + $this->addSql('ALTER TABLE task ADD required_on_sick_day BOOLEAN NOT NULL DEFAULT FALSE'); + $this->addSql('ALTER TABLE task ADD defer_days INT DEFAULT NULL'); + $this->addSql('ALTER TABLE task ADD deferred_until DATE DEFAULT NULL'); + $this->addSql('ALTER TABLE task ADD deferral_source VARCHAR(20) DEFAULT NULL'); + $this->addSql('ALTER TABLE settings ADD sick_mode_enabled BOOLEAN NOT NULL DEFAULT FALSE'); + $this->addSql('ALTER TABLE settings ADD sick_until DATE DEFAULT NULL'); + + return; + } + + $this->addSql('ALTER TABLE task ADD required_on_sick_day TINYINT(1) NOT NULL DEFAULT 0, ADD defer_days INT DEFAULT NULL, ADD deferred_until DATE DEFAULT NULL, ADD deferral_source VARCHAR(20) DEFAULT NULL'); + $this->addSql('ALTER TABLE settings ADD sick_mode_enabled TINYINT(1) NOT NULL DEFAULT 0, ADD sick_until DATE DEFAULT NULL'); + } + + public function down(Schema $schema): void + { + if ($this->connection->getDatabasePlatform() instanceof PostgreSQLPlatform) { + $this->addSql('ALTER TABLE task DROP required_on_sick_day'); + $this->addSql('ALTER TABLE task DROP defer_days'); + $this->addSql('ALTER TABLE task DROP deferred_until'); + $this->addSql('ALTER TABLE task DROP deferral_source'); + $this->addSql('ALTER TABLE settings DROP sick_mode_enabled'); + $this->addSql('ALTER TABLE settings DROP sick_until'); + + return; + } + + $this->addSql('ALTER TABLE task DROP required_on_sick_day, DROP defer_days, DROP deferred_until, DROP deferral_source'); + $this->addSql('ALTER TABLE settings DROP sick_mode_enabled, DROP sick_until'); + } +} diff --git a/src/Controller/TaskController.php b/src/Controller/TaskController.php index a557430..6de3a7b 100644 --- a/src/Controller/TaskController.php +++ b/src/Controller/TaskController.php @@ -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; } + } diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php new file mode 100644 index 0000000..6a5e8a0 --- /dev/null +++ b/src/Controller/UserController.php @@ -0,0 +1,81 @@ +render('user/index.html.twig', [ + 'users' => $userRepository->findAll(), + ]); + } + + #[Route('/new', name: 'app_user_new', methods: ['GET', 'POST'])] + public function new(Request $request, EntityManagerInterface $entityManager): Response + { + $user = new User(); + $form = $this->createForm(UserType::class, $user); + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + $entityManager->persist($user); + $entityManager->flush(); + + return $this->redirectToRoute('app_user_index', [], Response::HTTP_SEE_OTHER); + } + + return $this->render('user/new.html.twig', [ + 'user' => $user, + 'form' => $form, + ]); + } + + #[Route('/{id}', name: 'app_user_show', methods: ['GET'])] + public function show(User $user): Response + { + return $this->render('user/show.html.twig', [ + 'user' => $user, + ]); + } + + #[Route('/{id}/edit', name: 'app_user_edit', methods: ['GET', 'POST'])] + public function edit(Request $request, User $user, EntityManagerInterface $entityManager): Response + { + $form = $this->createForm(UserType::class, $user); + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + $entityManager->flush(); + + return $this->redirectToRoute('app_user_index', [], Response::HTTP_SEE_OTHER); + } + + return $this->render('user/edit.html.twig', [ + 'user' => $user, + 'form' => $form, + ]); + } + + #[Route('/{id}', name: 'app_user_delete', methods: ['POST'])] + public function delete(Request $request, User $user, EntityManagerInterface $entityManager): Response + { + if ($this->isCsrfTokenValid('delete'.$user->getId(), $request->getPayload()->getString('_token'))) { + $entityManager->remove($user); + $entityManager->flush(); + } + + return $this->redirectToRoute('app_user_index', [], Response::HTTP_SEE_OTHER); + } +} diff --git a/src/Controller/UserSettingController.php b/src/Controller/UserSettingController.php index 2a7a3de..64522e8 100644 --- a/src/Controller/UserSettingController.php +++ b/src/Controller/UserSettingController.php @@ -2,80 +2,48 @@ namespace App\Controller; -use App\Entity\UserSetting; -use App\Form\UserSetting1Type; -use App\Repository\UserSettingRepository; +use App\Entity\Settings; +use App\Entity\User; +use App\Form\SettingsType; +use App\Service\SickDayService; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Attribute\Route; -#[Route('/user/settings')] +#[Route('/settings')] final class UserSettingController extends AbstractController { - #[Route(name: 'app_user_settings_index', methods: ['GET'])] - public function index(UserSettingRepository $UserSettingRepository): Response + #[Route(name: 'app_settings', methods: ['GET', 'POST'])] + public function index(Request $request, EntityManagerInterface $entityManager, SickDayService $sickDays): Response { - return $this->render('user_settings/index.html.twig', [ - 'user_settings' => $UserSettingRepository->findAll(), - ]); - } - - #[Route('/new', name: 'app_user_settings_new', methods: ['GET', 'POST'])] - public function new(Request $request, EntityManagerInterface $entityManager): Response - { - $userSetting = new UserSetting(); - $form = $this->createForm(UserSetting1Type::class, $userSetting); - $form->handleRequest($request); - - if ($form->isSubmitted() && $form->isValid()) { - $entityManager->persist($userSetting); - $entityManager->flush(); - - return $this->redirectToRoute('app_user_settings_index', [], Response::HTTP_SEE_OTHER); + $user = $this->getUser(); + if (!$user instanceof User) { + throw $this->createAccessDeniedException(); } - return $this->render('user_settings/new.html.twig', [ - 'user_setting' => $userSetting, - 'form' => $form, - ]); - } + $settings = $user->getSettings(); + if (null === $settings) { + $settings = (new Settings())->setUser($user); + $user->setSettings($settings); + $entityManager->persist($settings); + $entityManager->flush(); + } - #[Route('/{id}', name: 'app_user_settings_show', methods: ['GET'])] - public function show(UserSetting $userSetting): Response - { - return $this->render('user_settings/show.html.twig', [ - 'user_setting' => $userSetting, - ]); - } - - #[Route('/{id}/edit', name: 'app_user_settings_edit', methods: ['GET', 'POST'])] - public function edit(Request $request, UserSetting $userSetting, EntityManagerInterface $entityManager): Response - { - $form = $this->createForm(UserSetting1Type::class, $userSetting); + $form = $this->createForm(SettingsType::class, $settings); $form->handleRequest($request); - if ($form->isSubmitted() && $form->isValid()) { $entityManager->flush(); + $sickDays->syncStoredDeferrals($settings); - return $this->redirectToRoute('app_user_settings_index', [], Response::HTTP_SEE_OTHER); + return $this->redirectToRoute('app_settings', [], Response::HTTP_SEE_OTHER); } - return $this->render('user_settings/edit.html.twig', [ - 'user_setting' => $userSetting, + return $this->render('settings/index.html.twig', [ 'form' => $form, + 'settings' => $settings, + 'today' => new \DateTimeImmutable('today'), ]); } - - #[Route('/{id}', name: 'app_user_settings_delete', methods: ['POST'])] - public function delete(Request $request, UserSetting $userSetting, EntityManagerInterface $entityManager): Response - { - if ($this->isCsrfTokenValid('delete'.$userSetting->getId(), $request->getPayload()->getString('_token'))) { - $entityManager->remove($userSetting); - $entityManager->flush(); - } - - return $this->redirectToRoute('app_user_settings_index', [], Response::HTTP_SEE_OTHER); - } } diff --git a/src/Entity/Settings.php b/src/Entity/Settings.php index 65d22f4..9a2732e 100644 --- a/src/Entity/Settings.php +++ b/src/Entity/Settings.php @@ -3,6 +3,7 @@ namespace App\Entity; use App\Repository\SettingsRepository; +use Doctrine\DBAL\Types\Types; use Doctrine\ORM\Mapping as ORM; #[ORM\Entity(repositoryClass: SettingsRepository::class)] @@ -26,6 +27,12 @@ class Settings #[ORM\Column(nullable: true)] private ?\DateTimeImmutable $locationUpdatedAt = null; + #[ORM\Column(options: ['default' => false])] + private bool $sickModeEnabled = false; + + #[ORM\Column(type: Types::DATE_IMMUTABLE, nullable: true)] + private ?\DateTimeImmutable $sickUntil = null; + public function getId(): ?int { return $this->id; } public function getUser(): ?User { return $this->user; } public function setUser(User $user): static { $this->user = $user; return $this; } @@ -46,4 +53,33 @@ class Settings { return null !== $this->latitude && null !== $this->longitude; } + + public function isSickModeEnabled(): bool + { + return $this->sickModeEnabled; + } + + public function setSickModeEnabled(bool $sickModeEnabled): static + { + $this->sickModeEnabled = $sickModeEnabled; + + return $this; + } + + public function getSickUntil(): ?\DateTimeImmutable + { + return $this->sickUntil; + } + + public function setSickUntil(?\DateTimeImmutable $sickUntil): static + { + $this->sickUntil = $sickUntil?->setTime(0, 0); + + return $this; + } + + public function isSickOn(\DateTimeImmutable $date): bool + { + return $this->sickModeEnabled && (null === $this->sickUntil || $date->setTime(0, 0) <= $this->sickUntil); + } } diff --git a/src/Entity/Task.php b/src/Entity/Task.php index d2defcc..cf0825d 100644 --- a/src/Entity/Task.php +++ b/src/Entity/Task.php @@ -5,6 +5,7 @@ namespace App\Entity; use App\Repository\TaskRepository; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; #[ORM\Entity(repositoryClass: TaskRepository::class)] class Task @@ -53,6 +54,19 @@ class Task #[ORM\Column(length: 30)] private ?string $weatherProfile = 'none'; + #[ORM\Column(options: ['default' => false])] + private bool $requiredOnSickDay = false; + + #[ORM\Column(nullable: true)] + #[Assert\Positive] + private ?int $deferDays = null; + + #[ORM\Column(type: Types::DATE_IMMUTABLE, nullable: true)] + private ?\DateTimeImmutable $deferredUntil = null; + + #[ORM\Column(length: 20, nullable: true)] + private ?string $deferralSource = null; + #[ORM\Column] private ?\DateTimeImmutable $updatedAt = null; @@ -213,6 +227,55 @@ class Task return $this; } + + public function isRequiredOnSickDay(): bool + { + return $this->requiredOnSickDay; + } + + public function setRequiredOnSickDay(bool $requiredOnSickDay): static + { + $this->requiredOnSickDay = $requiredOnSickDay; + + return $this; + } + + public function getDeferDays(): ?int + { + return $this->deferDays; + } + + public function setDeferDays(?int $deferDays): static + { + $this->deferDays = $deferDays; + + return $this; + } + + public function getDeferredUntil(): ?\DateTimeImmutable + { + return $this->deferredUntil; + } + + public function setDeferredUntil(?\DateTimeImmutable $deferredUntil): static + { + $this->deferredUntil = $deferredUntil?->setTime(0, 0); + + return $this; + } + + public function getDeferralSource(): ?string + { + return $this->deferralSource; + } + + public function setDeferralSource(?string $deferralSource): static + { + $this->deferralSource = $deferralSource; + + return $this; + } + public function setRecurrenceUnit(?string $recurrenceUnit): static { $this->recurrenceUnit = $recurrenceUnit; diff --git a/src/Entity/User.php b/src/Entity/User.php index d49516c..8d5f54a 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -43,6 +43,9 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface #[ORM\OneToMany(targetEntity: UserSetting::class, mappedBy: 'user_id', orphanRemoval: true)] private Collection $UserSetting; + #[ORM\Column(length: 255, nullable: true)] + private ?string $username = null; + public function __construct() { $this->UserSetting = new ArrayCollection(); @@ -171,4 +174,16 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface return $this; } + + public function getUsername(): ?string + { + return $this->username; + } + + public function setUsername(string $username): static + { + $this->username = $username; + + return $this; + } } diff --git a/src/Form/SettingsType.php b/src/Form/SettingsType.php new file mode 100644 index 0000000..d20d704 --- /dev/null +++ b/src/Form/SettingsType.php @@ -0,0 +1,34 @@ +add('sickModeEnabled', CheckboxType::class, [ + 'label' => 'Sick Day Mode', + 'required' => false, + ]) + ->add('sickUntil', DateType::class, [ + 'label' => 'Expected recovery date', + 'widget' => 'single_text', + 'input' => 'datetime_immutable', + 'required' => false, + 'help' => 'Optional. Sick Day Mode stays active until you turn it off when this is blank.', + ]); + } + + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults(['data_class' => Settings::class]); + } +} diff --git a/src/Form/TaskType.php b/src/Form/TaskType.php index 7682182..63892a1 100644 --- a/src/Form/TaskType.php +++ b/src/Form/TaskType.php @@ -41,6 +41,16 @@ class TaskType extends AbstractType 'required' => false, 'attr' => ['placeholder' => 'e.g. Home'], ]) + ->add('requiredOnSickDay', CheckboxType::class, [ + 'label' => 'Required on sick days', + 'required' => false, + ]) + ->add('deferDays', IntegerType::class, [ + 'label' => 'Automatically defer missed tasks by (days)', + 'required' => false, + 'attr' => ['min' => 1, 'placeholder' => 'Optional'], + 'help' => 'Used when automatic missed-task deferral is enabled.', + ]) ->add('isOutdoor', CheckboxType::class, [ 'label' => 'Outdoor task', 'required' => false, diff --git a/src/Form/UserType.php b/src/Form/UserType.php new file mode 100644 index 0000000..07695a3 --- /dev/null +++ b/src/Form/UserType.php @@ -0,0 +1,34 @@ +add('email') + ->add('roles') + ->add('password') + ->add('username') + ->add('settings', EntityType::class, [ + 'class' => Settings::class, + 'choice_label' => 'id', + ]) + ; + } + + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults([ + 'data_class' => User::class, + ]); + } +} diff --git a/src/Service/SickDayService.php b/src/Service/SickDayService.php new file mode 100644 index 0000000..856f469 --- /dev/null +++ b/src/Service/SickDayService.php @@ -0,0 +1,87 @@ +isSickOn($selectedDate)) { + return; + } + + // With no recovery estimate, the date advances only as the user views + // dates. Disabling the mode therefore immediately restores eligibility. + $returnDate = (null === $settings->getSickUntil() ? $selectedDate : $settings->getSickUntil()) + ->modify('+1 day') + ->setTime(0, 0); + $changed = false; + + foreach ($tasks as $task) { + if (!$task->isActive()) { + continue; + } + + if ($task->isRequiredOnSickDay()) { + if (TaskDeferralService::SOURCE_SICK_DAY === $task->getDeferralSource()) { + $this->deferrals->clearDeferral($task); + $changed = true; + } + + continue; + } + + if (!$this->recommendations->isNormallyScheduledFor($task, $selectedDate)) { + continue; + } + + $changed = $this->deferrals->replaceSickDayDeferral($task, $returnDate) || $changed; + } + + if ($changed) { + $this->entityManager->flush(); + } + } + + /** + * Changing or disabling Sick Day Mode should affect only its own deferrals. + */ + public function syncStoredDeferrals(Settings $settings): void + { + $tasks = $this->tasks->findBy(['deferralSource' => TaskDeferralService::SOURCE_SICK_DAY]); + $changed = false; + + foreach ($tasks as $task) { + if (!$settings->isSickModeEnabled()) { + $this->deferrals->clearDeferral($task); + $changed = true; + continue; + } + + if (null !== $settings->getSickUntil()) { + $changed = $this->deferrals->replaceSickDayDeferral($task, $settings->getSickUntil()->modify('+1 day')) || $changed; + } + } + + if ($changed) { + $this->entityManager->flush(); + } + } +} diff --git a/src/Service/TaskDeferralService.php b/src/Service/TaskDeferralService.php new file mode 100644 index 0000000..a75d986 --- /dev/null +++ b/src/Service/TaskDeferralService.php @@ -0,0 +1,108 @@ +setTime(0, 0); + $current = $task->getDeferredUntil(); + + if (null !== $current && $current >= $until) { + return false; + } + + $task + ->setDeferredUntil($until) + ->setDeferralSource($source); + + return true; + } + + public function deferByDays(Task $task, int $days, ?string $source = null, ?\DateTimeImmutable $from = null): bool + { + if ($days < 1) { + throw new \InvalidArgumentException('A task must be deferred by at least one day.'); + } + + $from ??= new \DateTimeImmutable('today'); + + return $this->deferUntil($task, $from->setTime(0, 0)->modify(sprintf('+%d days', $days)), $source); + } + + /** + * Updating the recovery estimate may move only a Sick Day deferral earlier. + * A manual (or future) deferral is never shortened by Sick Day Mode. + */ + public function replaceSickDayDeferral(Task $task, \DateTimeImmutable $until): bool + { + $until = $until->setTime(0, 0); + if (self::SOURCE_SICK_DAY !== $task->getDeferralSource()) { + return $this->deferUntil($task, $until, self::SOURCE_SICK_DAY); + } + + if ($task->getDeferredUntil()?->format('Y-m-d') === $until->format('Y-m-d')) { + return false; + } + + $task->setDeferredUntil($until); + + return true; + } + + public function clearDeferral(Task $task): void + { + $task + ->setDeferredUntil(null) + ->setDeferralSource(null); + } + + /** + * @param Task[] $tasks + */ + public function deferMissedTasks(array $tasks, \DateTimeImmutable $selectedDate): void + { + $changed = false; + $selectedDate = $selectedDate->setTime(0, 0); + + foreach ($tasks as $task) { + $scheduledFor = $task->getScheduledFor(); + $deferDays = $task->getDeferDays(); + + // Recurring tasks already have a future occurrence owned by their + // recurrence rule. Do not manufacture a second catch-up occurrence. + if (!$task->isActive() || $task->isRecurring() || null === $scheduledFor || null === $deferDays + || $scheduledFor >= $selectedDate || self::SOURCE_MISSED === $task->getDeferralSource()) { + continue; + } + + $changed = $this->deferByDays($task, $deferDays, self::SOURCE_MISSED, $selectedDate) || $changed; + } + + if ($changed) { + $this->entityManager->flush(); + } + } + + public function isDeferred(Task $task, ?\DateTimeImmutable $on = null): bool + { + $on ??= new \DateTimeImmutable('today'); + + return null !== $task->getDeferredUntil() && $on->setTime(0, 0) < $task->getDeferredUntil(); + } +} diff --git a/src/Service/TaskRecommendationService.php b/src/Service/TaskRecommendationService.php index ae7841a..94f86e1 100644 --- a/src/Service/TaskRecommendationService.php +++ b/src/Service/TaskRecommendationService.php @@ -54,8 +54,9 @@ final class TaskRecommendationService $selectedDate = $selectedDate->setTime(0, 0); $tasks = array_values(array_filter( $tasks, - fn (Task $task): bool => $this->isScheduledFor($task, $selectedDate) - || $this->weatherEvaluator->shouldCarryForward($task, $selectedDate, $previousForecast, $forecast), + fn (Task $task): bool => !$this->isDeferredOn($task, $selectedDate) + && ($this->isScheduledFor($task, $selectedDate) + || $this->weatherEvaluator->shouldCarryForward($task, $selectedDate, $previousForecast, $forecast)), )); @@ -68,6 +69,18 @@ final class TaskRecommendationService public function isScheduledFor(Task $task, \DateTimeImmutable $selectedDate): bool { + $selectedDate = $selectedDate->setTime(0, 0); + $deferredUntil = $task->getDeferredUntil(); + if (null !== $deferredUntil && $selectedDate->format('Y-m-d') === $deferredUntil->format('Y-m-d')) { + return true; + } + + return $this->isNormallyScheduledFor($task, $selectedDate); + } + + public function isNormallyScheduledFor(Task $task, \DateTimeImmutable $selectedDate): bool + { + $selectedDate = $selectedDate->setTime(0, 0); $scheduledFor = $task->getScheduledFor(); if (null === $scheduledFor || $selectedDate < $scheduledFor) { return false; @@ -90,6 +103,13 @@ final class TaskRecommendationService }; } + public function isDeferredOn(Task $task, \DateTimeImmutable $date): bool + { + $deferredUntil = $task->getDeferredUntil(); + + return null !== $deferredUntil && $date->setTime(0, 0) < $deferredUntil; + } + private function isMonthlyOccurrence(\DateTimeImmutable $scheduledFor, \DateTimeImmutable $selectedDate, int $interval): bool { $monthsApart = ((int) $selectedDate->format('Y') - (int) $scheduledFor->format('Y')) * 12 diff --git a/src/Service/TaskSchedulingService.php b/src/Service/TaskSchedulingService.php new file mode 100644 index 0000000..c5995cf --- /dev/null +++ b/src/Service/TaskSchedulingService.php @@ -0,0 +1,32 @@ +tasks->findAll(); + + $this->deferrals->deferMissedTasks($tasks, $selectedDate); + $this->sickDays->applyForDate($tasks, $settings, $selectedDate); + + return $this->recommendations->sort($tasks, $batteryLevel, $selectedDate, $settings); + } +} diff --git a/templates/base.html.twig b/templates/base.html.twig index 249ec53..da9d5b9 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -20,7 +20,13 @@ {% endif %}
-
TaskNest  }})
TaskNest
+ {% if app.user %}
+ Settings
+ {% endif %}
+
+