Merge remote-tracking branch 'origin/dev/main' into dev/main

Backend/endpoints/auto_logout.go

@@ -5,6 +5,7 @@ import (
 	"arbeitszeitmessung/models"
 	"encoding/json"
 	"fmt"
+	"log"
 	"net/http"
 )
 
@@ -31,6 +32,7 @@ func autoLogout(w http.ResponseWriter) {
 				fmt.Printf("Error logging out user %v\n", err)
 			} else {
 				logged_out_users = append(logged_out_users, user)
+				log.Printf("Automaticaly logged out user %s, %s ", user.Name, user.Vorname)
 			}
 		}
 

Backend/models/user.go

@@ -68,7 +68,7 @@ func (u *User) GetAll() ([]User, error) {
 // Returns true if there is a booking 1 for today -> meaning the user is at work
 // Returns false if there is no booking today or the user is already booked out of the system
 func (u *User) CheckAnwesenheit() bool {
-	qStr, err := DB.Prepare((`SELECT check_in_out FROM anwesenheit WHERE card_uid = $1 AND "timestamp" >= now()::date + interval '1h' ORDER BY "timestamp" DESC LIMIT 1;`))
+	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)
 		return false