tom/arbeitszeitmessung
3
0
Fork 0
Code Issues 19 Pull Requests Actions Packages Releases 9 Wiki Activity

removed and refactored virtual and real worktime

Browse Source
This commit is contained in:
Tom Tröger
2025-12-12 06:31:03 +01:00
parent f73c2b1a96
commit 1ccc19b85c
12 changed files with 79 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Backend/endpoints/pdf-create.go
View File

@@ -20,7 +20,7 @@ func convertDaysToTypst(days []models.IWorkDay, u models.User) ([]typstDay, erro
var typstDays []typstDay
for _, day := range days {
var thisTypstDay typstDay
work, pause, overtime := day.GetTimesVirtual(u, models.WorktimeBaseWeek)
work, pause, overtime := day.GetTimes(u, models.WorktimeBaseWeek, true)
thisTypstDay.Date = day.Date().Format(DE_DATE)
thisTypstDay.Worktime = helper.FormatDurationFill(work, true)
thisTypstDay.Pausetime = helper.FormatDurationFill(pause, true)
@@ -132,7 +132,7 @@ func createEmployeReport(employee models.User, startDate, endDate time.Time) (by
var actualHours time.Duration
for _, day := range workingDays {
actualHours += day.GetWorktimeVirtual(employee, models.WorktimeBaseDay)
actualHours += day.GetWorktime(employee, models.WorktimeBaseDay, true)
}
worktimeBalance := actualHours - targetHours
@@ -172,8 +172,8 @@ func PDFHandler(w http.ResponseWriter, r *http.Request) {
weeks := models.GetDays(user, startDate, endDate, false)
var aggregatedOvertime, aggregatedWorkTime time.Duration
for _, day := range weeks {
aggregatedOvertime += day.GetOvertimeReal(user, models.WorktimeBaseWeek)
aggregatedWorkTime += day.GetWorktimeVirtual(user, models.WorktimeBaseWeek)
aggregatedOvertime += day.GetOvertime(user, models.WorktimeBaseWeek, false)
aggregatedWorkTime += day.GetWorktime(user, models.WorktimeBaseWeek, true)
}
typstDays, err := convertDaysToTypst(weeks, user)