fixed #61, #62 refactored getTime variants

Backend/endpoints/auto-kurzarbeit.go

@@ -46,11 +46,11 @@ func fillKurzarbeit(r *http.Request, w http.ResponseWriter) {
 		if !day.IsKurzArbeit() || !day.IsWorkDay() {
 			continue
 		}
-		if day.GetWorktimeReal(user, models.WorktimeBaseDay) >= day.GetWorktimeVirtual(user, models.WorktimeBaseDay) {
+		if day.GetWorktime(user, models.WorktimeBaseDay, false) >= day.GetWorktime(user, models.WorktimeBaseDay, true) {
 			continue
 		}
 
-		worktimeKurzarbeit := day.GetWorktimeVirtual(user, models.WorktimeBaseDay) - day.GetWorktimeReal(user, models.WorktimeBaseDay)
+		worktimeKurzarbeit := day.GetWorktime(user, models.WorktimeBaseDay, true) - day.GetWorktime(user, models.WorktimeBaseDay, false)
 
 		if wDay, ok := day.(*models.WorkDay); !ok || len(wDay.Bookings) == 0 {
 			continue

Backend/endpoints/pdf-create.go

@@ -20,13 +20,21 @@ 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.WorktimeBaseDay, false)
+		workVirtual := day.GetWorktime(u, models.WorktimeBaseDay, true)
+		overtime = workVirtual - u.ArbeitszeitProWocheFrac(0.2)
 		thisTypstDay.Date = day.Date().Format(DE_DATE)
-		thisTypstDay.Worktime = helper.FormatDurationFill(work, true)
+		thisTypstDay.Worktime = helper.FormatDurationFill(workVirtual, true)
 		thisTypstDay.Pausetime = helper.FormatDurationFill(pause, true)
 		thisTypstDay.Overtime = helper.FormatDurationFill(overtime, true)
 		thisTypstDay.IsFriday = day.Date().Weekday() == time.Friday
 
+		if workVirtual > work {
+			thisTypstDay.Kurzarbeit = helper.FormatDurationFill(workVirtual-work, true)
+		} else {
+			thisTypstDay.Kurzarbeit = helper.FormatDurationFill(0, true)
+		}
+
 		thisTypstDay.DayParts = convertDayToTypstDayParts(day, u)
 		typstDays = append(typstDays, thisTypstDay)
 	}
@@ -45,7 +53,7 @@ func convertDayToTypstDayParts(day models.IWorkDay, user models.User) []typstDay
 			typstDayPart.IsWorkDay = true
 			typstDayParts = append(typstDayParts, typstDayPart)
 		}
-		if day.IsKurzArbeit() {
+		if day.IsKurzArbeit() && len(workDay.Bookings) > 0 {
 			tsFrom, tsTo := workDay.GenerateKurzArbeitBookings(user)
 			typstDayParts = append(typstDayParts, typstDayPart{
 				BookingFrom: tsFrom.Format("15:04"),
@@ -54,6 +62,9 @@ func convertDayToTypstDayParts(day models.IWorkDay, user models.User) []typstDay
 				IsWorkDay:   true,
 			})
 		}
+		if workdayAbsence := workDay.GetWorktimeAbsence(); (workdayAbsence != models.Absence{}) {
+			typstDayParts = append(typstDayParts, typstDayPart{IsWorkDay: false, WorkType: workdayAbsence.AbwesenheitTyp.Name})
+		}
 
 	} else {
 		absentDay, _ := day.(*models.Absence)
@@ -62,6 +73,90 @@ func convertDayToTypstDayParts(day models.IWorkDay, user models.User) []typstDay
 	return typstDayParts
 }
 
