fixed superfluos http headers, fixed overtime calculation

Author: gluek

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v0.5.6
+
+### Bugfix
+
+- Superfluous HTTP header error
+- fixed overtime calculation across years
+
+---
+
 ## v0.5.5
 
 ### Features

Taskfile.yaml

@@ -36,6 +36,11 @@ tasks:
     deps: [css, gen, winres]
     cmds:
       - go build -ldflags "-w -s -H=windowsgui" .
+  build-debug:
+    desc: Run the application
+    deps: [css, gen, winres]
+    cmds:
+      - go build -ldflags "-H=windowsgui" .
   release:
     desc: Tag commit and push to remote
     cmds:

internal/components/components.templ

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-var version string = "v0.5.5"
+var version string = "v0.5.6"
 
 func yearSelectList() []int {
 	currentYear := time.Now().Year()

internal/database/client.go

@@ -275,6 +275,16 @@ func GetRecordsForDate(date time.Time) []Timeframe {
 	return timeframes
 }
 
+func GetRecordsUntilDay(day time.Time) []Timeframe {
+	statement := "SELECT * FROM timeframes WHERE date<=date(?);"
+	timeframes, err := getTimeframes(statement, day.Format("2006-01-02"))
+	if err != nil {
+		log.Printf("error GetRecordsForDate: %v", err)
+		return []Timeframe{}
+	}
+	return timeframes
+}
+
 func GetRecordsForProjectAndMonth(year int, month int, projectid int) []Timeframe {
 	statement := "SELECT * FROM timeframes WHERE year=? AND month=? AND projectid=?"
 	timeframes, err := getTimeframes(statement, year, month, projectid)
@@ -628,6 +638,34 @@ func GetLocationDaysForYear(year time.Time) []LocationDays {
 	return locationDays
 }
 
+func GetYears() []int {
+	var years []int
+	statement, err := DB.Prepare("SELECT DISTINCT year FROM timeframes")
+	if err != nil {
+		log.Printf("could not prepare statement GetYears: %v", err)
+		return []int{}
+	}
+	defer statement.Close()
+
+	rows, err := statement.Query()
+	if err != nil {
+		log.Printf("could not query database GetYears: %v", err)
+		return []int{}
+	}
+	defer rows.Close()
+
+	for rows.Next() {
+		var year int
+		err = rows.Scan(&year)
+		if err != nil {
+			log.Printf("could not scan rows GetYears: %v", err)
+			return []int{}
+		}
+		years = append(years, year)
+	}
+	return years
+}
+
 func GetVersion() {
 	var version string
 	err = DB.QueryRow("SELECT SQLITE_VERSION()").Scan(&version)

internal/handlers/handler_helpers.go

@@ -237,25 +237,40 @@ func GetProjectsHoursOverview(month time.Time) []database.ProjectHoursLocationsD
 }
 
 func GetOvertimeHoursUntilDay(year time.Time, day time.Time) database.ProjectHours {
-	projects := database.GetProjects()
+	//projects := database.GetProjects()
 	total, err := time.ParseDuration("0s")
 	if err != nil {
 		log.Println(err)
 	}
-	for _, project := range projects {
-		records := database.GetRecordsForProjectAndYearUntilToday(year, day, project.ID)
-		duration := workTotalForRecords(records)
-		total += duration
-	}
+	//for _, project := range projects {
+	//records := database.GetRecordsForProjectAndYearUntilToday(year, day, project.ID)
+	records := database.GetRecordsUntilDay(day)
+	duration := workTotalForRecords(records)
+	total += duration
+	//}
 	workTotalTarget, err := time.ParseDuration(viper.GetString("worktime_per_week"))
 	if err != nil {
 		log.Println(err)
 	}
+	// TODO: Consider overtime offset only once
+	// TODO: Consider hours from previous year
+	// TODO: Write Work Hours per Day into Records? Extra days table?
 	offsetOvertime, err := time.ParseDuration(viper.GetString("offset_overtime"))
 	if err != nil {
 		log.Println(err)
 	}
-	overTimeHours := offsetOvertime.Hours() + total.Hours() - float64(GetWorkDaysUntilDay(year, day))*workTotalTarget.Hours()/5
+
+	// Calculate work days
+	years := database.GetYears()
+	workdays := 0
+	for _, yearDB := range years {
+		if yearDB <= year.Year() {
+			year_as_time, _ := time.Parse("2006", fmt.Sprintf("%d", yearDB))
+			workdays += GetWorkDaysForYearUntilDay(year_as_time, day)
+		}
+	}
+
+	overTimeHours := offsetOvertime.Hours() + total.Hours() - float64(workdays)*workTotalTarget.Hours()/5
 	return database.ProjectHours{
 		Project: database.Project{Activity: "", Details: "", Name: "Overtime"},
 		Hours:   fmt.Sprintf("%.2f", overTimeHours),
@@ -272,13 +287,14 @@ func GetWorkDays(month time.Time) int {
 	}
 }
 
-func GetWorkDaysUntilDay(year time.Time, day time.Time) int {
+// If year is smaller than year of day, work days for whole year are returned
+func GetWorkDaysForYearUntilDay(year time.Time, day time.Time) int {
 	startOfYear, err := time.Parse("2006-01-02", fmt.Sprintf("%d-01-01", year.Year()))
 	if err != nil {
 		log.Println(err)
 	}
 	var endDate time.Time
-	if year.Year() < time.Now().Year() {
+	if year.Year() < day.Year() {
 		endDate, err = time.Parse("2006-01-02", fmt.Sprintf("%d-12-31", year.Year()))
 		if err != nil {
 			log.Println(err)

internal/handlers/handlers.go

@@ -47,7 +47,7 @@ func HomePage(w http.ResponseWriter, r *http.Request) {
 		workDeltaWeek(workTotalWeek(activeDate), activeDate), GetOvertimeHoursUntilDay(activeDate, activeDate))
 	err := component.Render(r.Context(), w)
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
+		//w.WriteHeader(http.StatusInternalServerError)
 		log.Printf("error render homepage: %v", err)
 	}
 }
@@ -62,7 +62,7 @@ func RecordsPageHandler(w http.ResponseWriter, r *http.Request) {
 		workDeltaWeek(workTotalWeek(activeDate), activeDate), GetOvertimeHoursUntilDay(activeDate, activeDate))
 	err := component.Render(r.Context(), w)
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
+		//w.WriteHeader(http.StatusInternalServerError)
 		log.Printf("error render records: %v", err)
 	}
 }
@@ -88,7 +88,7 @@ func RecordsPageDateChangeHandler(w http.ResponseWriter, r *http.Request) {
 		workDeltaWeek(workTotalWeek(activeDate), activeDate), GetOvertimeHoursUntilDay(activeDate, activeDate))
 	err = component.Render(r.Context(), w)
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
+		//w.WriteHeader(http.StatusInternalServerError)
 		log.Printf("error render records: %v", err)
 		return
 	}
@@ -101,7 +101,7 @@ func RecordsHandler(w http.ResponseWriter, r *http.Request) {
 	)
 	err := component.Render(r.Context(), w)
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
+		//w.WriteHeader(http.StatusInternalServerError)
 		log.Printf("error render records: %v", err)
 		return
 	}
@@ -110,7 +110,7 @@ func RecordsHandler(w http.ResponseWriter, r *http.Request) {
 func ProjectsHandler(w http.ResponseWriter, r *http.Request) {
 	err := components.Projects(database.GetProjects()).Render(r.Context(), w)
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
+		//w.WriteHeader(http.StatusInternalServerError)
 		log.Printf("error render projects: %v", err)
 		return
 	}
@@ -126,7 +126,7 @@ func MonthlySummaryHandler(w http.ResponseWriter, r *http.Request) {
 	)
 	err := component.Render(r.Context(), w)
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
+		//w.WriteHeader(http.StatusInternalServerError)
 		log.Printf("error render monthly summary: %v", err)
 		return
 	}
@@ -153,7 +153,7 @@ func YearlySummaryHandler(w http.ResponseWriter, r *http.Request) {
 	)
 	err := component.Render(r.Context(), w)
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
+		//w.WriteHeader(http.StatusInternalServerError)
 		log.Printf("error render yearly summary: %v", err)
 		return
 	}

internal/handlers/handlers_test.go

@@ -17,5 +17,5 @@ func TestGetWorkDays(t *testing.T) {
 func TestGetWorkDaysUntilDay(t *testing.T) {
 	HandlerInit()
 	fmt.Println("Today:", time.Now().String())
-	fmt.Println("Days:", GetWorkDaysUntilDay(time.Now(), time.Now()))
+	fmt.Println("Days:", GetWorkDaysForYearUntilDay(time.Now(), time.Now()))
 }

main_windows.go

@@ -111,9 +111,9 @@ func getlanternSysTray() {
 
 		go func() {
 			<-mQuitOrig.ClickedCh
-			fmt.Println("Requesting quit")
+			log.Println("Requesting quit")
 			systray.Quit()
-			fmt.Println("Finished quitting")
+			log.Println("Finished quitting")
 		}()
 
 		go func() {