sebastian/timemanager
Template
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

issue-7 #9

Merged
sebastian merged 4 commits from issue-7 into master 2023-10-02 09:36:13 +02:00
Conversation 0 Commits 4 Files Changed 27 +19 -23
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b3e7ad3dae - Show all commits

33
backend/.idea/workspace.xml
View File

@ -4,26 +4,10 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment=""> <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Structure Taskgroups in Hierarchies">
<change afterPath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-creation/TaskgroupCreationData.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/TaskgroupController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/TaskgroupController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/TaskgroupEntityInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/TaskgroupEntityInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/TaskgroupFieldInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/TaskgroupFieldInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/TaskgroupRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/TaskgroupRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskgroupService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskgroupService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/src/api/api.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/api.module.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/src/api/api/api.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/api/api.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/src/api/api/taskgroup.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/api/taskgroup.service.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/src/api/model/models.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/model/models.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/src/api/model/taskgroupEntityInfo.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/model/taskgroupEntityInfo.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/src/api/model/taskgroupFieldInfo.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/model/taskgroupFieldInfo.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/src/app/app-routing.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/app-routing.module.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-creation/taskgroup-creation.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-creation/taskgroup-creation.component.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-creation/taskgroup-creation.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-creation/taskgroup-creation.component.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-dashboard/taskgroup-dashboard.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-dashboard/taskgroup-dashboard.component.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-dashboard/taskgroup-dashboard.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-dashboard/taskgroup-dashboard.component.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-dashboard/taskgroup-dashboard.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-dashboard/taskgroup-dashboard.component.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../openapi.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../openapi.yaml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -82,13 +66,26 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1695647243767</updated> <updated>1695647243767</updated>
<workItem from="1695647249321" duration="397000" /> <workItem from="1695647249321" duration="397000" />
<workItem from="1696183811713" duration="3909000" /> <workItem from="1696183811713" duration="4994000" />
</task> </task>
<task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
<option name="closed" value="true" />
<created>1696188127465</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1696188127467</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" /> <option name="version" value="3" />
</component> </component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Structure Taskgroups in Hierarchies" />
<option name="LAST_COMMIT_MESSAGE" value="Structure Taskgroups in Hierarchies" />
</component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
<breakpoints> <breakpoints>

7
frontend/src/app/taskgroups/taskgroup-creation/taskgroup-creation.component.ts
View File

@ -20,8 +20,7 @@ export class TaskgroupCreationComponent implements OnInit {
constructor(private dialogRef: MatDialogRef<TaskgroupCreationComponent>, constructor(private dialogRef: MatDialogRef<TaskgroupCreationComponent>,
private taskgroupService: TaskgroupService, private taskgroupService: TaskgroupService,
private snackbar: MatSnackBar, private snackbar: MatSnackBar,
@Inject(MAT_DIALOG_DATA) public data: TaskgroupCreationData, @Inject(MAT_DIALOG_DATA) public data: TaskgroupCreationData) { }
private activatedRoute: ActivatedRoute) { }
ngOnInit(): void { ngOnInit(): void {
if(this.data.taskgroup != undefined) { if(this.data.taskgroup != undefined) {
@ -54,9 +53,9 @@ export class TaskgroupCreationComponent implements OnInit {
} }
}) })
} else { } else {
this.taskgroupService.taskgroupsTaskgroupIDPost(this.data.taskgroupID, { this.taskgroupService.taskgroupsTaskgroupIDPost(this.data.taskgroup!.taskgroupID, {
name: this.nameCtrl.value, name: this.nameCtrl.value,
parentID: this.data.taskgroup!.parentTaskgroup.taskgroupID parentID: this.data.taskgroupID
}).subscribe({ }).subscribe({
next: resp => { next: resp => {
this.pending = false; this.pending = false;

2
frontend/src/app/taskgroups/taskgroup-dashboard/taskgroup-dashboard.component.ts
View File

@ -49,7 +49,7 @@ export class TaskgroupDashboardComponent implements OnInit {
} }
openTaskgroupEditor(taskgroup: TaskgroupEntityInfo) { openTaskgroupEditor(taskgroup: TaskgroupEntityInfo) {
const dialogRef = this.dialog.open(TaskgroupCreationComponent, {data: taskgroup, minWidth: "400px"}); const dialogRef = this.dialog.open(TaskgroupCreationComponent, {data: {taskgroup: taskgroup, taskgroupID: this.taskgroupID}, minWidth: "400px"});
dialogRef.afterClosed().subscribe(res => { dialogRef.afterClosed().subscribe(res => {
if(res) { if(res) {
const data = this.taskgroups const data = this.taskgroups