+func PDFCreateController(w http.ResponseWriter, r *http.Request) {
+	helper.RequiresLogin(Session, w, r)
+	switch r.Method {
+	case http.MethodGet:
+		user, err := models.GetUserFromSession(Session, r.Context())
+		if err != nil {
+			log.Println("Error getting user!")
+			return
+		}
+		pp := paramParser.New(r.URL.Query())
+		startDate := pp.ParseTimestampFallback("start_date", time.DateOnly, time.Now())
+		personalNumbers := pp.ParseIntListFallback("employe_list", ",", make([]int, 0))
+
+		employes, err := models.GetUserByPersonalNrMulti(personalNumbers)
+		if err != nil {
+			slog.Warn("Error getting employes!", slog.Any("Error", err))
+			return
+		}
+
+		output, err := createReports(user, employes, startDate)
+		if err != nil {
+			slog.Warn("Could not create pdf report", slog.Any("Error", err))
+		}
+
+		w.Header().Set("Content-type", "application/pdf")
+		output.WriteTo(w)
+		w.WriteHeader(http.StatusOK)
+
+	default:
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
+	}
+}
+
+func createReports(user models.User, employes []models.User, startDate time.Time) (bytes.Buffer, error) {
+	startDate = helper.GetFirstOfMonth(startDate)
+	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))
+		} else {
+			employeData = append(employeData, data)
+		}
+	}
+	return renderPDF(employeData)
+}
+
+func createEmployeReport(employee models.User, startDate, endDate time.Time) (typstData, error) {
+	targetHoursThisMonth := employee.ArbeitszeitProWocheFrac(.2) * time.Duration(helper.GetWorkingDays(startDate, endDate))
+	workDaysThisMonth := models.GetDays(employee, startDate, endDate.AddDate(0, 0, 1), false)
+
+	slog.Debug("Baseline Working hours", "targetHours", targetHoursThisMonth.Hours())
+
+	var workHours, kurzarbeitHours time.Duration
+	for _, day := range workDaysThisMonth {
+		tmpvirtualHours := day.GetWorktime(employee, models.WorktimeBaseDay, true)
+		tmpactualHours := day.GetWorktime(employee, models.WorktimeBaseDay, false)
+		if day.IsKurzArbeit() && tmpvirtualHours > tmpactualHours {
+			slog.Debug("Adding kurzarbeit to workday", "day", day.Date())
+			kurzarbeitHours += tmpvirtualHours - tmpactualHours
+		}
+		workHours += tmpvirtualHours
+	}
+	worktimeBalance := workHours - targetHoursThisMonth
+
+	typstDays, err := convertDaysToTypst(workDaysThisMonth, employee)
+	if err != nil {
+		slog.Warn("Failed to convert to days", slog.Any("error", err))
+		return typstData{}, err
+	}
+
+	metadata := typstMetadata{
+		EmployeeName:     fmt.Sprintf("%s %s", employee.Vorname, employee.Name),
+		TimeRange:        fmt.Sprintf("%s - %s", startDate.Format(DE_DATE), endDate.Format(DE_DATE)),
+		Overtime:         helper.FormatDurationFill(worktimeBalance, true),
+		WorkTime:         helper.FormatDurationFill(workHours, true),
+		Kurzarbeit:       helper.FormatDurationFill(kurzarbeitHours, true),
+		OvertimeTotal:    "",
+		CurrentTimestamp: time.Now().Format("02.01.2006 - 15:04 Uhr"),
+	}
+	return typstData{Meta: metadata, Days: typstDays}, nil
+}
+
 func renderPDF(data []typstData) (bytes.Buffer, error) {
 	var markup bytes.Buffer
 	var output bytes.Buffer
@@ -90,115 +185,6 @@ func renderPDF(data []typstData) (bytes.Buffer, error) {
 	return output, nil
 }
 
-func PDFCreateController(w http.ResponseWriter, r *http.Request) {
-	helper.RequiresLogin(Session, w, r)
-	switch r.Method {
-	case http.MethodGet:
-		user, err := models.GetUserFromSession(Session, r.Context())
-		if err != nil {
-			log.Println("Error getting user!")
-			return
-		}
-		pp := paramParser.New(r.URL.Query())
-		startDate := pp.ParseTimestampFallback("start_date", time.DateOnly, time.Now())
-		var members []models.User = make([]models.User, 0)
-		output, err := createReports(user, members, startDate)
-		if err != nil {
-			slog.Warn("Could not create pdf report", slog.Any("Error", err))
-		}
-
-		w.Header().Set("Content-type", "application/pdf")
-		output.WriteTo(w)
-		w.WriteHeader(http.StatusOK)
-
-	default:
-		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
-	}
-}
-
-func createReports(user models.User, employes []models.User, startDate time.Time) (bytes.Buffer, error) {
-	if startDate.Day() > 1 {
-		startDate = startDate.AddDate(0, 0, -(startDate.Day() - 1))
-	}
-	endDate := startDate.AddDate(0, 1, -1)
-	return createEmployeReport(user, startDate, endDate)
-}
-
-func createEmployeReport(employee models.User, startDate, endDate time.Time) (bytes.Buffer, error) {
-	targetHours := (employee.ArbeitszeitProWoche() / 5) * time.Duration(helper.GetWorkingDays(startDate, endDate))
-	workingDays := models.GetDays(employee, startDate, endDate, false)
-
-	slog.Debug("Baseline Working hours", "targetHours", targetHours.Hours())
-
-	var actualHours time.Duration
-	for _, day := range workingDays {
-		actualHours += day.GetWorktimeVirtual(employee, models.WorktimeBaseDay)
-	}
-	worktimeBalance := actualHours - targetHours
-
-	typstDays, err := convertDaysToTypst(workingDays, employee)
-	if err != nil {
-		log.Panicf("Failed to convert days!")
-	}
-
-	metadata := typstMetadata{
-		EmployeeName:     fmt.Sprintf("%s %s", employee.Vorname, employee.Name),
-		TimeRange:        fmt.Sprintf("%s - %s", startDate.Format(DE_DATE), endDate.Format(DE_DATE)),
-		Overtime:         helper.FormatDurationFill(worktimeBalance, true),
-		WorkTime:         helper.FormatDurationFill(actualHours, true),
-		OvertimeTotal:    "",
-		CurrentTimestamp: time.Now().Format("02.01.2006 - 15:04 Uhr"),
-	}
-
-	return renderPDF([]typstData{{Meta: metadata, Days: typstDays}, {Meta: metadata, Days: typstDays}})
-}
-
-func PDFHandler(w http.ResponseWriter, r *http.Request) {
-	helper.RequiresLogin(Session, w, r)
-	startDate := time.Now()
-
-	if startDate.Day() > 1 {
-		startDate = startDate.AddDate(0, 0, -(startDate.Day() - 1))
-	}
-	endDate := startDate.AddDate(0, 1, -1)
-
-	user, err := models.GetUserFromSession(Session, r.Context())
-	if err != nil {
-		log.Println("Error getting user!")
-	}
-
-	//TODO: only accepted weeks
-
-	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)
-	}
-
-	typstDays, err := convertDaysToTypst(weeks, user)
-	if err != nil {
-		log.Panicf("Failed to convert days!")
-	}
-	metadata := typstMetadata{
-		EmployeeName:     fmt.Sprintf("%s %s", user.Vorname, user.Name),
-		TimeRange:        fmt.Sprintf("%s - %s", startDate.Format(DE_DATE), endDate.Format(DE_DATE)),
-		Overtime:         helper.FormatDurationFill(aggregatedOvertime, true),
-		WorkTime:         helper.FormatDurationFill(aggregatedWorkTime, true),
-		OvertimeTotal:    "",
-		CurrentTimestamp: time.Now().Format("02.01.2006 - 15:04 Uhr"),
-	}
-
-	output, err := renderPDF([]typstData{{Meta: metadata, Days: typstDays}})
-	if err != nil {
-		slog.Warn("Could not create pdf report", slog.Any("Error", err))
-	}
-
-	w.Header().Set("Content-type", "application/pdf")
-	output.WriteTo(w)
-	w.WriteHeader(200)
-}
-
 type typstMetadata struct {
 	TimeRange        string `json:"time-range"`
 	EmployeeName     string `json:"employee-name"`
@@ -217,12 +203,13 @@ type typstDayPart struct {
 }
 
 type typstDay struct {
-	Date      string         `json:"date"`
+	Date       string         `json:"date"`
-	DayParts  []typstDayPart `json:"day-parts"`
+	DayParts   []typstDayPart `json:"day-parts"`
-	Worktime  string         `json:"worktime"`
+	Worktime   string         `json:"worktime"`
-	Pausetime string         `json:"pausetime"`
+	Pausetime  string         `json:"pausetime"`
-	Overtime  string         `json:"overtime"`
+	Overtime   string         `json:"overtime"`
-	IsFriday  bool           `json:"is-weekend"`
+	Kurzarbeit string         `json:"kurzarbeit"`
+	IsFriday   bool           `json:"is-weekend"`
 }
 
 type typstData struct {

Backend/endpoints/time.go

@@ -84,7 +84,7 @@ func getBookings(w http.ResponseWriter, r *http.Request) {
 		if day.Date().Before(lastSub) {
 			continue
 		}
-		aggregatedOvertime += day.GetOvertimeReal(user, models.WorktimeBaseDay)
+		aggregatedOvertime += day.GetOvertime(user, models.WorktimeBaseDay, false)
 	}
 	if reportedOvertime, err := user.GetReportedOvertime(); err == nil {
 		user.Overtime = (reportedOvertime + aggregatedOvertime).Round(time.Minute)

Backend/helper/paramParser/main.go

@@ -5,6 +5,7 @@ import (
 	"log/slog"
 	"net/url"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -12,6 +13,30 @@ type ParamsParser struct {
 	urlParams url.Values
 }
 
+func (p ParamsParser) ParseStringListFallback(key string, delimiter string, fallback []string) []string {
+	if !p.urlParams.Has(key) {
+		return fallback
+	}
+	paramList := p.urlParams.Get(key)
+	list := strings.Split(paramList, delimiter)
+	return list
+}
+
+func (p ParamsParser) ParseIntListFallback(key string, delimiter string, fallback []int) []int {
+	if !p.urlParams.Has(key) {
+		return fallback
+	}
+	paramList := p.urlParams.Get(key)
+	list := strings.Split(paramList, delimiter)
+	parsedList := make([]int, 0)
+	for _, item := range list {
+		if parsedItem, err := strconv.Atoi(item); err == nil {
+			parsedList = append(parsedList, parsedItem)
+		}
+	}
+	return parsedList
+}
+
 type NoValueError struct {
 	Key string
 }

Backend/helper/time.go

@@ -16,6 +16,13 @@ func GetMonday(ts time.Time) time.Time {
 	return ts
 }
 
+func GetFirstOfMonth(ts time.Time) time.Time {
+	if ts.Day() > 1 {
+		return ts.AddDate(0, 0, -(ts.Day() - 1))
+	}
+	return ts
+}
+
 func IsWeekend(ts time.Time) bool {
 	return ts.Weekday() == time.Saturday || ts.Weekday() == time.Sunday
 }

Backend/models/absence.go

@@ -49,75 +49,41 @@ func (a *Absence) IsMultiDay() bool {
 	return !a.DateFrom.Equal(a.DateTo)
 }
 
-func (a *Absence) GetWorktimeReal(u User, base WorktimeBase) time.Duration {
+func (a *Absence) GetWorktime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
-	if a.AbwesenheitTyp.WorkTime <= 0 {
-		return 0
-	}
 	switch base {
 	case WorktimeBaseDay:
+		if a.AbwesenheitTyp.WorkTime <= 0 && includeKurzarbeit {
+			return u.ArbeitszeitProTagFrac(1)
+		}
 		return u.ArbeitszeitProTagFrac(float32(a.AbwesenheitTyp.WorkTime) / 100)
 	case WorktimeBaseWeek:
+		if a.AbwesenheitTyp.WorkTime <= 0 && includeKurzarbeit {
+			return u.ArbeitszeitProTagFrac(0.2)
+		}
 		return u.ArbeitszeitProWocheFrac(0.2 * float32(a.AbwesenheitTyp.WorkTime) / 100)
 	}
 	return 0
 }
-func (a *Absence) GetPausetimeReal(u User, base WorktimeBase) time.Duration {
+
+func (a *Absence) GetPausetime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
 	return 0
 }
 
-func (a *Absence) GetOvertimeReal(u User, base WorktimeBase) time.Duration {
+func (a *Absence) GetOvertime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
 	if a.AbwesenheitTyp.WorkTime > 0 {
 		return 0
 	}
 	switch base {
 	case WorktimeBaseDay:
-		return -u.ArbeitszeitProTag()
+		return -u.ArbeitszeitProTagFrac(1)
 	case WorktimeBaseWeek:
-		return -u.ArbeitszeitProWoche() / 5
+		return -u.ArbeitszeitProWocheFrac(0.2)
 	}
 	return 0
 }
 
-func (a *Absence) GetWorktimeVirtual(u User, base WorktimeBase) time.Duration {
+func (a *Absence) GetTimes(u User, base WorktimeBase, includeKurzarbeit bool) (work, pause, overtime time.Duration) {
-	return a.GetWorktimeReal(u, base)
+	return a.GetWorktime(u, base, includeKurzarbeit), a.GetPausetime(u, base, includeKurzarbeit), a.GetOvertime(u, base, includeKurzarbeit)
-}
-
-func (a *Absence) GetPausetimeVirtual(u User, base WorktimeBase) time.Duration {
-	return a.GetPausetimeReal(u, base)
-}
-
-func (a *Absence) GetOvertimeVirtual(u User, base WorktimeBase) time.Duration {
-	return a.GetOvertimeReal(u, base)
-}
-
-func (a *Absence) GetTimesReal(u User, base WorktimeBase) (work, pause, overtime time.Duration) {
-	return a.GetWorktimeReal(u, base), a.GetPausetimeReal(u, base), a.GetOvertimeReal(u, base)
-}
-
-func (a *Absence) GetTimesVirtual(u User, base WorktimeBase) (work, pause, overtime time.Duration) {
-	return a.GetWorktimeVirtual(u, base), a.GetPausetimeVirtual(u, base), a.GetOvertimeVirtual(u, base)
-}
-
-func (a *Absence) TimeWorkVirtual(u User) time.Duration {
-	return a.TimeWorkReal(u)
-}
-
-func (a *Absence) TimeWorkReal(u User) time.Duration {
-	if a.AbwesenheitTyp.WorkTime > 1 {
-		return time.Duration(u.ArbeitszeitPerTag * float32(time.Hour)).Round(time.Minute)
-	}
-	return 0
-}
-
-func (a *Absence) TimePauseReal(u User) (work, pause time.Duration) {
-	return 0, 0
-}
-
-func (a *Absence) TimeOvertimeReal(u User) time.Duration {
-	if a.AbwesenheitTyp.WorkTime > 1 {
-		return 0
-	}
-	return -u.ArbeitszeitProTag()
 }
 
 func (a *Absence) ToString() string {

Backend/models/absence_test.go

@@ -52,7 +52,7 @@ func TestCalcRealWorkTimeDayAbsence(t *testing.T) {
 		t.Run("Calc Absence Worktime: "+tc.absenceType.Name, func(t *testing.T) {
 			var testCase = testAbsence
 			testCase.AbwesenheitTyp = tc.absenceType
-			workTime := testCase.GetWorktimeReal(testUser, models.WorktimeBaseDay)
+			workTime := testCase.GetWorktime(testUser, models.WorktimeBaseDay, false)
 			if workTime != tc.expectedTime {
 				t.Errorf("Calc Worktime Default not working, time should be %s, but was %s", helper.FormatDurationFill(tc.expectedTime, true), helper.FormatDurationFill(workTime, true))
 			}
@@ -83,7 +83,7 @@ func TestCalcRealWorkTimeWeekAbsence(t *testing.T) {
 		t.Run("Calc Absence Worktime: "+tc.absenceType.Name, func(t *testing.T) {
 			var testCase = testAbsence
 			testCase.AbwesenheitTyp = tc.absenceType
-			workTime := testCase.GetWorktimeReal(testUser, models.WorktimeBaseWeek)
+			workTime := testCase.GetWorktime(testUser, models.WorktimeBaseWeek, false)
 			if workTime != tc.expectedTime {
 				t.Errorf("Calc Worktime Default not working, time should be %s, but was %s", helper.FormatDurationFill(tc.expectedTime, true), helper.FormatDurationFill(workTime, true))
 			}

Backend/models/iworkday.go

@@ -13,14 +13,10 @@ type IWorkDay interface {
 	IsKurzArbeit() bool
 	GetDayProgress(User) int8
 	RequiresAction() bool
-	GetWorktimeReal(User, WorktimeBase) time.Duration
+	GetWorktime(User, WorktimeBase, bool) time.Duration
-	GetPausetimeReal(User, WorktimeBase) time.Duration
+	GetPausetime(User, WorktimeBase, bool) time.Duration
-	GetOvertimeReal(User, WorktimeBase) time.Duration
+	GetTimes(User, WorktimeBase, bool) (work, pause, overtime time.Duration)
-	GetWorktimeVirtual(User, WorktimeBase) time.Duration
+	GetOvertime(User, WorktimeBase, bool) time.Duration
-	GetPausetimeVirtual(User, WorktimeBase) time.Duration
-	GetOvertimeVirtual(User, WorktimeBase) time.Duration
-	GetTimesReal(User, WorktimeBase) (work, pause, overtime time.Duration)
-	GetTimesVirtual(User, WorktimeBase) (work, pause, overtime time.Duration)
 }
 
 func GetDays(user User, tsFrom, tsTo time.Time, orderedForward bool) []IWorkDay {

Backend/models/user.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/alexedwards/scs/v2"
+	"github.com/lib/pq"
 )
 
 type User struct {
@@ -173,6 +174,38 @@ func GetUserByPersonalNr(personalNummer int) (User, error) {
 	return user, nil
 }
 
+func GetUserByPersonalNrMulti(personalNummerMulti []int) ([]User, error) {
+	var users []User
+	if len(personalNummerMulti) == 0 {
+		return users, errors.New("No personalNumbers provided")
+	}
+
+	qStr, err := DB.Prepare((`SELECT personal_nummer, card_uid, vorname, nachname, arbeitszeit_per_tag, arbeitszeit_per_woche FROM s_personal_daten WHERE personal_nummer = ANY($1::int[]);`))
+	if err != nil {
+		return users, err
+	}
+
+	rows, err := qStr.Query(pq.Array(personalNummerMulti))
+	if err == sql.ErrNoRows {
+		return users, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	for rows.Next() {
+		var user User
+		if err := rows.Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag, &user.ArbeitszeitPerWoche); err != nil {
+			return users, err
+		}
+		users = append(users, user)
+	}
+	if err = rows.Err(); err != nil {
+		return users, err
+	}
+	return users, nil
+}
+
 func (u *User) Login(password string) bool {
 	var loginSuccess bool
 	qStr, err := DB.Prepare((`SELECT (pass_hash = crypt($2, pass_hash)) AS pass_hash FROM user_password WHERE personal_nummer = $1;`))

Backend/models/workDay.go

@@ -30,31 +30,33 @@ const (
 	WorktimeBaseDay  WorktimeBase = "day"
 )
 
+func (d *WorkDay) GetWorktimeAbsence() Absence {
+	return d.worktimeAbsece
+}
+
 // Gets the time as is in the db (with corrected pause times)
-func (d *WorkDay) GetWorktimeReal(u User, base WorktimeBase) time.Duration {
+func (d *WorkDay) GetWorktime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
+	if includeKurzarbeit && d.IsKurzArbeit() && len(d.Bookings) > 0 {
+		return d.kurzArbeitAbsence.GetWorktime(u, base, true)
+	}
 	work, pause := calcWorkPause(d.Bookings)
 	work, pause = correctWorkPause(work, pause)
 	if (d.worktimeAbsece != Absence{}) {
-		work += d.worktimeAbsece.GetWorktimeReal(u, WorktimeBaseDay)
+		work += d.worktimeAbsece.GetWorktime(u, base, false)
 	}
 	return work.Round(time.Minute)
 }
 
 // Gets the corrected pause times based on db entries
-func (d *WorkDay) GetPausetimeReal(u User, base WorktimeBase) time.Duration {
+func (d *WorkDay) GetPausetime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
 	work, pause := calcWorkPause(d.Bookings)
 	work, pause = correctWorkPause(work, pause)
 	return pause.Round(time.Minute)
 }
 
 // Returns the overtime based on the db entries
-func (d *WorkDay) GetOvertimeReal(u User, base WorktimeBase) time.Duration {
+func (d *WorkDay) GetOvertime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
-	work, pause := calcWorkPause(d.Bookings)
+	work := d.GetWorktime(u, base, includeKurzarbeit)
-	work, pause = correctWorkPause(work, pause)
-	if (d.worktimeAbsece != Absence{}) {
-		work += d.worktimeAbsece.GetWorktimeReal(u, base)
-	}
-
 	var targetHours time.Duration
 	switch base {
 	case WorktimeBaseDay:
@@ -65,44 +67,8 @@ func (d *WorkDay) GetOvertimeReal(u User, base WorktimeBase) time.Duration {
 	return (work - targetHours).Round(time.Minute)
 }
 
-// Returns the worktime based on absence or kurzarbeit
+func (d *WorkDay) GetTimes(u User, base WorktimeBase, includeKurzarbeit bool) (work, pause, overtime time.Duration) {
-func (d *WorkDay) GetWorktimeVirtual(u User, base WorktimeBase) time.Duration {
+	return d.GetWorktime(u, base, includeKurzarbeit), d.GetPausetime(u, base, includeKurzarbeit), d.GetOvertime(u, base, includeKurzarbeit)
-	if !d.IsKurzArbeit() {
-		return d.GetWorktimeReal(u, base)
-	}
-	switch base {
-	case WorktimeBaseDay:
-		return u.ArbeitszeitProTag()
-	case WorktimeBaseWeek:
-		return u.ArbeitszeitProWocheFrac(0.2)
-	default:
-		return 0
-	}
-}
-
-func (d *WorkDay) GetPausetimeVirtual(u User, base WorktimeBase) time.Duration {
-	return d.GetPausetimeReal(u, base)
-}
-
-func (d *WorkDay) GetOvertimeVirtual(u User, base WorktimeBase) time.Duration {
-	work := d.GetWorktimeVirtual(u, base)
-
-	var targetHours time.Duration
-	switch base {
-	case WorktimeBaseDay:
-		targetHours = u.ArbeitszeitProTag()
-	case WorktimeBaseWeek:
-		targetHours = u.ArbeitszeitProWocheFrac(0.2)
-	}
-	return (work - targetHours).Round(time.Minute)
-}
-
-func (d *WorkDay) GetTimesReal(u User, base WorktimeBase) (work, pause, overtime time.Duration) {
-	return d.GetWorktimeReal(u, base), d.GetPausetimeReal(u, base), d.GetOvertimeReal(u, base)
-}
-
-func (d *WorkDay) GetTimesVirtual(u User, base WorktimeBase) (work, pause, overtime time.Duration) {
-	return d.GetWorktimeVirtual(u, base), d.GetPausetimeVirtual(u, base), d.GetOvertimeVirtual(u, base)
 }
 
 func calcWorkPause(bookings []Booking) (work, pause time.Duration) {
@@ -162,12 +128,12 @@ func (d *WorkDay) Date() time.Time {
 
 func (d *WorkDay) GenerateKurzArbeitBookings(u User) (time.Time, time.Time) {
 	var timeFrom, timeTo time.Time
-	if d.workTime >= u.ArbeitszeitProTag() {
+	if d.GetWorktime(u, WorktimeBaseDay, false) >= u.ArbeitszeitProTag() {
 		return timeFrom, timeTo
 	}
 
 	timeFrom = d.Bookings[len(d.Bookings)-1].Timestamp.Add(time.Minute)
-	timeTo = timeFrom.Add(u.ArbeitszeitProTag() - d.workTime)
+	timeTo = timeFrom.Add(u.ArbeitszeitProTag() - d.GetWorktime(u, WorktimeBaseDay, false))
 	slog.Debug("Added duration as Kurzarbeit", "date", d.Date().String(), "duration", timeTo.Sub(timeFrom).String())
 
 	return timeFrom, timeTo
@@ -307,7 +273,7 @@ func (d *WorkDay) GetDayProgress(u User) int8 {
 	if d.RequiresAction() {
 		return -1
 	}
-	workTime := d.GetWorktimeVirtual(u, WorktimeBaseDay)
+	workTime := d.GetWorktime(u, WorktimeBaseDay, true)
 	progress := (workTime.Seconds() / u.ArbeitszeitProTag().Seconds()) * 100
 	return int8(progress)
 }

Backend/models/workDay_test.go

@@ -49,7 +49,7 @@ func TestWorkdayWorktimeDay(t *testing.T) {
 		t.Run("Calc Absence Worktime: "+tc.testName, func(t *testing.T) {
 			var testCase = testWorkDay
 			testCase.Bookings = tc.bookings
-			workTime := testCase.GetWorktimeReal(testUser, models.WorktimeBaseDay)
+			workTime := testCase.GetWorktime(testUser, models.WorktimeBaseDay, false)
 			if workTime != tc.expectedTime {
 				t.Errorf("GetWorktimeReal not working, time should be %s, but was %s", helper.FormatDurationFill(tc.expectedTime, true), helper.FormatDurationFill(workTime, true))
 			}
@@ -84,7 +84,7 @@ func TestWorkdayWorktimeWeek(t *testing.T) {
 		t.Run("Calc Absence Worktime: "+tc.testName, func(t *testing.T) {
 			var testCase = testWorkDay
 			testCase.Bookings = tc.bookings
-			workTime := testCase.GetWorktimeReal(testUser, models.WorktimeBaseWeek)
+			workTime := testCase.GetWorktime(testUser, models.WorktimeBaseWeek, false)
 			if workTime != tc.expectedTime {
 				t.Errorf("GetWorktimeReal not working, time should be %s, but was %s", helper.FormatDurationFill(tc.expectedTime, true), helper.FormatDurationFill(workTime, true))
 			}
@@ -119,7 +119,7 @@ func TestWorkdayPausetimeDay(t *testing.T) {
 		t.Run("Calc Absence Worktime: "+tc.testName, func(t *testing.T) {
 			var testCase = testWorkDay
 			testCase.Bookings = tc.bookings
-			workTime := testCase.GetPausetimeReal(testUser, models.WorktimeBaseDay)
+			workTime := testCase.GetPausetime(testUser, models.WorktimeBaseDay, false)
 			if workTime != tc.expectedTime {
 				t.Errorf("GetPausetimeReal not working, time should be %s, but was %s", helper.FormatDurationFill(tc.expectedTime, true), helper.FormatDurationFill(workTime, true))
 			}
@@ -154,7 +154,7 @@ func TestWorkdayPausetimeWeek(t *testing.T) {
 		t.Run("Calc Absence Worktime: "+tc.testName, func(t *testing.T) {
 			var testCase = testWorkDay
 			testCase.Bookings = tc.bookings
-			workTime := testCase.GetPausetimeReal(testUser, models.WorktimeBaseWeek)
+			workTime := testCase.GetPausetime(testUser, models.WorktimeBaseWeek, false)
 			if workTime != tc.expectedTime {
 				t.Errorf("GetPausetimeReal not working, time should be %s, but was %s", helper.FormatDurationFill(tc.expectedTime, true), helper.FormatDurationFill(workTime, true))
 			}

Backend/models/workWeek.go

@@ -20,7 +20,7 @@ type WorkWeek struct {
 	User            User
 	WeekStart       time.Time
 	Worktime        time.Duration
-	WorkTimeVirtual time.Duration
+	WorktimeVirtual time.Duration
 	Overtime        time.Duration
 	Status          WeekStatus
 }
@@ -52,14 +52,14 @@ func (w *WorkWeek) PopulateWithDays(worktime time.Duration, overtime time.Durati
 	w.Days = GetDays(w.User, w.WeekStart, w.WeekStart.Add(6*24*time.Hour), false)
 
 	for _, day := range w.Days {
-		w.Worktime += day.GetWorktimeReal(w.User, WorktimeBaseDay)
+		w.Worktime += day.GetWorktime(w.User, WorktimeBaseDay, false)
-		w.WorkTimeVirtual += day.GetWorktimeVirtual(w.User, WorktimeBaseDay)
+		w.WorktimeVirtual += day.GetWorktime(w.User, WorktimeBaseDay, true)
 	}
-	slog.Debug("Got worktime for user", "worktime", w.Worktime.String(), "virtualWorkTime", w.WorkTimeVirtual.String())
+	slog.Debug("Got worktime for user", "worktime", w.Worktime.String(), "virtualWorkTime", w.WorktimeVirtual.String())
 
-	w.Overtime = w.WorkTimeVirtual - w.User.ArbeitszeitProWoche()
+	w.Overtime = w.WorktimeVirtual - w.User.ArbeitszeitProWoche()
 
-	slog.Debug("Calculated overtime", "worktime", w.Worktime.String(), "virtualWorkTime", w.WorkTimeVirtual.String())
+	slog.Debug("Calculated overtime", "worktime", w.Worktime.String(), "virtualWorkTime", w.WorktimeVirtual.String())
 
 	w.Worktime = w.Worktime.Round(time.Minute)
 	w.Overtime = w.Overtime.Round(time.Minute)

Backend/templates/teamComponents.templ

@@ -36,7 +36,7 @@ templ defaultWeekDayComponent(u models.User, day models.IWorkDay) {
 			if day.IsWorkDay() {
 				{{
 				workDay, _ := day.(*models.WorkDay)
-				work, pause, _ := workDay.GetTimesReal(u, models.WorktimeBaseDay)
+				work, pause, _ := workDay.GetTimes(u, models.WorktimeBaseDay, false)
 				}}
 				if !workDay.RequiresAction() {
 					<div class="flex flex-row gap-2">
@@ -81,7 +81,7 @@ templ weekDayComponent(user models.User, day models.WorkDay) {
 templ workWeekComponent(week models.WorkWeek, onlyAccept bool) {
 	{{
 		year, kw := week.WeekStart.ISOWeek()
-		progress := (float32(week.WorkTimeVirtual.Hours()) / week.User.ArbeitszeitPerWoche) * 100
+		progress := (float32(week.WorktimeVirtual.Hours()) / week.User.ArbeitszeitPerWoche) * 100
 	}}
 	<div class="employeComponent grid-sub responsive lg:divide-x-1 max-md:divide-y-1 @container">
 		<div class="grid-cell flex flex-col max-md:bg-neutral-300 gap-2">

Backend/templates/teamComponents_templ.go

@@ -179,7 +179,7 @@ func defaultWeekDayComponent(u models.User, day models.IWorkDay) templ.Component
 		if day.IsWorkDay() {
 
 			workDay, _ := day.(*models.WorkDay)
-			work, pause, _ := workDay.GetTimesReal(u, models.WorktimeBaseDay)
+			work, pause, _ := workDay.GetTimes(u, models.WorktimeBaseDay, false)
 			if !workDay.RequiresAction() {
 				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "<div class=\"flex flex-row gap-2\"><span class=\"text-accent\">")
 				if templ_7745c5c3_Err != nil {
@@ -346,7 +346,7 @@ func workWeekComponent(week models.WorkWeek, onlyAccept bool) templ.Component {
 		ctx = templ.ClearChildren(ctx)
 
 		year, kw := week.WeekStart.ISOWeek()
-		progress := (float32(week.WorkTimeVirtual.Hours()) / week.User.ArbeitszeitPerWoche) * 100
+		progress := (float32(week.WorktimeVirtual.Hours()) / week.User.ArbeitszeitPerWoche) * 100
 		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<div class=\"employeComponent grid-sub responsive lg:divide-x-1 max-md:divide-y-1 @container\"><div class=\"grid-cell flex flex-col max-md:bg-neutral-300 gap-2\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err

Backend/templates/timePage.templ

@@ -103,8 +103,8 @@ templ defaultDayComponent(day models.IWorkDay) {
 				if day.IsWorkDay() {
 					{{
 						workDay, _ := day.(*models.WorkDay)
-						work, pause, overtime := workDay.GetTimesVirtual(user, models.WorktimeBaseDay)
+						work, pause, overtime := workDay.GetTimes(user, models.WorktimeBaseDay, true)
-						work = workDay.GetWorktimeReal(user, models.WorktimeBaseDay)
+						work = workDay.GetWorktime(user, models.WorktimeBaseDay, false)
 					}}
 					if day.RequiresAction() {
 						<p class="text-red-600">Bitte anpassen</p>
@@ -137,7 +137,7 @@ templ defaultDayComponent(day models.IWorkDay) {
 					if len(workDay.Bookings) < 1 {
 						<p class="text group-[.edit]:hidden">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>
 					}
-					if workDay.IsKurzArbeit() {
+					if workDay.IsKurzArbeit() && len(workDay.Bookings) > 0 {
 						@absenceComponent(workDay.GetKurzArbeit(), true)
 					}
 					for _, booking := range workDay.Bookings {

Backend/templates/timePage_templ.go

@@ -297,8 +297,8 @@ func defaultDayComponent(day models.IWorkDay) templ.Component {
 		if day.IsWorkDay() {
 
 			workDay, _ := day.(*models.WorkDay)
-			work, pause, overtime := workDay.GetTimesVirtual(user, models.WorktimeBaseDay)
+			work, pause, overtime := workDay.GetTimes(user, models.WorktimeBaseDay, true)
-			work = workDay.GetWorktimeReal(user, models.WorktimeBaseDay)
+			work = workDay.GetWorktime(user, models.WorktimeBaseDay, false)
 			if day.RequiresAction() {
 				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<p class=\"text-red-600\">Bitte anpassen</p>")
 				if templ_7745c5c3_Err != nil {
@@ -436,7 +436,7 @@ func defaultDayComponent(day models.IWorkDay) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			if workDay.IsKurzArbeit() {
+			if workDay.IsKurzArbeit() && len(workDay.Bookings) > 0 {
 				templ_7745c5c3_Err = absenceComponent(workDay.GetKurzArbeit(), true).Render(ctx, templ_7745c5c3_Buffer)
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err

DocumentCreator/templates/abrechnung.typ

@@ -37,31 +37,35 @@
   [Zeitraum: #meta.TimeRange]
 
   table(
-    columns: (1fr, 1fr, 1fr, 1fr, 1fr, 1fr, .875fr, 1.25fr),
+  columns: (1fr, 1fr, 1fr, 1fr, 1fr, 1fr, .875fr, 1.25fr),
   fill: (x, y) =>
     if y == 0 { oklch(87%, 0, 0deg) },
   table-header(
-    [Datum], [Kommen], [Gehen], [Arbeitsart], [Stunden], [Pause], [Überstunden]
+    [Datum], [Kommen], [Gehen], [Arbeitsart], [Stunden], [Kurzarbeit], [Pause], [Überstunden]
   ),
   .. for day in days {
     (
     [#day.Date],
     if day.DayParts.len() == 0{
         table.cell(colspan: 3)[Keine Buchungen]
-    }else if not day.DayParts.first().IsWorkDay{
+    }else if day.DayParts.len() == 1 and not day.DayParts.first().IsWorkDay{
       table.cell(colspan: 3)[#day.DayParts.first().WorkType]
     }
     else {
-
     table.cell(colspan: 3, inset: 0em)[
-
       #table(
         columns: (1fr, 1fr, 1fr),
         .. for Zeit in day.DayParts {
       (
-      [#Zeit.BookingFrom],
+        if Zeit.IsWorkDay{
-      [#Zeit.BookingTo],
+        (
-      [#Zeit.WorkType],
+          table.cell()[#Zeit.BookingFrom],
+          table.cell()[#Zeit.BookingTo],
+          table.cell()[#Zeit.WorkType],
+        )
+        }else{
+          (table.cell(colspan: 3)[#Zeit.WorkType],)
+        }
       )
     },
       )
@@ -85,9 +89,9 @@
     stroke: none,
     table.hline(start: 0, end: 2, stroke: stroke(dash:"dashed", thickness:.5pt)),
   [Arbeitszeit :], table.cell(align: left)[#meta.WorkTime],
+  [Kurzarbeit :], table.cell(align: left)[#meta.Kurzarbeit],
   [Überstunden :], table.cell(align: left)[#meta.Overtime],
-  [Überstunden :],table.cell(align: left)[#meta.OvertimeTotal],
+  [Überstunden lfd. :],table.cell(align: left)[#meta.OvertimeTotal],
   table.hline(start: 0, end: 2),
-
 )
 }