diff --git a/Backend/database.go b/Backend/database.go index 1112aa6..f814974 100644 --- a/Backend/database.go +++ b/Backend/database.go @@ -10,7 +10,7 @@ import ( func OpenDatabase() (*sql.DB, error) { dbHost := helper.GetEnv("POSTGRES_HOST", "localhost") dbName := helper.GetEnv("POSTGRES_DB", "arbeitszeitmessung") - dbUser := helper.GetEnv("POSTGRES_API_USER", "arbeit_zeit") + dbUser := helper.GetEnv("POSTGRES_API_USER", "api_nutzer") dbPassword := helper.GetEnv("POSTGRES_API_PASS", "password") connStr := fmt.Sprintf("postgres://%s:%s@%s:5432/%s?sslmode=disable&TimeZone=Europe/Berlin", dbUser, dbPassword, dbHost, dbName) diff --git a/Backend/endpoints/auto_logout.go b/Backend/endpoints/auto_logout.go index 9457d3e..7d6de92 100644 --- a/Backend/endpoints/auto_logout.go +++ b/Backend/endpoints/auto_logout.go @@ -5,6 +5,7 @@ import ( "arbeitszeitmessung/models" "encoding/json" "fmt" + "log" "net/http" ) @@ -26,11 +27,13 @@ func autoLogout(w http.ResponseWriter) { } for _, user := range users { if user.CheckAnwesenheit() { - err = user.Logout() + err = user.CheckOut() if err != nil { fmt.Printf("Error logging out user %v\n", err) + } else { + logged_out_users = append(logged_out_users, user) + log.Printf("Automaticaly logged out user %s, %s ", user.Name, user.Vorname) } - logged_out_users = append(logged_out_users, user) } } diff --git a/Backend/endpoints/team.go b/Backend/endpoints/team.go index 843f899..c28cc72 100644 --- a/Backend/endpoints/team.go +++ b/Backend/endpoints/team.go @@ -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 +} diff --git a/Backend/endpoints/team_presence.go b/Backend/endpoints/team_presence.go new file mode 100644 index 0000000..5ca18e0 --- /dev/null +++ b/Backend/endpoints/team_presence.go @@ -0,0 +1,45 @@ +package endpoints + +import ( + "arbeitszeitmessung/helper" + "arbeitszeitmessung/models" + "arbeitszeitmessung/templates" + "log" + "net/http" +) + +func TeamPresenceHandler(w http.ResponseWriter, r *http.Request){ + helper.RequiresLogin(Session, w, r) + helper.SetCors(w) + switch r.Method { + case http.MethodGet: + teamPresence(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 + } +} + +func teamPresence(w http.ResponseWriter, r *http.Request){ + user, err := (*models.User).GetUserFromSession(nil, Session, r.Context()) + if err != nil { + log.Println("Error getting user!", err) + } + team, err := user.GetTeamMembers() + teamPresence := make(map[bool][]models.User) + for _, user := range team { + present := user.CheckAnwesenheit() + teamPresence[present] = append(teamPresence[present], user) + } + + + if(err != nil){ + log.Println("Error getting team", err) + } + templates.TeamPresencePage(teamPresence).Render(r.Context(), w) +} diff --git a/Backend/endpoints/time_create.go b/Backend/endpoints/time-create.go similarity index 98% rename from Backend/endpoints/time_create.go rename to Backend/endpoints/time-create.go index e1f4d58..ddeb0a4 100644 --- a/Backend/endpoints/time_create.go +++ b/Backend/endpoints/time-create.go @@ -69,6 +69,5 @@ func checkPassword(r *http.Request) bool { return false } } - log.Println(authHeaders) return authToken == authHeaders[_authStart:] } diff --git a/Backend/endpoints/time.go b/Backend/endpoints/time.go index 4035e41..36abc91 100644 --- a/Backend/endpoints/time.go +++ b/Backend/endpoints/time.go @@ -8,6 +8,7 @@ import ( "encoding/json" "log" "net/http" + "sort" "strconv" "time" ) @@ -69,48 +70,107 @@ func getBookings(w http.ResponseWriter, r *http.Request) { } tsTo = tsTo.AddDate(0, 0, 1) // so that today is inside - bookings, err := (*models.Booking).GetBookingsGrouped(nil, user.CardUID, tsFrom, tsTo) - if err != nil { - log.Println("Error getting bookings: ", err) - http.Error(w, "Internal Server Error", http.StatusInternalServerError) - return - } + workDays := (*models.WorkDay).GetWorkDays(nil, user.CardUID, tsFrom, tsTo) + sort.Slice(workDays, func(i, j int) bool { + return workDays[i].Day.After(workDays[j].Day) + }) + if r.Header.Get("Accept") == "application/json" { w.Header().Set("Content-Type", "application/json") w.WriteHeader(http.StatusOK) - json.NewEncoder(w).Encode(bookings) + json.NewEncoder(w).Encode(workDays) return } + ctx := context.WithValue(r.Context(), "user", user) - templates.TimePage(bookings).Render(ctx, w) + templates.TimePage(workDays).Render(ctx, w) } func updateBooking(w http.ResponseWriter, r *http.Request) { r.ParseForm() - for index, possibleBooking := range r.PostForm { - if index[:7] == "booking" { - booking_id, err := strconv.Atoi(index[8:]) - if err != nil { - log.Println("Error parsing bookingId", err) - continue - } - booking, err := (*models.Booking).GetBookingById(nil, booking_id) - if err != nil { - log.Println("Error getting booking!", err) - continue - } - parsedTime, err := time.ParseInLocation("15:04", possibleBooking[0], time.Local) - if err != nil { - log.Println("Error parsing time!", err) - continue - } - log.Println("Parsing time", parsedTime) - booking.UpdateTime(parsedTime) - } + var loc *time.Location + loc, err := time.LoadLocation(helper.GetEnv("TZ", "Europe/Berlin")) + if err != nil { + log.Println("Error loading location", err) + loc = time.Local } + user, err := (*models.User).GetUserFromSession(nil, Session, r.Context()) + if err != nil { + log.Println("No user found!", err) + return + } + switch r.FormValue("action") { + case "add": + timestamp, err := time.ParseInLocation("2006-01-02|15:04", r.FormValue("date")+"|"+r.FormValue("timestamp"), loc) + if err != nil { + log.Println("Error parsing timestamp", err) + return + } + + var check_in_out int + check_in_out, err = strconv.Atoi(r.FormValue("check_in_out")) + if err != nil { + log.Println("Error parsing check_in_out", err) + return + } + + newBooking := (*models.Booking).New(nil, user.CardUID, 0, int16(check_in_out)) + newBooking.Timestamp = timestamp + err = newBooking.InsertTimestamp() + if err != nil { + log.Println("Error inserting booking", err) + } + break + case "change": + absenceType, err := strconv.Atoi(r.FormValue("absence")) + if err != nil { + log.Println("Error parsing absence type.", err) + absenceType = 0 + } + if absenceType != 0 { + createAbsence(absenceType, user, loc, r) + } + for index, possibleBooking := range r.PostForm { + if len(index) > 7 && index[:7] == "booking" { + booking_id, err := strconv.Atoi(index[8:]) + if err != nil { + log.Println("Error parsing bookingId", err) + continue + } + booking, err := (*models.Booking).GetBookingById(nil, booking_id) + if err != nil { + log.Println("Error getting booking!", err) + continue + } + parsedTime, err := time.ParseInLocation("15:04", possibleBooking[0], booking.Timestamp.Location()) + if err != nil { + log.Println("Error parsing time!", err) + continue + } + // log.Println("Parsing time", parsedTime) + booking.UpdateTime(parsedTime) + } + } + break + } + getBookings(w, r) } +func createAbsence(absenceType int, user models.User, loc *time.Location, r *http.Request) { + absenceDate, err := time.ParseInLocation("2006-01-02", r.FormValue("date"), loc) + if err != nil { + log.Println("Cannot get date from input! Skipping absence creation", err) + return + } + absence := models.NewAbsence(user.CardUID, int8(absenceType), absenceDate) + err = absence.Insert() + if err != nil { + log.Println("Error inserting absence!", err) + return + } +} + func getBookingsAPI(w http.ResponseWriter, r *http.Request) { _user_pn := r.URL.Query().Get("personal_nummer") user_pn, err := strconv.Atoi(_user_pn) diff --git a/Backend/endpoints/user.go b/Backend/endpoints/user-login.go similarity index 58% rename from Backend/endpoints/user.go rename to Backend/endpoints/user-login.go index b225f39..ee19238 100644 --- a/Backend/endpoints/user.go +++ b/Backend/endpoints/user-login.go @@ -4,6 +4,7 @@ import ( "arbeitszeitmessung/helper" "arbeitszeitmessung/models" "arbeitszeitmessung/templates" + "context" "log" "net/http" "strconv" @@ -34,22 +35,15 @@ func LoginHandler(w http.ResponseWriter, r *http.Request) { } } -func UserHandler(w http.ResponseWriter, r *http.Request) { - helper.RequiresLogin(Session, w, r) - switch r.Method { - case http.MethodGet: - showUserPage(w, r, 0) - break - case http.MethodPost: - changePassword(w, r) - break - default: - http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed) - break - } -} - func showLoginPage(w http.ResponseWriter, r *http.Request, failed bool) { + r = r.WithContext(context.WithValue(r.Context(), "session", Session)) + if helper.GetEnv("GO_ENV", "production") == "debug" { + // http.Redirect(w, r, "/time", http.StatusSeeOther) + templates.LoginPage(failed).Render(r.Context(), w) + } + if Session.Exists(r.Context(), "user") { + http.Redirect(w, r, "/time", http.StatusSeeOther) + } templates.LoginPage(failed).Render(r.Context(), w) } @@ -91,38 +85,3 @@ func loginUser(w http.ResponseWriter, r *http.Request) { showLoginPage(w, r, false) return } - -// change user password and store salted hash in db -func changePassword(w http.ResponseWriter, r *http.Request) { - err := r.ParseForm() - if err != nil { - log.Println("Error parsing form!", err) - http.Error(w, "Error parsing form error", http.StatusBadRequest) - return - } - password := r.FormValue("password") - newPassword := r.FormValue("new_password") - if password == "" || newPassword == "" || newPassword != r.FormValue("new_password_repeat") { - 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) - showUserPage(w, r, http.StatusBadRequest) - } - auth, err := user.ChangePass(password, newPassword) - if err != nil { - log.Println("Error when changing password!", err) - } - if auth { - showUserPage(w, r, http.StatusOK) - return - } - showUserPage(w, r, http.StatusUnauthorized) -} - -func showUserPage(w http.ResponseWriter, r *http.Request, status int) { - templates.UserPage(status).Render(r.Context(), w) - return -} diff --git a/Backend/endpoints/user-settings.go b/Backend/endpoints/user-settings.go new file mode 100644 index 0000000..7524f81 --- /dev/null +++ b/Backend/endpoints/user-settings.go @@ -0,0 +1,76 @@ +package endpoints + +import ( + "arbeitszeitmessung/helper" + "arbeitszeitmessung/models" + "arbeitszeitmessung/templates" + "log" + "net/http" +) + +func UserSettingsHandler(w http.ResponseWriter, r *http.Request) { + helper.RequiresLogin(Session, w, r) + switch r.Method { + case http.MethodGet: + showUserPage(w, r, 0) + break + case http.MethodPost: + switch r.FormValue("action") { + case "change-pass": + changePassword(w, r) + break + case "logout-user": + logoutUser(w, r) + break + } + + break + default: + http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed) + break + } +} + +// change user password and store salted hash in db +func changePassword(w http.ResponseWriter, r *http.Request) { + err := r.ParseForm() + if err != nil { + log.Println("Error parsing form!", err) + http.Error(w, "Error parsing form error", http.StatusBadRequest) + return + } + password := r.FormValue("password") + newPassword := r.FormValue("new_password") + if password == "" || newPassword == "" || newPassword != r.FormValue("new_password_repeat") { + 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) + showUserPage(w, r, http.StatusBadRequest) + } + auth, err := user.ChangePass(password, newPassword) + if err != nil { + log.Println("Error when changing password!", err) + } + if auth { + showUserPage(w, r, http.StatusAccepted) + return + } + showUserPage(w, r, http.StatusUnauthorized) +} + +func logoutUser(w http.ResponseWriter, r *http.Request) { + + err := Session.Destroy(r.Context()) + if err != nil { + log.Println("Error destroying session!", err) + } + http.Redirect(w, r, "/user/login", http.StatusSeeOther) +} + +func showUserPage(w http.ResponseWriter, r *http.Request, status int) { + templates.UserPage(status).Render(r.Context(), w) + return +} diff --git a/Backend/helper/system.go b/Backend/helper/system.go index 4ebffb2..b1c28b5 100644 --- a/Backend/helper/system.go +++ b/Backend/helper/system.go @@ -2,11 +2,13 @@ package helper import ( "os" + "time" ) // Returns env with default fallback value. // // Params: +// // key - enviroment var name // fallback - default value func GetEnv(key, fallback string) string { @@ -15,3 +17,37 @@ func GetEnv(key, fallback string) string { } return fallback } + +type CacheItem struct { + value any + expiration time.Time +} + +type Cache struct { + data map[string]CacheItem + ttl time.Duration + fetch func(key string) (any, error) +} + +func NewCache(ttl time.Duration, fetchFunc func(key string) (any, error)) *Cache { + return &Cache{ + data: make(map[string]CacheItem), + ttl: ttl, + fetch: fetchFunc, + } +} + +func (c *Cache) Get(key string) (any, error) { + if item, found := c.data[key]; found { + if time.Now().Before(item.expiration) { + return item.value, nil + } + } + + value, err := c.fetch(key) + if err != nil { + return nil, err + } + c.data[key] = CacheItem{value: value, expiration: time.Now().Add(c.ttl)} + return value, nil +} diff --git a/Backend/helper/web.go b/Backend/helper/web.go index 0bae9bf..32fca7a 100644 --- a/Backend/helper/web.go +++ b/Backend/helper/web.go @@ -1,6 +1,7 @@ package helper import ( + "context" "net/http" "os" @@ -20,6 +21,7 @@ func SetCors(w http.ResponseWriter) { } func RequiresLogin(session *scs.SessionManager, w http.ResponseWriter, r *http.Request) { + r = r.WithContext(context.WithValue(r.Context(), "session", session)) if GetEnv("GO_ENV", "production") == "debug" { return } diff --git a/Backend/main.go b/Backend/main.go index 86b50aa..969ab60 100644 --- a/Backend/main.go +++ b/Backend/main.go @@ -8,6 +8,7 @@ import ( "fmt" "log" "net/http" + "os" "time" "github.com/joho/godotenv" @@ -21,6 +22,16 @@ func main() { if err != nil { log.Println("No .env file found in directory!") } + if(helper.GetEnv("GO_ENV", "production") == "debug") { + log.Println("Debug mode enabled") + log.Println("Environment Variables") + envs := os.Environ() + for _, e := range envs { + fmt.Println(e) + } + } + + models.DB, err = OpenDatabase() if err != nil { @@ -38,8 +49,9 @@ func main() { server.Handle("/time", ParamsMiddleware(endpoints.TimeHandler)) server.HandleFunc("/logout", endpoints.LogoutHandler) server.HandleFunc("/user/login", endpoints.LoginHandler) - server.HandleFunc("/user", endpoints.UserHandler) + server.HandleFunc("/user/settings", endpoints.UserSettingsHandler) server.HandleFunc("/team", endpoints.TeamHandler) + server.HandleFunc("/team/presence", endpoints.TeamPresenceHandler) server.Handle("/", http.RedirectHandler("/time", http.StatusPermanentRedirect)) server.Handle("/static/", http.StripPrefix("/static/", fs)) diff --git a/Backend/models/absence.go b/Backend/models/absence.go new file mode 100644 index 0000000..2f352c6 --- /dev/null +++ b/Backend/models/absence.go @@ -0,0 +1,68 @@ +package models + +import ( + "log" + "time" +) + +type AbsenceType struct { + Value int8 + Label string +} + +const ( + AbsenceNone int8 = iota + AbsenceUrlaub + AbsenceKurzarbeit + AbsenceKrank + AbsenceKindkrank +) + +var AbsenceTypes = []AbsenceType{ + // {Value: AbsenceNone, Label: "Abwesenheit"}, + {Value: AbsenceUrlaub, Label: "Urlaub"}, + {Value: AbsenceKurzarbeit, Label: "Kurzarbeit"}, + {Value: AbsenceKrank, Label: "Krank"}, + {Value: AbsenceKindkrank, Label: "Kindkrank"}, +} + +var AbsenceTypesLabel = map[int8]string{ + 0: "None", + AbsenceUrlaub: "Urlaub", + AbsenceKurzarbeit: "Kurzarbeit", + AbsenceKrank: "Krank", + AbsenceKindkrank: "Kindkrank", +} + +type Absence struct { + CounterId int + CardUID string + AbwesenheitTyp int8 + Datum time.Time +} + +func NewAbsence(card_uid string, abwesenheit_typ int8, datum time.Time) Absence { + return Absence{ + CardUID: card_uid, + AbwesenheitTyp: abwesenheit_typ, + Datum: datum, + } +} + +func (a *Absence) Insert() error { + qStr, err := DB.Prepare(`INSERT INTO abwesenheit (card_uid, abwesenheit_typ, datum) VALUES ($1, $2, $3) RETURNING counter_id;`) + if err != nil { + log.Println("Error preparing sql Statement", err) + return err + } + err = qStr.QueryRow(a.CardUID, a.AbwesenheitTyp, a.Datum).Scan(&a.CounterId) + if err != nil { + log.Println("Error executing insert statement", err) + return err + } + return nil +} + +func (a *Absence) GetStringType() string { + return AbsenceTypesLabel[a.AbwesenheitTyp] +} diff --git a/Backend/models/booking.go b/Backend/models/booking.go index 14d231e..47c2c47 100644 --- a/Backend/models/booking.go +++ b/Backend/models/booking.go @@ -1,6 +1,7 @@ package models import ( + "arbeitszeitmessung/helper" "database/sql" "fmt" "log" @@ -46,8 +47,9 @@ func (b *Booking) FromUrlParams(params url.Values) Booking { return booking } -func (b Booking) Verify() bool { - if b.CardUID == "" || b.GeraetID == 0 || b.CheckInOut == 0 { +func (b *Booking) Verify() bool { + //check for overlapping time + arbeitszeit verstoß + if b.CardUID == "" { //|| b.GeraetID == 0 || b.CheckInOut == 0 { return false } return true @@ -68,6 +70,21 @@ func (b *Booking) Insert() error { return nil } +func (b *Booking) InsertTimestamp() error { + if b.Timestamp.IsZero() { + return b.Insert() + } + stmt, err := DB.Prepare((`INSERT INTO anwesenheit (card_uid, geraet_id, check_in_out, timestamp) VALUES ($1, $2, $3, $4) RETURNING counter_id`)) + if err != nil { + return err + } + err = stmt.QueryRow(b.CardUID, b.GeraetID, b.CheckInOut, b.Timestamp).Scan(&b.CounterId) + if err != nil { + return err + } + return nil +} + func (b *Booking) GetBookingById(booking_id int) (Booking, error) { var booking Booking qStr, err := DB.Prepare((`SELECT counter_id, timestamp, card_uid, geraet_id, check_in_out FROM anwesenheit WHERE counter_id = $1`)) @@ -78,10 +95,10 @@ func (b *Booking) GetBookingById(booking_id int) (Booking, error) { if err != nil { return booking, err } - if !booking.Verify() { - fmt.Printf("Booking verification failed") - return booking, nil - } + // if !booking.Verify() { + // fmt.Printf("Booking verification failed! %d", ) + // return booking, nil + // } return booking, nil } @@ -136,7 +153,7 @@ func (b *Booking) GetBookingsGrouped(card_uid string, tsFrom time.Time, tsTo tim return bookings[i].Timestamp.Before(bookings[j].Timestamp) }) workDay := WorkDay{Day: day, Bookings: bookings} - workDay.GetWorkTime() + workDay.getWorkTime() result = append(result, workDay) } @@ -161,12 +178,23 @@ func (b Booking) Save() { } func (b *Booking) GetBookingType() string { + debug := (helper.GetEnv("GO_ENV", "production") == "debug") switch b.CheckInOut { - case 1, 3: //manuelle Änderung + case 1: //manuelle Änderung return "kommen" - case 2, 4: //manuelle Änderung + case 3: + if debug { + return "kommen manuell" + } + return "kommen" + case 2: //manuelle Änderung return "gehen" - case 255: + case 4: + if debug { + return "gehen manuell" + } + return "gehen" + case 254: return "abgemeldet" default: return "Buchungs Typ unbekannt" @@ -217,13 +245,19 @@ func (b *Booking) UpdateTime(newTime time.Time) { // TODO: add check for time overlap var newBooking Booking - newBooking.Timestamp = time.Date(b.Timestamp.Year(), b.Timestamp.Month(), b.Timestamp.Day(), hour, minute, 0, 0, time.Local) + newBooking.Timestamp = time.Date(b.Timestamp.Year(), b.Timestamp.Month(), b.Timestamp.Day(), hour, minute, 0, 0, b.Timestamp.Location()) if b.CheckInOut < 3 { newBooking.CheckInOut = b.CheckInOut + 2 } - if b.CheckInOut == 255 { + if b.CheckInOut == 254 { newBooking.CheckInOut = 4 } + log.Println("Updating") b.Update(newBooking) + b.Verify() b.Save() } + +func (b *Booking) ToString() string { + return fmt.Sprintf("Booking %d: at: %s, as type: %d", b.CounterId, b.Timestamp.Format("15:04"), b.CheckInOut) +} diff --git a/Backend/models/user.go b/Backend/models/user.go index 94fd3d0..7c45242 100644 --- a/Backend/models/user.go +++ b/Backend/models/user.go @@ -13,11 +13,11 @@ import ( ) type User struct { - CardUID string `json:"card_uid"` - Name string `json:"name"` - Vorname string `json:"vorname"` - PersonalNummer int `json:"personal_nummer"` - Arbeitszeit float32 `json:"arbeitszeit"` + CardUID string `json:"card_uid"` + Name string `json:"name"` + Vorname string `json:"vorname"` + PersonalNummer int `json:"personal_nummer"` + ArbeitszeitPerTag float32 `json:"arbeitszeit"` } func (u *User) GetUserFromSession(Session *scs.SessionManager, ctx context.Context) (User, error) { @@ -53,9 +53,11 @@ func (u *User) GetAll() ([]User, error) { } defer rows.Close() for rows.Next() { + var user User if err := rows.Scan(&user.CardUID, &user.Vorname, &user.Name); err != nil { - return users, nil + log.Println("Error creating user!", err) + continue } users = append(users, user) } @@ -68,7 +70,7 @@ func (u *User) GetAll() ([]User, error) { // Returns true if there is a booking 1 for today -> meaning the user is at work // Returns false if there is no booking today or the user is already booked out of the system func (u *User) CheckAnwesenheit() bool { - qStr, err := DB.Prepare((`SELECT check_in_out FROM anwesenheit WHERE card_uid = $1 AND "timestamp" >= now()::date + interval '1h' ORDER BY "timestamp" DESC`)) + qStr, err := DB.Prepare((`SELECT check_in_out FROM anwesenheit WHERE card_uid = $1 AND "timestamp"::date = now()::date ORDER BY "timestamp" DESC LIMIT 1;`)) if err != nil { fmt.Printf("Error preparing query statement %v\n", err) return false @@ -79,12 +81,12 @@ func (u *User) CheckAnwesenheit() bool { if err != nil { return false } - return check_in_out == 1 + return check_in_out%2 == 1 } -// Creates a new booking for the user -> check_in_out will be 255 for automatic check out -func (u *User) Logout() error { - booking := (*Booking).New(nil, u.CardUID, 0, 255) +// Creates a new booking for the user -> check_in_out will be 254 for automatic check out +func (u *User) CheckOut() error { + booking := (*Booking).New(nil, u.CardUID, 0, 254) err := booking.Insert() if err != nil { fmt.Printf("Error inserting booking %v\n", err) @@ -100,7 +102,7 @@ func (u *User) GetByPersonalNummer(personalNummer int) (User, error) { if err != nil { return user, err } - err = qStr.QueryRow(personalNummer).Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.Arbeitszeit) + err = qStr.QueryRow(personalNummer).Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag) if err != nil { return user, err @@ -167,6 +169,15 @@ func (u *User) GetTeamMembers() ([]User, error) { return teamMembers, nil } +func (u *User) IsTeamLeader() bool { + team, err := u.GetTeamMembers() + if err != nil { + log.Println("Error getting team Members", err) + return false + } + return len(team) > 0 +} + func (u *User) GetWeek(tsFrom time.Time) WorkWeek { var bookings []WorkDay weekStart := tsFrom.AddDate(0, 0, -1*int(tsFrom.Local().Weekday())-1) @@ -187,7 +198,7 @@ func (u *User) GetNextWeek() WorkWeek { func parseUser(rows *sql.Rows) (User, error) { var user User - if err := rows.Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.Arbeitszeit); err != nil { + if err := rows.Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag); err != nil { log.Println("Error scanning row!", err) return user, err } @@ -219,6 +230,22 @@ func (u *User) GetLastSubmission() time.Time { return lastSub } +func (u *User) GetFromCardUID(card_uid string) (User, error) { + user := User{} + var err error + + qStr, err := DB.Prepare((`SELECT personal_nummer, card_uid, vorname, nachname, arbeitszeit_per_tag FROM personal_daten WHERE card_uid = $1;`)) + if err != nil { + return user, err + } + err = qStr.QueryRow(card_uid).Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag) + + if err != nil { + return user, err + } + return user, nil +} + func getMonday(ts time.Time) time.Time { if ts.Weekday() != time.Monday { if ts.Weekday() == time.Sunday { diff --git a/Backend/models/workDay.go b/Backend/models/workDay.go index 388b4ff..d6d637a 100644 --- a/Backend/models/workDay.go +++ b/Backend/models/workDay.go @@ -1,8 +1,12 @@ package models import ( + "arbeitszeitmessung/helper" + "database/sql" + "encoding/json" "fmt" "log" + "strconv" "time" ) @@ -13,59 +17,72 @@ type WorkDay struct { pauseTime time.Duration TimeFrom time.Time TimeTo time.Time + Absence Absence } func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay { var workDays []WorkDay var workSec, pauseSec float64 + qStr, err := DB.Prepare(` - WITH ordered_bookings AS ( + WITH all_days AS ( + SELECT generate_series($2::DATE, $3::DATE - INTERVAL '1 day', INTERVAL '1 day')::DATE AS work_date + ), + ordered_bookings AS ( + SELECT + timestamp::DATE AS work_date, + timestamp, + check_in_out, + counter_id, + LAG(timestamp) OVER (PARTITION BY card_uid, timestamp::DATE ORDER BY timestamp) AS prev_timestamp, + LAG(check_in_out) OVER (PARTITION BY card_uid, timestamp::DATE ORDER BY timestamp) AS prev_check + FROM anwesenheit + WHERE card_uid = $1 + AND timestamp::DATE >= $2 + AND timestamp::DATE <= $3 + ), + abwesenheiten AS ( + SELECT + datum::DATE AS work_date, + abwesenheit_typ + FROM abwesenheit + WHERE card_uid = $1 + AND datum::DATE >= $2 + AND datum::DATE <= $3 + ) SELECT - timestamp::DATE AS work_date, -- Extract date for grouping - timestamp, - check_in_out, - LAG(timestamp) OVER ( - PARTITION BY card_uid, timestamp::DATE -- Reset for each day - ORDER BY timestamp - ) AS prev_timestamp, - LAG(check_in_out) OVER ( - PARTITION BY card_uid, timestamp::DATE - ORDER BY timestamp - ) AS prev_check - FROM anwesenheit - WHERE card_uid = $1 -- Replace with actual card_uid - AND timestamp::DATE >= $2 -- Set date range - AND timestamp::DATE <= $3 - ) - SELECT - work_date, - MIN(timestamp) AS time_from, - MAX(timestamp) AS time_to, - -- Total work time per day - COALESCE( - EXTRACT(EPOCH FROM SUM( - CASE - WHEN prev_check IN (1, 3) AND check_in_out IN (2, 4, 254) - THEN timestamp - prev_timestamp - ELSE INTERVAL '0' - END - )), 0 - ) AS total_work, - - -- Extract total pause time in seconds - COALESCE( - EXTRACT(EPOCH FROM SUM( - CASE - WHEN prev_check IN (2, 4, 254) AND check_in_out IN (1, 3) - THEN timestamp - prev_timestamp - ELSE INTERVAL '0' - END - )), 0 - ) AS total_pause - - FROM ordered_bookings - GROUP BY work_date - ORDER BY work_date;`) + d.work_date, + COALESCE(MIN(b.timestamp), NOW()) AS time_from, + COALESCE(MAX(b.timestamp), NOW()) AS time_to, + COALESCE( + EXTRACT(EPOCH FROM SUM( + CASE + WHEN b.prev_check IN (1, 3) AND b.check_in_out IN (2, 4, 255) + THEN b.timestamp - b.prev_timestamp + ELSE INTERVAL '0' + END + )), 0 + ) AS total_work_seconds, + COALESCE( + EXTRACT(EPOCH FROM SUM( + CASE + WHEN b.prev_check IN (2, 4, 255) AND b.check_in_out IN (1, 3) + THEN b.timestamp - b.prev_timestamp + ELSE INTERVAL '0' + END + )), 0 + ) AS total_pause_seconds, + COALESCE(jsonb_agg(jsonb_build_object( + 'check_in_out', b.check_in_out, + 'timestamp', b.timestamp, + 'counter_id', b.counter_id + ) ORDER BY b.timestamp), '[]'::jsonb) AS bookings, + a.abwesenheit_typ + FROM all_days d + LEFT JOIN ordered_bookings b ON d.work_date = b.work_date + LEFT JOIN abwesenheiten a ON d.work_date = a.work_date + GROUP BY d.work_date, a.abwesenheit_typ + ORDER BY d.work_date;`) if err != nil { log.Println("Error preparing SQL statement", err) @@ -79,16 +96,42 @@ func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay return workDays } defer rows.Close() + emptyDays, _ := strconv.ParseBool(helper.GetEnv("EMPTY_DAYS", "false")) for rows.Next() { var workDay WorkDay - if err := rows.Scan(&workDay.Day, &workDay.TimeFrom, &workDay.TimeTo, &workSec, &pauseSec); err != nil { + var bookings []byte + var absenceType sql.NullInt16 + if err := rows.Scan(&workDay.Day, &workDay.TimeFrom, &workDay.TimeTo, &workSec, &pauseSec, &bookings, &absenceType); err != nil { log.Println("Error scanning row!", err) return workDays } workDay.workTime = time.Duration(workSec * float64(time.Second)) workDay.pauseTime = time.Duration(pauseSec * float64(time.Second)) - workDay.calcPauseTime() - workDays = append(workDays, workDay) + err = json.Unmarshal(bookings, &workDay.Bookings) + if err != nil { + log.Println("Error parsing bookings JSON!", err) + return nil + } + // better empty day handling + if len(workDay.Bookings) == 1 && workDay.Bookings[0].CounterId == 0 { + workDay.Bookings = []Booking{} + } + + if absenceType.Valid { + workDay.Absence = NewAbsence(card_uid, int8(absenceType.Int16), workDay.Day) + log.Println("Found absence", workDay.Absence) + } + + if workDay.Day.Equal(time.Now().Truncate(24 * time.Hour)) { + workDay.getWorkTime() + } else { + workDay.calcPauseTime() + } + if emptyDays || len(workDay.Bookings) > 0 || (workDay.Absence != Absence{}) { + workDays = append(workDays, workDay) + } else { + log.Println("no booking on day", workDay.Day.Format("02.01.2006")) + } } if err = rows.Err(); err != nil { return workDays @@ -98,7 +141,7 @@ func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay func (d *WorkDay) calcPauseTime() { if d.workTime > 6*time.Hour && d.pauseTime < 45*time.Minute { - if d.workTime < 9*time.Hour && d.pauseTime < 30*time.Minute { + if d.workTime <= (9*time.Hour) && d.pauseTime < 30*time.Minute { diff := 30*time.Minute - d.pauseTime d.workTime -= diff d.pauseTime += diff @@ -111,7 +154,10 @@ func (d *WorkDay) calcPauseTime() { } // Gets the duration someone worked that day -func (d *WorkDay) GetWorkTime() { +func (d *WorkDay) getWorkTime() { + if len(d.Bookings) < 1 { + return + } var workTime, pauseTime time.Duration var lastBooking Booking for _, booking := range d.Bookings { @@ -134,6 +180,7 @@ func (d *WorkDay) GetWorkTime() { d.calcPauseTime() } +// Converts duration to string func formatDuration(d time.Duration) string { hours := int(d.Abs().Hours()) minutes := int(d.Abs().Minutes()) % 60 @@ -147,9 +194,6 @@ func formatDuration(d time.Duration) string { } } -// Converts duration to string and replaces 0s with in -// -// -> output xhxmin func (d *WorkDay) GetWorkTimeString() (string, string) { workString := formatDuration(d.workTime) pauseString := formatDuration(d.pauseTime) @@ -158,12 +202,15 @@ func (d *WorkDay) GetWorkTimeString() (string, string) { // returns bool wheter the workday was ended with an automatic logout func (d *WorkDay) RequiresAction() bool { - return d.Bookings[len(d.Bookings)-1].CheckInOut == 255 + if len(d.Bookings) > 0 { + return d.Bookings[len(d.Bookings)-1].CheckInOut == 254 + } + return false } // returns a integer percentage of how much day has been worked of func (d *WorkDay) GetWorkDayProgress(user User) uint8 { - defaultWorkTime := time.Duration(user.Arbeitszeit * float32(time.Hour)) + defaultWorkTime := time.Duration(user.ArbeitszeitPerTag * float32(time.Hour)) progress := (d.workTime.Seconds() / defaultWorkTime.Seconds()) * 100 return uint8(progress) } diff --git a/Backend/models/workWeek.go b/Backend/models/workWeek.go index 7d84436..1ce0a30 100644 --- a/Backend/models/workWeek.go +++ b/Backend/models/workWeek.go @@ -1,6 +1,7 @@ package models import ( + "database/sql" "errors" "log" "time" @@ -14,6 +15,14 @@ type WorkWeek struct { WorkHours time.Duration } +type WeekStatus int8 + +const ( + WeekStatusNone WeekStatus = iota + WeekStatusSent + WeekStatusAccepted +) + func (w *WorkWeek) GetWeek(user User, tsMonday time.Time, populateDays bool) WorkWeek { var week WorkWeek if populateDays { @@ -25,6 +34,31 @@ func (w *WorkWeek) GetWeek(user User, tsMonday time.Time, populateDays bool) Wor return week } +func (w *WorkWeek) CheckStatus() WeekStatus { + weekStatus := WeekStatusNone + qStr, err := DB.Prepare(`SELECT bestaetigt FROM wochen_report WHERE woche_start = $1::DATE AND personal_nummer = $2;`) + if err != nil { + log.Println("Error preparing SQL statement", err) + return weekStatus + } + defer qStr.Close() + var beastatigt bool + err = qStr.QueryRow(w.WeekStart, w.User.PersonalNummer).Scan(&beastatigt) + if err == sql.ErrNoRows { + return weekStatus + } + if err != nil { + log.Println("Error querying database", err) + return weekStatus + } + if beastatigt { + weekStatus = WeekStatusAccepted + } else { + weekStatus = WeekStatusSent + } + return weekStatus +} + func (w *WorkWeek) GetWorkHourString() string { return formatDuration(w.WorkHours) } @@ -74,14 +108,24 @@ var ErrRunningWeek = errors.New("Week is in running week") // creates a new entry in the woche_report table with the given workweek func (w *WorkWeek) Send() error { + var qStr *sql.Stmt + var err error if time.Since(w.WeekStart) < 5*24*time.Hour { log.Println("Cannot send week, because it's the running week!") return ErrRunningWeek } - qStr, err := DB.Prepare(`INSERT INTO wochen_report (personal_nummer, woche_start) VALUES ($1, $2);`) - if err != nil { - log.Println("Error preparing SQL statement", err) - return err + if w.CheckStatus() != WeekStatusNone { + qStr, err = DB.Prepare(`UPDATE "wochen_report" SET bestaetigt = FALSE WHERE personal_nummer = $1 AND woche_start = $2;`) + if err != nil { + log.Println("Error preparing SQL statement", err) + return err + } + } else { + qStr, err = DB.Prepare(`INSERT INTO wochen_report (personal_nummer, woche_start) VALUES ($1, $2);`) + if err != nil { + log.Println("Error preparing SQL statement", err) + return err + } } _, err = qStr.Exec(w.User.PersonalNummer, w.WeekStart) if err != nil { diff --git a/Backend/src/main.css b/Backend/src/main.css index 2330065..4b3439b 100644 --- a/Backend/src/main.css +++ b/Backend/src/main.css @@ -2,62 +2,62 @@ @source "../templates/*.templ"; @theme { - --color-accent-50: #e7fdea; - --color-accent-100: #cbfbd1; - --color-accent-200: #9cf7a8; - --color-accent-300: #68f37a; - --color-accent-400: #33ef4d; - --color-accent-500: #11db2d; - --color-accent-600: #0eaf23; - --color-accent-700: #0a851b; - --color-accent-800: #075a12; - --color-accent-900: #032b09; - --color-accent-950: #021805; - --color-accent: #0eaf23; - --color-text-50: #f7f8f7; - --color-text-100: #f2f3f2; - --color-text-200: #e2e4e2; - --color-text-300: #d2d6d2; - --color-text-400: #c2c7c2; - --color-text-500: #afb6af; - --color-text-600: #97a097; - --color-text-700: #7d877d; - --color-text-800: #5a625a; - --color-text-900: #161816; - --color-text-950: #000000; + --color-accent-50: #e7fdea; + --color-accent-100: #cbfbd1; + --color-accent-200: #9cf7a8; + --color-accent-300: #68f37a; + --color-accent-400: #33ef4d; + --color-accent-500: #11db2d; + --color-accent-600: #0eaf23; + --color-accent-700: #0a851b; + --color-accent-800: #075a12; + --color-accent-900: #032b09; + --color-accent-950: #021805; + --color-accent: #0eaf23; + --color-text-50: #f7f8f7; + --color-text-100: #f2f3f2; + --color-text-200: #e2e4e2; + --color-text-300: #d2d6d2; + --color-text-400: #c2c7c2; + --color-text-500: #afb6af; + --color-text-600: #97a097; + --color-text-700: #7d877d; + --color-text-800: #5a625a; + --color-text-900: #161816; + --color-text-950: #000000; } @layer components { + .grid-main { + display: grid; + grid-template-columns: 2fr auto 1fr; + align-items: stretch; + } + + .grid-sub { + display: grid; + grid-template-columns: subgrid; + grid-column: 1 / -1; + border-color: var(--color-neutral-400); + transition: background-color 0.2s ease-in-out; + } + + .grid-sub:hover { + background-color: var(--color-neutral-200); + } + + .grid-cell { + padding: calc(var(--spacing) * 2); + border-color: var(--color-neutral-400); + } + + @media (width >=48rem) { .grid-main { - display: grid; - grid-template-columns: repeat(6, 1fr); - align-items: stretch; + grid-template-columns: repeat(5, 1fr); + margin: 0 10%; } .grid-sub { - display: grid; - grid-template-columns: subgrid; - grid-column: 1 / -1; - border-color: var(--color-neutral-400); - transition: background-color 0.2s ease-in-out; - } - - .grid-sub:hover { - background-color: var(--color-neutral-200); - } - - .grid-cell { - padding: calc(var(--spacing) * 2); - border-color: var(--color-neutral-400); - } - - @media (width >=48rem) { - .grid-main { - grid-template-columns: repeat(5, 1fr); - margin: 0 10%; - } - - .grid-sub { - } } + } } diff --git a/Backend/static/css/styles.css b/Backend/static/css/styles.css index acefd6d..f67f5de 100644 --- a/Backend/static/css/styles.css +++ b/Backend/static/css/styles.css @@ -1,365 +1,32 @@ -/*! tailwindcss v4.0.6 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v4.0.8 | MIT License | https://tailwindcss.com */ @layer theme, base, components, utilities; @layer theme { :root, :host { --font-sans: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; - --font-serif: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif; --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; - --color-red-50: oklch(0.971 0.013 17.38); - --color-red-100: oklch(0.936 0.032 17.717); - --color-red-200: oklch(0.885 0.062 18.334); - --color-red-300: oklch(0.808 0.114 19.571); - --color-red-400: oklch(0.704 0.191 22.216); --color-red-500: oklch(0.637 0.237 25.331); --color-red-600: oklch(0.577 0.245 27.325); - --color-red-700: oklch(0.505 0.213 27.518); - --color-red-800: oklch(0.444 0.177 26.899); - --color-red-900: oklch(0.396 0.141 25.723); - --color-red-950: oklch(0.258 0.092 26.042); - --color-orange-50: oklch(0.98 0.016 73.684); - --color-orange-100: oklch(0.954 0.038 75.164); - --color-orange-200: oklch(0.901 0.076 70.697); - --color-orange-300: oklch(0.837 0.128 66.29); - --color-orange-400: oklch(0.75 0.183 55.934); --color-orange-500: oklch(0.705 0.213 47.604); - --color-orange-600: oklch(0.646 0.222 41.116); - --color-orange-700: oklch(0.553 0.195 38.402); - --color-orange-800: oklch(0.47 0.157 37.304); - --color-orange-900: oklch(0.408 0.123 38.172); - --color-orange-950: oklch(0.266 0.079 36.259); - --color-amber-50: oklch(0.987 0.022 95.277); - --color-amber-100: oklch(0.962 0.059 95.617); - --color-amber-200: oklch(0.924 0.12 95.746); - --color-amber-300: oklch(0.879 0.169 91.605); - --color-amber-400: oklch(0.828 0.189 84.429); - --color-amber-500: oklch(0.769 0.188 70.08); - --color-amber-600: oklch(0.666 0.179 58.318); - --color-amber-700: oklch(0.555 0.163 48.998); - --color-amber-800: oklch(0.473 0.137 46.201); - --color-amber-900: oklch(0.414 0.112 45.904); - --color-amber-950: oklch(0.279 0.077 45.635); - --color-yellow-50: oklch(0.987 0.026 102.212); - --color-yellow-100: oklch(0.973 0.071 103.193); - --color-yellow-200: oklch(0.945 0.129 101.54); - --color-yellow-300: oklch(0.905 0.182 98.111); - --color-yellow-400: oklch(0.852 0.199 91.936); - --color-yellow-500: oklch(0.795 0.184 86.047); - --color-yellow-600: oklch(0.681 0.162 75.834); - --color-yellow-700: oklch(0.554 0.135 66.442); - --color-yellow-800: oklch(0.476 0.114 61.907); - --color-yellow-900: oklch(0.421 0.095 57.708); - --color-yellow-950: oklch(0.286 0.066 53.813); - --color-lime-50: oklch(0.986 0.031 120.757); - --color-lime-100: oklch(0.967 0.067 122.328); - --color-lime-200: oklch(0.938 0.127 124.321); - --color-lime-300: oklch(0.897 0.196 126.665); - --color-lime-400: oklch(0.841 0.238 128.85); - --color-lime-500: oklch(0.768 0.233 130.85); - --color-lime-600: oklch(0.648 0.2 131.684); - --color-lime-700: oklch(0.532 0.157 131.589); - --color-lime-800: oklch(0.453 0.124 130.933); - --color-lime-900: oklch(0.405 0.101 131.063); - --color-lime-950: oklch(0.274 0.072 132.109); - --color-green-50: oklch(0.982 0.018 155.826); - --color-green-100: oklch(0.962 0.044 156.743); - --color-green-200: oklch(0.925 0.084 155.995); - --color-green-300: oklch(0.871 0.15 154.449); - --color-green-400: oklch(0.792 0.209 151.711); - --color-green-500: oklch(0.723 0.219 149.579); - --color-green-600: oklch(0.627 0.194 149.214); - --color-green-700: oklch(0.527 0.154 150.069); - --color-green-800: oklch(0.448 0.119 151.328); - --color-green-900: oklch(0.393 0.095 152.535); - --color-green-950: oklch(0.266 0.065 152.934); - --color-emerald-50: oklch(0.979 0.021 166.113); - --color-emerald-100: oklch(0.95 0.052 163.051); - --color-emerald-200: oklch(0.905 0.093 164.15); - --color-emerald-300: oklch(0.845 0.143 164.978); - --color-emerald-400: oklch(0.765 0.177 163.223); - --color-emerald-500: oklch(0.696 0.17 162.48); - --color-emerald-600: oklch(0.596 0.145 163.225); - --color-emerald-700: oklch(0.508 0.118 165.612); - --color-emerald-800: oklch(0.432 0.095 166.913); - --color-emerald-900: oklch(0.378 0.077 168.94); - --color-emerald-950: oklch(0.262 0.051 172.552); - --color-teal-50: oklch(0.984 0.014 180.72); - --color-teal-100: oklch(0.953 0.051 180.801); - --color-teal-200: oklch(0.91 0.096 180.426); - --color-teal-300: oklch(0.855 0.138 181.071); - --color-teal-400: oklch(0.777 0.152 181.912); - --color-teal-500: oklch(0.704 0.14 182.503); - --color-teal-600: oklch(0.6 0.118 184.704); - --color-teal-700: oklch(0.511 0.096 186.391); - --color-teal-800: oklch(0.437 0.078 188.216); - --color-teal-900: oklch(0.386 0.063 188.416); - --color-teal-950: oklch(0.277 0.046 192.524); - --color-cyan-50: oklch(0.984 0.019 200.873); - --color-cyan-100: oklch(0.956 0.045 203.388); - --color-cyan-200: oklch(0.917 0.08 205.041); - --color-cyan-300: oklch(0.865 0.127 207.078); - --color-cyan-400: oklch(0.789 0.154 211.53); - --color-cyan-500: oklch(0.715 0.143 215.221); - --color-cyan-600: oklch(0.609 0.126 221.723); - --color-cyan-700: oklch(0.52 0.105 223.128); - --color-cyan-800: oklch(0.45 0.085 224.283); - --color-cyan-900: oklch(0.398 0.07 227.392); - --color-cyan-950: oklch(0.302 0.056 229.695); - --color-sky-50: oklch(0.977 0.013 236.62); - --color-sky-100: oklch(0.951 0.026 236.824); - --color-sky-200: oklch(0.901 0.058 230.902); - --color-sky-300: oklch(0.828 0.111 230.318); - --color-sky-400: oklch(0.746 0.16 232.661); - --color-sky-500: oklch(0.685 0.169 237.323); - --color-sky-600: oklch(0.588 0.158 241.966); - --color-sky-700: oklch(0.5 0.134 242.749); - --color-sky-800: oklch(0.443 0.11 240.79); - --color-sky-900: oklch(0.391 0.09 240.876); - --color-sky-950: oklch(0.293 0.066 243.157); - --color-blue-50: oklch(0.97 0.014 254.604); - --color-blue-100: oklch(0.932 0.032 255.585); - --color-blue-200: oklch(0.882 0.059 254.128); - --color-blue-300: oklch(0.809 0.105 251.813); - --color-blue-400: oklch(0.707 0.165 254.624); - --color-blue-500: oklch(0.623 0.214 259.815); - --color-blue-600: oklch(0.546 0.245 262.881); - --color-blue-700: oklch(0.488 0.243 264.376); - --color-blue-800: oklch(0.424 0.199 265.638); - --color-blue-900: oklch(0.379 0.146 265.522); - --color-blue-950: oklch(0.282 0.091 267.935); - --color-indigo-50: oklch(0.962 0.018 272.314); - --color-indigo-100: oklch(0.93 0.034 272.788); - --color-indigo-200: oklch(0.87 0.065 274.039); - --color-indigo-300: oklch(0.785 0.115 274.713); - --color-indigo-400: oklch(0.673 0.182 276.935); - --color-indigo-500: oklch(0.585 0.233 277.117); - --color-indigo-600: oklch(0.511 0.262 276.966); - --color-indigo-700: oklch(0.457 0.24 277.023); - --color-indigo-800: oklch(0.398 0.195 277.366); - --color-indigo-900: oklch(0.359 0.144 278.697); - --color-indigo-950: oklch(0.257 0.09 281.288); - --color-violet-50: oklch(0.969 0.016 293.756); - --color-violet-100: oklch(0.943 0.029 294.588); - --color-violet-200: oklch(0.894 0.057 293.283); - --color-violet-300: oklch(0.811 0.111 293.571); - --color-violet-400: oklch(0.702 0.183 293.541); - --color-violet-500: oklch(0.606 0.25 292.717); - --color-violet-600: oklch(0.541 0.281 293.009); - --color-violet-700: oklch(0.491 0.27 292.581); - --color-violet-800: oklch(0.432 0.232 292.759); - --color-violet-900: oklch(0.38 0.189 293.745); - --color-violet-950: oklch(0.283 0.141 291.089); - --color-purple-50: oklch(0.977 0.014 308.299); - --color-purple-100: oklch(0.946 0.033 307.174); - --color-purple-200: oklch(0.902 0.063 306.703); - --color-purple-300: oklch(0.827 0.119 306.383); - --color-purple-400: oklch(0.714 0.203 305.504); - --color-purple-500: oklch(0.627 0.265 303.9); --color-purple-600: oklch(0.558 0.288 302.321); - --color-purple-700: oklch(0.496 0.265 301.924); - --color-purple-800: oklch(0.438 0.218 303.724); - --color-purple-900: oklch(0.381 0.176 304.987); - --color-purple-950: oklch(0.291 0.149 302.717); - --color-fuchsia-50: oklch(0.977 0.017 320.058); - --color-fuchsia-100: oklch(0.952 0.037 318.852); - --color-fuchsia-200: oklch(0.903 0.076 319.62); - --color-fuchsia-300: oklch(0.833 0.145 321.434); - --color-fuchsia-400: oklch(0.74 0.238 322.16); - --color-fuchsia-500: oklch(0.667 0.295 322.15); - --color-fuchsia-600: oklch(0.591 0.293 322.896); - --color-fuchsia-700: oklch(0.518 0.253 323.949); - --color-fuchsia-800: oklch(0.452 0.211 324.591); - --color-fuchsia-900: oklch(0.401 0.17 325.612); - --color-fuchsia-950: oklch(0.293 0.136 325.661); - --color-pink-50: oklch(0.971 0.014 343.198); - --color-pink-100: oklch(0.948 0.028 342.258); - --color-pink-200: oklch(0.899 0.061 343.231); - --color-pink-300: oklch(0.823 0.12 346.018); - --color-pink-400: oklch(0.718 0.202 349.761); - --color-pink-500: oklch(0.656 0.241 354.308); - --color-pink-600: oklch(0.592 0.249 0.584); - --color-pink-700: oklch(0.525 0.223 3.958); - --color-pink-800: oklch(0.459 0.187 3.815); - --color-pink-900: oklch(0.408 0.153 2.432); - --color-pink-950: oklch(0.284 0.109 3.907); - --color-rose-50: oklch(0.969 0.015 12.422); - --color-rose-100: oklch(0.941 0.03 12.58); - --color-rose-200: oklch(0.892 0.058 10.001); - --color-rose-300: oklch(0.81 0.117 11.638); - --color-rose-400: oklch(0.712 0.194 13.428); - --color-rose-500: oklch(0.645 0.246 16.439); - --color-rose-600: oklch(0.586 0.253 17.585); - --color-rose-700: oklch(0.514 0.222 16.935); - --color-rose-800: oklch(0.455 0.188 13.697); - --color-rose-900: oklch(0.41 0.159 10.272); - --color-rose-950: oklch(0.271 0.105 12.094); - --color-slate-50: oklch(0.984 0.003 247.858); - --color-slate-100: oklch(0.968 0.007 247.896); - --color-slate-200: oklch(0.929 0.013 255.508); - --color-slate-300: oklch(0.869 0.022 252.894); - --color-slate-400: oklch(0.704 0.04 256.788); - --color-slate-500: oklch(0.554 0.046 257.417); - --color-slate-600: oklch(0.446 0.043 257.281); - --color-slate-700: oklch(0.372 0.044 257.287); - --color-slate-800: oklch(0.279 0.041 260.031); - --color-slate-900: oklch(0.208 0.042 265.755); - --color-slate-950: oklch(0.129 0.042 264.695); - --color-gray-50: oklch(0.985 0.002 247.839); - --color-gray-100: oklch(0.967 0.003 264.542); - --color-gray-200: oklch(0.928 0.006 264.531); - --color-gray-300: oklch(0.872 0.01 258.338); - --color-gray-400: oklch(0.707 0.022 261.325); - --color-gray-500: oklch(0.551 0.027 264.364); - --color-gray-600: oklch(0.446 0.03 256.802); - --color-gray-700: oklch(0.373 0.034 259.733); - --color-gray-800: oklch(0.278 0.033 256.848); - --color-gray-900: oklch(0.21 0.034 264.665); - --color-gray-950: oklch(0.13 0.028 261.692); - --color-zinc-50: oklch(0.985 0 0); - --color-zinc-100: oklch(0.967 0.001 286.375); - --color-zinc-200: oklch(0.92 0.004 286.32); - --color-zinc-300: oklch(0.871 0.006 286.286); - --color-zinc-400: oklch(0.705 0.015 286.067); - --color-zinc-500: oklch(0.552 0.016 285.938); - --color-zinc-600: oklch(0.442 0.017 285.786); - --color-zinc-700: oklch(0.37 0.013 285.805); - --color-zinc-800: oklch(0.274 0.006 286.033); - --color-zinc-900: oklch(0.21 0.006 285.885); - --color-zinc-950: oklch(0.141 0.005 285.823); - --color-neutral-50: oklch(0.985 0 0); --color-neutral-100: oklch(0.97 0 0); --color-neutral-200: oklch(0.922 0 0); --color-neutral-300: oklch(0.87 0 0); --color-neutral-400: oklch(0.708 0 0); --color-neutral-500: oklch(0.556 0 0); - --color-neutral-600: oklch(0.439 0 0); --color-neutral-700: oklch(0.371 0 0); --color-neutral-800: oklch(0.269 0 0); --color-neutral-900: oklch(0.205 0 0); - --color-neutral-950: oklch(0.145 0 0); - --color-stone-50: oklch(0.985 0.001 106.423); - --color-stone-100: oklch(0.97 0.001 106.424); - --color-stone-200: oklch(0.923 0.003 48.717); - --color-stone-300: oklch(0.869 0.005 56.366); - --color-stone-400: oklch(0.709 0.01 56.259); - --color-stone-500: oklch(0.553 0.013 58.071); - --color-stone-600: oklch(0.444 0.011 73.639); - --color-stone-700: oklch(0.374 0.01 67.558); - --color-stone-800: oklch(0.268 0.007 34.298); - --color-stone-900: oklch(0.216 0.006 56.043); - --color-stone-950: oklch(0.147 0.004 49.25); --color-black: #000; --color-white: #fff; --spacing: 0.25rem; - --breakpoint-sm: 40rem; - --breakpoint-md: 48rem; - --breakpoint-lg: 64rem; - --breakpoint-xl: 80rem; - --breakpoint-2xl: 96rem; - --container-3xs: 16rem; - --container-2xs: 18rem; - --container-xs: 20rem; - --container-sm: 24rem; - --container-md: 28rem; - --container-lg: 32rem; - --container-xl: 36rem; - --container-2xl: 42rem; - --container-3xl: 48rem; - --container-4xl: 56rem; - --container-5xl: 64rem; - --container-6xl: 72rem; - --container-7xl: 80rem; - --text-xs: 0.75rem; - --text-xs--line-height: calc(1 / 0.75); --text-sm: 0.875rem; --text-sm--line-height: calc(1.25 / 0.875); - --text-base: 1rem; - --text-base--line-height: calc(1.5 / 1); - --text-lg: 1.125rem; - --text-lg--line-height: calc(1.75 / 1.125); --text-xl: 1.25rem; --text-xl--line-height: calc(1.75 / 1.25); - --text-2xl: 1.5rem; - --text-2xl--line-height: calc(2 / 1.5); - --text-3xl: 1.875rem; - --text-3xl--line-height: calc(2.25 / 1.875); - --text-4xl: 2.25rem; - --text-4xl--line-height: calc(2.5 / 2.25); - --text-5xl: 3rem; - --text-5xl--line-height: 1; - --text-6xl: 3.75rem; - --text-6xl--line-height: 1; - --text-7xl: 4.5rem; - --text-7xl--line-height: 1; - --text-8xl: 6rem; - --text-8xl--line-height: 1; - --text-9xl: 8rem; - --text-9xl--line-height: 1; - --font-weight-thin: 100; - --font-weight-extralight: 200; - --font-weight-light: 300; - --font-weight-normal: 400; - --font-weight-medium: 500; - --font-weight-semibold: 600; --font-weight-bold: 700; - --font-weight-extrabold: 800; - --font-weight-black: 900; - --tracking-tighter: -0.05em; - --tracking-tight: -0.025em; - --tracking-normal: 0em; - --tracking-wide: 0.025em; - --tracking-wider: 0.05em; - --tracking-widest: 0.1em; - --leading-tight: 1.25; - --leading-snug: 1.375; - --leading-normal: 1.5; - --leading-relaxed: 1.625; - --leading-loose: 2; - --radius-xs: 0.125rem; - --radius-sm: 0.25rem; --radius-md: 0.375rem; - --radius-lg: 0.5rem; - --radius-xl: 0.75rem; - --radius-2xl: 1rem; - --radius-3xl: 1.5rem; - --radius-4xl: 2rem; - --shadow-2xs: 0 1px rgb(0 0 0 / 0.05); - --shadow-xs: 0 1px 2px 0 rgb(0 0 0 / 0.05); - --shadow-sm: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1); - --shadow-md: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); - --shadow-lg: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1); - --shadow-xl: 0 20px 25px -5px rgb(0 0 0 / 0.1), 0 8px 10px -6px rgb(0 0 0 / 0.1); - --shadow-2xl: 0 25px 50px -12px rgb(0 0 0 / 0.25); - --inset-shadow-2xs: inset 0 1px rgb(0 0 0 / 0.05); - --inset-shadow-xs: inset 0 1px 1px rgb(0 0 0 / 0.05); - --inset-shadow-sm: inset 0 2px 4px rgb(0 0 0 / 0.05); - --drop-shadow-xs: 0 1px 1px rgb(0 0 0 / 0.05); - --drop-shadow-sm: 0 1px 2px rgb(0 0 0 / 0.15); - --drop-shadow-md: 0 3px 3px rgb(0 0 0 / 0.12); - --drop-shadow-lg: 0 4px 4px rgb(0 0 0 / 0.15); - --drop-shadow-xl: 0 9px 7px rgb(0 0 0 / 0.1); - --drop-shadow-2xl: 0 25px 25px rgb(0 0 0 / 0.15); - --ease-in: cubic-bezier(0.4, 0, 1, 1); - --ease-out: cubic-bezier(0, 0, 0.2, 1); - --ease-in-out: cubic-bezier(0.4, 0, 0.2, 1); - --animate-spin: spin 1s linear infinite; - --animate-ping: ping 1s cubic-bezier(0, 0, 0.2, 1) infinite; - --animate-pulse: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite; - --animate-bounce: bounce 1s infinite; - --blur-xs: 4px; - --blur-sm: 8px; - --blur-md: 12px; - --blur-lg: 16px; - --blur-xl: 24px; - --blur-2xl: 40px; - --blur-3xl: 64px; - --perspective-dramatic: 100px; - --perspective-near: 300px; - --perspective-normal: 500px; - --perspective-midrange: 800px; - --perspective-distant: 1200px; - --aspect-video: 16 / 9; --default-transition-duration: 150ms; --default-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); --default-font-family: var(--font-sans); @@ -374,29 +41,7 @@ --default-mono-font-variation-settings: var( --font-mono--font-variation-settings ); - --color-accent-50: #e7fdea; - --color-accent-100: #cbfbd1; - --color-accent-200: #9cf7a8; - --color-accent-300: #68f37a; - --color-accent-400: #33ef4d; - --color-accent-500: #11db2d; - --color-accent-600: #0eaf23; - --color-accent-700: #0a851b; - --color-accent-800: #075a12; - --color-accent-900: #032b09; - --color-accent-950: #021805; --color-accent: #0eaf23; - --color-text-50: #f7f8f7; - --color-text-100: #f2f3f2; - --color-text-200: #e2e4e2; - --color-text-300: #d2d6d2; - --color-text-400: #c2c7c2; - --color-text-500: #afb6af; - --color-text-600: #97a097; - --color-text-700: #7d877d; - --color-text-800: #5a625a; - --color-text-900: #161816; - --color-text-950: #000000; } } @layer base { @@ -541,12 +186,6 @@ } } @layer utilities { - .collapse { - visibility: collapse; - } - .relative { - position: relative; - } .static { position: static; } @@ -556,8 +195,8 @@ .col-span-3 { grid-column: span 3 / span 3; } - .col-span-5 { - grid-column: span 5 / span 5; + .mx-auto { + margin-inline: auto; } .-my-1 { margin-block: calc(var(--spacing) * -1); @@ -568,27 +207,15 @@ .mb-2 { margin-bottom: calc(var(--spacing) * 2); } - .block { - display: block; - } .flex { display: flex; } - .grid { - display: grid; - } .hidden { display: none; } .inline { display: inline; } - .inline-flex { - display: inline-flex; - } - .list-item { - display: list-item; - } .table { display: table; } @@ -600,28 +227,27 @@ width: calc(var(--spacing) * 4); height: calc(var(--spacing) * 4); } - .size-8 { - width: calc(var(--spacing) * 8); - height: calc(var(--spacing) * 8); - } .h-4 { height: calc(var(--spacing) * 4); } + .h-8 { + height: calc(var(--spacing) * 8); + } .h-\[100vh\] { height: 100vh; } .h-full { height: 100%; } + .w-1\/3 { + width: calc(1/3 * 100%); + } .w-2 { width: calc(var(--spacing) * 2); } .w-4 { width: calc(var(--spacing) * 4); } - .w-9 { - width: calc(var(--spacing) * 9); - } .w-9\/10 { width: calc(9/10 * 100%); } @@ -640,18 +266,9 @@ .grow-1 { flex-grow: 1; } - .border-collapse { - border-collapse: collapse; - } - .transform { - transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y); - } .cursor-pointer { cursor: pointer; } - .resize { - resize: both; - } .grid-cols-2 { grid-template-columns: repeat(2, minmax(0, 1fr)); } @@ -667,6 +284,9 @@ .items-center { align-items: center; } + .justify-around { + justify-content: space-around; + } .justify-between { justify-content: space-between; } @@ -750,6 +370,9 @@ .bg-red-600 { background-color: var(--color-red-600); } + .p-1 { + padding: calc(var(--spacing) * 1); + } .p-2 { padding: calc(var(--spacing) * 2); } @@ -774,6 +397,9 @@ --tw-font-weight: var(--font-weight-bold); font-weight: var(--font-weight-bold); } + .whitespace-nowrap { + white-space: nowrap; + } .text-accent { color: var(--color-accent); } @@ -786,26 +412,18 @@ .text-neutral-800 { color: var(--color-neutral-800); } + .text-red-500 { + color: var(--color-red-500); + } .text-red-600 { color: var(--color-red-600); } .uppercase { text-transform: uppercase; } - .underline { - text-decoration-line: underline; - } - .outline { - outline-style: var(--tw-outline-style); - outline-width: 1px; - } .filter { filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,); } - .backdrop-filter { - -webkit-backdrop-filter: var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,); - backdrop-filter: var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,); - } .transition { transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter; transition-timing-function: var(--tw-ease, var(--default-transition-timing-function)); @@ -820,9 +438,29 @@ --tw-duration: 300ms; transition-duration: 300ms; } - .ease-in-out { - --tw-ease: var(--ease-in-out); - transition-timing-function: var(--ease-in-out); + .group-hover\:text-black { + &:is(:where(.group):hover *) { + @media (hover: hover) { + color: var(--color-black); + } + } + } + .group-hover\:text-white { + &:is(:where(.group):hover *) { + @media (hover: hover) { + color: var(--color-white); + } + } + } + .group-\[\.edit\]\:block { + &:is(:where(.group):is(.edit) *) { + display: block; + } + } + .group-\[\.edit\]\:flex { + &:is(:where(.group):is(.edit) *) { + display: flex; + } } .group-\[\.edit\]\:hidden { &:is(:where(.group):is(.edit) *) { @@ -937,6 +575,11 @@ grid-column: span 3 / span 3; } } + .md\:col-span-4 { + @media (width >= 48rem) { + grid-column: span 4 / span 4; + } + } .md\:mx-\[10\%\] { @media (width >= 48rem) { margin-inline: 10%; @@ -967,6 +610,11 @@ padding-inline: calc(var(--spacing) * 4); } } + .md\:text-transparent { + @media (width >= 48rem) { + color: transparent; + } + } .group-\[\.edit\]\:md\:block { &:is(:where(.group):is(.edit) *) { @media (width >= 48rem) { @@ -983,7 +631,7 @@ @layer components { .grid-main { display: grid; - grid-template-columns: repeat(6, 1fr); + grid-template-columns: 2fr auto 1fr; align-items: stretch; } .grid-sub { @@ -1007,57 +655,6 @@ } } } -@keyframes spin { - to { - transform: rotate(360deg); - } -} -@keyframes ping { - 75%, 100% { - transform: scale(2); - opacity: 0; - } -} -@keyframes pulse { - 50% { - opacity: 0.5; - } -} -@keyframes bounce { - 0%, 100% { - transform: translateY(-25%); - animation-timing-function: cubic-bezier(0.8, 0, 1, 1); - } - 50% { - transform: none; - animation-timing-function: cubic-bezier(0, 0, 0.2, 1); - } -} -@property --tw-rotate-x { - syntax: "*"; - inherits: false; - initial-value: rotateX(0); -} -@property --tw-rotate-y { - syntax: "*"; - inherits: false; - initial-value: rotateY(0); -} -@property --tw-rotate-z { - syntax: "*"; - inherits: false; - initial-value: rotateZ(0); -} -@property --tw-skew-x { - syntax: "*"; - inherits: false; - initial-value: skewX(0); -} -@property --tw-skew-y { - syntax: "*"; - inherits: false; - initial-value: skewY(0); -} @property --tw-divide-x-reverse { syntax: "*"; inherits: false; @@ -1077,11 +674,6 @@ syntax: "*"; inherits: false; } -@property --tw-outline-style { - syntax: "*"; - inherits: false; - initial-value: solid; -} @property --tw-blur { syntax: "*"; inherits: false; @@ -1118,39 +710,7 @@ syntax: "*"; inherits: false; } -@property --tw-backdrop-blur { - syntax: "*"; - inherits: false; -} -@property --tw-backdrop-brightness { - syntax: "*"; - inherits: false; -} -@property --tw-backdrop-contrast { - syntax: "*"; - inherits: false; -} -@property --tw-backdrop-grayscale { - syntax: "*"; - inherits: false; -} -@property --tw-backdrop-hue-rotate { - syntax: "*"; - inherits: false; -} -@property --tw-backdrop-invert { - syntax: "*"; - inherits: false; -} -@property --tw-backdrop-opacity { - syntax: "*"; - inherits: false; -} -@property --tw-backdrop-saturate { - syntax: "*"; - inherits: false; -} -@property --tw-backdrop-sepia { +@property --tw-drop-shadow { syntax: "*"; inherits: false; } @@ -1158,7 +718,3 @@ syntax: "*"; inherits: false; } -@property --tw-ease { - syntax: "*"; - inherits: false; -} diff --git a/Backend/static/script.js b/Backend/static/script.js index 965a5f6..5bc2abb 100644 --- a/Backend/static/script.js +++ b/Backend/static/script.js @@ -1,12 +1,34 @@ function editDay(element, event, formId) { var form = element .closest(".grid-sub") - .querySelector(".time-component > form"); + .querySelector(".all-booking-component > form"); form.classList.toggle("edit"); element.classList.toggle("edit"); if (element.classList.contains("edit")) { event.preventDefault(); + form.querySelectorAll("input, select").forEach((input) => { + input.disabled = false; + }); } else { form.submit(); } } + +function editAbwesenheit(element, event) { + var newBookingComponent = element + .closest(".grid-sub") + .querySelector(".new-booking-component"); + if (element.value == 0) { + newBookingComponent.style.display = ""; + } else { + newBookingComponent.style.display = "none"; + } +} + +function navigateWeek(element, event, direction) { + var dateInput = element.closest("form").querySelector("input[type=date]"); + var date = dateInput.valueAsDate; + date.setDate(date.getDate() + 7 * direction); + date.setHours(10); + dateInput.valueAsDate = date; +} diff --git a/Backend/templates/headerComponent.templ b/Backend/templates/headerComponent.templ index a44ea10..bfb040f 100644 --- a/Backend/templates/headerComponent.templ +++ b/Backend/templates/headerComponent.templ @@ -1,9 +1,14 @@ package templates + + templ headerComponent() {
Zeitverwaltung - Mitarbeiter - Nutzer + Abrechnung + if true { + Anwesenheit + } + Einstellungen
} diff --git a/Backend/templates/headerComponent_templ.go b/Backend/templates/headerComponent_templ.go index 49ef799..4710b0a 100644 --- a/Backend/templates/headerComponent_templ.go +++ b/Backend/templates/headerComponent_templ.go @@ -29,7 +29,17 @@ func headerComponent() templ.Component { templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "
Zeitverwaltung Mitarbeiter Nutzer
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "
Zeitverwaltung Abrechnung ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if true { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "Anwesenheit ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "Einstellungen
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/Backend/templates/pages.templ b/Backend/templates/pages.templ index 8d92ba7..73d9785 100644 --- a/Backend/templates/pages.templ +++ b/Backend/templates/pages.templ @@ -22,15 +22,8 @@ templ TimePage(workDays []models.WorkDay) { @headerComponent()
@inputForm() - for _, bookingGroup := range workDays { - @dayComponent(bookingGroup) - // if (bookingGroup.Day.Weekday() == 4) { - //
- //
- //

Wochenende

- //
- //
- // } + for _, day := range workDays { + @dayComponent(day) }
@LegendComponent() @@ -67,12 +60,21 @@ templ UserPage(status int) {

Aktuelles Passwort nicht korrekt!

case status >= 400:

Passwortwechsel fehlgeschlagen, bitte erneut versuchen!

- case status == 200: + case status == 202:

Passwortänderung erfolgreich

}
- + +
+ +
+

Nutzer abmelden

+
+

Nutzer von Weboberfläche abmelden.

+
+
+
@@ -92,19 +94,54 @@ templ TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) { @weekDayComponent(userWeek.User, day) } -
-
-

Woche: { fmt.Sprintf("%02d-%d", kw, year) }

-

an Vorgesetzten senden

-
- - - - // if failed { - //

Fehlgeschlagen

- // } - -
+
+
+ + +

KW { fmt.Sprintf("%02d, %d", kw, year) }

+ +
+
+ + + + switch userWeek.CheckStatus() { + case models.WeekStatusNone: +

an Vorgesetzten senden

+ + if time.Since(userWeek.WeekStart) < 24*7*time.Hour { +

Die Woche kann erst am nächsten Montag abgesendet werden!

+ } + case models.WeekStatusSent: +

an Vorgesetzten gesendet

+ +

+ akzeptiert: + + + +

+ case models.WeekStatusAccepted: +

vom Vorgesetzten bestätigt

+ +

+ akzeptiert: + + + + +

+ } +
+
for _, week := range weeks { @employeComponent(week) @@ -122,3 +159,26 @@ templ NavPage() { } + +templ TeamPresencePage(teamPresence map[bool][]models.User) { + @Base() + @headerComponent() +
+
+

Anwesend

+
+ for _, user := range teamPresence[true] { + @userPresenceComponent(user, true) + } +
+
+
+

Nicht Anwesend

+
+ for _, user := range teamPresence[false] { + @userPresenceComponent(user, false) + } +
+
+
+} diff --git a/Backend/templates/pages_templ.go b/Backend/templates/pages_templ.go index 22da0f1..c649f96 100644 --- a/Backend/templates/pages_templ.go +++ b/Backend/templates/pages_templ.go @@ -81,17 +81,13 @@ func TimePage(workDays []models.WorkDay) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - for _, bookingGroup := range workDays { - templ_7745c5c3_Err = dayComponent(bookingGroup).Render(ctx, templ_7745c5c3_Buffer) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, " ") + for _, day := range workDays { + templ_7745c5c3_Err = dayComponent(day).Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -128,17 +124,17 @@ func LoginPage(failed bool) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "

Benutzer Anmelden

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "

Benutzer Anmelden

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if failed { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "

Login fehlgeschlagen, bitte erneut versuchen!

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "

Login fehlgeschlagen, bitte erneut versuchen!

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -175,28 +171,28 @@ func UserPage(status int) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "

Passwort ändern

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "

Passwort ändern

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } switch { case status == 401: - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "

Aktuelles Passwort nicht korrekt!

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "

Aktuelles Passwort nicht korrekt!

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } case status >= 400: - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "

Passwortwechsel fehlgeschlagen, bitte erneut versuchen!

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "

Passwortwechsel fehlgeschlagen, bitte erneut versuchen!

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - case status == 200: - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "

Passwortänderung erfolgreich

") + case status == 202: + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "

Passwortänderung erfolgreich

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "

Nutzer abmelden

Nutzer von Weboberfläche abmelden.

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -235,20 +231,20 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var6 string templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%s %s", userWeek.User.Vorname, userWeek.User.Name)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 89, Col: 111} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 91, Col: 111} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -258,46 +254,140 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "

Woche: ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "

an Vorgesetzten senden

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var8 string - templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(userWeek.User.PersonalNummer)) - if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 101, Col: 87} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) + templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "-1")) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "\">

