From 50719322c84f37cbede7219fed77b92c3500df90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reinhard=20X=2E=20F=C3=BCrst?= <rexfue@gmail.com>
Date: Fri, 1 May 2026 11:00:19 +0200
Subject: [PATCH] v1.2.0: Formular-Redesign und Listen-Verbesserungen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 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>
---
 app/change-password/page.tsx |   2 +-
 app/login/page.tsx           |   2 +-
 components/CustomSelect.tsx  |   2 +-
 components/LogbuchForm.tsx   | 101 +++++++++++++++--------------------
 components/LogbuchList.tsx   |  26 +++++----
 package.json                 |   2 +-
 types/logbuch.ts             |  20 ++++---
 7 files changed, 77 insertions(+), 78 deletions(-)

diff --git a/app/change-password/page.tsx b/app/change-password/page.tsx
index c080acf..e40bbfe 100644
--- a/app/change-password/page.tsx
+++ b/app/change-password/page.tsx
@@ -10,7 +10,7 @@ export default function ChangePasswordPage() {
 
   return (
     <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>
 
         <div className="flex justify-center py-10">
diff --git a/app/login/page.tsx b/app/login/page.tsx
index 8de1469..1df0f9f 100644
--- a/app/login/page.tsx
+++ b/app/login/page.tsx
@@ -15,7 +15,7 @@ export default function LoginPage() {
 
   return (
     <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">
           <h1 className="text-3xl font-bold">Logbuch — Sternwarte Welzheim</h1>
         </div>
diff --git a/components/CustomSelect.tsx b/components/CustomSelect.tsx
index d302f77..9f7fc2e 100644
--- a/components/CustomSelect.tsx
+++ b/components/CustomSelect.tsx
@@ -39,7 +39,7 @@ export default function CustomSelect({ options, placeholder, onChange, keepOpen
       <button
         type="button"
         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>
         <svg
diff --git a/components/LogbuchForm.tsx b/components/LogbuchForm.tsx
index da74d06..90882b2 100644
--- a/components/LogbuchForm.tsx
+++ b/components/LogbuchForm.tsx
@@ -2,7 +2,7 @@
 
 import { useEffect, useState } from 'react';
 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 ObjektSelector from './ObjektSelector';
 import CustomSelect from './CustomSelect';
@@ -194,64 +194,51 @@ export default function LogbuchForm({ kuppel, currentUserBeo, editEntry, onSaved
   return (
     <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 */}
-      <div>
-        <label className={labelCls}>Art der Führung</label>
-        <CustomSelect
-          placeholder={`${artFuehrung} — ${ARTEN_MAP[artFuehrung]}`}
-          options={ARTEN.map((a) => ({ value: a, label: `${a} — ${ARTEN_MAP[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);
-                setEnde(ende.slice(0, 10) + 'T' + t);
-              }}
-              className="w-24"
-            />
-          </div>
+      {/* Art der Führung / Datum / Startzeit / Endzeit / Besucher — eine Zeile */}
+      <div className="flex flex-wrap gap-3 items-end">
+        <div className="flex-1 min-w-[160px]">
+          <label className={labelCls}>Art der Führung</label>
+          <CustomSelect
+            placeholder={artLabel(artFuehrung)}
+            options={ARTEN.map((a) => ({ value: a, label: artLabel(a) }))}
+            onChange={(v) => setArtFuehrung(v as ArtFuehrung)}
+          />
         </div>
-        <div className="w-full sm:flex-1">
-          <label className={labelCls}>Ende</label>
-          <div className="flex gap-2">
-            <input
-              type="date"
-              value={ende.slice(0, 10)}
-              onChange={(e) => {
-                if (!e.target.value) return;
-                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={ende.slice(11, 16)}
-              onChange={(t) => setEnde(ende.slice(0, 10) + 'T' + t)}
-              className="w-24"
-            />
-          </div>
+        <div className="shrink-0">
+          <label className={labelCls}>Datum</label>
+          <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="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"
+          />
+        </div>
+        <div className="shrink-0">
+          <label className={labelCls}>Startzeit</label>
+          <TimePicker5
+            value={beginn.slice(11, 16)}
+            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>
         {showBesucher && (
-          <div className="sm:shrink-0">
+          <div className="shrink-0">
             <label className={labelCls}>Besucher</label>
             <input
               type="number"
@@ -259,7 +246,7 @@ export default function LogbuchForm({ kuppel, currentUserBeo, editEntry, onSaved
               onChange={(e) => setBesucher(e.target.value === '' ? '' : parseInt(e.target.value) || 0)}
               min={0}
               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>
         )}
diff --git a/components/LogbuchList.tsx b/components/LogbuchList.tsx
index f3adeb1..491812e 100644
--- a/components/LogbuchList.tsx
+++ b/components/LogbuchList.tsx
@@ -11,15 +11,21 @@ interface Props {
   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 '';
   const d = new Date(dt);
   if (isNaN(d.getTime())) return dt;
-  if (short) {
-    const pad = (n: number) => String(n).padStart(2, '0');
-    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' });
+  if (short) return `${pad(d.getDate())}.${pad(d.getMonth() + 1)}.`;
+  return `${pad(d.getDate())}.${pad(d.getMonth() + 1)}.${d.getFullYear()}`;
+}
+
+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) {
@@ -65,7 +71,8 @@ export default function LogbuchList({ kuppel, refreshKey, onEdit, limit = 20, co
         <table className="w-full border-collapse" style={{ fontSize: compact ? '0.75rem' : '0.875rem' }}>
           <thead>
             <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}>Art</th>
               <th className={`${head} text-center w-10`}>Bes.</th>
@@ -78,8 +85,9 @@ export default function LogbuchList({ kuppel, refreshKey, onEdit, limit = 20, co
           <tbody>
             {entries.map((e) => (
               <tr key={e.ID} className="hover:bg-gray-50">
-                <td className={`${cell} whitespace-nowrap`}>{formatDateTime(e.Beginn, compact)}</td>
-                <td className={`${cell} whitespace-nowrap`}>{formatDateTime(e.Ende, compact)}</td>
+                <td className={`${cell} whitespace-nowrap`}>{formatDate(e.Beginn, 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} text-center`}>{e.Besucher || ''}</td>
                 <td className={cell}>{e.BEOs || '—'}</td>
diff --git a/package.json b/package.json
index d90b533..16e0689 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "logbuch",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/types/logbuch.ts b/types/logbuch.ts
index 02df80e..a68d144 100644
--- a/types/logbuch.ts
+++ b/types/logbuch.ts
@@ -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 ARTEN_MAP: Record<ArtFuehrung, string> = {
-  RF:   'Reguläre Führung',
-  SF:   'Sonderführung',
-  PrF:  'Private Führung',
-  BEOS: 'BEO-Sitzung',
-  SonF: 'Sonnenführung',
-  TD:   'Technischer Dienst',
+  RF:   'regulär',
+  SF:   'sonder',
+  PrF:  'privat',
+  BEOS: '',
+  SonF: 'sonnen',
+  TD:   '',
   Beob: 'Beobachtung',
-  ToT:  'Tag der offenen Tür',
-  Sonst:'Sonstiges',
+  ToT:  '',
+  Sonst: 'Sonstiges',
 };
 
 export const ARTEN = Object.keys(ARTEN_MAP) as ArtFuehrung[];
 
+export function artLabel(a: ArtFuehrung): string {
+  return ARTEN_MAP[a] || a;
+}
+
 export interface BeoOption {
   ID: number;
   Kuerzel: string;