Compare commits

..

14 commits

Author SHA1 Message Date
Jesko Anschütz
dc16a0fbd0 fix(store): GetDisplayState unterscheidet pgx.ErrNoRows; tz-Kommentar im Scheduler
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-27 07:32:28 +01:00
Jesko Anschütz
a27ef11b45 docs: Display-Steuerung + Zeitplan in API-ENDPOINTS, SCHEMA, README
- API-ENDPOINTS.md: neue Sektion "Display-Steuerung" mit POST /api/v1/screens/{screenSlug}/display und POST /api/v1/screens/{screenSlug}/schedule
- SCHEMA.md: Hinweis zur vereinfachten screen_status-Tabelle (Migration 004) und neue Sektion screen_schedules (Migration 005)
- server/backend/README.md: scheduler-Package beschrieben, Migrationen 004+005 ergaenzt, Endpunkt-Tabelle aktualisiert

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-27 07:27:50 +01:00
Jesko Anschütz
588045ac04 feat(ui): Zeitplan-Formular in Playlist-Verwaltung 2026-03-27 07:23:38 +01:00
Jesko Anschütz
6cabaeca58 feat(manage): Schedule in ManageUI-Template-Daten 2026-03-27 07:23:07 +01:00
Jesko Anschütz
fc5587c171 fix: Zeitformat-Validierung + pgx.ErrNoRows in ScreenScheduleStore.Get
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-27 07:21:01 +01:00
Jesko Anschütz
83af005fad feat(api): POST /api/v1/screens/{slug}/schedule + Scheduler verdrahtet
ScheduleStore in RouterDeps, HandleUpdateSchedule-Handler, Scheduler-Goroutine
in app.Run(), ScreenStore.GetByID hinzugefügt.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-27 07:17:45 +01:00
Jesko Anschütz
9b766f9086 feat(scheduler): Display-Zeitplan-Scheduler Package
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-27 07:17:40 +01:00
Jesko Anschütz
7e485e505e feat(store): ScreenScheduleStore mit Get/Upsert/ListEnabled
Fügt ScreenSchedule-Typ, ScreenScheduleStore und GetByID-Methode
für ScreenStore hinzu.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-27 07:17:37 +01:00
Jesko Anschütz
1556c0d002 feat(db): screen_schedules-Tabelle für Zeitplan
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-27 07:17:34 +01:00
Jesko Anschütz
bdd99d10bd feat(ui): Display-Buttons und Sammelschalter in Screen-Übersicht
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-27 07:10:40 +01:00
Jesko Anschütz
68fc0bf4cf feat(ui): Display-Steuerbox in Playlist-Verwaltung
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-27 07:10:23 +01:00
Jesko Anschütz
2a312cd61a feat(manage): DisplayState je Screen in ScreenOverview 2026-03-27 07:05:06 +01:00
Jesko Anschütz
c4f15d862c feat(manage): DisplayState in ManageUI-Template-Daten 2026-03-27 07:04:54 +01:00
Jesko Anschütz
086f093cb9 feat(store): GetDisplayState für screen_status 2026-03-27 07:02:26 +01:00
11 changed files with 575 additions and 25 deletions

View file

@ -526,6 +526,67 @@ Löscht ein Medien-Asset (und physische Datei falls lokal gespeichert).
---
## Display-Steuerung (JSON API)
Beide Endpunkte erfordern `RequireAuth` + `RequireScreenAccess` (`authScreen`-Middleware).
### POST /api/v1/screens/{screenSlug}/display
Sendet einen MQTT-Befehl zum Ein- oder Ausschalten des physischen Displays.
**Auth:** Erforderlich (Bearer-Token oder Session-Cookie). Screen-Zugriff erforderlich.
**Path-Parameter:**
- `screenSlug` — Slug des Screens
**Request-Body:**
```json
{"state": "on"}
```
oder
```json
{"state": "off"}
```
**Response:** `204 No Content`
**Fehler:**
- `400 Bad Request``state` ist nicht `"on"` oder `"off"`, oder ungültiges JSON
- `502 Bad Gateway` — MQTT-Publish fehlgeschlagen
---
### POST /api/v1/screens/{screenSlug}/schedule
Speichert den Zeitplan für das automatische Ein-/Ausschalten eines Displays.
**Auth:** Erforderlich. Screen-Zugriff erforderlich.
**Path-Parameter:**
- `screenSlug` — Slug des Screens
**Request-Body:**
```json
{
"schedule_enabled": true,
"power_on_time": "06:00",
"power_off_time": "22:00"
}
```
Zeitangaben müssen im Format `HH:MM` (24h) oder als leerer String `""` übergeben werden.
Der Scheduler prüft jede Minute, ob die aktuelle Uhrzeit mit `power_on_time` oder `power_off_time`
übereinstimmt, und sendet dann den entsprechenden MQTT-Befehl.
**Response:** `204 No Content`
**Fehler:**
- `400 Bad Request` — Zeitformat ungültig (nicht `HH:MM`), oder ungültiges JSON
- `404 Not Found` — Screen nicht vorhanden
- `500 Internal Server Error` — DB-Fehler
---
## Message Wall
### POST /api/v1/tools/message-wall/resolve

