Merge feature/admin-server-zeit in main
This commit is contained in:
commit
af58156209
2 files changed
+16
-3
No files matched your search
@@ -298,12 +298,19 @@ function MatchAdminCard({ m, run, busy, token, reload, setNotice }) {
|
||||
{current.live?.roundsPlayed != null && <span className="muted">Runde {current.live.roundsPlayed + 1}</span>}
|
||||
</div>
|
||||
)}
|
||||
{m.server?.address && m.server.status !== 'stopped' && (
|
||||
{m.server && (m.server.requestedAt || (m.server.address && m.server.status !== 'stopped')) && (
|
||||
<div className="admin-address">
|
||||
{m.server.address && m.server.status !== 'stopped' && (
|
||||
<>
|
||||
<span><span className="muted">Server</span> <code>{m.server.address.host}:{m.server.address.port}</code></span>
|
||||
{m.server.address.tvPort && (
|
||||
<span><span className="muted">CSTV</span> <code>{m.server.address.host}:{m.server.address.tvPort}</code></span>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
{m.server.requestedAt && (
|
||||
<span><span className="muted">Angefordert</span> {formatDateTime(m.server.requestedAt)}</span>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
{paused && <span className="admin-badge is-paused">Pausiert</span>}
|
||||
@@ -686,3 +693,7 @@ function DockerHostsPanel({ token, setNotice }) {
|
||||
</section>
|
||||
);
|
||||
}
|
||||
/** Datum und Uhrzeit auf Deutsch, z. B. 29.10.2026, 12:54 Uhr */
|
||||
function formatDateTime(ms) {
|
||||
return `${new Date(ms).toLocaleString('de-DE', { day: '2-digit', month: '2-digit', year: 'numeric', hour: '2-digit', minute: '2-digit' })} Uhr`;
|
||||
}
|
||||
@@ -956,8 +956,10 @@ export class MatchService extends EventEmitter {
|
||||
updatedAt: row.updated_at,
|
||||
idleTimeoutMinutes: this.config.idleTimeoutMinutes,
|
||||
};
|
||||
if (viewer.isOrganizer && row.host) {
|
||||
view.address = { host: row.host, port: row.port, tvPort: row.tv_port };
|
||||
if (viewer.isOrganizer) {
|
||||
// Zeitpunkt der letzten Anforderung (neuer Start oder "Server neu starten / wiederholen")
|
||||
view.requestedAt = row.started_at ?? null;
|
||||
if (row.host) view.address = { host: row.host, port: row.port, tvPort: row.tv_port };
|
||||
}
|
||||
const configured = row.status === 'configured';
|
||||
if (!configured || viewer.role === 'public') return view;
|
||||
|
||||
Reference in new issue
Block a user