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

working on printable PDF Forms
All checks were successful
Tests / Run Go Tests (push) Successful in 30s
Details

Browse Source
This commit is contained in:
Tom Tröger
2025-09-08 00:32:29 +02:00
parent 12ed9959cb
commit 2eab598348
12 changed files with 305 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Backend/models/user.go
View File

@@ -22,7 +22,7 @@ type User struct {
Overtime time.Duration
}
func (u *User) GetUserFromSession(Session *scs.SessionManager, ctx context.Context) (User, error) {
func GetUserFromSession(Session *scs.SessionManager, ctx context.Context) (User, error) {
var user User
var err error
if helper.GetEnv("GO_ENV", "production") == "debug" {

4
Backend/models/workDay.go
View File

@@ -19,7 +19,7 @@ type WorkDay struct {
Absence Absence
}
func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay {
func GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay {
var workDays []WorkDay
var workSec, pauseSec float64
@@ -181,7 +181,7 @@ func (d *WorkDay) getWorkTime() {
d.calcPauseTime()
}
func (d *WorkDay) GetWorkTimeString() (string, string) {
func (d *WorkDay) GetWorkTimeString() (work string, pause string) {
workString := helper.FormatDuration(d.workTime)
pauseString := helper.FormatDuration(d.pauseTime)
return workString, pauseString

2
Backend/models/workWeek.go
View File

@@ -45,7 +45,7 @@ func NewWorkWeek(user User, tsMonday time.Time, populate bool) WorkWeek {
}
func (w *WorkWeek) PopulateWithBookings(worktime time.Duration, overtime time.Duration) {
w.WorkDays = (*WorkDay).GetWorkDays(nil, w.User.CardUID, w.WeekStart, w.WeekStart.Add(7*24*time.Hour))
w.WorkDays = GetWorkDays(w.User.CardUID, w.WeekStart, w.WeekStart.Add(7*24*time.Hour))
if absences, err := GetAbsencesByCardUID(w.User.CardUID, w.WeekStart, w.WeekStart.Add(7*24*time.Hour)); err == nil {
w.Absences = absences
} else {