added overtime to week report closes #18
This commit is contained in:
@@ -34,7 +34,7 @@ func submitReport(w http.ResponseWriter, r *http.Request) {
|
||||
_weekTs := r.FormValue("week")
|
||||
weekTs, err := time.Parse(time.DateOnly, _weekTs)
|
||||
user, err := models.GetUserByPersonalNr(userPN)
|
||||
workWeek := (*models.WorkWeek).GetWeek(nil, user, weekTs, false)
|
||||
workWeek := models.NewWorkWeek(user, weekTs, true)
|
||||
|
||||
if err != nil {
|
||||
log.Println("Could not get user!")
|
||||
@@ -70,7 +70,7 @@ func showWeeks(w http.ResponseWriter, r *http.Request) {
|
||||
lastSub = helper.GetMonday(submissionDate)
|
||||
}
|
||||
}
|
||||
userWeek := (*models.WorkWeek).GetWeek(nil, user, lastSub, true)
|
||||
userWeek := models.NewWorkWeek(user, lastSub, true)
|
||||
|
||||
var workWeeks []models.WorkWeek
|
||||
teamMembers, err := user.GetTeamMembers()
|
||||
|
||||
Reference in New Issue
Block a user