From 673faa5912be7ed3af564d35316a8c477d5a9dd8 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 26 Oct 2023 10:21:29 +0200 Subject: [PATCH 1/5] First Approach to visualize nested taskgroups --- frontend/src/app/dashboard/dashboard.component.html | 13 ++++++++++++- frontend/src/app/dashboard/dashboard.component.ts | 5 +++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index 3b16ade..05f687c 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -42,7 +42,18 @@
- +
+ +
+ + + +
+ +
+
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts index 0a089b9..4cf6195 100644 --- a/frontend/src/app/dashboard/dashboard.component.ts +++ b/frontend/src/app/dashboard/dashboard.component.ts @@ -13,6 +13,7 @@ export class DashboardComponent implements OnInit{ missedSchedules: boolean = true schedules: ScheduleInfo[] = [] workedMinutesToday: number = 0 + test_Var: boolean = false; @ViewChild('activeSchedule') activeScheduleComponent: ActiveScheduleComponent | undefined constructor(private scheduleService: ScheduleService) { @@ -42,4 +43,8 @@ export class DashboardComponent implements OnInit{ this.workedMinutesToday += stopActiveScheduleInfo.workedMinutes; this.schedules = this.schedules.filter(schedule => schedule.scheduleID !== stopActiveScheduleInfo.schedule.scheduleID); } + + test() { + this.test_Var = !this.test_Var; + } } From 7ee892884981518aab08d1f4363ca408f4d67055 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sat, 28 Oct 2023 08:48:52 +0200 Subject: [PATCH 2/5] Taskgroup Overview with Action-List --- backend/.idea/workspace.xml | 55 ++++--- frontend/src/app/app.module.ts | 76 +++++----- .../src/app/dashboard/dashboard.component.css | 7 + .../app/dashboard/dashboard.component.html | 19 +-- .../src/app/dashboard/dashboard.component.ts | 5 +- .../taskgroup-overview.component.css | 142 ++++++++++++++++++ .../taskgroup-overview.component.html | 7 + .../taskgroup-overview.component.spec.ts | 21 +++ .../taskgroup-overview.component.ts | 14 ++ 9 files changed, 265 insertions(+), 81 deletions(-) create mode 100644 frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css create mode 100644 frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html create mode 100644 frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.spec.ts create mode 100644 frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml index 86e32db..07e8d25 100644 --- a/backend/.idea/workspace.xml +++ b/backend/.idea/workspace.xml @@ -5,7 +5,10 @@ - + + + + - { + "keyToString": { + "RequestMappingsPanelOrder0": "0", + "RequestMappingsPanelOrder1": "1", + "RequestMappingsPanelWidth0": "75", + "RequestMappingsPanelWidth1": "75", + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "WebServerToolWindowFactoryState": "false", + "git-widget-placeholder": "issue-11-angular-update", + "last_directory_selection": "D:/Programmierprojekte/TimeManager/backend/src/main/java/core/api/models/timemanager", + "last_opened_file_path": "D:/Programmierprojekte/Dicewars/client", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "settings.editor.selected.configurable": "swagger", + "ts.external.directory.path": "/snap/intellij-idea-ultimate/459/plugins/javascript-impl/jsLanguageServicesImpl/external", + "vue.rearranger.settings.migration": "true" }, - "keyToStringList": { - "DatabaseDriversLRU": [ - "mariadb" + "keyToStringList": { + "DatabaseDriversLRU": [ + "mariadb" ] } -}]]> +} @@ -100,6 +103,8 @@ + +