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

added public holidays + updated templ to v0.3.960
Some checks failed
Tests / Run Go Tests (push) Failing after 1m33s
Details

Browse Source
This commit is contained in:
Tom Tröger
2025-12-19 09:15:58 +01:00
parent 177fbdeb3f
commit f562ef2a33
16 changed files with 95 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,9 +143,9 @@ func createReports(employes []models.User, startDate time.Time) []typstData {
endDate := startDate.AddDate(0, 1, -1)
var employeData []typstData
for _, employe := range employes {
if data, err := createEmployeReport(employe, startDate, endDate); err != nil {
slog.Warn("Error when creating employeReport", slog.Any("user", employe), slog.Any("error", err))
for _, employee := range employes {
if data, err := createEmployeReport(employee, startDate, endDate); err != nil {
slog.Warn("Error when creating employeReport", slog.Any("user", employee), slog.Any("error", err))
} else {
employeData = append(employeData, data)
}
@@ -154,7 +154,8 @@ func createReports(employes []models.User, startDate time.Time) []typstData {
}
func createEmployeReport(employee models.User, startDate, endDate time.Time) (typstData, error) {
targetHoursThisMonth := employee.ArbeitszeitProWocheFrac(.2) * time.Duration(helper.GetWorkingDays(startDate, endDate))
publicHolidays, err := models.GetHolidaysFromTo(startDate, endDate)
targetHoursThisMonth := employee.ArbeitszeitProWocheFrac(.2) * time.Duration(helper.GetWorkingDays(startDate, endDate)-len(publicHolidays))
workDaysThisMonth := models.GetDays(employee, startDate, endDate.AddDate(0, 0, 1), false)
slog.Debug("Baseline Working hours", "targetHours", targetHoursThisMonth.Hours())