CHANGE: Minor improvements + updated api docs

.gitignore

@@ -31,3 +31,8 @@ DB/pg_data
 .env.*
 .env
 !.env.example
+
+.idea
+.vscode
+
+node_modules

.vscode/launch.json

@@ -1,19 +0,0 @@
-{
-	// Use IntelliSense to learn about possible attributes.
-	// Hover to view descriptions of existing attributes.
-	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"name": "Backend",
-			"type": "go",
-			"request": "launch",
-			"mode": "auto",
-			"program": "${workspaceFolder}/Backend",
-			"dlvFlags": ["--check-go-version=false"],
-			"env": {
-				"DEBUG": "true"
-			}
-		}
-	]
-}

.vscode/settings.json

@@ -1,15 +0,0 @@
-{
-	"sqltools.connections": [
-		{
-			"previewLimit": 50,
-			"server": "localhost",
-			"port": 5432,
-			"askForPassword": true,
-			"driver": "PostgreSQL",
-			"name": "arbeitszeiten",
-			"database": "arbeitszeitmessung",
-			"username": "arbeit_zeit"
-		}
-	],
-	"makefile.configureOnOpen": false
-}

Backend/database.go

@@ -10,8 +10,8 @@ import (
 func OpenDatabase() (*sql.DB, error) {
 	dbHost := helper.GetEnv("POSTGRES_HOST", "localhost")
 	dbName := helper.GetEnv("POSTGRES_DB", "arbeitszeitmessung")
-	dbUser := helper.GetEnv("POSTGRES_USER", "arbeit_zeit")
+	dbUser := helper.GetEnv("POSTGRES_API_USER", "arbeit_zeit")
-	dbPassword := helper.GetEnv("POSTGRES_PASS", "password")
+	dbPassword := helper.GetEnv("POSTGRES_API_PASS", "password")
 
 	connStr := fmt.Sprintf("postgres://%s:%s@%s:5432/%s?sslmode=disable&TimeZone=Europe/Berlin", dbUser, dbPassword, dbHost, dbName)
 	return sql.Open("postgres", connStr)

Backend/endpoints/team.go

@@ -0,0 +1,117 @@
+package endpoints
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"arbeitszeitmessung/templates"
+	"context"
+	"errors"
+	"log"
+	"net/http"
+	"strconv"
+	"time"
+)
+
+func TeamHandler(w http.ResponseWriter, r *http.Request) {
+	helper.RequiresLogin(Session, w, r)
+	switch r.Method {
+	case http.MethodPost:
+		submitReport(w, r)
+		break
+	case http.MethodGet:
+		showWeeks(w, r)
+		break
+	default:
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
+		break
+	}
+	// user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
+	// if err != nil {
+	// 	log.Println("No user found with the given personal number!")
+	// 	http.Redirect(w, r, "/user/login", http.StatusSeeOther)
+	// 	return
+	// }
+	// var userWorkDays []models.WorkDay
+	// userWorkDays = (*models.WorkDay).GetWorkDays(nil, user.CardUID, time.Date(2025, time.February, 24, 0, 0, 0, 0, time.Local), time.Date(2025, time.February, 24+7, 0, 0, 0, 0, time.Local))
+	// log.Println("User:", user)
+	// teamMembers, err := user.GetTeamMembers()
+	// getWeeksTillNow(time.Now().AddDate(0, 0, -14))
+	// templates.TeamPage(teamMembers, userWorkDays).Render(r.Context(), w)
+}
+
+func submitReport(w http.ResponseWriter, r *http.Request) {
+	err := r.ParseForm()
+	if err != nil {
+		log.Println("Error parsing form", err)
+		return
+	}
+	userPN, _ := strconv.Atoi(r.FormValue("user"))
+	_weekTs := r.FormValue("week")
+	weekTs, err := time.Parse(time.DateOnly, _weekTs)
+	user, err := (*models.User).GetByPersonalNummer(nil, userPN)
+	workWeek := (*models.WorkWeek).GetWeek(nil, user, weekTs, false)
+
+	if err != nil {
+		log.Println("Could not get user!")
+		return
+	}
+
+	switch r.FormValue("method") {
+	case "send":
+		err = workWeek.Send()
+		break
+	case "accept":
+		err = workWeek.Accept()
+		break
+	default:
+		break
+	}
+	if errors.Is(err, models.ErrRunningWeek) {
+		showWeeks(w, r.WithContext(context.WithValue(r.Context(), "error", true)))
+	}
+	showWeeks(w, r)
+}
+
+func showWeeks(w http.ResponseWriter, r *http.Request) {
+	user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
+	if err != nil {
+		log.Println("No user found with the given personal number!")
+		http.Redirect(w, r, "/user/login", http.StatusSeeOther)
+		return
+	}
+	var workWeeks []models.WorkWeek
+	teamMembers, err := user.GetTeamMembers()
+	for _, member := range teamMembers {
+		weeks := (*models.WorkWeek).GetSendWeeks(nil, member)
+		workWeeks = append(workWeeks, weeks...)
+	}
+	lastSub := user.GetLastSubmission()
+	log.Println(lastSub)
+	userWeek := (*models.WorkWeek).GetWeek(nil, user, lastSub, true)
+	// isRunningWeek := time.Since(lastSub) < 24*5*time.Hour //the last submission is this week and cannot be send yet
+	templates.TeamPage(workWeeks, userWeek).Render(r.Context(), w)
+}
+
+func getWeeksTillNow(lastWeek time.Time) []time.Time {
+	var weeks []time.Time
+	if lastWeek.After(time.Now()) {
+		log.Println("Timestamp is after today, no weeks till now!")
+		return weeks
+	}
+	if lastWeek.Weekday() != time.Monday {
+		if lastWeek.Weekday() == time.Sunday {
+			lastWeek = lastWeek.AddDate(0, 0, -6)
+		} else {
+			lastWeek = lastWeek.AddDate(0, 0, -int(lastWeek.Weekday()-1))
+		}
+	}
+	if time.Since(lastWeek) < 24*5*time.Hour {
+		log.Println("Timestamp in running week, cannot split!")
+	}
+
+	for t := lastWeek; t.Before(time.Now()); t = t.Add(7 * 24 * time.Hour) {
+		weeks = append(weeks, t)
+	}
+	log.Println(weeks)
+	return weeks
+}

Backend/endpoints/time.go

@@ -14,17 +14,22 @@ import (
 
 // Frontend relevant backend functionality -> not used by the arduino devices
 func TimeHandler(w http.ResponseWriter, r *http.Request) {
+	helper.RequiresLogin(Session, w, r)
 	helper.SetCors(w)
 	switch r.Method {
-	case "GET":
+	case http.MethodGet:
 		getBookings(w, r)
-	case "POST":
+		break
+	case http.MethodPost:
 		updateBooking(w, r)
-	case "OPTIONS":
+		break
+	case http.MethodOptions:
 		// just support options header for non GET Requests from SWAGGER
 		w.WriteHeader(http.StatusOK)
+		break
 	default:
-		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
+		break
 	}
 }
 
@@ -42,22 +47,10 @@ func parseTimestamp(r *http.Request, get_key string, fallback string) (time.Time
 
 // Returns bookings from DB with similar card uid -> checks for card uid in http query params
 func getBookings(w http.ResponseWriter, r *http.Request) {
-	var user models.User
+	user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
-	var err error
-	if helper.GetEnv("GO_ENV", "production") == "debug" {
-		user, err = (*models.User).GetByPersonalNummer(nil, 123)
-	} else {
-		if !Session.Exists(r.Context(), "user") {
-			log.Println("No user in session storage!")
-			http.Error(w, "Not logged in!", http.StatusForbidden)
-			return
-		}
-
-		user, err = (*models.User).GetByPersonalNummer(nil, Session.GetInt(r.Context(), "user"))
-	}
 	if err != nil {
 		log.Println("No user found with the given personal number!")
-		http.Error(w, "No user found", http.StatusNotFound)
+		http.Redirect(w, r, "/user/login", http.StatusSeeOther)
 		return
 	}
 
@@ -82,6 +75,12 @@ func getBookings(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 		return
 	}
+	if r.Header.Get("Accept") == "application/json" {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusOK)
+		json.NewEncoder(w).Encode(bookings)
+		return
+	}
 	ctx := context.WithValue(r.Context(), "user", user)
 	templates.TimePage(bookings).Render(ctx, w)
 }

Backend/endpoints/time_create.go

@@ -16,13 +16,17 @@ func TimeCreateHandler(w http.ResponseWriter, r *http.Request) {
 	switch r.Method {
 	case http.MethodPut:
 		createBooking(w, r)
+		break
 	case http.MethodGet:
 		createBooking(w, r)
+		break
 	case http.MethodOptions:
 		// just support options header for non GET Requests from SWAGGER
 		w.WriteHeader(http.StatusOK)
+		break
 	default:
 		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+		break
 	}
 }
 
@@ -55,8 +59,16 @@ func createBooking(w http.ResponseWriter, r *http.Request) {
 }
 
 func checkPassword(r *http.Request) bool {
-	authToken := helper.GetEnv("apiToken", "dont_access")
+	authToken := helper.GetEnv("API_TOKEN", "dont_access")
 	authHeaders := r.Header.Get("Authorization")
 	_authStart := len("Bearer ")
+	if len(authHeaders) <= _authStart {
+		authHeaders = r.URL.Query().Get("api_key")
+		_authStart = 0
+		if len(authHeaders) <= _authStart {
+			return false
+		}
+	}
+	log.Println(authHeaders)
 	return authToken == authHeaders[_authStart:]
 }

Backend/endpoints/user.go

@@ -1,6 +1,7 @@
 package endpoints
 
 import (
+	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"arbeitszeitmessung/templates"
 	"log"
@@ -18,27 +19,26 @@ func CreateSessionManager(lifetime time.Duration) *scs.SessionManager {
 	Session.Lifetime = lifetime
 	return Session
 }
+
 func LoginHandler(w http.ResponseWriter, r *http.Request) {
 	switch r.Method {
 	case http.MethodGet:
-		showLoginForm(w, r, false)
+		showLoginPage(w, r, false)
 		break
 	case http.MethodPost:
 		loginUser(w, r)
 		break
 	default:
-		showLoginForm(w, r, false)
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
 		break
 	}
 }
 
 func UserHandler(w http.ResponseWriter, r *http.Request) {
-	if !Session.Exists(r.Context(), "user") {
+	helper.RequiresLogin(Session, w, r)
-		http.Redirect(w, r, "/user/login", http.StatusSeeOther)
-	}
 	switch r.Method {
 	case http.MethodGet:
-		showPWForm(w, r, 0)
+		showUserPage(w, r, 0)
 		break
 	case http.MethodPost:
 		changePassword(w, r)
@@ -49,7 +49,7 @@ func UserHandler(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func showLoginForm(w http.ResponseWriter, r *http.Request, failed bool) {
+func showLoginPage(w http.ResponseWriter, r *http.Request, failed bool) {
 	templates.LoginPage(failed).Render(r.Context(), w)
 }
 
@@ -85,10 +85,10 @@ func loginUser(w http.ResponseWriter, r *http.Request) {
 		Session.Put(r.Context(), "user", user.PersonalNummer)
 		http.Redirect(w, r, "/time", http.StatusSeeOther) //with this browser always uses GET
 	} else {
-		showLoginForm(w, r, true)
+		showLoginPage(w, r, true)
 		return
 	}
-	showLoginForm(w, r, false)
+	showLoginPage(w, r, false)
 	return
 }
 
@@ -103,26 +103,26 @@ func changePassword(w http.ResponseWriter, r *http.Request) {
 	password := r.FormValue("password")
 	newPassword := r.FormValue("new_password")
 	if password == "" || newPassword == "" || newPassword != r.FormValue("new_password_repeat") {
-		showPWForm(w, r, http.StatusBadRequest)
+		showUserPage(w, r, http.StatusBadRequest)
 		return
 	}
 	user, err := (*models.User).GetByPersonalNummer(nil, Session.GetInt(r.Context(), "user"))
 	if err != nil {
 		log.Println("Error getting user!", err)
-		showPWForm(w, r, http.StatusBadRequest)
+		showUserPage(w, r, http.StatusBadRequest)
 	}
 	auth, err := user.ChangePass(password, newPassword)
 	if err != nil {
 		log.Println("Error when changing password!", err)
 	}
 	if auth {
-		showPWForm(w, r, http.StatusOK)
+		showUserPage(w, r, http.StatusOK)
 		return
 	}
-	showPWForm(w, r, http.StatusUnauthorized)
+	showUserPage(w, r, http.StatusUnauthorized)
 }
 
-func showPWForm(w http.ResponseWriter, r *http.Request, status int) {
+func showUserPage(w http.ResponseWriter, r *http.Request, status int) {
 	templates.UserPage(status).Render(r.Context(), w)
 	return
 }

Backend/helper/web.go

@@ -3,15 +3,28 @@ package helper
 import (
 	"net/http"
 	"os"
+
+	"github.com/alexedwards/scs/v2"
 )
 
 // setting cors, important for later frontend use
 //
 // in DEBUG == "true" everything is set to "*" so that no cors errors will be happen
 func SetCors(w http.ResponseWriter) {
-	if os.Getenv("DEBUG") == "true" {
+	if os.Getenv("NO_CORS") == "true" {
 		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Access-Control-Allow-Methods", "*")
 		w.Header().Set("Access-Control-Allow-Headers", "*")
+		// log.Println("Setting cors to *")
 	}
 }
+
+func RequiresLogin(session *scs.SessionManager, w http.ResponseWriter, r *http.Request) {
+	if GetEnv("GO_ENV", "production") == "debug" {
+		return
+	}
+	if session.Exists(r.Context(), "user") {
+		return
+	}
+	http.Redirect(w, r, "/user/login", http.StatusSeeOther)
+}

Backend/main.go

@@ -4,12 +4,14 @@ import (
 	"arbeitszeitmessung/endpoints"
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
+	"arbeitszeitmessung/templates"
 	"context"
 	"fmt"
 	"log"
 	"net/http"
 	"time"
 
+	"github.com/a-h/templ"
 	"github.com/joho/godotenv"
 	_ "github.com/lib/pq"
 )
@@ -39,6 +41,8 @@ func main() {
 	server.HandleFunc("/logout", endpoints.LogoutHandler)
 	server.HandleFunc("/user/login", endpoints.LoginHandler)
 	server.HandleFunc("/user", endpoints.UserHandler)
+	server.HandleFunc("/team", endpoints.TeamHandler)
+	server.Handle("/", templ.Handler(templates.NavPage()))
 	server.Handle("/static/", http.StripPrefix("/static/", fs))
 
 	serverSessionMiddleware := endpoints.Session.LoadAndSave(server)

Backend/models/booking.go

@@ -116,11 +116,11 @@ func (b *Booking) GetBookingsByCardID(card_uid string, tsFrom time.Time, tsTo ti
 	return bookings, nil
 }
 
-func (b *Booking) GetBookingsGrouped(card_uid string, tsFrom time.Time, tsTo time.Time) ([]WorkDay, error){
+func (b *Booking) GetBookingsGrouped(card_uid string, tsFrom time.Time, tsTo time.Time) ([]WorkDay, error) {
 	var grouped = make(map[string][]Booking)
 	bookings, err := b.GetBookingsByCardID(card_uid, tsFrom, tsTo)
-	if (err != nil){
+	if err != nil {
-		log.Println("Failed to get bookings",err)
+		log.Println("Failed to get bookings", err)
 		return []WorkDay{}, nil
 	}
 	for _, booking := range bookings {
@@ -161,14 +161,14 @@ func (b Booking) Save() {
 }
 
 func (b *Booking) GetBookingType() string {
-	switch b.CheckInOut{
+	switch b.CheckInOut {
-		case 1,3: //manuelle Änderung
+	case 1, 3: //manuelle Änderung
 		return "kommen"
-		case 2, 4: //manuelle Änderung
+	case 2, 4: //manuelle Änderung
 		return "gehen"
-		case 255:
+	case 255:
 		return "abgemeldet"
-		default:
+	default:
 		return "Buchungs Typ unbekannt"
 	}
 }
@@ -183,7 +183,7 @@ func (b *Booking) Update(nb Booking) {
 	if b.GeraetID != nb.GeraetID && nb.GeraetID != 0 {
 		b.GeraetID = nb.GeraetID
 	}
-	if(b.Timestamp != nb.Timestamp){
+	if b.Timestamp != nb.Timestamp {
 		b.Timestamp = nb.Timestamp
 	}
 }
@@ -203,25 +203,25 @@ func checkLastBooking(b Booking) bool {
 		log.Println("Error checking last booking: ", err)
 		return false
 	}
-	if int16(check_in_out) == b.CheckInOut {
+	if int16(check_in_out)%2 == b.CheckInOut%2 {
 		return false
 	}
 	return true
 }
 
-func (b *Booking) UpdateTime(newTime time.Time){
+func (b *Booking) UpdateTime(newTime time.Time) {
 	hour, minute, _ := newTime.Clock()
-	if(hour == b.Timestamp.Hour() && minute == b.Timestamp.Minute()){
+	if hour == b.Timestamp.Hour() && minute == b.Timestamp.Minute() {
 		return
 	}
 	// TODO: add check for time overlap
 
 	var newBooking Booking
-	newBooking.Timestamp =  time.Date(b.Timestamp.Year(), b.Timestamp.Month(), b.Timestamp.Day(), hour, minute, 0, 0, time.Local)
+	newBooking.Timestamp = time.Date(b.Timestamp.Year(), b.Timestamp.Month(), b.Timestamp.Day(), hour, minute, 0, 0, time.Local)
-	if(b.CheckInOut < 3){
+	if b.CheckInOut < 3 {
 		newBooking.CheckInOut = b.CheckInOut + 2
 	}
-	if(b.CheckInOut == 255){
+	if b.CheckInOut == 255 {
 		newBooking.CheckInOut = 4
 	}
 	b.Update(newBooking)

Backend/models/user.go

@@ -1,8 +1,15 @@
 package models
 
 import (
+	"arbeitszeitmessung/helper"
+	"context"
+	"database/sql"
+	"errors"
 	"fmt"
 	"log"
+	"time"
+
+	"github.com/alexedwards/scs/v2"
 )
 
 type User struct {
@@ -13,6 +20,25 @@ type User struct {
 	Arbeitszeit    float32 `json:"arbeitszeit"`
 }
 
+func (u *User) GetUserFromSession(Session *scs.SessionManager, ctx context.Context) (User, error) {
+	var user User
+	var err error
+	if helper.GetEnv("GO_ENV", "production") == "debug" {
+		user, err = (*User).GetByPersonalNummer(nil, 123)
+	} else {
+		if !Session.Exists(ctx, "user") {
+			log.Println("No user in session storage!")
+			return user, errors.New("No user in session storage!")
+		}
+		user, err = (*User).GetByPersonalNummer(nil, Session.GetInt(ctx, "user"))
+	}
+	if err != nil {
+		log.Println("Cannot get user from session!")
+		return user, err
+	}
+	return user, nil
+}
+
 func (u *User) GetAll() ([]User, error) {
 	qStr, err := DB.Prepare((`SELECT card_uid, vorname, nachname FROM personal_daten;`))
 	var users []User
@@ -115,3 +141,91 @@ func (u *User) ChangePass(password, newPassword string) (bool, error) {
 	}
 	return true, nil
 }
+
+func (u *User) GetTeamMembers() ([]User, error) {
+	var teamMembers []User
+	qStr, err := DB.Prepare(`SELECT personal_nummer, card_uid, vorname, nachname, arbeitszeit_per_tag FROM personal_daten WHERE vorgesetzter_pers_nr = $1`)
+	if err != nil {
+		return teamMembers, err
+	}
+	defer qStr.Close()
+	rows, err := qStr.Query(u.PersonalNummer)
+	if err != nil {
+		log.Println("Error getting rows!")
+		return teamMembers, err
+	}
+	defer rows.Close()
+	for rows.Next() {
+		user, err := parseUser(rows)
+		if err != nil {
+			log.Println("Error parsing user!")
+			return teamMembers, err
+		}
+		teamMembers = append(teamMembers, user)
+	}
+
+	return teamMembers, nil
+}
+
+func (u *User) GetWeek(tsFrom time.Time) WorkWeek {
+	var bookings []WorkDay
+	weekStart := tsFrom.AddDate(0, 0, -1*int(tsFrom.Local().Weekday())-1)
+	bookings, err := (*Booking).GetBookingsGrouped(nil, u.CardUID, weekStart, time.Now())
+	if err != nil {
+		log.Println("Error fetching bookings!")
+		return WorkWeek{WorkDays: bookings}
+	}
+	return WorkWeek{WorkDays: bookings}
+}
+
+// gets the first week, that needs to be submitted
+func (u *User) GetNextWeek() WorkWeek {
+	var week WorkWeek
+	return week
+
+}
+
+func parseUser(rows *sql.Rows) (User, error) {
+	var user User
+	if err := rows.Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.Arbeitszeit); err != nil {
+		log.Println("Error scanning row!", err)
+		return user, err
+	}
+	return user, nil
+}
+
+// returns the start of the week, the last submission was made, submission == first booking or last send booking_report to team leader
+func (u *User) GetLastSubmission() time.Time {
+	var lastSub time.Time
+	qStr, err := DB.Prepare(`
+	SELECT COALESCE(
+	    (SELECT woche_start + INTERVAL '1 week' FROM wochen_report WHERE personal_nummer = $1 ORDER BY woche_start DESC LIMIT 1),
+	    (SELECT timestamp FROM anwesenheit WHERE card_uid = $2 ORDER BY timestamp LIMIT 1)
+    ) AS letzte_buchung;
+`)
+	if err != nil {
+		log.Println("Error preparing statement!", err)
+		return lastSub
+	}
+	err = qStr.QueryRow(u.PersonalNummer, u.CardUID).Scan(&lastSub)
+	if err != nil {
+		log.Println("Error executing query!", err)
+		return lastSub
+	}
+	log.Println("From DB: ", lastSub)
+	lastSub = getMonday(lastSub)
+	lastSub = lastSub.Round(24 * time.Hour)
+	log.Println("After truncate: ", lastSub)
+	return lastSub
+}
+
+func getMonday(ts time.Time) time.Time {
+	if ts.Weekday() != time.Monday {
+		if ts.Weekday() == time.Sunday {
+			ts = ts.AddDate(0, 0, -6)
+		} else {
+			ts = ts.AddDate(0, 0, -int(ts.Weekday()-1))
+		}
+	}
+	return ts
+}

Backend/models/workDay.go

@@ -2,60 +2,144 @@ package models
 
 import (
 	"fmt"
+	"log"
 	"time"
 )
 
 type WorkDay struct {
-	Day time.Time
+	Day       time.Time `json:"day"`
-	Bookings []Booking
+	Bookings  []Booking `json:"bookings"`
-	workTime time.Duration
+	workTime  time.Duration
 	pauseTime time.Duration
 }
 
+func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay {
+	var workDays []WorkDay
+	var workSec, pauseSec float64
+	qStr, err := DB.Prepare(`
+	WITH ordered_bookings AS (
+    SELECT
+        timestamp::DATE AS work_date,  -- Extract date for grouping
+        timestamp,
+        check_in_out,
+        LAG(timestamp) OVER (
+            PARTITION BY card_uid, timestamp::DATE  -- Reset for each day
+            ORDER BY timestamp
+        ) AS prev_timestamp,
+        LAG(check_in_out) OVER (
+            PARTITION BY card_uid, timestamp::DATE
+            ORDER BY timestamp
+        ) AS prev_check
+    FROM anwesenheit
+    WHERE card_uid = $1  -- Replace with actual card_uid
+    AND timestamp::DATE >= $2  -- Set date range
+    AND timestamp::DATE <= $3
+	)
+	SELECT
+	    work_date,
+
+	    -- Total work time per day
+	    COALESCE(
+	        EXTRACT(EPOCH FROM SUM(
+	            CASE
+	                WHEN prev_check IN (1, 3) AND check_in_out IN (2, 4, 254)
+	                THEN timestamp - prev_timestamp
+	                ELSE INTERVAL '0'
+	            END
+	        )), 0
+	    ) AS total_work,
+
+	    -- Extract total pause time in seconds
+	    COALESCE(
+	        EXTRACT(EPOCH FROM SUM(
+	            CASE
+	                WHEN prev_check IN (2, 4, 254) AND check_in_out IN (1, 3)
+	                THEN timestamp - prev_timestamp
+	                ELSE INTERVAL '0'
+	            END
+	        )), 0
+	    ) AS total_pause
+
+	FROM ordered_bookings
+	GROUP BY work_date
+	ORDER BY work_date;`)
+
+	if err != nil {
+		log.Println("Error preparing SQL statement", err)
+		return workDays
+	}
+
+	defer qStr.Close()
+	rows, err := qStr.Query(card_uid, tsFrom, tsTo)
+	if err != nil {
+		log.Println("Error getting rows!")
+		return workDays
+	}
+	defer rows.Close()
+	for rows.Next() {
+		var workDay WorkDay
+		if err := rows.Scan(&workDay.Day, &workSec, &pauseSec); err != nil {
+			log.Println("Error scanning row!", err)
+			return workDays
+		}
+		workDay.workTime = time.Duration(workSec * float64(time.Second))
+		workDay.pauseTime = time.Duration(pauseSec * float64(time.Second))
+		workDay.calcPauseTime()
+		workDays = append(workDays, workDay)
+	}
+	if err = rows.Err(); err != nil {
+		return workDays
+	}
+	return workDays
+}
+
+func (d *WorkDay) calcPauseTime() {
+	if d.workTime > 6*time.Hour && d.pauseTime < 45*time.Minute {
+		if d.workTime < 9*time.Hour && d.pauseTime < 30*time.Minute {
+			diff := 30*time.Minute - d.pauseTime
+			d.workTime -= diff
+			d.pauseTime += diff
+		} else if d.pauseTime < 45*time.Minute {
+			diff := 45*time.Minute - d.pauseTime
+			d.workTime -= diff
+			d.pauseTime += diff
+		}
+	}
+}
+
 // Gets the duration someone worked that day
-func (d *WorkDay) GetWorkTime() time.Duration{
+func (d *WorkDay) GetWorkTime() {
 	var workTime, pauseTime time.Duration
 	var lastBooking Booking
-	for _, booking := range d.Bookings{
+	for _, booking := range d.Bookings {
-		if booking.CheckInOut % 2 == 1 {
+		if booking.CheckInOut%2 == 1 {
 			if !lastBooking.Timestamp.IsZero() {
 				pauseTime += booking.Timestamp.Sub(lastBooking.Timestamp)
 			}
-		}else {
+		} else {
 			workTime += booking.Timestamp.Sub(lastBooking.Timestamp)
 		}
 		lastBooking = booking
 	}
 	// checks if booking is today and has no gehen yet, so the time since last kommen booking is added to workTime
-	if(d.Day.Day() == time.Now().Day() && len(d.Bookings) % 2 == 1){
+	if d.Day.Day() == time.Now().Day() && len(d.Bookings)%2 == 1 {
 		workTime += time.Since(lastBooking.Timestamp.Local())
 	}
-
-	if workTime > 6 * time.Hour && pauseTime < 45 * time.Minute {
-		if workTime < 9 * time.Hour && pauseTime < 30 * time.Minute {
-			diff := 30 * time.Minute - pauseTime
-			workTime -= diff
-			pauseTime += diff
-		}else if pauseTime < 45 * time.Minute {
-			diff := 45 * time.Minute - pauseTime
-			workTime -= diff
-			pauseTime += diff
-		}
-	}
 	d.workTime = workTime
 	d.pauseTime = pauseTime
-	return workTime
+
+	d.calcPauseTime()
 }
 
-func formatDuration(d time.Duration) string{
+func formatDuration(d time.Duration) string {
-	hours := int(d.Hours())
+	hours := int(d.Abs().Hours())
-	minutes := int(d.Minutes()) % 60
+	minutes := int(d.Abs().Minutes()) % 60
-	switch{
+	switch {
-		case hours > 0:
+	case hours > 0:
 		return fmt.Sprintf("%dh %dmin", hours, minutes)
-		case minutes >0:
+	case minutes > 0:
 		return fmt.Sprintf("%dmin", minutes)
-		default:
+	default:
 		return ""
 	}
 }
@@ -77,6 +161,6 @@ func (d *WorkDay) RequiresAction() bool {
 // returns a integer percentage of how much day has been worked of
 func (d *WorkDay) GetWorkDayProgress(user User) uint8 {
 	defaultWorkTime := time.Duration(user.Arbeitszeit * float32(time.Hour))
-	progress := (d.workTime.Seconds()/defaultWorkTime.Seconds())*100
+	progress := (d.workTime.Seconds() / defaultWorkTime.Seconds()) * 100
 	return uint8(progress)
 }

Backend/models/workWeek.go

@@ -0,0 +1,107 @@
+package models
+
+import (
+	"errors"
+	"log"
+	"time"
+)
+
+type WorkWeek struct {
+	Id        int
+	WorkDays  []WorkDay
+	User      User
+	WeekStart time.Time
+	WorkHours time.Duration
+}
+
+func (w *WorkWeek) GetWeek(user User, tsMonday time.Time, populateDays bool) WorkWeek {
+	var week WorkWeek
+	if populateDays {
+		week.WorkDays = (*WorkDay).GetWorkDays(nil, user.CardUID, tsMonday, tsMonday.Add(7*24*time.Hour))
+		week.WorkHours = aggregateWorkTime(week.WorkDays)
+	}
+	week.User = user
+	week.WeekStart = tsMonday
+	return week
+}
+
+func (w *WorkWeek) GetWorkHourString() string {
+	return formatDuration(w.WorkHours)
+}
+
+func aggregateWorkTime(days []WorkDay) time.Duration {
+	var workTime time.Duration
+	for _, day := range days {
+		workTime += day.workTime
+	}
+	return workTime
+}
+
+func (w *WorkWeek) GetSendWeeks(user User) []WorkWeek {
+	var weeks []WorkWeek
+	qStr, err := DB.Prepare(`SELECT id, woche_start::DATE FROM wochen_report WHERE bestaetigt = FALSE AND personal_nummer = $1;`)
+	if err != nil {
+		log.Println("Error preparing SQL statement", err)
+		return weeks
+	}
+	defer qStr.Close()
+
+	rows, err := qStr.Query(user.PersonalNummer)
+	if err != nil {
+		log.Println("Error querining db!", err)
+		return weeks
+	}
+	defer rows.Close()
+	for rows.Next() {
+		var week WorkWeek
+		week.User = user
+		if err := rows.Scan(&week.Id, &week.WeekStart); err != nil {
+			log.Println("Error scanning row!", err)
+			return weeks
+		}
+		week.WorkDays = (*WorkDay).GetWorkDays(nil, user.CardUID, week.WeekStart, week.WeekStart.Add(7*24*time.Hour))
+		week.WorkHours = aggregateWorkTime(week.WorkDays)
+		weeks = append(weeks, week)
+	}
+	if err = rows.Err(); err != nil {
+		return weeks
+	}
+
+	return weeks
+}
+
+var ErrRunningWeek = errors.New("Week is in running week")
+
+// creates a new entry in the woche_report table with the given workweek
+func (w *WorkWeek) Send() error {
+	if time.Since(w.WeekStart) < 5*24*time.Hour {
+		log.Println("Cannot send week, because it's the running week!")
+		return ErrRunningWeek
+	}
+	qStr, err := DB.Prepare(`INSERT INTO wochen_report (personal_nummer, woche_start) VALUES ($1, $2);`)
+	if err != nil {
+		log.Println("Error preparing SQL statement", err)
+		return err
+	}
+	_, err = qStr.Exec(w.User.PersonalNummer, w.WeekStart)
+	if err != nil {
+		log.Println("Error executing query!", err)
+		return err
+	}
+	return nil
+
+}
+
+func (w *WorkWeek) Accept() error {
+	qStr, err := DB.Prepare(`UPDATE "wochen_report" SET bestaetigt = TRUE WHERE personal_nummer = $1 AND woche_start = $2;`)
+	if err != nil {
+		log.Println("Error preparing SQL statement", err)
+		return err
+	}
+	_, err = qStr.Exec(w.User.PersonalNummer, w.WeekStart)
+	if err != nil {
+		log.Println("Error executing query!", err)
+		return err
+	}
+	return nil
+}

Backend/src/main.css

@@ -35,10 +35,15 @@
     }
 
     .grid-sub {
-        display: flex;
+        display: grid;
-        flex-direction: column;
+        grid-template-columns: subgrid;
         grid-column: 1 / -1;
         border-color: var(--color-neutral-400);
+        transition: background-color 0.2s ease-in-out;
+    }
+
+    .grid-sub:hover {
+        background-color: var(--color-neutral-200);
     }
 
     .grid-cell {
@@ -53,8 +58,6 @@
         }
 
         .grid-sub {
-            display: grid;
-            grid-template-columns: subgrid;
         }
     }
 }

Backend/static/css/styles.css

@@ -568,6 +568,9 @@
   .inline {
     display: inline;
   }
+  .table {
+    display: table;
+  }
   .size-2 {
     width: calc(var(--spacing) * 2);
     height: calc(var(--spacing) * 2);
@@ -656,6 +659,11 @@
   .justify-self-end {
     justify-self: flex-end;
   }
+  .truncate {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
   .overflow-hidden {
     overflow: hidden;
   }
@@ -675,6 +683,9 @@
   .border-neutral-300 {
     border-color: var(--color-neutral-300);
   }
+  .border-neutral-800 {
+    border-color: var(--color-neutral-800);
+  }
   .border-neutral-900 {
     border-color: var(--color-neutral-900);
   }
@@ -801,6 +812,13 @@
       }
     }
   }
+  .hover\:text-accent {
+    &:hover {
+      @media (hover: hover) {
+        color: var(--color-accent);
+      }
+    }
+  }
   .hover\:text-white {
     &:hover {
       @media (hover: hover) {
@@ -839,11 +857,21 @@
       opacity: 50%;
     }
   }
+  .max-md\:flex {
+    @media (width < 48rem) {
+      display: flex;
+    }
+  }
   .max-md\:grid {
     @media (width < 48rem) {
       display: grid;
     }
   }
+  .max-md\:flex-col {
+    @media (width < 48rem) {
+      flex-direction: column;
+    }
+  }
   .md\:col-span-1 {
     @media (width >= 48rem) {
       grid-column: span 1 / span 1;
@@ -904,10 +932,14 @@
     align-items: stretch;
   }
   .grid-sub {
-    display: flex;
+    display: grid;
-    flex-direction: column;
+    grid-template-columns: subgrid;
     grid-column: 1 / -1;
     border-color: var(--color-neutral-400);
+    transition: background-color 0.2s ease-in-out;
+  }
+  .grid-sub:hover {
+    background-color: var(--color-neutral-200);
   }
   .grid-cell {
     padding: calc(var(--spacing) * 2);
@@ -918,10 +950,6 @@
       grid-template-columns: repeat(5, 1fr);
       margin: 0 10%;
     }
-    .grid-sub {
-      display: grid;
-      grid-template-columns: subgrid;
-    }
   }
 }
 @keyframes spin {

Backend/templates/pages.templ

@@ -1,6 +1,11 @@
 package templates
 
-import "arbeitszeitmessung/models"
+import (
+	"arbeitszeitmessung/models"
+	"fmt"
+	"strconv"
+	"time"
+)
 
 templ Base() {
 	<!DOCTYPE html>
@@ -65,3 +70,48 @@ templ UserPage(status int) {
 		</form>
 	</div>
 }
+
+templ TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) {
+	{{
+		year, kw := userWeek.WeekStart.ISOWeek()
+	}}
+	@Base()
+	@headerComponent()
+	<div class="grid-main divide-y-1">
+		<div class="grid-sub divide-x-1 bg-neutral-300">
+			<div class="grid-cell font-bold uppercase">{ fmt.Sprintf("%s %s", userWeek.User.Vorname, userWeek.User.Name) }</div>
+			<div class="grid-cell col-span-3 flex flex-col gap-2">
+				for _, day := range userWeek.WorkDays {
+					@weekDayComponent(userWeek.User, day)
+				}
+			</div>
+			<form class="grid-cell flex flex-col gap-2" method="post">
+				<div>
+					<p class="text-sm"><span class="">Woche:</span> { fmt.Sprintf("%02d-%d", kw, year) }</p>
+					<p class="text-sm">an Vorgesetzten senden</p>
+				</div>
+				<input type="hidden" name="method" value="send"/>
+				<input type="hidden" name="user" value={ strconv.Itoa(userWeek.User.PersonalNummer) }/>
+				<input type="hidden" name="week" value={ userWeek.WeekStart.Format(time.DateOnly) }/>
+				// if failed {
+				// 	<p>Fehlgeschlagen</p>
+				// }
+				<button type="submit" class="w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">Senden</button>
+			</form>
+		</div>
+		for _, week := range weeks {
+			@employeComponent(week)
+		}
+	</div>
+}
+
+templ NavPage() {
+	@Base()
+	<div class="w-full h-[100vh] flex flex-col justify-center items-center">
+		<div class="flex flex-col justify-between w-full md:w-1/2 py-2">
+			<a class="text-xl hover:text-accent transition-colors1" href="/time">Zeitverwaltung</a>
+			<a class="text-xl hover:text-accent transition-colors1" href="/team">Mitarbeiter</a>
+			<a class="text-xl hover:text-accent transition-colors1" href="/user">Nutzer</a>
+		</div>
+	</div>
+}

Backend/templates/pages_templ.go

@@ -8,7 +8,12 @@ package templates
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-import "arbeitszeitmessung/models"
+import (
+	"arbeitszeitmessung/models"
+	"fmt"
+	"strconv"
+	"time"
+)
 
 func Base() templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
@@ -195,4 +200,148 @@ func UserPage(status int) templ.Component {
 	})
 }
 
+func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var5 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var5 == nil {
+			templ_7745c5c3_Var5 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		year, kw := userWeek.WeekStart.ISOWeek()
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = headerComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<div class=\"grid-main divide-y-1\"><div class=\"grid-sub divide-x-1 bg-neutral-300\"><div class=\"grid-cell font-bold uppercase\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%s %s", userWeek.User.Vorname, userWeek.User.Name))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 82, Col: 111}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</div><div class=\"grid-cell col-span-3 flex flex-col gap-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, day := range userWeek.WorkDays {
+			templ_7745c5c3_Err = weekDayComponent(userWeek.User, day).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</div><form class=\"grid-cell flex flex-col gap-2\" method=\"post\"><div><p class=\"text-sm\"><span class=\"\">Woche:</span> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%02d-%d", kw, year))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 90, Col: 87}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</p><p class=\"text-sm\">an Vorgesetzten senden</p></div><input type=\"hidden\" name=\"method\" value=\"send\"> <input type=\"hidden\" name=\"user\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(userWeek.User.PersonalNummer))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 94, Col: 87}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "\"> <input type=\"hidden\" name=\"week\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(userWeek.WeekStart.Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 95, Col: 85}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "\"><button type=\"submit\" class=\"w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Senden</button></form></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, week := range weeks {
+			templ_7745c5c3_Err = employeComponent(week).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func NavPage() templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var10 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var10 == nil {
+			templ_7745c5c3_Var10 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "<div class=\"w-full h-[100vh] flex flex-col justify-center items-center\"><div class=\"flex flex-col justify-between w-full md:w-1/2 py-2\"><a class=\"text-xl hover:text-accent transition-colors1\" href=\"/time\">Zeitverwaltung</a> <a class=\"text-xl hover:text-accent transition-colors1\" href=\"/team\">Mitarbeiter</a> <a class=\"text-xl hover:text-accent transition-colors1\" href=\"/user\">Nutzer</a></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
 var _ = templruntime.GeneratedTemplate

Backend/templates/teamComponents.templ

@@ -0,0 +1,49 @@
+package templates
+
+import (
+	"arbeitszeitmessung/models"
+	"fmt"
+	"strconv"
+	"time"
+)
+
+templ weekDayComponent(user models.User, day models.WorkDay) {
+	{{ work, pause := day.GetWorkTimeString() }}
+	<div class="flex flex-row gap-2">
+		@timeGaugeComponent(day.GetWorkDayProgress(user), false, false)
+		<div class="flex flex-col">
+			<p class=""><span class="font-bold uppercase hidden md:inline">{ day.Day.Format("Mon") }:</span> { day.Day.Format("02.01.2006") }</p>
+			<div class="flex flex-row gap-2">
+				<span class="text-accent">{ work }</span>
+				<span class="text-neutral-500">{ pause }</span>
+			</div>
+		</div>
+	</div>
+}
+
+templ employeComponent(week models.WorkWeek) {
+	{{
+		year, kw := week.WeekStart.ISOWeek()
+	}}
+	<div class="grid-sub divide-x-1">
+		<div class="grid-cell">
+			<p class="font-bold uppercase">{ week.User.Vorname } { week.User.Name }</p>
+			<p class="text-sm">Arbeitszeit</p>
+			<p class="text-accent">{ week.GetWorkHourString() }</p>
+		</div>
+		<div class="grid-cell col-span-3 flex flex-col gap-2">
+			for _, day := range week.WorkDays {
+				@weekDayComponent(week.User, day)
+			}
+		</div>
+		<form class="grid-cell flex flex-col justify-between gap-2" method="post">
+			<p class="text-sm"><span class="">Woche:</span> { fmt.Sprintf("%02d-%d", kw, year) }</p>
+			<input type="hidden" name="method" value="accept"/>
+			<input type="hidden" name="user" value={ strconv.Itoa(week.User.PersonalNummer) }/>
+			<input type="hidden" name="week" value={ week.WeekStart.Format(time.DateOnly) }/>
+			<button type="submit" class="w-full bg-neutral-100 cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">
+				<p class="">Bestätigen</p>
+			</button>
+		</form>
+	</div>
+}

Backend/templates/teamComponents_templ.go

@@ -0,0 +1,227 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.3.833
+package templates
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import (
+	"arbeitszeitmessung/models"
+	"fmt"
+	"strconv"
+	"time"
+)
+
+func weekDayComponent(user models.User, day models.WorkDay) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		work, pause := day.GetWorkTimeString()
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"flex flex-row gap-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = timeGaugeComponent(day.GetWorkDayProgress(user), false, false).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<div class=\"flex flex-col\"><p class=\"\"><span class=\"font-bold uppercase hidden md:inline\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(day.Day.Format("Mon"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 15, Col: 89}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, ":</span> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(day.Day.Format("02.01.2006"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 15, Col: 130}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</p><div class=\"flex flex-row gap-2\"><span class=\"text-accent\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(work)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 17, Col: 36}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "</span> <span class=\"text-neutral-500\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(pause)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 18, Col: 42}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</span></div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func employeComponent(week models.WorkWeek) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var6 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var6 == nil {
+			templ_7745c5c3_Var6 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		year, kw := week.WeekStart.ISOWeek()
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<div class=\"grid-sub divide-x-1\"><div class=\"grid-cell\"><p class=\"font-bold uppercase\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(week.User.Vorname)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 30, Col: 53}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, " ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(week.User.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 30, Col: 72}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</p><p class=\"text-sm\">Arbeitszeit</p><p class=\"text-accent\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(week.GetWorkHourString())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 32, Col: 52}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</p></div><div class=\"grid-cell col-span-3 flex flex-col gap-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, day := range week.WorkDays {
+			templ_7745c5c3_Err = weekDayComponent(week.User, day).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</div><form class=\"grid-cell flex flex-col justify-between gap-2\" method=\"post\"><p class=\"text-sm\"><span class=\"\">Woche:</span> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%02d-%d", kw, year))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 40, Col: 85}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "</p><input type=\"hidden\" name=\"method\" value=\"accept\"> <input type=\"hidden\" name=\"user\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(week.User.PersonalNummer))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 42, Col: 82}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "\"> <input type=\"hidden\" name=\"week\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var12 string
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(week.WeekStart.Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 43, Col: 80}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "\"> <button type=\"submit\" class=\"w-full bg-neutral-100 cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\"><p class=\"\">Bestätigen</p></button></form></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

Backend/templates/timeComponents.templ

@@ -13,7 +13,7 @@ templ inputForm() {
 		urlParams := ctx.Value("urlParams").(url.Values)
 		user := ctx.Value("user").(models.User)
 	}}
-	<div class="grid-sub divide-x-1 bg-neutral-300">
+	<div class="grid-sub divide-x-1 bg-neutral-300 max-md:flex max-md:flex-col">
 		<div class="grid-cell col-span-2 md:col-span-1 max-md:grid grid-cols-2">
 			<p class="font-bold uppercase">{ user.Vorname + " " + user.Name }</p>
 			<div class="justify-self-end">

Backend/templates/timeComponents_templ.go

@@ -40,7 +40,7 @@ func inputForm() templ.Component {
 
 		urlParams := ctx.Value("urlParams").(url.Values)
 		user := ctx.Value("user").(models.User)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"grid-sub divide-x-1 bg-neutral-300\"><div class=\"grid-cell col-span-2 md:col-span-1 max-md:grid grid-cols-2\"><p class=\"font-bold uppercase\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"grid-sub divide-x-1 bg-neutral-300 max-md:flex max-md:flex-col\"><div class=\"grid-cell col-span-2 md:col-span-1 max-md:grid grid-cols-2\"><p class=\"font-bold uppercase\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

DB/initdb/01_create_tables.sql

@@ -41,6 +41,8 @@ CREATE TABLE "user_password" (
     "zuletzt_geandert" timestamp(6) DEFAULT CURRENT_TIMESTAMP
 );
 
+-- update Funktion für pass_hash
+
 CREATE OR REPLACE FUNCTION update_zuletzt_geandert()
 RETURNS TRIGGER AS $$
 BEGIN
@@ -57,6 +59,17 @@ BEFORE UPDATE ON user_password
 FOR EACH ROW
 EXECUTE FUNCTION update_zuletzt_geandert();
 
+-- audittabelle für arbeitsstunden bestätigung
+
+DROP TABLE IF EXISTS "wochen_report";
+CREATE TABLE "wochen_report" (
+    "id" serial PRIMARY KEY,
+    "personal_nummer" int4,
+    "woche_start" date,
+    "bestaetigt" bool DEFAULT FALSE,
+    UNIQUE ("personal_nummer", "woche_start")
+);
+
 -- Adds crypto extension
 
 CREATE EXTENSION IF NOT EXISTS pgcrypto;

DB/initdb/02_create_user.sh

@@ -7,7 +7,7 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
     CREATE USER $POSTGRES_API_USER WITH ENCRYPTED PASSWORD '$POSTGRES_API_PASSWORD';
     GRANT CONNECT ON DATABASE $POSTGRES_DB TO $POSTGRES_API_USER;
     GRANT USAGE ON SCHEMA public TO $POSTGRES_API_USER;
-    GRANT SELECT, INSERT, UPDATE ON anwesenheit, personal_daten, user_password TO $POSTGRES_API_USER;
+    GRANT SELECT, INSERT, UPDATE ON anwesenheit, personal_daten, user_password, wochen_report TO $POSTGRES_API_USER;
     GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO $POSTGRES_API_USER;
 EOSQL
 

Docker/.env.example

@@ -7,3 +7,4 @@ POSTGRES_DB=arbeitszeitmessung
 EXPOSED_PORT=8000
 TZ=Europe/Berlin
 PGTZ=Europe/Berlin
+API_TOKEN=dont_access

Docker/arbeitszeitmessung.json

@@ -1,292 +1,493 @@
 {
-	"openapi": "3.0.3",
+  "openapi": "3.0.3",
-	"info": {
+  "info": {
-		"title": "Arbeitszeitmessung - OpenAPI 3.0",
+    "title": "Arbeitszeitmessung - OpenAPI 3.0",
-		"description": "This demos the API for the Arbeitszeitmessung Project ",
+    "description": "This demos the API for the Arbeitszeitmessung Project ",
-		"version": "0.1.0"
+    "version": "0.1.0"
-	},
+  },
-	"externalDocs": {
+  "externalDocs": {
-		"description": "Git-Repository",
+    "description": "Git-Repository",
-		"url": "https://git.letsstein.de/tom/arbeitszeitmessung"
+    "url": "https://git.letsstein.de/tom/arbeitszeitmessung"
-	},
+  },
-	"servers": [
+  "servers": [
-		{
+    {
-			"url": "http://localhost:8000"
+      "url": "http://localhost:8000",
-		}
+      "description": "Docker Server"
-	],
+    },
-	"tags": [
+    {
-		{
+      "url": "http://localhost:8080",
-			"name": "booking",
+      "description": "Local Development"
-			"description": "all Bookings"
+    }
-		}
+  ],
-	],
+  "tags": [
-	"paths": {
+    {
-		"/time": {
+      "name": "booking",
-			"put": {
+      "description": "all Bookings"
-				"tags": ["booking"],
+    }
-				"summary": "Update a existing booking",
+  ],
-				"description": "Update an existing booking by Id",
+  "paths": {
-				"operationId": "updateBooking",
+    "/time": {
-				"parameters": [
+      "get": {
-					{
+        "tags": [
-						"name": "counter_id",
+          "booking"
-						"in": "query",
+        ],
-						"description": "Booking ID to update",
+        "summary": "Gets all the bookings from one card_uid",
-						"required": true,
+        "description": "Returns all the bookings optionally filtered with cardID",
-						"schema": {
+        "operationId": "getBooking",
-							"type": "string"
+        "parameters": [
-						}
+          {
-					}
+            "name": "card_uid",
-				],
+            "in": "query",
-				"requestBody": {
+            "description": "CardID to filter for",
-					"description": "Update an existent booking in the db. Not all values have to be updated",
+            "required": true,
-					"content": {
+            "schema": {
-						"application/json": {
+              "type": "string"
-							"schema": {
+            }
-								"$ref": "#/components/schemas/Booking"
+          },
-							}
+          {
-						}
+            "name": "time_from",
-					},
+            "in": "query",
-					"required": true
+            "description": "Timestamp since when all bookings are shown (default=1 month ago)",
-				},
+            "required": false,
-				"responses": {
+            "schema": {
-					"200": {
+              "type": "string",
-						"description": "Booking Updated",
+              "example": "2025-02-28"
-						"content": {
+            }
-							"application/json": {
+          },
-								"schema": {
+          {
-									"$ref": "#/components/schemas/Booking"
+            "name": "time_to",
-								}
+            "in": "query",
-							}
+            "description": "Timestamp till when all bookings are shown (default=today)",
-						}
+            "required": false,
-					},
+            "schema": {
-					"400": {
+              "type": "string",
-						"description": "Invalid ID supplied"
+              "example": "2025-02-28"
-					},
+            }
-					"500": {
+          }
-						"description": "Server Error"
+        ],
-					}
+        "responses": {
-				}
+          "200": {
-			},
+            "description": "Successful operation",
-			"get": {
+            "content": {
-				"tags": ["booking"],
+              "application/json": {
-				"summary": "Gets all the bookings limited",
+                "schema": {
-				"description": "Returns all the bookings optionally filtered with cardID",
+                  "type": "array",
-				"operationId": "getBooking",
+                  "items": {
-				"parameters": [
+                    "type": "object",
-					{
+                    "properties": {
-						"name": "card_uid",
+                      "day": {
-						"in": "query",
+                        "type": "string",
-						"description": "CardID to filter for",
+                        "format": "date"
-						"required": false,
+                      },
-						"schema": {
+                      "bookings": {
-							"type": "string"
+                        "type": "array",
-						}
+                        "items": {
-					}
+                          "type": "object",
-				],
+                          "properties": {
-				"responses": {
+                            "counter_id": {
-					"200": {
+                              "type": "integer",
-						"description": "Successful operation",
+                              "format": "int64",
-						"content": {
+                              "example": 100
-							"application/json": {
+                            },
-								"schema": {
+                            "card_uid": {
-									"type": "array",
+                              "type": "string",
-									"items": {
+                              "example": "test_card"
-										"$ref": "#/components/schemas/Booking"
+                            },
-									}
+                            "geraet_id": {
-								}
+                              "type": "string",
-							}
+                              "example": "test_reader"
-						}
+                            },
-					},
+                            "check_in_out": {
-					"400": {
+                              "type": "integer",
-						"description": "Invalid cardID"
+                              "example": 1,
-					}
+                              "enum": [
-				}
+                                1,
-			}
+                                2,
-		},
+                                255
-		"/time/new": {
+                              ]
-			"put": {
+                            },
-				"tags": ["booking"],
+                            "timestamp": {
-				"summary": "Create new Booking",
+                              "type": "string",
-				"description": "Creates a new booking with the supplied parameters",
+                              "format": "date-time",
-				"operationId": "pcreateBooking",
+                              "example": "2024-09-05T08:51:12.670Z"
-				"parameters": [
+                            }
-					{
+                          },
-						"name": "card_uid",
+                          "xml": {
-						"in": "query",
+                            "name": "booking"
-						"description": "id of the RFID card scanned",
+                          }
-						"required": true,
+                        }
-						"schema": {
+                      }
-							"type": "string"
+                    }
-						}
+                  }
-					},
+                }
-					{
+              }
-						"name": "geraet_id",
+            }
-						"in": "query",
+          },
-						"description": "id of the RFID reader scanning the card",
+          "400": {
-						"required": true,
+            "description": "Invalid cardID"
-						"schema": {
+          }
-							"type": "string"
+        }
-						}
+      }
-					},
+    },
-					{
+    "/time/new": {
-						"name": "check_in_out",
+      "put": {
-						"in": "query",
+        "tags": [
-						"description": "booking Type",
+          "booking"
-						"required": true,
+        ],
-						"schema": {
+        "summary": "Create new Booking",
-							"type": "integer",
+        "description": "Creates a new booking with the supplied parameters",
-							"enum": [1, 2, 255]
+        "operationId": "pcreateBooking",
-						}
+        "parameters": [
-					}
+          {
-				],
+            "in": "header",
-				"responses": {
+            "name": "Authorization",
-					"200": {
+            "description": "Predefined API Key to authorize access",
-						"description": "successfully created booking",
+            "schema": {
-						"content": {
+              "type": "string"
-							"application/json": {
+            }
-								"schema": {
+          },
-									"$ref": "#/components/schemas/Booking"
+          {
-								}
+            "name": "card_uid",
-							}
+            "in": "query",
-						}
+            "description": "id of the RFID card scanned",
-					},
+            "required": true,
-					"409": {
+            "schema": {
-						"description": "Same booking type as last booking"
+              "type": "string"
-					}
+            }
-				}
+          },
-			},
+          {
-			"get": {
+            "name": "geraet_id",
-				"tags": ["booking"],
+            "in": "query",
-				"summary": "Create new Booking",
+            "description": "id of the RFID reader scanning the card",
-				"description": "Creates a new booking with the supplied parameters",
+            "required": true,
-				"operationId": "gcreateBooking",
+            "schema": {
-				"parameters": [
+              "type": "string"
-					{
+            }
-						"name": "card_uid",
+          },
-						"in": "query",
+          {
-						"description": "id of the RFID card scanned",
+            "name": "check_in_out",
-						"required": true,
+            "in": "query",
-						"schema": {
+            "description": "booking Type",
-							"type": "string"
+            "required": true,
-						}
+            "schema": {
-					},
+              "type": "integer",
-					{
+              "enum": [
-						"name": "geraet_id",
+                1,
-						"in": "query",
+                2,
-						"description": "id of the RFID reader scanning the card",
+                255
-						"required": true,
+              ]
-						"schema": {
+            }
-							"type": "string"
+          }
-						}
+        ],
-					},
+        "responses": {
-					{
+          "200": {
-						"name": "check_in_out",
+            "description": "successfully created booking",
-						"in": "query",
+            "content": {
-						"description": "booking Type",
+              "application/json": {
-						"required": true,
+                "schema": {
-						"schema": {
+                  "type": "object",
-							"type": "integer",
+                  "properties": {
-							"enum": [1, 2, 255]
+                    "counter_id": {
-						}
+                      "type": "integer",
-					}
+                      "format": "int64",
-				],
+                      "example": 100
-				"responses": {
+                    },
-					"200": {
+                    "card_uid": {
-						"description": "successfully created booking",
+                      "type": "string",
-						"content": {
+                      "example": "test_card"
-							"application/json": {
+                    },
-								"schema": {
+                    "geraet_id": {
-									"$ref": "#/components/schemas/Booking"
+                      "type": "string",
-								}
+                      "example": "test_reader"
-							}
+                    },
-						}
+                    "check_in_out": {
-					},
+                      "type": "integer",
-					"409": {
+                      "example": 1,
-						"description": "Same booking type as last booking"
+                      "enum": [
-					}
+                        1,
-				}
+                        2,
-			}
+                        255
-		},
+                      ]
-		"/logout": {
+                    },
-			"get": {
+                    "timestamp": {
-				"tags": ["booking"],
+                      "type": "string",
-				"summary": "Logs out all logged in users",
+                      "format": "date-time",
-				"description": "With this call all actively logged in users (last booking today has check_in_out=1) will be logged out automaticly (check_in_out=255)",
+                      "example": "2024-09-05T08:51:12.670Z"
-				"operationId": "autoLogout",
+                    }
-				"responses": {
+                  },
-					"200": {
+                  "xml": {
-						"description": "Succesful",
+                    "name": "booking"
-						"content": {
+                  }
-							"application/json": {
+                }
-								"schema": {
+              }
-									"type": "array",
+            }
-									"items": {
+          },
-										"$ref": "#/components/schemas/User"
+          "409": {
-									}
+            "description": "Same booking type as last booking"
-								}
+          }
-							}
+        }
-						}
+      },
-					}
+      "get": {
-				}
+        "tags": [
-			}
+          "booking"
-		}
+        ],
-	},
+        "summary": "Create new Booking",
-	"components": {
+        "description": "Creates a new booking with the supplied parameters",
-		"schemas": {
+        "operationId": "gcreateBooking",
-			"Booking": {
+        "parameters": [
-				"type": "object",
+          {
-				"properties": {
+            "in": "header",
-					"counter_id": {
+            "name": "Authorization",
-						"type": "integer",
+            "description": "Predefined API Key to authorize access",
-						"format": "int64",
+            "schema": {
-						"example": 100
+              "type": "string"
-					},
+            }
-					"card_uid": {
+          },
-						"type": "string",
+          {
-						"example": "test_card"
+            "in": "query",
-					},
+            "name": "api_key",
-					"geraet_id": {
+            "description": "Predefined API Key to authorize access",
-						"type": "string",
+            "required": false,
-						"example": "test_reader"
+            "schema": {
-					},
+              "type": "string"
-					"check_in_out": {
+            }
-						"type": "integer",
+          },
-						"example": 1,
+          {
-						"enum": [1, 2, 255]
+            "name": "card_uid",
-					},
+            "in": "query",
-					"timestamp": {
+            "description": "id of the RFID card scanned",
-						"type": "string",
+            "required": true,
-						"format": "date-time",
+            "schema": {
-						"example": "2024-09-05T08:51:12.670Z"
+              "type": "string"
-					}
+            }
-				},
+          },
-				"xml": {
+          {
-					"name": "booking"
+            "name": "geraet_id",
-				}
+            "in": "query",
-			},
+            "description": "id of the RFID reader scanning the card",
-			"User": {
+            "required": true,
-				"type": "object",
+            "schema": {
-				"properties": {
+              "type": "string"
-					"card_uid": {
+            }
-						"type": "string",
+          },
-						"example": "test_card"
+          {
-					},
+            "name": "check_in_out",
-					"name": {
+            "in": "query",
-						"type": "string",
+            "description": "booking Type",
-						"example": "Mustermann"
+            "required": true,
-					},
+            "schema": {
-					"vorname": {
+              "type": "integer",
-						"type": "string",
+              "enum": [
-						"example": "Max"
+                1,
-					},
+                2,
-					"hauptbeschäftigungsort": {
+                255
-						"type": "integer",
+              ]
-						"format": "int8",
+            }
-						"example": 1
+          }
-					}
+        ],
-				}
+        "responses": {
-			}
+          "200": {
-		}
+            "description": "successfully created booking",
-	}
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "counter_id": {
+                      "type": "integer",
+                      "format": "int64",
+                      "example": 100
+                    },
+                    "card_uid": {
+                      "type": "string",
+                      "example": "test_card"
+                    },
+                    "geraet_id": {
+                      "type": "string",
+                      "example": "test_reader"
+                    },
+                    "check_in_out": {
+                      "type": "integer",
+                      "example": 1,
+                      "enum": [
+                        1,
+                        2,
+                        255
+                      ]
+                    },
+                    "timestamp": {
+                      "type": "string",
+                      "format": "date-time",
+                      "example": "2024-09-05T08:51:12.670Z"
+                    }
+                  },
+                  "xml": {
+                    "name": "booking"
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "none or wrong api key provided!"
+          },
+          "409": {
+            "description": "Same booking type as last booking"
+          }
+        }
+      }
+    },
+    "/logout": {
+      "get": {
+        "tags": [
+          "booking"
+        ],
+        "summary": "Logs out all logged in users",
+        "description": "With this call all actively logged in users (last booking today has check_in_out=1) will be logged out automaticly (check_in_out=255)",
+        "operationId": "autoLogout",
+        "responses": {
+          "200": {
+            "description": "Succesful",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "card_uid": {
+                        "type": "string",
+                        "example": "test_card"
+                      },
+                      "name": {
+                        "type": "string",
+                        "example": "Mustermann"
+                      },
+                      "vorname": {
+                        "type": "string",
+                        "example": "Max"
+                      },
+                      "hauptbeschäftigungsort": {
+                        "type": "integer",
+                        "format": "int8",
+                        "example": 1
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "BookingGrouped": {
+        "type": "object",
+        "properties": {
+          "day": {
+            "type": "string",
+            "format": "date"
+          },
+          "bookings": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "counter_id": {
+                  "type": "integer",
+                  "format": "int64",
+                  "example": 100
+                },
+                "card_uid": {
+                  "type": "string",
+                  "example": "test_card"
+                },
+                "geraet_id": {
+                  "type": "string",
+                  "example": "test_reader"
+                },
+                "check_in_out": {
+                  "type": "integer",
+                  "example": 1,
+                  "enum": [
+                    1,
+                    2,
+                    255
+                  ]
+                },
+                "timestamp": {
+                  "type": "string",
+                  "format": "date-time",
+                  "example": "2024-09-05T08:51:12.670Z"
+                }
+              },
+              "xml": {
+                "name": "booking"
+              }
+            }
+          }
+        }
+      },
+      "Booking": {
+        "type": "object",
+        "properties": {
+          "counter_id": {
+            "type": "integer",
+            "format": "int64",
+            "example": 100
+          },
+          "card_uid": {
+            "type": "string",
+            "example": "test_card"
+          },
+          "geraet_id": {
+            "type": "string",
+            "example": "test_reader"
+          },
+          "check_in_out": {
+            "type": "integer",
+            "example": 1,
+            "enum": [
+              1,
+              2,
+              255
+            ]
+          },
+          "timestamp": {
+            "type": "string",
+            "format": "date-time",
+            "example": "2024-09-05T08:51:12.670Z"
+          }
+        },
+        "xml": {
+          "name": "booking"
+        }
+      },
+      "User": {
+        "type": "object",
+        "properties": {
+          "card_uid": {
+            "type": "string",
+            "example": "test_card"
+          },
+          "name": {
+            "type": "string",
+            "example": "Mustermann"
+          },
+          "vorname": {
+            "type": "string",
+            "example": "Max"
+          },
+          "hauptbeschäftigungsort": {
+            "type": "integer",
+            "format": "int8",
+            "example": 1
+          }
+        }
+      }
+    }
+  }
 }

Docker/arbeitszeitmessung.yaml

@@ -1,74 +1,58 @@
 openapi: 3.0.3
 info:
   title: Arbeitszeitmessung - OpenAPI 3.0
-  description: 'This demos the API for the Arbeitszeitmessung Project '
+  description: "This demos the API for the Arbeitszeitmessung Project "
   version: 0.1.0
 externalDocs:
   description: Git-Repository
   url: https://git.letsstein.de/tom/arbeitszeitmessung
 servers:
   - url: http://localhost:8000
+    description: Docker Server
+  - url: http://localhost:8080
+    description: Local Development
 tags:
   - name: booking
     description: all Bookings
 paths:
   /time:
-    put:
-      tags:
-        - booking
-      summary: Update a existing booking
-      description: Update an existing booking by Id
-      operationId: updateBooking
-      parameters:
-        - name: counter_id
-          in: query
-          description: Booking ID to update
-          required: true
-          schema:
-            type: string
-      requestBody:
-        description: >-
-          Update an existent booking in the db. Not all values have to be
-          updated
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Booking'
-        required: true
-      responses:
-        '200':
-          description: Booking Updated
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Booking'
-        '400':
-          description: Invalid ID supplied
-        '500':
-          description: Server Error
     get:
       tags:
         - booking
-      summary: Gets all the bookings limited
+      summary: Gets all the bookings from one card_uid
       description: Returns all the bookings optionally filtered with cardID
       operationId: getBooking
       parameters:
         - name: card_uid
           in: query
           description: CardID to filter for
+          required: true
+          schema:
+            type: string
+        - name: time_from
+          in: query
+          description: Timestamp since when all bookings are shown (default=1 month ago)
           required: false
           schema:
             type: string
+            example: "2025-02-28"
+        - name: time_to
+          in: query
+          description: Timestamp till when all bookings are shown (default=today)
+          required: false
+          schema:
+            type: string
+            example: "2025-02-28"
       responses:
-        '200':
+        "200":
           description: Successful operation
           content:
             application/json:
               schema:
                 type: array
                 items:
-                  $ref: '#/components/schemas/Booking'
+                  $ref: "#/components/schemas/BookingGrouped"
-        '400':
+        "400":
           description: Invalid cardID
   /time/new:
     put:
@@ -78,6 +62,11 @@ paths:
       description: Creates a new booking with the supplied parameters
       operationId: pcreateBooking
       parameters:
+        - in: header
+          name: Authorization
+          description: Predefined API Key to authorize access
+          schema:
+            type: string
         - name: card_uid
           in: query
           description: id of the RFID card scanned
@@ -101,13 +90,13 @@ paths:
               - 2
               - 255
       responses:
-        '200':
+        "200":
           description: successfully created booking
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Booking'
+                $ref: "#/components/schemas/Booking"
-        '409':
+        "409":
           description: Same booking type as last booking
     get:
       tags:
@@ -116,6 +105,17 @@ paths:
       description: Creates a new booking with the supplied parameters
       operationId: gcreateBooking
       parameters:
+        - in: header
+          name: Authorization
+          description: Predefined API Key to authorize access
+          schema:
+            type: string
+        - in: query
+          name: api_key
+          description: Predefined API Key to authorize access
+          required: false
+          schema:
+            type: string
         - name: card_uid
           in: query
           description: id of the RFID card scanned
@@ -139,13 +139,15 @@ paths:
               - 2
               - 255
       responses:
-        '200':
+        "200":
           description: successfully created booking
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Booking'
+                $ref: "#/components/schemas/Booking"
-        '409':
+        "401":
+          description: none or wrong api key provided!
+        "409":
           description: Same booking type as last booking
   /logout:
     get:
@@ -155,16 +157,26 @@ paths:
       description: With this call all actively logged in users (last booking today has check_in_out=1) will be logged out automaticly (check_in_out=255)
       operationId: autoLogout
       responses:
-        '200':
+        "200":
           description: Succesful
           content:
             application/json:
               schema:
                 type: array
                 items:
-                  $ref: '#/components/schemas/User'
+                  $ref: "#/components/schemas/User"
 components:
   schemas:
+    BookingGrouped:
+      type: object
+      properties:
+        day:
+          type: string
+          format: date
+        bookings:
+          type: array
+          items:
+            $ref: "#/components/schemas/Booking"
     Booking:
       type: object
       properties:
@@ -188,7 +200,7 @@ components:
         timestamp:
           type: string
           format: date-time
-          example: '2024-09-05T08:51:12.670Z'
+          example: "2024-09-05T08:51:12.670Z"
       xml:
         name: booking
     User:

Docker/docker-compose.dev.yml

@@ -20,18 +20,16 @@ services:
       - 8001:8080
   backend:
     build: ../Backend
-    image: git.letsstein.de/tom/arbeitszeit-backend
+    image: git.letsstein.de/tom/arbeitszeit-backend:0.1.1
     env_file:
       - .env
     environment:
       POSTGRES_HOST: db
       POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_USER: ${POSTGRES_API_USER}
-      POSTGRES_PASS: ${POSTGRES_API_PASSWORD}
       EXPOSED_PORT: ${EXPOSED_PORT}
-      DEBUG: true
+      NO_CORS: true
     ports:
-      - 8000:8080
+      - ${EXPOSED_PORT}:8080
     depends_on:
       - db
   swagger:

Docker/docker-compose.yml

@@ -13,6 +13,8 @@ services:
     volumes:
       - ${POSTGRES_PATH}:/var/lib/postgresql/data
       - ${POSTGRES_PATH}/initdb:/docker-entrypoint-initdb.d
+    ports:
+      - 5432:5432
 
   backend:
     image: git.letsstein.de/tom/arbeitszeit-backend
@@ -21,10 +23,9 @@ services:
     environment:
       POSTGRES_HOST: db
       POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_USER: ${POSTGRES_API_USER}
-      POSTGRES_PASS: ${POSTGRES_API_PASSWORD}
       EXPOSED_PORT: ${EXPOSED_PORT}
     ports:
       - ${EXPOSED_PORT}:8080
     depends_on:
       - db
+    restart: unless-stopped

db.sql

@@ -62,3 +62,87 @@ VALUES (
 -- @block select
 SELECT *
 FROM personal_daten;
+
+-- @block work and pause time
+WITH ordered_bookings AS (
+    SELECT
+        timestamp,
+        check_in_out,
+        LAG(timestamp) OVER (PARTITION BY card_uid ORDER BY timestamp) AS prev_timestamp,
+        LAG(check_in_out) OVER (PARTITION BY card_uid ORDER BY timestamp) AS prev_check
+    FROM anwesenheit
+    WHERE card_uid = 'acde-edca'  -- Replace with actual card_uid
+    AND timestamp::DATE = '2025-02-23'  -- Replace with actual date
+)
+SELECT
+    -- Total work time: Duration between check-in (1,3) and check-out (2,4,254)
+    COALESCE(
+        SUM(
+            CASE
+                WHEN prev_check IN (1, 3) AND check_in_out IN (2, 4, 254)
+                THEN timestamp - prev_timestamp
+                ELSE INTERVAL '0'
+            END
+        ), INTERVAL '0'
+    ) AS total_work,
+
+    -- Total pause time: Duration between check-out (2,4,254) and next check-in (1,3)
+    COALESCE(
+        SUM(
+            CASE
+                WHEN prev_check IN (2, 4, 254) AND check_in_out IN (1, 3)
+                THEN timestamp - prev_timestamp
+                ELSE INTERVAL '0'
+            END
+        ), INTERVAL '0'
+    ) AS total_pause
+
+FROM ordered_bookings;
+
+-- @block work and pause time multi day
+WITH ordered_bookings AS (
+    SELECT
+        timestamp::DATE AS work_date,  -- Extract date for grouping
+        timestamp,
+        check_in_out,
+        LAG(timestamp) OVER (
+            PARTITION BY card_uid, timestamp::DATE  -- Reset for each day
+            ORDER BY timestamp
+        ) AS prev_timestamp,
+        LAG(check_in_out) OVER (
+            PARTITION BY card_uid, timestamp::DATE
+            ORDER BY timestamp
+        ) AS prev_check
+    FROM anwesenheit
+    WHERE card_uid = $1  -- Replace with actual card_uid
+    AND timestamp::DATE >= $2  -- Set date range
+    AND timestamp::DATE < $3
+)
+SELECT
+    work_date,
+
+    -- Total work time per day
+    COALESCE(
+        EXTRACT(EPOCH FROM SUM(
+            CASE
+                WHEN prev_check IN (1, 3) AND check_in_out IN (2, 4, 254)
+                THEN timestamp - prev_timestamp
+                ELSE INTERVAL '0'
+            END
+        )), 0
+    ) AS total_work,
+
+    -- Extract total pause time in seconds
+    COALESCE(
+        EXTRACT(EPOCH FROM SUM(
+            CASE
+                WHEN prev_check IN (2, 4, 254) AND check_in_out IN (1, 3)
+                THEN timestamp - prev_timestamp
+                ELSE INTERVAL '0'
+            END
+        )), 0
+    ) AS total_pause
+
+FROM ordered_bookings
+GROUP BY work_date
+ORDER BY work_date;