tom/arbeitszeitmessung
3
0
Fork 0
Code Issues 17 Pull Requests Actions Packages Releases 9 Wiki Activity

dev/main #19

Merged
tom_trgr merged 24 commits from dev/main into main 2025-06-20 22:17:21 +02:00
Conversation 0 Commits 24 Files Changed 35 +4 -4
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d955cb02b8 - Show all commits

4
Backend/models/workDay.go
View File

@@ -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

2
Backend/templates/timeComponents.templ
View File

@@ -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)

2
Backend/templates/timeComponents_templ.go
View File

@@ -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