UI Verbesserungen in Web App, Passwort/Lektoren

This commit is contained in:
concierge committed 2026-11-13 08:52:19 +01:00
1 parent 692b9b6ef8
commit d7113afa5f
23 files changed
+1340 -116

No files matched your search

+22 -6
View File
@@ -13,7 +13,14 @@ unverändert nutzbar.
## Funktionsumfang ## Funktionsumfang
- **Gottesdienstplan** mit Tageszeilen, Lesungen, Kirchenspalten, Feiertagen - **Gottesdienstplan** mit Tageszeilen, Lesungen, Kirchenspalten, Feiertagen
und farblich markierter Liturgie und farblich markierter Liturgie; Lesungen verlinken direkt auf die
Tagesliturgie bei Schott
- **Zeitstrahl** mit Marken des Kalender- und Kirchenjahres sowie erkennbaren
Monaten mit vorhandenen Planungsdaten
- **Zeitraum-Presets** für Quartale, Weihnachts- und Osterzeit sowie 3, 6 oder
12 Monate im Anschluss an die letzten Planungsdaten
- **Personenfilter** im Plan: Leser filtern nach ihrer verknüpften Person,
Redakteure nach beliebigen Personen
- **Automatische Planung** mit Ausschlüssen, Präferenzen, Fairness und - **Automatische Planung** mit Ausschlüssen, Präferenzen, Fairness und
Doppelrollen-Regeln; manuelle Nachsteuerung inklusive Sperren Doppelrollen-Regeln; manuelle Nachsteuerung inklusive Sperren
- **Gottesdienstordnung** mit wiederkehrenden Vorlagen, Ausnahmen und - **Gottesdienstordnung** mit wiederkehrenden Vorlagen, Ausnahmen und
@@ -27,6 +34,11 @@ unverändert nutzbar.
- **PDF/Druck** in zwei Varianten: A4 quer als vollständiger Plan und A4 hoch - **PDF/Druck** in zwei Varianten: A4 quer als vollständiger Plan und A4 hoch
als kompakte Gottesdienstliste als kompakte Gottesdienstliste
- **Mandanten, Konten und Kirchen** zentral über die Administration verwalten - **Mandanten, Konten und Kirchen** zentral über die Administration verwalten
- **Sichere Anmeldung** mit initialem Passwort und erzwungener eigener
Passwortvergabe beim ersten Login; Administratoren können Passwörter
zurücksetzen
- **Administrator-konfigurierbarer Anmeldespruch** unter dem Logo; globale
Website-Einstellungen sind ausschließlich für Administratoren sichtbar
## Schnellstart ## Schnellstart
@@ -48,8 +60,9 @@ Demo-Zugängen erhält man sofort einen vollständigen Plan:
| `editor` | `editor123`| Redakteur | | `editor` | `editor123`| Redakteur |
| `reader` | `reader123`| Leser | | `reader` | `reader123`| Leser |
> Die Demo-Zugänge sind ausschließlich für lokale Tests gedacht. In einer > Beim ersten Anmelden muss für jedes Konto ein eigenes Passwort vergeben
> produktiven Installation `-seed-demo` weglassen und ein eigenes > werden. Die Demo-Zugänge sind ausschließlich für lokale Tests gedacht. In
> einer produktiven Installation `-seed-demo` weglassen und ein eigenes
> Administratorkonto anlegen. > Administratorkonto anlegen.
Ohne `-seed-demo` und ohne vorhandene Konten erzeugt der Server automatisch Ohne `-seed-demo` und ohne vorhandene Konten erzeugt der Server automatisch
@@ -83,7 +96,10 @@ Jedes Konto hat genau eine globale Rolle:
- **Administrator** verwaltet alle Mandanten, Konten und Kirchen und darf überall - **Administrator** verwaltet alle Mandanten, Konten und Kirchen und darf überall
planen. planen.
- **Redakteur** bearbeitet die ihm freigegebenen Mandanten. - **Redakteur** bearbeitet die ihm freigegebenen Mandanten.
- **Leser** sieht die ihm freigegebenen Mandanten ausschließlich lesend. - **Leser** sieht die ihm freigegebenen Mandanten ausschließlich lesend. Wird
ein Leser-Konto mit einer Person verknüpft, darf es deren Stammdaten,
Präferenzen und Abwesenheiten selbst bearbeiten und den Plan nach dieser
Person filtern; ohne Verknüpfung bleiben Teamdaten für Leser unsichtbar.
Planungsdaten (Kirchen, Personen, Vorlagen, Gottesdienste, Einteilungen, Planungsdaten (Kirchen, Personen, Vorlagen, Gottesdienste, Einteilungen,
Abwesenheiten und Einstellungen) sind immer einem Mandanten zugeordnet. Abwesenheiten und Einstellungen) sind immer einem Mandanten zugeordnet.
@@ -144,8 +160,8 @@ Server sollte nicht direkt öffentlich erreichbar sein.
(`-wal`, `-shm`) gehören zum konsistenten Stand. (`-wal`, `-shm`) gehören zum konsistenten Stand.
- **Passwörter:** bcrypt-Hashes, serverseitige Sitzungen, HttpOnly-Cookies, - **Passwörter:** bcrypt-Hashes, serverseitige Sitzungen, HttpOnly-Cookies,
CSRF-Schutz auf allen schreibenden Formularen. CSRF-Schutz auf allen schreibenden Formularen.
- **Erster Login:** Nach dem Anlegen des Administrators das Initialpasswort - **Erster Login:** Jedes neu angelegte Konto muss beim ersten Anmelden ein
ändern und Demo-Konten entfernen bzw. deaktivieren. eigenes Passwort setzen. Demo-Konten nach dem Test entfernen bzw. deaktivieren.
- **Updates:** Neue Binärdatei austauschen und Dienst neu starten. Das - **Updates:** Neue Binärdatei austauschen und Dienst neu starten. Das
Datenbankschema wird beim Start automatisch migriert. Datenbankschema wird beim Start automatisch migriert.
- **Netzwerk:** Der Prozess lauscht standardmäßig auf allen Interfaces. Für - **Netzwerk:** Der Prozess lauscht standardmäßig auf allen Interfaces. Für
+3 -3
View File
@@ -5,10 +5,10 @@ Wants=network-online.target
[Service] [Service]
Type=simple Type=simple
User=lektorenplan User=cmb
Group=lektorenplan Group=cmb
WorkingDirectory=/opt/lektorenplan WorkingDirectory=/opt/lektorenplan
ExecStart=/opt/lektorenplan/lektorenplan -addr 127.0.0.1:8080 -db /var/lib/lektorenplan/lektorenplan.db ExecStart=/opt/lektorenplan/lektorenplan -addr 127.0.0.1:8082 -db /var/lib/lektorenplan/lektorenplan.db
Environment=LP_SEED_DEMO=false Environment=LP_SEED_DEMO=false
Environment=LP_SECURE_COOKIES=true Environment=LP_SECURE_COOKIES=true
Restart=on-failure Restart=on-failure
+68 -25
View File
@@ -49,14 +49,25 @@ func (r UserRole) IsAdmin() bool { return r == RoleAdmin }
// User is a login account. Memberships are loaded on demand. // User is a login account. Memberships are loaded on demand.
type User struct { type User struct {
ID string `json:"id"` ID string `json:"id"`
Username string `json:"username"` Username string `json:"username"`
DisplayName string `json:"displayName"` DisplayName string `json:"displayName"`
PasswordHash string `json:"-"` PasswordHash string `json:"-"`
Role UserRole `json:"role"` Role UserRole `json:"role"`
Active bool `json:"active"` Active bool `json:"active"`
CreatedAt time.Time `json:"createdAt"` MustChangePassword bool `json:"mustChangePassword"`
TenantIDs []string `json:"tenantIDs,omitempty"` LinkedTenantID string `json:"linkedTenantID,omitempty"`
LinkedPersonID string `json:"linkedPersonID,omitempty"`
CreatedAt time.Time `json:"createdAt"`
TenantIDs []string `json:"tenantIDs,omitempty"`
}
// LinkedPerson returns the tenant-scoped person linked to this account, if any.
func (u *User) LinkedPerson(tenantID string) (string, bool) {
if u == nil || u.LinkedPersonID == "" || u.LinkedTenantID != tenantID {
return "", false
}
return u.LinkedPersonID, true
} }
// RoleTitle is a template helper. // RoleTitle is a template helper.
@@ -65,7 +76,8 @@ func (u *User) RoleTitle() string { return UserRoleTitle(u.Role) }
// Users lists all accounts with their memberships. // Users lists all accounts with their memberships.
func (s *Store) Users(ctx context.Context) ([]User, error) { func (s *Store) Users(ctx context.Context) ([]User, error) {
rows, err := s.db.QueryContext(ctx, rows, err := s.db.QueryContext(ctx,
"SELECT id, username, display_name, password_hash, role, active, created_at FROM users ORDER BY username COLLATE NOCASE") "SELECT id, username, display_name, password_hash, role, active, must_change_password, "+
"linked_tenant_id, linked_person_id, created_at FROM users ORDER BY username COLLATE NOCASE")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -100,7 +112,8 @@ func (s *Store) Users(ctx context.Context) ([]User, error) {
// User loads an account by id. // User loads an account by id.
func (s *Store) User(ctx context.Context, id string) (*User, error) { func (s *Store) User(ctx context.Context, id string) (*User, error) {
row := s.db.QueryRowContext(ctx, row := s.db.QueryRowContext(ctx,
"SELECT id, username, display_name, password_hash, role, active, created_at FROM users WHERE id=?", id) "SELECT id, username, display_name, password_hash, role, active, must_change_password, "+
"linked_tenant_id, linked_person_id, created_at FROM users WHERE id=?", id)
user, err := scanUser(row) user, err := scanUser(row)
if errors.Is(err, sql.ErrNoRows) { if errors.Is(err, sql.ErrNoRows) {
return nil, ErrNotFound return nil, ErrNotFound
@@ -119,7 +132,8 @@ func (s *Store) User(ctx context.Context, id string) (*User, error) {
// UserByUsername loads an account by login name. // UserByUsername loads an account by login name.
func (s *Store) UserByUsername(ctx context.Context, username string) (*User, error) { func (s *Store) UserByUsername(ctx context.Context, username string) (*User, error) {
row := s.db.QueryRowContext(ctx, row := s.db.QueryRowContext(ctx,
"SELECT id, username, display_name, password_hash, role, active, created_at FROM users WHERE username=? COLLATE NOCASE", "SELECT id, username, display_name, password_hash, role, active, must_change_password, "+
"linked_tenant_id, linked_person_id, created_at FROM users WHERE username=? COLLATE NOCASE",
strings.TrimSpace(username)) strings.TrimSpace(username))
user, err := scanUser(row) user, err := scanUser(row)
if errors.Is(err, sql.ErrNoRows) { if errors.Is(err, sql.ErrNoRows) {
@@ -143,12 +157,14 @@ type rowScanner interface {
func scanUser(row rowScanner) (*User, error) { func scanUser(row rowScanner) (*User, error) {
var user User var user User
var role, created string var role, created string
var active int var active, mustChange int
if err := row.Scan(&user.ID, &user.Username, &user.DisplayName, &user.PasswordHash, &role, &active, &created); err != nil { if err := row.Scan(&user.ID, &user.Username, &user.DisplayName, &user.PasswordHash,
&role, &active, &mustChange, &user.LinkedTenantID, &user.LinkedPersonID, &created); err != nil {
return nil, err return nil, err
} }
user.Role = UserRole(role) user.Role = UserRole(role)
user.Active = active != 0 user.Active = active != 0
user.MustChangePassword = mustChange != 0
user.CreatedAt = parseTime(created) user.CreatedAt = parseTime(created)
return &user, nil return &user, nil
} }
@@ -199,14 +215,16 @@ func (s *Store) CreateUser(ctx context.Context, username, displayName, password
} }
user := &User{ user := &User{
ID: domain.NewID(), Username: username, DisplayName: displayName, ID: domain.NewID(), Username: username, DisplayName: displayName,
PasswordHash: hash, Role: role, Active: active, CreatedAt: time.Now().UTC(), PasswordHash: hash, Role: role, Active: active, MustChangePassword: true,
CreatedAt: time.Now().UTC(),
} }
err = s.transaction(ctx, func(tx *sql.Tx) error { err = s.transaction(ctx, func(tx *sql.Tx) error {
if _, err := tx.ExecContext(ctx, ` if _, err := tx.ExecContext(ctx, `
INSERT INTO users(id, username, display_name, password_hash, role, active, created_at) INSERT INTO users(id, username, display_name, password_hash, role, active,
VALUES(?, ?, ?, ?, ?, ?, ?)`, must_change_password, linked_tenant_id, linked_person_id, created_at)
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
user.ID, user.Username, user.DisplayName, user.PasswordHash, string(user.Role), user.ID, user.Username, user.DisplayName, user.PasswordHash, string(user.Role),
boolInt(user.Active), user.CreatedAt.Format(time.RFC3339)); err != nil { boolInt(user.Active), 1, "", "", user.CreatedAt.Format(time.RFC3339)); err != nil {
return err return err
} }
seen := map[string]bool{} seen := map[string]bool{}
@@ -233,15 +251,25 @@ func (s *Store) CreateUser(ctx context.Context, username, displayName, password
} }
// UpdateUser saves account fields. An empty password keeps the old hash. // UpdateUser saves account fields. An empty password keeps the old hash.
func (s *Store) UpdateUser(ctx context.Context, id, username, displayName, password string, role UserRole, active bool, tenantIDs []string) error { // Setting a new password by an administrator also forces a change at the next
// login. linkedTenantID/linkedPersonID may be empty to remove the link.
func (s *Store) UpdateUser(ctx context.Context, id, username, displayName, password string, role UserRole, active bool, tenantIDs []string, forcePasswordChange bool, linkedTenantID, linkedPersonID string) error {
username = strings.TrimSpace(username) username = strings.TrimSpace(username)
displayName = strings.TrimSpace(displayName) displayName = strings.TrimSpace(displayName)
linkedTenantID = strings.TrimSpace(linkedTenantID)
linkedPersonID = strings.TrimSpace(linkedPersonID)
if username == "" || displayName == "" { if username == "" || displayName == "" {
return errors.New("Benutzername und Anzeigename sind erforderlich") return errors.New("Benutzername und Anzeigename sind erforderlich")
} }
if !role.IsValid() { if !role.IsValid() {
return errors.New("Unbekannte Rolle") return errors.New("Unbekannte Rolle")
} }
if role != RoleReader {
linkedTenantID, linkedPersonID = "", ""
}
if linkedPersonID == "" {
linkedTenantID = ""
}
return s.transaction(ctx, func(tx *sql.Tx) error { return s.transaction(ctx, func(tx *sql.Tx) error {
if password != "" { if password != "" {
hash, err := HashPassword(password) hash, err := HashPassword(password)
@@ -249,14 +277,19 @@ func (s *Store) UpdateUser(ctx context.Context, id, username, displayName, passw
return err return err
} }
if _, err := tx.ExecContext(ctx, if _, err := tx.ExecContext(ctx,
"UPDATE users SET username=?, display_name=?, role=?, active=?, password_hash=? WHERE id=?", "UPDATE users SET username=?, display_name=?, role=?, active=?, password_hash=?, "+
username, displayName, string(role), boolInt(active), hash, id); err != nil { "must_change_password=?, linked_tenant_id=?, linked_person_id=? WHERE id=?",
username, displayName, string(role), boolInt(active), hash,
boolInt(forcePasswordChange || password != ""), linkedTenantID, linkedPersonID, id); err != nil {
return err return err
} }
} else { } else {
if _, err := tx.ExecContext(ctx, if _, err := tx.ExecContext(ctx,
"UPDATE users SET username=?, display_name=?, role=?, active=? WHERE id=?", "UPDATE users SET username=?, display_name=?, role=?, active=?, "+
username, displayName, string(role), boolInt(active), id); err != nil { "must_change_password=CASE WHEN ? THEN 1 ELSE must_change_password END, "+
"linked_tenant_id=?, linked_person_id=? WHERE id=?",
username, displayName, string(role), boolInt(active),
boolInt(forcePasswordChange), linkedTenantID, linkedPersonID, id); err != nil {
return err return err
} }
} }
@@ -278,13 +311,23 @@ func (s *Store) UpdateUser(ctx context.Context, id, username, displayName, passw
}) })
} }
// SetUserPassword updates only the password hash. // SetUserPassword updates the password hash and the forced-change flag.
func (s *Store) SetUserPassword(ctx context.Context, id, password string) error { func (s *Store) SetUserPassword(ctx context.Context, id, password string, mustChange bool) error {
hash, err := HashPassword(password) hash, err := HashPassword(password)
if err != nil { if err != nil {
return err return err
} }
_, err = s.db.ExecContext(ctx, "UPDATE users SET password_hash=? WHERE id=?", hash, id) _, err = s.db.ExecContext(ctx,
"UPDATE users SET password_hash=?, must_change_password=? WHERE id=?",
hash, boolInt(mustChange), id)
return err
}
// SetUserPersonLink ties a reader account to a person inside one tenant.
func (s *Store) SetUserPersonLink(ctx context.Context, id, tenantID, personID string) error {
_, err := s.db.ExecContext(ctx,
"UPDATE users SET linked_tenant_id=?, linked_person_id=? WHERE id=?",
strings.TrimSpace(tenantID), strings.TrimSpace(personID), id)
return err return err
} }
+47 -1
View File
@@ -97,6 +97,9 @@ CREATE TABLE IF NOT EXISTS users (
password_hash TEXT NOT NULL, password_hash TEXT NOT NULL,
role TEXT NOT NULL, role TEXT NOT NULL,
active INTEGER NOT NULL DEFAULT 1, active INTEGER NOT NULL DEFAULT 1,
must_change_password INTEGER NOT NULL DEFAULT 1,
linked_tenant_id TEXT NOT NULL DEFAULT '',
linked_person_id TEXT NOT NULL DEFAULT '',
created_at TEXT NOT NULL created_at TEXT NOT NULL
); );
@@ -253,14 +256,57 @@ func (s *Store) migrate(ctx context.Context) error {
if _, err := s.db.ExecContext(ctx, schema); err != nil { if _, err := s.db.ExecContext(ctx, schema); err != nil {
return fmt.Errorf("apply schema: %w", err) return fmt.Errorf("apply schema: %w", err)
} }
// Existing databases predate the password-state and person-link columns.
// CREATE TABLE IF NOT EXISTS does not modify them, so add the columns here.
columns := []struct {
name string
definition string
}{
{"must_change_password", "INTEGER NOT NULL DEFAULT 1"},
{"linked_tenant_id", "TEXT NOT NULL DEFAULT ''"},
{"linked_person_id", "TEXT NOT NULL DEFAULT ''"},
}
for _, column := range columns {
exists, err := s.hasColumn(ctx, "users", column.name)
if err != nil {
return fmt.Errorf("inspect users table: %w", err)
}
if exists {
continue
}
if _, err := s.db.ExecContext(ctx,
"ALTER TABLE users ADD COLUMN "+column.name+" "+column.definition); err != nil {
return fmt.Errorf("add users.%s: %w", column.name, err)
}
}
if _, err := s.db.ExecContext(ctx, if _, err := s.db.ExecContext(ctx,
"INSERT INTO schema_meta(key, value) VALUES('schemaVersion', '1') "+ "INSERT INTO schema_meta(key, value) VALUES('schemaVersion', '2') "+
"ON CONFLICT(key) DO UPDATE SET value=excluded.value"); err != nil { "ON CONFLICT(key) DO UPDATE SET value=excluded.value"); err != nil {
return fmt.Errorf("record schema version: %w", err) return fmt.Errorf("record schema version: %w", err)
} }
return nil return nil
} }
func (s *Store) hasColumn(ctx context.Context, table, column string) (bool, error) {
rows, err := s.db.QueryContext(ctx, "PRAGMA table_info("+table+")")
if err != nil {
return false, err
}
defer rows.Close()
for rows.Next() {
var cid, notNull, pk int
var name, kind string
var defaultValue sql.NullString
if err := rows.Scan(&cid, &name, &kind, &notNull, &defaultValue, &pk); err != nil {
return false, err
}
if name == column {
return true, nil
}
}
return false, rows.Err()
}
func (s *Store) transaction(ctx context.Context, fn func(*sql.Tx) error) error { func (s *Store) transaction(ctx context.Context, fn func(*sql.Tx) error) error {
tx, err := s.db.BeginTx(ctx, nil) tx, err := s.db.BeginTx(ctx, nil)
if err != nil { if err != nil {
+18
View File
@@ -98,6 +98,24 @@ func (s *Store) SpecialServices(ctx context.Context, tenantID string) ([]domain.
return out, rows.Err() return out, rows.Err()
} }
// LatestServiceDate returns the last date with planning data, if any.
func (s *Store) LatestServiceDate(ctx context.Context, tenantID string) (*time.Time, error) {
var value sql.NullString
err := s.db.QueryRowContext(ctx,
"SELECT MAX(date) FROM services WHERE tenant_id=?", tenantID).Scan(&value)
if err != nil {
return nil, err
}
if !value.Valid || value.String == "" {
return nil, nil
}
date, ok := domain.DateFromKey(value.String)
if !ok {
return nil, nil
}
return &date, nil
}
// ServiceCount returns the number of occurrences in a tenant. // ServiceCount returns the number of occurrences in a tenant.
func (s *Store) ServiceCount(ctx context.Context, tenantID string) (int, error) { func (s *Store) ServiceCount(ctx context.Context, tenantID string) (int, error) {
var count int var count int
+105 -9
View File
@@ -1,6 +1,8 @@
package web package web
import ( import (
"crypto/rand"
"encoding/hex"
"net/http" "net/http"
"strings" "strings"
@@ -19,13 +21,21 @@ type adminTenantsPageData struct {
Edit *store.Tenant Edit *store.Tenant
} }
type adminPersonOption struct {
TenantID string
TenantName string
ID string
Label string
}
type adminUsersPageData struct { type adminUsersPageData struct {
Users []store.User Users []store.User
Tenants []store.Tenant Tenants []store.Tenant
TenantsByID map[string]store.Tenant TenantsByID map[string]store.Tenant
Roles []store.UserRole Roles []store.UserRole
Edit *store.User Edit *store.User
SelfID string SelfID string
PersonOptions []adminPersonOption
} }
type adminChurchesPageData struct { type adminChurchesPageData struct {
@@ -167,9 +177,23 @@ func (s *Server) handleAdminUsers(w http.ResponseWriter, r *http.Request, user *
for _, item := range tenants { for _, item := range tenants {
tenantsByID[item.ID] = item tenantsByID[item.ID] = item
} }
var personOptions []adminPersonOption
for _, item := range tenants {
people, err := s.store.People(r.Context(), item.ID)
if err != nil {
s.renderError(w, r, http.StatusInternalServerError, "Team", err.Error())
return
}
for _, person := range people {
personOptions = append(personOptions, adminPersonOption{
TenantID: item.ID, TenantName: item.Name, ID: person.ID, Label: person.FullName(),
})
}
}
page := adminUsersPageData{ page := adminUsersPageData{
Users: users, Tenants: tenants, TenantsByID: tenantsByID, Edit: edit, SelfID: user.ID, Users: users, Tenants: tenants, TenantsByID: tenantsByID, Edit: edit, SelfID: user.ID,
Roles: []store.UserRole{store.RoleAdmin, store.RoleEditor, store.RoleReader}, Roles: []store.UserRole{store.RoleAdmin, store.RoleEditor, store.RoleReader},
PersonOptions: personOptions,
} }
data := s.baseView(w, r, "Konten", "admin_users") data := s.baseView(w, r, "Konten", "admin_users")
data.Data = page data.Data = page
@@ -184,6 +208,23 @@ func (s *Server) handleAdminUserSave(w http.ResponseWriter, r *http.Request, use
role := store.UserRole(strings.TrimSpace(r.FormValue("role"))) role := store.UserRole(strings.TrimSpace(r.FormValue("role")))
active := r.FormValue("active") == "1" || r.FormValue("active") == "on" active := r.FormValue("active") == "1" || r.FormValue("active") == "on"
tenantIDs := r.Form["tenant_ids"] tenantIDs := r.Form["tenant_ids"]
forcePasswordChange := r.FormValue("force_password_change") == "1"
linkedTenantID, linkedPersonID := parseLinkedPerson(r.FormValue("linked_person"))
if role != store.RoleReader {
linkedTenantID, linkedPersonID = "", ""
}
if linkedPersonID != "" {
if !containsStringValue(tenantIDs, linkedTenantID) {
s.setFlash(w, "Die verknüpfte Person gehört zu einem Mandanten, der dem Konto nicht freigegeben ist.", "error")
s.redirect(w, r, "/admin/users?edit="+id)
return
}
if _, err := s.store.Person(r.Context(), linkedTenantID, linkedPersonID); err != nil {
s.setFlash(w, "Die ausgewählte Person wurde nicht gefunden.", "error")
s.redirect(w, r, "/admin/users?edit="+id)
return
}
}
if !role.IsValid() { if !role.IsValid() {
s.setFlash(w, "Bitte eine gültige Rolle auswählen.", "error") s.setFlash(w, "Bitte eine gültige Rolle auswählen.", "error")
s.redirect(w, r, "/admin/users") s.redirect(w, r, "/admin/users")
@@ -206,11 +247,19 @@ func (s *Server) handleAdminUserSave(w http.ResponseWriter, r *http.Request, use
s.redirect(w, r, "/admin/users") s.redirect(w, r, "/admin/users")
return return
} }
s.setFlash(w, "Konto „"+created.Username+"“ angelegt.", "success") if linkedPersonID != "" {
if err := s.store.SetUserPersonLink(r.Context(), created.ID, linkedTenantID, linkedPersonID); err != nil {
s.setFlash(w, "Das Konto wurde angelegt, die Person konnte aber nicht verknüpft werden: "+err.Error(), "error")
s.redirect(w, r, "/admin/users?edit="+created.ID)
return
}
}
s.setFlash(w, "Konto „"+created.Username+"“ angelegt. Beim ersten Anmelden muss ein eigenes Passwort gesetzt werden.", "success")
s.redirect(w, r, "/admin/users?edit="+created.ID) s.redirect(w, r, "/admin/users?edit="+created.ID)
return return
} }
if err := s.store.UpdateUser(r.Context(), id, username, displayName, password, role, active, tenantIDs); err != nil { if err := s.store.UpdateUser(r.Context(), id, username, displayName, password, role, active, tenantIDs,
forcePasswordChange, linkedTenantID, linkedPersonID); err != nil {
s.setFlash(w, "Das Konto konnte nicht gespeichert werden: "+err.Error(), "error") s.setFlash(w, "Das Konto konnte nicht gespeichert werden: "+err.Error(), "error")
s.redirect(w, r, "/admin/users?edit="+id) s.redirect(w, r, "/admin/users?edit="+id)
return return
@@ -234,6 +283,53 @@ func (s *Server) handleAdminUserDelete(w http.ResponseWriter, r *http.Request, u
s.redirect(w, r, "/admin/users") s.redirect(w, r, "/admin/users")
} }
func (s *Server) handleAdminUserResetPassword(w http.ResponseWriter, r *http.Request, user *store.User, session *store.Session, tenant *store.Tenant) {
id := strings.TrimSpace(r.FormValue("id"))
if id == "" {
s.redirect(w, r, "/admin/users")
return
}
account, err := s.store.User(r.Context(), id)
if err != nil {
s.setFlash(w, "Das Konto wurde nicht gefunden.", "error")
s.redirect(w, r, "/admin/users")
return
}
buf := make([]byte, 6)
if _, err := rand.Read(buf); err != nil {
s.setFlash(w, "Es konnte kein temporäres Passwort erzeugt werden.", "error")
s.redirect(w, r, "/admin/users?edit="+id)
return
}
temporary := "lp-" + hex.EncodeToString(buf)
if err := s.store.SetUserPassword(r.Context(), id, temporary, true); err != nil {
s.setFlash(w, "Das Passwort konnte nicht zurückgesetzt werden: "+err.Error(), "error")
s.redirect(w, r, "/admin/users?edit="+id)
return
}
s.setFlash(w, "Temporäres Passwort für „"+account.Username+"“: "+temporary+
" · Beim nächsten Anmelden muss es geändert werden.", "success")
s.redirect(w, r, "/admin/users?edit="+id)
}
func parseLinkedPerson(value string) (string, string) {
parts := strings.SplitN(strings.TrimSpace(value), "::", 2)
if len(parts) != 2 {
return "", ""
}
return strings.TrimSpace(parts[0]), strings.TrimSpace(parts[1])
}
func containsStringValue(values []string, needle string) bool {
for _, value := range values {
if value == needle {
return true
}
}
return false
}
func (s *Server) handleAdminChurches(w http.ResponseWriter, r *http.Request, user *store.User, session *store.Session, tenant *store.Tenant) { func (s *Server) handleAdminChurches(w http.ResponseWriter, r *http.Request, user *store.User, session *store.Session, tenant *store.Tenant) {
if tenant == nil { if tenant == nil {
s.renderNoTenant(w, r) s.renderNoTenant(w, r)
+5
View File
@@ -46,6 +46,11 @@ func (s *Server) handleLoginPost(w http.ResponseWriter, r *http.Request) {
MaxAge: int(s.sessionTTL.Seconds()), MaxAge: int(s.sessionTTL.Seconds()),
}) })
_ = session _ = session
if user.MustChangePassword {
s.setFlash(w, "Bitte vergeben Sie zuerst ein eigenes Passwort.", "info")
s.redirect(w, r, "/password")
return
}
s.setFlash(w, "Willkommen zurück, "+user.DisplayName+".", "success") s.setFlash(w, "Willkommen zurück, "+user.DisplayName+".", "success")
next := safeNext(r.FormValue("next")) next := safeNext(r.FormValue("next"))
s.redirect(w, r, next) s.redirect(w, r, next)
+74
View File
@@ -0,0 +1,74 @@
package web
import (
"net/http"
"strings"
"lektorenplan/store"
)
type passwordPageData struct {
Forced bool
}
func (s *Server) handlePasswordGet(w http.ResponseWriter, r *http.Request, user *store.User, session *store.Session, tenant *store.Tenant) {
data := s.baseView(w, r, "Passwort ändern", "")
data.Data = passwordPageData{Forced: user.MustChangePassword}
s.renderPage(w, r, "password", data)
}
func (s *Server) handlePasswordChange(w http.ResponseWriter, r *http.Request, user *store.User, session *store.Session, tenant *store.Tenant) {
current := r.FormValue("current_password")
next := r.FormValue("new_password")
confirm := r.FormValue("confirm_password")
if _, err := s.store.Authenticate(r.Context(), user.Username, current); err != nil {
s.setFlash(w, "Das aktuelle Passwort ist nicht korrekt.", "error")
s.redirect(w, r, "/password")
return
}
if strings.TrimSpace(next) != next || len(next) < 6 {
s.setFlash(w, "Das neue Passwort muss mindestens 6 Zeichen lang sein.", "error")
s.redirect(w, r, "/password")
return
}
if next != confirm {
s.setFlash(w, "Die beiden neuen Passwörter stimmen nicht überein.", "error")
s.redirect(w, r, "/password")
return
}
if err := s.store.SetUserPassword(r.Context(), user.ID, next, false); err != nil {
s.setFlash(w, "Das Passwort konnte nicht gespeichert werden: "+err.Error(), "error")
s.redirect(w, r, "/password")
return
}
s.setFlash(w, "Ihr Passwort wurde geändert.", "success")
s.redirect(w, r, "/plan")
}
func (s *Server) handleSettingsPassword(w http.ResponseWriter, r *http.Request, user *store.User, session *store.Session, tenant *store.Tenant) {
current := r.FormValue("current_password")
next := r.FormValue("new_password")
confirm := r.FormValue("confirm_password")
if _, err := s.store.Authenticate(r.Context(), user.Username, current); err != nil {
s.setFlash(w, "Das aktuelle Passwort ist nicht korrekt.", "error")
s.redirect(w, r, "/settings")
return
}
if strings.TrimSpace(next) != next || len(next) < 6 {
s.setFlash(w, "Das neue Passwort muss mindestens 6 Zeichen lang sein.", "error")
s.redirect(w, r, "/settings")
return
}
if next != confirm {
s.setFlash(w, "Die beiden neuen Passwörter stimmen nicht überein.", "error")
s.redirect(w, r, "/settings")
return
}
if err := s.store.SetUserPassword(r.Context(), user.ID, next, false); err != nil {
s.setFlash(w, "Das Passwort konnte nicht gespeichert werden: "+err.Error(), "error")
s.redirect(w, r, "/settings")
return
}
s.setFlash(w, "Ihr Passwort wurde geändert.", "success")
s.redirect(w, r, "/settings")
}
+228 -1
View File
@@ -3,13 +3,48 @@ package web
import ( import (
"fmt" "fmt"
"net/http" "net/http"
"sort"
"strconv" "strconv"
"strings" "strings"
"time"
"lektorenplan/domain" "lektorenplan/domain"
"lektorenplan/store" "lektorenplan/store"
) )
type planPreset struct {
Label string
Start string
End string
}
type planPresetGroup struct {
Label string
Presets []planPreset
}
type planTimelineMarker struct {
Left float64
Label string
Date string
Kind string
}
type planTimelineSegment struct {
Left float64
Width float64
Label string
Title string
HasData bool
Services int
}
type planTimeline struct {
Markers []planTimelineMarker
Segments []planTimelineSegment
HasData bool
}
type planPageData struct { type planPageData struct {
Range domain.DayRange Range domain.DayRange
Start string Start string
@@ -25,6 +60,10 @@ type planPageData struct {
NextEnd string NextEnd string
PresetFourStart string PresetFourStart string
PresetFourEnd string PresetFourEnd string
Presets []planPresetGroup
Timeline planTimeline
FilterPeople []domain.Person
PersonFilter string
} }
func flattenRows(rows []domain.DayPlanRow) ([]domain.ServiceOccurrence, []domain.Assignment) { func flattenRows(rows []domain.DayPlanRow) ([]domain.ServiceOccurrence, []domain.Assignment) {
@@ -44,6 +83,7 @@ func (s *Server) handlePlan(w http.ResponseWriter, r *http.Request, user *store.
s.renderNoTenant(w, r) s.renderNoTenant(w, r)
return return
} }
canEdit := s.store.CanEditTenant(r.Context(), user, tenant.ID)
rng := s.rangeFromRequest(r) rng := s.rangeFromRequest(r)
rows, err := s.store.PlanRows(r.Context(), tenant.ID, rng) rows, err := s.store.PlanRows(r.Context(), tenant.ID, rng)
if err != nil { if err != nil {
@@ -69,6 +109,47 @@ func (s *Server) handlePlan(w http.ResponseWriter, r *http.Request, user *store.
for _, person := range peopleList { for _, person := range peopleList {
people[person.ID] = person people[person.ID] = person
} }
timeline := buildPlanTimeline(rng, rows)
latest, err := s.store.LatestServiceDate(r.Context(), tenant.ID)
if err != nil {
s.renderError(w, r, http.StatusInternalServerError, "Planung", err.Error())
return
}
presets := buildPlanPresets(latest)
var filterPeople []domain.Person
linkedID, linked := user.LinkedPerson(tenant.ID)
switch {
case canEdit:
filterPeople = peopleList
case linked:
for _, person := range peopleList {
if person.ID == linkedID {
filterPeople = append(filterPeople, person)
}
}
}
personFilter := strings.TrimSpace(r.URL.Query().Get("person"))
if !canEdit {
if personFilter != linkedID {
personFilter = ""
}
} else if personFilter != "" {
known := false
for _, person := range peopleList {
if person.ID == personFilter {
known = true
break
}
}
if !known {
personFilter = ""
}
}
if personFilter != "" {
rows = filterPlanRows(rows, personFilter)
}
services, assignments := flattenRows(rows) services, assignments := flattenRows(rows)
stats := domain.ComputeStatistics(rng, services, assignments, peopleList, churches, absences) stats := domain.ComputeStatistics(rng, services, assignments, peopleList, churches, absences)
@@ -80,14 +161,160 @@ func (s *Server) handlePlan(w http.ResponseWriter, r *http.Request, user *store.
data.Data = planPageData{ data.Data = planPageData{
Range: rng, Start: domain.Key(rng.Start), End: domain.Key(rng.End), Range: rng, Start: domain.Key(rng.Start), End: domain.Key(rng.End),
Rows: rows, Churches: churches, People: people, Stats: stats, Rows: rows, Churches: churches, People: people, Stats: stats,
CanEdit: s.store.CanEditTenant(r.Context(), user, tenant.ID), CanEdit: canEdit,
PrevStart: domain.Key(prev.Start), PrevEnd: domain.Key(prev.End), PrevStart: domain.Key(prev.Start), PrevEnd: domain.Key(prev.End),
NextStart: domain.Key(next.Start), NextEnd: domain.Key(next.End), NextStart: domain.Key(next.Start), NextEnd: domain.Key(next.End),
PresetFourStart: domain.Key(fourWeeks.Start), PresetFourEnd: domain.Key(fourWeeks.End), PresetFourStart: domain.Key(fourWeeks.Start), PresetFourEnd: domain.Key(fourWeeks.End),
Presets: presets, Timeline: timeline, FilterPeople: filterPeople, PersonFilter: personFilter,
} }
s.renderPage(w, r, "plan", data) s.renderPage(w, r, "plan", data)
} }
func filterPlanRows(rows []domain.DayPlanRow, personID string) []domain.DayPlanRow {
out := make([]domain.DayPlanRow, 0, len(rows))
for _, row := range rows {
filtered := domain.DayPlanRow{Date: row.Date, LiturgicalDay: row.LiturgicalDay}
for _, service := range row.Services {
for _, assignment := range service.Assignments {
if assignment.PersonID == personID {
filtered.Services = append(filtered.Services, service)
break
}
}
}
if len(filtered.Services) > 0 {
out = append(out, filtered)
}
}
return out
}
func buildPlanTimeline(rng domain.DayRange, rows []domain.DayPlanRow) planTimeline {
totalDays := rng.DayCount()
if totalDays < 1 {
totalDays = 1
}
position := func(date time.Time) float64 {
offset := domain.DaysBetween(rng.Start, date)
if offset < 0 {
offset = 0
}
if offset >= totalDays {
offset = totalDays - 1
}
return float64(offset) / float64(totalDays) * 100
}
servicesByDay := map[string]int{}
for _, row := range rows {
servicesByDay[domain.Key(row.Date)] = len(row.Services)
}
type markerCandidate struct {
date time.Time
label string
kind string
}
var candidates []markerCandidate
for year := domain.Year(rng.Start) - 1; year <= domain.Year(rng.End)+1; year++ {
candidates = append(candidates,
markerCandidate{domain.MustDate(domain.KeyYMD(year, 1, 1)), "Jahresbeginn", "calendar"},
markerCandidate{domain.MustDate(domain.KeyYMD(year, 4, 1)), "2. Quartal", "calendar"},
markerCandidate{domain.MustDate(domain.KeyYMD(year, 7, 1)), "3. Quartal", "calendar"},
markerCandidate{domain.MustDate(domain.KeyYMD(year, 10, 1)), "4. Quartal", "calendar"},
markerCandidate{domain.EasterSunday(year), "Ostern", "church"},
markerCandidate{domain.Pentecost(year), "Pfingsten", "church"},
markerCandidate{domain.ChristKing(year), "Christkönig", "church"},
markerCandidate{domain.AdventStart(year), "1. Advent", "church"},
markerCandidate{domain.MustDate(domain.KeyYMD(year, 12, 25)), "Weihnachten", "church"},
)
}
sort.SliceStable(candidates, func(i, j int) bool { return candidates[i].date.Before(candidates[j].date) })
var markers []planTimelineMarker
for _, candidate := range candidates {
if !rng.Contains(candidate.date) {
continue
}
markers = append(markers, planTimelineMarker{
Left: position(candidate.date), Label: candidate.label,
Date: domain.Key(candidate.date), Kind: candidate.kind,
})
}
var segments []planTimelineSegment
hasData := false
cursor := rng.Start
for !cursor.After(rng.End) {
monthEnd := domain.EndOfMonth(cursor)
if monthEnd.After(rng.End) {
monthEnd = rng.End
}
segment := planTimelineSegment{
Left: position(cursor),
Width: float64(domain.DaysBetween(cursor, monthEnd)+1) / float64(totalDays) * 100,
Label: domain.ShortMonthName(cursor),
}
if domain.Month(cursor) == 1 || domain.Year(rng.Start) != domain.Year(rng.End) {
segment.Label += " " + strconv.Itoa(domain.Year(cursor))
}
for !cursor.After(monthEnd) {
segment.Services += servicesByDay[domain.Key(cursor)]
cursor = domain.AddingDays(1, cursor)
}
segment.HasData = segment.Services > 0
hasData = hasData || segment.HasData
segment.Title = fmt.Sprintf("%s · %d Gottesdienste", segment.Label, segment.Services)
segments = append(segments, segment)
}
return planTimeline{Markers: markers, Segments: segments, HasData: hasData}
}
func buildPlanPresets(latest *time.Time) []planPresetGroup {
today := domain.Today()
currentQuarter := domain.QuarterRange(today)
nextQuarter := domain.QuarterRange(domain.AddingMonths(3, currentQuarter.Start))
christmasStart := domain.MustDate(domain.KeyYMD(domain.Year(today), 12, 24))
christmasEnd := domain.MustDate(domain.KeyYMD(domain.Year(today)+1, 1, 6))
if domain.Month(today) == 1 && domain.DayNumber(today) <= 6 {
// Still inside the Christmas season that began last December.
christmasStart = domain.MustDate(domain.KeyYMD(domain.Year(today)-1, 12, 24))
christmasEnd = domain.MustDate(domain.KeyYMD(domain.Year(today), 1, 6))
}
easterStart := domain.EasterSunday(domain.Year(today))
easterEnd := domain.Pentecost(domain.Year(today))
if today.After(easterEnd) {
easterStart = domain.EasterSunday(domain.Year(today) + 1)
easterEnd = domain.Pentecost(domain.Year(today) + 1)
}
preset := func(label string, rng domain.DayRange) planPreset {
return planPreset{Label: label, Start: domain.Key(rng.Start), End: domain.Key(rng.End)}
}
groups := []planPresetGroup{
{Label: "Quartale", Presets: []planPreset{
preset("Dieses Quartal", currentQuarter),
preset("Nächstes Quartal", nextQuarter),
}},
{Label: "Kirchenjahr", Presets: []planPreset{
preset("Weihnachtszeit", domain.NewDayRange(christmasStart, christmasEnd)),
preset("Osterzeit", domain.NewDayRange(easterStart, easterEnd)),
}},
}
if latest != nil {
var after []planPreset
for _, months := range []int{3, 6, 12} {
start := domain.AddingDays(1, *latest)
end := domain.AddingMonths(months, start)
after = append(after, preset(fmt.Sprintf("%d Monate nach Planungsende", months),
domain.NewDayRange(start, end)))
}
groups = append(groups, planPresetGroup{Label: "Anschlussplanung", Presets: after})
}
return groups
}
func (s *Server) handleGenerateServices(w http.ResponseWriter, r *http.Request, user *store.User, session *store.Session, tenant *store.Tenant) { func (s *Server) handleGenerateServices(w http.ResponseWriter, r *http.Request, user *store.User, session *store.Session, tenant *store.Tenant) {
if tenant == nil { if tenant == nil {
s.redirect(w, r, "/plan") s.redirect(w, r, "/plan")
+22 -15
View File
@@ -16,20 +16,22 @@ import (
) )
type viewData struct { type viewData struct {
Title string Title string
Active string Active string
User *store.User User *store.User
Session *store.Session Session *store.Session
Tenant *store.Tenant Tenant *store.Tenant
Tenants []store.Tenant Tenants []store.Tenant
CSRF string CSRF string
Flash string Flash string
FlashKind string FlashKind string
IsEditor bool IsEditor bool
IsAdmin bool IsAdmin bool
Version string Version string
DemoMode bool DemoMode bool
Data any LoginQuote string
LoginQuoteSource string
Data any
} }
func (s *Server) baseView(w http.ResponseWriter, r *http.Request, title, active string) viewData { func (s *Server) baseView(w http.ResponseWriter, r *http.Request, title, active string) viewData {
@@ -40,6 +42,8 @@ func (s *Server) baseView(w http.ResponseWriter, r *http.Request, title, active
data := viewData{ data := viewData{
Title: title, Active: active, User: user, Session: session, Tenant: tenant, Title: title, Active: active, User: user, Session: session, Tenant: tenant,
Flash: flash, FlashKind: kind, Version: s.opts.Version, DemoMode: s.opts.DemoMode, Flash: flash, FlashKind: kind, Version: s.opts.Version, DemoMode: s.opts.DemoMode,
LoginQuote: s.loginQuote(r),
LoginQuoteSource: s.loginQuoteSource(r),
} }
if session != nil { if session != nil {
data.CSRF = session.CSRFToken data.CSRF = session.CSRFToken
@@ -155,7 +159,10 @@ func templateFunctions() template.FuncMap {
return *value return *value
}, },
"formatFloat": func(value float64) string { "formatFloat": func(value float64) string {
return strings.Replace(strconv.FormatFloat(value, 'f', 1, 64), ".", ",", 1) // Template output uses one decimal with a German comma. Round
// half-up explicitly; FormatFloat alone rounds 0.25 to 0.2.
rounded := math.Round(value*10) / 10
return strings.Replace(strconv.FormatFloat(rounded, 'f', 1, 64), ".", ",", 1)
}, },
"setting": sSetting, "setting": sSetting,
"safe": func(value string) template.HTML { return template.HTML(value) }, "safe": func(value string) template.HTML { return template.HTML(value) },
+37 -4
View File
@@ -63,7 +63,7 @@ func New(st *store.Store, opts Options) (*Server, error) {
names := []string{ names := []string{
"login", "plan", "service", "services", "team", "person", "statistics", "login", "plan", "service", "services", "team", "person", "statistics",
"exchange", "settings", "liturgy", "admin_tenants", "admin_users", "exchange", "settings", "liturgy", "admin_tenants", "admin_users",
"admin_churches", "error", "no_tenant", "admin_churches", "password", "error", "no_tenant",
} }
views := make(map[string]*template.Template, len(names)) views := make(map[string]*template.Template, len(names))
for _, name := range names { for _, name := range names {
@@ -123,6 +123,8 @@ func (s *Server) Handler() http.Handler {
mux.HandleFunc("GET /login", s.handleLoginGet) mux.HandleFunc("GET /login", s.handleLoginGet)
mux.HandleFunc("POST /login", s.handleLoginPost) mux.HandleFunc("POST /login", s.handleLoginPost)
mux.HandleFunc("POST /logout", s.auth(s.handleLogout)) mux.HandleFunc("POST /logout", s.auth(s.handleLogout))
mux.HandleFunc("GET /password", s.auth(s.handlePasswordGet))
mux.HandleFunc("POST /password", s.auth(s.handlePasswordChange))
mux.HandleFunc("GET /switch", s.auth(s.handleSwitchTenant)) mux.HandleFunc("GET /switch", s.auth(s.handleSwitchTenant))
mux.HandleFunc("GET /{$}", s.auth(s.handleRoot)) mux.HandleFunc("GET /{$}", s.auth(s.handleRoot))
@@ -144,10 +146,10 @@ func (s *Server) Handler() http.Handler {
mux.HandleFunc("GET /team", s.auth(s.handleTeam)) mux.HandleFunc("GET /team", s.auth(s.handleTeam))
mux.HandleFunc("GET /team/person/{id}", s.auth(s.handlePerson)) mux.HandleFunc("GET /team/person/{id}", s.auth(s.handlePerson))
mux.HandleFunc("POST /team/person/{id}/save", s.editor(s.handlePersonSave)) mux.HandleFunc("POST /team/person/{id}/save", s.personEditor(s.handlePersonSave))
mux.HandleFunc("POST /team/person/{id}/delete", s.editor(s.handlePersonDelete)) mux.HandleFunc("POST /team/person/{id}/delete", s.editor(s.handlePersonDelete))
mux.HandleFunc("POST /team/person/{id}/absence", s.editor(s.handleAbsenceSave)) mux.HandleFunc("POST /team/person/{id}/absence", s.personEditor(s.handleAbsenceSave))
mux.HandleFunc("POST /team/person/{id}/absence/delete", s.editor(s.handleAbsenceDelete)) mux.HandleFunc("POST /team/person/{id}/absence/delete", s.personEditor(s.handleAbsenceDelete))
mux.HandleFunc("GET /statistics", s.auth(s.handleStatistics)) mux.HandleFunc("GET /statistics", s.auth(s.handleStatistics))
mux.HandleFunc("GET /exchange", s.auth(s.handleExchange)) mux.HandleFunc("GET /exchange", s.auth(s.handleExchange))
@@ -155,6 +157,7 @@ func (s *Server) Handler() http.Handler {
mux.HandleFunc("POST /exchange/import", s.editor(s.handleImport)) mux.HandleFunc("POST /exchange/import", s.editor(s.handleImport))
mux.HandleFunc("GET /settings", s.auth(s.handleSettings)) mux.HandleFunc("GET /settings", s.auth(s.handleSettings))
mux.HandleFunc("POST /settings/save", s.editor(s.handleSettingsSave)) mux.HandleFunc("POST /settings/save", s.editor(s.handleSettingsSave))
mux.HandleFunc("POST /settings/password", s.auth(s.handleSettingsPassword))
mux.HandleFunc("POST /settings/demo/reset", s.editor(s.handleResetDemo)) mux.HandleFunc("POST /settings/demo/reset", s.editor(s.handleResetDemo))
mux.HandleFunc("POST /settings/data/delete", s.editor(s.handleDeleteTenantData)) mux.HandleFunc("POST /settings/data/delete", s.editor(s.handleDeleteTenantData))
mux.HandleFunc("GET /liturgy", s.auth(s.handleLiturgy)) mux.HandleFunc("GET /liturgy", s.auth(s.handleLiturgy))
@@ -167,6 +170,7 @@ func (s *Server) Handler() http.Handler {
mux.HandleFunc("POST /admin/tenants/delete", s.admin(s.handleAdminTenantDelete)) mux.HandleFunc("POST /admin/tenants/delete", s.admin(s.handleAdminTenantDelete))
mux.HandleFunc("GET /admin/users", s.admin(s.handleAdminUsers)) mux.HandleFunc("GET /admin/users", s.admin(s.handleAdminUsers))
mux.HandleFunc("POST /admin/users/save", s.admin(s.handleAdminUserSave)) mux.HandleFunc("POST /admin/users/save", s.admin(s.handleAdminUserSave))
mux.HandleFunc("POST /admin/users/reset-password", s.admin(s.handleAdminUserResetPassword))
mux.HandleFunc("POST /admin/users/delete", s.admin(s.handleAdminUserDelete)) mux.HandleFunc("POST /admin/users/delete", s.admin(s.handleAdminUserDelete))
mux.HandleFunc("GET /admin/churches", s.admin(s.handleAdminChurches)) mux.HandleFunc("GET /admin/churches", s.admin(s.handleAdminChurches))
mux.HandleFunc("POST /admin/churches/save", s.admin(s.handleAdminChurchSave)) mux.HandleFunc("POST /admin/churches/save", s.admin(s.handleAdminChurchSave))
@@ -284,10 +288,39 @@ func (s *Server) auth(next authedHandler) http.HandlerFunc {
http.Redirect(w, r, "/login?next="+url.QueryEscape(target), http.StatusSeeOther) http.Redirect(w, r, "/login?next="+url.QueryEscape(target), http.StatusSeeOther)
return return
} }
// Force a password change before any other authenticated page is
// reachable. The password form itself and logout stay accessible.
if user.MustChangePassword && r.URL.Path != "/password" && r.URL.Path != "/logout" {
s.redirect(w, r, "/password")
return
}
next(w, r, user, session, tenantFrom(r)) next(w, r, user, session, tenantFrom(r))
} }
} }
// personEditor permits editors for every person and linked readers for their
// own person only.
func (s *Server) personEditor(next authedHandler) http.HandlerFunc {
return s.auth(func(w http.ResponseWriter, r *http.Request, user *store.User, session *store.Session, tenant *store.Tenant) {
if tenant == nil {
s.setFlash(w, "Kein Mandant ausgewählt.", "error")
http.Redirect(w, r, "/plan", http.StatusSeeOther)
return
}
if s.store.CanEditTenant(r.Context(), user, tenant.ID) {
next(w, r, user, session, tenant)
return
}
personID, linked := user.LinkedPerson(tenant.ID)
if !linked || personID != r.PathValue("id") {
s.renderError(w, r, http.StatusForbidden, "Keine Berechtigung",
"Sie dürfen nur die Daten der mit Ihrem Konto verknüpften Person bearbeiten.")
return
}
next(w, r, user, session, tenant)
})
}
func (s *Server) editor(next authedHandler) http.HandlerFunc { func (s *Server) editor(next authedHandler) http.HandlerFunc {
return s.auth(func(w http.ResponseWriter, r *http.Request, user *store.User, session *store.Session, tenant *store.Tenant) { return s.auth(func(w http.ResponseWriter, r *http.Request, user *store.User, session *store.Session, tenant *store.Tenant) {
if tenant == nil { if tenant == nil {
+195 -2
View File
@@ -62,8 +62,28 @@ func login(t *testing.T, client *http.Client, base, username, password string) {
if resp.StatusCode != http.StatusSeeOther { if resp.StatusCode != http.StatusSeeOther {
t.Fatalf("login status = %d, want 303", resp.StatusCode) t.Fatalf("login status = %d, want 303", resp.StatusCode)
} }
if !strings.HasPrefix(resp.Header.Get("Location"), "/plan") { location := resp.Header.Get("Location")
t.Fatalf("login redirect = %q, want /plan", resp.Header.Get("Location")) if location == "/password" {
// Every seeded account starts with a forced password change.
page := get(t, client, base+"/password", http.StatusOK)
csrf := extractCSRF(t, page)
change, err := client.PostForm(base+"/password", url.Values{
"csrf": {csrf},
"current_password": {password},
"new_password": {password + "1"},
"confirm_password": {password + "1"},
})
if err != nil {
t.Fatalf("change initial password: %v", err)
}
defer change.Body.Close()
if change.StatusCode != http.StatusSeeOther {
t.Fatalf("change password status = %d, want 303", change.StatusCode)
}
location = change.Header.Get("Location")
}
if !strings.HasPrefix(location, "/plan") {
t.Fatalf("login redirect = %q, want /plan", location)
} }
} }
@@ -218,6 +238,179 @@ func TestWritesAndCSRF(t *testing.T) {
} }
} }
func TestLinkedReaderSelfService(t *testing.T) {
ts, st := newTestServer(t)
ctx := context.Background()
reader, err := st.UserByUsername(ctx, "reader")
if err != nil {
t.Fatalf("reader: %v", err)
}
tenants, err := st.Tenants(ctx)
if err != nil || len(tenants) == 0 {
t.Fatalf("tenants: %v", err)
}
var tenantID string
for _, tenant := range tenants {
if tenant.Slug == "bad-godesberg" {
tenantID = tenant.ID
break
}
}
if tenantID == "" {
t.Fatal("demo tenant not found")
}
people, err := st.People(ctx, tenantID)
if err != nil || len(people) < 2 {
t.Fatalf("people: %v", err)
}
if err := st.SetUserPersonLink(ctx, reader.ID, tenantID, people[0].ID); err != nil {
t.Fatalf("link reader: %v", err)
}
client := newClient(t)
login(t, client, ts.URL, "reader", "reader123")
body := get(t, client, ts.URL+"/team", http.StatusOK)
if !strings.Contains(body, people[0].FullName()) {
t.Fatalf("linked person missing from team page")
}
get(t, client, ts.URL+"/team/person/"+people[0].ID, http.StatusOK)
get(t, client, ts.URL+"/team/person/"+people[1].ID, http.StatusForbidden)
personBody := get(t, client, ts.URL+"/team/person/"+people[0].ID, http.StatusOK)
csrf := extractCSRF(t, personBody)
resp, err := client.PostForm(ts.URL+"/team/person/"+people[0].ID+"/save", url.Values{
"csrf": {csrf},
"first_name": {"Selbst"},
"last_name": {"Gepflegt"},
"email": {"selbst@example.org"},
})
if err != nil {
t.Fatalf("save own person: %v", err)
}
resp.Body.Close()
if resp.StatusCode != http.StatusSeeOther {
t.Fatalf("save own person = %d, want 303", resp.StatusCode)
}
updated, err := st.Person(ctx, tenantID, people[0].ID)
if err != nil || updated.FirstName != "Selbst" {
t.Fatalf("own person not updated: %#v, %v", updated, err)
}
if len(updated.Roles) != len(people[0].Roles) {
t.Fatalf("reader changed protected roles: %v", updated.Roles)
}
resp, err = client.PostForm(ts.URL+"/team/person/"+people[1].ID+"/save", url.Values{
"csrf": {csrf}, "first_name": {"Fremd"}, "last_name": {"Person"},
})
if err != nil {
t.Fatalf("save foreign person: %v", err)
}
resp.Body.Close()
if resp.StatusCode != http.StatusForbidden {
t.Fatalf("save foreign person = %d, want 403", resp.StatusCode)
}
}
func TestReaderWithoutLinkCannotSeeTeam(t *testing.T) {
ts, _ := newTestServer(t)
client := newClient(t)
login(t, client, ts.URL, "reader", "reader123")
get(t, client, ts.URL+"/team", http.StatusForbidden)
}
func TestAdminPasswordResetAndLoginQuote(t *testing.T) {
ts, st := newTestServer(t)
admin := newClient(t)
login(t, admin, ts.URL, "admin", "admin123")
body := get(t, admin, ts.URL+"/settings", http.StatusOK)
if !strings.Contains(body, "Spruch unter dem Logo") {
t.Fatal("admin settings do not expose the login quote")
}
csrf := extractCSRF(t, body)
resp, err := admin.PostForm(ts.URL+"/settings/save", url.Values{
"csrf": {csrf}, "login_quote": {"Neuer Spruch für die Anmeldung"},
"login_quote_source": {"Testgemeinde"},
})
if err != nil {
t.Fatalf("save settings: %v", err)
}
resp.Body.Close()
if resp.StatusCode != http.StatusSeeOther {
t.Fatalf("save settings = %d, want 303", resp.StatusCode)
}
anonymous := newClient(t)
loginPage := get(t, anonymous, ts.URL+"/login", http.StatusOK)
if !strings.Contains(loginPage, "Neuer Spruch für die Anmeldung") {
t.Fatal("configured login quote not rendered")
}
reader, err := st.UserByUsername(context.Background(), "reader")
if err != nil {
t.Fatalf("reader: %v", err)
}
usersPage := get(t, admin, ts.URL+"/admin/users?edit="+reader.ID, http.StatusOK)
csrf = extractCSRF(t, usersPage)
resp, err = admin.PostForm(ts.URL+"/admin/users/reset-password", url.Values{
"csrf": {csrf}, "id": {reader.ID},
})
if err != nil {
t.Fatalf("reset password: %v", err)
}
resp.Body.Close()
if resp.StatusCode != http.StatusSeeOther {
t.Fatalf("reset password = %d, want 303", resp.StatusCode)
}
reloaded, err := st.UserByUsername(context.Background(), "reader")
if err != nil {
t.Fatalf("reload reader: %v", err)
}
if !reloaded.MustChangePassword {
t.Fatal("password reset did not force a password change")
}
if _, err := st.Authenticate(context.Background(), "reader", "reader123"); err == nil {
t.Fatal("old reader password still valid after reset")
}
editor := newClient(t)
login(t, editor, ts.URL, "editor", "editor123")
editorSettings := get(t, editor, ts.URL+"/settings", http.StatusOK)
if strings.Contains(editorSettings, "Spruch unter dem Logo") {
t.Fatal("non-admin sees website-wide settings")
}
}
func TestPlanTimelinePresetsAndReadingLinks(t *testing.T) {
ts, st := newTestServer(t)
client := newClient(t)
login(t, client, ts.URL, "admin", "admin123")
tenants, err := st.Tenants(context.Background())
if err != nil || len(tenants) == 0 {
t.Fatalf("tenants: %v", err)
}
people, err := st.People(context.Background(), tenants[0].ID)
if err != nil || len(people) == 0 {
t.Fatalf("people: %v", err)
}
body := get(t, client, ts.URL+"/plan?start=2025-01-01&end=2025-12-31&person="+people[0].ID, http.StatusOK)
for _, marker := range []string{"Zeitstrahl", "Zeitraum-Presets", "Weihnachtszeit", "Osterzeit", "Ostern", "1. Advent"} {
if !strings.Contains(body, marker) {
t.Fatalf("plan page misses %q", marker)
}
}
if !strings.Contains(body, "Allgemeine Personen") && !strings.Contains(body, "Alle Personen") {
t.Fatal("plan page misses the person filter")
}
if !strings.Contains(body, "schott.erzabtei-beuron.de") {
t.Fatal("plan page misses the Schott reading link")
}
for _, marker := range []string{"plan-table-desktop", "plan-mobile-list", "plan-day-summary", "data-plan-mobile-empty"} {
if !strings.Contains(body, marker) {
t.Fatalf("plan page misses mobile markup %q", marker)
}
}
}
func extractCSRF(t *testing.T, body string) string { func extractCSRF(t *testing.T, body string) string {
t.Helper() t.Helper()
const marker = `name="csrf" value="` const marker = `name="csrf" value="`
+67 -24
View File
@@ -9,15 +9,37 @@ import (
) )
type settingsPageData struct { type settingsPageData struct {
Settings map[string]string Settings map[string]string
AutoSync bool AutoSync bool
Diocese string Diocese string
LastSync string LastSync string
Counts map[string]int Counts map[string]int
ChurchCount int ChurchCount int
CanEdit bool CanEdit bool
Database string IsAdmin bool
DemoReset bool Database string
DemoReset bool
LoginQuote string
LoginQuoteSource string
}
const (
defaultLoginQuote = "Jeder Sonntag braucht Menschen, die das Wort tragen und die Gemeinschaft begleiten."
defaultLoginQuoteSource = "Pfarreiengemeinschaft Bad Godesberg"
)
func (s *Server) loginQuote(r *http.Request) string {
if value := strings.TrimSpace(s.store.Setting(r.Context(), "loginQuoteText")); value != "" {
return value
}
return defaultLoginQuote
}
func (s *Server) loginQuoteSource(r *http.Request) string {
if value := strings.TrimSpace(s.store.Setting(r.Context(), "loginQuoteSource")); value != "" {
return value
}
return defaultLoginQuoteSource
} }
var dioceseOptions = []struct { var dioceseOptions = []struct {
@@ -67,14 +89,17 @@ func (s *Server) handleSettings(w http.ResponseWriter, r *http.Request, user *st
return return
} }
page := settingsPageData{ page := settingsPageData{
Settings: settings, Settings: settings,
AutoSync: s.store.Setting(r.Context(), "autoSyncLiturgy") != "0", AutoSync: s.store.Setting(r.Context(), "autoSyncLiturgy") != "0",
Diocese: s.store.Setting(r.Context(), "diocese"), Diocese: s.store.Setting(r.Context(), "diocese"),
LastSync: s.store.Setting(r.Context(), "lastLiturgicalSync"), LastSync: s.store.Setting(r.Context(), "lastLiturgicalSync"),
Counts: counts, Counts: counts,
CanEdit: s.store.CanEditTenant(r.Context(), user, tenant.ID), CanEdit: s.store.CanEditTenant(r.Context(), user, tenant.ID),
Database: s.store.Path(), IsAdmin: user.Role.IsAdmin(),
DemoReset: tenant.Slug == "bad-godesberg" || tenant.Slug == "rheinaue", Database: s.store.Path(),
DemoReset: tenant.Slug == "bad-godesberg" || tenant.Slug == "rheinaue",
LoginQuote: s.loginQuote(r),
LoginQuoteSource: s.loginQuoteSource(r),
} }
if page.Diocese == "" { if page.Diocese == "" {
page.Diocese = "koeln" page.Diocese = "koeln"
@@ -89,12 +114,32 @@ func (s *Server) handleSettingsSave(w http.ResponseWriter, r *http.Request, user
s.redirect(w, r, "/plan") s.redirect(w, r, "/plan")
return return
} }
_ = s.store.SetSetting(r.Context(), "autoSyncLiturgy", boolSetting(r.FormValue("auto_sync"))) if user.Role.IsAdmin() {
diocese := strings.TrimSpace(r.FormValue("diocese")) _ = s.store.SetSetting(r.Context(), "autoSyncLiturgy", boolSetting(r.FormValue("auto_sync")))
if diocese == "" { diocese := strings.TrimSpace(r.FormValue("diocese"))
diocese = "koeln" if diocese == "" {
diocese = "koeln"
}
_ = s.store.SetSetting(r.Context(), "diocese", diocese)
quote := strings.TrimSpace(r.FormValue("login_quote"))
if len([]rune(quote)) > 240 {
quote = string([]rune(quote)[:240])
}
if quote == "" {
_ = s.store.RemoveSetting(r.Context(), "loginQuoteText")
} else {
_ = s.store.SetSetting(r.Context(), "loginQuoteText", quote)
}
source := strings.TrimSpace(r.FormValue("login_quote_source"))
if len([]rune(source)) > 120 {
source = string([]rune(source)[:120])
}
if source == "" {
_ = s.store.RemoveSetting(r.Context(), "loginQuoteSource")
} else {
_ = s.store.SetSetting(r.Context(), "loginQuoteSource", source)
}
} }
_ = s.store.SetSetting(r.Context(), "diocese", diocese)
tenantValues := map[string]string{ tenantValues := map[string]string{
"planner.replaceExisting": boolSetting(r.FormValue("replace_existing")), "planner.replaceExisting": boolSetting(r.FormValue("replace_existing")),
@@ -113,8 +158,6 @@ func (s *Server) handleSettingsSave(w http.ResponseWriter, r *http.Request, user
return return
} }
} }
_ = s.store.SetSetting(r.Context(), "respectPreferredWeekdays", tenantValues["planner.respectPreferredWeekdays"])
_ = s.store.SetSetting(r.Context(), "fairnessWeight", tenantValues["planner.weightFairness"])
s.setFlash(w, "Einstellungen gespeichert.", "success") s.setFlash(w, "Einstellungen gespeichert.", "success")
s.redirect(w, r, "/settings") s.redirect(w, r, "/settings")
} }
+12 -8
View File
@@ -29,10 +29,16 @@
if (!table || !chips.length) return; if (!table || !chips.length) return;
var rows = Array.prototype.slice.call(table.querySelectorAll("[data-plan-row]")); var rows = Array.prototype.slice.call(table.querySelectorAll("[data-plan-row]"));
var empty = document.createElement("tr"); var tbody = table.querySelector("table.calendar-table tbody");
empty.className = "plan-filter-empty"; var empty = null;
empty.innerHTML = '<td colspan="99">Keine Tage passen zu diesem Filter.</td>'; if (tbody) {
empty.hidden = true; empty = document.createElement("tr");
empty.className = "plan-filter-empty";
empty.innerHTML = '<td colspan="99">Keine Tage passen zu diesem Filter.</td>';
empty.hidden = true;
tbody.appendChild(empty);
}
var mobileEmpty = table.querySelector("[data-plan-mobile-empty]");
function apply(filter) { function apply(filter) {
var visible = 0; var visible = 0;
@@ -48,10 +54,8 @@
row.hidden = !show; row.hidden = !show;
if (show) visible++; if (show) visible++;
}); });
empty.hidden = visible !== 0; if (empty) empty.hidden = visible !== 0;
if (visible === 0 && empty.parentNode !== table.tBodies[0]) { if (mobileEmpty) mobileEmpty.hidden = visible !== 0;
table.tBodies[0].appendChild(empty);
}
} }
chips.forEach(function (chip) { chips.forEach(function (chip) {
+129 -1
View File
@@ -301,7 +301,7 @@ hr { border: 0; border-top: 1px solid var(--line); margin: 1rem 0; }
.intro-stats strong { font-family: var(--serif); font-size: 1.55rem; line-height: 1; color: var(--green-dark); } .intro-stats strong { font-family: var(--serif); font-size: 1.55rem; line-height: 1; color: var(--green-dark); }
.intro-stats span { font-size: .68rem; color: var(--muted); text-transform: uppercase; letter-spacing: .08em; } .intro-stats span { font-size: .68rem; color: var(--muted); text-transform: uppercase; letter-spacing: .08em; }
.toolbar { display: flex; align-items: center; justify-content: space-between; gap: 1rem; flex-wrap: wrap; padding: .7rem .9rem; } .toolbar { position: relative; z-index: 5; display: flex; align-items: center; justify-content: space-between; gap: 1rem; flex-wrap: wrap; padding: .7rem .9rem; }
.toolbar-group { display: flex; align-items: center; gap: .45rem; flex-wrap: wrap; } .toolbar-group { display: flex; align-items: center; gap: .45rem; flex-wrap: wrap; }
.range-nav { gap: .35rem; } .range-nav { gap: .35rem; }
.range-form { display: flex; align-items: flex-end; gap: .45rem; flex-wrap: wrap; } .range-form { display: flex; align-items: flex-end; gap: .45rem; flex-wrap: wrap; }
@@ -475,6 +475,113 @@ hr { border: 0; border-top: 1px solid var(--line); margin: 1rem 0; }
.swatch.feast { background: #f0dfe0; } .swatch.feast { background: #f0dfe0; }
.swatch.open { background: var(--burgundy); border-color: var(--burgundy); } .swatch.open { background: var(--burgundy); border-color: var(--burgundy); }
/* Mobile Tageszusammenfassung (ersetzt die breite Tabelle auf kleinen Geräten) */
.plan-mobile-list { display: none; }
.plan-mobile-hint { padding: .55rem .75rem 0; color: var(--muted); font-size: .7rem; }
.plan-mobile-empty { padding: 1.5rem .9rem; text-align: center; }
.plan-day-card { border-bottom: 1px solid var(--line-soft); background: rgba(255, 253, 247, .55); }
.plan-day-card[hidden] { display: none !important; }
.plan-day-card:last-of-type { border-bottom: 0; }
.plan-day-card.is-sunday { background: rgba(248, 240, 218, .55); }
.plan-day-card.is-highfeast { background: rgba(124, 59, 63, .075); }
.plan-day-card.is-feast { background: rgba(194, 161, 77, .09); }
.plan-day-card.is-obligation { background: rgba(49, 94, 80, .06); }
.plan-day-summary {
list-style: none; cursor: pointer;
display: flex; align-items: center; gap: .65rem;
padding: .65rem .75rem;
transition: background .13s ease;
}
.plan-day-summary::-webkit-details-marker { display: none; }
.plan-day-summary:hover { background: rgba(239, 233, 217, .55); }
.plan-day-card[open] > .plan-day-summary { background: rgba(237, 228, 210, .38); }
.plan-day-summary .day-date { position: relative; display: flex; flex-direction: column; align-items: center; min-width: 46px; padding-left: .45rem; }
.plan-day-summary .date-number { font-size: 1.25rem; }
.plan-day-summary .date-meta { flex-direction: column; align-items: center; gap: 0; font-size: .58rem; margin-top: .05rem; }
.day-main { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: .18rem; }
.day-title { display: flex; align-items: flex-start; gap: .35rem; font-size: .81rem; line-height: 1.28; }
.day-title strong { font-weight: 650; }
.day-status { display: flex; flex-wrap: wrap; gap: .15rem .5rem; color: var(--muted); font-size: .68rem; }
.day-status-open { color: var(--burgundy); font-weight: 750; }
.day-status-ok { color: var(--green); font-weight: 650; }
.day-chevron {
flex: 0 0 auto; display: inline-flex; align-items: center; justify-content: center;
width: 25px; height: 25px; border-radius: 50%;
color: var(--muted); background: rgba(237, 228, 210, .65);
transition: transform .15s ease, background .15s ease;
}
.day-chevron .icon { width: 15px; height: 15px; }
.plan-day-card[open] .day-chevron { transform: rotate(90deg); background: var(--gold-soft); color: #6d5219; }
.day-details { display: flex; flex-direction: column; gap: .55rem; padding: .1rem .75rem .85rem; }
.day-readings { align-self: flex-start; margin-top: 0; }
.day-church { border: 1px solid var(--line-soft); border-radius: 10px; padding: .55rem .6rem; background: rgba(255, 253, 247, .78); }
.day-church-head { display: flex; align-items: center; gap: .45rem; margin-bottom: .4rem; }
.day-church-head .church-glyph { width: 34px; height: 25px; color: var(--green-dark); }
.day-church-head > span { display: flex; flex-direction: column; line-height: 1.15; }
.day-church-head strong { font-size: .75rem; color: var(--ink-soft); }
.day-church-head small { color: var(--muted); font-size: .63rem; }
.day-service-card { padding: .45rem .55rem; background: #fffdf7; border-color: var(--line-soft); }
.day-service-card .service-title { font-size: .8rem; }
.day-service-card .service-time { font-size: .68rem; }
.day-service-card .person-chip { font-size: .65rem; }
/* ---------- Plan timeline and presets ---------- */
.filter-form { display: flex; align-items: flex-end; gap: .4rem; }
.filter-form select { min-width: 160px; }
.preset-menu { position: relative; }
.preset-menu summary { list-style: none; cursor: pointer; }
.preset-menu summary::-webkit-details-marker { display: none; }
.preset-panel {
position: absolute; right: 0; top: calc(100% + .45rem); z-index: 30;
width: min(430px, 88vw); padding: .8rem;
display: flex; flex-direction: column; gap: .7rem;
border: 1px solid var(--line); border-radius: 12px;
background: #fffdf7; box-shadow: var(--shadow);
}
.preset-group { display: flex; flex-direction: column; gap: .3rem; }
.preset-links { display: grid; grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); gap: .3rem; }
.preset-link {
display: flex; flex-direction: column; gap: .08rem; padding: .35rem .5rem;
border: 1px solid var(--line-soft); border-radius: 8px;
color: var(--ink-soft); font-size: .78rem; font-weight: 650;
background: rgba(250, 246, 236, .7);
}
.preset-link:hover { border-color: var(--gold); background: #fffdf7; color: var(--ink); }
.preset-link small { color: var(--muted); font-size: .64rem; font-weight: 500; }
.plan-timeline { padding: .9rem 1.1rem 1rem; }
.timeline-head { display: flex; align-items: flex-start; justify-content: space-between; gap: 1rem; flex-wrap: wrap; margin-bottom: .7rem; }
.timeline-head h3 { font-size: 1rem; }
.timeline-legend { display: flex; align-items: center; gap: .35rem; color: var(--muted); font-size: .68rem; }
.timeline-dot { width: 10px; height: 10px; border-radius: 50%; background: #e7dfcd; display: inline-block; margin-left: .35rem; }
.timeline-dot.has-data { background: var(--green); }
.timeline { position: relative; }
.timeline-markers { position: relative; height: 48px; }
.timeline-marker { position: absolute; top: 0; transform: translateX(-50%); display: flex; flex-direction: column; align-items: center; gap: .12rem; }
.timeline-marker:nth-child(even) { top: 18px; }
.timeline-marker i { width: 2px; height: 9px; background: var(--gold); display: block; }
.timeline-marker em { font-style: normal; color: var(--muted); font-size: .61rem; white-space: nowrap; }
.timeline-marker.marker-calendar i { background: var(--burgundy); }
.timeline-track {
position: relative; height: 38px; border-radius: 8px; overflow: hidden;
border: 1px solid var(--line); background: #f4eee1;
}
.timeline-segment {
position: absolute; top: 0; bottom: 0;
display: flex; align-items: center; justify-content: center;
border-right: 1px solid rgba(255, 253, 247, .8);
color: #7a705b; font-size: .6rem; font-weight: 700;
background: repeating-linear-gradient(135deg, #eee7d6, #eee7d6 5px, #e9e1cd 5px, #e9e1cd 10px);
}
.timeline-segment.has-data {
color: #f7f3e8;
background: linear-gradient(180deg, #477363, #315e50);
}
.timeline-segment span { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; padding: 0 .18rem; }
.readings { display: inline-flex; align-items: center; gap: .2rem; text-decoration: none; }
.readings:hover { color: var(--green-dark); text-decoration: underline; }
.readings .icon { width: 11px; height: 11px; opacity: .7; }
/* ---------- Church overview ---------- */ /* ---------- Church overview ---------- */
.church-overview { display: grid; grid-template-columns: repeat(auto-fit, minmax(330px, 1fr)); gap: 1rem; } .church-overview { display: grid; grid-template-columns: repeat(auto-fit, minmax(330px, 1fr)); gap: 1rem; }
.church-card { border: 1px solid var(--line); border-radius: var(--radius); background: rgba(255, 253, 247, .88); box-shadow: var(--shadow-sm); padding: .9rem 1rem; } .church-card { border: 1px solid var(--line); border-radius: var(--radius); background: rgba(255, 253, 247, .88); box-shadow: var(--shadow-sm); padding: .9rem 1rem; }
@@ -736,8 +843,27 @@ hr { border: 0; border-top: 1px solid var(--line); margin: 1rem 0; }
.settings-grid { grid-template-columns: 1fr; } .settings-grid { grid-template-columns: 1fr; }
.data-summary { grid-template-columns: repeat(3, 1fr); } .data-summary { grid-template-columns: repeat(3, 1fr); }
} }
@media (max-width: 720px) {
.plan-table-desktop { display: none; }
.plan-mobile-list { display: flex; flex-direction: column; }
.plan-timeline { padding: .8rem .85rem .9rem; }
.timeline-legend { font-size: .62rem; }
.preset-menu { position: static; }
.preset-panel { left: .5rem; right: .5rem; top: auto; width: auto; max-height: 68vh; overflow-y: auto; }
}
@media (max-width: 640px) { @media (max-width: 640px) {
.content { padding: 1rem .8rem 1.6rem; } .content { padding: 1rem .8rem 1.6rem; }
.toolbar { flex-direction: column; align-items: stretch; gap: .6rem; }
.toolbar-group { width: 100%; justify-content: flex-start; }
.range-nav { justify-content: space-between; }
.range-nav > .icon-button { order: 1; }
.range-form { order: 3; width: 100%; display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: .4rem; }
.range-form .btn { grid-column: 1 / -1; }
.filter-form { width: 100%; }
.filter-form .field-inline { flex: 1; }
.filter-form select { min-width: 0; width: 100%; }
.plan-legend { flex-direction: column; align-items: stretch; gap: .45rem; }
.preset-panel { left: .4rem; right: .4rem; }
.topbar { padding: .8rem .8rem; } .topbar { padding: .8rem .8rem; }
.topbar-title h1 { font-size: 1.3rem; } .topbar-title h1 { font-size: 1.3rem; }
.account-text { display: none; } .account-text { display: none; }
@@ -764,6 +890,8 @@ hr { border: 0; border-top: 1px solid var(--line); margin: 1rem 0; }
body { background: #fff; } body { background: #fff; }
.card, .calendar-card { box-shadow: none; border-color: #bbb; } .card, .calendar-card { box-shadow: none; border-color: #bbb; }
.calendar-table { min-width: 0; font-size: 9pt; } .calendar-table { min-width: 0; font-size: 9pt; }
.plan-mobile-list { display: none !important; }
.plan-table-desktop { display: block !important; }
} }
@media (prefers-reduced-motion: reduce) { @media (prefers-reduced-motion: reduce) {
+73 -3
View File
@@ -34,6 +34,7 @@ type teamPageData struct {
ChurchByID map[string]domain.Church ChurchByID map[string]domain.Church
Stats map[string]domain.PersonStat Stats map[string]domain.PersonStat
CanEdit bool CanEdit bool
CanManageAll bool
ActiveCount int ActiveCount int
LectorCount int LectorCount int
HelperCount int HelperCount int
@@ -55,6 +56,7 @@ type personPageData struct {
Stats domain.PersonStat Stats domain.PersonStat
Weekdays []weekdayOption Weekdays []weekdayOption
CanEdit bool CanEdit bool
CanManageAll bool
UpcomingCount int UpcomingCount int
TotalCount int TotalCount int
Year int Year int
@@ -66,16 +68,42 @@ func (s *Server) handleTeam(w http.ResponseWriter, r *http.Request, user *store.
s.renderNoTenant(w, r) s.renderNoTenant(w, r)
return return
} }
canManageAll := s.store.CanEditTenant(r.Context(), user, tenant.ID)
people, err := s.store.People(r.Context(), tenant.ID) people, err := s.store.People(r.Context(), tenant.ID)
if err != nil { if err != nil {
s.renderError(w, r, http.StatusInternalServerError, "Team", err.Error()) s.renderError(w, r, http.StatusInternalServerError, "Team", err.Error())
return return
} }
if !canManageAll {
linkedID, linked := user.LinkedPerson(tenant.ID)
if !linked {
s.renderError(w, r, http.StatusForbidden, "Nur für Redakteure",
"Die Teamdaten sind nur für Redakteure sichtbar. Ihr Leser-Konto ist mit keiner Person verknüpft.")
return
}
filtered := people[:0]
for _, person := range people {
if person.ID == linkedID {
filtered = append(filtered, person)
}
}
people = filtered
}
absences, err := s.store.Absences(r.Context(), tenant.ID) absences, err := s.store.Absences(r.Context(), tenant.ID)
if err != nil { if err != nil {
s.renderError(w, r, http.StatusInternalServerError, "Abwesenheiten", err.Error()) s.renderError(w, r, http.StatusInternalServerError, "Abwesenheiten", err.Error())
return return
} }
if !canManageAll {
linkedID, _ := user.LinkedPerson(tenant.ID)
filtered := absences[:0]
for _, absence := range absences {
if absence.PersonID == linkedID {
filtered = append(filtered, absence)
}
}
absences = filtered
}
churches, err := s.store.Churches(r.Context(), tenant.ID) churches, err := s.store.Churches(r.Context(), tenant.ID)
if err != nil { if err != nil {
s.renderError(w, r, http.StatusInternalServerError, "Kirchen", err.Error()) s.renderError(w, r, http.StatusInternalServerError, "Kirchen", err.Error())
@@ -113,7 +141,7 @@ func (s *Server) handleTeam(w http.ResponseWriter, r *http.Request, user *store.
page := teamPageData{ page := teamPageData{
People: people, PeopleByID: peopleByID, Absences: absences, AbsencesByPerson: absencesByPerson, People: people, PeopleByID: peopleByID, Absences: absences, AbsencesByPerson: absencesByPerson,
Churches: churches, ChurchByID: churchByID, Stats: statByPerson, Churches: churches, ChurchByID: churchByID, Stats: statByPerson,
CanEdit: s.store.CanEditTenant(r.Context(), user, tenant.ID), Year: year, CanEdit: canManageAll, CanManageAll: canManageAll, Year: year,
} }
for _, person := range people { for _, person := range people {
if person.Active { if person.Active {
@@ -156,6 +184,15 @@ func (s *Server) handlePerson(w http.ResponseWriter, r *http.Request, user *stor
} }
person = *loaded person = *loaded
} }
canManageAll := s.store.CanEditTenant(r.Context(), user, tenant.ID)
if !canManageAll {
linkedID, linked := user.LinkedPerson(tenant.ID)
if isNew || !linked || linkedID != person.ID {
s.renderError(w, r, http.StatusForbidden, "Keine Berechtigung",
"Sie dürfen nur die Daten der mit Ihrem Konto verknüpften Person einsehen.")
return
}
}
absences, err := s.store.AbsencesForPerson(r.Context(), tenant.ID, person.ID) absences, err := s.store.AbsencesForPerson(r.Context(), tenant.ID, person.ID)
if err != nil { if err != nil {
s.renderError(w, r, http.StatusInternalServerError, "Abwesenheiten", err.Error()) s.renderError(w, r, http.StatusInternalServerError, "Abwesenheiten", err.Error())
@@ -210,7 +247,7 @@ func (s *Server) handlePerson(w http.ResponseWriter, r *http.Request, user *stor
page := personPageData{ page := personPageData{
Person: person, IsNew: isNew, Absences: absences, Churches: churches, Person: person, IsNew: isNew, Absences: absences, Churches: churches,
Assignments: rows, Weekdays: weekdays, Assignments: rows, Weekdays: weekdays,
CanEdit: s.store.CanEditTenant(r.Context(), user, tenant.ID), CanEdit: canManageAll || !isNew, CanManageAll: canManageAll,
UpcomingCount: upcoming, TotalCount: len(rows), Year: domain.Year(today), UpcomingCount: upcoming, TotalCount: len(rows), Year: domain.Year(today),
PreferredChurches: map[string]domain.Church{}, PreferredChurches: map[string]domain.Church{},
} }
@@ -246,12 +283,25 @@ func (s *Server) handlePersonSave(w http.ResponseWriter, r *http.Request, user *
if id == "" || id == "new" { if id == "" || id == "new" {
id = domain.NewID() id = domain.NewID()
} }
canManageAll := s.store.CanEditTenant(r.Context(), user, tenant.ID)
var existing *domain.Person
if !canManageAll {
loaded, err := s.store.Person(r.Context(), tenant.ID, id)
if err != nil {
s.renderError(w, r, http.StatusForbidden, "Keine Berechtigung", "Diese Person kann nicht bearbeitet werden.")
return
}
existing = loaded
}
var roles []domain.Role var roles []domain.Role
for _, role := range domain.AllRoles { for _, role := range domain.AllRoles {
if r.FormValue("role_"+string(role)) == "1" || r.FormValue("role_"+string(role)) == "on" { if r.FormValue("role_"+string(role)) == "1" || r.FormValue("role_"+string(role)) == "on" {
roles = append(roles, role) roles = append(roles, role)
} }
} }
if existing != nil {
roles = existing.Roles
}
if len(roles) == 0 { if len(roles) == 0 {
s.setFlash(w, "Bitte mindestens eine Rolle auswählen.", "error") s.setFlash(w, "Bitte mindestens eine Rolle auswählen.", "error")
s.redirectBack(w, r, "/team/person/"+id) s.redirectBack(w, r, "/team/person/"+id)
@@ -272,6 +322,9 @@ func (s *Server) handlePersonSave(w http.ResponseWriter, r *http.Request, user *
person.PreferredWeekdays = append(person.PreferredWeekdays, value) person.PreferredWeekdays = append(person.PreferredWeekdays, value)
} }
} }
if existing != nil {
person.Active = existing.Active
}
if err := s.store.UpsertPerson(r.Context(), tenant.ID, person); err != nil { if err := s.store.UpsertPerson(r.Context(), tenant.ID, person); err != nil {
s.setFlash(w, "Die Person konnte nicht gespeichert werden: "+err.Error(), "error") s.setFlash(w, "Die Person konnte nicht gespeichert werden: "+err.Error(), "error")
s.redirectBack(w, r, "/team/person/"+id) s.redirectBack(w, r, "/team/person/"+id)
@@ -318,7 +371,24 @@ func (s *Server) handleAbsenceSave(w http.ResponseWriter, r *http.Request, user
} }
func (s *Server) handleAbsenceDelete(w http.ResponseWriter, r *http.Request, user *store.User, session *store.Session, tenant *store.Tenant) { func (s *Server) handleAbsenceDelete(w http.ResponseWriter, r *http.Request, user *store.User, session *store.Session, tenant *store.Tenant) {
if err := s.store.DeleteAbsence(r.Context(), tenant.ID, strings.TrimSpace(r.FormValue("id"))); err != nil { absenceID := strings.TrimSpace(r.FormValue("id"))
if !s.store.CanEditTenant(r.Context(), user, tenant.ID) {
absences, err := s.store.AbsencesForPerson(r.Context(), tenant.ID, r.PathValue("id"))
allowed := false
if err == nil {
for _, absence := range absences {
if absence.ID == absenceID {
allowed = true
break
}
}
}
if !allowed {
s.renderError(w, r, http.StatusForbidden, "Keine Berechtigung", "Diese Abwesenheit gehört nicht zu Ihrer Person.")
return
}
}
if err := s.store.DeleteAbsence(r.Context(), tenant.ID, absenceID); err != nil {
s.setFlash(w, "Die Abwesenheit konnte nicht gelöscht werden.", "error") s.setFlash(w, "Die Abwesenheit konnte nicht gelöscht werden.", "error")
} else { } else {
s.setFlash(w, "Abwesenheit gelöscht.", "success") s.setFlash(w, "Abwesenheit gelöscht.", "success")
+26 -1
View File
@@ -35,7 +35,10 @@
{{range .TenantIDs}}{{$tenant := index $.Data.TenantsByID .}}{{if $tenant}}<span class="badge badge-neutral">{{$tenant.Name}}</span>{{end}}{{else}}<span class="muted">keine Freigabe</span>{{end}} {{range .TenantIDs}}{{$tenant := index $.Data.TenantsByID .}}{{if $tenant}}<span class="badge badge-neutral">{{$tenant.Name}}</span>{{end}}{{else}}<span class="muted">keine Freigabe</span>{{end}}
{{end}} {{end}}
</td> </td>
<td>{{if .Active}}<span class="badge badge-green">aktiv</span>{{else}}<span class="badge badge-neutral">deaktiviert</span>{{end}}</td> <td>
{{if .Active}}<span class="badge badge-green">aktiv</span>{{else}}<span class="badge badge-neutral">deaktiviert</span>{{end}}
{{if .MustChangePassword}}<span class="badge badge-gold">Passwortwechsel offen</span>{{end}}
</td>
<td> <td>
<div class="row-actions"> <div class="row-actions">
<a class="icon-button" href="/admin/users?edit={{.ID}}" title="Konto bearbeiten">{{icon "settings"}}</a> <a class="icon-button" href="/admin/users?edit={{.ID}}" title="Konto bearbeiten">{{icon "settings"}}</a>
@@ -61,11 +64,25 @@
<label class="field"><span class="field-label">Benutzername</span><input type="text" name="username" value="{{if $edit}}{{$edit.Username}}{{end}}" required autocomplete="off"></label> <label class="field"><span class="field-label">Benutzername</span><input type="text" name="username" value="{{if $edit}}{{$edit.Username}}{{end}}" required autocomplete="off"></label>
<label class="field"><span class="field-label">Anzeigename</span><input type="text" name="display_name" value="{{if $edit}}{{$edit.DisplayName}}{{end}}" required></label> <label class="field"><span class="field-label">Anzeigename</span><input type="text" name="display_name" value="{{if $edit}}{{$edit.DisplayName}}{{end}}" required></label>
<label class="field"><span class="field-label">Passwort {{if $edit}}<small>leer lassen = unverändert</small>{{end}}</span><input type="password" name="password" {{if not $edit}}required{{end}} autocomplete="new-password" placeholder="mindestens 6 Zeichen"></label> <label class="field"><span class="field-label">Passwort {{if $edit}}<small>leer lassen = unverändert</small>{{end}}</span><input type="password" name="password" {{if not $edit}}required{{end}} autocomplete="new-password" placeholder="mindestens 6 Zeichen"></label>
{{if $edit}}
<label class="check"><input type="checkbox" name="force_password_change" value="1"><span>Passwortänderung bei der nächsten Anmeldung erzwingen</span></label>
{{end}}
<label class="field"><span class="field-label">Rolle</span> <label class="field"><span class="field-label">Rolle</span>
<select name="role"> <select name="role">
{{range .Data.Roles}}<option value="{{printf "%s" .}}" {{if eq (printf "%s" .) $editRole}}selected{{end}}>{{userRole .}}</option>{{end}} {{range .Data.Roles}}<option value="{{printf "%s" .}}" {{if eq (printf "%s" .) $editRole}}selected{{end}}>{{userRole .}}</option>{{end}}
</select> </select>
</label> </label>
<label class="field"><span class="field-label">Verknüpfte Person <small>nur für Leser-Konten</small></span>
<select name="linked_person">
<option value="">— keine Verknüpfung —</option>
{{$linkedTenant := ""}}{{$linkedPerson := ""}}
{{if $edit}}{{$linkedTenant = $edit.LinkedTenantID}}{{$linkedPerson = $edit.LinkedPersonID}}{{end}}
{{range .Data.PersonOptions}}
<option value="{{.TenantID}}::{{.ID}}" {{if and (eq .TenantID $linkedTenant) (eq .ID $linkedPerson)}}selected{{end}}>{{.Label}} · {{.TenantName}}</option>
{{end}}
</select>
</label>
<p class="field-hint">Ein verknüpftes Leser-Konto darf die Stammdaten, Präferenzen und Abwesenheiten dieser Person selbst bearbeiten.</p>
<div class="field-group"> <div class="field-group">
<span class="field-label">Mandantenfreigaben</span> <span class="field-label">Mandantenfreigaben</span>
<p class="field-hint">Administratoren sehen automatisch alle Mandanten.</p> <p class="field-hint">Administratoren sehen automatisch alle Mandanten.</p>
@@ -81,6 +98,14 @@
<button class="btn btn-primary" type="submit">{{if $edit}}Konto speichern{{else}}Konto anlegen{{end}}</button> <button class="btn btn-primary" type="submit">{{if $edit}}Konto speichern{{else}}Konto anlegen{{end}}</button>
{{if $edit}}<a class="text-link" href="/admin/users">Neues Konto anlegen</a>{{end}} {{if $edit}}<a class="text-link" href="/admin/users">Neues Konto anlegen</a>{{end}}
</form> </form>
{{if $edit}}
<form method="post" action="/admin/users/reset-password" class="form-stack compact reset-password-form" data-confirm="Passwort für „{{$edit.Username}}“ zurücksetzen? Das bisherige Passwort wird ungültig.">
<input type="hidden" name="csrf" value="{{.CSRF}}">
<input type="hidden" name="id" value="{{$edit.ID}}">
<div class="field-hint">Erzeugt ein temporäres Passwort und erzwingt beim nächsten Anmelden eine Änderung.</div>
<button class="btn btn-secondary btn-small" type="submit">Passwort zurücksetzen</button>
</form>
{{end}}
</aside> </aside>
</div> </div>
</div> </div>
+3 -3
View File
@@ -20,8 +20,8 @@
</div> </div>
<div class="auth-quote"> <div class="auth-quote">
<span class="quote-mark">„</span> <span class="quote-mark">„</span>
<p>Jeder Sonntag braucht Menschen, die das Wort tragen und die Gemeinschaft begleiten.</p> <p>{{.LoginQuote}}</p>
<span class="quote-source">Pfarreiengemeinschaft Bad Godesberg</span> {{if .LoginQuoteSource}}<span class="quote-source">{{.LoginQuoteSource}}</span>{{end}}
</div> </div>
<div class="auth-badges"> <div class="auth-badges">
<span class="badge badge-gold">Kalender</span> <span class="badge badge-gold">Kalender</span>
@@ -34,7 +34,7 @@
<div class="auth-form-head"> <div class="auth-form-head">
<span class="eyebrow">Willkommen zurück</span> <span class="eyebrow">Willkommen zurück</span>
<h2>Anmelden</h2> <h2>Anmelden</h2>
<p>Bitte melden Sie sich mit Ihrem Konto an. Administratoren, Redakteure und Leser sehen jeweils die ihnen freigegebenen Mandanten.</p> <p>Bitte melden Sie sich mit Ihrem Konto an. Administratoren, Redakteure und Leser sehen jeweils die ihnen freigegebenen Mandanten. Beim ersten Anmelden vergibt jedes Konto ein eigenes Passwort.</p>
</div> </div>
<form method="post" action="/login" class="form-stack" autocomplete="on"> <form method="post" action="/login" class="form-stack" autocomplete="on">
<input type="hidden" name="next" value="{{.Data.Next}}"> <input type="hidden" name="next" value="{{.Data.Next}}">
+28
View File
@@ -0,0 +1,28 @@
{{define "content"}}
<div class="page-stack narrow-page">
<section class="page-intro">
<div>
<span class="eyebrow">Konto</span>
<h2>Passwort ändern</h2>
{{if .Data.Forced}}
<p>Ihr Konto wurde mit einem initialen Passwort angelegt. Bitte vergeben Sie jetzt ein eigenes Passwort, bevor Sie weiterarbeiten.</p>
{{else}}
<p>Vergeben Sie hier ein neues Passwort für Ihr Konto.</p>
{{end}}
</div>
</section>
<section class="card">
<form method="post" action="/password" class="form-stack">
<input type="hidden" name="csrf" value="{{.CSRF}}">
<label class="field"><span class="field-label">Aktuelles Passwort</span><input type="password" name="current_password" required autocomplete="current-password" autofocus></label>
<label class="field"><span class="field-label">Neues Passwort <small>mindestens 6 Zeichen</small></span><input type="password" name="new_password" required minlength="6" autocomplete="new-password"></label>
<label class="field"><span class="field-label">Neues Passwort wiederholen</span><input type="password" name="confirm_password" required minlength="6" autocomplete="new-password"></label>
<div class="form-actions">
<button class="btn btn-primary" type="submit">Passwort speichern</button>
{{if not .Data.Forced}}<a class="btn btn-ghost" href="/plan">Abbrechen</a>{{end}}
</div>
</form>
</section>
</div>
{{end}}
+4 -4
View File
@@ -19,7 +19,7 @@
</div> </div>
<div class="detail-hero-actions"> <div class="detail-hero-actions">
<a class="btn btn-ghost btn-small" href="/team">{{icon "users"}} Zum Team</a> <a class="btn btn-ghost btn-small" href="/team">{{icon "users"}} Zum Team</a>
{{if and .Data.CanEdit (not .Data.IsNew)}} {{if and .Data.CanManageAll (not .Data.IsNew)}}
<form method="post" action="/team/person/{{$person.ID}}/delete" data-confirm="Person mit allen Einteilungen und Abwesenheiten löschen?"> <form method="post" action="/team/person/{{$person.ID}}/delete" data-confirm="Person mit allen Einteilungen und Abwesenheiten löschen?">
<input type="hidden" name="csrf" value="{{.CSRF}}"> <input type="hidden" name="csrf" value="{{.CSRF}}">
<button class="btn btn-danger btn-small" type="submit">{{icon "trash"}} Löschen</button> <button class="btn btn-danger btn-small" type="submit">{{icon "trash"}} Löschen</button>
@@ -46,8 +46,8 @@
<div class="field-group"> <div class="field-group">
<span class="field-label">Dienste</span> <span class="field-label">Dienste</span>
<div class="checkbox-row"> <div class="checkbox-row">
<label class="check"><input type="checkbox" name="role_lector" value="1" {{if roleChecked $person "lector"}}checked{{end}}><span>Lektor</span></label> <label class="check"><input type="checkbox" name="role_lector" value="1" {{if roleChecked $person "lector"}}checked{{end}} {{if not .Data.CanManageAll}}disabled{{end}}><span>Lektor</span></label>
<label class="check"><input type="checkbox" name="role_helper" value="1" {{if roleChecked $person "helper"}}checked{{end}}><span>Kommunionhelfer</span></label> <label class="check"><input type="checkbox" name="role_helper" value="1" {{if roleChecked $person "helper"}}checked{{end}} {{if not .Data.CanManageAll}}disabled{{end}}><span>Kommunionhelfer</span></label>
</div> </div>
</div> </div>
<div class="field-group"> <div class="field-group">
@@ -70,7 +70,7 @@
<div class="form-row"> <div class="form-row">
<label class="field"><span class="field-label">Monatslimit <small>0 = kein Limit</small></span><input type="number" name="max_per_month" min="0" max="30" value="{{$person.MaxPerMonth}}"></label> <label class="field"><span class="field-label">Monatslimit <small>0 = kein Limit</small></span><input type="number" name="max_per_month" min="0" max="30" value="{{$person.MaxPerMonth}}"></label>
<label class="field"><span class="field-label">Status</span> <label class="field"><span class="field-label">Status</span>
<label class="check standalone"><input type="checkbox" name="active" value="1" {{if $person.Active}}checked{{end}}><span>aktiv und planbar</span></label> <label class="check standalone"><input type="checkbox" name="active" value="1" {{if $person.Active}}checked{{end}} {{if not .Data.CanManageAll}}disabled{{end}}><span>aktiv und planbar</span></label>
</label> </label>
</div> </div>
<label class="field"><span class="field-label">Notizen</span><textarea name="notes" rows="3">{{$person.Notes}}</textarea></label> <label class="field"><span class="field-label">Notizen</span><textarea name="notes" rows="3">{{$person.Notes}}</textarea></label>
+143 -6
View File
@@ -2,21 +2,72 @@
<div class="page-stack"> <div class="page-stack">
<section class="toolbar card"> <section class="toolbar card">
<div class="toolbar-group range-nav"> <div class="toolbar-group range-nav">
<a class="icon-button" href="/plan?start={{.Data.PrevStart}}&amp;end={{.Data.PrevEnd}}" title="Vorheriger Monat">{{icon "left"}}</a> <a class="icon-button" href="/plan?start={{.Data.PrevStart}}&amp;end={{.Data.PrevEnd}}{{if .Data.PersonFilter}}&amp;person={{.Data.PersonFilter}}{{end}}" title="Vorheriger Monat">{{icon "left"}}</a>
<form class="range-form" method="get" action="/plan"> <form class="range-form" method="get" action="/plan">
<label class="field field-inline"><span>Von</span><input type="date" name="start" value="{{.Data.Start}}"></label> <label class="field field-inline"><span>Von</span><input type="date" name="start" value="{{.Data.Start}}"></label>
<label class="field field-inline"><span>Bis</span><input type="date" name="end" value="{{.Data.End}}"></label> <label class="field field-inline"><span>Bis</span><input type="date" name="end" value="{{.Data.End}}"></label>
{{if .Data.PersonFilter}}<input type="hidden" name="person" value="{{.Data.PersonFilter}}">{{end}}
<button class="btn btn-secondary btn-small" type="submit">Anzeigen</button> <button class="btn btn-secondary btn-small" type="submit">Anzeigen</button>
</form> </form>
<a class="icon-button" href="/plan?start={{.Data.NextStart}}&amp;end={{.Data.NextEnd}}" title="Nächster Monat">{{icon "right"}}</a> <a class="icon-button" href="/plan?start={{.Data.NextStart}}&amp;end={{.Data.NextEnd}}{{if .Data.PersonFilter}}&amp;person={{.Data.PersonFilter}}{{end}}" title="Nächster Monat">{{icon "right"}}</a>
</div> </div>
<div class="toolbar-group"> <div class="toolbar-group">
<a class="chip" href="/plan">Dieser Monat</a> {{if .Data.FilterPeople}}
<a class="chip" href="/plan?start={{.Data.PresetFourStart}}&amp;end={{.Data.PresetFourEnd}}">Nächste 4 Wochen</a> <form class="filter-form" method="get" action="/plan">
<input type="hidden" name="start" value="{{.Data.Start}}">
<input type="hidden" name="end" value="{{.Data.End}}">
<label class="field field-inline"><span>Person</span>
<select name="person" onchange="this.form.submit()">
<option value="">Alle Personen</option>
{{range .Data.FilterPeople}}<option value="{{.ID}}" {{if eq .ID $.Data.PersonFilter}}selected{{end}}>{{.FullName}}</option>{{end}}
</select>
</label>
<noscript><button class="btn btn-secondary btn-small" type="submit">Filtern</button></noscript>
</form>
{{end}}
<a class="chip" href="/plan{{if .Data.PersonFilter}}?person={{.Data.PersonFilter}}{{end}}">Dieser Monat</a>
<a class="chip" href="/plan?start={{.Data.PresetFourStart}}&amp;end={{.Data.PresetFourEnd}}{{if .Data.PersonFilter}}&amp;person={{.Data.PersonFilter}}{{end}}">Nächste 4 Wochen</a>
<details class="preset-menu">
<summary class="chip">{{icon "calendar"}} Zeitraum-Presets</summary>
<div class="preset-panel">
{{range .Data.Presets}}
<div class="preset-group">
<span class="field-caption">{{.Label}}</span>
<div class="preset-links">
{{range .Presets}}<a class="preset-link" href="/plan?start={{.Start}}&amp;end={{.End}}{{if $.Data.PersonFilter}}&amp;person={{$.Data.PersonFilter}}{{end}}">{{.Label}}<small>{{.Start}} – {{.End}}</small></a>{{end}}
</div>
</div>
{{end}}
</div>
</details>
<a class="chip" href="/statistics?start={{.Data.Start}}&amp;end={{.Data.End}}">{{icon "chart"}} Statistik</a> <a class="chip" href="/statistics?start={{.Data.Start}}&amp;end={{.Data.End}}">{{icon "chart"}} Statistik</a>
</div> </div>
</section> </section>
<section class="card plan-timeline">
<div class="timeline-head">
<div><span class="eyebrow">Zeitstrahl</span><h3>Kalender- und Kirchenjahr</h3></div>
<span class="timeline-legend"><i class="timeline-dot has-data"></i> Planungsdaten vorhanden <i class="timeline-dot"></i> ohne Daten</span>
</div>
<div class="timeline">
<div class="timeline-markers">
{{range .Data.Timeline.Markers}}
<span class="timeline-marker marker-{{.Kind}}" style="left:{{.Left}}%" title="{{.Label}} · {{.Date}}">
<i></i><em>{{.Label}}</em>
</span>
{{end}}
</div>
<div class="timeline-track">
{{range .Data.Timeline.Segments}}
<span class="timeline-segment {{if .HasData}}has-data{{end}}" style="left:{{.Left}}%;width:{{.Width}}%" title="{{.Title}}">
<span>{{.Label}}</span>
</span>
{{end}}
</div>
</div>
{{if not .Data.Timeline.HasData}}<p class="empty-note">Im gewählten Zeitraum liegen noch keine Planungsdaten vor.</p>{{end}}
</section>
<section class="range-banner"> <section class="range-banner">
<div> <div>
<span class="eyebrow">Planungszeitraum</span> <span class="eyebrow">Planungszeitraum</span>
@@ -80,7 +131,7 @@
</div> </div>
<section class="calendar-card" data-plan-table> <section class="calendar-card" data-plan-table>
<div class="table-scroll"> <div class="table-scroll plan-table-desktop">
<table class="calendar-table"> <table class="calendar-table">
<thead> <thead>
<tr> <tr>
@@ -120,7 +171,7 @@
{{if .LiturgicalDay.IsObligation}}<span class="badge badge-burgundy">geboten</span>{{end}} {{if .LiturgicalDay.IsObligation}}<span class="badge badge-burgundy">geboten</span>{{end}}
</div> </div>
{{if not .LiturgicalDay.Readings.IsEmpty}} {{if not .LiturgicalDay.Readings.IsEmpty}}
<div class="readings" title="{{.LiturgicalDay.Readings.FullLabel}}">{{.LiturgicalDay.Readings.ShortLabel}}</div> <a class="readings" href="https://schott.erzabtei-beuron.de/?datum={{isoDate .Date}}" target="_blank" rel="noopener" title="{{.LiturgicalDay.Readings.FullLabel}} · Tageslesungen bei Schott öffnen">{{.LiturgicalDay.Readings.ShortLabel}}{{icon "external"}}</a>
{{end}} {{end}}
{{if .LiturgicalDay.Remark}}<div class="liturgy-remark">{{.LiturgicalDay.Remark}}</div>{{end}} {{if .LiturgicalDay.Remark}}<div class="liturgy-remark">{{.LiturgicalDay.Remark}}</div>{{end}}
{{else}} {{else}}
@@ -158,6 +209,92 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="plan-mobile-list">
<p class="plan-mobile-hint">Tippen Sie auf einen Tag, um die Gottesdienste und Einteilungen zu sehen.</p>
{{range $row := .Data.Rows}}
<details class="plan-day-card {{if .IsHighFeast}}is-highfeast{{else if .IsSunday}}is-sunday{{else if .IsObligation}}is-obligation{{else if .IsFeast}}is-feast{{end}}"
data-plan-row
data-has-services="{{if .HasServices}}true{{else}}false{{end}}"
data-open="{{.OpenSlots}}"
data-special="{{if .IsSpecialDay}}true{{else}}false{{end}}">
<summary class="plan-day-summary">
<span class="day-date">
<span class="date-number">{{dayNumber $row.Date}}</span>
<span class="date-meta"><span>{{shortWeekday $row.Date}}</span><span>{{shortMonth $row.Date}}</span></span>
{{if $row.LiturgicalDay}}<span class="liturgical-bar" style="background:{{liturgicalColor $row.LiturgicalDay}}"></span>{{end}}
</span>
<span class="day-main">
<span class="day-title">
{{if $row.LiturgicalDay}}
{{feastGlyph $row.LiturgicalDay.Symbol}}
<strong>{{$row.LiturgicalDay.DisplayTitle}}</strong>
{{else}}
<strong>Keine Liturgie hinterlegt</strong>
{{end}}
</span>
{{if $row.LiturgicalDay}}
<span class="liturgy-meta">
{{if $row.LiturgicalDay.BadgeText}}<span class="badge badge-rank rank-{{$row.LiturgicalDay.Rank.ShortLabel}}">{{$row.LiturgicalDay.BadgeText}}</span>{{end}}
{{if $row.LiturgicalDay.IsObligation}}<span class="badge badge-burgundy">geboten</span>{{end}}
</span>
{{end}}
<span class="day-status">
{{if $row.HasServices}}
<span>{{len $row.Services}} {{plural (len $row.Services) "Gottesdienst" "Gottesdienste"}}</span>
{{if gt $row.OpenSlots 0}}
<span class="day-status-open">{{$row.OpenSlots}} {{plural $row.OpenSlots "Dienst offen" "Dienste offen"}}</span>
{{else}}
<span class="day-status-ok">vollständig besetzt</span>
{{end}}
{{else}}
<span class="day-status-empty">Keine Gottesdienste</span>
{{end}}
</span>
</span>
<span class="day-chevron" aria-hidden="true">{{icon "right"}}</span>
</summary>
<div class="day-details">
{{if $row.LiturgicalDay}}
{{if not $row.LiturgicalDay.Readings.IsEmpty}}
<a class="readings day-readings" href="https://schott.erzabtei-beuron.de/?datum={{isoDate $row.Date}}" target="_blank" rel="noopener" title="{{$row.LiturgicalDay.Readings.FullLabel}} · Tageslesungen bei Schott öffnen">{{$row.LiturgicalDay.Readings.ShortLabel}}{{icon "external"}}</a>
{{end}}
{{if $row.LiturgicalDay.Remark}}<div class="liturgy-remark">{{$row.LiturgicalDay.Remark}}</div>{{end}}
{{end}}
{{range $.Data.Churches}}
{{$church := .}}
{{$services := $row.ServicesForChurch $church.ID}}
{{if $services}}
<div class="day-church">
<div class="day-church-head">
{{churchGlyph .Symbol .ColorHex}}
<span><strong>{{.ShortName}}</strong><small>{{.Name}}</small></span>
</div>
<div class="service-stack">
{{range $services}}
<a class="service-card day-service-card {{if .IsFullyStaffed}}staffed{{else}}open{{end}}" href="/services/{{.Service.ID}}?start={{$.Data.Start}}&amp;end={{$.Data.End}}">
<span class="service-time">{{timeLabel .Service.TimeMinutes}}</span>
<span class="service-title">{{.Service.Title}}{{if eq (printf "%s" .Service.Kind) "special"}}<span class="service-kind">Sonder</span>{{end}}</span>
{{if .Service.Location}}<span class="service-location">{{deref .Service.Location}}</span>{{end}}
<span class="service-people">
{{range .Assignments}}
{{$person := index $.Data.People .PersonID}}
<span class="person-chip role-{{roleShort .Role}}" title="{{roleTitle .Role}}{{if $person}} · {{$person.FullName}}{{end}}">{{if $person}}{{$person.AbbreviatedName}}{{else}}?{{end}}</span>
{{end}}
</span>
{{if not .IsFullyStaffed}}<span class="open-badge">{{plural .OpenSlots "Platz offen" "Plätze offen"}}</span>{{end}}
</a>
{{end}}
</div>
</div>
{{end}}
{{end}}
{{if not $row.HasServices}}<p class="empty-note">Für diesen Tag sind keine Gottesdienste eingetragen.</p>{{end}}
</div>
</details>
{{end}}
<p class="plan-mobile-empty empty-note" data-plan-mobile-empty hidden>Keine Tage passen zu diesem Filter.</p>
</div>
</section> </section>
<p class="table-note">Klicken Sie auf einen Gottesdienst, um Einteilungen zu ändern oder Vorschläge zu sehen. Kirchennamen erscheinen als Tooltip.</p> <p class="table-note">Klicken Sie auf einen Gottesdienst, um Einteilungen zu ändern oder Vorschläge zu sehen. Kirchennamen erscheinen als Tooltip.</p>
</div> </div>
+29
View File
@@ -13,6 +13,7 @@
<form method="post" action="/settings/save" class="page-stack"> <form method="post" action="/settings/save" class="page-stack">
<input type="hidden" name="csrf" value="{{.CSRF}}"> <input type="hidden" name="csrf" value="{{.CSRF}}">
{{if .Data.IsAdmin}}
<section class="card"> <section class="card">
<div class="card-head"><div><span class="eyebrow">Liturgie</span><h3>Kalenderquelle</h3></div></div> <div class="card-head"><div><span class="eyebrow">Liturgie</span><h3>Kalenderquelle</h3></div></div>
<div class="settings-grid"> <div class="settings-grid">
@@ -34,6 +35,21 @@
</div> </div>
</section> </section>
<section class="card">
<div class="card-head"><div><span class="eyebrow">Website</span><h3>Anmeldeseite</h3></div></div>
<div class="settings-grid">
<div class="settings-copy">
<h4>Spruch unter dem Logo</h4>
<p>Dieser Text erscheint auf der Anmeldeseite unter dem Logo. Leere Felder stellen den Standardtext wieder her.</p>
</div>
<div class="settings-fields">
<label class="field"><span class="field-label">Spruch</span><textarea name="login_quote" rows="3" maxlength="240">{{.Data.LoginQuote}}</textarea></label>
<label class="field"><span class="field-label">Quellenangabe <small>optional</small></span><input type="text" name="login_quote_source" value="{{.Data.LoginQuoteSource}}" maxlength="120"></label>
</div>
</div>
</section>
{{end}}
<section class="card"> <section class="card">
<div class="card-head"><div><span class="eyebrow">Planung</span><h3>Regeln und Gewichtung</h3></div></div> <div class="card-head"><div><span class="eyebrow">Planung</span><h3>Regeln und Gewichtung</h3></div></div>
<div class="settings-grid"> <div class="settings-grid">
@@ -58,6 +74,19 @@
</section> </section>
</form> </form>
<section class="card">
<div class="card-head"><div><span class="eyebrow">Konto</span><h3>Eigenes Passwort ändern</h3></div></div>
<form method="post" action="/settings/password" class="form-stack">
<input type="hidden" name="csrf" value="{{.CSRF}}">
<div class="form-row">
<label class="field"><span class="field-label">Aktuelles Passwort</span><input type="password" name="current_password" required autocomplete="current-password"></label>
<label class="field"><span class="field-label">Neues Passwort <small>mindestens 6 Zeichen</small></span><input type="password" name="new_password" required minlength="6" autocomplete="new-password"></label>
</div>
<label class="field narrow"><span class="field-label">Neues Passwort wiederholen</span><input type="password" name="confirm_password" required minlength="6" autocomplete="new-password"></label>
<div class="form-actions"><button class="btn btn-secondary" type="submit">Passwort ändern</button></div>
</form>
</section>
<section class="card"> <section class="card">
<div class="card-head"><div><span class="eyebrow">Bestand</span><h3>Datenhaltung</h3></div></div> <div class="card-head"><div><span class="eyebrow">Bestand</span><h3>Datenhaltung</h3></div></div>
<div class="data-summary"> <div class="data-summary">
+2
View File
@@ -6,9 +6,11 @@
<h2>Das Planungsteam</h2> <h2>Das Planungsteam</h2>
<p>Rollen, Kontaktdaten, bevorzugte Kirchen und Gottesdienste, Monatslimits und Abwesenheiten bilden die Grundlage für faire und nachvollziehbare Einteilungen.</p> <p>Rollen, Kontaktdaten, bevorzugte Kirchen und Gottesdienste, Monatslimits und Abwesenheiten bilden die Grundlage für faire und nachvollziehbare Einteilungen.</p>
</div> </div>
{{if .Data.CanManageAll}}
<div class="intro-actions"> <div class="intro-actions">
<a class="btn btn-primary" href="/team/person/new">{{icon "plus"}} Neue Person</a> <a class="btn btn-primary" href="/team/person/new">{{icon "plus"}} Neue Person</a>
</div> </div>
{{end}}
</section> </section>
<section class="stat-strip four"> <section class="stat-strip four">