build uppon paramParser

This commit is contained in:
2025-10-28 22:59:09 +01:00
parent a634b7a69e
commit 4bc5594dc5
4 changed files with 101 additions and 54 deletions

View File

@@ -2,13 +2,13 @@ package endpoints
import (
"arbeitszeitmessung/helper"
"arbeitszeitmessung/helper/paramParser"
"arbeitszeitmessung/models"
"arbeitszeitmessung/templates"
"context"
"errors"
"log"
"net/http"
"strconv"
"time"
)
@@ -30,17 +30,17 @@ func submitReport(w http.ResponseWriter, r *http.Request) {
log.Println("Error parsing form", err)
return
}
userPN, _ := strconv.Atoi(r.FormValue("user"))
_weekTs := r.FormValue("week")
weekTs, err := time.Parse(time.DateOnly, _weekTs)
pp := paramParser.New(r.Form)
userPN, err := pp.ParseInt("user")
weekTs := pp.ParseTimestampFallback("week", time.DateOnly, time.Now())
user, err := models.GetUserByPersonalNr(userPN)
workWeek := models.NewWorkWeek(user, weekTs, true)
if err != nil {
log.Println("Could not get user!")
return
}
workWeek := models.NewWorkWeek(user, weekTs, true)
switch r.FormValue("method") {
case "send":
err = workWeek.SendWeek()
@@ -62,14 +62,11 @@ func showWeeks(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, "/user/login", http.StatusSeeOther)
return
}
submissionDate := r.URL.Query().Get("submission_date")
lastSub := user.GetLastWorkWeekSubmission()
if submissionDate != "" {
submissionDate, err := time.Parse(time.DateOnly, submissionDate)
if err == nil {
lastSub = helper.GetMonday(submissionDate)
}
}
pp := paramParser.New(r.URL.Query())
submissionDate := pp.ParseTimestampFallback("submission_date", time.DateOnly, user.GetLastWorkWeekSubmission())
lastSub := helper.GetMonday(submissionDate)
userWeek := models.NewWorkWeek(user, lastSub, true)
var workWeeks []models.WorkWeek