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

Merge pull request 'issue-54' (#62) from issue-54 into master
All checks were successful
Java CI with Maven / build (push) Successful in 43s
Details

Browse Source 
Reviewed-on: Sebastian/TimeManager#62
This commit is contained in:
Sebastian 2023-11-13 19:34:10 +01:00
commit 79034a5b3a
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/.idea/workspace.xml
View File

@ -4,10 +4,7 @@
<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="Edit and Delete in Draggable Scheduler"> <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Edit and Delete in Draggable Scheduler" />
<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/entities/timemanager/Taskgroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java" afterDir="false" />
</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" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />

12
backend/src/main/java/core/api/models/timemanager/taskSchedule/TaskScheduleStopResponse.java
View File

@ -2,17 +2,17 @@ package core.api.models.timemanager.taskSchedule;
public class TaskScheduleStopResponse { public class TaskScheduleStopResponse {
private int activeTime; private int workTime;
public TaskScheduleStopResponse(int activeTime) { public TaskScheduleStopResponse(int activeTime) {
this.activeTime = activeTime; this.workTime = activeTime;
} }
public int getActiveTime() { public int getWorkTime() {
return activeTime; return workTime;
} }
public void setActiveTime(int activeTime) { public void setWorkTime(int workTime) {
this.activeTime = activeTime; this.workTime = workTime;
} }
} }

2
frontend/src/app/dashboard/active-schedule/active-schedule.component.html
View File

@ -10,7 +10,7 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<span *ngFor="let taskgroupPath of activeSchedule!.taskgroupPath">{{taskgroupPath.taskgroupName}} /</span> <span *ngFor="let taskgroupPath of activeSchedule!.taskgroupPath">{{taskgroupPath.taskgroupName}} /</span>
<p class="gray-text" *ngIf="activeSchedule!.scheduleType==='BASIC'">Running for {{displayTime}}</p> <p class="gray-text">Running for {{displayTime}}</p>
</mat-card-content> </mat-card-content>
<mat-card-actions> <mat-card-actions>
<button mat-raised-button class="grayBtn" (click)="stopTask(false)">Stop</button> <button mat-raised-button class="grayBtn" (click)="stopTask(false)">Stop</button>

1
frontend/src/app/dashboard/active-schedule/active-schedule.component.ts
View File

@ -63,6 +63,7 @@ export class ActiveScheduleComponent implements OnInit{
schedule: this.activeSchedule!, schedule: this.activeSchedule!,
workedMinutes: resp.workTime workedMinutes: resp.workTime
}) })
console.log(resp.workTime)
this.activeSchedule = undefined this.activeSchedule = undefined
} }
}) })

2
frontend/src/app/dashboard/dashboard.component.ts
View File

@ -18,7 +18,7 @@ import {TaskOverviewData} from "./taskgroup-overview/taskgroup-overview.componen
}) })
export class DashboardComponent implements OnInit{ export class DashboardComponent implements OnInit{
missedSchedules: boolean = true missedSchedules: boolean = false
schedules: ScheduleInfo[] = [] schedules: ScheduleInfo[] = []
workedMinutesToday: number = 0 workedMinutesToday: number = 0