CHANGE: added team view, with submitted bookings for team members and send form for own bookings

Backend/endpoints/team.go

@@ -1,31 +1,75 @@
 package endpoints
 
 import (
-	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"arbeitszeitmessung/templates"
 	"log"
 	"net/http"
+	"time"
 )
 
 func TeamHandler(w http.ResponseWriter, r *http.Request) {
-	var user models.User
+	showWeeks(w, r)
-	var err error
+	// user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
-	if helper.GetEnv("GO_ENV", "production") == "debug" {
+	// if err != nil {
-		user, err = (*models.User).GetByPersonalNummer(nil, 123)
+	// 	log.Println("No user found with the given personal number!")
-	} else {
+	// 	http.Redirect(w, r, "/user/login", http.StatusSeeOther)
-		if !Session.Exists(r.Context(), "user") {
+	// 	return
-			log.Println("No user in session storage!")
+	// }
-			http.Error(w, "Not logged in!", http.StatusForbidden)
+	// var userWorkDays []models.WorkDay
-			return
+	// 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)
-		user, err = (*models.User).GetByPersonalNummer(nil, Session.GetInt(r.Context(), "user"))
+	// teamMembers, err := user.GetTeamMembers()
-	}
+	// getWeeksTillNow(time.Now().AddDate(0, 0, -14))
+	// templates.TeamPage(teamMembers, userWorkDays).Render(r.Context(), w)
+}
+
+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()
-	templates.TeamPage(teamMembers).Render(r.Context(), w)
+	for _, member := range teamMembers {
+		weeks := (*models.WorkWeek).GetSendWeeks(nil, member)
+		workWeeks = append(workWeeks, weeks...)
+	}
+	// Somehow use this for the own users weeks
+	// lastSub := member.GetLastSubmission()
+	// weeks := getWeeksTillNow(lastSub)
+	// for _, week := range weeks {
+	// 	workWeek := (*models.WorkWeek).GetWeek(nil, member, week)
+	// 	workWeeks = append(workWeeks, workWeek)
+	// }
+	lastSub := user.GetLastSubmission()
+	// userWorkDays := (*models.WorkDay).GetWorkDays(nil, user.CardUID, lastSub, lastSub.AddDate(0, 0, 7))
+	userWeek := (*models.WorkWeek).GetWeek(nil, user, lastSub)
+	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

@@ -42,21 +42,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
 	}
 

Backend/endpoints/user.go

