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

issue-25 #27

Merged
sebastian merged 32 commits from issue-25 into issue-18 2023-10-28 19:33:06 +02:00
Conversation 0 Commits 32 Files Changed 51 +7 -2
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 984552bc69 - Show all commits

5
frontend/src/app/dashboard/task-overview/task-overview.component.css
View File

@ -26,3 +26,8 @@
color: white; color: white;
border-radius: 0; border-radius: 0;
} }
.task-link {
text-decoration: none;
color: black;
}

2
frontend/src/app/dashboard/task-overview/task-overview.component.html
View File

@ -1,7 +1,7 @@
<button mat-raised-button class="greenBtn long-btn" *ngIf="taskgroupID != undefined" (click)="openTaskCreation()">Add</button> <button mat-raised-button class="greenBtn long-btn" *ngIf="taskgroupID != undefined" (click)="openTaskCreation()">Add</button>
<mat-card *ngFor="let task of tasks"> <mat-card *ngFor="let task of tasks">
<mat-card-content> <mat-card-content>
<h3>{{task.taskName}}</h3> <h3><a class="task-link" [routerLink]="['/taskgroups', taskgroupID!, 'tasks', task.taskID]">{{task.taskName}}</a></h3>
<mat-progress-bar mode="determinate" value="{{task.activeTime}}" class="progress"></mat-progress-bar> <mat-progress-bar mode="determinate" value="{{task.activeTime}}" class="progress"></mat-progress-bar>
<p class="task-info"><i>ETA: </i>{{task.activeTime}} / {{task.eta}}</p> <p class="task-info"><i>ETA: </i>{{task.activeTime}} / {{task.eta}}</p>
<p class="task-info"><i>Limit: </i>{{task.limit}}</p> <p class="task-info"><i>Limit: </i>{{task.limit}}</p>

2
frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
View File

@ -1,5 +1,5 @@
<mat-action-list style="padding: 0"> <mat-action-list style="padding: 0">
<button mat-list-item class="lightBlueBtn">Manage Taskgroups</button> <button mat-list-item class="lightBlueBtn" [routerLink]="['/taskgroups']">Manage Taskgroups</button>
</mat-action-list> </mat-action-list>
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl" > <mat-tree [dataSource]="dataSource" [treeControl]="treeControl" >
<!-- This is the tree node template for leaf nodes --> <!-- This is the tree node template for leaf nodes -->