KW ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var9 string - templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(userWeek.WeekStart.Format(time.DateOnly)) + templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%02d, %d", kw, year)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 102, Col: 85} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 105, Col: 72} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "\">

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "1")) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + switch userWeek.CheckStatus() { + case models.WeekStatusNone: + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "

an Vorgesetzten senden

Senden ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if time.Since(userWeek.WeekStart) < 24*7*time.Hour { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "

Die Woche kann erst am nächsten Montag abgesendet werden!

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + case models.WeekStatusSent: + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "

an Vorgesetzten gesendet

akzeptiert:

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + case models.WeekStatusAccepted: + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "

vom Vorgesetzten bestätigt

akzeptiert:

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -307,7 +397,7 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -331,16 +421,73 @@ func NavPage() templ.Component { }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var10 := templ.GetChildren(ctx) - if templ_7745c5c3_Var10 == nil { - templ_7745c5c3_Var10 = templ.NopComponent + templ_7745c5c3_Var13 := templ.GetChildren(ctx) + if templ_7745c5c3_Var13 == nil { + templ_7745c5c3_Var13 = templ.NopComponent } ctx = templ.ClearChildren(ctx) templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "
Zeitverwaltung Mitarbeiter Nutzer
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "
Zeitverwaltung Mitarbeiter Nutzer
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) +} + +func TeamPresencePage(teamPresence map[bool][]models.User) templ.Component { + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { + return templ_7745c5c3_CtxErr + } + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var14 := templ.GetChildren(ctx) + if templ_7745c5c3_Var14 == nil { + templ_7745c5c3_Var14 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) + templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = headerComponent().Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "

Anwesend

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + for _, user := range teamPresence[true] { + templ_7745c5c3_Err = userPresenceComponent(user, true).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "

Nicht Anwesend

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + for _, user := range teamPresence[false] { + templ_7745c5c3_Err = userPresenceComponent(user, false).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/Backend/templates/teamComponents.templ b/Backend/templates/teamComponents.templ index ab917cb..40679c5 100644 --- a/Backend/templates/teamComponents.templ +++ b/Backend/templates/teamComponents.templ @@ -22,9 +22,13 @@ templ weekDayComponent(user models.User, day models.WorkDay) { - { day.TimeFrom.Format("15:04") } - - - { day.TimeTo.Format("15:04") } + if day.TimeFrom == day.TimeTo { +

Keine Anwesenheit

+ } else { + { day.TimeFrom.Format("15:04") } + - + { day.TimeTo.Format("15:04") } + } @@ -34,7 +38,7 @@ templ employeComponent(week models.WorkWeek) { {{ year, kw := week.WeekStart.ISOWeek() }} -
+

{ week.User.Vorname } { week.User.Name }

Arbeitszeit

@@ -56,3 +60,14 @@ templ employeComponent(week models.WorkWeek) {
} + +templ userPresenceComponent(user models.User, present bool) { +
+ if present { +
Anwesend
+ } else { +
Abwesend
+ } +

{ user.Vorname } { user.Name }

+
+} diff --git a/Backend/templates/teamComponents_templ.go b/Backend/templates/teamComponents_templ.go index c096fc6..efd4951 100644 --- a/Backend/templates/teamComponents_templ.go +++ b/Backend/templates/teamComponents_templ.go @@ -97,33 +97,48 @@ func weekDayComponent(user models.User, day models.WorkDay) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var6 string - templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(day.TimeFrom.Format("15:04")) - if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 25, Col: 40} + if day.TimeFrom == day.TimeTo { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "

Keine Anwesenheit

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var6 string + templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(day.TimeFrom.Format("15:04")) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 28, Col: 41} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, " - ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var7 string + templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(day.TimeTo.Format("15:04")) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 30, Col: 39} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, " - ") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - var templ_7745c5c3_Var7 string - templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(day.TimeTo.Format("15:04")) - if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 27, Col: 38} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -154,46 +169,46 @@ func employeComponent(week models.WorkWeek) templ.Component { ctx = templ.ClearChildren(ctx) year, kw := week.WeekStart.ISOWeek() - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var9 string templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(week.User.Vorname) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 39, Col: 53} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 43, Col: 53} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, " ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, " ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var10 string templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(week.User.Name) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 39, Col: 72} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 43, Col: 72} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "

Arbeitszeit

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "

Arbeitszeit

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var11 string templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(week.GetWorkHourString()) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 41, Col: 52} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 45, Col: 52} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -203,46 +218,116 @@ func employeComponent(week models.WorkWeek) templ.Component { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "

Woche: ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "

Woche: ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var12 string templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%02d-%d", kw, year)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 49, Col: 85} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 53, Col: 85} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\">
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) +} + +func userPresenceComponent(user models.User, present bool) templ.Component { + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { + return templ_7745c5c3_CtxErr + } + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var15 := templ.GetChildren(ctx) + if templ_7745c5c3_Var15 == nil { + templ_7745c5c3_Var15 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if present { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "
Anwesend
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "
Abwesend
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var16 string + templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 71, Col: 19} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, " ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var17 string + templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(user.Name) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 71, Col: 33} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/Backend/templates/timeComponents.templ b/Backend/templates/timeComponents.templ index 9102f79..9a7b68a 100644 --- a/Backend/templates/timeComponents.templ +++ b/Backend/templates/timeComponents.templ @@ -14,14 +14,14 @@ templ inputForm() { user := ctx.Value("user").(models.User) }}
-
+

{ user.Vorname + " " + user.Name }

Überstunden

-

4h 32min

+

0h 0min (statisch)

-
+ @lineComponent()
@@ -39,27 +39,45 @@ templ inputForm() { templ dayComponent(workDay models.WorkDay) { {{ work, pause := workDay.GetWorkTimeString() + justify := "" + if len(workDay.Bookings) <= 1 { + justify = "justify-content: center" + } }}
-
+
@timeGaugeComponent(workDay.GetWorkDayProgress(ctx.Value("user").(models.User)), workDay.Day.Equal(time.Now().Truncate(24*time.Hour)), workDay.RequiresAction())

{ workDay.Day.Format("02.01.2006") }

-

Arbeitszeit:

- if (workDay.RequiresAction()) { -

Bitte anpassen

- } else { -

{ work }

+ if work!="" { +

Arbeitszeit:

+ if (workDay.RequiresAction()) { +

Bitte anpassen

+ } else { +

{ work }

+ } +

{ pause }

} -

{ pause }

-
+
@lineComponent() - - for _, booking := range workDay.Bookings { - @bookingComponent(booking) + + if (workDay.Absence != models.Absence{}) { +

{ workDay.Absence.GetStringType() }

} + if len(workDay.Bookings) < 1 && (workDay.Absence == models.Absence{}) { +

Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!

+ @absenceComponent(workDay) + @newBookingComponent(workDay) + } else { + @absenceComponent(workDay) + for _, booking := range workDay.Bookings { + @bookingComponent(booking) + } + @newBookingComponent(workDay) + } +
@@ -69,11 +87,12 @@ templ dayComponent(workDay models.WorkDay) { } templ changeButtonComponent(id string) { - } @@ -120,11 +139,40 @@ templ lineComponent() {
} +templ absenceComponent(d models.WorkDay) { + +} + +templ newBookingComponent(d models.WorkDay) { + +} + templ bookingComponent(booking models.Booking) {

{ booking.Timestamp.Format("15:04") } - + { booking.GetBookingType() }

diff --git a/Backend/templates/timeComponents_templ.go b/Backend/templates/timeComponents_templ.go index e085bd6..c109fb7 100644 --- a/Backend/templates/timeComponents_templ.go +++ b/Backend/templates/timeComponents_templ.go @@ -40,7 +40,7 @@ func inputForm() templ.Component { urlParams := ctx.Value("urlParams").(url.Values) user := ctx.Value("user").(models.User) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -53,7 +53,7 @@ func inputForm() templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "

Überstunden

4h 32min

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "

Überstunden

0h 0min (statisch)

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -118,7 +118,11 @@ func dayComponent(workDay models.WorkDay) templ.Component { ctx = templ.ClearChildren(ctx) work, pause := workDay.GetWorkTimeString() - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "
") + justify := "" + if len(workDay.Bookings) <= 1 { + justify = "justify-content: center" + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -133,7 +137,7 @@ func dayComponent(workDay models.WorkDay) templ.Component { var templ_7745c5c3_Var6 string templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Day.Format("Mon")) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 47, Col: 94} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 51, Col: 94} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) if templ_7745c5c3_Err != nil { @@ -146,54 +150,64 @@ func dayComponent(workDay models.WorkDay) templ.Component { var templ_7745c5c3_Var7 string templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Day.Format("02.01.2006")) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 47, Col: 139} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 51, Col: 139} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "

Arbeitszeit:

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - if workDay.RequiresAction() { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "

Bitte anpassen

") + if work != "" { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "

Arbeitszeit:

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - } else { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "

") + if workDay.RequiresAction() { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "

Bitte anpassen

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var8 string + templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(work) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 57, Col: 36} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var8 string - templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(work) + var templ_7745c5c3_Var9 string + templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(pause) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 52, Col: 35} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 59, Col: 40} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "

") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - var templ_7745c5c3_Var9 string - templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(pause) - if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 54, Col: 39} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -201,30 +215,93 @@ func dayComponent(workDay models.WorkDay) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "\" class=\"flex flex-col gap-2 group w-full justify-between\" style=\"") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - for _, booking := range workDay.Bookings { - templ_7745c5c3_Err = bookingComponent(booking).Render(ctx, templ_7745c5c3_Buffer) + var templ_7745c5c3_Var11 string + templ_7745c5c3_Var11, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues(justify) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 65, Col: 131} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\" method=\"post\">") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if (workDay.Absence != models.Absence{}) { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var12 string + templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Absence.GetStringType()) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 67, Col: 41} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "
") + if len(workDay.Bookings) < 1 && (workDay.Absence == models.Absence{}) { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "

Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = absenceComponent(workDay).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, " ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = newBookingComponent(workDay).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else { + templ_7745c5c3_Err = absenceComponent(workDay).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + for _, booking := range workDay.Bookings { + templ_7745c5c3_Err = bookingComponent(booking).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, " ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = newBookingComponent(workDay).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -232,7 +309,7 @@ func dayComponent(workDay models.WorkDay) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -256,25 +333,25 @@ func changeButtonComponent(id string) templ.Component { }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var11 := templ.GetChildren(ctx) - if templ_7745c5c3_Var11 == nil { - templ_7745c5c3_Var11 = templ.NopComponent + templ_7745c5c3_Var13 := templ.GetChildren(ctx) + if templ_7745c5c3_Var13 == nil { + templ_7745c5c3_Var13 = templ.NopComponent } ctx = templ.ClearChildren(ctx) templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "\">

Ändern

Absenden

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -298,9 +375,9 @@ func timeGaugeComponent(progress uint8, today bool, warning bool) templ.Componen }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var13 := templ.GetChildren(ctx) - if templ_7745c5c3_Var13 == nil { - templ_7745c5c3_Var13 = templ.NopComponent + templ_7745c5c3_Var15 := templ.GetChildren(ctx) + if templ_7745c5c3_Var15 == nil { + templ_7745c5c3_Var15 = templ.NopComponent } ctx = templ.ClearChildren(ctx) @@ -323,65 +400,65 @@ func timeGaugeComponent(progress uint8, today bool, warning bool) templ.Componen break } if today { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var14 = []any{"flex w-full items-center justify-center overflow-hidden rounded-full", bgColor} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var14...) + var templ_7745c5c3_Var16 = []any{"flex w-full items-center justify-center overflow-hidden rounded-full", bgColor} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var16...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "
") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - } else { - var templ_7745c5c3_Var17 = []any{"w-2 h-full bg-accent rounded-md", bgColor} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var17...) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "\">
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else { + var templ_7745c5c3_Var19 = []any{"w-2 h-full bg-accent rounded-md", bgColor} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var19...) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -406,12 +483,169 @@ func lineComponent() templ.Component { }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var19 := templ.GetChildren(ctx) - if templ_7745c5c3_Var19 == nil { - templ_7745c5c3_Var19 = templ.NopComponent + templ_7745c5c3_Var21 := templ.GetChildren(ctx) + if templ_7745c5c3_Var21 == nil { + templ_7745c5c3_Var21 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) +} + +func absenceComponent(d models.WorkDay) templ.Component { + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { + return templ_7745c5c3_CtxErr + } + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var22 := templ.GetChildren(ctx) + if templ_7745c5c3_Var22 == nil { + templ_7745c5c3_Var22 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) +} + +func newBookingComponent(d models.WorkDay) templ.Component { + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { + return templ_7745c5c3_CtxErr + } + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var26 := templ.GetChildren(ctx) + if templ_7745c5c3_Var26 == nil { + templ_7745c5c3_Var26 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -435,64 +669,64 @@ func bookingComponent(booking models.Booking) templ.Component { }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var20 := templ.GetChildren(ctx) - if templ_7745c5c3_Var20 == nil { - templ_7745c5c3_Var20 = templ.NopComponent + templ_7745c5c3_Var29 := templ.GetChildren(ctx) + if templ_7745c5c3_Var29 == nil { + templ_7745c5c3_Var29 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var21 string - templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Format("15:04")) + var templ_7745c5c3_Var30 string + templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Format("15:04")) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 126, Col: 97} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 174, Col: 97} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, " ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, "\" class=\"text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\"> ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var24 string - templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(booking.GetBookingType()) + var templ_7745c5c3_Var33 string + templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs(booking.GetBookingType()) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 128, Col: 29} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 176, Col: 29} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 54, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -516,12 +750,12 @@ func LegendComponent() templ.Component { }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var25 := templ.GetChildren(ctx) - if templ_7745c5c3_Var25 == nil { - templ_7745c5c3_Var25 = templ.NopComponent + templ_7745c5c3_Var34 := templ.GetChildren(ctx) + if templ_7745c5c3_Var34 == nil { + templ_7745c5c3_Var34 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "
Fehler
Arbeitszeit unter regulär
Arbeitszeit vollständig
Überstunden
Keine Buchungen
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 55, "
Fehler
Arbeitszeit unter regulär
Arbeitszeit vollständig
Überstunden
Keine Buchungen
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/DB/initdb/01_create_tables.sql b/DB/initdb/01_create_tables.sql index 839b396..4cac87c 100644 --- a/DB/initdb/01_create_tables.sql +++ b/DB/initdb/01_create_tables.sql @@ -70,6 +70,14 @@ CREATE TABLE "wochen_report" ( UNIQUE ("personal_nummer", "woche_start") ); +DROP TABLE IF EXISTS "abwesenheit"; +CREATE TABLE "abwesenheit" ( + "counter_id" bigserial PRIMARY KEY, + "card_uid" varchar(255), + "abwesenheit_typ" int2, + "datum" timestamptz(6) DEFAULT NOW()::DATE + ); + -- Adds crypto extension CREATE EXTENSION IF NOT EXISTS pgcrypto; diff --git a/DB/initdb/02_create_user.sh b/DB/initdb/02_create_user.sh index 4b942c1..160c76e 100644 --- a/DB/initdb/02_create_user.sh +++ b/DB/initdb/02_create_user.sh @@ -7,7 +7,7 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E CREATE USER $POSTGRES_API_USER WITH ENCRYPTED PASSWORD '$POSTGRES_API_PASS'; GRANT CONNECT ON DATABASE $POSTGRES_DB TO $POSTGRES_API_USER; GRANT USAGE ON SCHEMA public TO $POSTGRES_API_USER; - GRANT SELECT, INSERT, UPDATE ON anwesenheit, personal_daten, user_password, wochen_report TO $POSTGRES_API_USER; + GRANT SELECT, INSERT, UPDATE ON anwesenheit, abwesenheit, personal_daten, user_password, wochen_report TO $POSTGRES_API_USER; GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO $POSTGRES_API_USER; EOSQL diff --git a/Docker/.env.example b/Docker/.env.example index 492fcec..8eea0f3 100644 --- a/Docker/.env.example +++ b/Docker/.env.example @@ -8,3 +8,4 @@ EXPOSED_PORT=8000 TZ=Europe/Berlin PGTZ=Europe/Berlin API_TOKEN=dont_access +EMPTY_DAYS=false diff --git a/Docker/arbeitszeitmessung.json b/Docker/arbeitszeitmessung.json index d020214..852a89c 100644 --- a/Docker/arbeitszeitmessung.json +++ b/Docker/arbeitszeitmessung.json @@ -28,9 +28,7 @@ "paths": { "/time": { "get": { - "tags": [ - "booking" - ], + "tags": ["booking"], "summary": "Gets all the bookings from one card_uid", "description": "Returns all the bookings optionally filtered with cardID", "operationId": "getBooking", @@ -100,11 +98,7 @@ "check_in_out": { "type": "integer", "example": 1, - "enum": [ - 1, - 2, - 255 - ] + "enum": [1, 2, 254] }, "timestamp": { "type": "string", @@ -131,9 +125,7 @@ }, "/time/new": { "put": { - "tags": [ - "booking" - ], + "tags": ["booking"], "summary": "Create new Booking", "description": "Creates a new booking with the supplied parameters", "operationId": "pcreateBooking", @@ -171,11 +163,7 @@ "required": true, "schema": { "type": "integer", - "enum": [ - 1, - 2, - 255 - ] + "enum": [1, 2, 254] } } ], @@ -203,11 +191,7 @@ "check_in_out": { "type": "integer", "example": 1, - "enum": [ - 1, - 2, - 255 - ] + "enum": [1, 2, 254] }, "timestamp": { "type": "string", @@ -228,9 +212,7 @@ } }, "get": { - "tags": [ - "booking" - ], + "tags": ["booking"], "summary": "Create new Booking", "description": "Creates a new booking with the supplied parameters", "operationId": "gcreateBooking", @@ -277,11 +259,7 @@ "required": true, "schema": { "type": "integer", - "enum": [ - 1, - 2, - 255 - ] + "enum": [1, 2, 254] } } ], @@ -309,11 +287,7 @@ "check_in_out": { "type": "integer", "example": 1, - "enum": [ - 1, - 2, - 255 - ] + "enum": [1, 2, 254] }, "timestamp": { "type": "string", @@ -339,11 +313,9 @@ }, "/logout": { "get": { - "tags": [ - "booking" - ], + "tags": ["booking"], "summary": "Logs out all logged in users", - "description": "With this call all actively logged in users (last booking today has check_in_out=1) will be logged out automaticly (check_in_out=255)", + "description": "With this call all actively logged in users (last booking today has check_in_out=1) will be logged out automaticly (check_in_out=254)", "operationId": "autoLogout", "responses": { "200": { @@ -412,11 +384,7 @@ "check_in_out": { "type": "integer", "example": 1, - "enum": [ - 1, - 2, - 255 - ] + "enum": [1, 2, 254] }, "timestamp": { "type": "string", @@ -450,11 +418,7 @@ "check_in_out": { "type": "integer", "example": 1, - "enum": [ - 1, - 2, - 255 - ] + "enum": [1, 2, 254] }, "timestamp": { "type": "string", diff --git a/Docker/arbeitszeitmessung.yaml b/Docker/arbeitszeitmessung.yaml index a0a43a4..73b2cae 100644 --- a/Docker/arbeitszeitmessung.yaml +++ b/Docker/arbeitszeitmessung.yaml @@ -88,7 +88,7 @@ paths: enum: - 1 - 2 - - 255 + - 254 responses: "200": description: successfully created booking @@ -137,7 +137,7 @@ paths: enum: - 1 - 2 - - 255 + - 254 responses: "200": description: successfully created booking @@ -154,7 +154,7 @@ paths: tags: - booking summary: Logs out all logged in users - description: With this call all actively logged in users (last booking today has check_in_out=1) will be logged out automaticly (check_in_out=255) + description: With this call all actively logged in users (last booking today has check_in_out=1) will be logged out automaticly (check_in_out=254) operationId: autoLogout responses: "200": @@ -196,7 +196,7 @@ components: enum: - 1 - 2 - - 255 + - 254 timestamp: type: string format: date-time diff --git a/Docker/docker-compose.dev.yml b/Docker/docker-compose.dev.yml index e0919b1..2abeb41 100644 --- a/Docker/docker-compose.dev.yml +++ b/Docker/docker-compose.dev.yml @@ -20,7 +20,8 @@ services: - 8001:8080 backend: build: ../Backend - image: git.letsstein.de/tom/arbeitszeit-backend:0.0.1 + image: git.letsstein.de/tom/arbeitszeit-backend:0.1.1 + restart: unless-stopped env_file: - .env environment: diff --git a/Readme.md b/Readme.md index 70d803e..8bf23c6 100644 --- a/Readme.md +++ b/Readme.md @@ -26,73 +26,93 @@ Nutzeransicht (/user): ![user](docs/images/user.png) +## Buchungstypen + +1 - Kommen +2 - Gehen +3 - Kommen Manuell +4 - Gehen Manuell +254 - Automatisch abgemeldet + ## API + Nutzung der API wenn die `dev-docker-compose.yml` Datei gestartet wird, ist direkt ein SwaggerUI Server mit entsprechender Datei inbegriffen. ### Buchungen [/time] #### [GET] Anfrage + Parameter: cardID (string) Antwort: `200` + ```json [ - { - "cradID": "test_card", - "readerID": "test_reader", - "bookingTyp": 2, - "loggedTime": "2024-09-05T08:37:53.117641Z", - "id": 5 - }, - { - "cradID": "test_card", - "readerID": "mytest", - "bookingTyp": 1, - "loggedTime": "2024-09-05T08:51:12.670827Z", - "id": 6 - }, -] -``` -Antwort `500` -Serverfehler - -#### [PUT] Anfrage -Parameter: id (int) -Body: (veränderte Parameter) -```json -{ + { "cradID": "test_card", - "readerID": "mytest", - "bookingTyp": 1, - "loggedTime": "2024-09-05T08:51:12.670827Z", -} -``` - Antwort `200` - ```json -{ + "readerID": "test_reader", + "bookingTyp": 2, + "loggedTime": "2024-09-05T08:37:53.117641Z", + "id": 5 + }, + { "cradID": "test_card", "readerID": "mytest", "bookingTyp": 1, "loggedTime": "2024-09-05T08:51:12.670827Z", "id": 6 + } +] +``` + +Antwort `500` +Serverfehler + +#### [PUT] Anfrage + +Parameter: id (int) +Body: (veränderte Parameter) + +```json +{ + "cradID": "test_card", + "readerID": "mytest", + "bookingTyp": 1, + "loggedTime": "2024-09-05T08:51:12.670827Z" } - ``` +``` + +Antwort `200` + +```json +{ + "cradID": "test_card", + "readerID": "mytest", + "bookingTyp": 1, + "loggedTime": "2024-09-05T08:51:12.670827Z", + "id": 6 +} +``` ### Neue Buchung [/time/new] + #### [PUT] Anfrage + Parameter: + - cardID (string) - readerID (string) - bookingType (string) Antwort `202` Akzeptiert und eingefügt + ```json { - "cradID": "test_card", - "readerID": "mytest", - "bookingTyp": 1, - "loggedTime": "2024-09-05T08:51:12.670827Z", - "id": 6 + "cradID": "test_card", + "readerID": "mytest", + "bookingTyp": 1, + "loggedTime": "2024-09-05T08:51:12.670827Z", + "id": 6 } ``` diff --git a/db.sql b/db.sql index 05e4244..0e59269 100644 --- a/db.sql +++ b/db.sql @@ -6,7 +6,7 @@ CREATE TABLE "public"."anwesenheit" ( "check_in_out" int2, "geraet_id" int2 ); -COMMENT ON COLUMN "public"."anwesenheit"."check_in_out" IS '1=Check In 2=Check Out 255=Automatic Check Out'; +COMMENT ON COLUMN "public"."anwesenheit"."check_in_out" IS '1=Check In 2=Check Out 254=Automatic Check Out'; COMMENT ON COLUMN "public"."anwesenheit"."geraet_id" IS 'ID des Lesegerätes'; -- @block create table personaldaten