@@ -33,9 +33,9 @@ func LoginHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func UserHandler(w http.ResponseWriter, r *http.Request) {
-	if !Session.Exists(r.Context(), "user") {
+	// if !Session.Exists(r.Context(), "user") {
-		http.Redirect(w, r, "/user/login", http.StatusSeeOther)
+	// 	http.Redirect(w, r, "/user/login", http.StatusSeeOther)
-	}
+	// }
 	switch r.Method {
 	case http.MethodGet:
 		showPWForm(w, r, 0)

Backend/models/user.go

@@ -1,9 +1,15 @@
 package models
 
 import (
+	"arbeitszeitmessung/helper"
+	"context"
+	"database/sql"
+	"errors"
 	"fmt"
 	"log"
 	"time"
+
+	"github.com/alexedwards/scs/v2"
 )
 
 type User struct {
@@ -138,7 +144,26 @@ func (u *User) ChangePass(password, newPassword string) (bool, error) {
 
 func (u *User) GetTeamMembers() ([]User, error) {
 	var teamMembers []User
-	teamMembers = append(teamMembers, *u)
+	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
 }
 
@@ -159,3 +184,27 @@ func (u *User) GetNextWeek() 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
+}
+
+func (u *User) GetLastSubmission() time.Time {
+	var lastSub time.Time
+	qStr, err := DB.Prepare("SELECT woche_start FROM buchung_wochen WHERE personal_nummer = $1 ORDER BY woche_start DESC LIMIT 1")
+	if err != nil {
+		log.Println("Error preparing statement!", err)
+		return lastSub
+	}
+	err = qStr.QueryRow(u.PersonalNummer).Scan(&lastSub)
+	if err != nil {
+		log.Println("Error executing query!", err)
+		return lastSub
+	}
+	return lastSub
+}

Backend/models/workDay.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"fmt"
+	"log"
 	"time"
 )
 
@@ -12,8 +13,102 @@ type WorkDay struct {
 	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 {
@@ -30,26 +125,15 @@ func (d *WorkDay) GetWorkTime() time.Duration {
 	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 {
-	hours := int(d.Hours())
+	hours := int(d.Abs().Hours())
-	minutes := int(d.Minutes()) % 60
+	minutes := int(d.Abs().Minutes()) % 60
 	switch {
 	case hours > 0:
 		return fmt.Sprintf("%dh %dmin", hours, minutes)

Backend/models/workWeek.go

@@ -1,5 +1,52 @@
 package models
 
+import (
+	"log"
+	"time"
+)
+
 type WorkWeek struct {
-	WorkDays []WorkDay
+	WorkDays  []WorkDay
+	User      User
+	WeekStart time.Time
+}
+
+func (w *WorkWeek) GetWeek(user User, tsMonday time.Time) WorkWeek {
+	var week WorkWeek
+	week.WorkDays = (*WorkDay).GetWorkDays(nil, user.CardUID, tsMonday, tsMonday.Add(7*24*time.Hour))
+	week.User = user
+	week.WeekStart = tsMonday
+	return week
+}
+
+func (w *WorkWeek) GetSendWeeks(user User) []WorkWeek {
+	var weeks []WorkWeek
+	qStr, err := DB.Prepare(`SELECT woche_start::DATE FROM buchung_wochen 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.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))
+		weeks = append(weeks, week)
+	}
+	if err = rows.Err(); err != nil {
+		return weeks
+	}
+
+	return weeks
 }

Backend/templates/pages.templ

@@ -1,6 +1,9 @@
 package templates
 
-import "arbeitszeitmessung/models"
+import (
+	"arbeitszeitmessung/models"
+	"fmt"
+)
 
 templ Base() {
 	<!DOCTYPE html>
@@ -66,20 +69,30 @@ templ UserPage(status int) {
 	</div>
 }
 
-templ TeamPage(teamMembers []models.User) {
+templ TeamPage(weeks []models.WorkWeek, week models.WorkWeek) {
+	{{
+		year, kw := week.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 uppercase">Max Mustermann</div>
+			<div class="grid-cell font-bold uppercase">{ fmt.Sprintf("%s %s", week.User.Vorname, week.User.Name) }</div>
-			<div class="grid-cell col-span-3"></div>
+			<div class="grid-cell col-span-3 flex flex-col gap-2">
-			<div class="grid-cell">
+				for _, day := range week.WorkDays {
-				<p class="text-sm">an Vorgesetzten senden</p>
+					@weekDayComponent(week.User, day)
+				}
+			</div>
+			<div class="grid-cell flex flex-col gap-2">
+				<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>
 				<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>
 			</div>
 		</div>
-		for _, user := range teamMembers {
+		for _, week := range weeks {
-			@employeComponent(user)
+			@employeComponent(week)
 		}
 	</div>
 }

Backend/templates/pages_templ.go

@@ -8,7 +8,10 @@ package templates
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-import "arbeitszeitmessung/models"
+import (
+	"arbeitszeitmessung/models"
+	"fmt"
+)
 
 func Base() templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
@@ -195,7 +198,7 @@ func UserPage(status int) templ.Component {
 	})
 }
 
-func TeamPage(teamMembers []models.User) templ.Component {
+func TeamPage(weeks []models.WorkWeek, 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 {
@@ -216,6 +219,8 @@ func TeamPage(teamMembers []models.User) templ.Component {
 			templ_7745c5c3_Var5 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
+
+		year, kw := week.WeekStart.ISOWeek()
 		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
@@ -224,17 +229,53 @@ func TeamPage(teamMembers []models.User) templ.Component {
 		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 uppercase\">Max Mustermann</div><div class=\"grid-cell col-span-3\"></div><div class=\"grid-cell\"><p class=\"text-sm\">an Vorgesetzten senden</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></div></div>")
+		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
 		}
-		for _, user := range teamMembers {
+		var templ_7745c5c3_Var6 string
-			templ_7745c5c3_Err = employeComponent(user).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%s %s", week.User.Vorname, week.User.Name))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 80, Col: 103}
+		}
+		_, 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 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, 13, "</div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</div><div class=\"grid-cell flex flex-col gap-2\"><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: 88, 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><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></div></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, 16, "</div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

Backend/templates/teamComponents.templ

@@ -1,14 +1,13 @@
 package templates
 
-import (
+import "arbeitszeitmessung/models"
-	"arbeitszeitmessung/models"
-	"time"
-)
 
-templ weekDayComponent(day models.WorkDay) {
+import "fmt"
+
+templ weekDayComponent(user models.User, day models.WorkDay) {
 	{{ work, pause := day.GetWorkTimeString() }}
 	<div class="flex flex-row gap-2">
-		@timeGaugeComponent(92, false, false)
+		@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">
@@ -19,22 +18,23 @@ templ weekDayComponent(day models.WorkDay) {
 	</div>
 }
 
-templ employeComponent(user models.User) {
+templ employeComponent(week models.WorkWeek) {
 	{{
-		workWeek := user.GetWeek(time.Now().AddDate(0, 0, -2))
+		year, kw := week.WeekStart.ISOWeek()
 	}}
 	<div class="grid-sub divide-x-1">
 		<div class="grid-cell">
-			<p class="font-bold uppercase">{ user.Vorname } { user.Name }</p>
+			<p class="font-bold uppercase">{ week.User.Vorname } { week.User.Name }</p>
 			<p class="text-sm">Arbeitszeit</p>
 			<p class="text-accent">40h 12min</p>
 		</div>
 		<div class="grid-cell col-span-3 flex flex-col gap-2">
-			for _, day := range workWeek.WorkDays {
+			for _, day := range week.WorkDays {
-				@weekDayComponent(day)
+				@weekDayComponent(week.User, day)
 			}
 		</div>
-		<div class="grid-cell flex flex-col justify-end">
+		<div class="grid-cell flex flex-col justify-between gap-2">
+			<p class="text-sm"><span class="">Woche:</span> { fmt.Sprintf("%02d-%d", kw, year) }</p>
 			<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>

Backend/templates/teamComponents_templ.go

@@ -8,12 +8,11 @@ package templates
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-import (
+import "arbeitszeitmessung/models"
-	"arbeitszeitmessung/models"
-	"time"
-)
 
-func weekDayComponent(day models.WorkDay) templ.Component {
+import "fmt"
+
+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 {
@@ -39,7 +38,7 @@ func weekDayComponent(day models.WorkDay) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = timeGaugeComponent(92, false, false).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = timeGaugeComponent(day.GetWorkDayProgress(user), false, false).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -50,7 +49,7 @@ func weekDayComponent(day models.WorkDay) templ.Component {
 		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: 13, Col: 89}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 12, Col: 89}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
@@ -63,7 +62,7 @@ func weekDayComponent(day models.WorkDay) templ.Component {
 		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: 13, Col: 130}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 12, Col: 130}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 		if templ_7745c5c3_Err != nil {
@@ -76,7 +75,7 @@ func weekDayComponent(day models.WorkDay) templ.Component {
 		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: 15, Col: 36}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 14, Col: 36}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 		if templ_7745c5c3_Err != nil {
@@ -89,7 +88,7 @@ func weekDayComponent(day models.WorkDay) templ.Component {
 		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: 16, Col: 42}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 15, Col: 42}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
 		if templ_7745c5c3_Err != nil {
@@ -103,7 +102,7 @@ func weekDayComponent(day models.WorkDay) templ.Component {
 	})
 }
 
-func employeComponent(user models.User) templ.Component {
+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 {
@@ -125,15 +124,15 @@ func employeComponent(user models.User) templ.Component {
 		}
 		ctx = templ.ClearChildren(ctx)
 
-		workWeek := user.GetWeek(time.Now().AddDate(0, 0, -2))
+		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(user.Vorname)
+		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: 28, Col: 48}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 27, Col: 53}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
 		if templ_7745c5c3_Err != nil {
@@ -144,9 +143,9 @@ func employeComponent(user models.User) templ.Component {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var8 string
-		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(user.Name)
+		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: 28, Col: 62}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 27, Col: 72}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
 		if templ_7745c5c3_Err != nil {
@@ -156,13 +155,26 @@ func employeComponent(user models.User) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		for _, day := range workWeek.WorkDays {
+		for _, day := range week.WorkDays {
-			templ_7745c5c3_Err = weekDayComponent(day).Render(ctx, templ_7745c5c3_Buffer)
+			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, 10, "</div><div class=\"grid-cell flex flex-col justify-end\"><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></div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</div><div class=\"grid-cell flex flex-col justify-between gap-2\"><p class=\"text-sm\"><span class=\"\">Woche:</span> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, 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: 37, 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, 11, "</p><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></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

DB/initdb/01_create_tables.sql

@@ -61,13 +61,13 @@ EXECUTE FUNCTION update_zuletzt_geandert();
 
 -- audittabelle für arbeitsstunden bestätigung
 
--- DROP TABLE IF EXISTS "buchung_wochen";
+DROP TABLE IF EXISTS "buchung_wochen";
--- CREATE TABLE "buchung_wochen" (
+CREATE TABLE "buchung_wochen" (
---     "personal_nummer" int4,
+    "id" serial PRIMARY KEY,
---     "woche_start" date,
+    "personal_nummer" int4,
---     "buchungen" []bigserial,
+    "woche_start" date,
---     "bestaetigt" bool DEFAULT FALSE,
+    "bestaetigt" bool DEFAULT FALSE
--- );
+);
 
 -- Adds crypto extension
 

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, buchung_wochen TO $POSTGRES_API_USER;
     GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO $POSTGRES_API_USER;
 EOSQL
 

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;