From 6da58d6753e7e42e708be9152084ee04ce556469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Tr=C3=B6ger?= Date: Thu, 9 Oct 2025 13:11:54 +0200 Subject: [PATCH] fixed #54, #55 --- Backend/models/workDay.go | 1 + Backend/models/workWeek.go | 9 +++-- Backend/templates/pages.templ | 55 ----------------------------- Backend/templates/pages_templ.go | 4 +-- Backend/templates/timePage.templ | 2 +- Backend/templates/timePage_templ.go | 2 +- 6 files changed, 12 insertions(+), 61 deletions(-) diff --git a/Backend/models/workDay.go b/Backend/models/workDay.go index cde6dd3..6624296 100644 --- a/Backend/models/workDay.go +++ b/Backend/models/workDay.go @@ -84,6 +84,7 @@ func (d *WorkDay) TimeWorkVirtual(u User) time.Duration { if d.IsKurzArbeit() { return u.ArbeitszeitProTag() } + return d.workTime } diff --git a/Backend/models/workWeek.go b/Backend/models/workWeek.go index 7144b8e..634d6fb 100644 --- a/Backend/models/workWeek.go +++ b/Backend/models/workWeek.go @@ -45,11 +45,15 @@ func NewWorkWeek(user User, tsMonday time.Time, populate bool) WorkWeek { } func (w *WorkWeek) PopulateWithDays(worktime time.Duration, overtime time.Duration) { + log.Println("Got Days with overtime and worktime", worktime, overtime) w.Days = GetDays(w.User, w.WeekStart, w.WeekStart.Add(6*24*time.Hour), false) + log.Println(w.Worktime) for _, day := range w.Days { + log.Println(day.TimeWorkVirtual(w.User)) w.Worktime += day.TimeWorkVirtual(w.User) } + log.Println("Calculated new worktime", w.Worktime) w.Overtime = w.Worktime - w.User.ArbeitszeitProWoche() w.Worktime = w.Worktime.Round(time.Minute) @@ -127,12 +131,13 @@ func (w *WorkWeek) GetSendWeeks(user User) []WorkWeek { defer rows.Close() for rows.Next() { var week WorkWeek = WorkWeek{User: user} - if err := rows.Scan(&week.Id, &week.WeekStart, &week.Worktime, &week.Overtime); err != nil { + var workTime, overTime time.Duration + if err := rows.Scan(&week.Id, &week.WeekStart, &workTime, &overTime); err != nil { log.Println("Error scanning row!", err) return weeks } - week.PopulateWithDays(week.Worktime, week.Overtime) + week.PopulateWithDays(workTime, overTime) weeks = append(weeks, week) } if err = rows.Err(); err != nil { diff --git a/Backend/templates/pages.templ b/Backend/templates/pages.templ index 7d9c6a7..b2a3475 100644 --- a/Backend/templates/pages.templ +++ b/Backend/templates/pages.templ @@ -93,61 +93,6 @@ templ TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) { @workWeekComponent(userWeek, false) - //
- //
- //

Eigene Abrechnung

- //
- //
- //
- // @weekPicker(userWeek.WeekStart) - //
- //

{ fmt.Sprintf("%s %s", userWeek.User.Vorname, userWeek.User.Name) }

- //
- //
- // - // @statusCheckMark(userWeek.CheckStatus(), models.WeekStatusSent) - // Gesendet - // - // - // @statusCheckMark(userWeek.CheckStatus(), models.WeekStatusAccepted) - // Akzeptiert - // - //
- //
- // @timeGaugeComponent(int8(progress), false) - //
- //

Arbeitszeit: { fmt.Sprintf("%s", helper.FormatDuration(userWeek.Worktime)) }

- //

Überstunden: { fmt.Sprintf("%s", helper.FormatDurationFill(userWeek.Overtime, true)) }

- //
- //
- //
- //
- //
- // for _, day := range userWeek.Days { - // @defaultWeekDayComponent(userWeek.User, day) - // } - //
- //
- //
- // @weekPicker(userWeek.WeekStart) - //
- //
- // - // - // - // switch userWeek.CheckStatus() { - // case models.WeekStatusNone: - //

an Vorgesetzten senden

- // case models.WeekStatusSent: - //

an Vorgesetzten gesendet

- // case models.WeekStatusAccepted: - //

vom Vorgesetzten bestätigt

- // } - // - // - //
- //
- //
if len(weeks) > 0 {

Abrechnung Mitarbeiter

diff --git a/Backend/templates/pages_templ.go b/Backend/templates/pages_templ.go index 14fae96..ad17982 100644 --- a/Backend/templates/pages_templ.go +++ b/Backend/templates/pages_templ.go @@ -337,7 +337,7 @@ func TeamPresencePage(teamPresence map[models.User]bool) templ.Component { var templ_7745c5c3_Var11 string templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 173, Col: 22} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 118, Col: 22} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) if templ_7745c5c3_Err != nil { @@ -350,7 +350,7 @@ func TeamPresencePage(teamPresence map[models.User]bool) templ.Component { var templ_7745c5c3_Var12 string templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(user.Name) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 173, Col: 36} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 118, Col: 36} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) if templ_7745c5c3_Err != nil { diff --git a/Backend/templates/timePage.templ b/Backend/templates/timePage.templ index 1c68483..7df0b29 100644 --- a/Backend/templates/timePage.templ +++ b/Backend/templates/timePage.templ @@ -103,7 +103,7 @@ templ defaultDayComponent(day models.IWorkDay) { if day.IsWorkDay() { {{ workDay, _ := day.(*models.WorkDay) - work, pause, overtime := workDay.GetAllWorkTimesVirtual(user) + work, pause, overtime := workDay.GetAllWorkTimesReal(user) }} if day.RequiresAction() {

Bitte anpassen

diff --git a/Backend/templates/timePage_templ.go b/Backend/templates/timePage_templ.go index 272389b..dd29246 100644 --- a/Backend/templates/timePage_templ.go +++ b/Backend/templates/timePage_templ.go @@ -297,7 +297,7 @@ func defaultDayComponent(day models.IWorkDay) templ.Component { if day.IsWorkDay() { workDay, _ := day.(*models.WorkDay) - work, pause, overtime := workDay.GetAllWorkTimesVirtual(user) + work, pause, overtime := workDay.GetAllWorkTimesReal(user) if day.RequiresAction() { templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "

Bitte anpassen

") if templ_7745c5c3_Err != nil {