From d955cb02b80497c5d1d95167051da43149b0f800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20Tr=C3=B6ger?= <t.troeger.02@gmail.com>
Date: Tue, 20 May 2025 14:47:24 +0200
Subject: [PATCH] fixed error when only one booking was inserted

---
 Backend/models/workDay.go                 | 4 ++--
 Backend/templates/timeComponents.templ    | 2 +-
 Backend/templates/timeComponents_templ.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Backend/models/workDay.go b/Backend/models/workDay.go
index 98bda26..ee57f04 100644
--- a/Backend/models/workDay.go
+++ b/Backend/models/workDay.go
@@ -26,7 +26,7 @@ func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay
 
 	qStr, err := DB.Prepare(`
 	WITH all_days AS (
-    SELECT generate_series($2, $3, INTERVAL '1 day')::DATE AS work_date
+	SELECT generate_series($2::DATE, $3::DATE - INTERVAL '1 day', INTERVAL '1 day')::DATE AS work_date
     ),
     ordered_bookings AS (
         SELECT
@@ -155,7 +155,7 @@ func (d *WorkDay) calcPauseTime() {
 
 // Gets the duration someone worked that day
 func (d *WorkDay) getWorkTime() {
-	if len(d.Bookings) <= 1 && d.Bookings[0].CounterId == 0 {
+	if len(d.Bookings) < 1 {
 		return
 	}
 	var workTime, pauseTime time.Duration
diff --git a/Backend/templates/timeComponents.templ b/Backend/templates/timeComponents.templ
index c8ce0c5..9a7b68a 100644
--- a/Backend/templates/timeComponents.templ
+++ b/Backend/templates/timeComponents.templ
@@ -66,7 +66,7 @@ templ dayComponent(workDay models.WorkDay) {
 				if (workDay.Absence != models.Absence{}) {
 					<p>{ workDay.Absence.GetStringType() }</p>
 				}
-				if len(workDay.Bookings) <= 1 && (workDay.Absence == models.Absence{}) {
+				if len(workDay.Bookings) < 1 && (workDay.Absence == models.Absence{}) {
 					<p class="text group-[.edit]:hidden">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>
 					@absenceComponent(workDay)
 					@newBookingComponent(workDay)
diff --git a/Backend/templates/timeComponents_templ.go b/Backend/templates/timeComponents_templ.go
index 2d5a0c3..c109fb7 100644
--- a/Backend/templates/timeComponents_templ.go
+++ b/Backend/templates/timeComponents_templ.go
@@ -264,7 +264,7 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 				return templ_7745c5c3_Err
 			}
 		}
-		if len(workDay.Bookings) <= 1 && (workDay.Absence == models.Absence{}) {
+		if len(workDay.Bookings) < 1 && (workDay.Absence == models.Absence{}) {
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<p class=\"text group-[.edit]:hidden\">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err