From 2324976bd66507bbd2cb70c4acda4e5760d62b13 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 29 Oct 2023 09:47:57 +0100 Subject: [PATCH 1/2] Register Forgotten Activities --- backend/.idea/workspace.xml | 26 ++++- .../api/controller/ScheduleController.java | 19 ++++ .../core/api/controller/TaskController.java | 22 +++++ .../taskSchedule/ForgottenActivity.java | 22 +++++ .../taskSchedule/ForgottenActivityMode.java | 8 ++ .../timemanager/tasks/TaskShortInfo.java | 5 + .../java/core/entities/timemanager/Task.java | 4 + .../core/entities/timemanager/Taskgroup.java | 1 + .../BasicTaskScheduleRepository.java | 3 + .../timemanager/TaskRepository.java | 4 + .../core/services/TaskScheduleService.java | 53 +++++++++++ .../main/java/core/services/TaskService.java | 4 + frontend/src/api/.openapi-generator/FILES | 1 + frontend/src/api/api/schedule.service.ts | 71 ++++++++++++++ frontend/src/api/api/task.service.ts | 60 ++++++++++++ .../src/api/model/forgottenActivityRequest.ts | 33 +++++++ frontend/src/api/model/models.ts | 1 + frontend/src/app/app.module.ts | 78 +++++++-------- .../active-schedule.component.html | 2 +- .../active-schedule.component.ts | 16 +++- .../app/dashboard/dashboard.component.html | 2 +- .../src/app/dashboard/dashboard.component.ts | 12 ++- .../forgotten-task-start-dialog.component.css | 4 + ...forgotten-task-start-dialog.component.html | 31 ++++++ ...gotten-task-start-dialog.component.spec.ts | 21 ++++ .../forgotten-task-start-dialog.component.ts | 80 ++++++++++++++++ openapi.yaml | 95 ++++++++++++++++++- 27 files changed, 629 insertions(+), 49 deletions(-) create mode 100644 backend/src/main/java/core/api/models/timemanager/taskSchedule/ForgottenActivity.java create mode 100644 backend/src/main/java/core/api/models/timemanager/taskSchedule/ForgottenActivityMode.java create mode 100644 frontend/src/api/model/forgottenActivityRequest.ts create mode 100644 frontend/src/app/dashboard/forgotten-task-start-dialog/forgotten-task-start-dialog.component.css create mode 100644 frontend/src/app/dashboard/forgotten-task-start-dialog/forgotten-task-start-dialog.component.html create mode 100644 frontend/src/app/dashboard/forgotten-task-start-dialog/forgotten-task-start-dialog.component.spec.ts create mode 100644 frontend/src/app/dashboard/forgotten-task-start-dialog/forgotten-task-start-dialog.component.ts diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml index c7a54fb..93cfbcd 100644 --- a/backend/.idea/workspace.xml +++ b/backend/.idea/workspace.xml @@ -5,8 +5,23 @@ + + + + + + + + + + + + + + +