refactor + added kurzarbeit to pdf export #66

Merged
tom_trgr merged 5 commits from dev/broken into dev/pdf 2025-12-12 14:17:17 +01:00
Showing only changes of commit a1b225478a - Show all commits

View File

@@ -7,6 +7,7 @@ import (
"errors"
"fmt"
"log"
"log/slog"
"time"
"github.com/alexedwards/scs/v2"
@@ -62,7 +63,6 @@ func GetAllUsers() ([]User, error) {
qStr, err := DB.Prepare((`SELECT card_uid, vorname, nachname,arbeitszeit_per_tag, arbeitszeit_per_woche FROM s_personal_daten;`))
var users []User
if err != nil {
fmt.Printf("Error preparing query statement %v\n", err)
return users, err
}
defer qStr.Close()
@@ -90,7 +90,6 @@ func (u *User) GetAll() ([]User, error) {
qStr, err := DB.Prepare((`SELECT card_uid, vorname, nachname FROM s_personal_daten;`))
var users []User
if err != nil {
fmt.Printf("Error preparing query statement %v\n", err)
return users, err
}
defer qStr.Close()
@@ -136,7 +135,7 @@ func (u *User) ArbeitszeitProWocheFrac(fraction float32) time.Duration {
func (u *User) CheckAnwesenheit() bool {
qStr, err := DB.Prepare((`SELECT check_in_out FROM anwesenheit WHERE card_uid = $1 AND "timestamp"::date = now()::date ORDER BY "timestamp" DESC LIMIT 1;`))
if err != nil {
fmt.Printf("Error preparing query statement %v\n", err)
slog.Debug("Error preparing query statement.", "error", err)
return false
}
defer qStr.Close()
@@ -210,7 +209,7 @@ 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;`))
if err != nil {
log.Println("Error preparing db statement", err)
slog.Debug("Error preparing query statement.", "error", err)
return false
}
defer qStr.Close()
@@ -302,7 +301,7 @@ func (u *User) GetLastWorkWeekSubmission() time.Time {
) AS letzte_buchung;
`)
if err != nil {
log.Println("Error preparing statement!", err)
slog.Debug("Error preparing query statement.", "error", err)
return lastSub
}
err = qStr.QueryRow(u.PersonalNummer, u.CardUID).Scan(&lastSub)