git/school-timetracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: added all features for seconde release candidate

Browse source
This commit is contained in:
Patryk Hegenberg 2025-11-05 23:39:51 +01:00
parent 9c25956711
commit e65ba85c43
7 changed files with 1947 additions and 850 deletions
Download patch file Download diff file Expand all files Collapse all files

161
backend/database.go
View file

@ -31,12 +31,12 @@ func InitDB(filepath string) *sql.DB {
func createTables(db *sql.DB) {
queries := []string{
`CREATE TABLE IF NOT EXISTS users (
id INTEGER PRIMARY KEY AUTOINCREMENT,
username TEXT UNIQUE NOT NULL,
password TEXT NOT NULL,
is_admin BOOLEAN NOT NULL DEFAULT 0,
weekly_hours REAL NOT NULL DEFAULT 40.0,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
id INTEGER PRIMARY KEY AUTOINCREMENT,
username TEXT UNIQUE NOT NULL,
password TEXT NOT NULL,
is_admin BOOLEAN NOT NULL DEFAULT 0,
yearly_hours REAL NOT NULL DEFAULT 1800.0, -- 40 Stunden/Woche * 45 Schulwochen
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
)`,
`CREATE TABLE IF NOT EXISTS schedules (
id INTEGER PRIMARY KEY AUTOINCREMENT,
@ -74,10 +74,9 @@ func createTables(db *sql.DB) {
}
}
// Admin-User anlegen
hash, _ := bcrypt.GenerateFromPassword([]byte("admin123"), bcrypt.DefaultCost)
_, err := db.Exec(`
INSERT OR IGNORE INTO users (id, username, password, is_admin, weekly_hours)
INSERT OR IGNORE INTO users (id, username, password, is_admin, yearly_hours)
VALUES (?, ?, ?, ?, ?)`,
1, "admin", string(hash), true, 40.0,
)
@ -104,8 +103,8 @@ func createIndexes(db *sql.DB) {
func GetUserByUsername(db *sql.DB, username string) (*User, error) {
user := &User{}
err := db.QueryRow("SELECT id, username, password, is_admin, weekly_hours FROM users WHERE username = ?", username).
Scan(&user.ID, &user.Username, &user.Password, &user.IsAdmin, &user.WeeklyHours)
err := db.QueryRow("SELECT id, username, password, is_admin, yearly_hours FROM users WHERE username = ?", username).
Scan(&user.ID, &user.Username, &user.Password, &user.IsAdmin, &user.YearlyHours)
if err != nil {
return nil, err
}
@ -114,22 +113,22 @@ func GetUserByUsername(db *sql.DB, username string) (*User, error) {
func GetUserByID(db *sql.DB, userID int) (*User, error) {
user := &User{}
err := db.QueryRow("SELECT id, username, password, is_admin, weekly_hours FROM users WHERE id = ?", userID).
Scan(&user.ID, &user.Username, &user.Password, &user.IsAdmin, &user.WeeklyHours)
err := db.QueryRow("SELECT id, username, password, is_admin, yearly_hours FROM users WHERE id = ?", userID).
Scan(&user.ID, &user.Username, &user.Password, &user.IsAdmin, &user.YearlyHours)
if err != nil {
return nil, err
}
return user, nil
}
func CreateUser(db *sql.DB, username, hashedPassword string, isAdmin bool, weeklyHours float64) error {
_, err := db.Exec("INSERT INTO users (username, password, is_admin, weekly_hours) VALUES (?, ?, ?, ?)",
username, hashedPassword, isAdmin, weeklyHours)
func CreateUser(db *sql.DB, username, hashedPassword string, isAdmin bool, yearlyHours float64) error {
_, err := db.Exec("INSERT INTO users (username, password, is_admin, yearly_hours) VALUES (?, ?, ?, ?)",
username, hashedPassword, isAdmin, yearlyHours)
return err
}
func GetAllUsers(db *sql.DB) ([]User, error) {
rows, err := db.Query("SELECT id, username, is_admin, weekly_hours FROM users ORDER BY username")
rows, err := db.Query("SELECT id, username, is_admin, yearly_hours FROM users ORDER BY username")
if err != nil {
return nil, err
}
@ -138,7 +137,7 @@ func GetAllUsers(db *sql.DB) ([]User, error) {
var users []User
for rows.Next() {
var u User
if err := rows.Scan(&u.ID, &u.Username, &u.IsAdmin, &u.WeeklyHours); err != nil {
if err := rows.Scan(&u.ID, &u.Username, &u.IsAdmin, &u.YearlyHours); err != nil {
continue
}
users = append(users, u)
@ -146,9 +145,9 @@ func GetAllUsers(db *sql.DB) ([]User, error) {
return users, nil
}
func UpdateUser(db *sql.DB, userID int, weeklyHours float64) error {
_, err := db.Exec("UPDATE users SET weekly_hours = ? WHERE id = ?",
weeklyHours, userID)
func UpdateUser(db *sql.DB, userID int, yearlyHours float64) error {
_, err := db.Exec("UPDATE users SET yearly_hours = ? WHERE id = ?",
yearlyHours, userID)
return err
}
@ -213,10 +212,10 @@ func CreateTimeEntry(db *sql.DB, entry *TimeEntry) error {
func GetTimeEntriesByUser(db *sql.DB, userID int) ([]TimeEntry, error) {
rows, err := db.Query(`
SELECT te.id, te.user_id, te.schedule_id, te.date, te.type, te.start_time, te.end_time, te.created_at, u.username
SELECT te.id, te.user_id, te.schedule_id, te.date, te.type, te.start_time, te.end_time, te.created_at, u.username
FROM time_entries te
JOIN users u ON te.user_id = u.id
WHERE te.user_id = ?
WHERE te.user_id = ?
ORDER BY te.date DESC, te.created_at DESC
`, userID)
if err != nil {
@ -237,7 +236,7 @@ func GetTimeEntriesByUser(db *sql.DB, userID int) ([]TimeEntry, error) {
func GetAllTimeEntries(db *sql.DB) ([]TimeEntry, error) {
rows, err := db.Query(`
SELECT te.id, te.user_id, te.schedule_id, te.date, te.type, te.start_time, te.end_time, te.created_at, u.username
SELECT te.id, te.user_id, te.schedule_id, te.date, te.type, te.start_time, te.end_time, te.created_at, u.username
FROM time_entries te
JOIN users u ON te.user_id = u.id
ORDER BY te.date DESC, te.created_at DESC
@ -260,34 +259,37 @@ func GetAllTimeEntries(db *sql.DB) ([]TimeEntry, error) {
func GetWeeklyHours(db *sql.DB) ([]WeeklyHours, error) {
rows, err := db.Query(`
SELECT
te.user_id,
u.username,
te.date,
te.start_time,
te.end_time,
te.type,
u.weekly_hours
FROM time_entries te
JOIN users u ON te.user_id = u.id
ORDER BY te.date DESC
`)
SELECT
te.user_id,
u.username,
te.date,
te.start_time,
te.end_time,
te.type,
u.yearly_hours
FROM time_entries te
JOIN users u ON te.user_id = u.id
ORDER BY te.date DESC
`)
if err != nil {
return nil, err
}
defer rows.Close()
hoursMap := make(map[string]*WeeklyHours)
userYearlyHours := make(map[int]float64)
for rows.Next() {
var userID int
var username, dateStr, startTime, endTime, entryType string
var expectedWeeklyHours float64
var yearlyHours float64
if err := rows.Scan(&userID, &username, &dateStr, &startTime, &endTime, &entryType, &expectedWeeklyHours); err != nil {
if err := rows.Scan(&userID, &username, &dateStr, &startTime, &endTime, &entryType, &yearlyHours); err != nil {
continue
}
userYearlyHours[userID] = yearlyHours
t, err := time.Parse("2006-01-02", dateStr)
if err != nil {
continue
@ -303,24 +305,30 @@ func GetWeeklyHours(db *sql.DB) ([]WeeklyHours, error) {
}
key := fmt.Sprintf("%d_%d_%d", userID, year, week)
if existing, exists := hoursMap[key]; exists {
existing.TotalHours += hours
} else {
hoursMap[key] = &WeeklyHours{
UserID: userID,
Username: username,
Year: year,
Week: week,
TotalHours: hours,
ExpectedHours: expectedWeeklyHours,
RemainingHours: expectedWeeklyHours - hours,
UserID: userID,
Username: username,
Year: year,
Week: week,
TotalHours: hours,
}
}
}
yearlyTotals := make(map[int]float64)
for _, h := range hoursMap {
h.RemainingHours = h.ExpectedHours - h.TotalHours
yearlyTotals[h.UserID] += h.TotalHours
}
for _, h := range hoursMap {
h.YearlyTarget = userYearlyHours[h.UserID]
h.YearlyActual = yearlyTotals[h.UserID]
h.WeeklyTarget = h.YearlyTarget / 45.0
h.RemainingYearly = h.YearlyTarget - h.YearlyActual
}
var result []WeeklyHours
@ -341,6 +349,57 @@ func GetWeeklyHours(db *sql.DB) ([]WeeklyHours, error) {
return result, nil
}
func GetYearlyHoursSummary(db *sql.DB) ([]WeeklyHours, error) {
users, err := GetAllUsers(db)
if err != nil {
return nil, err
}
entries, err := GetAllTimeEntries(db)
if err != nil {
return nil, err
}
userTotals := make(map[int]float64)
usernames := make(map[int]string)
for _, entry := range entries {
var hours float64
if entry.Type == "lesson" {
hours = 1.0
} else {
hours = calculateHoursDiff(entry.StartTime, entry.EndTime)
}
userTotals[entry.UserID] += hours
usernames[entry.UserID] = entry.Username
}
var result []WeeklyHours
for _, user := range users {
if !user.IsAdmin {
total := userTotals[user.ID]
remaining := user.YearlyHours - total
result = append(result, WeeklyHours{
UserID: user.ID,
Username: user.Username,
Year: time.Now().Year(),
Week: 0,
TotalHours: total,
YearlyTarget: user.YearlyHours,
YearlyActual: total,
RemainingYearly: remaining,
})
}
}
sort.Slice(result, func(i, j int) bool {
return result[i].Username < result[j].Username
})
return result, nil
}
func calculateHoursDiff(startTime, endTime string) float64 {
parseTime := func(timeStr string) float64 {
parts := strings.Split(timeStr, ":")
@ -376,8 +435,8 @@ func DeleteTimeEntriesByUserAndWeek(db *sql.DB, userID int, year int, week int)
}
query := `
DELETE FROM time_entries
WHERE user_id = ?
DELETE FROM time_entries
WHERE user_id = ?
AND date IN (?, ?, ?, ?, ?)
`
_, err := db.Exec(query, userID, dateList[0], dateList[1], dateList[2], dateList[3], dateList[4])
@ -393,9 +452,9 @@ func CheckUserHasEntriesForWeek(db *sql.DB, userID int, year int, week int) (boo
}
query := `
SELECT COUNT(*)
FROM time_entries
WHERE user_id = ?
SELECT COUNT(*)
FROM time_entries
WHERE user_id = ?
AND date IN (?, ?, ?, ?, ?)
`

2
backend/go.mod
View file

@ -5,6 +5,7 @@ go 1.25.3
require (
github.com/labstack/echo/v4 v4.13.4
golang.org/x/crypto v0.43.0
golang.org/x/time v0.11.0
modernc.org/sqlite v1.40.0
)
@ -22,7 +23,6 @@ require (
golang.org/x/net v0.45.0 // indirect
golang.org/x/sys v0.37.0 // indirect
golang.org/x/text v0.30.0 // indirect
golang.org/x/time v0.11.0 // indirect
modernc.org/libc v1.66.10 // indirect
modernc.org/mathutil v1.7.1 // indirect
modernc.org/memory v1.11.0 // indirect

120
backend/handlers.go
View file

@ -14,7 +14,6 @@ type App struct {
DB *sql.DB
}
// Login Handler
func (app *App) LoginHandler(c echo.Context) error {
var req LoginRequest
if err := c.Bind(&req); err != nil {
@ -44,7 +43,6 @@ func (app *App) LoginHandler(c echo.Context) error {
return c.JSON(http.StatusOK, response)
}
// Schedule Handlers
func (app *App) GetSchedulesHandler(c echo.Context) error {
schedules, err := GetAllSchedules(app.DB)
if err != nil {
@ -76,33 +74,62 @@ func (app *App) DeleteScheduleHandler(c echo.Context) error {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
return c.NoContent(http.StatusOK)
return c.NoContent(http.StatusNoContent)
}
// // User Handlers
// func (app *App) CreateUserHandler(c echo.Context) error {
// var req CreateUserRequest
// if err := c.Bind(&req); err != nil {
// return echo.NewHTTPError(http.StatusBadRequest, "invalid request")
// }
func (app *App) GetYearlyHoursSummaryHandler(c echo.Context) error {
hours, err := GetYearlyHoursSummary(app.DB)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
if hours == nil {
hours = []WeeklyHours{}
}
return c.JSON(http.StatusOK, hours)
}
// hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
// if err != nil {
// return echo.NewHTTPError(http.StatusInternalServerError, "error hashing password")
// }
func (app *App) AdminCreateTimeEntryHandler(c echo.Context) error {
isAdmin, _ := c.Get("is_admin").(bool)
// if err := CreateUser(app.DB, req.Username, string(hashedPassword), req.IsAdmin); err != nil {
// return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
// }
if !isAdmin {
return echo.NewHTTPError(http.StatusForbidden, "Only admins can create entries for others")
}
// return c.JSON(http.StatusCreated, map[string]string{"message": "user created"})
// }
var req struct {
UserID int `json:"user_id"`
Date string `json:"date"`
StartTime string `json:"start_time"`
EndTime string `json:"end_time"`
Type string `json:"type"`
}
if err := c.Bind(&req); err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "invalid request")
}
entry := TimeEntry{
UserID: req.UserID,
Date: req.Date,
StartTime: req.StartTime,
EndTime: req.EndTime,
Type: req.Type,
}
if err := CreateTimeEntry(app.DB, &entry); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
return c.JSON(http.StatusCreated, map[string]string{"message": "time entry created"})
}
func (app *App) GetUsersHandler(c echo.Context) error {
users, err := GetAllUsers(app.DB)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
if users == nil {
users = []User{}
}
return c.JSON(http.StatusOK, users)
}
@ -116,10 +143,9 @@ func (app *App) DeleteUserHandler(c echo.Context) error {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
return c.NoContent(http.StatusOK)
return c.NoContent(http.StatusNoContent)
}
// Time Entry Handlers
func (app *App) CreateTimeEntryHandler(c echo.Context) error {
userID := c.Get("user_id").(int)
@ -144,6 +170,9 @@ func (app *App) GetMyTimeEntriesHandler(c echo.Context) error {
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
if entries == nil {
entries = []TimeEntry{}
}
return c.JSON(http.StatusOK, entries)
}
@ -189,6 +218,9 @@ func (app *App) GetAllTimeEntriesHandler(c echo.Context) error {
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
if entries == nil {
entries = []TimeEntry{}
}
return c.JSON(http.StatusOK, entries)
}
@ -197,6 +229,9 @@ func (app *App) GetWeeklyHoursHandler(c echo.Context) error {
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
if hours == nil {
hours = []WeeklyHours{}
}
return c.JSON(http.StatusOK, hours)
}
@ -217,7 +252,7 @@ func (app *App) DeleteWeekEntries(c echo.Context) error {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
return c.NoContent(http.StatusOK)
return c.NoContent(http.StatusNoContent)
}
type WeekDates struct {
@ -320,7 +355,7 @@ func (app *App) UpdateUserHandler(c echo.Context) error {
return echo.NewHTTPError(http.StatusBadRequest, err.Error())
}
if err := UpdateUser(app.DB, userID, req.WeeklyHours); err != nil {
if err := UpdateUser(app.DB, userID, req.YearlyHours); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
@ -378,47 +413,18 @@ func (app *App) DeleteTimeEntryHandler(c echo.Context) error {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
return c.NoContent(http.StatusOK)
return c.NoContent(http.StatusNoContent)
}
func (app *App) GetMyWeeklySummaryHandler(c echo.Context) error {
func (app *App) GetMyInfoHandler(c echo.Context) error {
userID := c.Get("user_id").(int)
year, err := strconv.Atoi(c.QueryParam("year"))
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "Invalid year")
}
week, err := strconv.Atoi(c.QueryParam("week"))
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "Invalid week")
}
user, err := GetUserByID(app.DB, userID)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
allHours, err := GetWeeklyHours(app.DB)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
for _, h := range allHours {
if h.UserID == userID && h.Year == year && h.Week == week {
return c.JSON(http.StatusOK, h)
}
}
return c.JSON(http.StatusOK, WeeklyHours{
UserID: userID,
Username: user.Username,
Year: year,
Week: week,
TotalHours: 0,
ExpectedHours: user.WeeklyHours,
RemainingHours: user.WeeklyHours,
})
return c.JSON(http.StatusOK, user)
}
func (app *App) CreateUserHandler(c echo.Context) error {
@ -432,11 +438,11 @@ func (app *App) CreateUserHandler(c echo.Context) error {
return echo.NewHTTPError(http.StatusInternalServerError, "Error hashing password")
}
if req.WeeklyHours == 0 {
req.WeeklyHours = 40.0
if req.YearlyHours == 0 {
req.YearlyHours = 1800.0
}
if err := CreateUser(app.DB, req.Username, string(hashedPassword), req.IsAdmin, req.WeeklyHours); err != nil {
if err := CreateUser(app.DB, req.Username, string(hashedPassword), req.IsAdmin, req.YearlyHours); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}

6
backend/main.go
View file

@ -44,7 +44,8 @@ func main() {
protected.DELETE("/my-time-entries/week", app.DeleteWeekEntries)
protected.GET("/week-dates", app.GetWeekDates)
protected.GET("/week-has-entries", app.CheckWeekHasEntries)
protected.GET("/my-weekly-summary", app.GetMyWeeklySummaryHandler)
protected.GET("/yearly-hours-summary", app.GetYearlyHoursSummaryHandler)
protected.GET("/my-info", app.GetMyInfoHandler)
}
admin := e.Group("/api/admin")
@ -59,9 +60,10 @@ func main() {
admin.GET("/time-entries", app.GetAllTimeEntriesHandler)
admin.GET("/weekly-hours", app.GetWeeklyHoursHandler)
admin.PUT("/users/:id", app.UpdateUserHandler)
admin.POST("/users/:id/reset-password", app.ResetPasswordHandler)
admin.PUT("/users/:id/reset-password", app.ResetPasswordHandler)
admin.PUT("/time-entries/:id", app.UpdateTimeEntryHandler)
admin.DELETE("/time-entries/:id", app.DeleteTimeEntryHandler)
admin.POST("/time-entry", app.AdminCreateTimeEntryHandler)
}
e.Static("/", "./static")

22
backend/models.go
View file

@ -15,13 +15,15 @@ type TimeEntry struct {
}
type WeeklyHours struct {
UserID int `json:"user_id"`
Username string `json:"username"`
Week int `json:"week"`
Year int `json:"year"`
TotalHours float64 `json:"total_hours"`
ExpectedHours float64 `json:"expected_hours"`
RemainingHours float64 `json:"remaining_hours"`
UserID int `json:"user_id"`
Username string `json:"username"`
Week int `json:"week"`
Year int `json:"year"`
TotalHours float64 `json:"total_hours"`
YearlyTarget float64 `json:"yearly_target"` // NEU
YearlyActual float64 `json:"yearly_actual"` // NEU
WeeklyTarget float64 `json:"weekly_target"` // NEU
RemainingYearly float64 `json:"remaining_yearly"` // NEU
}
type User struct {
@ -29,7 +31,7 @@ type User struct {
Username string `json:"username"`
Password string `json:"-"`
IsAdmin bool `json:"is_admin"`
WeeklyHours float64 `json:"weekly_hours"`
YearlyHours float64 `json:"yearly_hours"`
}
type Schedule struct {
@ -56,12 +58,12 @@ type CreateUserRequest struct {
Username string `json:"username" validate:"required"`
Password string `json:"password" validate:"required,min=6"`
IsAdmin bool `json:"is_admin"`
WeeklyHours float64 `json:"weekly_hours"`
YearlyHours float64 `json:"yearly_hours"`
}
type UpdateUserRequest struct {
Username string `json:"username"`
WeeklyHours float64 `json:"weekly_hours"`
YearlyHours float64 `json:"yearly_hours"`
}
type ResetPasswordRequest struct {

17
docker-compose.yml
View file

@ -1,17 +1,3 @@
# version: '3.8'
# services:
# timetracking:
# build: .
# container_name: school-timetracking
# ports:
# - "8080:8080"
# volumes:
# - ./data:/data
# environment:
# - PORT=8080
# - DB_PATH=/data/timetracking.db
# restart: unless-stopped
services:
timetracking:
build: .
@ -21,6 +7,8 @@ services:
environment:
- PORT=8080
- DB_PATH=/data/timetracking.db
- JWT_SECRET=your-default-secret-change-me
- TZ=Europe/Berlin # Optional: Zeitzone
volumes:
- timetracking-data:/data
restart: unless-stopped
@ -34,4 +22,3 @@ volumes:
networks:
timetracking-net:
driver: bridge

2469
frontend/src/Main.elm
View file

File diff suppressed because it is too large Load diff