View file

@ -488,6 +488,41 @@ temperature_celsius numeric(5,2) null
updated_at timestamptz not null
```
**Hinweis:** Die Spalten oben beschreiben das geplante Langzeitschema. Migration `004_screen_status.sql`
implementiert eine vereinfachte Version dieser Tabelle mit nur drei Spalten:
```sql
screen_id TEXT PRIMARY KEY REFERENCES screens(id) ON DELETE CASCADE
display_state TEXT NOT NULL DEFAULT 'unknown' -- "on", "off", "unknown"
reported_at TIMESTAMPTZ NOT NULL DEFAULT now()
```
Diese kompakte Tabelle speichert ausschliesslich den zuletzt vom Agent gemeldeten Display-Zustand.
Weitere Laufzeitfelder (online, heartbeat, etc.) werden in einem spaeteren Migrations-Schritt ergaenzt.
### `screen_schedules`
Zweck:
- taeglich konfigurierbarer Ein-/Ausschalt-Zeitplan pro Screen
Migration: `005_screen_schedules.sql`
Spalten:
```sql
screen_id TEXT PRIMARY KEY REFERENCES screens(id) ON DELETE CASCADE
schedule_enabled BOOLEAN NOT NULL DEFAULT false
power_on_time TEXT NOT NULL DEFAULT '' -- HH:MM (24h), leer = nicht gesetzt
power_off_time TEXT NOT NULL DEFAULT '' -- HH:MM (24h), leer = nicht gesetzt
```
Regeln:
- Wird durch den `scheduler`-Package ausgewertet (prueft jede Minute alle aktiven Zeitplaene)
- `schedule_enabled = false` bedeutet: Zeitplan vorhanden, aber deaktiviert
- Leere Zeitfelder bedeuten: kein Einschalt- bzw. kein Ausschaltbefehl
### `screen_snapshots`
Zweck:
@ -556,6 +591,10 @@ und sind vollstaendig unter den Abschnitten `users` und `sessions` oben beschrie
Die Screen-Usserverwaltung wird durch `server/backend/internal/db/migrations/003_user_screen_permissions.sql` angelegt
und ist unter dem Abschnitt `user_screen_permissions` oben beschrieben.
Die Display-Steuerung wird durch zwei weitere Migrationen angelegt:
- `004_screen_status.sql` — vereinfachte `screen_status`-Tabelle (display_state + reported_at)
- `005_screen_schedules.sql``screen_schedules`-Tabelle fuer Zeitplaene
Der `AuthStore` (`internal/store/auth.go`) stellt folgende Methoden bereit:
- `GetUserByUsername(ctx, username)` — Nutzer per Username laden (inkl. `TenantSlug` via LEFT JOIN)

View file

@ -29,9 +29,19 @@ Dieses Verzeichnis enthaelt das zentrale Go-Backend fuer das Info-Board-System.
- `internal/httpapi/manage/csrf_helpers.go` — CSRF-Token Helpers fuer Templates (manage-Package)
- `internal/httpapi/tenant/` — Tenant-Self-Service-Dashboard
- `internal/httpapi/tenant/csrf_helpers.go` — CSRF-Token Helpers fuer Templates (tenant-Package, Import-Cycle-Isolation)
- `internal/mqttnotifier/` — MQTT-Notifizierungen (`NotifyChanged`, `RequestScreenshot`)
- `internal/mqttnotifier/` — MQTT-Notifizierungen (`NotifyChanged`, `RequestScreenshot`, `SendDisplayCommand`)
- `internal/scheduler/` — Display-Zeitplan-Scheduler (prueft jede Minute aktive Zeitplaene und sendet MQTT-Befehle)
- `internal/reqcontext/` — Context-Keys fuer authentifizierten User
### scheduler (`internal/scheduler/scheduler.go`)
Startet eine Goroutine (`scheduler.Run`), die jede Minute alle aktiven Zeitplaene aus
`screen_schedules` laedt und — sofern `power_on_time` oder `power_off_time` mit der aktuellen
Uhrzeit übereinstimmt — per MQTT den Befehl `display_on` bzw. `display_off` sendet.
Der Scheduler wird in `internal/app/app.go` als Goroutine gestartet und laeuft bis zum
Kontext-Abbruch beim Server-Shutdown.
## Datenbank-Stores
### AuthStore (`internal/store/auth.go`)
@ -105,6 +115,8 @@ Dieses Verzeichnis enthaelt das zentrale Go-Backend fuer das Info-Board-System.
| PATCH | `/api/v1/playlists/{playlistId}/duration` | Standard-Dauer setzen (API) |
| DELETE | `/api/v1/media/{id}` | Medium loeschen (API) |
| GET | `/api/v1/screens/{screenId}/screenshot` | Screenshot eines Screens abrufen |
| POST | `/api/v1/screens/{screenSlug}/display` | Display ein-/ausschalten (MQTT) |
| POST | `/api/v1/screens/{screenSlug}/schedule` | Display-Zeitplan speichern |
### Nur Admins (`RequireAuth` + `RequireAdmin`)
@ -173,3 +185,5 @@ Middleware zur rollenbasierten Zugriffskontrolle auf Screen-Ressourcen.
- `001_core.sql` — initiales Schema (Tenants, Screens, Playlists, Media, etc.)
- `002_auth.sql` — Auth-Tabellen (`users`, `sessions`)
- `003_user_screen_permissions.sql` — Screen-User Management (`user_screen_permissions`)
- `004_screen_status.sql` — Display-Zustand pro Screen (`screen_status`: screen_id, display_state, reported_at)
- `005_screen_schedules.sql` — Zeitplan pro Screen (`screen_schedules`: screen_id, schedule_enabled, power_on_time, power_off_time)

View file

@ -17,6 +17,7 @@ import (
"git.az-it.net/az/morz-infoboard/server/backend/internal/db"
"git.az-it.net/az/morz-infoboard/server/backend/internal/httpapi"
"git.az-it.net/az/morz-infoboard/server/backend/internal/mqttnotifier"
"git.az-it.net/az/morz-infoboard/server/backend/internal/scheduler"
"git.az-it.net/az/morz-infoboard/server/backend/internal/store"
)
@ -25,6 +26,8 @@ type App struct {
server *http.Server
notifier *mqttnotifier.Notifier
authStore *store.AuthStore
scheduleStore *store.ScreenScheduleStore
screenStore *store.ScreenStore
dbPool *db.Pool // V7: für db.Close() im Shutdown
logger *log.Logger
}
@ -58,6 +61,7 @@ func New() (*App, error) {
media := store.NewMediaStore(pool.Pool)
playlists := store.NewPlaylistStore(pool.Pool)
authStore := store.NewAuthStore(pool.Pool)
schedules := store.NewScreenScheduleStore(pool.Pool)
// Ensure admin user exists — generate a random password if none is configured.
adminPassword := cfg.AdminPassword
@ -96,6 +100,7 @@ func New() (*App, error) {
AuthStore: authStore,
Notifier: notifier,
ScreenshotStore: ss,
ScheduleStore: schedules,
Config: cfg,
UploadDir: cfg.UploadDir,
Logger: logger,
@ -106,6 +111,8 @@ func New() (*App, error) {
server: &http.Server{Addr: cfg.HTTPAddress, Handler: handler},
notifier: notifier,
authStore: authStore,
scheduleStore: schedules,
screenStore: screens,
dbPool: pool, // V7: Referenz für Shutdown
logger: logger,
}, nil
@ -137,6 +144,9 @@ func (a *App) Run() error {
}
}()
// Display-Zeitplan-Scheduler
go scheduler.Run(ctx, a.scheduleStore, a.screenStore, a.notifier)
// W2: Signal-Handler für Graceful Shutdown.
sigCh := make(chan os.Signal, 1)
signal.Notify(sigCh, syscall.SIGTERM, syscall.SIGINT)

View file

@ -0,0 +1,8 @@
-- Migration 005: Display-Steuerung Zeitplan pro Screen
create table if not exists screen_schedules (
screen_id text primary key references screens(id) on delete cascade,
schedule_enabled boolean not null default false,
power_on_time text not null default '',
power_off_time text not null default ''
);

View file

@ -0,0 +1,59 @@
package manage
import (
"encoding/json"
"net/http"
"time"
"git.az-it.net/az/morz-infoboard/server/backend/internal/store"
)
// HandleUpdateSchedule speichert den Zeitplan für ein Display.
// Body: {"schedule_enabled":true,"power_on_time":"06:00","power_off_time":"22:00"}
func HandleUpdateSchedule(screens *store.ScreenStore, schedules *store.ScreenScheduleStore) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
screenSlug := r.PathValue("screenSlug")
screen, err := screens.GetBySlug(r.Context(), screenSlug)
if err != nil {
http.Error(w, "screen not found", http.StatusNotFound)
return
}
if !requireScreenAccess(w, r, screen) {
return
}
var body struct {
ScheduleEnabled bool `json:"schedule_enabled"`
PowerOnTime string `json:"power_on_time"`
PowerOffTime string `json:"power_off_time"`
}
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
http.Error(w, "invalid JSON", http.StatusBadRequest)
return
}
if body.PowerOnTime != "" {
if _, err := time.Parse("15:04", body.PowerOnTime); err != nil {
http.Error(w, "invalid power_on_time format (use HH:MM)", http.StatusBadRequest)
return
}
}
if body.PowerOffTime != "" {
if _, err := time.Parse("15:04", body.PowerOffTime); err != nil {
http.Error(w, "invalid power_off_time format (use HH:MM)", http.StatusBadRequest)
return
}
}
if err := schedules.Upsert(r.Context(), &store.ScreenSchedule{
ScreenID: screen.ID,
ScheduleEnabled: body.ScheduleEnabled,
PowerOnTime: body.PowerOnTime,
PowerOffTime: body.PowerOffTime,
}); err != nil {
http.Error(w, "db error", http.StatusInternalServerError)
return
}
w.WriteHeader(http.StatusNoContent)
}
}

View file

@ -777,6 +777,16 @@ const manageTmpl = `<!DOCTYPE html>
.morz-toast.show { transform:translateX(0); }
.morz-toast.is-success { background:#f0fdf4; color:#166534; border:1px solid #bbf7d0; }
.morz-toast.is-danger { background:#fef2f2; color:#991b1b; border:1px solid #fecaca; }
/* Display control box */
.display-ctrl { display:flex; align-items:center; gap:.75rem; flex-wrap:wrap; }
.display-state-badge { font-size:.75rem; padding:.2em .65em; border-radius:99px; font-weight:700; }
.display-state-badge.on { background:#dcfce7; color:#166534; }
.display-state-badge.off { background:#fee2e2; color:#991b1b; }
.display-state-badge.unknown { background:#f3f4f6; color:#6b7280; }
/* Schedule control */
.schedule-row { display:flex; gap:.75rem; align-items:flex-end; flex-wrap:wrap; margin-top:.75rem; }
.schedule-row .field { margin:0; }
.schedule-row label { font-size:.75rem; color:#6b7280; display:block; margin-bottom:.2rem; font-weight:600; }
</style>
</head>
<body>
@ -932,6 +942,46 @@ const manageTmpl = `<!DOCTYPE html>
<!-- RIGHT: Library + Upload -->
<div>
<!-- Display control -->
<div class="box mb-3">
<h3 class="title is-6 mb-3">Display</h3>
<div class="display-ctrl">
<span id="display-state-badge" class="display-state-badge {{.DisplayState}}">
{{if eq .DisplayState "on"}}An{{else if eq .DisplayState "off"}}Aus{{else}}Unbekannt{{end}}
</span>
<button class="button is-small is-success is-light" type="button"
onclick="sendDisplayCmd('on')">Einschalten</button>
<button class="button is-small is-danger is-light" type="button"
onclick="sendDisplayCmd('off')">Ausschalten</button>
</div>
</div>
<!-- Schedule control -->
<div class="box mb-3">
<h3 class="title is-6 mb-2">Zeitplan</h3>
<label class="pl-toggle" title="Zeitplan aktivieren">
<input type="checkbox" id="schedule-enabled"
{{if .Schedule.ScheduleEnabled}}checked{{end}}
onchange="saveSchedule()">
<span class="pl-toggle-track"></span>
<span class="pl-toggle-thumb"></span>
<span class="pl-toggle-label" style="font-size:.8rem">Zeitplan aktiv</span>
</label>
<div class="schedule-row">
<div class="field">
<label>Einschalten</label>
<input class="input is-small" type="time" id="power-on-time"
value="{{.Schedule.PowerOnTime}}"
onchange="saveSchedule()" style="width:8rem">
</div>
<div class="field">
<label>Ausschalten</label>
<input class="input is-small" type="time" id="power-off-time"
value="{{.Schedule.PowerOffTime}}"
onchange="saveSchedule()" style="width:8rem">
</div>
</div>
<p id="schedule-save-ok" class="save-ok mt-2" style="font-size:.8rem"> Gespeichert</p>
</div>
<!-- Upload (collapsed) -->
<div class="box mb-3">
<details id="upload-details">
@ -1085,6 +1135,60 @@ function showToast(msg, type) {
setTimeout(function() { t.classList.remove('show'); setTimeout(function() { t.remove(); }, 300); }, 3500);
}
// ─── Display control ─────────────────────────────────────────────
function sendDisplayCmd(state) {
var slug = {{.Screen.Slug | printf "%q"}};
fetch('/api/v1/screens/' + slug + '/display', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-CSRF-Token': getCsrf(),
'X-Requested-With': 'fetch'
},
body: JSON.stringify({state: state})
}).then(function(r) {
if (r.ok) {
var badge = document.getElementById('display-state-badge');
if (badge) {
badge.className = 'display-state-badge ' + state;
badge.textContent = state === 'on' ? 'An' : 'Aus';
}
showToast('Display ' + (state === 'on' ? 'eingeschaltet' : 'ausgeschaltet'), 'is-success');
} else {
showToast('Fehler beim Schalten', 'is-danger');
}
}).catch(function() { showToast('Netzwerkfehler', 'is-danger'); });
}
// ─── Schedule control ────────────────────────────────────────────────────────
function saveSchedule() {
var slug = {{.Screen.Slug | printf "%q"}};
var enabled = document.getElementById('schedule-enabled').checked;
var onTime = document.getElementById('power-on-time').value;
var offTime = document.getElementById('power-off-time').value;
fetch('/api/v1/screens/' + slug + '/schedule', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-CSRF-Token': getCsrf(),
'X-Requested-With': 'fetch'
},
body: JSON.stringify({
schedule_enabled: enabled,
power_on_time: onTime,
power_off_time: offTime
})
}).then(function(r) {
var ok = document.getElementById('schedule-save-ok');
if (r.ok && ok) {
ok.classList.add('show');
setTimeout(function() { ok.classList.remove('show'); }, 2000);
} else if (!r.ok) {
showToast('Zeitplan konnte nicht gespeichert werden', 'is-danger');
}
}).catch(function() { showToast('Netzwerkfehler', 'is-danger'); });
}
// ─── ?msg= toast ─────────────────────────────────────────────────
(function() {
var msg = new URLSearchParams(window.location.search).get('msg');
@ -1158,7 +1262,11 @@ if (sortableEl) {
var ids = Array.from(sortableEl.querySelectorAll('.pl-item[data-id]')).map(function(el) { return el.dataset.id; });
fetch('/manage/' + SCREEN_SLUG + '/reorder', {
method: 'POST',
headers: {'Content-Type':'application/json'},
headers: {
'Content-Type':'application/json',
'X-CSRF-Token': getCsrf(),
'X-Requested-With': 'fetch'
},
body: JSON.stringify(ids)
}).then(function(r) {
if (!r.ok) { showToast(' Reihenfolge nicht gespeichert.','is-danger'); window.location.reload(); }
@ -1256,6 +1364,12 @@ const screenOverviewTmpl = `<!DOCTYPE html>
.morz-toast { position:fixed; top:1rem; right:1rem; z-index:9999; max-width:380px; border-radius:24px; box-shadow:var(--shadow-md); padding:.75rem 1.25rem; display:flex; align-items:center; gap:.75rem; font-size:.9rem; transform:translateX(120%); transition:transform .25s ease; }
.morz-toast.show { transform:translateX(0); }
.morz-toast.is-success { background:#f0fdf4; color:#166534; border:1px solid #bbf7d0; }
.display-btn-row { display:flex; gap:.4rem; margin-top:.5rem; }
.bulk-bar { background:var(--surface); border-radius:var(--radius); box-shadow:var(--shadow-sm); padding:.85rem 1rem; margin-bottom:1.25rem; display:flex; align-items:center; gap:.75rem; flex-wrap:wrap; }
.display-state-badge { font-size:.7rem; padding:.15em .55em; border-radius:99px; font-weight:700; }
.display-state-badge.on { background:#dcfce7; color:#166534; }
.display-state-badge.off { background:#fee2e2; color:#991b1b; }
.display-state-badge.unknown { background:#f3f4f6; color:#6b7280; }
</style>
</head>
<body>
@ -1278,6 +1392,14 @@ const screenOverviewTmpl = `<!DOCTYPE html>
<section class="section">
<div class="container">
<h1 class="title is-4 mb-5">Meine Bildschirme</h1>
{{if gt (len .Cards) 1}}
<div class="bulk-bar">
<span style="font-size:.875rem;font-weight:600;color:#374151">Alle Displays:</span>
<button class="button is-small is-success is-light" type="button" onclick="bulkDisplay('on')">Alle einschalten</button>
<button class="button is-small is-danger is-light" type="button" onclick="bulkDisplay('off')">Alle ausschalten</button>
<span id="bulk-result" style="font-size:.8rem;color:#6b7280"></span>
</div>
{{end}}
<div class="columns is-multiline">
{{range .Cards}}
<div class="column is-one-third-desktop is-half-tablet">
@ -1293,6 +1415,15 @@ const screenOverviewTmpl = `<!DOCTYPE html>
</div>
<div class="screen-card-sub">{{orientationLabel .Screen.Orientation}} · {{.Screen.Slug}}</div>
<a class="button is-primary is-fullwidth" href="/manage/{{.Screen.Slug}}">Verwalten </a>
<div class="display-btn-row">
<span id="ds-{{.Screen.Slug}}" class="display-state-badge {{.DisplayState}}">
{{if eq .DisplayState "on"}}An{{else if eq .DisplayState "off"}}Aus{{else}}?{{end}}
</span>
<button class="button is-small is-success is-light" type="button"
onclick="sendDisplayCmd('{{.Screen.Slug}}','on')">Ein</button>
<button class="button is-small is-danger is-light" type="button"
onclick="sendDisplayCmd('{{.Screen.Slug}}','off')">Aus</button>
</div>
</div>
</div>
</div>
@ -1333,6 +1464,55 @@ function injectCSRF() {
});
}
if (document.readyState==='loading') document.addEventListener('DOMContentLoaded',injectCSRF); else injectCSRF();
// ─── Display control ─────────────────────────────────────────────
function sendDisplayCmd(slug, state) {
fetch('/api/v1/screens/' + slug + '/display', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-CSRF-Token': getCsrf(),
'X-Requested-With': 'fetch'
},
body: JSON.stringify({state: state})
}).then(function(r) {
var badge = document.getElementById('ds-' + slug);
if (r.ok && badge) {
badge.className = 'display-state-badge ' + state;
badge.textContent = state === 'on' ? 'An' : 'Aus';
}
}).catch(function(){});
}
function bulkDisplay(state) {
var slugs = [];
document.querySelectorAll('[id^="ds-"]').forEach(function(el) {
slugs.push(el.id.replace('ds-', ''));
});
var result = document.getElementById('bulk-result');
var done = 0;
slugs.forEach(function(slug) {
fetch('/api/v1/screens/' + slug + '/display', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-CSRF-Token': getCsrf(),
'X-Requested-With': 'fetch'
},
body: JSON.stringify({state: state})
}).then(function(r) {
if (r.ok) {
var badge = document.getElementById('ds-' + slug);
if (badge) {
badge.className = 'display-state-badge ' + state;
badge.textContent = state === 'on' ? 'An' : 'Aus';
}
done++;
if (result) result.textContent = done + '/' + slugs.length + ' geschaltet';
}
}).catch(function(){});
});
}
</script>
</body>
</html>`

View file

@ -282,6 +282,7 @@ func HandleRemoveUserFromScreen(screens *store.ScreenStore) http.HandlerFunc {
type screenCard struct {
Screen *store.Screen
DisplayState string
}
// HandleScreenOverview renders a card-based overview of all accessible screens for a screen_user.
@ -308,7 +309,8 @@ func HandleScreenOverview(screens *store.ScreenStore, notifier *mqttnotifier.Not
csrfToken := setCSRFCookie(w, r, cfg.DevMode)
cards := make([]screenCard, 0, len(accessible))
for _, sc := range accessible {
cards = append(cards, screenCard{Screen: sc})
ds, _ := screens.GetDisplayState(r.Context(), sc.ID)
cards = append(cards, screenCard{Screen: sc, DisplayState: ds})
}
renderTemplate(w, t, map[string]any{
"Cards": cards,
@ -321,6 +323,7 @@ func HandleScreenOverview(screens *store.ScreenStore, notifier *mqttnotifier.Not
func HandleManageUI(
tenants *store.TenantStore,
screens *store.ScreenStore,
schedules *store.ScreenScheduleStore,
media *store.MediaStore,
playlists *store.PlaylistStore,
cfg config.Config,
@ -380,6 +383,13 @@ func HandleManageUI(
// M6: CSRF-Token an Template-Daten weitergeben.
csrfToken := setCSRFCookie(w, r, cfg.DevMode)
displayState, _ := screens.GetDisplayState(r.Context(), screen.ID)
schedule, _ := schedules.Get(r.Context(), screen.ID)
if schedule == nil {
schedule = &store.ScreenSchedule{ScreenID: screen.ID}
}
// Determine back-navigation based on ?from= query parameter.
backLink := "/admin"
backLabel := "← Admin"
@ -431,6 +441,8 @@ func HandleManageUI(
"AccessibleScreens": accessibleScreens,
"ServerTimezone": serverTimezone,
"CSRFToken": csrfToken,
"DisplayState": displayState,
"Schedule": schedule,
})
}
}

View file

@ -21,6 +21,7 @@ type RouterDeps struct {
AuthStore *store.AuthStore
Notifier *mqttnotifier.Notifier
ScreenshotStore *ScreenshotStore
ScheduleStore *store.ScreenScheduleStore
Config config.Config
UploadDir string
Logger *log.Logger
@ -165,7 +166,7 @@ func registerManageRoutes(mux *http.ServeMux, d RouterDeps) {
mux.Handle("GET /manage",
authOnly(http.HandlerFunc(manage.HandleScreenOverview(d.ScreenStore, notifier, d.Config))))
mux.Handle("GET /manage/{screenSlug}",
authScreen(http.HandlerFunc(manage.HandleManageUI(d.TenantStore, d.ScreenStore, d.MediaStore, d.PlaylistStore, d.Config, notifier))))
authScreen(http.HandlerFunc(manage.HandleManageUI(d.TenantStore, d.ScreenStore, d.ScheduleStore, d.MediaStore, d.PlaylistStore, d.Config, notifier))))
mux.Handle("POST /manage/{screenSlug}/upload",
authScreen(http.HandlerFunc(manage.HandleUploadMediaUI(d.MediaStore, d.ScreenStore, uploadDir))))
mux.Handle("POST /manage/{screenSlug}/items",
@ -187,6 +188,10 @@ func registerManageRoutes(mux *http.ServeMux, d RouterDeps) {
mux.Handle("POST /api/v1/screens/{screenSlug}/display",
authScreen(http.HandlerFunc(manage.HandleDisplayCommand(notifier))))
// ── Schedule control ──────────────────────────────────────────────────
mux.Handle("POST /api/v1/screens/{screenSlug}/schedule",
authScreen(http.HandlerFunc(manage.HandleUpdateSchedule(d.ScreenStore, d.ScheduleStore))))
// ── JSON API — screens ────────────────────────────────────────────────
// Self-registration: no auth (player calls this on startup).
mux.HandleFunc("POST /api/v1/screens/register",

View file

@ -0,0 +1,73 @@
// Package scheduler enthält den Display-Zeitplan-Scheduler.
// Er prüft jede Minute ob ein Screen ein- oder ausgeschaltet werden soll.
package scheduler
import (
"context"
"log/slog"
"time"
"git.az-it.net/az/morz-infoboard/server/backend/internal/store"
)
// DisplayCommander sendet einen Display-Befehl per MQTT.
type DisplayCommander interface {
SendDisplayCommand(screenSlug, action string) error
}
// ScreenSlugGetter lädt den Slug für eine Screen-ID.
type ScreenSlugGetter interface {
GetByID(ctx context.Context, id string) (*store.Screen, error)
}
// Run startet den Scheduler-Loop. Blockiert bis ctx abgebrochen wird.
func Run(ctx context.Context, schedules *store.ScreenScheduleStore, screens ScreenSlugGetter, notifier DisplayCommander) {
ticker := time.NewTicker(1 * time.Minute)
defer ticker.Stop()
for {
select {
case <-ticker.C:
check(ctx, schedules, screens, notifier)
case <-ctx.Done():
return
}
}
}
// check prüft alle aktiven Zeitpläne und sendet ggf. Befehle.
func check(ctx context.Context, schedules *store.ScreenScheduleStore, screens ScreenSlugGetter, notifier DisplayCommander) {
// Uses process-local timezone — ensure TZ env var is set in the container (e.g. Europe/Berlin).
now := time.Now().Format("15:04")
enabled, err := schedules.ListEnabled(ctx)
if err != nil {
slog.Error("scheduler: list enabled schedules failed", "err", err)
return
}
for _, sc := range enabled {
screen, err := screens.GetByID(ctx, sc.ScreenID)
if err != nil {
slog.Warn("scheduler: screen not found", "screen_id", sc.ScreenID, "err", err)
continue
}
var action string
if sc.PowerOnTime != "" && sc.PowerOnTime == now {
action = "display_on"
} else if sc.PowerOffTime != "" && sc.PowerOffTime == now {
action = "display_off"
}
if action == "" {
continue
}
if err := notifier.SendDisplayCommand(screen.Slug, action); err != nil {
slog.Error("scheduler: send command failed", "screen_id", sc.ScreenID, "action", action, "err", err)
} else {
slog.Info("scheduler: display command sent", "screen_id", sc.ScreenID, "slug", screen.Slug, "action", action)
}
}
}

View file

@ -7,6 +7,7 @@ import (
"fmt"
"time"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgxpool"
)
@ -40,6 +41,13 @@ type ScreenStatus struct {
ReportedAt time.Time `json:"reported_at"`
}
type ScreenSchedule struct {
ScreenID string `json:"screen_id"`
ScheduleEnabled bool `json:"schedule_enabled"`
PowerOnTime string `json:"power_on_time"`
PowerOffTime string `json:"power_off_time"`
}
type MediaAsset struct {
ID string `json:"id"`
TenantID string `json:"tenant_id"`
@ -94,11 +102,15 @@ type TenantStore struct{ pool *pgxpool.Pool }
type ScreenStore struct{ pool *pgxpool.Pool }
type MediaStore struct{ pool *pgxpool.Pool }
type PlaylistStore struct{ pool *pgxpool.Pool }
type ScreenScheduleStore struct{ pool *pgxpool.Pool }
func NewTenantStore(pool *pgxpool.Pool) *TenantStore { return &TenantStore{pool} }
func NewScreenStore(pool *pgxpool.Pool) *ScreenStore { return &ScreenStore{pool} }
func NewMediaStore(pool *pgxpool.Pool) *MediaStore { return &MediaStore{pool} }
func NewPlaylistStore(pool *pgxpool.Pool) *PlaylistStore { return &PlaylistStore{pool} }
func NewScreenScheduleStore(pool *pgxpool.Pool) *ScreenScheduleStore {
return &ScreenScheduleStore{pool}
}
// ------------------------------------------------------------------
// TenantStore
@ -185,6 +197,12 @@ func (s *ScreenStore) GetBySlug(ctx context.Context, slug string) (*Screen, erro
return scanScreen(row)
}
func (s *ScreenStore) GetByID(ctx context.Context, id string) (*Screen, error) {
row := s.pool.QueryRow(ctx,
`select id, tenant_id, slug, name, orientation, created_at from screens where id=$1`, id)
return scanScreen(row)
}
func (s *ScreenStore) Create(ctx context.Context, tenantID, slug, name, orientation string) (*Screen, error) {
row := s.pool.QueryRow(ctx,
`insert into screens(tenant_id, slug, name, orientation)
@ -328,6 +346,22 @@ func (s *ScreenStore) UpsertDisplayState(ctx context.Context, screenID, displayS
return err
}
// GetDisplayState gibt den zuletzt gemeldeten Display-Zustand zurück.
// Gibt "unknown" zurück wenn kein Eintrag vorhanden ist.
func (s *ScreenStore) GetDisplayState(ctx context.Context, screenID string) (string, error) {
var state string
err := s.pool.QueryRow(ctx,
`select coalesce(display_state,'unknown')
from screen_status where screen_id = $1`, screenID).Scan(&state)
if errors.Is(err, pgx.ErrNoRows) {
return "unknown", nil
}
if err != nil {
return "unknown", err
}
return state, nil
}
// ------------------------------------------------------------------
// MediaStore
// ------------------------------------------------------------------
@ -610,3 +644,58 @@ func scanPlaylistItem(row interface {
}
return &it, nil
}
// ------------------------------------------------------------------
// ScreenScheduleStore
// ------------------------------------------------------------------
// Get lädt den Zeitplan eines Screens. Gibt einen leeren ScreenSchedule zurück wenn keiner vorhanden.
func (s *ScreenScheduleStore) Get(ctx context.Context, screenID string) (*ScreenSchedule, error) {
var sc ScreenSchedule
err := s.pool.QueryRow(ctx,
`select screen_id, schedule_enabled, power_on_time, power_off_time
from screen_schedules where screen_id = $1`, screenID).
Scan(&sc.ScreenID, &sc.ScheduleEnabled, &sc.PowerOnTime, &sc.PowerOffTime)
if errors.Is(err, pgx.ErrNoRows) {
return &ScreenSchedule{ScreenID: screenID}, nil
}
if err != nil {
return nil, err
}
return &sc, nil
}
// Upsert speichert oder aktualisiert den Zeitplan eines Screens.
func (s *ScreenScheduleStore) Upsert(ctx context.Context, sc *ScreenSchedule) error {
_, err := s.pool.Exec(ctx,
`insert into screen_schedules (screen_id, schedule_enabled, power_on_time, power_off_time)
values ($1, $2, $3, $4)
on conflict (screen_id) do update
set schedule_enabled = excluded.schedule_enabled,
power_on_time = excluded.power_on_time,
power_off_time = excluded.power_off_time`,
sc.ScreenID, sc.ScheduleEnabled, sc.PowerOnTime, sc.PowerOffTime)
return err
}
// ListEnabled gibt alle Screens mit aktivem Zeitplan zurück.
func (s *ScreenScheduleStore) ListEnabled(ctx context.Context) ([]*ScreenSchedule, error) {
rows, err := s.pool.Query(ctx,
`select screen_id, schedule_enabled, power_on_time, power_off_time
from screen_schedules
where schedule_enabled = true
and (power_on_time != '' or power_off_time != '')`)
if err != nil {
return nil, err
}
defer rows.Close()
var out []*ScreenSchedule
for rows.Next() {
var sc ScreenSchedule
if err := rows.Scan(&sc.ScreenID, &sc.ScheduleEnabled, &sc.PowerOnTime, &sc.PowerOffTime); err != nil {
return nil, err
}
out = append(out, &sc)
}
return out, rows.Err()
}