Compare commits

..

2 Commits

Author SHA1 Message Date
50719322c8 v1.2.0: Formular-Redesign und Listen-Verbesserungen
- Eingabe: alle 5 Felder (Führung, Datum, Start, Ende, Besucher) in einer Zeile
- Eingabe: Datum einmalig, Start- und Endzeit getrennt
- Führungsarten: Kürzel werden nur in DB gespeichert, Anzeige als Klartext
- Liste: Datum und Zeit getrennt in eigenen Spalten
- Hintergrundfarbe #EEF4FF auf Login- und Passwort-Seite übertragen
- Alle Inputfelder gleich hoch (text-sm durchgehend)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-01 11:00:19 +02:00
7055fd0229 v1.1.0: Druck-Optimierung, UI-Verbesserungen
- Drucklayout: kein innerer Rahmen, volle DIN-A4-Breite, @page-Regel
- Besucher-Spalte: zeigt keine 0 an wenn kein Wert eingetragen
- Beginn-Zeit synchronisiert automatisch die Ende-Zeit
- Hintergrundfarbe auf helles Blau (#EEF4FF)
- Listen-Tab und kompakte Vorschau mit weißem Rahmen
- Besucher-Spalte schmaler, Header als "Bes." abgekürzt
- Drucken-Button im Listen-Tab, Navigation bei Druck ausgeblendet

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-01 10:25:11 +02:00
9 changed files with 136 additions and 109 deletions

View File

@@ -43,11 +43,11 @@ export default function MainClient({ kuerzel, beoId, beoName }: Props) {
} }
return ( return (
<div className="min-h-screen bg-white py-2 px-2 sm:py-4 sm:px-4"> <div className="min-h-screen bg-white py-2 px-2 sm:py-4 sm:px-4 print:p-0">
<main className="max-w-6xl mx-auto border-2 border-black rounded-lg p-3 sm:p-6 bg-[#FFFFDD]"> <main className="max-w-6xl mx-auto border-2 border-black rounded-lg p-3 sm:p-6 bg-[#EEF4FF] print:max-w-none print:border-0 print:p-0 print:bg-white">
{/* Header */} {/* Header */}
<div className="flex justify-between items-start sm:items-center mb-4 gap-2"> <div className="flex justify-between items-start sm:items-center mb-4 gap-2 print:hidden">
<h1 className="text-xl sm:text-2xl font-bold leading-tight"> <h1 className="text-xl sm:text-2xl font-bold leading-tight">
<span className="hidden sm:inline">Sternwarte-Welzheim &nbsp; </span> <span className="hidden sm:inline">Sternwarte-Welzheim &nbsp; </span>
Logbuch für {activeKuppel}-Kuppel Logbuch für {activeKuppel}-Kuppel
@@ -63,7 +63,7 @@ export default function MainClient({ kuerzel, beoId, beoName }: Props) {
</div> </div>
{/* Kuppel-Tabs */} {/* Kuppel-Tabs */}
<div className="flex gap-1 mb-4 border-b-2 border-gray-300 overflow-x-auto"> <div className="flex gap-1 mb-4 border-b-2 border-gray-300 overflow-x-auto print:hidden">
{KUPPELN.map((k) => ( {KUPPELN.map((k) => (
<button <button
key={k} key={k}
@@ -81,7 +81,7 @@ export default function MainClient({ kuerzel, beoId, beoName }: Props) {
</div> </div>
{/* Eingabe/Liste-Tabs */} {/* Eingabe/Liste-Tabs */}
<div className="flex gap-1 mb-4 border-b border-gray-200"> <div className="flex gap-1 mb-4 border-b border-gray-200 print:hidden">
{(['eingabe', 'liste'] as const).map((tab) => ( {(['eingabe', 'liste'] as const).map((tab) => (
<button <button
key={tab} key={tab}
@@ -115,37 +115,54 @@ export default function MainClient({ kuerzel, beoId, beoName }: Props) {
{/* Kompakte Liste — nur auf Desktop sichtbar */} {/* Kompakte Liste — nur auf Desktop sichtbar */}
<div className="hidden lg:block mt-5 border-t-2 border-gray-300 pt-4"> <div className="hidden lg:block mt-5 border-t-2 border-gray-300 pt-4">
<div className="flex justify-between items-center mb-2"> <div className="border-2 border-gray-400 rounded-xl bg-white p-3">
<h2 className="text-sm font-semibold text-gray-600">Letzte Einträge</h2> <div className="flex justify-between items-center mb-2">
<button <h2 className="text-sm font-semibold text-gray-600">Letzte Einträge</h2>
onClick={() => setActiveTab('liste')} <button
className="text-xs text-blue-600 hover:underline" onClick={() => setActiveTab('liste')}
> className="text-xs text-blue-600 hover:underline"
Alle anzeigen >
</button> Alle anzeigen
</button>
</div>
<LogbuchList
kuppel={activeKuppel}
refreshKey={refreshKey}
onEdit={handleEdit}
limit={5}
compact
/>
</div> </div>
<LogbuchList
kuppel={activeKuppel}
refreshKey={refreshKey}
onEdit={handleEdit}
limit={5}
compact
/>
</div> </div>
</> </>
)} )}
{/* Liste-Tab: vollständige Liste */} {/* Liste-Tab: vollständige Liste */}
{activeTab === 'liste' && ( {activeTab === 'liste' && (
<LogbuchList <div className="border-2 border-gray-400 rounded-xl bg-white p-3 print:border-0 print:rounded-none print:p-0">
kuppel={activeKuppel} <div className="flex justify-between items-center mb-2 print:hidden">
refreshKey={refreshKey} <span className="text-sm font-semibold text-gray-600">Einträge {activeKuppel}-Kuppel</span>
onEdit={handleEdit} <button
limit={20} onClick={() => window.print()}
/> className="text-sm px-3 py-1.5 bg-gray-200 hover:bg-gray-300 text-gray-700 rounded-lg"
>
🖨 Drucken
</button>
</div>
<div className="hidden print:block mb-4">
<div className="text-lg font-bold">Sternwarte Welzheim Logbuch {activeKuppel}-Kuppel</div>
<div className="text-sm text-gray-500">Ausdruck vom {new Date().toLocaleDateString('de-DE')}</div>
</div>
<LogbuchList
kuppel={activeKuppel}
refreshKey={refreshKey}
onEdit={handleEdit}
limit={20}
/>
</div>
)} )}
<footer className="mt-6 flex justify-between items-center text-xs sm:text-sm text-gray-600 px-1 sm:px-4"> <footer className="mt-6 flex justify-between items-center text-xs sm:text-sm text-gray-600 px-1 sm:px-4 print:hidden">
<div> <div>
<a href="mailto:rxf@gmx.de" className="text-blue-600 hover:underline"> <a href="mailto:rxf@gmx.de" className="text-blue-600 hover:underline">
rxf@gmx.de rxf@gmx.de

View File

@@ -10,7 +10,7 @@ export default function ChangePasswordPage() {
return ( return (
<div className="min-h-screen bg-white py-4 px-4"> <div className="min-h-screen bg-white py-4 px-4">
<main className="max-w-6xl mx-auto border-2 border-black rounded-lg p-6 bg-[#FFFFDD]"> <main className="max-w-6xl mx-auto border-2 border-black rounded-lg p-6 bg-[#EEF4FF]">
<h1 className="text-3xl font-bold mb-6">Logbuch Sternwarte Welzheim</h1> <h1 className="text-3xl font-bold mb-6">Logbuch Sternwarte Welzheim</h1>
<div className="flex justify-center py-10"> <div className="flex justify-center py-10">

View File

@@ -24,3 +24,13 @@ body {
color: var(--foreground); color: var(--foreground);
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
} }
@media print {
@page {
size: A4 portrait;
margin: 1.5cm;
}
body {
background: white;
}
}

View File

@@ -15,7 +15,7 @@ export default function LoginPage() {
return ( return (
<div className="min-h-screen bg-white py-4 px-4"> <div className="min-h-screen bg-white py-4 px-4">
<main className="max-w-6xl mx-auto border-2 border-black rounded-lg p-6 bg-[#FFFFDD]"> <main className="max-w-6xl mx-auto border-2 border-black rounded-lg p-6 bg-[#EEF4FF]">
<div className="flex justify-between items-center mb-6"> <div className="flex justify-between items-center mb-6">
<h1 className="text-3xl font-bold">Logbuch Sternwarte Welzheim</h1> <h1 className="text-3xl font-bold">Logbuch Sternwarte Welzheim</h1>
</div> </div>

View File

@@ -39,7 +39,7 @@ export default function CustomSelect({ options, placeholder, onChange, keepOpen
<button <button
type="button" type="button"
onClick={() => setOpen((v) => !v)} onClick={() => setOpen((v) => !v)}
className="w-full flex items-center justify-between px-4 py-2 border-2 border-gray-400 rounded-lg bg-white text-base text-gray-900 focus:border-blue-500 focus:outline-none" className="w-full flex items-center justify-between px-4 py-2 border-2 border-gray-400 rounded-lg bg-white text-sm text-gray-900 focus:border-blue-500 focus:outline-none"
> >
<span>{placeholder}</span> <span>{placeholder}</span>
<svg <svg

View File

@@ -2,7 +2,7 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import type { Kuppel, ArtFuehrung, BeoOption, SelectedObjekt, Wetter, LogbuchEintrag } from '@/types/logbuch'; import type { Kuppel, ArtFuehrung, BeoOption, SelectedObjekt, Wetter, LogbuchEintrag } from '@/types/logbuch';
import { ARTEN, ARTEN_MAP } from '@/types/logbuch'; import { ARTEN, ARTEN_MAP, artLabel } from '@/types/logbuch';
import BeoSelector from './BeoSelector'; import BeoSelector from './BeoSelector';
import ObjektSelector from './ObjektSelector'; import ObjektSelector from './ObjektSelector';
import CustomSelect from './CustomSelect'; import CustomSelect from './CustomSelect';
@@ -194,61 +194,51 @@ export default function LogbuchForm({ kuppel, currentUserBeo, editEntry, onSaved
return ( return (
<form onSubmit={handleSubmit} className="space-y-3 max-w-2xl mx-auto border-2 border-gray-400 rounded-xl p-4 bg-white"> <form onSubmit={handleSubmit} className="space-y-3 max-w-2xl mx-auto border-2 border-gray-400 rounded-xl p-4 bg-white">
{/* Art der Führung — volle Breite */} {/* Art der Führung / Datum / Startzeit / Endzeit / Besucher — eine Zeile */}
<div> <div className="flex flex-wrap gap-3 items-end">
<label className={labelCls}>Art der Führung</label> <div className="flex-1 min-w-[160px]">
<CustomSelect <label className={labelCls}>Art der Führung</label>
placeholder={`${artFuehrung}${ARTEN_MAP[artFuehrung]}`} <CustomSelect
options={ARTEN.map((a) => ({ value: a, label: `${a}${ARTEN_MAP[a]}` }))} placeholder={artLabel(artFuehrung)}
onChange={(v) => setArtFuehrung(v as ArtFuehrung)} options={ARTEN.map((a) => ({ value: a, label: artLabel(a) }))}
/> onChange={(v) => setArtFuehrung(v as ArtFuehrung)}
</div> />
{/* Beginn / Ende / Besucher */}
<div className="flex flex-col sm:flex-row gap-3 sm:items-end">
<div className="w-full sm:flex-1">
<label className={labelCls}>Beginn</label>
<div className="flex gap-2">
<input
type="date"
value={beginn.slice(0, 10)}
onChange={(e) => {
if (!e.target.value) return;
setBeginn(e.target.value + 'T' + (beginn.slice(11, 16) || '00:00'));
setEnde(e.target.value + 'T' + (ende.slice(11, 16) || '00:00'));
}}
required
className="flex-1 px-2 py-2 border-2 border-gray-400 rounded-lg bg-white text-sm text-gray-900 focus:border-blue-500 focus:outline-none"
/>
<TimePicker5
value={beginn.slice(11, 16)}
onChange={(t) => setBeginn(beginn.slice(0, 10) + 'T' + t)}
className="w-24"
/>
</div>
</div> </div>
<div className="w-full sm:flex-1"> <div className="shrink-0">
<label className={labelCls}>Ende</label> <label className={labelCls}>Datum</label>
<div className="flex gap-2"> <input
<input type="date"
type="date" value={beginn.slice(0, 10)}
value={ende.slice(0, 10)} onChange={(e) => {
onChange={(e) => { if (!e.target.value) return;
if (!e.target.value) return; setBeginn(e.target.value + 'T' + (beginn.slice(11, 16) || '00:00'));
setEnde(e.target.value + 'T' + (ende.slice(11, 16) || '00:00')); setEnde(e.target.value + 'T' + (ende.slice(11, 16) || '00:00'));
}} }}
required required
className="flex-1 px-2 py-2 border-2 border-gray-400 rounded-lg bg-white text-sm text-gray-900 focus:border-blue-500 focus:outline-none" className="px-2 py-2 border-2 border-gray-400 rounded-lg bg-white text-sm text-gray-900 focus:border-blue-500 focus:outline-none"
/> />
<TimePicker5 </div>
value={ende.slice(11, 16)} <div className="shrink-0">
onChange={(t) => setEnde(ende.slice(0, 10) + 'T' + t)} <label className={labelCls}>Startzeit</label>
className="w-24" <TimePicker5
/> value={beginn.slice(11, 16)}
</div> onChange={(t) => {
setBeginn(beginn.slice(0, 10) + 'T' + t);
setEnde(ende.slice(0, 10) + 'T' + t);
}}
className="w-24"
/>
</div>
<div className="shrink-0">
<label className={labelCls}>Endzeit</label>
<TimePicker5
value={ende.slice(11, 16)}
onChange={(t) => setEnde(ende.slice(0, 10) + 'T' + t)}
className="w-24"
/>
</div> </div>
{showBesucher && ( {showBesucher && (
<div className="sm:shrink-0"> <div className="shrink-0">
<label className={labelCls}>Besucher</label> <label className={labelCls}>Besucher</label>
<input <input
type="number" type="number"
@@ -256,7 +246,7 @@ export default function LogbuchForm({ kuppel, currentUserBeo, editEntry, onSaved
onChange={(e) => setBesucher(e.target.value === '' ? '' : parseInt(e.target.value) || 0)} onChange={(e) => setBesucher(e.target.value === '' ? '' : parseInt(e.target.value) || 0)}
min={0} min={0}
max={9999} max={9999}
className="w-20 px-2 py-2 border-2 border-gray-400 rounded-lg bg-white text-base focus:border-blue-500 focus:outline-none" className="w-20 px-2 py-2 border-2 border-gray-400 rounded-lg bg-white text-sm focus:border-blue-500 focus:outline-none"
/> />
</div> </div>
)} )}

View File

@@ -11,15 +11,21 @@ interface Props {
compact?: boolean; compact?: boolean;
} }
function formatDateTime(dt: string, short = false): string { const pad = (n: number) => String(n).padStart(2, '0');
function formatDate(dt: string, short = false): string {
if (!dt) return ''; if (!dt) return '';
const d = new Date(dt); const d = new Date(dt);
if (isNaN(d.getTime())) return dt; if (isNaN(d.getTime())) return dt;
if (short) { if (short) return `${pad(d.getDate())}.${pad(d.getMonth() + 1)}.`;
const pad = (n: number) => String(n).padStart(2, '0'); return `${pad(d.getDate())}.${pad(d.getMonth() + 1)}.${d.getFullYear()}`;
return `${pad(d.getDate())}.${pad(d.getMonth() + 1)}. ${pad(d.getHours())}:${pad(d.getMinutes())}`; }
}
return d.toLocaleString('de-DE', { day: '2-digit', month: '2-digit', year: 'numeric', hour: '2-digit', minute: '2-digit' }); function formatTime(dt: string): string {
if (!dt) return '';
const d = new Date(dt);
if (isNaN(d.getTime())) return dt;
return `${pad(d.getHours())}:${pad(d.getMinutes())}`;
} }
export default function LogbuchList({ kuppel, refreshKey, onEdit, limit = 20, compact = false }: Props) { export default function LogbuchList({ kuppel, refreshKey, onEdit, limit = 20, compact = false }: Props) {
@@ -65,31 +71,31 @@ export default function LogbuchList({ kuppel, refreshKey, onEdit, limit = 20, co
<table className="w-full border-collapse" style={{ fontSize: compact ? '0.75rem' : '0.875rem' }}> <table className="w-full border-collapse" style={{ fontSize: compact ? '0.75rem' : '0.875rem' }}>
<thead> <thead>
<tr className="bg-gray-100 text-left"> <tr className="bg-gray-100 text-left">
<th className={`${head} whitespace-nowrap`}>Beginn</th> <th className={`${head} whitespace-nowrap`}>Datum</th>
<th className={`${head} whitespace-nowrap`}>Start</th>
<th className={`${head} whitespace-nowrap`}>Ende</th> <th className={`${head} whitespace-nowrap`}>Ende</th>
<th className={head}>Art</th> <th className={head}>Art</th>
<th className={`${head} text-center`}>Besucher</th> <th className={`${head} text-center w-10`}>Bes.</th>
<th className={head}>BEOs</th> <th className={head}>BEOs</th>
<th className={head}>Objekte</th> <th className={head}>Objekte</th>
{!compact && <th className={head}>Bemerkungen</th>} {!compact && <th className={head}>Bemerkungen</th>}
<th className={`${head} text-center`}>Aktionen</th> <th className={`${head} text-center print:hidden`}>Aktionen</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{entries.map((e) => ( {entries.map((e) => (
<tr key={e.ID} className="hover:bg-gray-50"> <tr key={e.ID} className="hover:bg-gray-50">
<td className={`${cell} whitespace-nowrap`}>{formatDateTime(e.Beginn, compact)}</td> <td className={`${cell} whitespace-nowrap`}>{formatDate(e.Beginn, compact)}</td>
<td className={`${cell} whitespace-nowrap`}>{formatDateTime(e.Ende, compact)}</td> <td className={`${cell} whitespace-nowrap`}>{formatTime(e.Beginn)}</td>
<td className={`${cell} whitespace-nowrap`}>{formatTime(e.Ende)}</td>
<td className={cell}>{e.ArtFuehrung}</td> <td className={cell}>{e.ArtFuehrung}</td>
<td className={`${cell} text-center`}>{e.Besucher}</td> <td className={`${cell} text-center`}>{e.Besucher || ''}</td>
<td className={cell}>{e.BEOs || '—'}</td> <td className={cell}>{e.BEOs || '—'}</td>
<td className={cell}>{e.Objekte || '—'}</td> <td className={cell}>{e.Objekte || '—'}</td>
{!compact && ( {!compact && (
<td className={`${cell} max-w-xs`}> <td className={cell}>{e.Bemerkungen || ''}</td>
<span className="line-clamp-2">{e.Bemerkungen || ''}</span>
</td>
)} )}
<td className={`${cell} text-center whitespace-nowrap`}> <td className={`${cell} text-center whitespace-nowrap print:hidden`}>
<button <button
onClick={() => onEdit(e)} onClick={() => onEdit(e)}
className="text-blue-600 hover:text-blue-800 mr-2 font-medium" className="text-blue-600 hover:text-blue-800 mr-2 font-medium"

View File

@@ -1,6 +1,6 @@
{ {
"name": "logbuch", "name": "logbuch",
"version": "1.0.0", "version": "1.2.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",

View File

@@ -4,19 +4,23 @@ export type ArtFuehrung = 'RF' | 'SF' | 'PrF' | 'BEOS' | 'SonF' | 'TD' | 'Beob'
export const KUPPELN: Kuppel[] = ['West', 'Ost', 'Süd', 'Pluto']; export const KUPPELN: Kuppel[] = ['West', 'Ost', 'Süd', 'Pluto'];
export const ARTEN_MAP: Record<ArtFuehrung, string> = { export const ARTEN_MAP: Record<ArtFuehrung, string> = {
RF: 'Reguläre Führung', RF: 'regulär',
SF: 'Sonderführung', SF: 'sonder',
PrF: 'Private Führung', PrF: 'privat',
BEOS: 'BEO-Sitzung', BEOS: '',
SonF: 'Sonnenführung', SonF: 'sonnen',
TD: 'Technischer Dienst', TD: '',
Beob: 'Beobachtung', Beob: 'Beobachtung',
ToT: 'Tag der offenen Tür', ToT: '',
Sonst:'Sonstiges', Sonst: 'Sonstiges',
}; };
export const ARTEN = Object.keys(ARTEN_MAP) as ArtFuehrung[]; export const ARTEN = Object.keys(ARTEN_MAP) as ArtFuehrung[];
export function artLabel(a: ArtFuehrung): string {
return ARTEN_MAP[a] || a;
}
export interface BeoOption { export interface BeoOption {
ID: number; ID: number;
Kuerzel: string; Kuerzel: string;