working on #6 and fixed #13

This commit is contained in:
2025-05-02 21:41:11 +02:00
parent de2dbe558d
commit d386653a64
5 changed files with 171 additions and 40 deletions

View File

@@ -79,15 +79,22 @@ 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.GetLastSubmission()
if submissionDate != "" {
submissionDate, err := time.Parse("2006-01-02", submissionDate)
if err == nil {
lastSub = getMonday(submissionDate)
}
}
userWeek := (*models.WorkWeek).GetWeek(nil, user, lastSub, true)
var workWeeks []models.WorkWeek
teamMembers, err := user.GetTeamMembers()
for _, member := range teamMembers {
weeks := (*models.WorkWeek).GetSendWeeks(nil, member)
workWeeks = append(workWeeks, weeks...)
}
lastSub := user.GetLastSubmission()
log.Println(lastSub)
userWeek := (*models.WorkWeek).GetWeek(nil, user, lastSub, true)
// isRunningWeek := time.Since(lastSub) < 24*5*time.Hour //the last submission is this week and cannot be send yet
templates.TeamPage(workWeeks, userWeek).Render(r.Context(), w)
}
@@ -115,3 +122,14 @@ func getWeeksTillNow(lastWeek time.Time) []time.Time {
log.Println(weeks)
return weeks
}
func getMonday(ts time.Time) time.Time {
if ts.Weekday() != time.Monday {
if ts.Weekday() == time.Sunday {
ts = ts.AddDate(0, 0, -6)
} else {
ts = ts.AddDate(0, 0, -int(ts.Weekday()-1))
}
}
return ts
}