This commit is contained in:
@@ -73,11 +73,11 @@ func getBookings(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
lastSub := user.GetLastWorkWeekSubmission()
|
||||
var aggregatedOvertime time.Duration
|
||||
for _, days := range workDays {
|
||||
if days.Day.Before(lastSub) {
|
||||
for _, day := range workDays {
|
||||
if day.Day.Before(lastSub) {
|
||||
continue
|
||||
}
|
||||
aggregatedOvertime += days.CalcOvertime(user)
|
||||
aggregatedOvertime += day.CalcOvertime(user)
|
||||
}
|
||||
if reportedOvertime, err := user.GetReportedOvertime(); err == nil {
|
||||
user.Overtime = (reportedOvertime + aggregatedOvertime).Round(time.Minute)
|
||||
@@ -92,10 +92,6 @@ func getBookings(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
log.Println("Error calc overtime: ", err)
|
||||
}
|
||||
|
||||
ctx := context.WithValue(r.Context(), "user", user)
|
||||
templates.TimePage(workDays, lastSub).Render(ctx, w)
|
||||
}
|
||||
|
||||
@@ -18,7 +18,6 @@ var Session *scs.SessionManager
|
||||
func CreateSessionManager(lifetime time.Duration) *scs.SessionManager {
|
||||
Session = scs.New()
|
||||
Session.Lifetime = lifetime
|
||||
log.Println("Created Session")
|
||||
return Session
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user