updated time editing ui

Backend/models/absence.go

@@ -45,6 +45,10 @@ func (a *Absence) Date() time.Time {
 	return a.Day.Truncate(24 * time.Hour)
 }
 
+func (a *Absence) IsMultiDay() bool {
+	return !a.DateFrom.Equal(a.DateTo)
+}
+
 func (a *Absence) TimeWorkVirtual(u User) time.Duration {
 	return a.TimeWorkReal(u)
 }

Backend/models/workDay.go

@@ -3,9 +3,9 @@ package models
 import (
 	"arbeitszeitmessung/helper"
 	"encoding/json"
+	"fmt"
 	"log"
 	"sort"
-	"strconv"
 	"time"
 )
 
@@ -87,8 +87,8 @@ func (d *WorkDay) TimeWorkVirtual(u User) time.Duration {
 	return d.workTime
 }
 
-func (d *WorkDay) GetKurzArbeit() Absence {
-	return d.kurzArbeitAbsence
+func (d *WorkDay) GetKurzArbeit() *Absence {
+	return &d.kurzArbeitAbsence
 }
 
 func (d *WorkDay) TimeWorkReal(u User) time.Duration {
@@ -144,7 +144,7 @@ func (d *WorkDay) TimePauseReal(u User) (work, pause time.Duration) {
 }
 
 func (d *WorkDay) ToString() string {
-	return "WorkDay"
+	return fmt.Sprintf("WorkDay: %s with %d bookings and worktime: %s", d.Date().Format("2006-01-02"), len(d.Bookings), helper.FormatDuration(d.workTime))
 }
 
 func (d *WorkDay) IsWorkDay() bool {
@@ -231,7 +231,7 @@ func GetWorkDays(user User, tsFrom, tsTo time.Time) []WorkDay {
 		return workDays
 	}
 	defer rows.Close()
-	emptyDays, _ := strconv.ParseBool(helper.GetEnv("EMPTY_DAYS", "false"))
+	// emptyDays, _ := strconv.ParseBool(helper.GetEnv("EMPTY_DAYS", "false"))
 	for rows.Next() {
 		var workDay WorkDay
 		var bookings []byte
@@ -251,11 +251,12 @@ func GetWorkDays(user User, tsFrom, tsTo time.Time) []WorkDay {
 			workDay.Bookings = []Booking{}
 		}
 		workDay.TimePauseReal(user)
-		if emptyDays && !helper.IsWeekend(workDay.Date()) {
+		if len(workDay.Bookings) > 1 || !helper.IsWeekend(workDay.Date()) {
 			workDays = append(workDays, workDay)
 		}
 	}
 	if err = rows.Err(); err != nil {
+		log.Println("Error in workday rows!", err)
 		return workDays
 	}
 	return workDays