CHANGE: added report section
This commit is contained in:
@@ -1,15 +1,30 @@
|
||||
package endpoints
|
||||
|
||||
import (
|
||||
"arbeitszeitmessung/helper"
|
||||
"arbeitszeitmessung/models"
|
||||
"arbeitszeitmessung/templates"
|
||||
"context"
|
||||
"errors"
|
||||
"log"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TeamHandler(w http.ResponseWriter, r *http.Request) {
|
||||
showWeeks(w, r)
|
||||
helper.RequiresLogin(Session, w, r)
|
||||
switch r.Method {
|
||||
case http.MethodPost:
|
||||
submitReport(w, r)
|
||||
break
|
||||
case http.MethodGet:
|
||||
showWeeks(w, r)
|
||||
break
|
||||
default:
|
||||
http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
|
||||
break
|
||||
}
|
||||
// user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
|
||||
// if err != nil {
|
||||
// log.Println("No user found with the given personal number!")
|
||||
@@ -24,6 +39,39 @@ func TeamHandler(w http.ResponseWriter, r *http.Request) {
|
||||
// templates.TeamPage(teamMembers, userWorkDays).Render(r.Context(), w)
|
||||
}
|
||||
|
||||
func submitReport(w http.ResponseWriter, r *http.Request) {
|
||||
err := r.ParseForm()
|
||||
if err != nil {
|
||||
log.Println("Error parsing form", err)
|
||||
return
|
||||
}
|
||||
userPN, _ := strconv.Atoi(r.FormValue("user"))
|
||||
_weekTs := r.FormValue("week")
|
||||
weekTs, err := time.Parse(time.DateOnly, _weekTs)
|
||||
user, err := (*models.User).GetByPersonalNummer(nil, userPN)
|
||||
workWeek := (*models.WorkWeek).GetWeek(nil, user, weekTs, false)
|
||||
|
||||
if err != nil {
|
||||
log.Println("Could not get user!")
|
||||
return
|
||||
}
|
||||
|
||||
switch r.FormValue("method") {
|
||||
case "send":
|
||||
err = workWeek.Send()
|
||||
break
|
||||
case "accept":
|
||||
err = workWeek.Accept()
|
||||
break
|
||||
default:
|
||||
break
|
||||
}
|
||||
if errors.Is(err, models.ErrRunningWeek) {
|
||||
showWeeks(w, r.WithContext(context.WithValue(r.Context(), "error", true)))
|
||||
}
|
||||
showWeeks(w, r)
|
||||
}
|
||||
|
||||
func showWeeks(w http.ResponseWriter, r *http.Request) {
|
||||
user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
|
||||
if err != nil {
|
||||
@@ -37,16 +85,10 @@ func showWeeks(w http.ResponseWriter, r *http.Request) {
|
||||
weeks := (*models.WorkWeek).GetSendWeeks(nil, member)
|
||||
workWeeks = append(workWeeks, weeks...)
|
||||
}
|
||||
// Somehow use this for the own users weeks
|
||||
// lastSub := member.GetLastSubmission()
|
||||
// weeks := getWeeksTillNow(lastSub)
|
||||
// for _, week := range weeks {
|
||||
// workWeek := (*models.WorkWeek).GetWeek(nil, member, week)
|
||||
// workWeeks = append(workWeeks, workWeek)
|
||||
// }
|
||||
lastSub := user.GetLastSubmission()
|
||||
// userWorkDays := (*models.WorkDay).GetWorkDays(nil, user.CardUID, lastSub, lastSub.AddDate(0, 0, 7))
|
||||
userWeek := (*models.WorkWeek).GetWeek(nil, user, lastSub)
|
||||
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)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user