tom/arbeitszeitmessung
3
0
Fork 0
Code Issues 17 Pull Requests Actions Packages Releases 9 Wiki Activity

CHANGE: added report section

Browse Source
This commit is contained in:
Tom Tröger
2025-02-26 15:05:50 +01:00
parent 0ddca8b9ce
commit 54104d5a0e
15 changed files with 376 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Backend/endpoints/team.go
View File

@@ -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)
}

13
Backend/endpoints/time.go
View File

@@ -14,17 +14,22 @@ import (
// Frontend relevant backend functionality -> not used by the arduino devices
func TimeHandler(w http.ResponseWriter, r *http.Request) {
helper.RequiresLogin(Session, w, r)
helper.SetCors(w)
switch r.Method {
case "GET":
case http.MethodGet:
getBookings(w, r)
case "POST":
break
case http.MethodPost:
updateBooking(w, r)
case "OPTIONS":
break
case http.MethodOptions:
// just support options header for non GET Requests from SWAGGER
w.WriteHeader(http.StatusOK)
break
default:
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
break
}
}

4
Backend/endpoints/time_create.go
View File

@@ -16,13 +16,17 @@ func TimeCreateHandler(w http.ResponseWriter, r *http.Request) {
switch r.Method {
case http.MethodPut:
createBooking(w, r)
break
case http.MethodGet:
createBooking(w, r)
break
case http.MethodOptions:
// just support options header for non GET Requests from SWAGGER
w.WriteHeader(http.StatusOK)
break
default:
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
break
}
}

28
Backend/endpoints/user.go
View File

@@ -1,6 +1,7 @@
package endpoints
import (
"arbeitszeitmessung/helper"
"arbeitszeitmessung/models"
"arbeitszeitmessung/templates"
"log"
@@ -18,27 +19,26 @@ func CreateSessionManager(lifetime time.Duration) *scs.SessionManager {
Session.Lifetime = lifetime
return Session
}
func LoginHandler(w http.ResponseWriter, r *http.Request) {
switch r.Method {
case http.MethodGet:
showLoginForm(w, r, false)
showLoginPage(w, r, false)
break
case http.MethodPost:
loginUser(w, r)
break
default:
showLoginForm(w, r, false)
http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
break
}
}
func UserHandler(w http.ResponseWriter, r *http.Request) {
// if !Session.Exists(r.Context(), "user") {
// http.Redirect(w, r, "/user/login", http.StatusSeeOther)
// }
helper.RequiresLogin(Session, w, r)
switch r.Method {
case http.MethodGet:
showPWForm(w, r, 0)
showUserPage(w, r, 0)
break
case http.MethodPost:
changePassword(w, r)
@@ -49,7 +49,7 @@ func UserHandler(w http.ResponseWriter, r *http.Request) {
}
}
func showLoginForm(w http.ResponseWriter, r *http.Request, failed bool) {
func showLoginPage(w http.ResponseWriter, r *http.Request, failed bool) {
templates.LoginPage(failed).Render(r.Context(), w)
}
@@ -85,10 +85,10 @@ func loginUser(w http.ResponseWriter, r *http.Request) {
Session.Put(r.Context(), "user", user.PersonalNummer)
http.Redirect(w, r, "/time", http.StatusSeeOther) //with this browser always uses GET
} else {
showLoginForm(w, r, true)
showLoginPage(w, r, true)
return
}
showLoginForm(w, r, false)
showLoginPage(w, r, false)
return
}
@@ -103,26 +103,26 @@ func changePassword(w http.ResponseWriter, r *http.Request) {
password := r.FormValue("password")
newPassword := r.FormValue("new_password")
if password == "" || newPassword == "" || newPassword != r.FormValue("new_password_repeat") {
showPWForm(w, r, http.StatusBadRequest)
showUserPage(w, r, http.StatusBadRequest)
return
}
user, err := (*models.User).GetByPersonalNummer(nil, Session.GetInt(r.Context(), "user"))
if err != nil {
log.Println("Error getting user!", err)
showPWForm(w, r, http.StatusBadRequest)
showUserPage(w, r, http.StatusBadRequest)
}
auth, err := user.ChangePass(password, newPassword)
if err != nil {
log.Println("Error when changing password!", err)
}
if auth {
showPWForm(w, r, http.StatusOK)
showUserPage(w, r, http.StatusOK)
return
}
showPWForm(w, r, http.StatusUnauthorized)
showUserPage(w, r, http.StatusUnauthorized)
}
func showPWForm(w http.ResponseWriter, r *http.Request, status int) {
func showUserPage(w http.ResponseWriter, r *http.Request, status int) {
templates.UserPage(status).Render(r.Context(), w)
return
}