This commit is contained in:
@@ -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.GetTimesReal(u, models.WorktimeBaseWeek)
|
||||
work, pause, overtime := day.GetTimesVirtual(u, models.WorktimeBaseWeek)
|
||||
thisTypstDay.Date = day.Date().Format(DE_DATE)
|
||||
thisTypstDay.Worktime = helper.FormatDurationFill(work, true)
|
||||
thisTypstDay.Pausetime = helper.FormatDurationFill(pause, true)
|
||||
@@ -45,6 +45,16 @@ func convertDayToTypstDayParts(day models.IWorkDay, user models.User) []typstDay
|
||||
typstDayPart.IsWorkDay = true
|
||||
typstDayParts = append(typstDayParts, typstDayPart)
|
||||
}
|
||||
if day.IsKurzArbeit() {
|
||||
tsFrom, tsTo := workDay.GenerateKurzArbeitBookings(user)
|
||||
typstDayParts = append(typstDayParts, typstDayPart{
|
||||
BookingFrom: tsFrom.Format("15:04"),
|
||||
BookingTo: tsTo.Format("15:04"),
|
||||
WorkType: "Kurzarbeit",
|
||||
IsWorkDay: true,
|
||||
})
|
||||
}
|
||||
|
||||
} else {
|
||||
absentDay, _ := day.(*models.Absence)
|
||||
typstDayParts = append(typstDayParts, typstDayPart{IsWorkDay: false, WorkType: absentDay.AbwesenheitTyp.Name})
|
||||
@@ -122,7 +132,7 @@ func createEmployeReport(employee models.User, startDate, endDate time.Time) (by
|
||||
|
||||
var actualHours time.Duration
|
||||
for _, day := range workingDays {
|
||||
actualHours += day.TimeWorkVirtual(employee)
|
||||
actualHours += day.GetWorktimeVirtual(employee, models.WorktimeBaseDay)
|
||||
}
|
||||
worktimeBalance := actualHours - targetHours
|
||||
|
||||
@@ -162,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.TimeOvertimeReal(user)
|
||||
aggregatedWorkTime += day.TimeWorkVirtual(user)
|
||||
aggregatedOvertime += day.GetOvertimeReal(user, models.WorktimeBaseWeek)
|
||||
aggregatedWorkTime += day.GetWorktimeVirtual(user, models.WorktimeBaseWeek)
|
||||
}
|
||||
|
||||
typstDays, err := convertDaysToTypst(weeks, user)
|
||||
@@ -193,6 +203,7 @@ type typstMetadata struct {
|
||||
TimeRange string `json:"time-range"`
|
||||
EmployeeName string `json:"employee-name"`
|
||||
WorkTime string `json:"worktime"`
|
||||
Kurzarbeit string `json:"kurzarbeit"`
|
||||
Overtime string `json:"overtime"`
|
||||
OvertimeTotal string `json:"overtime-total"`
|
||||
CurrentTimestamp string `json:"current-timestamp"`
|
||||
|
||||
Reference in New Issue
Block a user