Compare commits

...
66 Commits
Author SHA1 Message Date
raffaelandClaude Opus 5.5 b4582828b3 chore(infra): Gitea-Host auf git.hg-int.dev umstellen
deploy / deploy (push) Successful in 1m39s
ci / quality (push) Failing after 1m44s
ci / build (push) Skipped
Gitea läuft seit 2026-11-11 auf hivegrid-control (git.hg-int.dev);
git.tool-ctrl.de wird abgeschaltet.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-11 18:53:16 +01:00
dejanandClaude Fable 5 94faf5e41f Anwesenheit: Fallback-Anker erster Zeiteintrag bei Auto-Tagen
ci / quality (push) Failing after 38s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 1m1s
Auto-Tage vom 6-Uhr-Schnitt haben keinen echten Lock-in — statt die
Anwesenheit ganz auszublenden, ankert sie jetzt am ersten Zeiteintrag
des Tages. teamToday/listToday liefern presenceStartedAt/presenceEndedAt
(echter Check-in hat Vorrang); Team-Karte, Heute-Balken und "Zeit heute"
nutzen die neuen Felder.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-12 12:20:18 +02:00
dejanandClaude Fable 5 e049e0a88c Anwesenheit ignoriert Auto-Check-in vom 6-Uhr-Schnitt
ci / quality (push) Failing after 46s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 1m30s
Der 6-Uhr-Schnitt legt Folgetage mit checkedInAt=06:00 an — das ist kein
echter Lock-in, die Anwesenheitsanzeige lief dadurch fälschlich seit
06:00 mit (z. B. "6h 6m" mittags trotz spätem Arbeitsbeginn). Neues Flag
day_entry.auto_checked_in (Backfill: bestehende 06:00:00-Check-ins);
teamToday, Heute-Balken und "Zeit heute" zeigen Anwesenheit nur noch bei
echtem Check-in.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-12 12:13:57 +02:00
dejanandClaude Fable 5 e0fbc386fa Anwesenheit auch in "Zeit im Team heute" anzeigen
ci / quality (push) Failing after 30s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 53s
teamToday liefert pro Person checkedInAt/checkedOutAt aus dem heutigen
day_entry mit; die Team-Karte zeigt daneben "Anwesend: …" (live, bzw.
eingefroren nach Feierabend). Reine Anzeige, kein Eingriff ins Tracking.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-11 19:28:29 +02:00
dejanandClaude Fable 5 687325ad0d Anwesenheitszeit (Lock-in bis Feierabend) als reine Anzeige ergänzen
ci / quality (push) Failing after 36s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 1m19s
Neben der getrackten Task-Zeit zeigt der "Zeit heute"-Header jetzt
"Getrackt · Anwesend"; der Check-In/Out-Balken zeigt die Anwesenheit
live ("anwesend seit …") und nach Check-Out die finale Dauer. Kein
Eingriff ins Task-Tracking — Wert wird nur aus checkedInAt/checkedOutAt
berechnet.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-11 19:24:56 +02:00
Raffael SheikhandClaude Opus 4.8 a1cf6f3883 chore(format): Prettier über das gesamte Repo
ci / quality (push) Failing after 45s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 53s
Behebt die rote CI (format:check schlug an 36 Alt-Bestand-Dateien fehl:
migrations/meta-Snapshots, seed.ts, schemas/lead.ts, README u. a.) und erzwingt
nebenbei einen frischen web-Build beim Auto-Deploy (apps/web-Dateien geaendert
-> COPY-Layer invalidiert -> Vite baut neu).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 17:50:07 +02:00
Raffael SheikhandClaude Opus 4.8 b340b45110 Historie: nachträglich reflektieren bis 3 Tage nach dem Tag
ci / quality (push) Failing after 36s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 55s
Reflexion/ToDo-Bearbeitung war nur bis 06:00 des Folgetags moeglich. Jetzt
3-Tage-Nachfrist (isEditableWithinGrace) und ein Bearbeiten-Weg aus der Historie:

- werktag: isEditableWithinGrace(entryDate, now, 3) + Tests
- submitReflection/editTodoTitle: Sperre auf die 3-Tage-Nachfrist gelockert
- neue Query dayEntry.ownForDate(date): eigener Tageseintrag + editable-Flag
- reflexion.tsx liest ?date= und laedt vergangene Tage; Felder werden mit der
  bestehenden Reflexion vorbefuellt
- historie.tsx: "Bearbeiten"-Button am eigenen Eintrag (wenn <= 3 Tage)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 13:13:38 +02:00
Raffael SheikhandClaude Opus 4.8 ccd5c42709 chore(format): Prettier auf werktag.ts anwenden
Alt-Bestand nie formatiert — isolierter Format-Lauf vor isEditableWithinGrace.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 13:11:13 +02:00
Raffael SheikhandClaude Opus 4.8 6acf9977ec Historie: Task-Notizen + Link sichtbar, Navigation zu Tagen mit Einträgen
- Notizfeld pro Task in der Reflexion (optional, jeder Status) — nutzt das
  bestehende dropReason-Feld (Limit 200->500). Wird in der Historie bei JEDEM
  Status angezeigt (bisher nur bei "verworfen").
- Optionaler Tages-Link wird in der Historie jetzt angezeigt.
- Historie-Pfeile springen zum naechsten/vorherigen Tag MIT Eintraegen statt
  starr ueber Werktage — Wochenend-Arbeit (z. B. Sa 6.6.) ist nun erreichbar.
  Default-Tag = juengster Tag vor heute mit Eintrag.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 13:04:52 +02:00
Raffael SheikhandClaude Opus 4.8 6e7a910ed3 chore(format): Prettier auf historie.tsx anwenden
Alt-Bestand nie formatiert — isolierter Format-Lauf vor den Historie-Aenderungen.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 13:03:18 +02:00
Raffael SheikhandClaude Opus 4.8 62945201b1 Feature: Lessons-Learned-Vorlage beim Projekt-Abschluss
Der Abschluss verlangte eine URL + freie Vermerk-Textarea, half aber nicht beim
Strukturieren der Retro. Jetzt gefuehrte Felder (Ziel erreicht? / Aufwand vs.
Plan / was lief gut / was nicht), gespeichert als JSONB project.lessons_learned
(Migration 0018). Anzeige im Projekt-Detail als "Retrospektive"; Altprojekte
fallen auf den freien Abschlussvermerk zurueck.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 12:45:19 +02:00
Raffael SheikhandClaude Opus 4.8 3e66ba3156 chore(format): Prettier auf schema.ts anwenden
Alt-Bestand nie formatiert — isolierter Format-Lauf vor dem lessonsLearned-Feld.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 12:44:27 +02:00
Raffael SheikhandClaude Opus 4.8 7a7cc75dd6 Feature: „Meine Woche" — persönliche 7-Tage-Übersicht
Alle Bausteine waren da (Ampel/Trend, ToDo-Status, Anwesenheit), aber niemand
sah je seinen eigenen Verlauf. Neue Query dayEntry.myWeek + Route /meine-woche
(pro Tag Ampel, Antritt→Feierabend, ToDo-Zähler). Nav-Tab „Woche" + Shortcut g w.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 12:39:09 +02:00
Raffael SheikhandClaude Opus 4.8 4311eadf50 chore(format): Prettier auf day-entry.ts + TopNav.tsx anwenden
Alt-Bestand nie formatiert — isolierter Format-Lauf vor der myWeek-Query und
dem Woche-Nav-Tab.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 12:37:59 +02:00
Raffael SheikhandClaude Opus 4.8 a0a2392e3d Feature: Globale Schnellsuche (Cmd/Ctrl+K oder „/")
Keine Sprung-zu-Suche bei wachsender Projekt-/Lead-Zahl. Neuer search-Router
(ILIKE ueber Projekte, Leads, offene Blocker) + Command-Palette ueber die
Modal-Basis, getriggert per Cmd/Ctrl+K oder „/". Klick springt zum Ziel.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 12:34:25 +02:00
Raffael SheikhandClaude Opus 4.8 aad247dd4a Feature: Deal-Pipeline-UI (totes Deal-Backend reaktiviert)
Das vollstaendige Deal-Backend (list/kpis/updateStage) lag ohne UI brach;
Lead->Deal-Promotion war eine Sackgasse. Neue Route /pipeline: KPI-Header
(gewichtete Pipeline, offene Deals, gewonnen/Quartal) + Spalten je Stufe
(lead/erstgespraech/demo/angebot/abschluss), Stufenwechsel per Select
(deal.updateStage). Verlinkt von /leads. Kein Drag-Kanban (CONVENTIONS).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 12:27:54 +02:00
Raffael SheikhandClaude Opus 4.8 6a25383cbe chore(format): Prettier auf router.tsx anwenden
Alt-Bestand nie formatiert — isolierter Format-Lauf vor der Pipeline-Route.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 12:27:14 +02:00
Raffael SheikhandClaude Opus 4.8 23e850287c Feature: Fällige Lead-Wiedervorlagen auf der Leads-Seite
naechsterSchrittDatum wurde erfasst, aber nie als faellige Liste geb√ºndelt —
warme Leads gingen unter. Neue Query lead.dueFollowUps (aktive Leads mit
faelligem/ueberfaelligem naechsten Schritt) + "Faellige Wiedervorlagen"-Block
oben auf /leads.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 12:19:13 +02:00
Raffael SheikhandClaude Opus 4.8 3d9b739d25 chore(format): Prettier auf lead.ts anwenden
Alt-Bestand nie formatiert — isolierter Format-Lauf vor der dueFollowUps-Query.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 12:18:25 +02:00
Raffael SheikhandClaude Opus 4.8 7dd1f2fb20 Feature: Zeit-pro-Projekt-Auswertung im Projekt-Detail
time_entry erfasst bezugKind='project'+bezugId, aber niemand sah je, wie viel
Zeit ein Projekt frisst. Neue Query time.byProject (Gesamtsumme + pro Person);
neue "Getrackte Zeit"-Sektion im Projekt-Detail (blendet sich aus, wenn nichts
getrackt wurde).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 12:15:05 +02:00
Raffael SheikhandClaude Opus 4.8 2eef94afce chore(format): Prettier auf time.ts anwenden
Alt-Bestand nie formatiert — isolierter Format-Lauf vor der byProject-Query.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 12:14:31 +02:00
Raffael SheikhandClaude Opus 4.8 c98d27e70c api: Audit-Log verdrahtet (auditedProcedure an kritische Mutationen)
withAudit war als tRPC-Wrapper definiert, aber an keine Procedure gehaengt
(audit_event blieb leer). Jetzt eine echte tRPC-v11-Middleware-Procedure
(auditedProcedure), die nach erfolgreicher Mutation best-effort einen
audit_event schreibt (Fehler beim Audit kippen die Mutation nicht).

Verdrahtet an die folgenreichen Zustandsuebergaenge:
- blocker.resolve
- project.archive, project.setPhase, project.addPhaseGate

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 12:06:13 +02:00
Raffael SheikhandClaude Opus 4.8 6e7f639013 chore(format): Prettier auf project.ts anwenden
Alt-Bestand nie formatiert — isolierter Format-Lauf vor der Audit-Verdrahtung.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 12:05:26 +02:00
Raffael SheikhandClaude Opus 4.8 9bae1702aa db: Foreign Keys für blocker- und Tageseintrag-Verweise (Migration 0017)
Bisher reine uuid-Spalten ohne referenzielle Integritaet -> Orphan-Risiko, wenn
das Ziel geloescht wird. Jetzt echte FKs mit ON DELETE SET NULL:

- day_entry.blocker_id -> blocker
- blocker.area_id -> area
- blocker.project_id -> project

Migration bereinigt vorab verwaiste IDs (UPDATE ... SET NULL), damit ADD
CONSTRAINT auf Altdaten nicht bricht. Verifiziert: alle 18 Migrationen laufen
gegen frische Postgres 16 durch, FKs angelegt.

(todo.bezug_id / time_entry.bezug_id bleiben FK-frei: echt polymorph ueber
bezug_kind project/deal/campaign — kein einzelner FK moeglich.)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 12:01:24 +02:00
Raffael SheikhandClaude Opus 4.8 ff0a15b94e UI: Touch-Sichtbarkeit der Hover-Aktionen
Edit/Delete/Start/Zeit-Buttons waren nur per group-hover sichtbar (opacity-0)
und damit auf Touch-Geraeten unerreichbar. Jetzt mobil dauerhaft sichtbar, ab
sm (Desktop) weiterhin Hover-Reveal.

- TimelineSection (Bearbeiten/Loeschen einer Zeit-Zeile)
- heute (Task starten/fortsetzen, Zeit nachtragen)
- reflexion (ToDo-Titel bearbeiten)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 11:50:54 +02:00
Raffael SheikhandClaude Opus 4.8 f600c9f187 UI: alle 8 Dialoge auf barrierearme Modal-Basis umgestellt
Bisher waren alle Overlay-Dialoge plain divs ohne role/Fokus-Trap/Escape.
Jetzt setzen sie auf <Modal> auf (role=dialog, aria-modal, Fokus-Trap +
-Rueckgabe, Escape, Body-Scroll-Lock, konsistenter X-Button, Scroll bei langem
Inhalt).

- Modal: X-Schliessen-Button + max-h-[90vh]/overflow-y-auto ergaenzt
- BlockerDialog, ManualDialog (Timeline)
- leads: CSV-Import + Neuer Lead
- bereich: Neues Projekt
- projekt: Gate-Review + Projekt abschliessen
- lead: Zu Deal machen

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 11:49:05 +02:00
Raffael SheikhandClaude Opus 4.8 30006e3b32 chore(format): Prettier auf B4-Zieldateien anwenden
Vorbereitung der Modal-Umstellung: TimelineSection/leads/bereich (Alt-Bestand
nie formatiert) + kleiner B3-Nachzug in projekt/lead. Reine Formatierung, damit
die folgenden Modal-Commits nur echte Aenderungen zeigen.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 11:38:40 +02:00
Raffael SheikhandClaude Opus 4.8 8b0df9cc4e UI: Fehler-States statt weißer Leerseiten bei Query-Fehlern
Dashboard/Projekt/Lead/Team/Historie rendern bei fehlgeschlagener Query nicht
mehr ein stilles `return null` (leere weisse Seite), sondern einen Hinweis mit
"Neu laden"-Button.

- Neue Komponente ErrorState (Meldung + optionaler Retry)
- 5 Routen: if (q.isError || !q.data) -> ErrorState mit q.refetch()

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 11:35:52 +02:00
Raffael SheikhandClaude Opus 4.8 90caa282ee UI: Bestätigungsdialog vor allen Löschungen (Projekt + Lead)
Bisher loeschten 8 Muelltonnen-Icons sofort und unwiderruflich, ganz ohne
Rueckfrage. Jetzt fragt jeder Loeschpfad ueber useConfirm() nach.

- projekt.tsx: Aenderung, Stakeholder, Risiko, Meilenstein
- lead.tsx: Kontakt, Touchpoint, offene Frage, Anhang

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 11:28:48 +02:00
Raffael SheikhandClaude Opus 4.8 33a740ca7e chore(format): Prettier auf heute/projekt/lead.tsx anwenden
Diese drei Dateien waren nicht prettier-konform (nie formatiert). Isolierter
Format-Lauf, damit der folgende Logik-Commit nur die echten Aenderungen zeigt.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 11:28:19 +02:00
Raffael SheikhandClaude Opus 4.8 00b611fa3b UI: Modal-Basis + Confirm-Infrastruktur + Feierabend-Tagesabschluss
Fundament für Paket B (UI/UX-Härtung):
- Modal: barrierearmer Basis-Dialog (role/aria-modal, Fokus-Trap, Escape,
  Fokus-Rückgabe, Body-Scroll-Lock, Portal). Basis für alle App-Dialoge.
- ConfirmProvider/useConfirm: imperative Bestaetigung (await confirm({...}))
  statt window.confirm(); wird als Naechstes an die Loeschpfade gehaengt.
- Feierabend-Dialog: Tagesabschluss mit Zusammenfassung (erledigt/offen/
  verworfen) + Hinweis auf offene/unreflektierte ToDos und fehlende Reflexion.
  Check-Out feuert erst nach Bestaetigung; bleibt reversibel.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 11:19:40 +02:00
Raffael SheikhandClaude Opus 4.8 7285ed9cae Backup-Sidecar: täglicher pg_dump scharf geschaltet
Das dokumentierte Backup lief real nie (stock postgres-Image ohne Cron,
backup.sh nirgends eingebunden) -> bei Volume-/Disk-Verlust drohte Totalverlust.

- Neuer service "backup" (docker-compose.yml): postgres:16-alpine als Sidecar,
  taeglicher pg_dump um BACKUP_HOUR (Default 03:00 Europe/Berlin)
- backup-loop.sh: abhaengigkeitsfreier Tages-Scheduler (umgeht busybox-cron-
  Environment-Eigenheiten)
- backup.sh korrigiert: laeuft remote gegen PGHOST mit PGPASSWORD; -Fc statt
  "-Fc | gzip" (war doppelt komprimiert und als .sql.gz nicht restore-bar) -> .dump
- BACKUP_HOUR/BACKUP_RETENTION_DAYS konfigurierbar (.env.example)
- operations.md: Backup-/Restore-Anleitung an Ist-Zustand angepasst

Verifiziert: pg_dump erstellt + pg_restore in frische DB, Daten intakt.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 11:09:38 +02:00
Raffael SheikhandClaude Opus 4.8 39e259f3ac Arbeitstag-Grenze auf 6 Uhr + Feierabend reversibel
Nachtarbeit über Mitternacht brach bisher den Check-Out ("Du bist heute
noch nicht locked in") und sperrte nach versehentlichem Feierabend den Tag.

- Tag = Kalendertag des Check-ins; eine über Mitternacht laufende Session
  zaehlt zum Starttag, bis 06:00 des Folgetags (isWorkdaySealed)
- checkOut/today finden den offenen Eintrag statt stur "heute"
- reopen ("Arbeit fortsetzen") hebt einen Feierabend wieder auf
- applyWorkdayBoundary: nahtloser 6-Uhr-Schnitt (Auto-Checkout + Folge-Tag,
  offene ToDos wandern mit)
- Reflexion/ToDo-Edit folgen der 6-Uhr-Grenze statt Mitternacht
- Cron apply-workday-boundaries fuer Team-Dashboard-Konsistenz

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-07 10:48:23 +02:00
dejanandClaude Opus 4.8 b39c67d1aa Zeit-heute-Liste aufsteigend sortieren (Vormittag → Abend)
ci / quality (push) Failing after 34s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 46s
Blöcke werden jetzt nach Startzeit aufsteigend angezeigt statt neueste
zuerst.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 21:08:35 +02:00
dejanandClaude Opus 4.8 3e61cd563d Status-Anzeige robust gegen leere/lahmende Verlauf-Query
ci / quality (push) Failing after 43s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 46s
Der aktuelle Projektstatus hing allein an der statusHistory-Query. Kam
die beim Laden mal leer oder fehlerhaft zurück, stand fälschlich "Noch
kein Status gesetzt", obwohl der statusCache (aus demselben byId-Load)
den Status hatte. Jetzt: Verlauf vorhanden -> volle Anzeige; sonst
Fallback auf statusCache-Badge; "Noch kein Status" nur wenn die Query
erfolgreich leer ist. Zusätzlich Lade-/Fehlerzustand.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 21:00:53 +02:00
dejanandClaude Opus 4.8 8b49641c3f Reflexionsfeld "Sonst noch was?" in "Fazit" umbenennen
ci / quality (push) Failing after 39s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 45s
Label + Platzhalter angepasst: jeder fasst im Fazit zusammen, was er
gemacht hat. Damit ergibt auch der Text in "Gestern im Team" Sinn.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 20:54:13 +02:00
dejanandClaude Opus 4.8 ba8e524261 Deadline nachträglich editierbar, Arbeitsmodus aus UI entfernen
ci / quality (push) Failing after 28s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 53s
Deadline lässt sich jetzt direkt im Projekt-Header bearbeiten (Inline-
Datepicker mit Freitag/Wochenende-Warnung), via project.update. Der
Arbeitsmodus (Kanban/Cycle) ist in ebw bedeutungslos und fliegt aus der
Projekterstellung und der Header-Zeile raus. DB-Spalte bleibt ungenutzt
bestehen (keine destruktive Migration nötig).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 20:52:16 +02:00
dejanandClaude Opus 4.8 684841ffb4 Projektlogo auch in Dashboard-Listen anzeigen
ci / quality (push) Failing after 43s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 53s
Logo erscheint jetzt zusätzlich bei "Anstehende Meilensteine" (neben dem
Projekt-Link) und bei "Pflicht-Minimum offen" (vor dem Namen). Dashboard-
Queries liefern dafür project.logoUrl mit.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 20:47:58 +02:00
dejanandClaude Opus 4.8 1206dc5e0f Projektlogo: quadratisches Logo hochladen & anzeigen
ci / quality (push) Failing after 42s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 53s
Logo kann bei der Projekterstellung und nachträglich im Projekt-Header
hochgeladen werden. Client-seitiger Center-Crop auf 256px WebP, gespeichert
als Data-URL in neuer Spalte project.logo_url (Migration 0016). Anzeige in
der Bereichs-Projektliste (Card) und im Detail-Header, mit Initialen-
Platzhalter wenn kein Logo gesetzt ist.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 20:44:58 +02:00
dejanandClaude Opus 4.8 45a87711fb Gestern im Team: pro User nur die neueste Reflexion
ci / quality (push) Failing after 42s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 52s
Im Dashboard-Feed wird je User nur noch die aktuellste Reflexion als
eine Card gezeigt (Dedup über userId, feedRows ist bereits nach Datum
absteigend sortiert). Ältere Einträge sieht man weiterhin unter
"Ganze Historie". Angezeigter Text ist der Freitext "Sonst noch was?"
(reflectionText).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 20:38:09 +02:00
dejanandClaude Opus 4.8 77cb36cd72 Bereichs-Karten aus dem Dashboard entfernen
ci / quality (push) Failing after 34s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 45s
Die Bereiche (Entwicklung/Vertrieb/Marketing/Allgemein) raus aus dem
Dashboard. AmpelDot + Ampel-Typ wurden dadurch ungenutzt, ebenfalls
entfernt.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 20:32:31 +02:00
dejanandClaude Opus 4.8 1b186d8be6 Anstehende Meilensteine im Dashboard anzeigen
ci / quality (push) Failing after 38s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 52s
Projektübergreifende Liste offener/überfälliger Meilensteine mit Datum,
sortiert nach Fälligkeit. Überfällige rot markiert, relative Tagesangabe
("in 3 Tagen" / "überfällig"), direkt verlinkt aufs Projekt. Sitzt oben
zwischen Showstoppern und kritischen Modi.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 20:29:16 +02:00
dejanandClaude Opus 4.8 e46d107b2d Verlinkungen im Projekt-Detail editierbar machen
ci / quality (push) Failing after 43s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 51s
Risikoliste und Lessons Learned konnten bisher nur beim Anlegen bzw.
Abschluss gesetzt werden. Jetzt ist die ganze Verlinkungen-Karte über
"Bearbeiten" editierbar (Outline, Plane, Risikoliste, Lessons Learned).
Leeres Feld entfernt den Link, URLs werden serverseitig validiert.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 20:11:44 +02:00
dejanandClaude Opus 4.8 390a99bf5e chore: "Buch"-Erwähnungen aus UI & Kommentaren entfernen
ci / quality (push) Failing after 36s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 1m11s
User-sichtbare Hinweise (Meilenstein-Mindestanzahl, Stakeholder-Empty,
Freitags-Warnung) ohne Quellenangabe umformuliert; Dev-Kommentare von
"Buch Kap. X" auf "Leitfaden" geändert.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 19:49:39 +02:00
dejanandClaude Opus 4.8 d8a224d5af chore(db): ehemalige Pausen löschen (Migration 0015)
ci / quality (push) Failing after 35s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 53s
Daten-Migration entfernt alle alten 'break'-Zeiteinträge (das Pause-Feature
wurde abgeschafft). Sie erschienen sonst als graue Blöcke in der Team-Timeline.
Läuft beim Deploy automatisch über runMigrations.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 19:03:37 +02:00
dejanandClaude Opus 4.8 7f9a4506c5 refactor(zeit): Pausen nicht mehr buchen — Lücken zwischen Tasks = Pause
ci / quality (push) Failing after 45s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 53s
Pause-Feature entfernt: kein Pause-Button, kein break-Buchen mehr. Man bucht
nur Tasks; stoppt man eine Task und es läuft keine andere, ist die Lücke
automatisch eine Pause — im Kalender/Tagesansicht schlicht leer. Tasks bleiben
pausierbar (Stop = Pause, erneut Start = Fortsetzen → mehrere Segmente auf
dieselbe Task, Lücke dazwischen leer). Wall-Clock zählt Lücken ohnehin nicht.

- time.pause-Endpoint entfernt; 'break' aus der angebotenen Kategorienliste
  raus (bleibt im Enum für Altdaten).
- TimerPill: Pause-Button + Pause-Panel-Grund entfernt; Stop/Start je Task bleibt
  (= pausieren/fortsetzen). Heute-ToDo-Zeile entsprechend beschriftet.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 18:56:54 +02:00
dejanandClaude Opus 4.8 5bbb4abffa feat(zeit): Check-In/Check-Out + Kimai-Sync-Naht (ENTWICKLUN-9)
ci / quality (push) Failing after 42s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 1m20s
Arbeitsantritt = bestehender Lock-in (setzt checkedInAt); neu dazu:
- Check-Out / Feierabend: dayEntry.checkedOutAt + Endpoint dayEntry.checkOut;
  Heute-Seite zeigt „Arbeitsantritt HH:MM" und einen „Feierabend / Check-Out"-
  Button, danach Antritt/Feierabend/Dauer.
- Kimai-Anbindung (config-gated, best-effort, nicht blockierend): lib/kimai.ts
  mit clockIn/clockOut. Check-In startet ein Kimai-Timesheet, Check-Out stoppt
  es; ID + Sync-Status auf dem dayEntry (kimaiTimesheetId, kimaiSynced).
  No-Op solange KIMAI_BASE_URL/API_TOKEN/PROJECT_ID/ACTIVITY_ID nicht gesetzt.

Migration 0014 (checkedOutAt, kimaiTimesheetId, kimaiSynced). Env-Vars als
optional ergänzt + in .env.example dokumentiert.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 18:46:18 +02:00
dejanandClaude Opus 4.8 9942cd8e88 feat(zeit): mehrere Timer parallel (ENTWICKLUN-6)
ci / quality (push) Failing after 44s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 53s
Mehrere Tasks gleichzeitig tracken. Unique-Index "ein aktiver Timer pro User"
entfernt (Migration 0013); time.start stoppt den laufenden nicht mehr, sondern
läuft parallel.

- time.now liefert jetzt ALLE laufenden Timer (Array) inkl. ToDo-Titel.
- time.stop({id}) stoppt einen bestimmten Timer; time.stopAll stoppt alle.
- time.pause stoppt ALLE laufenden Tasks und startet eine Pause (passt zum
  Pause-Ticket „alle laufenden Tasks pausiert").
- TimerPill: zeigt Anzahl laufender Timer; Panel listet alle mit Live-Zähler +
  einzelnem Stop, „Weiteren Task starten", Grund-Nachtrag für Pausen.
- Heute-ToDo-Zeile: Start/Stop pro ToDo unabhängig (Array-basiert).

Zusammenspiel: Team-Timeline zeigt parallele Stränge, „Gesamt"-Zeit zählt
Überlappung weiterhin nur einmal (Wall-Clock).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 18:28:48 +02:00
dejanandClaude Opus 4.8 66adc49e2c feat(heute): ungeplant Erledigtes nachtragen (ENTWICKLUN-7)
ci / quality (push) Failing after 43s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 53s
Drive-by-Aufgaben ("btw, Yevgen-Security-Fix hab ich auch noch gemacht")
strukturiert erfassen statt nur im Freitext. Neues Feld todo.unplanned +
Endpoint dayEntry.addUnplanned: legt sofort ein erledigtes, als „ungeplant"
markiertes ToDo an.

- Schnell-Eingabe „Ungeplant erledigt" auf Heute (Mid-Day) und in der
  Reflexion (End-of-Day-Recall).
- "ungeplant"-Badge in Heute, Reflexion und Historie.
- historyForDate liefert das unplanned-Flag mit.
- Reflexions-Freitext bleibt für die Tages-Story.

Migration 0012 (todo.unplanned).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 18:09:38 +02:00
dejanandClaude Opus 4.8 516b35bf15 feat(team-view): horizontale Team-Timeline (ENTWICKLUN-8)
ci / quality (push) Failing after 33s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 1m17s
Neue Seite /team (Tab „Team", g t): horizontale Tages-Timeline mit einer Spur
pro Person. Zeit-Blöcke werden nach Start/Ende auf einer Stundenachse
positioniert, eingefärbt nach Kategorie; überlappende Blöcke landen auf
parallelen Sub-Spuren ("parallele Zeitstränge"). Laufende Blöcke (heute) ticken
live und sind rot umrandet. Datums-Navigation (Tag vor/zurück, Picker, „Heute"),
Hover-Tooltip mit Label/Zeitraum/Dauer, Kategorie-Legende.

Endpoint time.teamTimeline({date?}) liefert pro Person die Roh-Einträge
(Start/Ende/Kategorie/Label); Achse & Sub-Spuren rechnet das Frontend.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 17:58:47 +02:00
dejanandClaude Opus 4.8 9bf20fbabd feat(historie): team-weite Tages-Historie (ENTWICKLUN-10)
ci / quality (push) Failing after 46s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 55s
Neue Seite /historie: pro vergangenem Tag sieht man, was jede/r gemacht hat —
Reflexion (Ampel/Trend/Text) + ToDos (erledigt/offen/verworfen), plus Liste
„ohne Eintrag". Datums-Navigation (vorheriger/nächster Werktag, Datum-Picker);
Default = vorheriger Werktag. Heutige Reflexionen bleiben privat (nur ToDos).

- Endpoint dayEntry.historyForDate({date?}) liefert Einträge + prev/next-Werktag.
- TopNav-Tab „Historie" (g i), Link „Ganze Historie →" im Dashboard-Feed.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 17:46:49 +02:00
dejanandClaude Opus 4.8 c3d3c4500e fix(dashboard): "Gestern im Team" war immer leer (ENTWICKLUN-13)
ci / quality (push) Failing after 35s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 53s
Der Vortags-Feed verlangte published_at IS NOT NULL, gesetzt nur vom Cron
publish-day-entries. Auf Prod ist dieser Cron nicht eingeplant (keine crontab/
kein Scheduler) → published_at blieb bei allen echten Reflexionen null → Feed
immer leer (auf Dev sah's gut aus, weil der Seed published_at setzt).

Feed jetzt vom Cron entkoppelt: zeigt volle Reflexionen mit Datum < heute
(heutige bleiben privat bis morgen), sortiert nach Datum/Reflexionszeit.
Gilt für dashboard.overview.feed und dayEntry.feed.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 17:39:17 +02:00
dejanandClaude Opus 4.8 8fd72bcb69 fix(zeit): über Mitternacht laufende Timer bleiben sichtbar (ENTWICKLUN-14)
ci / quality (push) Failing after 40s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 53s
Ein um 23:00 gestarteter, noch laufender Timer hatte Start-Datum = gestern und
fiel nach Mitternacht aus listToday/teamToday (Filter nach Start-Datum=heute) —
nur die TimerPill zeigte ihn noch.

- listToday/teamToday: Filter „overlapsToday" = heute gestartet ODER heute
  beendet (Mitternacht überschritten) ODER laufend → Eintrag bleibt sichtbar.
- Tages-Summen clampen den Anteil auf den heutigen Tag (berlinDayStartMs,
  DST-korrekt) → über Mitternacht gelaufene Blöcke werden nicht falsch zugezählt.
- ToDo-Titel werden tagesübergreifend serverseitig aufgelöst (time.now +
  listToday) → Task bleibt benannt, auch wenn das ToDo von gestern ist.
- Timeline zeigt das Start-Datum, wenn ein Eintrag nicht heute begonnen hat.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 17:29:47 +02:00
dejanandClaude Opus 4.8 040dd62735 fix(web): Stale-Chunk-Fehler nach Deploy automatisch abfangen
ci / quality (push) Failing after 39s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 57s
"Failed to fetch dynamically imported module" trat auf, wenn ein offener Tab
nach einem Deploy auf alte (gehashte, inzwischen gelöschte) Route-Chunks zeigt.
Jetzt:
- lazyWithReload() lädt bei fehlgeschlagenem Lazy-Import einmal automatisch neu
  (holt frische index.html); sessionStorage-Guard verhindert Reload-Schleifen.
- vite:preloadError-Event wird ebenfalls abgefangen (modulepreload-Fehler).
- errorElement (RouteError) ersetzt die Dev-Default-Fehlerseite durch eine
  saubere "Neu laden"-Ansicht als Fallback.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 17:15:01 +02:00
dejanandClaude Opus 4.8 02bd682fa5 feat(zeit): Pause-Button (ENTWICKLUN-15)
ci / quality (push) Failing after 35s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 46s
Pause-Button in der Timer-Pill (sichtbar im Leerlauf und während ein Task
läuft): ein Klick stoppt den laufenden Task und startet sofort eine Pause
(break-Eintrag) — bis man wieder eine Aufgabe aktiviert. Läuft eine Pause,
zeigt die Pill sie mit Live-Zähler; ein Panel erlaubt optional einen Grund
nachzutragen (z. B. Bürofahrt, Essen), „Weiter mit Aufgabe" oder „Pause
beenden". Grund ist optional — Pause kann einfach Pause sein.

Reine Frontend-Änderung (nutzt time.start mit category 'break'), keine Migration.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 17:11:23 +02:00
dejanandClaude Opus 4.8 22f79460b2 fix: Bug-Review-Fixes + README aktualisiert
ci / quality (push) Failing after 38s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 53s
Backend:
- Vortags-Feed (dashboard.overview + dayEntry.feed) sortierte aufsteigend
  mit limit(50) → zeigte die ÄLTESTEN statt neuesten Einträge. Jetzt desc.
- deal.updateStage: wonValueEur wurde beim Gewinnen mit der Wahrscheinlichkeit
  gewichtet → zu niedriger Won-Umsatz. Jetzt voller Auftragswert.
- Pflicht-Minimum „Status aktuell" wurde global (letzte Reflexion irgendwo)
  statt pro Projekt berechnet. Jetzt je Projekt aus dem jüngsten Statusbericht.
- time.listToday/teamToday nutzten fixen +02:00-Offset → im Winter (CET) um
  1h verschobene Tagesgrenze. Jetzt DST-sicher via AT TIME ZONE 'Europe/Berlin'.

Frontend:
- lead.tsx + projekt.tsx: Datumsanzeigen nutzten UTC (toISOString) → abends
  Off-by-one. Jetzt Berlin-lokal formatiert.
- reflexion.tsx: Submit mappte nur den initialen ToDo-Snapshot → mitten am Tag
  ergänzte ToDos verloren ihren Status. Jetzt über die aktuelle Liste.
- leads.tsx: CSV-Zeilenzähler konnte „-1" zeigen (Math.max).
- TimerPill: Label ohne Control (a11y-Lint-Error, war repo-weit rot) + unused
  clsx-Import behoben → pnpm lint jetzt 0 Errors.

DB: seed.ts unbedingten updatedAt-Bump aller User entfernt (Debug-Rest).

README: vollständig auf aktuellen Stand gebracht (Leads/CRM, CSV-Import,
PM-Tiefe, Phasen/Status/Risiken/Stakeholder/Änderungen, Tabellen bis 0011,
tRPC-Router, staleTime 0, Auto-Deploy-Runner + Startup-Migrationen).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 17:00:03 +02:00
dejanandClaude Opus 4.8 19db774c4c feat(leads): Leads universell mit Projekten verknüpfen
ci / quality (push) Failing after 44s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 54s
Ein Projekt lebt in genau einem Heimat-Bereich und wird einmal angelegt;
Leads bekommen eine optionale Verknüpfung dorthin (lead.projectId), egal in
welchem Bereich das Projekt wohnt — kein redundantes Anlegen mehr.

- Migration 0011: lead.project_id (FK → project, ON DELETE SET NULL).
- Lead anlegen / CSV-Import / Lead-Detail: Projekt zuordnen; CSV ordnet alle
  importierten Leads einem Projekt zu.
- Projektseite: neue "Leads"-Sektion (Vertriebs-Sicht des Projekts).
- Vertrieb: "Projekte mit Vertriebsaktivität" — bereichsübergreifend alle
  Projekte mit verknüpften Leads (so erscheint ein Entwicklungsprojekt hier,
  WEIL es Leads hat). Rein interne Projekte ohne Leads tauchen nicht auf.
- Lead-Liste/Detail zeigen das verknüpfte Projekt.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 16:08:59 +02:00
dejanandClaude Opus 4.8 68480c1eb1 feat(heute): ToDos mitten am Tag hinzufügen
ci / quality (push) Failing after 33s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 52s
Nach dem Lock-in konnte man ToDos nur bearbeiten/abhaken, aber keine neuen
anlegen. Neuer Endpoint dayEntry.addTodo hängt ein einzelnes ToDo an den
heutigen Tageseintrag an (erlaubt solange der Eintrag vom heutigen
Berlin-Tag ist, auch nach der Reflexion). Inline-Feld „Neues ToDo
hinzufügen" in der EinstempeltView; aktualisiert Heute + Dashboard-Sichten.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 15:47:54 +02:00
dejanandClaude Opus 4.8 bcae44eeb3 fix(streak): Feiertage, Wochenend-Edge & Lookback-Deckel
ci / build (push) Has been skipped
ci / quality (push) Failing after 38s
deploy / deploy (push) Successful in 55s
- Feiertage: isWerktag berücksichtigt jetzt die 9 bundesweiten gesetzlichen
  Feiertage (Oster-Computus + feste Tage) → ein Feiertag bricht die Streak
  nicht mehr (zählt wie ein Wochenende neutral). Landesspezifische Feiertage
  bewusst (noch) nicht enthalten.
- Wochenend-Edge: Reflexion an Sa/So setzte die angezeigte Streak auf 0
  (Schleife brach am Nicht-Werktag ab). Jetzt wird übersprungen statt gebrochen.
- Lookback von 120 auf 400 Tage erhöht, damit lange Streaks nicht
  abgeschnitten werden.
- Streak-Zähllogik in reine, getestete countStreakDays() ausgelagert
  (8 Streak- + 5 Feiertags-Tests).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 15:42:25 +02:00
dejanandClaude Opus 4.8 1f0c9efd59 fix(web): Daten nach Aktionen ohne Refresh aktuell
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 47s
ci / quality (push) Failing after 42s
staleTime war 30 s → nach „Lock in" zeigte das Dashboard bis zu 30 s alte
Cache-Stände, erst ein Browser-Refresh half. Jetzt staleTime 0: Seiten
holen beim Aufrufen/Tab-Fokus frische Daten (kein Polling). Zusätzlich
invalidiert checkIn jetzt dashboard.overview, dayEntry.todayTeam und
todayPresence, damit ein offenes Dashboard sofort mitzieht.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 15:27:29 +02:00
dejanandClaude Opus 4.8 b7b54fcec5 fix(zeit): Gesamt-Zeit als Wall-Clock statt Summe paralleler Tasks
ci / quality (push) Failing after 1m8s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 1m55s
"Zeit im Team heute" (und "Zeit heute") summierten alle Task-Dauern —
wer 5 Tasks parallel trackt, hatte 10h statt 2h Anwesenheit. Gesamt wird
jetzt als Vereinigung überlappender Intervalle berechnet (unionSeconds).
Pro-Aufgabe/Kategorie bleibt separat als Summe erhalten und wird als
"getrackt X" angezeigt; der Verteilungsbalken nutzt diese Summe als Nenner.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-06 15:06:27 +02:00
dejanandClaude Opus 4.8 43eeabaea2 fix(bereich): Bereich-Dropdown im "Neues Projekt"-Dialog war leer
ci / quality (push) Failing after 45s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 53s
Zwei Ursachen behoben:
- Frontend: areaId/Default wurden nur beim Mount aus dem (noch ladenden)
  areas-Prop berechnet → kein Default, keine Platzhalter-Option. Jetzt via
  useEffect Default setzen sobald Areas geladen sind + Platzhalter-Option.
- Prod: Deploy seedet nicht → frische DB hatte keine Areas. Neue
  ensureBaseAreas() legt die Basis-Bereiche idempotent beim API-Start an
  (nach den Migrationen), analog zu runMigrations.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-05 19:28:59 +02:00
dejanandClaude Opus 4.8 9c5207527a chore(ci): Deploy auslösen (Features 0008–0010 + CSV-Import live bringen)
ci / quality (push) Failing after 33s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 34s
Runner kam nach dem letzten Push online; löst die deploy.yml-Pipeline für
den aktuellen origin/main aus (Lead-CRM, PM-Tiefe, CSV-Import). API wendet
Migrationen 0008–0010 beim Start an.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-05 19:17:15 +02:00
Raffael SheikhandClaude Opus 4.8 67e8916634 fix(web): Caddyfile ins Image backen — SPA statt Caddy-Default-Seite
ci / quality (push) Failing after 37s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 52s
Das web-Runtime-Image (caddy:2-alpine) hatte keine eigene Config, daher
lieferte Caddy seine Default-Welcome-Seite aus /usr/share/caddy statt der
gebauten SPA aus /srv ("Caddy works!"). Eigene Caddyfile (root /srv,
try_files SPA-Fallback) wird jetzt nach /etc/caddy/Caddyfile kopiert.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-05 19:02:27 +02:00
Raffael SheikhandClaude Opus 4.8 3b928d0ad0 ci(deploy): Auto-Deploy-Runner für Push auf main + reproduzierbarer API-Build
ci / quality (push) Failing after 35s
ci / build (push) Has been skipped
deploy / deploy (push) Successful in 53s
- .gitea/workflows/deploy.yml: deployt bei Push auf main via Host-Runner
  (git reset --hard origin/main in /opt/build/cockpit, docker compose up
  -d --build in /opt/stacks/cockpit, Healthcheck auf cockpit-api).
- Auto-Migrate: runMigrations() (drizzle-orm Migrator) wird beim API-Start
  aufgerufen; Schema wird vor dem Listen idempotent aktualisiert.
- API-Dockerfile: Workspace-Libs (@cockpit/db, @cockpit/shared) werden jetzt
  mit Emit kompiliert und main/exports im Image auf dist gebogen. Vorher war
  das Prod-Image nicht reproduzierbar baubar (Node konnte die TS-Quelle der
  Libs nicht laden → ERR_MODULE_NOT_FOUND). Dev-Modus und Web-/Vite-Build
  bleiben unberührt.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-05 18:51:17 +02:00
dejanandClaude Opus 4.8 9f3ee13094 feat(leads): CSV-Import für Leads
ci / quality (push) Failing after 1m11s
ci / build (push) Has been skipped
"CSV importieren"-Dialog auf /leads. Serverseitiger lead.importCsv:
eigener CSV-Parser (Quotes/Kommata/Zeilenumbrüche, mit Tests),
header-basiertes Mapping (umlaut-tolerant). Pro Zeile entsteht ein Lead
(Adresse → standorte) + primärer Kontakt; Notizen werden als erster
Austausch-Log-Eintrag gespeichert. Dedup über Firmenname.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-05 18:17:50 +02:00
104 changed files with 34813 additions and 1948 deletions

No files matched your search

+14
View File
@@ -17,8 +17,22 @@ SESSION_COOKIE_SECRET=please-change-me-in-prod-at-least-32-chars
# --- Cron Bearer (Story 2.6 + 5.1 + 6.3) --- # --- Cron Bearer (Story 2.6 + 5.1 + 6.3) ---
CRON_BEARER_TOKEN=please-change-me-in-prod CRON_BEARER_TOKEN=please-change-me-in-prod
# --- Backup-Sidecar (Story 6.3, nur Prod) ---
# Täglicher pg_dump im service "backup". Beide optional (Defaults: 03 / 14).
# BACKUP_HOUR=03
# BACKUP_RETENTION_DAYS=14
# --- App --- # --- App ---
NODE_ENV=development NODE_ENV=development
LOG_LEVEL=info LOG_LEVEL=info
PORT=3000 PORT=3000
PUBLIC_BASE_URL=http://localhost:5173 PUBLIC_BASE_URL=http://localhost:5173
# --- Kimai-Sync (optional, ENTWICKLUN-9) ---
# Nur wenn ALLE vier gesetzt sind, synct ebw beim Check-In/Out nach Kimai
# (sonst No-Op). API-Token in Kimai unter Benutzerprofil → API-Zugriff.
# PROJECT/ACTIVITY = numerische IDs des Default-Projekts/-Tätigkeit in Kimai.
# KIMAI_BASE_URL=https://kimai.tool-ctrl.de
# KIMAI_API_TOKEN=
# KIMAI_PROJECT_ID=
# KIMAI_ACTIVITY_ID=
+50
View File
@@ -0,0 +1,50 @@
# Gitea Actions Deploy für das Cockpit.
# Läuft NUR bei Push auf main und deployt auf dem Homeserver, auf dem auch
# Gitea und der act_runner laufen. Der Job läuft im Host-Executor (runs-on: host),
# damit er Zugriff auf den Docker-Daemon und die Host-Pfade hat:
# /opt/build/cockpit → Source-Checkout (Build-Context, gehört dem Runner-User)
# /opt/stacks/cockpit → docker-compose.yml + .env (root-owned → via sudo)
name: deploy
on:
push:
branches: [main]
concurrency:
group: deploy-cockpit
cancel-in-progress: false
jobs:
deploy:
runs-on: host
steps:
- name: Source-Checkout auf origin/main aktualisieren
run: |
set -euo pipefail
git -C /opt/build/cockpit fetch --prune origin
git -C /opt/build/cockpit reset --hard origin/main
echo "Deployed commit:"
git -C /opt/build/cockpit log --oneline -1
- name: Container bauen & neu starten
run: |
set -euo pipefail
cd /opt/stacks/cockpit
sudo docker compose up -d --build --remove-orphans
- name: Auf API-Health warten
run: |
set -euo pipefail
for i in $(seq 1 36); do
status=$(sudo docker inspect -f '{{.State.Health.Status}}' cockpit-api 2>/dev/null || echo "missing")
echo " api health: $status"
if [ "$status" = "healthy" ]; then
echo "✅ cockpit-api ist healthy."
exit 0
fi
sleep 5
done
echo "❌ cockpit-api wurde nicht rechtzeitig healthy." >&2
sudo docker logs --tail 80 cockpit-api || true
exit 1
+67 -37
View File
@@ -9,20 +9,23 @@ Internes Web-Tool von **ToolCTRL** für den täglichen Überblick über alle Pro
## Was die App tut ## Was die App tut
| Bereich | Feature | | Bereich | Feature |
|---|---| | ------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| **Dashboard** (`/dashboard`) | Unternehmens-Übersicht: Bereichs-Ampelstatus, „Heute fehlt"-Liste, bereichsübergreifende Blocker, Pflicht-Minimum-Übersicht, Jourfixe-Hinweis, „Heute im Team" (ToDos), „Zeit im Team heute" (Live-Tracking), Vortags-Feed | | **Dashboard** (`/dashboard`) | Unternehmens-Übersicht: Bereichs-Ampelstatus, **Showstopper** (offene Showstopper-Risiken), **Projekte in Eskalation/Taskforce**, „Heute fehlt"-Liste, bereichsübergreifende Blocker, Pflicht-Minimum-Übersicht, Jourfixe-Hinweis, „Heute im Team" (ToDos), „Zeit im Team heute" (Live-Tracking, Wall-Clock), Vortags-Feed |
| **Bereich** (`/bereich`, `/bereich/<slug>`) | Tab-Switcher über Entwicklung / Vertrieb / Marketing — pro Bereich Projekt-Liste (Kundenprojekte / Interne Projekte) mit Pflicht-Minimum-Indicator | | **Bereich** (`/bereich`, `/bereich/<slug>`) | Tab-Switcher Entwicklung / Vertrieb / Marketing — Projekt-Liste (Kundenprojekte / Interne Projekte) mit Pflicht-Minimum- & Modus-Indicator. **Vertrieb** zusätzlich: Lead-Teaser + „Projekte mit Vertriebsaktivität" (bereichsübergreifend) |
| **Projekt** (`/projekt/:id`) | Detail: Verlinkungen (Outline-Steckbrief, Plane-Board, Risikoliste), Pflicht-Minimum-Status, Meilenstein-Checkliste, DoD, Projekt-Abschluss (P1) | | **Projekt** (`/projekt/:id`) | Detail: Ziel/Maxime/Nicht-Ziele/Liefergegenstände + Zieldreieck, **Phasen-Lebenszyklus mit Gate-Reviews**, **Statusbericht** (Ampel/Trend + Verlauf), **Stakeholder-Matrix**, **Risiko- & Chancen-Register**, **verknüpfte Leads**, **Änderungs-Log**, Verlinkungen, Pflicht-Minimum, Meilensteine (mit Ergebnis/Kundennutzen + Datums-Warnung), DoD, Projekt-Abschluss (Checkliste + Vermerk, P1), Projekt-Modus |
| **Heute** (`/heute`) | Tagesrhythmus: Lock-in mit ToDo-Liste, Auto-Carryover offener ToDos vom Vortag, ToDo-Editor, Zeiterfassungs-Timeline mit Edit/Delete/Nachtrag | | **Leads** (`/leads`, `/lead/:id`) | Vertriebs-CRM: Lead-Liste nach Status (Cold/Warm/Hot/Won/Lost), Dossier (Stammdaten, Pain & Bedarf, Soft Factors, Strategie), Kontaktpersonen, Austausch-Log, **CSV-Import**, Lead→Deal-Promotion, **Projekt-Verknüpfung** |
| **Reflexion** (`/reflexion`) | Abend-Reflexion: ToDos abhaken, Freitext, Ampel + Trend, optional Blocker. Editierbar bis 00:00 Berlin | | **Heute** (`/heute`) | Tagesrhythmus: Lock-in mit ToDo-Liste, Auto-Carryover offener ToDos vom Vortag, **ToDos mitten am Tag hinzufügen**, Timer pro ToDo, Zeiterfassungs-Timeline mit Edit/Delete/Nachtrag |
| **Reflexion** (`/reflexion`) | Abend-Reflexion: ToDos abhaken + **Titel inline korrigieren**, Freitext, Ampel + Trend, optional Blocker. Editierbar bis 00:00 Berlin |
| **Archiv** (`/archiv`) | Abgeschlossene Projekte, gruppiert nach Bereich | | **Archiv** (`/archiv`) | Abgeschlossene Projekte, gruppiert nach Bereich |
**Querschnittsfunktionen** **Querschnittsfunktionen**
- **Zeiterfassung**: Persistente Timer-Pill in der TopNav (Live-Sekundenzähler), Quick-Picker mit ToDos + Kategorien + Freitext, retroaktiver Nachtrag-Dialog, Bindung an ToDo optional. Personenübergreifend sichtbar im Dashboard. - **Leads / CRM**: Qualitative Lead-Dossiers im Vertrieb, **CSV-Import** (header-basiert, Dedup über Firmenname, Adresse → Standort, Notizen → Austausch-Log), optionale **Verknüpfung zu einem Projekt** (egal welcher Bereich) → Projekte mit Leads erscheinen in der Vertriebs-Sicht, ohne redundant angelegt zu werden.
- **Projektmanagement-Tiefe** (operationalisiert Leitfaden v3.0): Projekt-Modus (Relax/Standard/Eskalation/Taskforce), 4-Phasen-Lebenszyklus mit Gate-Reviews, Statusbericht (Ampel/Trend/Text + Verlauf), Stakeholder-Analyse mit Macht/Interesse-Matrix, Risiko- & Chancen-Register (W×A, Showstopper, Owner, Strategie), Änderungs-Log (Scope-Creep), Zieldreieck, strukturierter Abschluss.
- **Zeiterfassung**: Persistente Timer-Pill in der TopNav (Live-Sekundenzähler), Quick-Picker mit ToDos + Kategorien + Freitext, retroaktiver Nachtrag. „Gesamt" pro Person ist **Wall-Clock** (überlappende parallele Tasks zählen einmal); pro Aufgabe wird die Summe getrennt ausgewiesen („getrackt").
- **Blocker**: Inline in der Reflexion oder über `n`-Shortcut bzw. den globalen „Neuer Blocker"-Dialog. Auflösung nur durch den Projekt-P1. - **Blocker**: Inline in der Reflexion oder über `n`-Shortcut bzw. den globalen „Neuer Blocker"-Dialog. Auflösung nur durch den Projekt-P1.
- **Pflicht-Minimum-Check** (Leitfaden §9): 6-Punkte-Checkliste pro Projekt, einer davon (Status-Ampel aktuell) wird stündlich per Cron aus den Reflexions-Zeitstempeln aktualisiert. - **Pflicht-Minimum-Check** (Leitfaden §9): 6-Punkte-Checkliste pro Projekt; Punkt „Status-Ampel aktuell (≤ 7 Werktage)" wird per Cron **pro Projekt** aus dem jüngsten Statusbericht berechnet.
- **Streak**: aufeinanderfolgende Werktage mit voller Reflexion. Flammen-Pill rechts oben. - **Streak**: aufeinanderfolgende Werktage mit voller Reflexion. Wochenenden, **bundesweite Feiertage** und gemeldete Abwesenheiten sind neutral (brechen nicht). Flammen-Pill rechts oben.
- **Keyboard-Shortcuts**: `g d/b/h/a` Navigation, `g e/v/m` direkt in Entwicklung/Vertrieb/Marketing, `n` Neuer Blocker, `?` Cheatsheet. - **Keyboard-Shortcuts**: `g d/b/h/a` Navigation, `g e/v/m` direkt in Entwicklung/Vertrieb/Marketing, `n` Neuer Blocker, `?` Cheatsheet.
--- ---
@@ -30,7 +33,7 @@ Internes Web-Tool von **ToolCTRL** für den täglichen Überblick über alle Pro
## Tech Stack ## Tech Stack
| Layer | Wahl | | Layer | Wahl |
|---|---| | ------------- | ------------------------------------------------------------------------------------------------------------------------- |
| Sprache | **TypeScript** strict, ESM überall | | Sprache | **TypeScript** strict, ESM überall |
| Repo-Layout | **pnpm**-Monorepo (`pnpm-workspace.yaml`) | | Repo-Layout | **pnpm**-Monorepo (`pnpm-workspace.yaml`) |
| Node | **22+** | | Node | **22+** |
@@ -66,9 +69,10 @@ Internes Web-Tool von **ToolCTRL** für den täglichen Überblick über alle Pro
│ │ │ │ └── ui/ Button, Card, KeyCaret, SkeletonCard, ToolCtrlLogo │ │ │ │ └── ui/ Button, Card, KeyCaret, SkeletonCard, ToolCtrlLogo
│ │ │ ├── hooks/ useCurrentUser │ │ │ ├── hooks/ useCurrentUser
│ │ │ ├── lib/ router, trpc, trpc-provider, voice, │ │ │ ├── lib/ router, trpc, trpc-provider, voice,
│ │ │ │ format-duration, time-categories │ │ │ │ format-duration, time-categories,
│ │ │ │ lead-meta, project-meta
│ │ │ ├── routes/ dashboard, bereich, projekt, heute, reflexion, │ │ │ ├── routes/ dashboard, bereich, projekt, heute, reflexion,
│ │ │ │ archiv, login, not-found │ │ │ │ leads, lead, archiv, login, not-found
│ │ │ └── styles/globals.css │ │ │ └── styles/globals.css
│ │ ├── index.html │ │ ├── index.html
│ │ └── vite.config.ts │ │ └── vite.config.ts
@@ -78,9 +82,11 @@ Internes Web-Tool von **ToolCTRL** für den täglichen Überblick über alle Pro
│ ├── auth/ oidc, routes (login/callback/logout/dev-login), │ ├── auth/ oidc, routes (login/callback/logout/dev-login),
│ │ session, user, middleware │ │ session, user, middleware
│ ├── cron/routes.ts /internal/cron/* (Bearer-Token geschützt) │ ├── cron/routes.ts /internal/cron/* (Bearer-Token geschützt)
│ ├── lib/ werktag (Mo-Fr Berlin), ampel, pflicht-minimum, logger │ ├── lib/ werktag (Mo-Fr Berlin + Feiertage), holidays,
│ ├── routers/ _app, user, area, project, deal, gtm, │ │ streak, csv, ampel, pflicht-minimum, logger
│ │ campaign, blocker, day-entry, time, dashboard │ ├── routers/ _app, user, area, project, deal, gtm, lead,
│ │ risk, stakeholder, change, campaign, blocker,
│ │ day-entry, time, dashboard
│ ├── env.ts Zod-validierte Env-Vars │ ├── env.ts Zod-validierte Env-Vars
│ ├── db.ts Singleton-Drizzle-Client │ ├── db.ts Singleton-Drizzle-Client
│ ├── trpc.ts Context, protectedProcedure, withAudit │ ├── trpc.ts Context, protectedProcedure, withAudit
@@ -88,11 +94,12 @@ Internes Web-Tool von **ToolCTRL** für den täglichen Überblick über alle Pro
│ └── server.ts Fastify-Bootstrap + Healthcheck │ └── server.ts Fastify-Bootstrap + Healthcheck
├── packages/ ├── packages/
│ ├── db/ Drizzle-Schema + Migrationen │ ├── db/ Drizzle-Schema + Migrationen
│ │ ├── src/{schema,client,seed,index}.ts │ │ ├── src/{schema,client,seed,index,migrate,base-data}.ts
│ │ ├── migrations/ 0000_init … 0007_project_description │ │ ├── migrations/ 0000_init … 0011_lead_project_link
│ │ └── drizzle.config.ts │ │ └── drizzle.config.ts
│ └── shared/ Zod-Schemas + Konstanten + Types │ └── shared/ Zod-Schemas + Konstanten + Types
│ └── src/schemas/ day-entry, project, deal, campaign, time-entry │ └── src/schemas/ day-entry, project, deal, campaign, time-entry,
│ lead, risk, stakeholder, change
├── _bmad-output/planning-artifacts/ PRD, Architektur, UX-Spec, Epics, Decision-Log ├── _bmad-output/planning-artifacts/ PRD, Architektur, UX-Spec, Epics, Decision-Log
├── docs/operations.md Ops-Guide (Authentik-Setup, Backup, Restore) ├── docs/operations.md Ops-Guide (Authentik-Setup, Backup, Restore)
├── scripts/backup.sh pg_dump-Skript (im Postgres-Container) ├── scripts/backup.sh pg_dump-Skript (im Postgres-Container)
@@ -147,7 +154,7 @@ Im Dev-Modus läuft ein **Auto-Login** als Admin-User `dejan@tool-ctrl.de`. Auth
### Wichtige Ports ### Wichtige Ports
| Service | Port | Quelle | | Service | Port | Quelle |
|---|---|---| | --------------- | --------- | ------------------------------------------------------------------------- |
| Vite Dev-Server | **7173** | `apps/web/vite.config.ts` | | Vite Dev-Server | **7173** | `apps/web/vite.config.ts` |
| Fastify API | **7100** | `.env` (`PORT`) | | Fastify API | **7100** | `.env` (`PORT`) |
| Postgres (Dev) | **55432** | `docker-compose.dev.yml` (5432 würde mit Mac-System-Postgres kollidieren) | | Postgres (Dev) | **55432** | `docker-compose.dev.yml` (5432 würde mit Mac-System-Postgres kollidieren) |
@@ -169,21 +176,30 @@ pnpm --filter @cockpit/db migrate:generate --name=<name> # neue Migration
Postgres 16, Drizzle als ORM und Migrator. **Schema-Single-Source-of-Truth**: `packages/db/src/schema.ts`. Postgres 16, Drizzle als ORM und Migrator. **Schema-Single-Source-of-Truth**: `packages/db/src/schema.ts`.
### Tabellen (aktueller Stand nach Migration 0007) ### Tabellen (aktueller Stand nach Migration 0011)
| Tabelle | Zweck | | Tabelle | Zweck |
|---|---| | --------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `user` | Mitarbeiter (`authentik_sub` als Identitäts-Anker), `is_admin`-Flag | | `user` | Mitarbeiter (`authentik_sub` als Identitäts-Anker), `is_admin`-Flag |
| `session` | Server-Side Sessions (Postgres-persistent), Browser kennt nur Cookie-`id` | | `session` | Server-Side Sessions (Postgres-persistent), Browser kennt nur Cookie-`id` |
| `audit_event` | Audit-Trail für jede mutierende Operation | | `audit_event` | Audit-Trail (Tabelle vorhanden; `withAudit`-Wrapper aktuell nicht verdrahtet) |
| `area` | Bereich (entwicklung / vertrieb / marketing / allgemein) | | `area` | Bereich (entwicklung / vertrieb / marketing / allgemein) |
| `project` | Projekt: Name, optionale `description`, Outline-/Plane-URLs, Arbeitsmodus (cycle/kanban), `pflicht_minimum_state` JSONB, Status-/Trend-Cache, Archiv-Felder | | `project` | Projekt: Name, `description`, `maxime`, `ziel`/`nicht_ziele`/`liefergegenstaende`, `zieldreieck_flex`, `modus`, `phase`, Outline-/Plane-URLs, Arbeitsmodus, `pflicht_minimum_state` JSONB, Status-/Trend-Cache, `abschlussvermerk`, Archiv-Felder |
| `milestone` | Cockpit-Sicht-Meilenstein pro Projekt | | `milestone` | Cockpit-Sicht-Meilenstein pro Projekt (+ `ergebnis`, `kundennutzen`) |
| `project_status` | Statusbericht-Historie pro Projekt (Ampel/Trend/Text, extern-Flag) |
| `phase_gate` | Gate-Review am Phasenende (Ergebnis erreicht? + Notiz) |
| `change_entry` | Änderungs-Log pro Projekt (Scope-Creep) |
| `stakeholder` | Stakeholder-Analyse pro Projekt (Interesse × Einfluss, Haltung) |
| `risk` | Risiko- & Chancen-Register pro Projekt (W×A, Showstopper, Owner, Strategie) |
| `day_entry` | Tageseintrag (begun / full / absent), `published_at` für Vortrags-Veröffentlichung | | `day_entry` | Tageseintrag (begun / full / absent), `published_at` für Vortrags-Veröffentlichung |
| `todo` | Tagesplan-Item, optional an Bezug gebunden, `carried_over`-Flag | | `todo` | Tagesplan-Item, optional an Bezug gebunden, `carried_over`-Flag |
| `absence_day` | Urlaub/Krank/Sonstiges — zählt nicht gegen Streak | | `absence_day` | Urlaub/Krank/Sonstiges — zählt nicht gegen Streak |
| `blocker` | Bereichsübergreifendes Hindernis | | `blocker` | Bereichsübergreifendes Hindernis |
| `deal`, `gtm_step`, `campaign`, `lead_handover` | Im Schema vorhanden (Phase-2-Vorbereitung), **kein UI** mehr | | `lead` | Vertriebs-Lead-Dossier; optionale `project_id`-Verknüpfung zum (universellen) Projekt |
| `lead_contact` | Kontaktperson(en) eines Leads |
| `lead_touchpoint` | Austausch-Log eines Leads (Kanal, Outcome, Follow-up) |
| `deal` | Pipeline-Deal; wird per Lead→Deal-Promotion erzeugt |
| `gtm_step`, `campaign`, `lead_handover` | Im Schema vorhanden (Phase-2-Vorbereitung), kein UI |
| `time_entry` | Zeiterfassungs-Block, optional an ToDo gebunden, Partial-Unique-Index erzwingt max. einen aktiven Timer pro User | | `time_entry` | Zeiterfassungs-Block, optional an ToDo gebunden, Partial-Unique-Index erzwingt max. einen aktiven Timer pro User |
Migrationen liegen in `packages/db/migrations/*.sql` und werden über `drizzle-kit migrate` angewendet. Schema-Änderungen brauchen **immer eine neue Migration** — kein Schema-Drift. Migrationen liegen in `packages/db/migrations/*.sql` und werden über `drizzle-kit migrate` angewendet. Schema-Änderungen brauchen **immer eine neue Migration** — kein Schema-Drift.
@@ -195,7 +211,7 @@ Migrationen liegen in `packages/db/migrations/*.sql` und werden über `drizzle-k
### REST-Routen (Fastify) ### REST-Routen (Fastify)
| Methode | Pfad | Zweck | | Methode | Pfad | Zweck |
|---|---|---| | ----------- | ----------------------- | ----------------------------------------------------------------------------------------------------------- |
| `GET` | `/api/health` | DB- und Authentik-Reachability-Check | | `GET` | `/api/health` | DB- und Authentik-Reachability-Check |
| `GET` | `/api/me` | Eingeloggter User (oder 401) | | `GET` | `/api/me` | Eingeloggter User (oder 401) |
| `GET` | `/api/auth/login` | Startet OIDC-Flow (Redirect zu Authentik) | | `GET` | `/api/auth/login` | Startet OIDC-Flow (Redirect zu Authentik) |
@@ -211,14 +227,21 @@ Migrationen liegen in `packages/db/migrations/*.sql` und werden über `drizzle-k
health publicProcedure health publicProcedure
user me, list, markAbsent user me, list, markAbsent
area list area list
project list, byAreaSlug, byId (mit area), create, archive, project list, byAreaSlug, byId, create, update, archive,
setMilestoneStatus, listArchived setMilestoneStatus, addMilestone, updateMilestone, removeMilestone,
deal list, kpis, create, updateStage (kein UI, Phase 2) setModus, setPhase, addPhaseGate, phaseGates,
addStatus, statusHistory, listArchived
lead list, byId, forProject, create, update, addContact, removeContact,
addTouchpoint, removeTouchpoint, promoteToDeal, importCsv
risk forProject, create, update, remove
stakeholder forProject, create, update, remove
change forProject, create, update, remove
deal list, kpis, create, updateStage
gtm list, create, setStatus (kein UI, Phase 2) gtm list, create, setStatus (kein UI, Phase 2)
campaign list, create, funnel, crosslink (kein UI, Phase 2) campaign list, create, funnel, crosslink (kein UI, Phase 2)
blocker listOpen, byProject, create, resolve blocker listOpen, byProject, create, resolve
dayEntry today, todayTeam, pendingCarryOver, checkIn, dayEntry today, todayTeam, pendingCarryOver, checkIn, updateTodos,
updateTodos, submitReflection, feed, todayPresence editTodoTitle, addTodo, submitReflection, feed, todayPresence
time now, start, stop, listToday, update, upsertManual, time now, start, stop, listToday, update, upsertManual,
delete, teamToday delete, teamToday
dashboard overview dashboard overview
@@ -282,7 +305,7 @@ Login-Route ist außerhalb der `AppShell` (`/login`). Alle übrigen Routen unter
### State ### State
- **Server-State**: ausschließlich React Query via tRPC (`createTRPCReact<AppRouter>`). Konfig in `apps/web/src/lib/trpc-provider.tsx` (30 s staleTime, ein Retry, zentrales onError → Toast). - **Server-State**: ausschließlich React Query via tRPC (`createTRPCReact<AppRouter>`). Konfig in `apps/web/src/lib/trpc-provider.tsx` (**staleTime 0** → Daten werden bei Mount/Tab-Fokus neu geholt, kein Polling; ein Retry; zentrales onError → Toast). Mutationen invalidieren zusätzlich gezielt die gleichzeitig sichtbaren Sichten.
- **Auth-State**: React Query `user.me` (Hook `useCurrentUser`). - **Auth-State**: React Query `user.me` (Hook `useCurrentUser`).
- **Lokaler UI-State**: `useState` in der Komponente. Kein globaler Store. - **Lokaler UI-State**: `useState` in der Komponente. Kein globaler Store.
@@ -337,7 +360,7 @@ Konstanten (`MAX_TODO_TEXT_LENGTH`, `WERKTAGE`, `JOURFIXE_DAY`, `REFLEXION_REMIN
`docker-compose.yml` definiert vier Services: `docker-compose.yml` definiert vier Services:
| Service | Image | Rolle | | Service | Image | Rolle |
|---|---|---| | ---------- | ------------------------------- | ----------------------------------------------------------------------------- |
| `postgres` | `postgres:16-alpine` | DB, persistentes Volume `cockpit_postgres_data`, Backups in `cockpit_backups` | | `postgres` | `postgres:16-alpine` | DB, persistentes Volume `cockpit_postgres_data`, Backups in `cockpit_backups` |
| `api` | Build aus `apps/api/Dockerfile` | Fastify auf 3000, hängt an Postgres-Health | | `api` | Build aus `apps/api/Dockerfile` | Fastify auf 3000, hängt an Postgres-Health |
| `web` | Build aus `apps/web/Dockerfile` | Vite-Build wird in `cockpit_web_dist`-Volume gelegt | | `web` | Build aus `apps/web/Dockerfile` | Vite-Build wird in `cockpit_web_dist`-Volume gelegt |
@@ -357,7 +380,7 @@ Env-Variablen werden über `.env.production` injiziert. Required: `POSTGRES_PASS
`scripts/backup.sh` läuft als System-Cron im Postgres-Container: tägliches `pg_dump` mit 14-Tage-Retention + Heartbeat an `/internal/cron/pg-dump-backup` für Audit. `scripts/backup.sh` läuft als System-Cron im Postgres-Container: tägliches `pg_dump` mit 14-Tage-Retention + Heartbeat an `/internal/cron/pg-dump-backup` für Audit.
### CI ### CI & Auto-Deploy
`.gitea/workflows/ci.yml`: `.gitea/workflows/ci.yml`:
@@ -366,6 +389,13 @@ quality → install, typecheck, lint, format:check, test
build → install, web build, api build (needs quality) build → install, web build, api build (needs quality)
``` ```
`.gitea/workflows/deploy.yml` (Runner `runs-on: host` auf dem Homeserver): **bei jedem Push auf `main`** → `git reset --hard origin/main`, `docker compose up -d --build`, dann Warten bis `cockpit-api` healthy. Es gibt **keinen manuellen Trigger** — ein (ggf. leerer) Push löst den Deploy aus.
**Startup-Verhalten der API** (`apps/api/src/server.ts`): vor dem Listen wird
1. `runMigrations()` ausgeführt (Drizzle-Migrationen idempotent; schlägt eine fehl, startet die API nicht), dann
2. `ensureBaseAreas()` (legt die 4 Basis-Bereiche idempotent an, damit z. B. der „Neues Projekt"-Dropdown nie leer ist — auch auf einer nicht geseedeten Prod-DB).
--- ---
## Konventionen — Pflicht-Lesen vor Code-Edits ## Konventionen — Pflicht-Lesen vor Code-Edits
@@ -385,7 +415,7 @@ build → install, web build, api build (needs quality)
## Was bewusst NICHT gebaut ist (Phase 2) ## Was bewusst NICHT gebaut ist (Phase 2)
- **Plane-/Outline-API-Sync** — Cockpit verlinkt nur, hängt sich nichts ab - **Plane-/Outline-API-Sync** — Cockpit verlinkt nur, hängt sich nichts ab
- **Kanban-Pipeline / Lead-Funnel-UI** — Schemas existieren, aber UI raus - **Kanban-Pipeline / Deal-Funnel-UI** — `gtm`/`campaign` ohne UI (Lead-CRM ist gebaut)
- **Reportings / Wochen-/Monatsauswertungen** — bewusst minimal - **Reportings / Wochen-/Monatsauswertungen** — bewusst minimal
- **Reaktionen / Kommentare** auf Tagesupdates - **Reaktionen / Kommentare** auf Tagesupdates
- **Mobile schreibbar** — Desktop-first, mobil nur lesbar - **Mobile schreibbar** — Desktop-first, mobil nur lesbar
@@ -406,7 +436,7 @@ Vollständige PRD/Architektur/UX/Stories im `_bmad-output/planning-artifacts/`-O
- Anti-Ziele und Roadmap-Hinweise - Anti-Ziele und Roadmap-Hinweise
| Datei | Inhalt | | Datei | Inhalt |
|---|---| | ---------------------------------------------- | --------------------------------------- |
| `prds/prd-projectmanagement-2026-05-25/prd.md` | PRD (49 FRs, 16 NFRs) | | `prds/prd-projectmanagement-2026-05-25/prd.md` | PRD (49 FRs, 16 NFRs) |
| `architecture.md` | Stack-Entscheidungen, Patterns | | `architecture.md` | Stack-Entscheidungen, Patterns |
| `ux-design-specification.md` | Brand-Tokens, Komponenten, Voice & Tone | | `ux-design-specification.md` | Brand-Tokens, Komponenten, Voice & Tone |
@@ -417,7 +447,7 @@ Vollständige PRD/Architektur/UX/Stories im `_bmad-output/planning-artifacts/`-O
## Repo & Remote ## Repo & Remote
- **Default-Branch**: `main` - **Default-Branch**: `main`
- **Remote**: `ssh://git@git.tool-ctrl.de:2222/toolctrl-labs/everythingbutwork.git` (Gitea, non-standard SSH-Port) - **Remote**: `ssh://git@git.hg-int.dev:2222/toolctrl-labs/everythingbutwork.git` (Gitea, non-standard SSH-Port)
- **Gitignore**: `.env`, `node_modules`, `dist`, `_bmad/`-Tools (Bmad-Framework), `.claude/`, `ToolCTRL Brand Identity/` (215 MB Raw-Assets) - **Gitignore**: `.env`, `node_modules`, `dist`, `_bmad/`-Tools (Bmad-Framework), `.claude/`, `ToolCTRL Brand Identity/` (215 MB Raw-Assets)
--- ---
+8 -1
View File
@@ -15,7 +15,14 @@ COPY apps/api ./apps/api
COPY packages/db ./packages/db COPY packages/db ./packages/db
COPY packages/shared ./packages/shared COPY packages/shared ./packages/shared
RUN pnpm --filter api build # Die Workspace-Libs werden zur Laufzeit (Node) als JS geladen. Ihre tsconfig hat
# jedoch noEmit:true und main zeigt auf die TS-Quelle — Node kann das nicht laden.
# Daher hier mit Emit kompilieren und main/exports im Image auf die dist-Artefakte
# umbiegen (nur im Image; Repo-Quelle, Dev-Modus und Web-/Vite-Build bleiben unberührt).
RUN pnpm exec tsc -p packages/shared/tsconfig.json --noEmit false \
&& pnpm exec tsc -p packages/db/tsconfig.json --noEmit false \
&& pnpm --filter api build \
&& node -e "const fs=require('fs');for(const p of ['packages/db','packages/shared']){const f=p+'/package.json';const j=JSON.parse(fs.readFileSync(f,'utf8'));const fix=s=>s.replace('./src/','./dist/').replace(/[.]ts$/,'.js');if(j.main){j.main=fix(j.main);j.types=j.main.replace(/[.]js$/,'.d.ts');}if(j.exports)for(const k in j.exports){if(typeof j.exports[k]==='string')j.exports[k]=fix(j.exports[k]);}fs.writeFileSync(f,JSON.stringify(j,null,2));}"
# --- runtime --- # --- runtime ---
FROM node:22-alpine AS runtime FROM node:22-alpine AS runtime
+7 -2
View File
@@ -111,13 +111,18 @@ export async function registerAuthRoutes(app: FastifyInstance): Promise<void> {
// die App ohne Authentik durchnavigierbar ist. Authentik kommt in der späteren // die App ohne Authentik durchnavigierbar ist. Authentik kommt in der späteren
// Roadmap. Nur aktiv bei NODE_ENV=development. // Roadmap. Nur aktiv bei NODE_ENV=development.
if (env.NODE_ENV === 'development') { if (env.NODE_ENV === 'development') {
const handler = async (req: import('fastify').FastifyRequest, reply: import('fastify').FastifyReply) => { const handler = async (
req: import('fastify').FastifyRequest,
reply: import('fastify').FastifyReply,
) => {
const { getDb } = await import('../db.js'); const { getDb } = await import('../db.js');
const { user } = await import('@cockpit/db'); const { user } = await import('@cockpit/db');
const { eq } = await import('drizzle-orm'); const { eq } = await import('drizzle-orm');
const { db } = getDb(); const { db } = getDb();
const found = (await db.select().from(user).where(eq(user.email, 'dejan@tool-ctrl.de')).limit(1))[0]; const found = (
await db.select().from(user).where(eq(user.email, 'dejan@tool-ctrl.de')).limit(1)
)[0];
const userRow = found const userRow = found
? found ? found
: await upsertUserFromOidc({ : await upsertUserFromOidc({
+30 -1
View File
@@ -1,8 +1,10 @@
import type { FastifyInstance, FastifyRequest } from 'fastify'; import type { FastifyInstance, FastifyRequest } from 'fastify';
import { isNull } from 'drizzle-orm';
import { dayEntry } from '@cockpit/db';
import { loadEnv } from '../env.js'; import { loadEnv } from '../env.js';
import { logger } from '../lib/logger.js'; import { logger } from '../lib/logger.js';
import { getDb } from '../db.js'; import { getDb } from '../db.js';
import { publishYesterdaysEntries } from '../routers/day-entry.js'; import { publishYesterdaysEntries, applyWorkdayBoundary } from '../routers/day-entry.js';
import { previousWerktag, todayIso } from '../lib/werktag.js'; import { previousWerktag, todayIso } from '../lib/werktag.js';
function authorize(req: FastifyRequest): void { function authorize(req: FastifyRequest): void {
@@ -15,6 +17,33 @@ function authorize(req: FastifyRequest): void {
} }
export async function registerCronRoutes(app: FastifyInstance): Promise<void> { export async function registerCronRoutes(app: FastifyInstance): Promise<void> {
// 6-Uhr-Schnitt teamweit: beendet offene Nacht-Einträge, deren Arbeitstag
// abgelaufen ist, und startet den Folge-Tag. Lazy passiert das ohnehin beim
// nächsten Request der Person — dieser Cron (≈06:05) hält das Team-Dashboard
// konsistent, auch ohne dass die Person aktiv wird.
app.post('/internal/cron/apply-workday-boundaries', async (req, reply) => {
try {
authorize(req);
} catch (err) {
reply.code(401);
logger.warn({ err }, 'unauthorized cron call');
return { error: 'unauthorized' };
}
const { db } = getDb();
const now = new Date();
const openRows = await db
.selectDistinct({ userId: dayEntry.userId })
.from(dayEntry)
.where(isNull(dayEntry.checkedOutAt));
let cut = 0;
for (const { userId } of openRows) {
await applyWorkdayBoundary(db, userId, now);
cut++;
}
logger.info({ usersChecked: cut }, 'applied workday boundaries');
return { ok: true, usersChecked: cut };
});
app.post('/internal/cron/publish-day-entries', async (req, reply) => { app.post('/internal/cron/publish-day-entries', async (req, reply) => {
try { try {
authorize(req); authorize(req);
+7
View File
@@ -19,6 +19,13 @@ const envSchema = z.object({
CRON_BEARER_TOKEN: z.string().min(8), CRON_BEARER_TOKEN: z.string().min(8),
PUBLIC_BASE_URL: z.string().url().default('http://localhost:5173'), PUBLIC_BASE_URL: z.string().url().default('http://localhost:5173'),
// Kimai-Anbindung (optional). Erst wenn alle gesetzt sind, wird beim
// Check-In/Out wirklich nach Kimai synchronisiert; sonst No-Op.
KIMAI_BASE_URL: z.string().url().optional(),
KIMAI_API_TOKEN: z.string().min(1).optional(),
KIMAI_PROJECT_ID: z.coerce.number().int().optional(),
KIMAI_ACTIVITY_ID: z.coerce.number().int().optional(),
}); });
export type Env = z.infer<typeof envSchema>; export type Env = z.infer<typeof envSchema>;
+54
View File
@@ -0,0 +1,54 @@
import { describe, it, expect } from 'vitest';
import { parseCsv, normalizeHeader } from './csv.js';
describe('parseCsv', () => {
it('parst einfache Zeilen', () => {
expect(parseCsv('a,b,c\n1,2,3')).toEqual([
['a', 'b', 'c'],
['1', '2', '3'],
]);
});
it('ignoriert einen abschließenden Zeilenumbruch', () => {
expect(parseCsv('a,b\n1,2\n')).toEqual([
['a', 'b'],
['1', '2'],
]);
});
it('behandelt \\r\\n', () => {
expect(parseCsv('a,b\r\n1,2')).toEqual([
['a', 'b'],
['1', '2'],
]);
});
it('respektiert Anführungszeichen mit Komma und Quote-Escape', () => {
expect(parseCsv('a,b\n"x, y","sagt ""hi"""')).toEqual([
['a', 'b'],
['x, y', 'sagt "hi"'],
]);
});
it('erlaubt Zeilenumbruch innerhalb von Quotes', () => {
expect(parseCsv('a,b\n"erste\nzweite",2')).toEqual([
['a', 'b'],
['erste\nzweite', '2'],
]);
});
it('behält leere Felder', () => {
expect(parseCsv('a,b,c\n1,,3')).toEqual([
['a', 'b', 'c'],
['1', '', '3'],
]);
});
});
describe('normalizeHeader', () => {
it('normalisiert Umlaute und Sonderzeichen', () => {
expect(normalizeHeader('E-Mail')).toBe('email');
expect(normalizeHeader('Straße')).toBe('strasse');
expect(normalizeHeader(' Quelle ')).toBe('quelle');
});
});
+54
View File
@@ -0,0 +1,54 @@
// Minimaler, robuster CSV-Parser (RFC-4180-nah): unterstützt Anführungszeichen,
// eingebettete Kommata/Zeilenumbrüche und doppelte Quotes ("") als Escape.
export function parseCsv(input: string): string[][] {
const text = input.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
const rows: string[][] = [];
let row: string[] = [];
let field = '';
let inQuotes = false;
for (let i = 0; i < text.length; i++) {
const c = text[i];
if (inQuotes) {
if (c === '"') {
if (text[i + 1] === '"') {
field += '"';
i++;
} else {
inQuotes = false;
}
} else {
field += c;
}
} else if (c === '"') {
inQuotes = true;
} else if (c === ',') {
row.push(field);
field = '';
} else if (c === '\n') {
row.push(field);
rows.push(row);
row = [];
field = '';
} else {
field += c;
}
}
// Letztes Feld / letzte Zeile (falls Datei nicht mit \n endet).
if (field !== '' || row.length > 0) {
row.push(field);
rows.push(row);
}
return rows;
}
// Header-Zelle auf einen vergleichbaren Schlüssel normalisieren
// ("E-Mail" → "email", "Straße" → "strasse").
export function normalizeHeader(h: string): string {
return h
.trim()
.toLowerCase()
.replace(/ß/g, 'ss')
.replace(/[^a-z0-9]/g, '');
}
+36
View File
@@ -0,0 +1,36 @@
import { describe, it, expect } from 'vitest';
import { germanNationwideHolidays, isGermanHoliday } from './holidays.js';
import { isWerktag } from './werktag.js';
describe('germanNationwideHolidays', () => {
it('feste Feiertage 2026', () => {
const h = germanNationwideHolidays(2026);
for (const d of ['2026-01-01', '2026-05-01', '2026-10-03', '2026-12-25', '2026-12-26']) {
expect(h.has(d)).toBe(true);
}
});
it('oster-abhängige Feiertage 2026 (Ostern = 05.04.2026)', () => {
const h = germanNationwideHolidays(2026);
expect(h.has('2026-04-03')).toBe(true); // Karfreitag
expect(h.has('2026-04-06')).toBe(true); // Ostermontag
expect(h.has('2026-05-14')).toBe(true); // Christi Himmelfahrt
expect(h.has('2026-05-25')).toBe(true); // Pfingstmontag
});
it('oster-abhängige Feiertage 2025 (Ostern = 20.04.2025)', () => {
const h = germanNationwideHolidays(2025);
expect(h.has('2025-04-18')).toBe(true); // Karfreitag
expect(h.has('2025-06-09')).toBe(true); // Pfingstmontag
});
it('normale Tage sind keine Feiertage', () => {
expect(isGermanHoliday('2026-06-08')).toBe(false);
});
it('isWerktag behandelt Feiertage als Nicht-Werktag', () => {
expect(isWerktag('2026-05-01')).toBe(false); // Tag der Arbeit (Freitag)
expect(isWerktag('2026-05-25')).toBe(false); // Pfingstmontag
expect(isWerktag('2026-06-08')).toBe(true); // normaler Montag
});
});
+60
View File
@@ -0,0 +1,60 @@
// Bundesweite gesetzliche Feiertage in Deutschland. Diese 9 gelten in ALLEN
// Bundesländern — sie als Nicht-Werktag zu behandeln ist daher immer korrekt.
// Landesspezifische Feiertage (z. B. Fronleichnam, Reformationstag) sind hier
// bewusst NICHT enthalten; die können bei Bedarf pro Bundesland ergänzt werden.
const cache = new Map<number, Set<string>>();
function isoFromParts(year: number, month: number, day: number): string {
return new Date(Date.UTC(year, month - 1, day)).toISOString().slice(0, 10);
}
function addDays(year: number, month: number, day: number, offset: number): string {
const d = new Date(Date.UTC(year, month - 1, day));
d.setUTCDate(d.getUTCDate() + offset);
return d.toISOString().slice(0, 10);
}
// Ostersonntag (gregorianisch) nach Meeus/Jones/Butcher.
function easterSunday(year: number): { month: number; day: number } {
const a = year % 19;
const b = Math.floor(year / 100);
const c = year % 100;
const d = Math.floor(b / 4);
const e = b % 4;
const f = Math.floor((b + 8) / 25);
const g = Math.floor((b - f + 1) / 3);
const h = (19 * a + b - d - g + 15) % 30;
const i = Math.floor(c / 4);
const k = c % 4;
const l = (32 + 2 * e + 2 * i - h - k) % 7;
const m = Math.floor((a + 11 * h + 22 * l) / 451);
const month = Math.floor((h + l - 7 * m + 114) / 31); // 3 = März, 4 = April
const day = ((h + l - 7 * m + 114) % 31) + 1;
return { month, day };
}
export function germanNationwideHolidays(year: number): Set<string> {
const cached = cache.get(year);
if (cached) return cached;
const e = easterSunday(year);
const set = new Set<string>([
isoFromParts(year, 1, 1), // Neujahr
addDays(year, e.month, e.day, -2), // Karfreitag
addDays(year, e.month, e.day, 1), // Ostermontag
isoFromParts(year, 5, 1), // Tag der Arbeit
addDays(year, e.month, e.day, 39), // Christi Himmelfahrt
addDays(year, e.month, e.day, 50), // Pfingstmontag
isoFromParts(year, 10, 3), // Tag der Deutschen Einheit
isoFromParts(year, 12, 25), // 1. Weihnachtstag
isoFromParts(year, 12, 26), // 2. Weihnachtstag
]);
cache.set(year, set);
return set;
}
export function isGermanHoliday(iso: string): boolean {
const year = Number(iso.slice(0, 4));
if (!Number.isFinite(year)) return false;
return germanNationwideHolidays(year).has(iso);
}
+105
View File
@@ -0,0 +1,105 @@
// Kimai-Anbindung (optional). Nur wenn KIMAI_BASE_URL + KIMAI_API_TOKEN +
// KIMAI_PROJECT_ID + KIMAI_ACTIVITY_ID gesetzt sind, wird wirklich synchronisiert;
// sonst No-Op. Alle Calls sind best-effort — ein Kimai-Ausfall darf den
// ebw-Check-In/Out NIE blockieren.
import { loadEnv } from '../env.js';
import { logger } from './logger.js';
type KimaiConfig = {
baseUrl: string;
token: string;
projectId: number;
activityId: number;
};
function kimaiConfig(): KimaiConfig | null {
const env = loadEnv();
if (
env.KIMAI_BASE_URL &&
env.KIMAI_API_TOKEN &&
env.KIMAI_PROJECT_ID !== undefined &&
env.KIMAI_ACTIVITY_ID !== undefined
) {
return {
baseUrl: env.KIMAI_BASE_URL.replace(/\/$/, ''),
token: env.KIMAI_API_TOKEN,
projectId: env.KIMAI_PROJECT_ID,
activityId: env.KIMAI_ACTIVITY_ID,
};
}
return null;
}
export function kimaiEnabled(): boolean {
return kimaiConfig() !== null;
}
async function safeText(res: Response): Promise<string> {
try {
return (await res.text()).slice(0, 300);
} catch {
return '';
}
}
/**
* Startet ein laufendes Timesheet in Kimai (Clock-In). Liefert die Kimai-
* Timesheet-ID zurück oder null (nicht konfiguriert / Fehler).
*/
export async function kimaiClockIn(opts: {
begin: Date;
description?: string;
}): Promise<number | null> {
const cfg = kimaiConfig();
if (!cfg) {
logger.debug('kimai not configured — clock-in skipped');
return null;
}
try {
const res = await fetch(`${cfg.baseUrl}/api/timesheets`, {
method: 'POST',
headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${cfg.token}` },
body: JSON.stringify({
begin: opts.begin.toISOString(),
project: cfg.projectId,
activity: cfg.activityId,
description: opts.description ?? 'ebw Check-In',
}),
});
if (!res.ok) {
logger.warn({ status: res.status, body: await safeText(res) }, 'kimai clock-in failed');
return null;
}
const data = (await res.json()) as { id?: number };
return typeof data.id === 'number' ? data.id : null;
} catch (err) {
logger.warn({ err }, 'kimai clock-in error');
return null;
}
}
/**
* Stoppt das laufende Timesheet in Kimai (Clock-Out). Best-effort.
*/
export async function kimaiClockOut(opts: { timesheetId: number }): Promise<boolean> {
const cfg = kimaiConfig();
if (!cfg) {
logger.debug('kimai not configured — clock-out skipped');
return false;
}
try {
const res = await fetch(`${cfg.baseUrl}/api/timesheets/${opts.timesheetId}/stop`, {
method: 'PATCH',
headers: { Authorization: `Bearer ${cfg.token}` },
});
if (!res.ok) {
logger.warn({ status: res.status, body: await safeText(res) }, 'kimai clock-out failed');
return false;
}
return true;
} catch (err) {
logger.warn({ err }, 'kimai clock-out error');
return false;
}
}
+15 -18
View File
@@ -1,32 +1,32 @@
// Pflicht-Minimum-Berechnung (Leitfaden §9). // Pflicht-Minimum-Berechnung (Leitfaden §9).
// Punkte 1–4 + 6 werden manuell in der App gepflegt; Punkt 5 (Status-Ampel aktuell) // Punkte 1–4 + 6 werden manuell in der App gepflegt; Punkt 5 (Status-Ampel aktuell)
// wird hier zeitabhängig berechnet und im Cron auf alle Projekte aktualisiert. // wird hier zeitabhängig berechnet und im Cron aktualisiert.
import { eq, isNotNull, isNull, and, desc } from 'drizzle-orm'; import { eq, desc } from 'drizzle-orm';
import { project, dayEntry } from '@cockpit/db'; import { project, projectStatus } from '@cockpit/db';
import { werktageBetween, todayIso } from './werktag.js'; import type { Db } from '@cockpit/db';
import { werktageBetween, todayIso, formatIsoDate } from './werktag.js';
const MAX_AGE_WERKTAGE = 7; const MAX_AGE_WERKTAGE = 7;
export async function recomputePflichtMinimumStatusActual( export async function recomputePflichtMinimumStatusActual(db: Db): Promise<{ updated: number }> {
db: import('@cockpit/db').Db,
): Promise<{ updated: number }> {
const projects = await db.select().from(project).where(eq(project.archiviert, false)); const projects = await db.select().from(project).where(eq(project.archiviert, false));
const today = todayIso(); const today = todayIso();
let updated = 0; let updated = 0;
for (const p of projects) { for (const p of projects) {
// Letzte Reflexion mit Projektbezug? (Vereinfachung: letzter day_entry mit Ampel, // Jüngsten Statusbericht DIESES Projekts heranziehen (statt global).
// dessen Update das Projekt-Status-Cache gesetzt hat = `status_cache` selbst.) const last = (
const lastEntry = (
await db await db
.select() .select({ createdAt: projectStatus.createdAt })
.from(dayEntry) .from(projectStatus)
.where(and(isNotNull(dayEntry.reflectedAt))) .where(eq(projectStatus.projectId, p.id))
.orderBy(desc(dayEntry.reflectedAt)) .orderBy(desc(projectStatus.createdAt))
.limit(1) .limit(1)
)[0]; )[0];
const actual = lastEntry ? werktageBetween(lastEntry.date, today) <= MAX_AGE_WERKTAGE : false; const actual = last
? werktageBetween(formatIsoDate(last.createdAt), today) <= MAX_AGE_WERKTAGE
: false;
const newState = { ...p.pflichtMinimumState, status_aktuell: actual }; const newState = { ...p.pflichtMinimumState, status_aktuell: actual };
if (JSON.stringify(newState) !== JSON.stringify(p.pflichtMinimumState)) { if (JSON.stringify(newState) !== JSON.stringify(p.pflichtMinimumState)) {
@@ -36,6 +36,3 @@ export async function recomputePflichtMinimumStatusActual(
} }
return { updated }; return { updated };
} }
// linter
void isNull;
+87
View File
@@ -0,0 +1,87 @@
import { describe, it, expect } from 'vitest';
import { countStreakDays } from './streak.js';
const S = (...d: string[]) => new Set(d);
const NONE = new Set<string>();
describe('countStreakDays', () => {
it('zählt aufeinanderfolgende volle Werktage', () => {
// Mi/Di/Mo voll, heute Mi
expect(
countStreakDays({
today: '2026-06-10',
fullDates: S('2026-06-10', '2026-06-09', '2026-06-08'),
absenceDates: NONE,
}),
).toBe(3);
});
it('heute noch nicht reflektiert → Schonfrist (zählt ab gestern)', () => {
expect(
countStreakDays({
today: '2026-06-10',
fullDates: S('2026-06-09', '2026-06-08'),
absenceDates: NONE,
}),
).toBe(2);
});
it('bricht bei einem ausgelassenen Werktag', () => {
// 06-09 fehlt
expect(
countStreakDays({
today: '2026-06-10',
fullDates: S('2026-06-10', '2026-06-08'),
absenceDates: NONE,
}),
).toBe(1);
});
it('Wochenende ist neutral (Fr + Mo zählt durch)', () => {
// heute Mo 06-08, Fr 06-05 voll; 06-04 (Do) fehlt → 2
expect(
countStreakDays({
today: '2026-06-08',
fullDates: S('2026-06-08', '2026-06-05'),
absenceDates: NONE,
}),
).toBe(2);
});
it('Abwesenheit ist neutral (überspringen, nicht brechen)', () => {
// heute Mi 06-10 voll, Di 06-09 Urlaub, Mo 06-08 voll
expect(
countStreakDays({
today: '2026-06-10',
fullDates: S('2026-06-10', '2026-06-08'),
absenceDates: S('2026-06-09'),
}),
).toBe(2);
});
it('Feiertag bricht die Streak NICHT (Pfingstmontag 25.05.2026)', () => {
// heute Mi 05-27, Di 05-26 voll, Mo 05-25 Pfingstmontag, Fr 05-22 voll
expect(
countStreakDays({
today: '2026-05-27',
fullDates: S('2026-05-27', '2026-05-26', '2026-05-22'),
absenceDates: NONE,
}),
).toBe(3);
});
it('Reflexion am Wochenende zählt nicht zu 0 (zählt Freitag)', () => {
// heute Sa 06-06, voll am Sa + Fr 06-05; früher nichts
expect(
countStreakDays({
today: '2026-06-06',
fullDates: S('2026-06-06', '2026-06-05'),
absenceDates: NONE,
}),
).toBe(1);
});
it('leere Historie → 0', () => {
expect(countStreakDays({ today: '2026-06-10', fullDates: NONE, absenceDates: NONE })).toBe(0);
});
});
+47
View File
@@ -0,0 +1,47 @@
import { isWerktag, previousWerktag } from './werktag.js';
/**
* Zählt aufeinanderfolgende Werktage (Mo-Fr, ohne Feiertage) mit voller
* Reflexion, rückwärts ab `today`.
*
* Regeln:
* - Nur Tage in `fullDates` (status = 'full') zählen.
* - Tage in `absenceDates` (Urlaub/Krank/…) sind neutral: überspringen, nicht
* zählen, nicht brechen.
* - Wochenenden und Feiertage sind keine Werktage → übersprungen.
* - Heute ist Schonfrist: ist heute noch nicht voll, wird ab dem vorherigen
* Werktag gezählt (die laufende Streak bleibt über den Tag erhalten).
* - Bricht beim ersten Werktag, der weder voll noch Abwesenheit ist.
*/
export function countStreakDays(opts: {
today: string;
fullDates: Set<string>;
absenceDates: Set<string>;
}): number {
const { today, fullDates, absenceDates } = opts;
let cursor = today;
let streak = 0;
// Heute noch nicht reflektiert → ab vorherigem Werktag zählen.
if (!fullDates.has(cursor)) cursor = previousWerktag(today);
while (true) {
// Nicht-Werktag (z. B. an einem Wochenende/Feiertag reflektiert) überspringen,
// statt die Streak fälschlich abzubrechen.
if (!isWerktag(cursor)) {
cursor = previousWerktag(cursor);
continue;
}
if (absenceDates.has(cursor)) {
cursor = previousWerktag(cursor);
continue;
}
if (fullDates.has(cursor)) {
streak++;
cursor = previousWerktag(cursor);
continue;
}
break;
}
return streak;
}
+75 -11
View File
@@ -1,5 +1,16 @@
import { describe, it, expect } from 'vitest'; import { describe, it, expect } from 'vitest';
import { formatIsoDate, isWerktag, nextWerktag, previousWerktag, werktageBetween } from './werktag'; import {
formatIsoDate,
isWerktag,
nextWerktag,
previousWerktag,
werktageBetween,
berlinDayStartMs,
addCalendarDays,
workdayCutoffMs,
isWorkdaySealed,
isEditableWithinGrace,
} from './werktag';
describe('werktag', () => { describe('werktag', () => {
it('formatIsoDate liefert YYYY-MM-DD in Berlin TZ', () => { it('formatIsoDate liefert YYYY-MM-DD in Berlin TZ', () => {
@@ -7,24 +18,77 @@ describe('werktag', () => {
expect(formatIsoDate(d)).toBe('2026-05-25'); expect(formatIsoDate(d)).toBe('2026-05-25');
}); });
it('isWerktag erkennt Mo-Fr', () => { it('isWerktag erkennt Mo-Fr (ohne Feiertage)', () => {
expect(isWerktag('2026-05-25')).toBe(true); // Mo expect(isWerktag('2026-06-08')).toBe(true); // Mo
expect(isWerktag('2026-05-29')).toBe(true); // Fr expect(isWerktag('2026-06-12')).toBe(true); // Fr
expect(isWerktag('2026-05-30')).toBe(false); // Sa expect(isWerktag('2026-06-13')).toBe(false); // Sa
expect(isWerktag('2026-05-31')).toBe(false); // So expect(isWerktag('2026-06-14')).toBe(false); // So
}); });
it('nextWerktag springt über Wochenende', () => { it('nextWerktag springt über Wochenende', () => {
expect(nextWerktag('2026-05-29')).toBe('2026-06-01'); // Fr → Mo expect(nextWerktag('2026-06-12')).toBe('2026-06-15'); // Fr → Mo
expect(nextWerktag('2026-05-25')).toBe('2026-05-26'); // Mo → Di expect(nextWerktag('2026-06-08')).toBe('2026-06-09'); // Mo → Di
}); });
it('previousWerktag springt über Wochenende', () => { it('previousWerktag springt über Wochenende', () => {
expect(previousWerktag('2026-06-01')).toBe('2026-05-29'); // Mo → Fr expect(previousWerktag('2026-06-15')).toBe('2026-06-12'); // Mo → Fr
}); });
it('werktageBetween zählt korrekt', () => { it('werktageBetween zählt korrekt', () => {
// Mo 2026-05-25 bis Mo 2026-06-01 (exkl.): 5 Werktage // Mo 2026-06-08 bis Mo 2026-06-15 (exkl.): 5 Werktage
expect(werktageBetween('2026-05-25', '2026-06-01')).toBe(5); expect(werktageBetween('2026-06-08', '2026-06-15')).toBe(5);
});
it('berlinDayStartMs ist DST-korrekt', () => {
// Sommer (CEST, +2): 00:00 Berlin = 22:00 UTC am Vortag
expect(berlinDayStartMs('2026-06-06')).toBe(Date.parse('2026-06-05T22:00:00Z'));
// Winter (CET, +1): 00:00 Berlin = 23:00 UTC am Vortag
expect(berlinDayStartMs('2026-01-15')).toBe(Date.parse('2026-01-14T23:00:00Z'));
});
it('addCalendarDays verschiebt Kalendertage (auch über Monatsgrenze)', () => {
expect(addCalendarDays('2026-06-07', 1)).toBe('2026-06-08');
expect(addCalendarDays('2026-06-30', 1)).toBe('2026-07-01');
expect(addCalendarDays('2026-06-07', -1)).toBe('2026-06-06');
});
it('workdayCutoffMs ist 06:00 Berlin am Folgetag (DST-korrekt)', () => {
// Sommer (CEST, +2): 06:00 Berlin = 04:00 UTC
expect(workdayCutoffMs('2026-06-06')).toBe(Date.parse('2026-06-07T04:00:00Z'));
// Winter (CET, +1): 06:00 Berlin = 05:00 UTC
expect(workdayCutoffMs('2026-01-15')).toBe(Date.parse('2026-01-16T05:00:00Z'));
});
describe('isWorkdaySealed — der Arbeitstag = Check-in-Kalendertag', () => {
// Eintrag mit Datum Sa 2026-06-06 (Check-in irgendwann an dem Tag).
const entry = '2026-06-06';
it('vor Mitternacht: nicht versiegelt', () => {
expect(isWorkdaySealed(entry, new Date('2026-06-06T22:00:00+02:00'))).toBe(false);
});
it('nach Mitternacht, aber vor 06:00: noch der Arbeitstag (nicht versiegelt)', () => {
// 03:00 in der Nacht → gehört noch zum 06.
expect(isWorkdaySealed(entry, new Date('2026-06-07T03:00:00+02:00'))).toBe(false);
});
it('um/nach 06:00 des Folgetags: versiegelt', () => {
expect(isWorkdaySealed(entry, new Date('2026-06-07T06:00:00+02:00'))).toBe(true);
expect(isWorkdaySealed(entry, new Date('2026-06-07T09:00:00+02:00'))).toBe(true);
});
it('ein nach Mitternacht begonnener Tag (Datum = 07.) gilt um 06:00 noch nicht als versiegelt', () => {
const sameDayStart = '2026-06-07';
expect(isWorkdaySealed(sameDayStart, new Date('2026-06-07T06:00:00+02:00'))).toBe(false);
});
});
describe('isEditableWithinGrace — 3-Tage-Nachfrist', () => {
const entry = '2026-06-05'; // Fr
it('am Eintragstag selbst editierbar', () => {
expect(isEditableWithinGrace(entry, new Date('2026-06-05T20:00:00+02:00'))).toBe(true);
});
it('bis Ende des 3. Tages danach (08.) editierbar', () => {
expect(isEditableWithinGrace(entry, new Date('2026-06-08T23:00:00+02:00'))).toBe(true);
});
it('ab dem 4. Tag (09.) gesperrt', () => {
expect(isEditableWithinGrace(entry, new Date('2026-06-09T00:30:00+02:00'))).toBe(false);
});
}); });
}); });
+82 -2
View File
@@ -1,8 +1,18 @@
// Werktag-Logik in Europe/Berlin. Single source of truth fürs Backend // Werktag-Logik in Europe/Berlin. Single source of truth fürs Backend
// (Frontend bekommt fertige Felder). // (Frontend bekommt fertige Felder).
import { isGermanHoliday } from './holidays.js';
const TIMEZONE = 'Europe/Berlin'; const TIMEZONE = 'Europe/Berlin';
/**
* Uhrzeit (Berlin), zu der ein Arbeitstag „kippt": Wer um 06:00 noch eingestempelt
* ist, dessen Tag wird automatisch beendet (siehe `applyWorkdayBoundary`). Bis dahin
* gehört eine über Mitternacht laufende Session noch zum Tag, an dem eingestempelt
* wurde — der Arbeitstag eines Eintrags = der Kalendertag des Check-ins.
*/
export const WORKDAY_RESET_HOUR = 6;
/** /**
* Gibt das aktuelle Datum (oder `now`) als `YYYY-MM-DD` in Europe/Berlin zurück. * Gibt das aktuelle Datum (oder `now`) als `YYYY-MM-DD` in Europe/Berlin zurück.
*/ */
@@ -10,6 +20,45 @@ export function todayIso(now: Date = new Date()): string {
return formatIsoDate(now); return formatIsoDate(now);
} }
/**
* Verschiebt ein ISO-Datum um `n` Kalendertage (nicht Werktage). DST-robust, weil
* `parseIsoDate` von 12:00 UTC ausgeht und in Berlin formatiert wird.
*/
export function addCalendarDays(iso: string, n: number): string {
const d = parseIsoDate(iso);
return formatIsoDate(new Date(d.getTime() + n * 24 * 60 * 60 * 1000));
}
/**
* Epoch-ms des Zeitpunkts, ab dem der Arbeitstag mit Eintrags-Datum `entryDate`
* abgelaufen ist: 06:00 Europe/Berlin am Folgetag (DST-korrekt).
*/
export function workdayCutoffMs(entryDate: string): number {
return berlinDayStartMs(addCalendarDays(entryDate, 1)) + WORKDAY_RESET_HOUR * 60 * 60 * 1000;
}
/**
* True, wenn der Arbeitstag eines Eintrags (Datum = Check-in-Kalendertag) bereits
* „versiegelt" ist, d. h. `now` liegt am/nach 06:00 des Folgetags. Versiegelte Tage
* sind read-only und werden nicht mehr als aktiver Tag angezeigt.
*/
export function isWorkdaySealed(entryDate: string, now: Date = new Date()): boolean {
return now.getTime() >= workdayCutoffMs(entryDate);
}
/**
* True, solange ein Eintrag mit Datum `entryDate` noch nachträglich bearbeitet
* werden darf: bis zum Ende des `graceDays`-ten Kalendertages danach (Default 3).
* Genutzt für die Reflexion in der Historie (Tag selbst + 3 Tage Nachfrist).
*/
export function isEditableWithinGrace(
entryDate: string,
now: Date = new Date(),
graceDays = 3,
): boolean {
return now.getTime() < berlinDayStartMs(addCalendarDays(entryDate, graceDays + 1));
}
export function formatIsoDate(d: Date): string { export function formatIsoDate(d: Date): string {
const fmt = new Intl.DateTimeFormat('en-CA', { const fmt = new Intl.DateTimeFormat('en-CA', {
timeZone: TIMEZONE, timeZone: TIMEZONE,
@@ -20,6 +69,36 @@ export function formatIsoDate(d: Date): string {
return fmt.format(d); // en-CA liefert ISO YYYY-MM-DD return fmt.format(d); // en-CA liefert ISO YYYY-MM-DD
} }
/**
* Epoch-ms von 00:00 Europe/Berlin am gegebenen Tag (DST-korrekt). Genutzt, um
* Tagesgrenzen für Zeit-Auswertungen zu bilden (z. B. Tagesanteil eines über
* Mitternacht laufenden Timers).
*/
export function berlinDayStartMs(iso: string): number {
const utcMidnight = Date.parse(`${iso}T00:00:00Z`);
const parts = new Intl.DateTimeFormat('en-US', {
timeZone: TIMEZONE,
hourCycle: 'h23',
year: 'numeric',
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
}).formatToParts(new Date(utcMidnight));
const get = (t: string) => Number(parts.find((p) => p.type === t)?.value ?? '0');
const asIfUtc = Date.UTC(
get('year'),
get('month') - 1,
get('day'),
get('hour'),
get('minute'),
get('second'),
);
const offset = asIfUtc - utcMidnight; // ms, die Berlin der UTC voraus ist
return utcMidnight - offset;
}
export function parseIsoDate(s: string): Date { export function parseIsoDate(s: string): Date {
if (!/^\d{4}-\d{2}-\d{2}$/.test(s)) { if (!/^\d{4}-\d{2}-\d{2}$/.test(s)) {
throw new Error(`Ungültiges ISO-Datum: ${s}`); throw new Error(`Ungültiges ISO-Datum: ${s}`);
@@ -29,12 +108,13 @@ export function parseIsoDate(s: string): Date {
} }
/** /**
* Mo-Fr = Werktag. Feiertage Phase 2. * Werktag = Mo-Fr und kein bundesweiter gesetzlicher Feiertag.
*/ */
export function isWerktag(s: string): boolean { export function isWerktag(s: string): boolean {
const d = parseIsoDate(s); const d = parseIsoDate(s);
const wd = new Intl.DateTimeFormat('en-US', { timeZone: TIMEZONE, weekday: 'short' }).format(d); const wd = new Intl.DateTimeFormat('en-US', { timeZone: TIMEZONE, weekday: 'short' }).format(d);
return wd !== 'Sat' && wd !== 'Sun'; if (wd === 'Sat' || wd === 'Sun') return false;
return !isGermanHoliday(s);
} }
export function nextWerktag(s: string): string { export function nextWerktag(s: string): string {
+2
View File
@@ -14,6 +14,7 @@ import { campaignRouter } from './campaign.js';
import { areaRouter } from './area.js'; import { areaRouter } from './area.js';
import { blockerRouter } from './blocker.js'; import { blockerRouter } from './blocker.js';
import { timeRouter } from './time.js'; import { timeRouter } from './time.js';
import { searchRouter } from './search.js';
export const appRouter = router({ export const appRouter = router({
health: publicProcedure.query(() => ({ health: publicProcedure.query(() => ({
@@ -34,6 +35,7 @@ export const appRouter = router({
dayEntry: dayEntryRouter, dayEntry: dayEntryRouter,
time: timeRouter, time: timeRouter,
dashboard: dashboardRouter, dashboard: dashboardRouter,
search: searchRouter,
}); });
export type AppRouter = typeof appRouter; export type AppRouter = typeof appRouter;
+2 -2
View File
@@ -2,7 +2,7 @@ import { z } from 'zod';
import { TRPCError } from '@trpc/server'; import { TRPCError } from '@trpc/server';
import { eq, isNull, desc } from 'drizzle-orm'; import { eq, isNull, desc } from 'drizzle-orm';
import { blocker, project, user } from '@cockpit/db'; import { blocker, project, user } from '@cockpit/db';
import { router, protectedProcedure } from '../trpc.js'; import { router, protectedProcedure, auditedProcedure } from '../trpc.js';
export const blockerRouter = router({ export const blockerRouter = router({
listOpen: protectedProcedure.query(async ({ ctx }) => { listOpen: protectedProcedure.query(async ({ ctx }) => {
@@ -52,7 +52,7 @@ export const blockerRouter = router({
return created; return created;
}), }),
resolve: protectedProcedure resolve: auditedProcedure('blocker.resolve')
.input( .input(
z.object({ z.object({
blockerId: z.string().uuid(), blockerId: z.string().uuid(),
+2 -1
View File
@@ -41,7 +41,8 @@ export const changeRouter = router({
const existing = ( const existing = (
await ctx.db.select().from(changeEntry).where(eq(changeEntry.id, id)).limit(1) await ctx.db.select().from(changeEntry).where(eq(changeEntry.id, id)).limit(1)
)[0]; )[0];
if (!existing) throw new TRPCError({ code: 'NOT_FOUND', message: 'Eintrag nicht gefunden.' }); if (!existing)
throw new TRPCError({ code: 'NOT_FOUND', message: 'Eintrag nicht gefunden.' });
return existing; return existing;
} }
const [updated] = await ctx.db const [updated] = await ctx.db
+64 -8
View File
@@ -1,5 +1,15 @@
import { and, eq, ne, isNotNull, isNull, count } from 'drizzle-orm'; import { and, eq, ne, isNull, isNotNull, lt, count, asc, desc } from 'drizzle-orm';
import { area, project, blocker, dayEntry, user, risk, type Area, type Project } from '@cockpit/db'; import {
area,
project,
blocker,
dayEntry,
user,
risk,
milestone,
type Area,
type Project,
} from '@cockpit/db';
import { router, protectedProcedure } from '../trpc.js'; import { router, protectedProcedure } from '../trpc.js';
import { todayIso, previousWerktag } from '../lib/werktag.js'; import { todayIso, previousWerktag } from '../lib/werktag.js';
import { aggregateAreaAmpel } from '../lib/ampel.js'; import { aggregateAreaAmpel } from '../lib/ampel.js';
@@ -7,8 +17,16 @@ import { aggregateAreaAmpel } from '../lib/ampel.js';
export const dashboardRouter = router({ export const dashboardRouter = router({
overview: protectedProcedure.query(async ({ ctx }) => { overview: protectedProcedure.query(async ({ ctx }) => {
const todayDate = todayIso(); const todayDate = todayIso();
const [areas, allProjects, openBlockers, todayPresence, totalActiveUsers, feedRows, showstopperRows] = const [
await Promise.all([ areas,
allProjects,
openBlockers,
todayPresence,
totalActiveUsers,
feedRows,
showstopperRows,
milestoneRows,
] = await Promise.all([
ctx.db.select().from(area).orderBy(area.order), ctx.db.select().from(area).orderBy(area.order),
ctx.db.select().from(project).where(eq(project.archiviert, false)), ctx.db.select().from(project).where(eq(project.archiviert, false)),
ctx.db.select().from(blocker).where(isNull(blocker.resolvedAt)), ctx.db.select().from(blocker).where(isNull(blocker.resolvedAt)),
@@ -30,8 +48,10 @@ export const dashboardRouter = router({
}) })
.from(dayEntry) .from(dayEntry)
.innerJoin(user, eq(user.id, dayEntry.userId)) .innerJoin(user, eq(user.id, dayEntry.userId))
.where(and(isNotNull(dayEntry.publishedAt), eq(dayEntry.status, 'full'))) // „Gestern im Team": volle Reflexionen vor heute (heutige bleiben privat
.orderBy(dayEntry.publishedAt) // bis morgen). Unabhängig vom publish-Cron.
.where(and(lt(dayEntry.date, todayDate), eq(dayEntry.status, 'full')))
.orderBy(desc(dayEntry.date), desc(dayEntry.reflectedAt))
.limit(50), .limit(50),
ctx.db ctx.db
.select({ .select({
@@ -50,6 +70,29 @@ export const dashboardRouter = router({
eq(project.archiviert, false), eq(project.archiviert, false),
), ),
), ),
// Anstehende Meilensteine (offen/überfällig, mit Datum) projektübergreifend.
ctx.db
.select({
id: milestone.id,
title: milestone.title,
due: milestone.due,
status: milestone.status,
projectId: milestone.projectId,
projectName: project.name,
projectLogoUrl: project.logoUrl,
areaId: project.areaId,
})
.from(milestone)
.innerJoin(project, eq(project.id, milestone.projectId))
.where(
and(
ne(milestone.status, 'done'),
isNotNull(milestone.due),
eq(project.archiviert, false),
),
)
.orderBy(asc(milestone.due))
.limit(15),
]); ]);
const projectsByArea = new Map<string, Project[]>(); const projectsByArea = new Map<string, Project[]>();
@@ -72,6 +115,15 @@ export const dashboardRouter = router({
}; };
}); });
// „Gestern im Team": pro User nur die neueste Reflexion (feedRows ist nach
// date desc, reflectedAt desc sortiert → erster Treffer je User = aktuellste).
const seenUsers = new Set<string>();
const feedLatestPerUser = feedRows.filter((r) => {
if (seenUsers.has(r.userId)) return false;
seenUsers.add(r.userId);
return true;
});
const presentToday = new Set(todayPresence.map((p) => p.userId)); const presentToday = new Set(todayPresence.map((p) => p.userId));
const usersAll = await ctx.db const usersAll = await ctx.db
.select({ id: user.id, name: user.name }) .select({ id: user.id, name: user.name })
@@ -96,13 +148,17 @@ export const dashboardRouter = router({
}, },
jourfixe: { nextDate: nextJourfixe(todayDate), label: 'Di 11:00' }, jourfixe: { nextDate: nextJourfixe(todayDate), label: 'Di 11:00' },
showstoppers: showstopperRows, showstoppers: showstopperRows,
meilensteine: milestoneRows.map((m) => ({
...m,
ueberfaellig: m.due != null && m.due < todayDate,
})),
kritischeModi: allProjects kritischeModi: allProjects
.filter((p) => p.modus === 'eskalation' || p.modus === 'taskforce') .filter((p) => p.modus === 'eskalation' || p.modus === 'taskforce')
.map((p) => ({ id: p.id, name: p.name, areaId: p.areaId, modus: p.modus })), .map((p) => ({ id: p.id, name: p.name, areaId: p.areaId, modus: p.modus })),
pflichtMinimumOffen: allProjects pflichtMinimumOffen: allProjects
.filter((p) => Object.values(p.pflichtMinimumState).some((v) => v === false)) .filter((p) => Object.values(p.pflichtMinimumState).some((v) => v === false))
.map((p) => ({ id: p.id, name: p.name, areaId: p.areaId })), .map((p) => ({ id: p.id, name: p.name, areaId: p.areaId, logoUrl: p.logoUrl })),
feed: feedRows, feed: feedLatestPerUser,
gestern: previousWerktag(todayDate), gestern: previousWerktag(todayDate),
}; };
}), }),
+466 -30
View File
@@ -1,9 +1,130 @@
import { TRPCError } from '@trpc/server'; import { TRPCError } from '@trpc/server';
import { and, eq, isNull, isNotNull, lt, asc, inArray } from 'drizzle-orm'; import { z } from 'zod';
import { dayEntry, todo, blocker, type Todo } from '@cockpit/db'; import { and, eq, gt, gte, isNull, lt, lte, asc, desc, inArray } from 'drizzle-orm';
import { dayEntry, todo, blocker, user, type Db, type DayEntry, type Todo } from '@cockpit/db';
import { DayEntrySchemas } from '@cockpit/shared'; import { DayEntrySchemas } from '@cockpit/shared';
import { router, protectedProcedure } from '../trpc.js'; import { router, protectedProcedure } from '../trpc.js';
import { todayIso } from '../lib/werktag.js'; import {
todayIso,
previousWerktag,
addCalendarDays,
workdayCutoffMs,
isWorkdaySealed,
isEditableWithinGrace,
} from '../lib/werktag.js';
import { kimaiClockIn, kimaiClockOut, kimaiEnabled } from '../lib/kimai.js';
/**
* Der 6-Uhr-Schnitt: Ist um 06:00 (Berlin) noch ein Eintrag offen, dessen
* Arbeitstag (= Check-in-Kalendertag) abgelaufen ist, wird er automatisch beendet
* (checkedOutAt = 06:00 des Folgetags) und ein nahtloser Folge-Tag gestartet —
* offene ToDos wandern mit. So entstehen aus Nacht-Durcharbeiten saubere
* Tagesgrenzen, ohne dass der Nutzer manuell aus- und wieder einstempeln muss.
*
* Idempotent: ohne offenen, abgelaufenen Eintrag passiert nichts. Die Schleife
* deckt (selten) mehrtägiges Durchlaufen ab; das Limit ist ein Sicherheitsnetz.
*/
export async function applyWorkdayBoundary(db: Db, userId: string, now: Date): Promise<void> {
for (let i = 0; i < 14; i++) {
const open = (
await db
.select()
.from(dayEntry)
.where(and(eq(dayEntry.userId, userId), isNull(dayEntry.checkedOutAt)))
.orderBy(desc(dayEntry.date))
.limit(1)
)[0];
if (!open || !isWorkdaySealed(open.date, now)) return;
const cutoff = new Date(workdayCutoffMs(open.date));
const nextDate = addCalendarDays(open.date, 1);
await db.transaction(async (tx) => {
// 1) Alten Tag um 06:00 beenden.
await tx
.update(dayEntry)
.set({ checkedOutAt: cutoff, updatedAt: now })
.where(eq(dayEntry.id, open.id));
if (open.kimaiTimesheetId !== null && kimaiEnabled()) {
await kimaiClockOut({ timesheetId: open.kimaiTimesheetId });
}
// 2) Folge-Tag nur anlegen, wenn es ihn noch nicht gibt (unique userId+date).
const existsNext = (
await tx
.select({ id: dayEntry.id })
.from(dayEntry)
.where(and(eq(dayEntry.userId, userId), eq(dayEntry.date, nextDate)))
.limit(1)
)[0];
if (existsNext) return;
const [created] = await tx
.insert(dayEntry)
.values({
userId,
date: nextDate,
status: 'begun',
checkedInAt: cutoff,
// Kein echter Lock-in — Anwesenheits-Anzeigen ignorieren diesen Check-in.
autoCheckedIn: true,
})
.returning();
if (!created) throw new Error('Folge-Tag konnte nicht angelegt werden.');
// 3) Offene ToDos in den neuen Tag übernehmen (im alten als übertragen markiert).
const openTodos = await tx
.select()
.from(todo)
.where(and(eq(todo.dayEntryId, open.id), eq(todo.status, 'open')))
.orderBy(asc(todo.order));
if (openTodos.length > 0) {
await tx.insert(todo).values(
openTodos.map((t, idx) => ({
dayEntryId: created.id,
userId,
date: nextDate,
title: t.title,
order: idx,
bezugKind: t.bezugKind,
bezugId: t.bezugId,
carriedOver: true,
})),
);
await tx
.update(todo)
.set({ carriedOver: true })
.where(
inArray(
todo.id,
openTodos.map((t) => t.id),
),
);
}
});
}
}
/**
* Der aktive Arbeitstag des Nutzers nach Anwendung des 6-Uhr-Schnitts: der jüngste
* Eintrag, der noch nicht versiegelt ist (offen ODER bereits ausgecheckt, aber vor
* 06:00 des Folgetags — also noch fortsetzbar). `null`, wenn kein laufender/heutiger
* Tag existiert (→ Frontend zeigt das Einstempel-Formular).
*/
export async function getActiveEntry(db: Db, userId: string, now: Date): Promise<DayEntry | null> {
await applyWorkdayBoundary(db, userId, now);
const entry = (
await db
.select()
.from(dayEntry)
.where(eq(dayEntry.userId, userId))
.orderBy(desc(dayEntry.date))
.limit(1)
)[0];
if (!entry || isWorkdaySealed(entry.date, now)) return null;
return entry;
}
export const dayEntryRouter = router({ export const dayEntryRouter = router({
/** /**
@@ -13,11 +134,9 @@ export const dayEntryRouter = router({
*/ */
todayTeam: protectedProcedure.query(async ({ ctx }) => { todayTeam: protectedProcedure.query(async ({ ctx }) => {
const date = todayIso(); const date = todayIso();
const entries = await ctx.db const entries = await ctx.db.select().from(dayEntry).where(eq(dayEntry.date, date));
.select() if (entries.length === 0)
.from(dayEntry) return [] as Array<{ userId: string; entryStatus: string; todos: Todo[] }>;
.where(eq(dayEntry.date, date));
if (entries.length === 0) return [] as Array<{ userId: string; entryStatus: string; todos: Todo[] }>;
const ids = entries.map((e) => e.id); const ids = entries.map((e) => e.id);
const todos = await ctx.db const todos = await ctx.db
.select() .select()
@@ -64,25 +183,22 @@ export const dayEntryRouter = router({
}), }),
/** /**
* Heute-Status der eigenen Person. * Heute-Status der eigenen Person. „Heute" = der aktive Arbeitstag: ein laufender
* (offener) Eintrag bleibt aktiv, auch über Mitternacht hinaus, bis 06:00 des
* Folgetags. Ein bereits ausgecheckter Tag bleibt bis dahin sichtbar (fortsetzbar).
*/ */
today: protectedProcedure.query(async ({ ctx }) => { today: protectedProcedure.query(async ({ ctx }) => {
const date = todayIso(); const now = new Date();
const rows = await ctx.db const entry = await getActiveEntry(ctx.db, ctx.user.id, now);
.select()
.from(dayEntry)
.where(and(eq(dayEntry.userId, ctx.user.id), eq(dayEntry.date, date)))
.limit(1);
const entry = rows[0] ?? null;
if (!entry) { if (!entry) {
return { date, entry: null, todos: [] as Todo[] }; return { date: todayIso(now), entry: null, todos: [] as Todo[] };
} }
const todos = await ctx.db const todos = await ctx.db
.select() .select()
.from(todo) .from(todo)
.where(eq(todo.dayEntryId, entry.id)) .where(eq(todo.dayEntryId, entry.id))
.orderBy(todo.order); .orderBy(todo.order);
return { date, entry, todos }; return { date: entry.date, entry, todos };
}), }),
/** /**
@@ -91,6 +207,8 @@ export const dayEntryRouter = router({
checkIn: protectedProcedure checkIn: protectedProcedure
.input(DayEntrySchemas.checkInInput) .input(DayEntrySchemas.checkInInput)
.mutation(async ({ ctx, input }) => { .mutation(async ({ ctx, input }) => {
// Erst einen ggf. abgelaufenen Nacht-Eintrag sauber abschließen (6-Uhr-Schnitt).
await applyWorkdayBoundary(ctx.db, ctx.user.id, new Date());
const date = input.date ?? todayIso(); const date = input.date ?? todayIso();
// Verhindert Doppel-Einstempeln. Wenn bereits Einträge existieren, Fehler. // Verhindert Doppel-Einstempeln. Wenn bereits Einträge existieren, Fehler.
@@ -162,9 +280,95 @@ export const dayEntryRouter = router({
return { entry: created, todos: todoRows, carriedOver: stale.length }; return { entry: created, todos: todoRows, carriedOver: stale.length };
}); });
// Kimai-Sync (best-effort, nicht blockierend): Check-In = Clock-In.
if (kimaiEnabled()) {
const tsId = await kimaiClockIn({
begin: result.entry.checkedInAt ?? new Date(),
description: `ebw — ${ctx.user.name}`,
});
if (tsId !== null) {
await ctx.db
.update(dayEntry)
.set({ kimaiTimesheetId: tsId, kimaiSynced: true })
.where(eq(dayEntry.id, result.entry.id));
}
}
return result; return result;
}), }),
/**
* Check-Out / Arbeitsende: beendet den laufenden (offenen) Arbeitstag — egal, ob
* er heute oder gestern (Nachtarbeit über Mitternacht) begonnen wurde. Best-effort
* Kimai-Clock-Out, falls beim Check-In ein Timesheet gestartet wurde.
*/
checkOut: protectedProcedure.mutation(async ({ ctx }) => {
const now = new Date();
await applyWorkdayBoundary(ctx.db, ctx.user.id, now);
const entry = (
await ctx.db
.select()
.from(dayEntry)
.where(and(eq(dayEntry.userId, ctx.user.id), isNull(dayEntry.checkedOutAt)))
.orderBy(desc(dayEntry.date))
.limit(1)
)[0];
if (!entry) {
throw new TRPCError({ code: 'BAD_REQUEST', message: 'Du bist gerade nicht eingestempelt.' });
}
const [updated] = await ctx.db
.update(dayEntry)
.set({ checkedOutAt: now, updatedAt: now })
.where(eq(dayEntry.id, entry.id))
.returning();
if (entry.kimaiTimesheetId !== null && kimaiEnabled()) {
await kimaiClockOut({ timesheetId: entry.kimaiTimesheetId });
}
return updated;
}),
/**
* „Arbeit fortsetzen" — hebt einen Feierabend wieder auf (versehentlich geklickt
* oder doch noch weitergearbeitet). Öffnet den aktiven, noch nicht versiegelten
* Tag erneut (checkedOutAt → null). Möglich, solange der Arbeitstag läuft, d. h.
* vor 06:00 des Folgetags. Danach ist der Tag final → neu einstempeln.
*/
reopen: protectedProcedure.mutation(async ({ ctx }) => {
const now = new Date();
const entry = await getActiveEntry(ctx.db, ctx.user.id, now);
if (!entry) {
throw new TRPCError({
code: 'BAD_REQUEST',
message:
'Kein fortsetzbarer Arbeitstag — der letzte Tag ist abgeschlossen. Stempel neu ein.',
});
}
if (!entry.checkedOutAt) return entry; // läuft bereits
const [updated] = await ctx.db
.update(dayEntry)
.set({ checkedOutAt: null, updatedAt: now })
.where(eq(dayEntry.id, entry.id))
.returning();
// Best-effort: Kimai wieder anlaufen lassen, falls aktiv.
if (kimaiEnabled()) {
const tsId = await kimaiClockIn({
begin: now,
description: `ebw — ${ctx.user.name} (fortgesetzt)`,
});
if (tsId !== null) {
await ctx.db
.update(dayEntry)
.set({ kimaiTimesheetId: tsId, kimaiSynced: true })
.where(eq(dayEntry.id, entry.id));
}
}
return updated;
}),
/** /**
* ToDos im Verlauf des Tages ändern (vor Reflexion). * ToDos im Verlauf des Tages ändern (vor Reflexion).
*/ */
@@ -211,8 +415,8 @@ export const dayEntryRouter = router({
/** /**
* Einzelnen ToDo-Titel korrigieren (z. B. Tippfehler) — auch noch in der * Einzelnen ToDo-Titel korrigieren (z. B. Tippfehler) — auch noch in der
* Reflexion. Erlaubt, solange das ToDo der eigenen Person gehört und vom * Reflexion. Erlaubt, solange der Arbeitstag des ToDos noch läuft (vor 06:00 des
* heutigen Berlin-Tag ist (gleiche Editierbarkeits-Regel wie die Reflexion). * Folgetags); gleiche Editierbarkeits-Regel wie die Reflexion.
*/ */
editTodoTitle: protectedProcedure editTodoTitle: protectedProcedure
.input(DayEntrySchemas.editTodoTitleInput) .input(DayEntrySchemas.editTodoTitleInput)
@@ -226,10 +430,10 @@ export const dayEntryRouter = router({
if (!existing) { if (!existing) {
throw new TRPCError({ code: 'NOT_FOUND', message: 'ToDo nicht gefunden.' }); throw new TRPCError({ code: 'NOT_FOUND', message: 'ToDo nicht gefunden.' });
} }
if (existing.date !== todayIso(new Date())) { if (!isEditableWithinGrace(existing.date, new Date())) {
throw new TRPCError({ throw new TRPCError({
code: 'BAD_REQUEST', code: 'BAD_REQUEST',
message: 'ToDos eines Vortags können nicht mehr bearbeitet werden.', message: 'ToDos können nur bis 3 Tage nach dem Tag bearbeitet werden.',
}); });
} }
const [updated] = await ctx.db const [updated] = await ctx.db
@@ -240,6 +444,76 @@ export const dayEntryRouter = router({
return updated; return updated;
}), }),
/**
* Einzelnes ToDo mitten am Tag hinzufügen (auch nach der Reflexion möglich,
* solange der Tageseintrag vom heutigen Berlin-Tag ist).
*/
addTodo: protectedProcedure
.input(DayEntrySchemas.addTodoInput)
.mutation(async ({ ctx, input }) => {
const entry = await getActiveEntry(ctx.db, ctx.user.id, new Date());
if (!entry) {
throw new TRPCError({
code: 'BAD_REQUEST',
message: 'Du bist gerade nicht eingestempelt.',
});
}
const existing = await ctx.db
.select({ id: todo.id })
.from(todo)
.where(eq(todo.dayEntryId, entry.id));
const [created] = await ctx.db
.insert(todo)
.values({
dayEntryId: entry.id,
userId: ctx.user.id,
date: entry.date,
title: input.title,
order: existing.length,
bezugKind: input.bezugKind ?? null,
bezugId: input.bezugId ?? null,
})
.returning();
return created;
}),
/**
* Ungeplant dazugekommenes & bereits erledigtes Item nachtragen
* („btw, das habe ich heute auch noch gemacht"). Wird sofort als erledigt
* und als ungeplant markiert.
*/
addUnplanned: protectedProcedure
.input(DayEntrySchemas.addUnplannedInput)
.mutation(async ({ ctx, input }) => {
const entry = await getActiveEntry(ctx.db, ctx.user.id, new Date());
if (!entry) {
throw new TRPCError({
code: 'BAD_REQUEST',
message: 'Du bist gerade nicht eingestempelt.',
});
}
const existing = await ctx.db
.select({ id: todo.id })
.from(todo)
.where(eq(todo.dayEntryId, entry.id));
const [created] = await ctx.db
.insert(todo)
.values({
dayEntryId: entry.id,
userId: ctx.user.id,
date: entry.date,
title: input.title,
order: existing.length,
bezugKind: input.bezugKind ?? null,
bezugId: input.bezugId ?? null,
status: 'done',
unplanned: true,
completedAt: new Date(),
})
.returning();
return created;
}),
/** /**
* Abend-Reflexion. Setzt Ampel + Trend, optional Blocker. * Abend-Reflexion. Setzt Ampel + Trend, optional Blocker.
*/ */
@@ -255,13 +529,12 @@ export const dayEntryRouter = router({
if (!entry) { if (!entry) {
throw new TRPCError({ code: 'NOT_FOUND', message: 'Tageseintrag nicht gefunden.' }); throw new TRPCError({ code: 'NOT_FOUND', message: 'Tageseintrag nicht gefunden.' });
} }
// Editierbar, solange das Eintrags-Datum noch der heutige Berlin-Tag ist. // Reflexion ist bis 3 Kalendertage nach dem Eintragstag nachträglich
// Damit kann mehrmals am Tag aktualisiert werden; nach 00:00 (Europe/Berlin) // editierbar (Nachfrist für die Historie). Danach final.
// ist der Vortag final und kann nicht mehr verändert werden. if (!isEditableWithinGrace(entry.date, new Date())) {
if (entry.date !== todayIso(new Date())) {
throw new TRPCError({ throw new TRPCError({
code: 'BAD_REQUEST', code: 'BAD_REQUEST',
message: 'Reflexion eines Vortags kann nicht mehr bearbeitet werden.', message: 'Reflexion kann nur bis 3 Tage nach dem Tag bearbeitet werden.',
}); });
} }
@@ -331,15 +604,116 @@ export const dayEntryRouter = router({
* Nutzbar in Story 3.4 (Dashboard-Feed). * Nutzbar in Story 3.4 (Dashboard-Feed).
*/ */
feed: protectedProcedure.query(async ({ ctx }) => { feed: protectedProcedure.query(async ({ ctx }) => {
// Volle Reflexionen vor heute (heutige bleiben privat bis morgen) —
// unabhängig vom publish-Cron.
const today = todayIso();
const entries = await ctx.db const entries = await ctx.db
.select() .select()
.from(dayEntry) .from(dayEntry)
.where(isNotNull(dayEntry.publishedAt)) .where(and(lt(dayEntry.date, today), eq(dayEntry.status, 'full')))
.orderBy(dayEntry.publishedAt) .orderBy(desc(dayEntry.date), desc(dayEntry.reflectedAt))
.limit(50); .limit(50);
return entries; return entries;
}), }),
/**
* Team-weite Historie eines (vergangenen) Tages: was hat jede/r gemacht —
* Reflexion (Ampel/Trend/Text) + ToDos. Default-Datum = vorheriger Werktag.
* Datums-Navigation (prev/next Werktag) wird mitgeliefert.
*/
historyForDate: protectedProcedure
.input(DayEntrySchemas.historyForDateInput)
.query(async ({ ctx, input }) => {
const today = todayIso();
// Default-Tag = der jüngste Tag VOR heute, an dem es überhaupt Einträge gibt
// (nicht starr der vorige Werktag — sonst sieht man Wochenend-Arbeit nicht).
const fallbackDate =
(
await ctx.db
.select({ d: dayEntry.date })
.from(dayEntry)
.where(lt(dayEntry.date, today))
.orderBy(desc(dayEntry.date))
.limit(1)
)[0]?.d ?? previousWerktag(today);
const date = input.date ?? fallbackDate;
const isToday = date === today;
const entries = await ctx.db.select().from(dayEntry).where(eq(dayEntry.date, date));
const userRows = await ctx.db
.select({ id: user.id, name: user.name })
.from(user)
.where(eq(user.active, true));
const nameById = new Map(userRows.map((u) => [u.id, u.name]));
const ids = entries.map((e) => e.id);
const todoRows = ids.length
? await ctx.db
.select()
.from(todo)
.where(inArray(todo.dayEntryId, ids))
.orderBy(asc(todo.order))
: [];
const todosByEntry = new Map<string, Todo[]>();
for (const t of todoRows) {
const arr = todosByEntry.get(t.dayEntryId) ?? [];
arr.push(t);
todosByEntry.set(t.dayEntryId, arr);
}
const list = entries
.map((e) => ({
userId: e.userId,
name: nameById.get(e.userId) ?? '—',
status: e.status,
ampel: e.ampel,
trend: e.trend,
// Heutige Reflexion bleibt privat bis morgen; ToDos sind teamweit sichtbar.
reflectionText: isToday ? null : e.reflectionText,
url: e.url,
todos: (todosByEntry.get(e.id) ?? []).map((t) => ({
id: t.id,
title: t.title,
status: t.status,
dropReason: t.dropReason,
unplanned: t.unplanned,
})),
}))
.sort((a, b) => a.name.localeCompare(b.name));
const withEntry = new Set(entries.map((e) => e.userId));
const ohneEintrag = userRows
.filter((u) => !withEntry.has(u.id))
.map((u) => u.name)
.sort((a, b) => a.localeCompare(b));
// Pfeil-Navigation springt zum nächsten/vorherigen Tag MIT Einträgen
// (überspringt leere Tage, erreicht aber Wochenend-Arbeit).
const prevRow = (
await ctx.db
.select({ d: dayEntry.date })
.from(dayEntry)
.where(lt(dayEntry.date, date))
.orderBy(desc(dayEntry.date))
.limit(1)
)[0];
const nextRow = (
await ctx.db
.select({ d: dayEntry.date })
.from(dayEntry)
.where(and(gt(dayEntry.date, date), lte(dayEntry.date, today)))
.orderBy(asc(dayEntry.date))
.limit(1)
)[0];
return {
date,
prevDate: prevRow?.d ?? null,
nextDate: nextRow?.d ?? null,
entries: list,
ohneEintrag,
};
}),
/** /**
* „Heute fehlt"-Liste (Anwesenheits-Übersicht). * „Heute fehlt"-Liste (Anwesenheits-Übersicht).
*/ */
@@ -354,11 +728,73 @@ export const dayEntryRouter = router({
.where(eq(dayEntry.date, date)); .where(eq(dayEntry.date, date));
return rows; return rows;
}), }),
/**
* Persönliche Wochenübersicht: die letzten 7 Kalendertage des eigenen Users —
* pro Tag Status/Ampel/Trend, grobe Anwesenheit (Antritt→Feierabend) und ein
* ToDo-Zähler (erledigt/offen/verworfen). Speist die Route „Meine Woche".
*/
myWeek: protectedProcedure.query(async ({ ctx }) => {
const today = todayIso();
const from = addCalendarDays(today, -6);
const entries = await ctx.db
.select()
.from(dayEntry)
.where(
and(eq(dayEntry.userId, ctx.user.id), gte(dayEntry.date, from), lte(dayEntry.date, today)),
)
.orderBy(asc(dayEntry.date));
const ids = entries.map((e) => e.id);
const todos = ids.length
? await ctx.db.select().from(todo).where(inArray(todo.dayEntryId, ids))
: [];
const counts = new Map<string, { done: number; open: number; dropped: number }>();
for (const t of todos) {
const c = counts.get(t.dayEntryId) ?? { done: 0, open: 0, dropped: 0 };
c[t.status] += 1;
counts.set(t.dayEntryId, c);
}
return entries.map((e) => ({
date: e.date,
status: e.status,
ampel: e.ampel,
trend: e.trend,
checkedInAt: e.checkedInAt,
checkedOutAt: e.checkedOutAt,
todos: counts.get(e.id) ?? { done: 0, open: 0, dropped: 0 },
}));
}),
/**
* Eigener Tageseintrag eines bestimmten Datums — zum nachträglichen Reflektieren
* aus der Historie. `editable` zeigt, ob die 3-Tage-Nachfrist noch läuft.
*/
ownForDate: protectedProcedure
.input(z.object({ date: z.string().regex(/^\d{4}-\d{2}-\d{2}$/) }))
.query(async ({ ctx, input }) => {
const entry =
(
await ctx.db
.select()
.from(dayEntry)
.where(and(eq(dayEntry.userId, ctx.user.id), eq(dayEntry.date, input.date)))
.limit(1)
)[0] ?? null;
if (!entry) return { entry: null, todos: [] as Todo[], editable: false };
const todos = await ctx.db
.select()
.from(todo)
.where(eq(todo.dayEntryId, entry.id))
.orderBy(todo.order);
return { entry, todos, editable: isEditableWithinGrace(entry.date, new Date()) };
}),
}); });
// Helper für Cron-Endpoint // Helper für Cron-Endpoint
export async function publishYesterdaysEntries( export async function publishYesterdaysEntries(
ctx: { db: import('@cockpit/db').Db }, ctx: { db: Db },
yesterdayIso: string, yesterdayIso: string,
): Promise<number> { ): Promise<number> {
const now = new Date(); const now = new Date();
+2 -4
View File
@@ -64,10 +64,8 @@ export const dealRouter = router({
stage: input.stage, stage: input.stage,
enteredStageAt: new Date(), enteredStageAt: new Date(),
wonAt: input.stage === 'abschluss' ? new Date() : null, wonAt: input.stage === 'abschluss' ? new Date() : null,
wonValueEur: // Gewonnener Deal = voller Auftragswert (nicht mit Wahrscheinlichkeit gewichtet).
input.stage === 'abschluss' wonValueEur: input.stage === 'abschluss' ? sql`COALESCE(${deal.valueEur}, 0)` : null,
? sql`COALESCE(${deal.valueEur} * ${deal.probability} / 100, 0)`
: null,
}) })
.where(eq(deal.id, input.dealId)) .where(eq(deal.id, input.dealId))
.returning(); .returning();
+184 -9
View File
@@ -1,9 +1,11 @@
import { TRPCError } from '@trpc/server'; import { TRPCError } from '@trpc/server';
import { asc, desc, eq, sql } from 'drizzle-orm'; import { and, asc, desc, eq, inArray, isNotNull, lte, sql } from 'drizzle-orm';
import { lead, leadContact, leadTouchpoint, deal, area, user } from '@cockpit/db'; import { lead, leadContact, leadTouchpoint, deal, area, user, project } from '@cockpit/db';
import type { Db } from '@cockpit/db'; import type { Db } from '@cockpit/db';
import { LeadSchemas } from '@cockpit/shared'; import { LeadSchemas } from '@cockpit/shared';
import { router, protectedProcedure } from '../trpc.js'; import { router, protectedProcedure } from '../trpc.js';
import { parseCsv, normalizeHeader } from '../lib/csv.js';
import { todayIso } from '../lib/werktag.js';
const SALES_AREA_SLUG = 'vertrieb'; const SALES_AREA_SLUG = 'vertrieb';
@@ -20,10 +22,54 @@ export const leadRouter = router({
.select({ .select({
lead: lead, lead: lead,
ownerName: user.name, ownerName: user.name,
projectName: project.name,
}) })
.from(lead) .from(lead)
.leftJoin(user, eq(user.id, lead.ownerUserId)) .leftJoin(user, eq(user.id, lead.ownerUserId))
.leftJoin(project, eq(project.id, lead.projectId))
.orderBy(desc(lead.updatedAt)); .orderBy(desc(lead.updatedAt));
return rows.map((r) => ({ ...r.lead, ownerName: r.ownerName, projectName: r.projectName }));
}),
/**
* Fällige Wiedervorlagen: aktive Leads (cold/warm/hot), deren geplanter nächster
* Schritt heute oder überfällig ist. naechsterSchrittDatum wurde erfasst, aber
* nie als Liste gebündelt — so geht keine warme Spur mehr unter.
*/
dueFollowUps: protectedProcedure.query(async ({ ctx }) => {
const today = todayIso();
const rows = await ctx.db
.select({
id: lead.id,
firma: lead.firma,
status: lead.status,
ownerName: user.name,
naechsterSchritt: lead.naechsterSchritt,
faelligAm: lead.naechsterSchrittDatum,
})
.from(lead)
.leftJoin(user, eq(user.id, lead.ownerUserId))
.where(
and(
inArray(lead.status, ['cold', 'warm', 'hot']),
isNotNull(lead.naechsterSchrittDatum),
lte(lead.naechsterSchrittDatum, today),
),
)
.orderBy(asc(lead.naechsterSchrittDatum));
return rows;
}),
// Leads, die einem Projekt zugeordnet sind (Vertriebs-Sicht im Projekt).
forProject: protectedProcedure
.input(LeadSchemas.leadsForProjectInput)
.query(async ({ ctx, input }) => {
const rows = await ctx.db
.select({ lead: lead, ownerName: user.name })
.from(lead)
.leftJoin(user, eq(user.id, lead.ownerUserId))
.where(eq(lead.projectId, input.projectId))
.orderBy(desc(lead.score), desc(lead.updatedAt));
return rows.map((r) => ({ ...r.lead, ownerName: r.ownerName })); return rows.map((r) => ({ ...r.lead, ownerName: r.ownerName }));
}), }),
@@ -44,16 +90,24 @@ export const leadRouter = router({
.leftJoin(user, eq(user.id, leadTouchpoint.bearbeiterUserId)) .leftJoin(user, eq(user.id, leadTouchpoint.bearbeiterUserId))
.where(eq(leadTouchpoint.leadId, l.id)) .where(eq(leadTouchpoint.leadId, l.id))
.orderBy(desc(leadTouchpoint.datum), desc(leadTouchpoint.createdAt)); .orderBy(desc(leadTouchpoint.datum), desc(leadTouchpoint.createdAt));
const linkedProject = l.projectId
? ((
await ctx.db
.select({ id: project.id, name: project.name })
.from(project)
.where(eq(project.id, l.projectId))
.limit(1)
)[0] ?? null)
: null;
return { return {
lead: l, lead: l,
contacts, contacts,
project: linkedProject,
touchpoints: touchpoints.map((t) => ({ ...t.touchpoint, bearbeiterName: t.bearbeiterName })), touchpoints: touchpoints.map((t) => ({ ...t.touchpoint, bearbeiterName: t.bearbeiterName })),
}; };
}), }),
create: protectedProcedure create: protectedProcedure.input(LeadSchemas.createLeadInput).mutation(async ({ ctx, input }) => {
.input(LeadSchemas.createLeadInput)
.mutation(async ({ ctx, input }) => {
const areaId = await getSalesAreaId(ctx.db); const areaId = await getSalesAreaId(ctx.db);
const [created] = await ctx.db const [created] = await ctx.db
.insert(lead) .insert(lead)
@@ -63,6 +117,7 @@ export const leadRouter = router({
status: input.status, status: input.status,
score: input.score, score: input.score,
ownerUserId: input.ownerUserId ?? null, ownerUserId: input.ownerUserId ?? null,
projectId: input.projectId ?? null,
branche: input.branche ?? null, branche: input.branche ?? null,
subSegment: input.subSegment ?? null, subSegment: input.subSegment ?? null,
website: input.website ?? null, website: input.website ?? null,
@@ -74,9 +129,7 @@ export const leadRouter = router({
return created; return created;
}), }),
update: protectedProcedure update: protectedProcedure.input(LeadSchemas.updateLeadInput).mutation(async ({ ctx, input }) => {
.input(LeadSchemas.updateLeadInput)
.mutation(async ({ ctx, input }) => {
const { id, ...patch } = input; const { id, ...patch } = input;
if (Object.keys(patch).length === 0) { if (Object.keys(patch).length === 0) {
const existing = (await ctx.db.select().from(lead).where(eq(lead.id, id)).limit(1))[0]; const existing = (await ctx.db.select().from(lead).where(eq(lead.id, id)).limit(1))[0];
@@ -96,7 +149,8 @@ export const leadRouter = router({
addContact: protectedProcedure addContact: protectedProcedure
.input(LeadSchemas.addContactInput) .input(LeadSchemas.addContactInput)
.mutation(async ({ ctx, input }) => { .mutation(async ({ ctx, input }) => {
const count = ( const count =
(
await ctx.db await ctx.db
.select({ c: sql<number>`count(*)::int` }) .select({ c: sql<number>`count(*)::int` })
.from(leadContact) .from(leadContact)
@@ -189,4 +243,125 @@ export const leadRouter = router({
}); });
return result; return result;
}), }),
// CSV-Import: erzeugt je Zeile einen Lead + primären Kontakt; Adresse →
// standorte, Notizen → erster Austausch-Log-Eintrag. Dedup über Firmenname.
importCsv: protectedProcedure
.input(LeadSchemas.importLeadsCsvInput)
.mutation(async ({ ctx, input }) => {
const areaId = await getSalesAreaId(ctx.db);
const rows = parseCsv(input.csv);
const summary = {
created: 0,
skippedEmpty: 0,
skippedDuplicate: 0,
contacts: 0,
touchpoints: 0,
};
if (rows.length < 2 || !rows[0]) return summary;
const header = rows[0].map(normalizeHeader);
const col = (key: string) => header.indexOf(key);
const cells = {
quelle: col('quelle'),
vorname: col('vorname'),
nachname: col('nachname'),
position: col('position'),
firma: col('firma'),
strasse: col('strasse'),
plz: col('plz'),
ort: col('ort'),
telefon: col('telefon'),
mobil: col('mobil'),
email: col('email'),
website: col('website'),
branche: col('branche'),
notizen: col('notizen'),
};
const get = (row: string[], i: number) =>
i >= 0 && i < row.length ? (row[i] ?? '').trim() : '';
const existing = await ctx.db.select({ firma: lead.firma }).from(lead);
const seen = new Set(existing.map((e) => e.firma.trim().toLowerCase()));
const today = new Date().toISOString().slice(0, 10);
for (let r = 1; r < rows.length; r++) {
const row = rows[r];
if (!row || row.every((c) => c.trim() === '')) continue; // Leerzeile
const vorname = get(row, cells.vorname);
const nachname = get(row, cells.nachname);
const personName = `${vorname} ${nachname}`.trim();
const firma = get(row, cells.firma) || personName;
if (!firma) {
summary.skippedEmpty++;
continue;
}
const key = firma.toLowerCase();
if (seen.has(key)) {
summary.skippedDuplicate++;
continue;
}
seen.add(key);
const standorte = [
get(row, cells.strasse),
[get(row, cells.plz), get(row, cells.ort)].filter(Boolean).join(' '),
]
.filter(Boolean)
.join(', ');
await ctx.db.transaction(async (tx) => {
const [createdLead] = await tx
.insert(lead)
.values({
areaId,
firma,
status: 'cold',
score: 0,
projectId: input.projectId ?? null,
branche: get(row, cells.branche) || null,
website: get(row, cells.website) || null,
quelle: get(row, cells.quelle) || null,
standorte: standorte || null,
createdBy: ctx.user.id,
})
.returning();
if (!createdLead) throw new Error('Lead konnte nicht angelegt werden.');
summary.created++;
const email = get(row, cells.email);
const telefon = get(row, cells.telefon);
const mobil = get(row, cells.mobil);
const position = get(row, cells.position);
if (personName || email || telefon || mobil) {
const tel = [telefon, mobil ? `Mobil: ${mobil}` : ''].filter(Boolean).join(' · ');
await tx.insert(leadContact).values({
leadId: createdLead.id,
name: personName || firma,
rolle: position || null,
email: email || null,
telefon: tel || null,
isPrimary: true,
order: 0,
});
summary.contacts++;
}
const notizen = get(row, cells.notizen);
if (notizen) {
await tx.insert(leadTouchpoint).values({
leadId: createdLead.id,
datum: today,
kanal: 'sonstiges',
bearbeiterUserId: ctx.user.id,
inhalt: notizen.slice(0, 2000),
});
summary.touchpoints++;
}
});
}
return summary;
}),
}); });
+23 -11
View File
@@ -1,9 +1,17 @@
import { TRPCError } from '@trpc/server'; import { TRPCError } from '@trpc/server';
import { z } from 'zod'; import { z } from 'zod';
import { and, eq, desc } from 'drizzle-orm'; import { and, eq, desc } from 'drizzle-orm';
import { project, milestone, area, user, projectStatus, phaseGate, type Project } from '@cockpit/db'; import {
project,
milestone,
area,
user,
projectStatus,
phaseGate,
type Project,
} from '@cockpit/db';
import { ProjectSchemas } from '@cockpit/shared'; import { ProjectSchemas } from '@cockpit/shared';
import { router, protectedProcedure } from '../trpc.js'; import { router, protectedProcedure, auditedProcedure } from '../trpc.js';
const PHASE_ORDER = ['definition', 'planung', 'umsetzung', 'abschluss'] as const; const PHASE_ORDER = ['definition', 'planung', 'umsetzung', 'abschluss'] as const;
function nextPhase(p: (typeof PHASE_ORDER)[number]): (typeof PHASE_ORDER)[number] { function nextPhase(p: (typeof PHASE_ORDER)[number]): (typeof PHASE_ORDER)[number] {
@@ -71,9 +79,9 @@ export const projectRouter = router({
areaId: input.areaId, areaId: input.areaId,
name: input.name, name: input.name,
description: input.description ?? null, description: input.description ?? null,
logoUrl: input.logoUrl ?? null,
kind: input.kind, kind: input.kind,
verantwortlicheUserId: input.verantwortlicheUserId ?? null, verantwortlicheUserId: input.verantwortlicheUserId ?? null,
arbeitsmodus: input.arbeitsmodus ?? null,
outlineSteckbriefUrl: input.outlineSteckbriefUrl, outlineSteckbriefUrl: input.outlineSteckbriefUrl,
planeProjectUrl: input.planeProjectUrl, planeProjectUrl: input.planeProjectUrl,
risikolisteUrl: input.risikolisteUrl ?? null, risikolisteUrl: input.risikolisteUrl ?? null,
@@ -108,7 +116,7 @@ export const projectRouter = router({
return result; return result;
}), }),
archive: protectedProcedure archive: auditedProcedure('project.archive')
.input(ProjectSchemas.archiveProjectInput) .input(ProjectSchemas.archiveProjectInput)
.mutation(async ({ ctx, input }) => { .mutation(async ({ ctx, input }) => {
const p = ( const p = (
@@ -129,6 +137,7 @@ export const projectRouter = router({
phase: 'abschluss', phase: 'abschluss',
lessonsLearnedUrl: input.lessonsLearnedUrl, lessonsLearnedUrl: input.lessonsLearnedUrl,
abschlussvermerk: input.abschlussvermerk ?? p.abschlussvermerk, abschlussvermerk: input.abschlussvermerk ?? p.abschlussvermerk,
lessonsLearned: input.lessonsLearned ?? p.lessonsLearned,
pflichtMinimumState: { ...p.pflichtMinimumState, retrospektive: true }, pflichtMinimumState: { ...p.pflichtMinimumState, retrospektive: true },
}) })
.where(eq(project.id, input.projectId)) .where(eq(project.id, input.projectId))
@@ -137,7 +146,7 @@ export const projectRouter = router({
}), }),
// Phase direkt setzen (Leitfaden Kap. 2). // Phase direkt setzen (Leitfaden Kap. 2).
setPhase: protectedProcedure setPhase: auditedProcedure('project.setPhase')
.input(ProjectSchemas.setPhaseInput) .input(ProjectSchemas.setPhaseInput)
.mutation(async ({ ctx, input }) => { .mutation(async ({ ctx, input }) => {
const [updated] = await ctx.db const [updated] = await ctx.db
@@ -150,7 +159,7 @@ export const projectRouter = router({
}), }),
// Gate-Review am Phasenende (Leitfaden Kap. 5), optional Folgephase freigeben. // Gate-Review am Phasenende (Leitfaden Kap. 5), optional Folgephase freigeben.
addPhaseGate: protectedProcedure addPhaseGate: auditedProcedure('project.addPhaseGate')
.input(ProjectSchemas.addPhaseGateInput) .input(ProjectSchemas.addPhaseGateInput)
.mutation(async ({ ctx, input }) => { .mutation(async ({ ctx, input }) => {
const [gate] = await ctx.db const [gate] = await ctx.db
@@ -236,7 +245,7 @@ export const projectRouter = router({
return updated; return updated;
}), }),
// Projekt-Modus setzen (Buch Kap. 4): muss jederzeit ans Team kommuniziert sein. // Projekt-Modus setzen (Leitfaden): muss jederzeit ans Team kommuniziert sein.
setModus: protectedProcedure setModus: protectedProcedure
.input(ProjectSchemas.setModusInput) .input(ProjectSchemas.setModusInput)
.mutation(async ({ ctx, input }) => { .mutation(async ({ ctx, input }) => {
@@ -258,7 +267,8 @@ export const projectRouter = router({
const existing = ( const existing = (
await ctx.db.select().from(project).where(eq(project.id, projectId)).limit(1) await ctx.db.select().from(project).where(eq(project.id, projectId)).limit(1)
)[0]; )[0];
if (!existing) throw new TRPCError({ code: 'NOT_FOUND', message: 'Projekt nicht gefunden.' }); if (!existing)
throw new TRPCError({ code: 'NOT_FOUND', message: 'Projekt nicht gefunden.' });
return existing; return existing;
} }
const [updated] = await ctx.db const [updated] = await ctx.db
@@ -286,7 +296,7 @@ export const projectRouter = router({
order: existing.length, order: existing.length,
}) })
.returning(); .returning();
// Pflicht-Minimum-Punkt „Meilensteine" nachziehen (Buch: mind. 2). // Pflicht-Minimum-Punkt „Meilensteine" nachziehen (Leitfaden: mind. 2).
const p = ( const p = (
await ctx.db.select().from(project).where(eq(project.id, input.projectId)).limit(1) await ctx.db.select().from(project).where(eq(project.id, input.projectId)).limit(1)
)[0]; )[0];
@@ -312,7 +322,8 @@ export const projectRouter = router({
const existing = ( const existing = (
await ctx.db.select().from(milestone).where(eq(milestone.id, milestoneId)).limit(1) await ctx.db.select().from(milestone).where(eq(milestone.id, milestoneId)).limit(1)
)[0]; )[0];
if (!existing) throw new TRPCError({ code: 'NOT_FOUND', message: 'Meilenstein nicht gefunden.' }); if (!existing)
throw new TRPCError({ code: 'NOT_FOUND', message: 'Meilenstein nicht gefunden.' });
return existing; return existing;
} }
const [updated] = await ctx.db const [updated] = await ctx.db
@@ -320,7 +331,8 @@ export const projectRouter = router({
.set(patch) .set(patch)
.where(eq(milestone.id, milestoneId)) .where(eq(milestone.id, milestoneId))
.returning(); .returning();
if (!updated) throw new TRPCError({ code: 'NOT_FOUND', message: 'Meilenstein nicht gefunden.' }); if (!updated)
throw new TRPCError({ code: 'NOT_FOUND', message: 'Meilenstein nicht gefunden.' });
return updated; return updated;
}), }),
+3 -9
View File
@@ -15,9 +15,7 @@ export const riskRouter = router({
.orderBy(desc(risk.showstopper), desc(risk.createdAt)); .orderBy(desc(risk.showstopper), desc(risk.createdAt));
}), }),
create: protectedProcedure create: protectedProcedure.input(RiskSchemas.createRiskInput).mutation(async ({ ctx, input }) => {
.input(RiskSchemas.createRiskInput)
.mutation(async ({ ctx, input }) => {
const [created] = await ctx.db const [created] = await ctx.db
.insert(risk) .insert(risk)
.values({ .values({
@@ -38,9 +36,7 @@ export const riskRouter = router({
return created; return created;
}), }),
update: protectedProcedure update: protectedProcedure.input(RiskSchemas.updateRiskInput).mutation(async ({ ctx, input }) => {
.input(RiskSchemas.updateRiskInput)
.mutation(async ({ ctx, input }) => {
const { id, ...patch } = input; const { id, ...patch } = input;
if (Object.keys(patch).length === 0) { if (Object.keys(patch).length === 0) {
const existing = (await ctx.db.select().from(risk).where(eq(risk.id, id)).limit(1))[0]; const existing = (await ctx.db.select().from(risk).where(eq(risk.id, id)).limit(1))[0];
@@ -56,9 +52,7 @@ export const riskRouter = router({
return updated; return updated;
}), }),
remove: protectedProcedure remove: protectedProcedure.input(RiskSchemas.removeRiskInput).mutation(async ({ ctx, input }) => {
.input(RiskSchemas.removeRiskInput)
.mutation(async ({ ctx, input }) => {
await ctx.db.delete(risk).where(eq(risk.id, input.id)); await ctx.db.delete(risk).where(eq(risk.id, input.id));
return { ok: true as const }; return { ok: true as const };
}), }),
+38
View File
@@ -0,0 +1,38 @@
import { z } from 'zod';
import { and, ilike, isNull } from 'drizzle-orm';
import { project, lead, blocker } from '@cockpit/db';
import { router, protectedProcedure } from '../trpc.js';
/**
* Globale Schnellsuche über die wichtigsten Entitäten (Projekte, Leads, offene
* Blocker). Postgres ILIKE — für die Teamgröße völlig ausreichend, kein FTS nötig.
*/
export const searchRouter = router({
all: protectedProcedure
.input(z.object({ q: z.string().min(1).max(100) }))
.query(async ({ ctx, input }) => {
const term = `%${input.q.replace(/[%_]/g, '\\$&')}%`;
const [projects, leads, blockers] = await Promise.all([
ctx.db
.select({ id: project.id, name: project.name, archiviert: project.archiviert })
.from(project)
.where(ilike(project.name, term))
.limit(8),
ctx.db
.select({ id: lead.id, firma: lead.firma })
.from(lead)
.where(ilike(lead.firma, term))
.limit(8),
ctx.db
.select({ id: blocker.id, title: blocker.title })
.from(blocker)
.where(and(ilike(blocker.title, term), isNull(blocker.resolvedAt)))
.limit(8),
]);
return {
projects: projects.map((p) => ({ id: p.id, label: p.name, archived: p.archiviert })),
leads: leads.map((l) => ({ id: l.id, label: l.firma })),
blockers: blockers.map((b) => ({ id: b.id, label: b.title })),
};
}),
});
+4 -2
View File
@@ -50,7 +50,8 @@ export const stakeholderRouter = router({
const existing = ( const existing = (
await ctx.db.select().from(stakeholder).where(eq(stakeholder.id, id)).limit(1) await ctx.db.select().from(stakeholder).where(eq(stakeholder.id, id)).limit(1)
)[0]; )[0];
if (!existing) throw new TRPCError({ code: 'NOT_FOUND', message: 'Stakeholder nicht gefunden.' }); if (!existing)
throw new TRPCError({ code: 'NOT_FOUND', message: 'Stakeholder nicht gefunden.' });
return existing; return existing;
} }
const [updated] = await ctx.db const [updated] = await ctx.db
@@ -58,7 +59,8 @@ export const stakeholderRouter = router({
.set(patch) .set(patch)
.where(eq(stakeholder.id, id)) .where(eq(stakeholder.id, id))
.returning(); .returning();
if (!updated) throw new TRPCError({ code: 'NOT_FOUND', message: 'Stakeholder nicht gefunden.' }); if (!updated)
throw new TRPCError({ code: 'NOT_FOUND', message: 'Stakeholder nicht gefunden.' });
return updated; return updated;
}), }),
+298 -75
View File
@@ -1,39 +1,72 @@
import { TRPCError } from '@trpc/server'; import { TRPCError } from '@trpc/server';
import { z } from 'zod'; import { z } from 'zod';
import { and, eq, gte, isNull, lte, desc } from 'drizzle-orm'; import { and, eq, isNull, asc, desc, sql, inArray } from 'drizzle-orm';
import { timeEntry, dayEntry, type TimeEntry } from '@cockpit/db'; import { timeEntry, dayEntry, todo, user, type TimeEntry, type Db } from '@cockpit/db';
import { TimeEntrySchemas } from '@cockpit/shared'; import { TimeEntrySchemas } from '@cockpit/shared';
import { router, protectedProcedure } from '../trpc.js'; import { router, protectedProcedure } from '../trpc.js';
import { todayIso } from '../lib/werktag.js'; import { todayIso, berlinDayStartMs } from '../lib/werktag.js';
// Einträge, die „heute" betreffen: heute gestartet ODER heute beendet (über
// Mitternacht gelaufen) ODER aktuell laufend. Gemeinsam für listToday/teamToday.
function overlapsToday(today: string) {
return sql`(
(${timeEntry.startedAt} AT TIME ZONE 'Europe/Berlin')::date = ${today}
OR (${timeEntry.endedAt} AT TIME ZONE 'Europe/Berlin')::date = ${today}
OR ${timeEntry.endedAt} IS NULL
)`;
}
const idInput = z.object({ id: z.string().uuid() }); const idInput = z.object({ id: z.string().uuid() });
async function stopCurrent( /**
tx: import('@cockpit/db').Db, * Wall-Clock-Sekunden: Vereinigung überlappender Zeitintervalle. Parallel
userId: string, * laufende Einträge (mehrere Tasks gleichzeitig) zählen nur einmal — damit
now: Date, * „Gesamt heute" die tatsächlich anwesende Zeit zeigt, nicht die Summe.
): Promise<TimeEntry | null> { */
const active = ( function unionSeconds(intervals: Array<readonly [number, number]>): number {
await tx const valid = intervals.filter(([s, e]) => e > s).sort((a, b) => a[0] - b[0]);
.select() if (valid.length === 0) return 0;
.from(timeEntry) let total = 0;
.where(and(eq(timeEntry.userId, userId), isNull(timeEntry.endedAt))) let curStart = valid[0]![0];
.limit(1) let curEnd = valid[0]![1];
)[0]; for (let i = 1; i < valid.length; i++) {
if (!active) return null; const [s, e] = valid[i]!;
const durationSeconds = Math.max(0, Math.round((now.getTime() - active.startedAt.getTime()) / 1000)); if (s <= curEnd) {
const [stopped] = await tx if (e > curEnd) curEnd = e;
} else {
total += curEnd - curStart;
curStart = s;
curEnd = e;
}
}
total += curEnd - curStart;
return Math.round(total / 1000);
}
async function stopOneEntry(db: Db, entry: TimeEntry, now: Date): Promise<TimeEntry | null> {
const durationSeconds = Math.max(
0,
Math.round((now.getTime() - entry.startedAt.getTime()) / 1000),
);
const [stopped] = await db
.update(timeEntry) .update(timeEntry)
.set({ endedAt: now, durationSeconds, updatedAt: now }) .set({ endedAt: now, durationSeconds, updatedAt: now })
.where(eq(timeEntry.id, active.id)) .where(eq(timeEntry.id, entry.id))
.returning(); .returning();
return stopped ?? null; return stopped ?? null;
} }
async function findCurrentDayEntryId( // Stoppt ALLE laufenden Timer eines Users (mehrere parallele möglich).
db: import('@cockpit/db').Db, async function stopAllActive(db: Db, userId: string, now: Date): Promise<number> {
userId: string, const actives = await db
): Promise<string | null> { .select()
.from(timeEntry)
.where(and(eq(timeEntry.userId, userId), isNull(timeEntry.endedAt)));
for (const a of actives) await stopOneEntry(db, a, now);
return actives.length;
}
async function findCurrentDayEntryId(db: Db, userId: string): Promise<string | null> {
const date = todayIso(); const date = todayIso();
const row = ( const row = (
await db await db
@@ -47,30 +80,35 @@ async function findCurrentDayEntryId(
export const timeRouter = router({ export const timeRouter = router({
/** /**
* Aktiver Eintrag (oder null) für den eingeloggten User. * Alle laufenden Timer des eingeloggten Users (mehrere parallel möglich).
*/ */
now: protectedProcedure.query(async ({ ctx }) => { now: protectedProcedure.query(async ({ ctx }) => {
const row = ( const rows = await ctx.db
await ctx.db
.select() .select()
.from(timeEntry) .from(timeEntry)
.where(and(eq(timeEntry.userId, ctx.user.id), isNull(timeEntry.endedAt))) .where(and(eq(timeEntry.userId, ctx.user.id), isNull(timeEntry.endedAt)))
.limit(1) .orderBy(desc(timeEntry.startedAt));
)[0]; const todoIds = Array.from(new Set(rows.map((r) => r.todoId).filter((x): x is string => !!x)));
return row ?? null; const titles = new Map<string, string>();
if (todoIds.length > 0) {
const tr = await ctx.db
.select({ id: todo.id, title: todo.title })
.from(todo)
.where(inArray(todo.id, todoIds));
for (const t of tr) titles.set(t.id, t.title);
}
return rows.map((r) => ({ ...r, todoTitle: r.todoId ? (titles.get(r.todoId) ?? null) : null }));
}), }),
/** /**
* Startet einen neuen Eintrag; stoppt automatisch einen evtl. laufenden. * Startet einen neuen Timer — parallel zu evtl. bereits laufenden (ENTWICKLUN-6).
*/ */
start: protectedProcedure start: protectedProcedure
.input(TimeEntrySchemas.startTimeEntryInput) .input(TimeEntrySchemas.startTimeEntryInput)
.mutation(async ({ ctx, input }) => { .mutation(async ({ ctx, input }) => {
const now = new Date(); const now = new Date();
const dayEntryId = await findCurrentDayEntryId(ctx.db, ctx.user.id); const dayEntryId = await findCurrentDayEntryId(ctx.db, ctx.user.id);
const result = await ctx.db.transaction(async (tx) => { const [created] = await ctx.db
await stopCurrent(tx, ctx.user.id, now);
const [created] = await tx
.insert(timeEntry) .insert(timeEntry)
.values({ .values({
userId: ctx.user.id, userId: ctx.user.id,
@@ -83,20 +121,29 @@ export const timeRouter = router({
.returning(); .returning();
if (!created) throw new Error('Time-Entry konnte nicht angelegt werden.'); if (!created) throw new Error('Time-Entry konnte nicht angelegt werden.');
return created; return created;
});
return result;
}), }),
/** /**
* Stoppt den aktiven Eintrag. * Stoppt einen bestimmten laufenden Timer.
*/ */
stop: protectedProcedure.mutation(async ({ ctx }) => { stop: protectedProcedure.input(idInput).mutation(async ({ ctx, input }) => {
const now = new Date(); const existing = (
const stopped = await stopCurrent(ctx.db, ctx.user.id, now); await ctx.db.select().from(timeEntry).where(eq(timeEntry.id, input.id)).limit(1)
if (!stopped) { )[0];
throw new TRPCError({ code: 'BAD_REQUEST', message: 'Aktuell läuft kein Timer.' }); if (!existing) throw new TRPCError({ code: 'NOT_FOUND', message: 'Eintrag nicht gefunden.' });
if (existing.userId !== ctx.user.id) {
throw new TRPCError({ code: 'FORBIDDEN', message: 'Nicht dein Eintrag.' });
} }
return stopped; if (existing.endedAt) return existing;
return stopOneEntry(ctx.db, existing, new Date());
}),
/**
* Stoppt alle laufenden Timer des Users.
*/
stopAll: protectedProcedure.mutation(async ({ ctx }) => {
const stopped = await stopAllActive(ctx.db, ctx.user.id, new Date());
return { stopped };
}), }),
/** /**
@@ -104,25 +151,65 @@ export const timeRouter = router({
*/ */
listToday: protectedProcedure.query(async ({ ctx }) => { listToday: protectedProcedure.query(async ({ ctx }) => {
const today = todayIso(); const today = todayIso();
const startOfDay = new Date(`${today}T00:00:00+02:00`); const dayStart = berlinDayStartMs(today);
const startOfTomorrow = new Date(startOfDay.getTime() + 24 * 60 * 60 * 1000); const now = Date.now();
const rows = await ctx.db const rows = await ctx.db
.select() .select()
.from(timeEntry) .from(timeEntry)
.where( .where(and(eq(timeEntry.userId, ctx.user.id), overlapsToday(today)))
and(
eq(timeEntry.userId, ctx.user.id),
gte(timeEntry.startedAt, startOfDay),
lte(timeEntry.startedAt, startOfTomorrow),
),
)
.orderBy(desc(timeEntry.startedAt)); .orderBy(desc(timeEntry.startedAt));
const totalSeconds = rows.reduce((acc, r) => {
if (r.endedAt && r.durationSeconds) return acc + r.durationSeconds; // ToDo-Titel tagesübergreifend auflösen (ToDo kann von gestern sein).
if (!r.endedAt) return acc + Math.round((Date.now() - r.startedAt.getTime()) / 1000); const todoIds = Array.from(new Set(rows.map((r) => r.todoId).filter((x): x is string => !!x)));
return acc; const titles = new Map<string, string>();
}, 0); if (todoIds.length > 0) {
return { entries: rows, totalSeconds }; const tr = await ctx.db
.select({ id: todo.id, title: todo.title })
.from(todo)
.where(inArray(todo.id, todoIds));
for (const t of tr) titles.set(t.id, t.title);
}
// Für die Tages-Summen nur den HEUTIGEN Anteil zählen (über Mitternacht
// gelaufene Blöcke nicht doppelt/falsch zuschlagen).
const clampStart = (r: TimeEntry) => Math.max(r.startedAt.getTime(), dayStart);
const endMs = (r: TimeEntry) => (r.endedAt ? r.endedAt.getTime() : now);
const totalSeconds = unionSeconds(rows.map((r) => [clampStart(r), endMs(r)] as const));
const trackedSeconds = rows.reduce(
(acc, r) => acc + Math.max(0, Math.round((endMs(r) - clampStart(r)) / 1000)),
0,
);
// Anwesenheits-Anker wie in teamToday: echter Lock-in, sonst (Auto-Tag vom
// 6-Uhr-Schnitt oder kein Eintrag) der erste Zeiteintrag des Tages.
const ownDay = (
await ctx.db
.select({
checkedInAt: dayEntry.checkedInAt,
checkedOutAt: dayEntry.checkedOutAt,
autoCheckedIn: dayEntry.autoCheckedIn,
})
.from(dayEntry)
.where(and(eq(dayEntry.userId, ctx.user.id), eq(dayEntry.date, today)))
.limit(1)
)[0];
const firstStartMs = rows.length ? Math.min(...rows.map((r) => clampStart(r))) : null;
const anchorMs =
ownDay && !ownDay.autoCheckedIn && ownDay.checkedInAt
? ownDay.checkedInAt.getTime()
: firstStartMs;
const entries = rows.map((r) => ({
...r,
todoTitle: r.todoId ? (titles.get(r.todoId) ?? null) : null,
}));
return {
entries,
totalSeconds,
trackedSeconds,
presenceStartedAt: anchorMs !== null ? new Date(anchorMs).toISOString() : null,
presenceEndedAt: ownDay?.checkedOutAt ? ownDay.checkedOutAt.toISOString() : null,
};
}), }),
/** /**
@@ -140,7 +227,11 @@ export const timeRouter = router({
} }
const startedAt = input.startedAt ? new Date(input.startedAt) : existing.startedAt; const startedAt = input.startedAt ? new Date(input.startedAt) : existing.startedAt;
const endedAt = const endedAt =
input.endedAt === undefined ? existing.endedAt : input.endedAt === null ? null : new Date(input.endedAt); input.endedAt === undefined
? existing.endedAt
: input.endedAt === null
? null
: new Date(input.endedAt);
const durationSeconds = endedAt const durationSeconds = endedAt
? Math.max(0, Math.round((endedAt.getTime() - startedAt.getTime()) / 1000)) ? Math.max(0, Math.round((endedAt.getTime() - startedAt.getTime()) / 1000))
: null; : null;
@@ -152,8 +243,7 @@ export const timeRouter = router({
durationSeconds, durationSeconds,
todoId: input.todoId === undefined ? existing.todoId : input.todoId, todoId: input.todoId === undefined ? existing.todoId : input.todoId,
category: input.category ?? existing.category, category: input.category ?? existing.category,
description: description: input.description === undefined ? existing.description : input.description,
input.description === undefined ? existing.description : input.description,
updatedAt: new Date(), updatedAt: new Date(),
}) })
.where(eq(timeEntry.id, input.id)) .where(eq(timeEntry.id, input.id))
@@ -211,17 +301,13 @@ export const timeRouter = router({
*/ */
teamToday: protectedProcedure.query(async ({ ctx }) => { teamToday: protectedProcedure.query(async ({ ctx }) => {
const today = todayIso(); const today = todayIso();
const startOfDay = new Date(`${today}T00:00:00+02:00`); const dayStart = berlinDayStartMs(today);
const startOfTomorrow = new Date(startOfDay.getTime() + 24 * 60 * 60 * 1000);
const { todo } = await import('@cockpit/db');
const { inArray } = await import('drizzle-orm');
const rows = await ctx.db const rows = await ctx.db
.select() .select()
.from(timeEntry) .from(timeEntry)
.where( // Heute betroffen: heute gestartet/beendet oder laufend (auch über Mitternacht).
and(gte(timeEntry.startedAt, startOfDay), lte(timeEntry.startedAt, startOfTomorrow)), .where(overlapsToday(today));
);
const todoIds = Array.from( const todoIds = Array.from(
new Set(rows.map((r) => r.todoId).filter((x): x is string => Boolean(x))), new Set(rows.map((r) => r.todoId).filter((x): x is string => Boolean(x))),
@@ -244,9 +330,10 @@ export const timeRouter = router({
}; };
type Bucket = { type Bucket = {
userId: string; userId: string;
totalSeconds: number; trackedSeconds: number; // Summe aller Task-Zeiten (Parallel-Tracking)
byCategory: Record<string, number>; byCategory: Record<string, number>;
active: Active | null; active: Active | null;
intervals: Array<readonly [number, number]>;
}; };
const now = Date.now(); const now = Date.now();
@@ -255,16 +342,18 @@ export const timeRouter = router({
for (const r of rows) { for (const r of rows) {
const bucket: Bucket = perUser.get(r.userId) ?? { const bucket: Bucket = perUser.get(r.userId) ?? {
userId: r.userId, userId: r.userId,
totalSeconds: 0, trackedSeconds: 0,
byCategory: {}, byCategory: {},
active: null, active: null,
intervals: [],
}; };
const duration = r.endedAt // Nur den heutigen Anteil zählen (über Mitternacht gelaufene Blöcke clampen).
? (r.durationSeconds ?? const startMs = Math.max(r.startedAt.getTime(), dayStart);
Math.round((r.endedAt.getTime() - r.startedAt.getTime()) / 1000)) const endMs = r.endedAt ? r.endedAt.getTime() : now;
: Math.round((now - r.startedAt.getTime()) / 1000); const duration = Math.max(0, Math.round((endMs - startMs) / 1000));
bucket.totalSeconds += duration; bucket.trackedSeconds += duration;
bucket.byCategory[r.category] = (bucket.byCategory[r.category] ?? 0) + duration; bucket.byCategory[r.category] = (bucket.byCategory[r.category] ?? 0) + duration;
bucket.intervals.push([startMs, endMs]);
if (!r.endedAt) { if (!r.endedAt) {
bucket.active = { bucket.active = {
startedAt: r.startedAt.toISOString(), startedAt: r.startedAt.toISOString(),
@@ -277,6 +366,140 @@ export const timeRouter = router({
perUser.set(r.userId, bucket); perUser.set(r.userId, bucket);
} }
return Array.from(perUser.values()); // Anwesenheit (Lock-in → Feierabend) pro Person — reine Anzeige neben dem
// Tracking. Anker = echter Lock-in; bei vom 6-Uhr-Schnitt auto-angelegten
// Tagen (Check-in 06:00 ist kein echter Lock-in) stattdessen der erste
// Zeiteintrag des Tages.
const dayRows = await ctx.db
.select({
userId: dayEntry.userId,
checkedInAt: dayEntry.checkedInAt,
checkedOutAt: dayEntry.checkedOutAt,
autoCheckedIn: dayEntry.autoCheckedIn,
})
.from(dayEntry)
.where(eq(dayEntry.date, today));
const presenceByUser = new Map(dayRows.map((d) => [d.userId, d]));
// „Gesamt" pro Person = Wall-Clock (Vereinigung der Intervalle).
return Array.from(perUser.values()).map((b) => {
const p = presenceByUser.get(b.userId);
const firstStartMs = b.intervals.length ? Math.min(...b.intervals.map((i) => i[0])) : null;
const anchorMs =
p && !p.autoCheckedIn && p.checkedInAt ? p.checkedInAt.getTime() : firstStartMs;
return {
userId: b.userId,
totalSeconds: unionSeconds(b.intervals),
trackedSeconds: b.trackedSeconds,
byCategory: b.byCategory,
active: b.active,
presenceStartedAt: anchorMs !== null ? new Date(anchorMs).toISOString() : null,
presenceEndedAt: p?.checkedOutAt ? p.checkedOutAt.toISOString() : null,
};
});
}),
/**
* Team-Timeline: alle Zeit-Einträge eines Tages, pro Person eine Spur.
* Liefert Rohdaten (Start/Ende/Kategorie/Label); Achse & parallele Stränge
* (überlappende Blöcke) rendert das Frontend.
*/
teamTimeline: protectedProcedure
.input(TimeEntrySchemas.teamTimelineInput)
.query(async ({ ctx, input }) => {
const today = todayIso();
const date = input.date ?? today;
const isToday = date === today;
const onDate = (col: typeof timeEntry.startedAt | typeof timeEntry.endedAt) =>
sql`(${col} AT TIME ZONE 'Europe/Berlin')::date = ${date}`;
const cond = isToday
? sql`(${onDate(timeEntry.startedAt)} OR ${onDate(timeEntry.endedAt)} OR ${timeEntry.endedAt} IS NULL)`
: sql`(${onDate(timeEntry.startedAt)} OR ${onDate(timeEntry.endedAt)})`;
const rows = await ctx.db
.select()
.from(timeEntry)
.where(cond)
.orderBy(asc(timeEntry.startedAt));
const todoIds = Array.from(
new Set(rows.map((r) => r.todoId).filter((x): x is string => !!x)),
);
const titles = new Map<string, string>();
if (todoIds.length > 0) {
const tr = await ctx.db
.select({ id: todo.id, title: todo.title })
.from(todo)
.where(inArray(todo.id, todoIds));
for (const t of tr) titles.set(t.id, t.title);
}
const userRows = await ctx.db
.select({ id: user.id, name: user.name })
.from(user)
.where(eq(user.active, true));
const nameById = new Map(userRows.map((u) => [u.id, u.name]));
type Entry = {
id: string;
start: string;
end: string | null;
category: string;
description: string | null;
todoTitle: string | null;
};
const byUser = new Map<string, Entry[]>();
for (const r of rows) {
const arr = byUser.get(r.userId) ?? [];
arr.push({
id: r.id,
start: r.startedAt.toISOString(),
end: r.endedAt ? r.endedAt.toISOString() : null,
category: r.category,
description: r.description,
todoTitle: r.todoId ? (titles.get(r.todoId) ?? null) : null,
});
byUser.set(r.userId, arr);
}
const lanes = Array.from(byUser.entries())
.map(([userId, entries]) => ({ userId, name: nameById.get(userId) ?? '—', entries }))
.sort((a, b) => a.name.localeCompare(b.name));
return { date, lanes };
}),
/**
* Getrackte Zeit auf ein Projekt (time_entry mit bezugKind='project'):
* Gesamtsumme + Aufschlüsselung pro Person. bezugId wurde bislang erfasst,
* aber nirgends ausgewertet — das speist die „Getrackte Zeit"-Sektion im
* Projekt-Detail.
*/
byProject: protectedProcedure
.input(z.object({ projectId: z.string().uuid() }))
.query(async ({ ctx, input }) => {
const rows = await ctx.db
.select({
userId: timeEntry.userId,
seconds: sql<number>`COALESCE(SUM(${timeEntry.durationSeconds}), 0)`,
})
.from(timeEntry)
.where(and(eq(timeEntry.bezugKind, 'project'), eq(timeEntry.bezugId, input.projectId)))
.groupBy(timeEntry.userId);
const userRows = await ctx.db.select({ id: user.id, name: user.name }).from(user);
const nameById = new Map(userRows.map((u) => [u.id, u.name]));
const perUser = rows
.map((r) => ({
userId: r.userId,
name: nameById.get(r.userId) ?? '—',
seconds: Number(r.seconds),
}))
.filter((r) => r.seconds > 0)
.sort((a, b) => b.seconds - a.seconds);
const totalSeconds = perUser.reduce((sum, r) => sum + r.seconds, 0);
return { totalSeconds, perUser };
}), }),
}); });
+11 -35
View File
@@ -1,23 +1,20 @@
import { and, eq, gte, lte } from 'drizzle-orm'; import { and, eq, gte, lte } from 'drizzle-orm';
import { TRPCError } from '@trpc/server'; import { TRPCError } from '@trpc/server';
import { user, dayEntry, absenceDay } from '@cockpit/db'; import { user, dayEntry, absenceDay } from '@cockpit/db';
import type { Db } from '@cockpit/db';
import { DayEntrySchemas } from '@cockpit/shared'; import { DayEntrySchemas } from '@cockpit/shared';
import { router, protectedProcedure } from '../trpc.js'; import { router, protectedProcedure } from '../trpc.js';
import { import { todayIso, isWerktag, parseIsoDate, formatIsoDate } from '../lib/werktag.js';
todayIso, import { countStreakDays } from '../lib/streak.js';
isWerktag,
previousWerktag,
parseIsoDate,
formatIsoDate,
} from '../lib/werktag.js';
async function computeStreak(db: import('@cockpit/db').Db, userId: string): Promise<number> { async function computeStreak(db: Db, userId: string): Promise<number> {
const today = todayIso(); const today = todayIso();
// Hole alle relevanten DayEntries und Abwesenheiten der letzten 90 Tage. // DayEntries + Abwesenheiten der letzten 400 Tage (deckt > 1 Jahr Werktage ab,
// damit lange Streaks nicht am Lookback-Fenster abgeschnitten werden).
const endIso = today; const endIso = today;
const start = parseIsoDate(today); const start = parseIsoDate(today);
start.setUTCDate(start.getUTCDate() - 120); start.setUTCDate(start.getUTCDate() - 400);
const startIso = formatIsoDate(start); const startIso = formatIsoDate(start);
const [entries, absences] = await Promise.all([ const [entries, absences] = await Promise.all([
@@ -39,31 +36,11 @@ async function computeStreak(db: import('@cockpit/db').Db, userId: string): Prom
), ),
]); ]);
const fullByDate = new Map<string, boolean>(); const fullDates = new Set<string>();
for (const e of entries) fullByDate.set(e.date, e.status === 'full'); for (const e of entries) if (e.status === 'full') fullDates.add(e.date);
const absSet = new Set(absences.map((a) => a.date)); const absenceDates = new Set(absences.map((a) => a.date));
// Zähle aufeinanderfolgende volle Werktage rückwärts ab heute. return countStreakDays({ today, fullDates, absenceDates });
let cursor = today;
let streak = 0;
// Wenn heute noch nicht voll: starten beim vorherigen Werktag.
if (!fullByDate.get(today)) {
cursor = previousWerktag(today);
}
while (true) {
if (!isWerktag(cursor)) break;
if (absSet.has(cursor)) {
cursor = previousWerktag(cursor);
continue;
}
if (fullByDate.get(cursor)) {
streak++;
cursor = previousWerktag(cursor);
continue;
}
break;
}
return streak;
} }
export const userRouter = router({ export const userRouter = router({
@@ -95,7 +72,6 @@ export const userRouter = router({
let cursor = input.from; let cursor = input.from;
const toInsert: { userId: string; date: string; reason: 'urlaub' | 'krank' | 'sonstiges' }[] = const toInsert: { userId: string; date: string; reason: 'urlaub' | 'krank' | 'sonstiges' }[] =
[]; [];
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
while (cursor <= input.to) { while (cursor <= input.to) {
if (isWerktag(cursor)) { if (isWerktag(cursor)) {
toInsert.push({ userId: ctx.user.id, date: cursor, reason: input.reason }); toInsert.push({ userId: ctx.user.id, date: cursor, reason: input.reason });
+21
View File
@@ -1,6 +1,7 @@
import Fastify from 'fastify'; import Fastify from 'fastify';
import cookie from '@fastify/cookie'; import cookie from '@fastify/cookie';
import { fastifyTRPCPlugin, type FastifyTRPCPluginOptions } from '@trpc/server/adapters/fastify'; import { fastifyTRPCPlugin, type FastifyTRPCPluginOptions } from '@trpc/server/adapters/fastify';
import { runMigrations, ensureBaseAreas } from '@cockpit/db';
import { loadEnv } from './env.js'; import { loadEnv } from './env.js';
import { logger } from './lib/logger.js'; import { logger } from './lib/logger.js';
import { registerAuthMiddleware } from './auth/middleware.js'; import { registerAuthMiddleware } from './auth/middleware.js';
@@ -12,6 +13,26 @@ import { createContext } from './trpc.js';
async function main() { async function main() {
const env = loadEnv(); const env = loadEnv();
// Schema-Migrationen vor dem Start anwenden (idempotent). Schlägt eine
// Migration fehl, startet der Server nicht — besser als mit veraltetem Schema.
try {
await runMigrations(env.DATABASE_URL);
logger.info('db migrations applied');
} catch (err) {
logger.error({ err }, 'db migration failed');
process.exit(1);
}
// Basis-Bereiche sicherstellen (idempotent), damit der „Neues Projekt"-
// Bereich-Dropdown auch auf einer nicht geseedeten Prod-DB nie leer ist.
try {
await ensureBaseAreas(env.DATABASE_URL);
logger.info('base areas ensured');
} catch (err) {
logger.error({ err }, 'ensure base areas failed');
}
const app = Fastify({ const app = Fastify({
logger: { logger: {
level: env.LOG_LEVEL, level: env.LOG_LEVEL,
+23 -18
View File
@@ -3,8 +3,9 @@
import './types.js'; import './types.js';
import { initTRPC, TRPCError } from '@trpc/server'; import { initTRPC, TRPCError } from '@trpc/server';
import type { FastifyRequest, FastifyReply } from 'fastify'; import type { FastifyRequest, FastifyReply } from 'fastify';
import type { User } from '@cockpit/db'; import { auditEvent, type User } from '@cockpit/db';
import { getDb } from './db.js'; import { getDb } from './db.js';
import { logger } from './lib/logger.js';
export interface Context { export interface Context {
user: User | null; user: User | null;
@@ -45,25 +46,29 @@ export const protectedProcedure = t.procedure.use(async ({ ctx, next }) => {
return next({ ctx: { ...ctx, user: ctx.user } }); return next({ ctx: { ...ctx, user: ctx.user } });
}); });
// Audit-Wrapper: schreibt nach erfolgreicher Mutation einen audit_event. /**
// Genutzt als zusätzliche Middleware auf Mutations. * Auditierte Procedure: wie `protectedProcedure`, schreibt aber nach erfolgreicher
export function withAudit<TInput, TResult extends Record<string, unknown> | unknown>( * Ausführung einen `audit_event`. Nutzung:
action: string, * auditedProcedure('blocker.resolve').input(schema).mutation(...)
) { * Das Audit ist best-effort — ein Fehler beim Schreiben darf die eigentliche
return async function audit(opts: { * Mutation nicht scheitern lassen.
ctx: Context; */
input: TInput; export function auditedProcedure(action: string) {
next: () => Promise<{ ok: true; data: TResult } | TResult>; return protectedProcedure.use(async ({ ctx, next, getRawInput }) => {
}) { const result = await next();
const result = await opts.next(); if (result.ok) {
if (!opts.ctx.user) return result; try {
const { auditEvent } = await import('@cockpit/db'); const rawInput = await getRawInput();
await opts.ctx.db.insert(auditEvent).values({ await ctx.db.insert(auditEvent).values({
actorUserId: opts.ctx.user.id, actorUserId: ctx.user.id,
action, action,
entityKind: action.split('.')[0] ?? 'unknown', entityKind: action.split('.')[0] ?? 'unknown',
payload: { input: opts.input as unknown }, payload: { input: (rawInput ?? null) as unknown },
}); });
} catch (err) {
logger.warn({ err, action }, 'audit_event konnte nicht geschrieben werden');
}
}
return result; return result;
}; });
} }
+10
View File
@@ -0,0 +1,10 @@
# Caddy-Config für das statische Web-Image (cockpit-web).
# Liefert die gebaute SPA aus /srv mit SPA-Fallback auf index.html.
# /api und /trpc werden in Produktion bereits von Traefik (höhere Priorität)
# an cockpit-api geroutet und erreichen diesen Container nicht.
:80 {
root * /srv
encode zstd gzip
try_files {path} /index.html
file_server
}
+3 -1
View File
@@ -19,6 +19,8 @@ COPY packages/shared ./packages/shared
RUN pnpm --filter web build RUN pnpm --filter web build
# --- runtime (static via Caddy in production compose) --- # --- runtime (static via Caddy) ---
FROM caddy:2-alpine AS runtime FROM caddy:2-alpine AS runtime
# Eigene Caddy-Config statt der Default-Welcome-Seite: SPA aus /srv ausliefern.
COPY apps/web/Caddyfile /etc/caddy/Caddyfile
COPY --from=builder /repo/apps/web/dist /srv COPY --from=builder /repo/apps/web/dist /srv
+3
View File
@@ -1,12 +1,15 @@
import { Toaster } from 'sonner'; import { Toaster } from 'sonner';
import { TrpcProvider } from './lib/trpc-provider'; import { TrpcProvider } from './lib/trpc-provider';
import { Router } from './lib/router'; import { Router } from './lib/router';
import { ConfirmProvider } from './components/ui/ConfirmProvider';
export function App() { export function App() {
return ( return (
<TrpcProvider> <TrpcProvider>
<ConfirmProvider>
<Router /> <Router />
<Toaster position="bottom-right" richColors={false} /> <Toaster position="bottom-right" richColors={false} />
</ConfirmProvider>
</TrpcProvider> </TrpcProvider>
); );
} }
@@ -3,6 +3,7 @@ import { toast } from 'sonner';
import { trpc } from '../../lib/trpc'; import { trpc } from '../../lib/trpc';
import { voice } from '../../lib/voice'; import { voice } from '../../lib/voice';
import { Button } from '../ui/Button'; import { Button } from '../ui/Button';
import { Modal } from '../ui/Modal';
export function BlockerDialog({ onClose }: { onClose: () => void }) { export function BlockerDialog({ onClose }: { onClose: () => void }) {
const [title, setTitle] = useState(''); const [title, setTitle] = useState('');
@@ -23,15 +24,7 @@ export function BlockerDialog({ onClose }: { onClose: () => void }) {
} }
return ( return (
<div <Modal open onClose={onClose} title="Neuer Blocker">
className="fixed inset-0 z-50 flex items-center justify-center bg-black/30"
onClick={onClose}
>
<div
className="w-full max-w-md rounded-[var(--radius-xl)] bg-[var(--color-bg)] p-6 shadow-[var(--shadow-lg)]"
onClick={(e) => e.stopPropagation()}
>
<h2 className="text-xl font-semibold">Neuer Blocker</h2>
<form onSubmit={submit} className="mt-4 space-y-3"> <form onSubmit={submit} className="mt-4 space-y-3">
<label className="block"> <label className="block">
<span className="text-sm font-medium">Was klemmt?</span> <span className="text-sm font-medium">Was klemmt?</span>
@@ -65,7 +58,6 @@ export function BlockerDialog({ onClose }: { onClose: () => void }) {
</Button> </Button>
</div> </div>
</form> </form>
</div> </Modal>
</div>
); );
} }
@@ -3,14 +3,18 @@ import { useEffect, useState } from 'react';
import { TopNav } from './TopNav'; import { TopNav } from './TopNav';
import { useCurrentUser } from '../../hooks/useCurrentUser'; import { useCurrentUser } from '../../hooks/useCurrentUser';
import { BlockerDialog } from '../blocker/BlockerDialog'; import { BlockerDialog } from '../blocker/BlockerDialog';
import { CommandPalette } from '../search/CommandPalette';
const SHORTCUT_MAP: Record<string, string> = { const SHORTCUT_MAP: Record<string, string> = {
p: '/dashboard', p: '/dashboard',
h: '/heute', h: '/heute',
w: '/meine-woche',
b: '/bereich', b: '/bereich',
e: '/bereich/entwicklung', e: '/bereich/entwicklung',
v: '/bereich/vertrieb', v: '/bereich/vertrieb',
m: '/bereich/marketing', m: '/bereich/marketing',
t: '/team',
i: '/historie',
a: '/archiv', a: '/archiv',
}; };
@@ -18,6 +22,7 @@ export function AppShell() {
const me = useCurrentUser(); const me = useCurrentUser();
const navigate = useNavigate(); const navigate = useNavigate();
const [blockerOpen, setBlockerOpen] = useState(false); const [blockerOpen, setBlockerOpen] = useState(false);
const [searchOpen, setSearchOpen] = useState(false);
// Dev-Mode: bei fehlender Session sofort in den Auto-Login. Auf prod hingegen // Dev-Mode: bei fehlender Session sofort in den Auto-Login. Auf prod hingegen
// zeigen wir die Login-Aufforderung mit dem Authentik-Link. // zeigen wir die Login-Aufforderung mit dem Authentik-Link.
@@ -47,6 +52,12 @@ export function AppShell() {
} }
function onKey(e: KeyboardEvent) { function onKey(e: KeyboardEvent) {
// Cmd/Ctrl+K öffnet die Suche — auch aus Eingabefeldern heraus.
if ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === 'k') {
e.preventDefault();
setSearchOpen(true);
return;
}
const target = e.target as HTMLElement | null; const target = e.target as HTMLElement | null;
if ( if (
target && target &&
@@ -54,6 +65,11 @@ export function AppShell() {
) { ) {
return; return;
} }
if (e.key === '/') {
e.preventDefault();
setSearchOpen(true);
return;
}
if (e.key === '?' && !waitingForSecond) { if (e.key === '?' && !waitingForSecond) {
// eslint-disable-next-line no-alert // eslint-disable-next-line no-alert
alert( alert(
@@ -94,6 +110,7 @@ export function AppShell() {
{me ? <Outlet /> : <NotLoggedInHint />} {me ? <Outlet /> : <NotLoggedInHint />}
</main> </main>
{blockerOpen && <BlockerDialog onClose={() => setBlockerOpen(false)} />} {blockerOpen && <BlockerDialog onClose={() => setBlockerOpen(false)} />}
<CommandPalette open={searchOpen} onClose={() => setSearchOpen(false)} />
</div> </div>
); );
} }
+7 -1
View File
@@ -10,6 +10,9 @@ const TABS = [
{ to: '/dashboard', label: 'Dashboard', shortcut: 'g d', matchPrefix: '/dashboard' }, { to: '/dashboard', label: 'Dashboard', shortcut: 'g d', matchPrefix: '/dashboard' },
{ to: '/bereich', label: 'Bereich', shortcut: 'g b', matchPrefix: '/bereich' }, { to: '/bereich', label: 'Bereich', shortcut: 'g b', matchPrefix: '/bereich' },
{ to: '/heute', label: 'Heute', shortcut: 'g h', matchPrefix: '/heute' }, { to: '/heute', label: 'Heute', shortcut: 'g h', matchPrefix: '/heute' },
{ to: '/meine-woche', label: 'Woche', shortcut: 'g w', matchPrefix: '/meine-woche' },
{ to: '/team', label: 'Team', shortcut: 'g t', matchPrefix: '/team' },
{ to: '/historie', label: 'Historie', shortcut: 'g i', matchPrefix: '/historie' },
{ to: '/archiv', label: 'Archiv', shortcut: 'g a', matchPrefix: '/archiv' }, { to: '/archiv', label: 'Archiv', shortcut: 'g a', matchPrefix: '/archiv' },
] as const; ] as const;
@@ -35,7 +38,10 @@ export function TopNav() {
className="mx-auto flex h-14 max-w-[1280px] items-center gap-2 px-6" className="mx-auto flex h-14 max-w-[1280px] items-center gap-2 px-6"
aria-label="Hauptnavigation" aria-label="Hauptnavigation"
> >
<NavLink to="/dashboard" className="flex items-center gap-1.5 font-bold text-[var(--color-ink)]"> <NavLink
to="/dashboard"
className="flex items-center gap-1.5 font-bold text-[var(--color-ink)]"
>
<span>{voice.appName}</span> <span>{voice.appName}</span>
<ToolCtrlLogo size={18} /> <ToolCtrlLogo size={18} />
</NavLink> </NavLink>
@@ -0,0 +1,137 @@
import { useRef, useState } from 'react';
import { clsx } from 'clsx';
import { Upload, X } from 'lucide-react';
// Datei → zentriert quadratisch zugeschnittene, auf `size` verkleinerte WebP-Data-URL.
async function fileToSquareDataUrl(file: File, size = 256): Promise<string> {
const dataUrl = await new Promise<string>((resolve, reject) => {
const reader = new FileReader();
reader.onload = () => resolve(reader.result as string);
reader.onerror = () => reject(new Error('Datei konnte nicht gelesen werden.'));
reader.readAsDataURL(file);
});
const img = await new Promise<HTMLImageElement>((resolve, reject) => {
const i = new Image();
i.onload = () => resolve(i);
i.onerror = () => reject(new Error('Bild konnte nicht geladen werden.'));
i.src = dataUrl;
});
const canvas = document.createElement('canvas');
canvas.width = size;
canvas.height = size;
const ctx = canvas.getContext('2d');
if (!ctx) throw new Error('Canvas nicht verfügbar.');
// Center-Crop (cover): kürzere Kante bestimmt das Quadrat.
const s = Math.min(img.width, img.height);
const sx = (img.width - s) / 2;
const sy = (img.height - s) / 2;
ctx.drawImage(img, sx, sy, s, s, 0, 0, size, size);
return canvas.toDataURL('image/webp', 0.85);
}
export function ProjectLogo({
url,
name,
size = 40,
className,
}: {
url: string | null | undefined;
name: string;
size?: number;
className?: string;
}) {
if (url) {
return (
<img
src={url}
alt=""
className={clsx('shrink-0 rounded-[var(--radius-md)] object-cover', className)}
style={{ width: size, height: size }}
/>
);
}
const initials = name.trim().slice(0, 2).toUpperCase() || '–';
return (
<div
className={clsx(
'flex shrink-0 items-center justify-center rounded-[var(--radius-md)] bg-black/5 font-semibold text-[var(--color-ink-muted)]',
className,
)}
style={{ width: size, height: size, fontSize: Math.round(size * 0.34) }}
aria-hidden
>
{initials}
</div>
);
}
export function LogoUpload({
value,
name,
onChange,
className,
}: {
value: string | null;
name: string;
onChange: (v: string | null) => void;
className?: string;
}) {
const inputRef = useRef<HTMLInputElement>(null);
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
async function handleFile(file: File | undefined) {
if (!file) return;
setError(null);
setBusy(true);
try {
onChange(await fileToSquareDataUrl(file));
} catch (e) {
setError(e instanceof Error ? e.message : 'Upload fehlgeschlagen.');
} finally {
setBusy(false);
if (inputRef.current) inputRef.current.value = '';
}
}
return (
<div className={clsx('flex items-center gap-3', className)}>
<ProjectLogo url={value} name={name} size={56} />
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<button
type="button"
onClick={() => inputRef.current?.click()}
disabled={busy}
className="inline-flex items-center gap-1 rounded-[var(--radius-md)] border border-[var(--color-border)] px-2.5 py-1 text-xs hover:border-[var(--color-ink)] disabled:opacity-50"
>
<Upload size={13} /> {busy ? 'Lädt…' : value ? 'Ändern' : 'Logo hochladen'}
</button>
{value && (
<button
type="button"
onClick={() => onChange(null)}
className="inline-flex items-center gap-1 text-xs text-[var(--color-ink-muted)] hover:text-[var(--color-ampel-red-fg)]"
>
<X size={13} /> Entfernen
</button>
)}
</div>
{error ? (
<span className="text-xs text-[var(--color-ampel-red-fg)]">{error}</span>
) : (
<span className="text-xs text-[var(--color-ink-faint)]">
Quadratisch, wird auf 256px verkleinert.
</span>
)}
</div>
<input
ref={inputRef}
type="file"
accept="image/*"
className="hidden"
onChange={(e) => handleFile(e.target.files?.[0])}
/>
</div>
);
}
@@ -0,0 +1,106 @@
import { useEffect, useState, type ReactNode } from 'react';
import { useNavigate } from 'react-router';
import { trpc } from '../../lib/trpc';
import { Modal } from '../ui/Modal';
/**
* Globale Schnellsuche (Cmd/Ctrl+K oder „/"). Tippen sucht debounced über
* Projekte, Leads und offene Blocker; Klick springt zum Ziel.
*/
export function CommandPalette({ open, onClose }: { open: boolean; onClose: () => void }) {
const navigate = useNavigate();
const [q, setQ] = useState('');
const [debounced, setDebounced] = useState('');
useEffect(() => {
const t = setTimeout(() => setDebounced(q.trim()), 200);
return () => clearTimeout(t);
}, [q]);
useEffect(() => {
if (!open) {
setQ('');
setDebounced('');
}
}, [open]);
const results = trpc.search.all.useQuery(
{ q: debounced },
{ enabled: open && debounced.length >= 1 },
);
const data = results.data;
const empty =
!!data && data.projects.length === 0 && data.leads.length === 0 && data.blockers.length === 0;
function go(path: string) {
onClose();
navigate(path);
}
return (
<Modal open={open} onClose={onClose} title="Suche">
<input
type="text"
value={q}
onChange={(e) => setQ(e.target.value)}
placeholder="Projekt, Lead oder Blocker …"
className="mt-2 w-full rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-3 py-2 text-sm focus:border-[var(--color-ink)] focus:outline-none"
/>
<div className="mt-3 max-h-80 space-y-3 overflow-y-auto text-sm">
{debounced.length >= 1 && empty && results.isFetched && (
<p className="text-[var(--color-ink-muted)]">Nichts gefunden.</p>
)}
{data && data.projects.length > 0 && (
<Group title="Projekte">
{data.projects.map((p) => (
<ResultItem
key={p.id}
label={p.archived ? `${p.label} (archiviert)` : p.label}
onClick={() => go(`/projekt/${p.id}`)}
/>
))}
</Group>
)}
{data && data.leads.length > 0 && (
<Group title="Leads">
{data.leads.map((l) => (
<ResultItem key={l.id} label={l.label} onClick={() => go(`/lead/${l.id}`)} />
))}
</Group>
)}
{data && data.blockers.length > 0 && (
<Group title="Offene Blocker">
{data.blockers.map((b) => (
<ResultItem key={b.id} label={b.label} onClick={() => go('/dashboard')} />
))}
</Group>
)}
</div>
</Modal>
);
}
function Group({ title, children }: { title: string; children: ReactNode }) {
return (
<div>
<p className="mb-1 text-xs font-medium uppercase tracking-wide text-[var(--color-ink-faint)]">
{title}
</p>
<ul className="space-y-0.5">{children}</ul>
</div>
);
}
function ResultItem({ label, onClick }: { label: string; onClick: () => void }) {
return (
<li>
<button
type="button"
onClick={onClick}
className="w-full truncate rounded-[var(--radius-sm)] px-2 py-1.5 text-left hover:bg-black/5"
>
{label}
</button>
</li>
);
}
@@ -28,6 +28,16 @@ function initials(name: string) {
.join(''); .join('');
} }
/** Anwesenheit (Lock-in → Feierabend bzw. jetzt) — reine Anzeige, kein Tracking. */
function presenceSecondsOf(it: {
presenceStartedAt: string | null;
presenceEndedAt: string | null;
}): number | null {
if (!it.presenceStartedAt) return null;
const endMs = it.presenceEndedAt ? new Date(it.presenceEndedAt).getTime() : Date.now();
return Math.max(0, Math.round((endMs - new Date(it.presenceStartedAt).getTime()) / 1000));
}
export function TeamTimeSection() { export function TeamTimeSection() {
const team = trpc.time.teamToday.useQuery(undefined, { refetchInterval: 30_000 }); const team = trpc.time.teamToday.useQuery(undefined, { refetchInterval: 30_000 });
const users = trpc.user.list.useQuery(); const users = trpc.user.list.useQuery();
@@ -79,13 +89,32 @@ export function TeamTimeSection() {
<p className="text-xs text-[var(--color-ink-muted)]"> <p className="text-xs text-[var(--color-ink-muted)]">
Gesamt:{' '} Gesamt:{' '}
<span className="font-mono">{formatDurationCompact(it.totalSeconds)}</span> <span className="font-mono">{formatDurationCompact(it.totalSeconds)}</span>
{it.trackedSeconds > it.totalSeconds + 60 && (
<span
className="text-[var(--color-ink-faint)]"
title="Über parallele Aufgaben getrackte Summe (zählt überlappende Zeit mehrfach)."
>
{' · getrackt '}
<span className="font-mono">
{formatDurationCompact(it.trackedSeconds)}
</span>
</span>
)}
{presenceSecondsOf(it) !== null && (
<span title="Anwesenheit: ab Lock-in (bzw. erstem Zeiteintrag des Tages) bis Feierabend bzw. jetzt — unabhängig vom Tracking.">
{' · Anwesend: '}
<span className="font-mono">
{formatDurationCompact(presenceSecondsOf(it)!)}
</span>
</span>
)}
</p> </p>
</div> </div>
</div> </div>
{it.active ? <ActiveLine active={it.active} /> : <IdleLine />} {it.active ? <ActiveLine active={it.active} /> : <IdleLine />}
<Breakdown byCategory={it.byCategory} total={it.totalSeconds} /> <Breakdown byCategory={it.byCategory} total={it.trackedSeconds} />
</Card.Body> </Card.Body>
</Card.Root> </Card.Root>
))} ))}
@@ -122,18 +151,10 @@ function ActiveLine({
} }
function IdleLine() { function IdleLine() {
return ( return <p className="mt-3 text-xs text-[var(--color-ink-faint)]">Aktuell kein Timer.</p>;
<p className="mt-3 text-xs text-[var(--color-ink-faint)]">Aktuell kein Timer.</p>
);
} }
function Breakdown({ function Breakdown({ byCategory, total }: { byCategory: Record<string, number>; total: number }) {
byCategory,
total,
}: {
byCategory: Record<string, number>;
total: number;
}) {
if (total === 0) return null; if (total === 0) return null;
const ordered = TIME_CATEGORIES.map((c) => ({ const ordered = TIME_CATEGORIES.map((c) => ({
key: c.value, key: c.value,
@@ -1,11 +1,13 @@
import { useState } from 'react'; import { useState } from 'react';
import { Pencil, Trash2, Plus, X } from 'lucide-react'; import { Pencil, Trash2, Plus } from 'lucide-react';
import { toast } from 'sonner'; import { toast } from 'sonner';
import { clsx } from 'clsx'; import { clsx } from 'clsx';
import { trpc } from '../../lib/trpc'; import { trpc } from '../../lib/trpc';
import { Card } from '../ui/Card'; import { Card } from '../ui/Card';
import { Button } from '../ui/Button'; import { Button } from '../ui/Button';
import { Modal } from '../ui/Modal';
import { formatDuration, formatDurationCompact } from '../../lib/format-duration'; import { formatDuration, formatDurationCompact } from '../../lib/format-duration';
import { usePresenceSeconds } from '../../lib/use-presence-seconds';
import { TIME_CATEGORIES, type TimeCategory } from '../../lib/time-categories'; import { TIME_CATEGORIES, type TimeCategory } from '../../lib/time-categories';
const CATEGORY_LABEL: Record<string, string> = Object.fromEntries( const CATEGORY_LABEL: Record<string, string> = Object.fromEntries(
@@ -29,9 +31,23 @@ export function TimelineSection() {
const todayQuery = trpc.dayEntry.today.useQuery(); const todayQuery = trpc.dayEntry.today.useQuery();
const [manualOpen, setManualOpen] = useState(false); const [manualOpen, setManualOpen] = useState(false);
const [editing, setEditing] = useState<string | null>(null); const [editing, setEditing] = useState<string | null>(null);
// Anwesenheits-Anker: echter Lock-in; bei Auto-Tagen (6-Uhr-Schnitt) liefert
// listToday den ersten Zeiteintrag des Tages als Fallback.
const todayEntry = todayQuery.data?.entry;
const presenceFrom =
todayEntry && !todayEntry.autoCheckedIn && todayEntry.checkedInAt
? todayEntry.checkedInAt
: (listQuery.data?.presenceStartedAt ?? null);
const presenceSeconds = usePresenceSeconds(
presenceFrom,
todayEntry?.checkedOutAt ?? listQuery.data?.presenceEndedAt ?? null,
);
if (listQuery.isPending) return null; if (listQuery.isPending) return null;
const entries = listQuery.data?.entries ?? []; // Aufsteigend sortieren: Vormittag oben, Abend unten.
const entries = [...(listQuery.data?.entries ?? [])].sort(
(a, b) => new Date(a.startedAt).getTime() - new Date(b.startedAt).getTime(),
);
const totalSeconds = listQuery.data?.totalSeconds ?? 0; const totalSeconds = listQuery.data?.totalSeconds ?? 0;
const todoTitles = new Map((todayQuery.data?.todos ?? []).map((t) => [t.id, t.title])); const todoTitles = new Map((todayQuery.data?.todos ?? []).map((t) => [t.id, t.title]));
@@ -41,7 +57,13 @@ export function TimelineSection() {
<div> <div>
<h2 className="text-lg font-semibold">Zeit heute</h2> <h2 className="text-lg font-semibold">Zeit heute</h2>
<p className="text-xs text-[var(--color-ink-muted)]"> <p className="text-xs text-[var(--color-ink-muted)]">
Gesamt: <span className="font-mono">{formatDurationCompact(totalSeconds)}</span> Getrackt: <span className="font-mono">{formatDurationCompact(totalSeconds)}</span>
{presenceSeconds !== null && (
<>
{' · '}Anwesend:{' '}
<span className="font-mono">{formatDurationCompact(presenceSeconds)}</span>
</>
)}
</p> </p>
</div> </div>
<Button size="sm" variant="secondary" onClick={() => setManualOpen(true)}> <Button size="sm" variant="secondary" onClick={() => setManualOpen(true)}>
@@ -64,7 +86,7 @@ export function TimelineSection() {
<TimelineRow <TimelineRow
key={e.id} key={e.id}
entry={e} entry={e}
todoTitle={e.todoId ? todoTitles.get(e.todoId) : undefined} todoTitle={e.todoTitle ?? (e.todoId ? todoTitles.get(e.todoId) : undefined)}
todos={todayQuery.data?.todos ?? []} todos={todayQuery.data?.todos ?? []}
isEditing={editing === e.id} isEditing={editing === e.id}
onEdit={() => setEditing(e.id)} onEdit={() => setEditing(e.id)}
@@ -77,10 +99,7 @@ export function TimelineSection() {
)} )}
{manualOpen && ( {manualOpen && (
<ManualDialog <ManualDialog onClose={() => setManualOpen(false)} todos={todayQuery.data?.todos ?? []} />
onClose={() => setManualOpen(false)}
todos={todayQuery.data?.todos ?? []}
/>
)} )}
</section> </section>
); );
@@ -92,6 +111,7 @@ type TimeEntryRow = {
endedAt: string | Date | null; endedAt: string | Date | null;
durationSeconds: number | null; durationSeconds: number | null;
todoId: string | null; todoId: string | null;
todoTitle?: string | null;
category: string; category: string;
description: string | null; description: string | null;
}; };
@@ -237,6 +257,11 @@ function TimelineRow({
return ( return (
<div className="group flex items-center gap-3 rounded-[var(--radius-md)] border border-[var(--color-border)] p-2.5 text-sm"> <div className="group flex items-center gap-3 rounded-[var(--radius-md)] border border-[var(--color-border)] p-2.5 text-sm">
<div className="w-28 shrink-0 font-mono text-xs text-[var(--color-ink-muted)]"> <div className="w-28 shrink-0 font-mono text-xs text-[var(--color-ink-muted)]">
{start.toDateString() !== new Date().toDateString() && (
<span className="mr-1 text-[var(--color-ink-faint)]">
{pad(start.getDate())}.{pad(start.getMonth() + 1)}.
</span>
)}
{pad(start.getHours())}:{pad(start.getMinutes())} {pad(start.getHours())}:{pad(start.getMinutes())}
{end && ( {end && (
<> <>
@@ -249,7 +274,10 @@ function TimelineRow({
<p className="truncate">{label}</p> <p className="truncate">{label}</p>
<p className="text-xs text-[var(--color-ink-muted)]"> <p className="text-xs text-[var(--color-ink-muted)]">
{CATEGORY_LABEL[entry.category]} {CATEGORY_LABEL[entry.category]}
{entry.description && !todoTitle && entry.description !== label && ` · ${entry.description}`} {entry.description &&
!todoTitle &&
entry.description !== label &&
` · ${entry.description}`}
</p> </p>
</div> </div>
<div <div
@@ -261,7 +289,7 @@ function TimelineRow({
{formatDuration(duration)} {formatDuration(duration)}
</div> </div>
{!isRunning && ( {!isRunning && (
<div className="flex shrink-0 gap-1 opacity-0 group-hover:opacity-100"> <div className="flex shrink-0 gap-1 opacity-100 sm:opacity-0 sm:group-hover:opacity-100">
<button <button
type="button" type="button"
onClick={onEdit} onClick={onEdit}
@@ -324,25 +352,7 @@ export function ManualDialog({
} }
return ( return (
<div <Modal open onClose={onClose} title="Block nachtragen">
className="fixed inset-0 z-50 flex items-center justify-center bg-black/30"
onClick={onClose}
>
<div
className="w-full max-w-md rounded-[var(--radius-xl)] bg-[var(--color-bg)] p-6 shadow-[var(--shadow-lg)]"
onClick={(e) => e.stopPropagation()}
>
<div className="flex items-center justify-between">
<h2 className="text-xl font-semibold">Block nachtragen</h2>
<button
type="button"
onClick={onClose}
aria-label="Schließen"
className="rounded-[var(--radius-sm)] p-1 text-[var(--color-ink-muted)] hover:bg-black/5"
>
<X size={16} />
</button>
</div>
<form onSubmit={submit} className="mt-4 space-y-3"> <form onSubmit={submit} className="mt-4 space-y-3">
<div className="grid grid-cols-2 gap-2"> <div className="grid grid-cols-2 gap-2">
<label className="block"> <label className="block">
@@ -414,7 +424,6 @@ export function ManualDialog({
</Button> </Button>
</div> </div>
</form> </form>
</div> </Modal>
</div>
); );
} }
+127 -41
View File
@@ -9,37 +9,62 @@ import { TIME_CATEGORIES } from '../../lib/time-categories';
const CATEGORY_LABEL: Record<string, string> = Object.fromEntries( const CATEGORY_LABEL: Record<string, string> = Object.fromEntries(
TIME_CATEGORIES.map((c) => [c.value, c.label]), TIME_CATEGORIES.map((c) => [c.value, c.label]),
); );
const CATEGORY_DOT: Record<string, string> = {
focus: 'bg-[var(--color-ink)]',
meeting: 'bg-[var(--color-ampel-amber-fg)]',
admin: 'bg-[var(--color-ink-muted)]',
learning: 'bg-[var(--color-ampel-green-fg)]',
break: 'bg-[var(--color-ampel-amber-fg)]',
other: 'bg-[var(--color-border-strong)]',
};
type Active = {
id: string;
startedAt: string | Date;
category: string;
description: string | null;
todoId: string | null;
todoTitle: string | null;
};
function labelOf(a: Active): string {
return a.description || a.todoTitle || CATEGORY_LABEL[a.category] || 'Timer';
}
function elapsedOf(a: Active): number {
return Math.max(0, Math.round((Date.now() - new Date(a.startedAt).getTime()) / 1000));
}
export function TimerPill() { export function TimerPill() {
const utils = trpc.useUtils(); const utils = trpc.useUtils();
const nowQuery = trpc.time.now.useQuery(undefined, { refetchInterval: 30_000 }); const nowQuery = trpc.time.now.useQuery(undefined, { refetchInterval: 30_000 });
const todayQuery = trpc.dayEntry.today.useQuery(); const todayQuery = trpc.dayEntry.today.useQuery();
const [pickerOpen, setPickerOpen] = useState(false); const [pickerOpen, setPickerOpen] = useState(false);
const [elapsed, setElapsed] = useState(0); const [panelOpen, setPanelOpen] = useState(false);
const [, setTick] = useState(0);
const pickerRef = useRef<HTMLDivElement>(null); const pickerRef = useRef<HTMLDivElement>(null);
// Tick-Sekundenzähler nur wenn ein Timer läuft. const active: Active[] = nowQuery.data ?? [];
// Sekunden-Tick nur wenn etwas läuft.
useEffect(() => { useEffect(() => {
if (!nowQuery.data) { if (active.length === 0) return undefined;
setElapsed(0); const id = window.setInterval(() => setTick((t) => t + 1), 1000);
return;
}
const start = new Date(nowQuery.data.startedAt).getTime();
const updateElapsed = () => setElapsed(Math.round((Date.now() - start) / 1000));
updateElapsed();
const id = window.setInterval(updateElapsed, 1000);
return () => window.clearInterval(id); return () => window.clearInterval(id);
}, [nowQuery.data]); }, [active.length]);
useEffect(() => { useEffect(() => {
if (!pickerOpen) return undefined; if (!pickerOpen && !panelOpen) return undefined;
function onClick(e: MouseEvent) { function onClick(e: MouseEvent) {
if (pickerRef.current && !pickerRef.current.contains(e.target as Node)) { if (pickerRef.current && !pickerRef.current.contains(e.target as Node)) {
setPickerOpen(false); setPickerOpen(false);
setPanelOpen(false);
} }
} }
function onKey(e: KeyboardEvent) { function onKey(e: KeyboardEvent) {
if (e.key === 'Escape') setPickerOpen(false); if (e.key === 'Escape') {
setPickerOpen(false);
setPanelOpen(false);
}
} }
document.addEventListener('mousedown', onClick); document.addEventListener('mousedown', onClick);
document.addEventListener('keydown', onKey); document.addEventListener('keydown', onKey);
@@ -47,48 +72,40 @@ export function TimerPill() {
document.removeEventListener('mousedown', onClick); document.removeEventListener('mousedown', onClick);
document.removeEventListener('keydown', onKey); document.removeEventListener('keydown', onKey);
}; };
}, [pickerOpen]); }, [pickerOpen, panelOpen]);
const stopMutation = trpc.time.stop.useMutation({ const invalidate = async () => {
onSuccess: async () => {
await utils.time.now.invalidate(); await utils.time.now.invalidate();
await utils.time.listToday.invalidate(); await utils.time.listToday.invalidate();
toast('Timer gestoppt.'); };
},
});
const startMutation = trpc.time.start.useMutation({ const startMutation = trpc.time.start.useMutation({
onSuccess: async () => { onSuccess: async () => {
await utils.time.now.invalidate(); await invalidate();
await utils.time.listToday.invalidate();
setPickerOpen(false); setPickerOpen(false);
toast('Timer läuft.'); toast('Timer läuft.');
}, },
}); });
const count = active.length;
const active = nowQuery.data; const longest = count > 0 ? Math.max(...active.map(elapsedOf)) : 0;
const title = active
? active.description ||
(active.todoId
? todayQuery.data?.todos.find((t) => t.id === active.todoId)?.title ?? 'ToDo'
: CATEGORY_LABEL[active.category] ?? 'Timer')
: null;
return ( return (
<div className="relative" ref={pickerRef}> <div className="relative flex items-center gap-1.5" ref={pickerRef}>
{active ? ( {count > 0 ? (
<button <button
type="button" type="button"
onClick={() => stopMutation.mutate()} onClick={() => setPanelOpen((o) => !o)}
className="group inline-flex items-center gap-2 rounded-full bg-[var(--color-ampel-red-bg)] px-2.5 py-1 text-xs font-medium text-[var(--color-ampel-red-fg)] hover:bg-red-200" aria-expanded={panelOpen}
title="Stop" className="inline-flex items-center gap-2 rounded-full bg-[var(--color-ampel-red-bg)] px-2.5 py-1 text-xs font-medium text-[var(--color-ampel-red-fg)] hover:bg-red-200"
title={count === 1 ? 'Timer' : `${count} Timer laufen`}
> >
<span className="flex h-1.5 w-1.5 items-center justify-center"> <span className="flex h-1.5 w-1.5 items-center justify-center">
<span className="absolute h-1.5 w-1.5 animate-ping rounded-full bg-[var(--color-ampel-red-fg)] opacity-60" /> <span className="absolute h-1.5 w-1.5 animate-ping rounded-full bg-[var(--color-ampel-red-fg)] opacity-60" />
<span className="relative h-1.5 w-1.5 rounded-full bg-[var(--color-ampel-red-fg)]" /> <span className="relative h-1.5 w-1.5 rounded-full bg-[var(--color-ampel-red-fg)]" />
</span> </span>
<span className="max-w-[180px] truncate">{title}</span> <span className="max-w-[160px] truncate">
<span className="font-mono tabular-nums">{formatDuration(elapsed)}</span> {count === 1 ? labelOf(active[0]!) : `${count} Timer`}
<Square size={10} fill="currentColor" className="opacity-0 group-hover:opacity-100" /> </span>
<span className="font-mono tabular-nums">{formatDuration(longest)}</span>
</button> </button>
) : ( ) : (
<button <button
@@ -104,7 +121,7 @@ export function TimerPill() {
</button> </button>
)} )}
{pickerOpen && !active && ( {pickerOpen && (
<QuickPicker <QuickPicker
todos={(todayQuery.data?.todos ?? []).filter((t) => t.status === 'open')} todos={(todayQuery.data?.todos ?? []).filter((t) => t.status === 'open')}
onClose={() => setPickerOpen(false)} onClose={() => setPickerOpen(false)}
@@ -112,6 +129,65 @@ export function TimerPill() {
pending={startMutation.isPending} pending={startMutation.isPending}
/> />
)} )}
{panelOpen && count > 0 && (
<TimersPanel
active={active}
onAdd={() => {
setPanelOpen(false);
setPickerOpen(true);
}}
onChanged={invalidate}
/>
)}
</div>
);
}
function TimersPanel({
active,
onAdd,
onChanged,
}: {
active: Active[];
onAdd: () => void;
onChanged: () => Promise<void>;
}) {
const stopMutation = trpc.time.stop.useMutation({ onSuccess: onChanged });
return (
<div className="absolute right-0 top-full z-40 mt-2 w-[320px] rounded-[var(--radius-lg)] border border-[var(--color-border)] bg-[var(--color-surface-elevated)] p-3 shadow-[var(--shadow-lg)]">
<p className="px-1 text-xs font-medium text-[var(--color-ink-muted)]">
Läuft gerade ({active.length})
</p>
<div className="mt-2 space-y-1.5">
{active.map((a) => (
<div key={a.id} className="rounded-[var(--radius-md)] px-1 py-1">
<div className="flex items-center gap-2">
<span className={clsx('h-2 w-2 shrink-0 rounded-full', CATEGORY_DOT[a.category])} />
<span className="flex-1 truncate text-sm">{labelOf(a)}</span>
<span className="font-mono text-xs tabular-nums text-[var(--color-ink-muted)]">
{formatDuration(elapsedOf(a))}
</span>
<button
type="button"
onClick={() => stopMutation.mutate({ id: a.id })}
aria-label="Stoppen"
title="Stoppen"
className="inline-flex h-6 w-6 items-center justify-center rounded-[var(--radius-md)] text-[var(--color-ink-muted)] hover:bg-black/5 hover:text-[var(--color-ink)]"
>
<Square size={12} fill="currentColor" />
</button>
</div>
</div>
))}
</div>
<button
type="button"
onClick={onAdd}
className="mt-2 flex w-full items-center gap-2 border-t border-[var(--color-border)] px-1 pt-2 text-sm text-[var(--color-ink-muted)] hover:text-[var(--color-ink)]"
>
<Plus size={12} /> Weiteren Task starten
</button>
</div> </div>
); );
} }
@@ -124,7 +200,11 @@ function QuickPicker({
}: { }: {
todos: Array<{ id: string; title: string }>; todos: Array<{ id: string; title: string }>;
onClose: () => void; onClose: () => void;
onStart: (input: { todoId?: string; category: 'focus' | 'meeting' | 'admin' | 'learning' | 'break' | 'other'; description?: string }) => void; onStart: (input: {
todoId?: string;
category: 'focus' | 'meeting' | 'admin' | 'learning' | 'break' | 'other';
description?: string;
}) => void;
pending: boolean; pending: boolean;
}) { }) {
const [description, setDescription] = useState(''); const [description, setDescription] = useState('');
@@ -163,7 +243,9 @@ function QuickPicker({
<button <button
key={c.value} key={c.value}
type="button" type="button"
onClick={() => onStart({ category: c.value, description: description.trim() || undefined })} onClick={() =>
onStart({ category: c.value, description: description.trim() || undefined })
}
disabled={pending} disabled={pending}
className="flex w-full items-center gap-2 rounded-[var(--radius-md)] px-2 py-1.5 text-left text-sm hover:bg-black/5" className="flex w-full items-center gap-2 rounded-[var(--radius-md)] px-2 py-1.5 text-left text-sm hover:bg-black/5"
> >
@@ -174,11 +256,15 @@ function QuickPicker({
</div> </div>
<div className="mt-3 border-t border-[var(--color-border)] pt-2"> <div className="mt-3 border-t border-[var(--color-border)] pt-2">
<label className="block px-1 text-[10px] uppercase tracking-wide text-[var(--color-ink-faint)]"> <label
htmlFor="timer-freetext"
className="block px-1 text-[10px] uppercase tracking-wide text-[var(--color-ink-faint)]"
>
Mit freiem Text Mit freiem Text
</label> </label>
<div className="mt-1 flex gap-1.5"> <div className="mt-1 flex gap-1.5">
<input <input
id="timer-freetext"
type="text" type="text"
value={description} value={description}
onChange={(e) => setDescription(e.target.value)} onChange={(e) => setDescription(e.target.value)}
+1 -4
View File
@@ -5,10 +5,7 @@ function Root({ className, ...rest }: HTMLAttributes<HTMLDivElement>) {
// Scharfe Kanten, Haarlinien-Rahmen ohne Schatten — ToolCTRL-Website-Stil. // Scharfe Kanten, Haarlinien-Rahmen ohne Schatten — ToolCTRL-Website-Stil.
return ( return (
<div <div
className={clsx( className={clsx('bg-[var(--color-surface)] border border-[var(--color-border)]', className)}
'bg-[var(--color-surface)] border border-[var(--color-border)]',
className,
)}
{...rest} {...rest}
/> />
); );
@@ -0,0 +1,69 @@
import { createContext, useCallback, useContext, useRef, useState, type ReactNode } from 'react';
import { Modal } from './Modal';
import { Button } from './Button';
export type ConfirmOptions = {
title: string;
message?: ReactNode;
confirmLabel?: string;
cancelLabel?: string;
destructive?: boolean;
};
type ConfirmFn = (opts: ConfirmOptions) => Promise<boolean>;
const ConfirmContext = createContext<ConfirmFn | null>(null);
/**
* Imperative Bestätigung: `const confirm = useConfirm(); if (await confirm({...})) …`.
* Ersetzt window.confirm() durch einen gestylten, barrierearmen Dialog.
*/
export function useConfirm(): ConfirmFn {
const ctx = useContext(ConfirmContext);
if (!ctx) throw new Error('useConfirm muss innerhalb von <ConfirmProvider> stehen.');
return ctx;
}
export function ConfirmProvider({ children }: { children: ReactNode }) {
const [opts, setOpts] = useState<ConfirmOptions | null>(null);
const resolver = useRef<((v: boolean) => void) | null>(null);
const confirm = useCallback<ConfirmFn>((options) => {
setOpts(options);
return new Promise<boolean>((resolve) => {
resolver.current = resolve;
});
}, []);
const settle = useCallback((result: boolean) => {
resolver.current?.(result);
resolver.current = null;
setOpts(null);
}, []);
return (
<ConfirmContext.Provider value={confirm}>
{children}
<Modal open={opts !== null} onClose={() => settle(false)} title={opts?.title} size="sm">
{opts && (
<>
{opts.message != null && (
<div className="mt-2 text-sm text-[var(--color-ink-muted)]">{opts.message}</div>
)}
<div className="mt-5 flex justify-end gap-2">
<Button variant="ghost" onClick={() => settle(false)}>
{opts.cancelLabel ?? 'Abbrechen'}
</Button>
<Button
variant={opts.destructive ? 'destructive' : 'primary'}
onClick={() => settle(true)}
>
{opts.confirmLabel ?? 'OK'}
</Button>
</div>
</>
)}
</Modal>
</ConfirmContext.Provider>
);
}
+24
View File
@@ -0,0 +1,24 @@
import { Button } from './Button';
/**
* Einheitlicher Fehlerzustand für fehlgeschlagene Queries — ersetzt stilles
* `return null` (weiße Leerseite) durch einen Hinweis + optionalen Retry.
*/
export function ErrorState({
message = 'Konnte nicht geladen werden.',
onRetry,
}: {
message?: string;
onRetry?: () => void;
}) {
return (
<div className="mx-auto max-w-md rounded-[var(--radius-lg)] border border-[var(--color-border)] bg-[var(--color-bg)] p-6 text-center">
<p className="text-sm text-[var(--color-ink-muted)]">{message}</p>
{onRetry && (
<Button variant="secondary" size="sm" className="mt-3" onClick={onRetry}>
Neu laden
</Button>
)}
</div>
);
}
+118
View File
@@ -0,0 +1,118 @@
import { useEffect, useId, useRef, type ReactNode } from 'react';
import { createPortal } from 'react-dom';
import { X } from 'lucide-react';
type Size = 'sm' | 'md' | 'lg';
const maxWidth: Record<Size, string> = {
sm: 'max-w-sm',
md: 'max-w-md',
lg: 'max-w-2xl',
};
/**
* Barrierearmer Basis-Dialog: role=dialog/aria-modal, Fokus in den Dialog beim
* Öffnen, Fokus-Trap (Tab zyklisch), Escape zum Schließen, Fokus-Rückgabe ans
* vorher fokussierte Element, Body-Scroll-Lock. Klick aufs Overlay schließt.
* Alle App-Dialoge sollen hierauf aufsetzen.
*/
export function Modal({
open,
onClose,
title,
children,
size = 'md',
}: {
open: boolean;
onClose: () => void;
title?: ReactNode;
children: ReactNode;
size?: Size;
}) {
const panelRef = useRef<HTMLDivElement>(null);
const restoreFocus = useRef<HTMLElement | null>(null);
const titleId = useId();
useEffect(() => {
if (!open) return;
restoreFocus.current = document.activeElement as HTMLElement | null;
const panel = panelRef.current;
const focusableSel =
'input:not([disabled]), textarea:not([disabled]), select:not([disabled]), button:not([disabled]), a[href], [tabindex]:not([tabindex="-1"])';
const first = panel?.querySelector<HTMLElement>(focusableSel);
(first ?? panel)?.focus();
function onKey(e: KeyboardEvent) {
if (e.key === 'Escape') {
e.preventDefault();
onClose();
return;
}
if (e.key !== 'Tab' || !panel) return;
const nodes = Array.from(panel.querySelectorAll<HTMLElement>(focusableSel));
if (nodes.length === 0) {
e.preventDefault();
return;
}
const firstEl = nodes[0]!;
const lastEl = nodes[nodes.length - 1]!;
if (e.shiftKey && document.activeElement === firstEl) {
e.preventDefault();
lastEl.focus();
} else if (!e.shiftKey && document.activeElement === lastEl) {
e.preventDefault();
firstEl.focus();
}
}
document.addEventListener('keydown', onKey);
const prevOverflow = document.body.style.overflow;
document.body.style.overflow = 'hidden';
return () => {
document.removeEventListener('keydown', onKey);
document.body.style.overflow = prevOverflow;
restoreFocus.current?.focus?.();
};
}, [open, onClose]);
if (!open) return null;
return createPortal(
// Overlay-Klick schließt (reiner Maus-Komfort); Tastatur/Screenreader nutzen
// Escape und den Abbrechen-Button — daher ist die A11y-Regel hier ein false-positive.
// Overlay-Klick (nur direkt aufs Overlay, nicht aufs Panel) schließt — reiner
// Maus-Komfort; Tastatur/Screenreader nutzen Escape und den Abbrechen-Button.
<div
className="fixed inset-0 z-50 flex items-center justify-center bg-black/30 p-4"
onClick={(e) => {
if (e.target === e.currentTarget) onClose();
}}
>
<div
ref={panelRef}
role="dialog"
aria-modal="true"
aria-labelledby={title != null ? titleId : undefined}
tabIndex={-1}
className={`relative max-h-[90vh] w-full ${maxWidth[size]} overflow-y-auto rounded-[var(--radius-xl)] bg-[var(--color-bg)] p-6 shadow-[var(--shadow-lg)] focus:outline-none`}
>
<button
type="button"
onClick={onClose}
aria-label="Schließen"
className="absolute right-4 top-4 rounded-[var(--radius-sm)] p-1 text-[var(--color-ink-muted)] hover:bg-black/5 hover:text-[var(--color-ink)]"
>
<X size={18} />
</button>
{title != null && (
<h2 id={titleId} className="pr-8 text-xl font-semibold">
{title}
</h2>
)}
{children}
</div>
</div>,
document.body,
);
}
+1 -4
View File
@@ -2,10 +2,7 @@
export type LeadStatus = 'cold' | 'warm' | 'hot' | 'won' | 'lost'; export type LeadStatus = 'cold' | 'warm' | 'hot' | 'won' | 'lost';
export const LEAD_STATUS_META: Record< export const LEAD_STATUS_META: Record<LeadStatus, { label: string; badge: string; dot: string }> = {
LeadStatus,
{ label: string; badge: string; dot: string }
> = {
cold: { cold: {
label: 'Cold', label: 'Cold',
badge: 'bg-black/5 text-[var(--color-ink-muted)]', badge: 'bg-black/5 text-[var(--color-ink-muted)]',
+32 -9
View File
@@ -29,8 +29,14 @@ export const MODI: ProjectModus[] = ['relax', 'standard', 'eskalation', 'taskfor
export type Level = 'niedrig' | 'mittel' | 'hoch'; export type Level = 'niedrig' | 'mittel' | 'hoch';
export const LEVEL_META: Record<Level, { label: string; badge: string }> = { export const LEVEL_META: Record<Level, { label: string; badge: string }> = {
niedrig: { label: 'Niedrig', badge: 'bg-[var(--color-ampel-green-bg)] text-[var(--color-ampel-green-fg)]' }, niedrig: {
mittel: { label: 'Mittel', badge: 'bg-[var(--color-ampel-amber-bg)] text-[var(--color-ampel-amber-fg)]' }, label: 'Niedrig',
badge: 'bg-[var(--color-ampel-green-bg)] text-[var(--color-ampel-green-fg)]',
},
mittel: {
label: 'Mittel',
badge: 'bg-[var(--color-ampel-amber-bg)] text-[var(--color-ampel-amber-fg)]',
},
hoch: { label: 'Hoch', badge: 'bg-[var(--color-ampel-red-bg)] text-[var(--color-ampel-red-fg)]' }, hoch: { label: 'Hoch', badge: 'bg-[var(--color-ampel-red-bg)] text-[var(--color-ampel-red-fg)]' },
}; };
export const LEVELS: Level[] = ['niedrig', 'mittel', 'hoch']; export const LEVELS: Level[] = ['niedrig', 'mittel', 'hoch'];
@@ -66,7 +72,10 @@ export type ProjectPhase = 'definition' | 'planung' | 'umsetzung' | 'abschluss';
export const PHASES: ProjectPhase[] = ['definition', 'planung', 'umsetzung', 'abschluss']; export const PHASES: ProjectPhase[] = ['definition', 'planung', 'umsetzung', 'abschluss'];
export const PHASE_META: Record<ProjectPhase, { label: string; gateZiel: string }> = { export const PHASE_META: Record<ProjectPhase, { label: string; gateZiel: string }> = {
definition: { label: 'Definition', gateZiel: 'Steckbrief abgestimmt und freigegeben' }, definition: { label: 'Definition', gateZiel: 'Steckbrief abgestimmt und freigegeben' },
planung: { label: 'Planung', gateZiel: 'Plan steht — Backlog zerlegt, Meilensteine & Risiken erfasst' }, planung: {
label: 'Planung',
gateZiel: 'Plan steht — Backlog zerlegt, Meilensteine & Risiken erfasst',
},
umsetzung: { label: 'Umsetzung', gateZiel: 'Liefergegenstände abgenommen' }, umsetzung: { label: 'Umsetzung', gateZiel: 'Liefergegenstände abgenommen' },
abschluss: { label: 'Abschluss', gateZiel: 'Projekt beendet, Erkenntnisse gesichert' }, abschluss: { label: 'Abschluss', gateZiel: 'Projekt beendet, Erkenntnisse gesichert' },
}; };
@@ -86,24 +95,38 @@ export const RISK_STRATEGIE_LABEL: Record<RiskStrategie, string> = {
mindern: 'Mindern', mindern: 'Mindern',
akzeptieren: 'Akzeptieren', akzeptieren: 'Akzeptieren',
}; };
export const RISK_STRATEGIEN: RiskStrategie[] = ['vermeiden', 'verlagern', 'mindern', 'akzeptieren']; export const RISK_STRATEGIEN: RiskStrategie[] = [
'vermeiden',
'verlagern',
'mindern',
'akzeptieren',
];
export type ChangeEntscheidung = 'offen' | 'genehmigt' | 'abgelehnt'; export type ChangeEntscheidung = 'offen' | 'genehmigt' | 'abgelehnt';
export const CHANGE_ENTSCHEIDUNG_META: Record<ChangeEntscheidung, { label: string; badge: string }> = { export const CHANGE_ENTSCHEIDUNG_META: Record<
offen: { label: 'Offen', badge: 'bg-[var(--color-ampel-amber-bg)] text-[var(--color-ampel-amber-fg)]' }, ChangeEntscheidung,
genehmigt: { label: 'Genehmigt', badge: 'bg-[var(--color-ampel-green-bg)] text-[var(--color-ampel-green-fg)]' }, { label: string; badge: string }
> = {
offen: {
label: 'Offen',
badge: 'bg-[var(--color-ampel-amber-bg)] text-[var(--color-ampel-amber-fg)]',
},
genehmigt: {
label: 'Genehmigt',
badge: 'bg-[var(--color-ampel-green-bg)] text-[var(--color-ampel-green-fg)]',
},
abgelehnt: { label: 'Abgelehnt', badge: 'bg-black/5 text-[var(--color-ink-faint)]' }, abgelehnt: { label: 'Abgelehnt', badge: 'bg-black/5 text-[var(--color-ink-faint)]' },
}; };
export const CHANGE_ENTSCHEIDUNGEN: ChangeEntscheidung[] = ['offen', 'genehmigt', 'abgelehnt']; export const CHANGE_ENTSCHEIDUNGEN: ChangeEntscheidung[] = ['offen', 'genehmigt', 'abgelehnt'];
// Datums-Warnungen nach Buch-Regeln (keine Meilensteine Freitag / vor Feiertagen). // Datums-Warnungen (keine Meilensteine Freitag / vor Feiertagen).
export function dateWarnings(iso: string | null | undefined): string[] { export function dateWarnings(iso: string | null | undefined): string[] {
if (!iso) return []; if (!iso) return [];
const d = new Date(`${iso}T00:00:00`); const d = new Date(`${iso}T00:00:00`);
if (Number.isNaN(d.getTime())) return []; if (Number.isNaN(d.getTime())) return [];
const out: string[] = []; const out: string[] = [];
const wd = d.getDay(); // 0=So .. 6=Sa const wd = d.getDay(); // 0=So .. 6=Sa
if (wd === 5) out.push('Fällt auf einen Freitag — Buch-Regel: keine Meilensteine/Abgaben freitags.'); if (wd === 5) out.push('Fällt auf einen Freitag — besser keine Meilensteine/Abgaben freitags.');
if (wd === 0 || wd === 6) out.push('Fällt aufs Wochenende.'); if (wd === 0 || wd === 6) out.push('Fällt aufs Wochenende.');
const month = d.getMonth(); const month = d.getMonth();
const day = d.getDate(); const day = d.getDate();
+92 -11
View File
@@ -1,24 +1,85 @@
import { createBrowserRouter, RouterProvider } from 'react-router'; import { createBrowserRouter, RouterProvider } from 'react-router';
import { lazy, Suspense } from 'react'; import { lazy, Suspense, type ComponentType } from 'react';
import { AppShell } from '../components/layout/AppShell'; import { AppShell } from '../components/layout/AppShell';
import { SkeletonCard } from '../components/ui/SkeletonCard'; import { SkeletonCard } from '../components/ui/SkeletonCard';
import { Button } from '../components/ui/Button';
const Dashboard = lazy(() => import('../routes/dashboard').then((m) => ({ default: m.DashboardRoute }))); // Nach einem Deploy zeigen bereits offene Tabs auf alte, inzwischen gelöschte
const Heute = lazy(() => // Chunk-Dateien (gehashte Dateinamen). Der nächste Lazy-Import schlägt dann fehl
// („Failed to fetch dynamically imported module"). Ein einmaliger Reload holt die
// frische index.html mit den neuen Hashes. sessionStorage-Guard verhindert eine
// Reload-Schleife, falls der Fehler eine andere Ursache hat (z. B. offline).
const RELOAD_KEY = 'ebw:chunk-reload';
function reloadOnceForStaleChunk(): boolean {
const last = Number(sessionStorage.getItem(RELOAD_KEY) ?? '0');
if (Date.now() - last > 10_000) {
sessionStorage.setItem(RELOAD_KEY, String(Date.now()));
window.location.reload();
return true;
}
return false;
}
function lazyWithReload<T extends ComponentType>(factory: () => Promise<{ default: T }>) {
return lazy(() =>
factory().catch((err: unknown) => {
if (reloadOnceForStaleChunk()) {
// Hängt bis der Reload greift — vermeidet ein kurzes Aufblitzen des Fehlers.
return new Promise<{ default: T }>(() => {});
}
throw err;
}),
);
}
// Vite feuert dieses Event bei fehlgeschlagenem modulepreload (gleiche Ursache).
if (typeof window !== 'undefined') {
window.addEventListener('vite:preloadError', (e) => {
if (reloadOnceForStaleChunk()) e.preventDefault();
});
}
const Dashboard = lazyWithReload(() =>
import('../routes/dashboard').then((m) => ({ default: m.DashboardRoute })),
);
const Heute = lazyWithReload(() =>
import('../routes/heute').then((m) => ({ default: m.HeuteRoute })), import('../routes/heute').then((m) => ({ default: m.HeuteRoute })),
); );
const Reflexion = lazy(() => const Reflexion = lazyWithReload(() =>
import('../routes/reflexion').then((m) => ({ default: m.ReflexionRoute })), import('../routes/reflexion').then((m) => ({ default: m.ReflexionRoute })),
); );
const Bereich = lazy(() => import('../routes/bereich').then((m) => ({ default: m.BereichRoute }))); const Bereich = lazyWithReload(() =>
const Projekt = lazy(() => import('../routes/projekt').then((m) => ({ default: m.ProjektRoute }))); import('../routes/bereich').then((m) => ({ default: m.BereichRoute })),
const Leads = lazy(() => import('../routes/leads').then((m) => ({ default: m.LeadsRoute }))); );
const Lead = lazy(() => import('../routes/lead').then((m) => ({ default: m.LeadRoute }))); const Projekt = lazyWithReload(() =>
const Archiv = lazy(() => import('../routes/archiv').then((m) => ({ default: m.ArchivRoute }))); import('../routes/projekt').then((m) => ({ default: m.ProjektRoute })),
const NotFound = lazy(() => );
const Leads = lazyWithReload(() =>
import('../routes/leads').then((m) => ({ default: m.LeadsRoute })),
);
const Lead = lazyWithReload(() => import('../routes/lead').then((m) => ({ default: m.LeadRoute })));
const TeamView = lazyWithReload(() =>
import('../routes/team-view').then((m) => ({ default: m.TeamViewRoute })),
);
const Historie = lazyWithReload(() =>
import('../routes/historie').then((m) => ({ default: m.HistorieRoute })),
);
const Archiv = lazyWithReload(() =>
import('../routes/archiv').then((m) => ({ default: m.ArchivRoute })),
);
const Pipeline = lazyWithReload(() =>
import('../routes/pipeline').then((m) => ({ default: m.PipelineRoute })),
);
const MeineWoche = lazyWithReload(() =>
import('../routes/meine-woche').then((m) => ({ default: m.MeineWocheRoute })),
);
const NotFound = lazyWithReload(() =>
import('../routes/not-found').then((m) => ({ default: m.NotFoundRoute })), import('../routes/not-found').then((m) => ({ default: m.NotFoundRoute })),
); );
const Login = lazy(() => import('../routes/login').then((m) => ({ default: m.LoginRoute }))); const Login = lazyWithReload(() =>
import('../routes/login').then((m) => ({ default: m.LoginRoute })),
);
function withSuspense(node: React.ReactNode) { function withSuspense(node: React.ReactNode) {
return ( return (
@@ -26,24 +87,44 @@ function withSuspense(node: React.ReactNode) {
); );
} }
function RouteError() {
return (
<div className="mx-auto mt-16 max-w-md text-center">
<h1 className="text-lg font-semibold">Etwas ist schiefgelaufen.</h1>
<p className="mt-1 text-sm text-[var(--color-ink-muted)]">
Wahrscheinlich wurde gerade eine neue Version veröffentlicht. Lade die Seite neu.
</p>
<Button className="mt-4" onClick={() => window.location.reload()}>
Neu laden
</Button>
</div>
);
}
const router = createBrowserRouter([ const router = createBrowserRouter([
{ {
path: '/login', path: '/login',
element: withSuspense(<Login />), element: withSuspense(<Login />),
errorElement: <RouteError />,
}, },
{ {
path: '/', path: '/',
element: <AppShell />, element: <AppShell />,
errorElement: <RouteError />,
children: [ children: [
{ index: true, element: withSuspense(<Dashboard />) }, { index: true, element: withSuspense(<Dashboard />) },
{ path: 'dashboard', element: withSuspense(<Dashboard />) }, { path: 'dashboard', element: withSuspense(<Dashboard />) },
{ path: 'heute', element: withSuspense(<Heute />) }, { path: 'heute', element: withSuspense(<Heute />) },
{ path: 'meine-woche', element: withSuspense(<MeineWoche />) },
{ path: 'reflexion', element: withSuspense(<Reflexion />) }, { path: 'reflexion', element: withSuspense(<Reflexion />) },
{ path: 'bereich', element: withSuspense(<Bereich />) }, { path: 'bereich', element: withSuspense(<Bereich />) },
{ path: 'bereich/:slug', element: withSuspense(<Bereich />) }, { path: 'bereich/:slug', element: withSuspense(<Bereich />) },
{ path: 'projekt/:id', element: withSuspense(<Projekt />) }, { path: 'projekt/:id', element: withSuspense(<Projekt />) },
{ path: 'leads', element: withSuspense(<Leads />) }, { path: 'leads', element: withSuspense(<Leads />) },
{ path: 'pipeline', element: withSuspense(<Pipeline />) },
{ path: 'lead/:id', element: withSuspense(<Lead />) }, { path: 'lead/:id', element: withSuspense(<Lead />) },
{ path: 'team', element: withSuspense(<TeamView />) },
{ path: 'historie', element: withSuspense(<Historie />) },
{ path: 'archiv', element: withSuspense(<Archiv />) }, { path: 'archiv', element: withSuspense(<Archiv />) },
{ path: '*', element: withSuspense(<NotFound />) }, { path: '*', element: withSuspense(<NotFound />) },
], ],
+5 -1
View File
@@ -11,7 +11,11 @@ export function TrpcProvider({ children }: { children: React.ReactNode }) {
new QueryClient({ new QueryClient({
defaultOptions: { defaultOptions: {
queries: { queries: {
staleTime: 30_000, // staleTime 0: beim Aufrufen einer Seite / Tab-Fokus werden Daten
// neu geholt, statt bis zu 30 s veraltete Cache-Stände zu zeigen
// (sonst landeten Aktionen wie „Lock in" erst nach Refresh im
// Dashboard). Kein Polling — nur Refetch bei Mount/Fokus.
staleTime: 0,
retry: 1, retry: 1,
}, },
mutations: { mutations: {
+22
View File
@@ -0,0 +1,22 @@
import { useEffect, useState } from 'react';
/**
* Anwesenheits-Sekunden von Lock-in bis Feierabend — bzw. bis jetzt, solange
* noch kein Check-Out vorliegt. Reine Anzeige, unabhängig vom Task-Tracking.
* Tickt minütlich, solange der Tag noch läuft.
*/
export function usePresenceSeconds(
checkedInAt: string | Date | null | undefined,
checkedOutAt: string | Date | null | undefined,
): number | null {
const running = Boolean(checkedInAt) && !checkedOutAt;
const [nowMs, setNowMs] = useState(() => Date.now());
useEffect(() => {
if (!running) return;
const id = setInterval(() => setNowMs(Date.now()), 60_000);
return () => clearInterval(id);
}, [running]);
if (!checkedInAt) return null;
const endMs = checkedOutAt ? new Date(checkedOutAt).getTime() : nowMs;
return Math.max(0, Math.round((endMs - new Date(checkedInAt).getTime()) / 1000));
}
+75 -32
View File
@@ -1,14 +1,16 @@
import { Link, NavLink, useParams } from 'react-router'; import { Link, NavLink, useParams } from 'react-router';
import { useState } from 'react'; import { useState, useEffect } from 'react';
import { trpc } from '../lib/trpc'; import { trpc } from '../lib/trpc';
import { voice } from '../lib/voice'; import { voice } from '../lib/voice';
import { Card } from '../components/ui/Card'; import { Card } from '../components/ui/Card';
import { Button } from '../components/ui/Button'; import { Button } from '../components/ui/Button';
import { Modal } from '../components/ui/Modal';
import { SkeletonCard } from '../components/ui/SkeletonCard'; import { SkeletonCard } from '../components/ui/SkeletonCard';
import { toast } from 'sonner'; import { toast } from 'sonner';
import { clsx } from 'clsx'; import { clsx } from 'clsx';
import { LEAD_STATUS_META, type LeadStatus } from '../lib/lead-meta'; import { LEAD_STATUS_META, type LeadStatus } from '../lib/lead-meta';
import { MODUS_META, type ProjectModus } from '../lib/project-meta'; import { MODUS_META, type ProjectModus } from '../lib/project-meta';
import { ProjectLogo, LogoUpload } from '../components/project/ProjectLogo';
const BEREICHE: Array<{ slug: 'entwicklung' | 'vertrieb' | 'marketing'; label: string }> = [ const BEREICHE: Array<{ slug: 'entwicklung' | 'vertrieb' | 'marketing'; label: string }> = [
{ slug: 'entwicklung', label: 'Entwicklung' }, { slug: 'entwicklung', label: 'Entwicklung' },
@@ -85,6 +87,7 @@ function Section({
projects: Array<{ projects: Array<{
id: string; id: string;
name: string; name: string;
logoUrl: string | null;
statusCache: 'green' | 'amber' | 'red' | null; statusCache: 'green' | 'amber' | 'red' | null;
deadline: string | null; deadline: string | null;
modus: ProjectModus; modus: ProjectModus;
@@ -105,8 +108,10 @@ function Section({
{projects.map((p) => ( {projects.map((p) => (
<Link key={p.id} to={`/projekt/${p.id}`} className="contents"> <Link key={p.id} to={`/projekt/${p.id}`} className="contents">
<Card.Root className="cursor-pointer hover:shadow-[var(--shadow-md)]"> <Card.Root className="cursor-pointer hover:shadow-[var(--shadow-md)]">
<Card.Body className="flex items-center justify-between"> <Card.Body className="flex items-center justify-between gap-3">
<div> <div className="flex min-w-0 items-center gap-3">
<ProjectLogo url={p.logoUrl} name={p.name} size={40} />
<div className="min-w-0">
<p className="flex items-center gap-2 font-medium"> <p className="flex items-center gap-2 font-medium">
{p.name} {p.name}
{p.modus !== 'standard' && ( {p.modus !== 'standard' && (
@@ -124,6 +129,7 @@ function Section({
{p.deadline ? `bis ${p.deadline}` : 'kein Deadline'} {p.deadline ? `bis ${p.deadline}` : 'kein Deadline'}
</p> </p>
</div> </div>
</div>
<PflichtMinimumIndicator state={p.pflichtMinimumState} /> <PflichtMinimumIndicator state={p.pflichtMinimumState} />
</Card.Body> </Card.Body>
</Card.Root> </Card.Root>
@@ -175,9 +181,18 @@ function ProjectCreateDialog({
const defaultArea = areas.find((a) => a.slug === defaultSlug); const defaultArea = areas.find((a) => a.slug === defaultSlug);
const [name, setName] = useState(''); const [name, setName] = useState('');
const [description, setDescription] = useState(''); const [description, setDescription] = useState('');
const [logoUrl, setLogoUrl] = useState<string | null>(null);
const [areaId, setAreaId] = useState(defaultArea?.id ?? ''); const [areaId, setAreaId] = useState(defaultArea?.id ?? '');
// Areas werden asynchron geladen; sobald sie da sind und noch nichts gewählt
// wurde, sinnvollen Default setzen (Dropdown war sonst leer).
useEffect(() => {
if (!areaId && areas.length > 0) {
const fallback = areas.find((a) => a.slug === defaultSlug) ?? areas[0];
if (fallback) setAreaId(fallback.id);
}
}, [areas, areaId, defaultSlug]);
const [kind, setKind] = useState<'kundenprojekt' | 'internes_projekt'>('internes_projekt'); const [kind, setKind] = useState<'kundenprojekt' | 'internes_projekt'>('internes_projekt');
const [arbeitsmodus, setArbeitsmodus] = useState<'cycle' | 'kanban'>('kanban');
const [steckbrief, setSteckbrief] = useState(''); const [steckbrief, setSteckbrief] = useState('');
const [plane, setPlane] = useState(''); const [plane, setPlane] = useState('');
@@ -198,23 +213,15 @@ function ProjectCreateDialog({
areaId, areaId,
name, name,
description: description.trim() || undefined, description: description.trim() || undefined,
logoUrl: logoUrl ?? undefined,
kind, kind,
arbeitsmodus,
outlineSteckbriefUrl: steckbrief, outlineSteckbriefUrl: steckbrief,
planeProjectUrl: plane, planeProjectUrl: plane,
milestones: [], milestones: [],
}); });
} }
return ( return (
<div <Modal open onClose={onClose} title="Neues Projekt">
className="fixed inset-0 z-50 flex items-center justify-center bg-black/30"
onClick={onClose}
>
<div
className="w-full max-w-md rounded-[var(--radius-xl)] bg-[var(--color-bg)] p-6 shadow-[var(--shadow-lg)]"
onClick={(e) => e.stopPropagation()}
>
<h2 className="text-xl font-semibold">Neues Projekt</h2>
<form onSubmit={submit} className="mt-4 space-y-3"> <form onSubmit={submit} className="mt-4 space-y-3">
<Field label="Name"> <Field label="Name">
<input <input
@@ -234,6 +241,9 @@ function ProjectCreateDialog({
className="w-full rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-3 py-2 text-sm" className="w-full rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-3 py-2 text-sm"
/> />
</Field> </Field>
<Field label="Logo (optional)">
<LogoUpload value={logoUrl} name={name} onChange={setLogoUrl} />
</Field>
<Field label="Bereich"> <Field label="Bereich">
<select <select
required required
@@ -241,6 +251,9 @@ function ProjectCreateDialog({
onChange={(e) => setAreaId(e.target.value)} onChange={(e) => setAreaId(e.target.value)}
className="w-full rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-3 py-2 text-sm" className="w-full rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-3 py-2 text-sm"
> >
<option value="" disabled>
{areas.length ? '— Bereich wählen —' : 'Bereiche werden geladen…'}
</option>
{areas.map((a) => ( {areas.map((a) => (
<option key={a.id} value={a.id}> <option key={a.id} value={a.id}>
{a.name} {a.name}
@@ -258,16 +271,6 @@ function ProjectCreateDialog({
<option value="internes_projekt">Internes Projekt</option> <option value="internes_projekt">Internes Projekt</option>
</select> </select>
</Field> </Field>
<Field label="Arbeitsmodus">
<select
value={arbeitsmodus}
onChange={(e) => setArbeitsmodus(e.target.value as 'cycle' | 'kanban')}
className="w-full rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-3 py-2 text-sm"
>
<option value="kanban">Kanban</option>
<option value="cycle">Cycle</option>
</select>
</Field>
<Field label="Outline-Steckbrief-URL"> <Field label="Outline-Steckbrief-URL">
<input <input
required required
@@ -297,8 +300,7 @@ function ProjectCreateDialog({
</Button> </Button>
</div> </div>
</form> </form>
</div> </Modal>
</div>
); );
} }
@@ -315,23 +317,63 @@ function VertriebDetail() {
return ( return (
<div className="space-y-6"> <div className="space-y-6">
<LeadsTeaser /> <LeadsTeaser />
<ProjekteMitLeads />
<ProjektListeFuerBereich slug="vertrieb" /> <ProjektListeFuerBereich slug="vertrieb" />
</div> </div>
); );
} }
// Bereichsübergreifend: Projekte (egal aus welchem Bereich), die verknüpfte
// Leads haben — so taucht z. B. ein Entwicklungsprojekt hier auf, WEIL es
// Vertriebsaktivität hat, ohne redundant angelegt werden zu müssen.
function ProjekteMitLeads() {
const q = trpc.lead.list.useQuery();
const leads = q.data ?? [];
const map = new Map<string, { id: string; name: string; total: number; open: number }>();
for (const l of leads) {
if (!l.projectId || !l.projectName) continue;
const e = map.get(l.projectId) ?? { id: l.projectId, name: l.projectName, total: 0, open: 0 };
e.total++;
if (l.status !== 'won' && l.status !== 'lost') e.open++;
map.set(l.projectId, e);
}
const projects = Array.from(map.values()).sort((a, b) => b.open - a.open);
if (projects.length === 0) return null;
return (
<section>
<h2 className="mb-2 text-lg font-semibold">Projekte mit Vertriebsaktivität</h2>
<div className="grid grid-cols-1 gap-3 md:grid-cols-2 lg:grid-cols-3">
{projects.map((p) => (
<Link key={p.id} to={`/projekt/${p.id}`} className="contents">
<Card.Root className="cursor-pointer hover:shadow-[var(--shadow-md)]">
<Card.Body className="flex items-center justify-between gap-2">
<p className="font-medium">{p.name}</p>
<span className="shrink-0 text-xs text-[var(--color-ink-muted)]">
{p.total} {p.total === 1 ? 'Lead' : 'Leads'}
{p.open > 0 && ` · ${p.open} offen`}
</span>
</Card.Body>
</Card.Root>
</Link>
))}
</div>
</section>
);
}
function LeadsTeaser() { function LeadsTeaser() {
const q = trpc.lead.list.useQuery(); const q = trpc.lead.list.useQuery();
const leads = q.data ?? []; const leads = q.data ?? [];
const offen = leads.filter((l) => l.status !== 'won' && l.status !== 'lost'); const offen = leads.filter((l) => l.status !== 'won' && l.status !== 'lost');
const top = [...offen] const top = [...offen].sort((a, b) => b.score - a.score).slice(0, 3);
.sort((a, b) => b.score - a.score)
.slice(0, 3);
return ( return (
<section> <section>
<div className="mb-2 flex items-center justify-between"> <div className="mb-2 flex items-center justify-between">
<h2 className="text-lg font-semibold">Leads</h2> <h2 className="text-lg font-semibold">Leads</h2>
<Link to="/leads" className="text-sm text-[var(--color-ink-muted)] hover:text-[var(--color-ink)] hover:underline"> <Link
to="/leads"
className="text-sm text-[var(--color-ink-muted)] hover:text-[var(--color-ink)] hover:underline"
>
Alle Leads ({leads.length}) → Alle Leads ({leads.length}) →
</Link> </Link>
</div> </div>
@@ -360,7 +402,9 @@ function LeadsTeaser() {
<span className={clsx('h-2 w-2 rounded-full', meta.dot)} /> <span className={clsx('h-2 w-2 rounded-full', meta.dot)} />
<span className="font-medium">{l.firma}</span> <span className="font-medium">{l.firma}</span>
{l.subSegment && ( {l.subSegment && (
<span className="text-xs text-[var(--color-ink-muted)]">{l.subSegment}</span> <span className="text-xs text-[var(--color-ink-muted)]">
{l.subSegment}
</span>
)} )}
</span> </span>
<span className="font-mono text-xs tabular-nums text-[var(--color-ink-muted)]"> <span className="font-mono text-xs tabular-nums text-[var(--color-ink-muted)]">
@@ -407,4 +451,3 @@ function ProjektListeFuerBereich({ slug }: { slug: 'vertrieb' | 'marketing' }) {
</div> </div>
); );
} }
+81 -42
View File
@@ -4,12 +4,12 @@ import { voice } from '../lib/voice';
import { Card } from '../components/ui/Card'; import { Card } from '../components/ui/Card';
import { Button } from '../components/ui/Button'; import { Button } from '../components/ui/Button';
import { SkeletonCard } from '../components/ui/SkeletonCard'; import { SkeletonCard } from '../components/ui/SkeletonCard';
import { ErrorState } from '../components/ui/ErrorState';
import { TeamTimeSection } from '../components/time/TeamTimeSection'; import { TeamTimeSection } from '../components/time/TeamTimeSection';
import { MODUS_META, type ProjectModus } from '../lib/project-meta'; import { MODUS_META, type ProjectModus } from '../lib/project-meta';
import { AlertTriangle } from 'lucide-react'; import { AlertTriangle } from 'lucide-react';
import { clsx } from 'clsx'; import { clsx } from 'clsx';
import { ProjectLogo } from '../components/project/ProjectLogo';
type Ampel = 'green' | 'amber' | 'red' | 'grey';
export function DashboardRoute() { export function DashboardRoute() {
const q = trpc.dashboard.overview.useQuery(); const q = trpc.dashboard.overview.useQuery();
@@ -24,7 +24,13 @@ export function DashboardRoute() {
</div> </div>
); );
} }
if (!q.data) return null; if (q.isError || !q.data)
return (
<ErrorState
message="Dashboard konnte nicht geladen werden."
onRetry={() => void q.refetch()}
/>
);
const isCheckedIn = const isCheckedIn =
today.data?.entry?.status !== undefined && today.data.entry.status !== 'absent'; today.data?.entry?.status !== undefined && today.data.entry.status !== 'absent';
@@ -48,32 +54,6 @@ export function DashboardRoute() {
)} )}
</header> </header>
<section aria-labelledby="bereiche-heading">
<h2 id="bereiche-heading" className="sr-only">
Bereiche
</h2>
<div className="grid grid-cols-1 gap-4 md:grid-cols-3">
{q.data.areas.map((a) => (
<Link key={a.id} to={`/bereich/${a.slug}`} className="contents">
<Card.Root className="cursor-pointer hover:shadow-[var(--shadow-md)] transition-shadow">
<Card.Body className="flex flex-col gap-2">
<div className="flex items-center justify-between">
<h3 className="text-lg font-semibold">{a.name}</h3>
<AmpelDot ampel={a.ampel as Ampel} />
</div>
<div className="flex gap-3 text-xs text-[var(--color-ink-muted)]">
<span>{a.counts.green} grün</span>
<span>{a.counts.amber} gelb</span>
<span>{a.counts.red} rot</span>
{a.counts.grey > 0 && <span>{a.counts.grey} ohne Status</span>}
</div>
</Card.Body>
</Card.Root>
</Link>
))}
</div>
</section>
{q.data.showstoppers.length > 0 && ( {q.data.showstoppers.length > 0 && (
<section> <section>
<Card.Root className="border-[var(--color-ampel-red-fg)]"> <Card.Root className="border-[var(--color-ampel-red-fg)]">
@@ -104,6 +84,48 @@ export function DashboardRoute() {
</section> </section>
)} )}
{q.data.meilensteine.length > 0 && (
<section>
<h2 className="mb-2 text-lg font-semibold">Anstehende Meilensteine</h2>
<Card.Root>
<Card.Body className="p-0">
<ul className="divide-y divide-[var(--color-border)]">
{q.data.meilensteine.map((m) => (
<li key={m.id} className="flex items-center justify-between gap-3 px-4 py-3">
<div className="min-w-0">
<p className="truncate text-sm font-medium">{m.title}</p>
<div className="mt-0.5 flex items-center gap-2 text-xs">
<span
className={clsx(
m.ueberfaellig
? 'font-medium text-[var(--color-ampel-red-fg)]'
: 'text-[var(--color-ink-muted)]',
)}
>
{formatDate(m.due!)}
{m.ueberfaellig && ' · überfällig'}
</span>
<span className="text-[var(--color-ink-faint)]">·</span>
<span className="text-[var(--color-ink-muted)]">
{relativeDays(m.due!, q.data.date)}
</span>
</div>
</div>
<Link
to={`/projekt/${m.projectId}`}
className="inline-flex shrink-0 items-center gap-2 text-xs text-[var(--color-ink-muted)] hover:text-[var(--color-ink)] hover:underline"
>
<ProjectLogo url={m.projectLogoUrl} name={m.projectName} size={20} />
{m.projectName} →
</Link>
</li>
))}
</ul>
</Card.Body>
</Card.Root>
</section>
)}
{q.data.kritischeModi.length > 0 && ( {q.data.kritischeModi.length > 0 && (
<section> <section>
<h2 className="mb-2 text-lg font-semibold">Projekte in Eskalation / Taskforce</h2> <h2 className="mb-2 text-lg font-semibold">Projekte in Eskalation / Taskforce</h2>
@@ -189,7 +211,11 @@ export function DashboardRoute() {
<ul className="space-y-1 text-sm"> <ul className="space-y-1 text-sm">
{q.data.pflichtMinimumOffen.map((p) => ( {q.data.pflichtMinimumOffen.map((p) => (
<li key={p.id}> <li key={p.id}>
<Link to={`/projekt/${p.id}`} className="hover:underline"> <Link
to={`/projekt/${p.id}`}
className="inline-flex items-center gap-2 hover:underline"
>
<ProjectLogo url={p.logoUrl} name={p.name} size={20} />
{p.name} {p.name}
</Link> </Link>
</li> </li>
@@ -204,9 +230,17 @@ export function DashboardRoute() {
<TeamTimeSection /> <TeamTimeSection />
<section aria-labelledby="feed-heading"> <section aria-labelledby="feed-heading">
<h2 id="feed-heading" className="mb-3 text-lg font-semibold"> <div className="mb-3 flex items-baseline justify-between">
<h2 id="feed-heading" className="text-lg font-semibold">
Gestern im Team Gestern im Team
</h2> </h2>
<Link
to="/historie"
className="text-xs text-[var(--color-ink-muted)] hover:text-[var(--color-ink)] hover:underline"
>
Ganze Historie →
</Link>
</div>
{q.data.feed.length === 0 ? ( {q.data.feed.length === 0 ? (
<Card.Root> <Card.Root>
<Card.Body> <Card.Body>
@@ -236,16 +270,6 @@ export function DashboardRoute() {
); );
} }
function AmpelDot({ ampel }: { ampel: Ampel }) {
const colorClass = {
green: 'bg-[var(--color-ampel-green-fg)]',
amber: 'bg-[var(--color-ampel-amber-fg)]',
red: 'bg-[var(--color-ampel-red-fg)]',
grey: 'bg-[var(--color-ink-faint)]',
}[ampel];
return <span className={clsx('inline-block h-3 w-3 rounded-full', colorClass)} aria-hidden />;
}
function AmpelBadge({ ampel }: { ampel: 'green' | 'amber' | 'red' }) { function AmpelBadge({ ampel }: { ampel: 'green' | 'amber' | 'red' }) {
const cls = { const cls = {
green: 'bg-[var(--color-ampel-green-bg)] text-[var(--color-ampel-green-fg)]', green: 'bg-[var(--color-ampel-green-bg)] text-[var(--color-ampel-green-fg)]',
@@ -312,7 +336,9 @@ function TeamHeuteSection() {
</span> </span>
</div> </div>
{u.todos.length === 0 ? ( {u.todos.length === 0 ? (
<p className="mt-2 text-xs text-[var(--color-ink-faint)]">Keine ToDos eingetragen.</p> <p className="mt-2 text-xs text-[var(--color-ink-faint)]">
Keine ToDos eingetragen.
</p>
) : ( ) : (
<ul className="mt-2 space-y-1.5 text-sm"> <ul className="mt-2 space-y-1.5 text-sm">
{u.todos.map((t) => ( {u.todos.map((t) => (
@@ -356,5 +382,18 @@ function formatDate(input: string | Date): string {
}).format(dt); }).format(dt);
} }
// Relative Tagesangabe für Meilensteine ("heute", "in 3 Tagen", "vor 2 Tagen").
function relativeDays(dueIso: string, todayIso: string): string {
const due = new Date(`${dueIso}T00:00:00`);
const today = new Date(`${todayIso}T00:00:00`);
if (Number.isNaN(due.getTime()) || Number.isNaN(today.getTime())) return '';
const diff = Math.round((due.getTime() - today.getTime()) / 86_400_000);
if (diff === 0) return 'heute';
if (diff === 1) return 'morgen';
if (diff === -1) return 'gestern';
if (diff > 0) return `in ${diff} Tagen`;
return `vor ${Math.abs(diff)} Tagen`;
}
// Button als referenz behalten (Linter) // Button als referenz behalten (Linter)
void Button; void Button;
+312 -13
View File
@@ -4,10 +4,13 @@ import { trpc } from '../lib/trpc';
import { voice } from '../lib/voice'; import { voice } from '../lib/voice';
import { Card } from '../components/ui/Card'; import { Card } from '../components/ui/Card';
import { Button } from '../components/ui/Button'; import { Button } from '../components/ui/Button';
import { Modal } from '../components/ui/Modal';
import { SkeletonCard } from '../components/ui/SkeletonCard'; import { SkeletonCard } from '../components/ui/SkeletonCard';
import { toast } from 'sonner'; import { toast } from 'sonner';
import { X, Plus, RotateCw, BellRing, Play, Clock } from 'lucide-react'; import { X, Plus, RotateCw, BellRing, Play, Clock, Check, LogOut } from 'lucide-react';
import { TimelineSection, ManualDialog } from '../components/time/TimelineSection'; import { TimelineSection, ManualDialog } from '../components/time/TimelineSection';
import { formatDurationCompact } from '../lib/format-duration';
import { usePresenceSeconds } from '../lib/use-presence-seconds';
/** Aktuelle Stunde in Europe/Berlin (0–23). */ /** Aktuelle Stunde in Europe/Berlin (0–23). */
function berlinHourNow(): number { function berlinHourNow(): number {
@@ -59,6 +62,10 @@ function CheckInForm({ onDone }: { onDone: () => void }) {
toast(msg); toast(msg);
await utils.dayEntry.today.invalidate(); await utils.dayEntry.today.invalidate();
await utils.dayEntry.pendingCarryOver.invalidate(); await utils.dayEntry.pendingCarryOver.invalidate();
// Dashboard-Sichten sofort mitziehen (Quote, Anwesenheit, „Heute im Team").
await utils.dayEntry.todayTeam.invalidate();
await utils.dayEntry.todayPresence.invalidate();
await utils.dashboard.overview.invalidate();
onDone(); onDone();
}, },
}); });
@@ -182,7 +189,7 @@ function TodoRow({
todo, todo,
allTodos, allTodos,
}: { }: {
todo: { id: string; title: string; status: 'open' | 'done' | 'dropped' }; todo: { id: string; title: string; status: 'open' | 'done' | 'dropped'; unplanned?: boolean };
allTodos: Array<{ id: string; title: string }>; allTodos: Array<{ id: string; title: string }>;
}) { }) {
const utils = trpc.useUtils(); const utils = trpc.useUtils();
@@ -200,7 +207,8 @@ function TodoRow({
await utils.time.listToday.invalidate(); await utils.time.listToday.invalidate();
}, },
}); });
const isRunningHere = now.data?.todoId === todo.id; const activeHere = now.data?.find((a) => a.todoId === todo.id);
const isRunningHere = !!activeHere;
const dotClass = const dotClass =
todo.status === 'done' todo.status === 'done'
? 'h-2 w-2 rounded-full bg-[var(--color-ampel-green-fg)]' ? 'h-2 w-2 rounded-full bg-[var(--color-ampel-green-fg)]'
@@ -212,26 +220,30 @@ function TodoRow({
<span className={dotClass} /> <span className={dotClass} />
<span <span
className={ className={
todo.status === 'dropped' todo.status === 'dropped' ? 'flex-1 line-through text-[var(--color-ink-muted)]' : 'flex-1'
? 'flex-1 line-through text-[var(--color-ink-muted)]'
: 'flex-1'
} }
> >
{todo.title} {todo.title}
{todo.unplanned && (
<span className="ml-2 rounded-full bg-black/5 px-1.5 py-0.5 text-[10px] text-[var(--color-ink-muted)]">
ungeplant
</span>
)}
</span> </span>
{todo.status !== 'done' && todo.status !== 'dropped' && ( {todo.status !== 'done' && todo.status !== 'dropped' && (
<button <button
type="button" type="button"
onClick={() => onClick={() =>
isRunningHere activeHere
? stopMutation.mutate() ? stopMutation.mutate({ id: activeHere.id })
: startMutation.mutate({ todoId: todo.id, category: 'focus' }) : startMutation.mutate({ todoId: todo.id, category: 'focus' })
} }
aria-label={isRunningHere ? 'Timer stoppen' : 'Timer für diesen ToDo starten'} aria-label={isRunningHere ? 'Task pausieren' : 'Task starten / fortsetzen'}
title={isRunningHere ? 'Pausieren' : 'Starten / fortsetzen'}
className={ className={
isRunningHere isRunningHere
? 'inline-flex h-7 items-center gap-1 rounded-full bg-[var(--color-ampel-red-bg)] px-2 text-xs font-medium text-[var(--color-ampel-red-fg)]' ? 'inline-flex h-7 items-center gap-1 rounded-full bg-[var(--color-ampel-red-bg)] px-2 text-xs font-medium text-[var(--color-ampel-red-fg)]'
: 'inline-flex h-7 w-7 items-center justify-center rounded-full text-[var(--color-ink-muted)] opacity-0 hover:bg-black/5 hover:text-[var(--color-ink)] group-hover:opacity-100' : 'inline-flex h-7 w-7 items-center justify-center rounded-full text-[var(--color-ink-muted)] opacity-100 hover:bg-black/5 hover:text-[var(--color-ink)] sm:opacity-0 sm:group-hover:opacity-100'
} }
> >
{isRunningHere ? ( {isRunningHere ? (
@@ -253,7 +265,7 @@ function TodoRow({
onClick={() => setRetroOpen(true)} onClick={() => setRetroOpen(true)}
aria-label="Zeit nachtragen" aria-label="Zeit nachtragen"
title="Zeit nachtragen" title="Zeit nachtragen"
className="inline-flex h-7 w-7 items-center justify-center rounded-full text-[var(--color-ink-muted)] opacity-0 hover:bg-black/5 hover:text-[var(--color-ink)] group-hover:opacity-100" className="inline-flex h-7 w-7 items-center justify-center rounded-full text-[var(--color-ink-muted)] opacity-100 hover:bg-black/5 hover:text-[var(--color-ink)] sm:opacity-0 sm:group-hover:opacity-100"
> >
<Clock size={12} /> <Clock size={12} />
</button> </button>
@@ -269,12 +281,289 @@ function TodoRow({
); );
} }
function AddTodoInline() {
const utils = trpc.useUtils();
const [title, setTitle] = useState('');
const add = trpc.dayEntry.addTodo.useMutation({
onSuccess: async () => {
setTitle('');
await utils.dayEntry.today.invalidate();
await utils.dayEntry.todayTeam.invalidate();
await utils.dashboard.overview.invalidate();
},
});
return (
<form
className="mt-3 flex items-center gap-2"
onSubmit={(e) => {
e.preventDefault();
const v = title.trim();
if (!v) return;
add.mutate({ title: v });
}}
>
<input
type="text"
value={title}
onChange={(e) => setTitle(e.target.value)}
placeholder="Neues ToDo hinzufügen …"
maxLength={200}
className="flex-1 rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-3 py-2 text-sm focus:border-[var(--color-ink)] focus:outline-none"
/>
<Button type="submit" size="sm" variant="secondary" disabled={!title.trim() || add.isPending}>
<Plus size={14} /> Hinzufügen
</Button>
</form>
);
}
function CheckInOutBar({
checkedInAt,
checkedOutAt,
autoCheckedIn,
todos,
reflected,
}: {
checkedInAt: string | Date | null;
checkedOutAt: string | Date | null;
autoCheckedIn: boolean;
todos: Array<{ id: string; title: string; status: 'open' | 'done' | 'dropped' }>;
reflected: boolean;
}) {
const utils = trpc.useUtils();
const [confirmOpen, setConfirmOpen] = useState(false);
const checkOut = trpc.dayEntry.checkOut.useMutation({
onSuccess: async () => {
setConfirmOpen(false);
toast('Feierabend — Check-Out gespeichert.');
await utils.dayEntry.today.invalidate();
await utils.dashboard.overview.invalidate();
},
});
const reopen = trpc.dayEntry.reopen.useMutation({
onSuccess: async () => {
toast('Willkommen zurück — Arbeit fortgesetzt.');
await utils.dayEntry.today.invalidate();
await utils.dashboard.overview.invalidate();
},
onError: (err) => toast(err.message),
});
const hhmm = (d: string | Date | null) =>
d
? new Intl.DateTimeFormat('de-DE', {
timeZone: 'Europe/Berlin',
hour: '2-digit',
minute: '2-digit',
}).format(new Date(d))
: '—';
// Anwesenheit (Lock-in → Feierabend bzw. jetzt) — reine Anzeige, kein Tracking.
// Auto-Check-in vom 6-Uhr-Schnitt ist kein echter Lock-in → Fallback-Anker
// (erster Zeiteintrag des Tages) aus listToday.
const listToday = trpc.time.listToday.useQuery(undefined, { refetchInterval: 30_000 });
const presenceFrom =
!autoCheckedIn && checkedInAt ? checkedInAt : (listToday.data?.presenceStartedAt ?? null);
const presenceSeconds = usePresenceSeconds(presenceFrom, checkedOutAt);
return (
<>
<div className="flex flex-wrap items-center gap-x-3 gap-y-1 rounded-[var(--radius-md)] border border-[var(--color-border)] px-4 py-2 text-sm">
<span>
Arbeitsantritt <span className="font-mono">{hhmm(checkedInAt)}</span>
</span>
{checkedOutAt ? (
<>
<span className="text-[var(--color-ink-muted)]">
· Feierabend <span className="font-mono">{hhmm(checkedOutAt)}</span>
{presenceSeconds !== null && ` · ${formatDurationCompact(presenceSeconds)} anwesend`}
</span>
<Button
size="sm"
variant="ghost"
className="ml-auto"
disabled={reopen.isPending}
onClick={() => reopen.mutate()}
>
<Play size={14} /> Arbeit fortsetzen
</Button>
</>
) : (
<>
{presenceSeconds !== null && (
<span className="text-[var(--color-ink-muted)]">
· anwesend seit{' '}
<span className="font-mono">{formatDurationCompact(presenceSeconds)}</span>
</span>
)}
<Button
size="sm"
variant="secondary"
className="ml-auto"
onClick={() => setConfirmOpen(true)}
>
<LogOut size={14} /> Feierabend / Check-Out
</Button>
</>
)}
</div>
<FeierabendDialog
open={confirmOpen}
onClose={() => setConfirmOpen(false)}
todos={todos}
reflected={reflected}
pending={checkOut.isPending}
onConfirm={() => checkOut.mutate()}
/>
</>
);
}
/**
* Tagesabschluss vor dem Feierabend: kurze Zusammenfassung (erledigt/offen/
* verworfen) und ein Hinweis, falls noch ToDos offen oder die Reflexion fehlt.
* Feierabend ist reversibel ("Arbeit fortsetzen") — der Dialog ist daher Info,
* keine harte Sperre.
*/
function FeierabendDialog({
open,
onClose,
todos,
reflected,
pending,
onConfirm,
}: {
open: boolean;
onClose: () => void;
todos: Array<{ id: string; title: string; status: 'open' | 'done' | 'dropped' }>;
reflected: boolean;
pending: boolean;
onConfirm: () => void;
}) {
const navigate = useNavigate();
const done = todos.filter((t) => t.status === 'done');
const dropped = todos.filter((t) => t.status === 'dropped');
const offen = todos.filter((t) => t.status === 'open');
const reflexionEmpfohlen = !reflected || offen.length > 0;
return (
<Modal open={open} onClose={onClose} title="Feierabend?" size="md">
<p className="mt-1 text-sm text-[var(--color-ink-muted)]">
Kurzer Blick auf den Tag, bevor du abschließt.
</p>
<div className="mt-4 flex flex-wrap gap-x-4 gap-y-1 text-sm">
<span>
<strong>{done.length}</strong> erledigt
</span>
<span>
<strong>{offen.length}</strong> offen
</span>
{dropped.length > 0 && (
<span>
<strong>{dropped.length}</strong> verworfen
</span>
)}
</div>
{done.length > 0 && (
<ul className="mt-3 space-y-1 text-sm">
{done.map((t) => (
<li key={t.id} className="flex items-center gap-2 text-[var(--color-ink-muted)]">
<Check size={14} className="shrink-0 text-[var(--color-ampel-green-fg)]" />
<span className="truncate">{t.title}</span>
</li>
))}
</ul>
)}
{offen.length > 0 && (
<div className="mt-4 rounded-[var(--radius-md)] border border-[var(--color-ampel-amber-fg)] bg-[var(--color-ampel-amber-bg)] px-3 py-2 text-sm">
<strong className="block">Noch offen — nicht reflektiert:</strong>
<ul className="mt-1 space-y-0.5">
{offen.map((t) => (
<li key={t.id} className="truncate">
· {t.title}
</li>
))}
</ul>
</div>
)}
{!reflected && (
<p className="mt-3 text-sm text-[var(--color-ink-muted)]">
Du hast heute noch nicht reflektiert.
</p>
)}
<div className="mt-5 flex flex-wrap justify-end gap-2">
<Button variant="ghost" onClick={onClose}>
Abbrechen
</Button>
{reflexionEmpfohlen && (
<Button variant="secondary" onClick={() => navigate('/reflexion')}>
Zur Reflexion
</Button>
)}
<Button variant="primary" disabled={pending} onClick={onConfirm}>
Tag abschließen
</Button>
</div>
</Modal>
);
}
function AddUnplannedInline() {
const utils = trpc.useUtils();
const [title, setTitle] = useState('');
const add = trpc.dayEntry.addUnplanned.useMutation({
onSuccess: async () => {
setTitle('');
toast('Ungeplant erledigt — eingetragen.');
await utils.dayEntry.today.invalidate();
await utils.dayEntry.todayTeam.invalidate();
await utils.dashboard.overview.invalidate();
},
});
return (
<form
className="mt-2 flex items-center gap-2"
onSubmit={(e) => {
e.preventDefault();
const v = title.trim();
if (!v) return;
add.mutate({ title: v });
}}
>
<input
type="text"
value={title}
onChange={(e) => setTitle(e.target.value)}
placeholder="Ungeplant erledigt? z. B. mItapp-Security-Fix für Yevgen …"
maxLength={200}
className="flex-1 rounded-[var(--radius-md)] border border-dashed border-[var(--color-border)] bg-white px-3 py-2 text-sm focus:border-[var(--color-ink)] focus:outline-none"
/>
<Button type="submit" size="sm" variant="ghost" disabled={!title.trim() || add.isPending}>
<Check size={14} /> Erledigt eintragen
</Button>
</form>
);
}
function EinstempeltView({ function EinstempeltView({
todos, todos,
entry, entry,
}: { }: {
todos: Array<{ id: string; title: string; status: 'open' | 'done' | 'dropped' }>; todos: Array<{
entry: { status: 'begun' | 'full' | 'absent' }; id: string;
title: string;
status: 'open' | 'done' | 'dropped';
unplanned?: boolean;
}>;
entry: {
status: 'begun' | 'full' | 'absent';
checkedInAt: string | Date | null;
checkedOutAt: string | Date | null;
autoCheckedIn: boolean;
};
}) { }) {
// Reflexion ist „fällig", wenn nach 18:00 Berlin und noch nicht abgeschlossen. // Reflexion ist „fällig", wenn nach 18:00 Berlin und noch nicht abgeschlossen.
const reflectionDue = entry.status !== 'full' && berlinHourNow() >= 18; const reflectionDue = entry.status !== 'full' && berlinHourNow() >= 18;
@@ -292,6 +581,14 @@ function EinstempeltView({
<p className="mt-1 text-[var(--color-ink-muted)]">{subtitle}</p> <p className="mt-1 text-[var(--color-ink-muted)]">{subtitle}</p>
</header> </header>
<CheckInOutBar
checkedInAt={entry.checkedInAt}
checkedOutAt={entry.checkedOutAt}
autoCheckedIn={entry.autoCheckedIn}
todos={todos}
reflected={entry.status === 'full'}
/>
{reflectionDue && ( {reflectionDue && (
<div <div
role="alert" role="alert"
@@ -318,6 +615,8 @@ function EinstempeltView({
<TodoRow key={t.id} todo={t} allTodos={todos} /> <TodoRow key={t.id} todo={t} allTodos={todos} />
))} ))}
</ul> </ul>
<AddTodoInline />
<AddUnplannedInline />
</Card.Body> </Card.Body>
<Card.Footer className="flex justify-end"> <Card.Footer className="flex justify-end">
<Button onClick={() => (location.href = '/reflexion')}>{ctaLabel}</Button> <Button onClick={() => (location.href = '/reflexion')}>{ctaLabel}</Button>
+233
View File
@@ -0,0 +1,233 @@
import { useState } from 'react';
import { useNavigate } from 'react-router';
import { ChevronLeft, ChevronRight, Pencil } from 'lucide-react';
import { clsx } from 'clsx';
import type { inferRouterOutputs } from '@trpc/server';
import type { AppRouter } from '@cockpit/api/router';
import { trpc } from '../lib/trpc';
import { Card } from '../components/ui/Card';
import { Button } from '../components/ui/Button';
import { SkeletonCard } from '../components/ui/SkeletonCard';
import { ErrorState } from '../components/ui/ErrorState';
import { useCurrentUser } from '../hooks/useCurrentUser';
type HistoryPerson = inferRouterOutputs<AppRouter>['dayEntry']['historyForDate']['entries'][number];
const AMPEL_META: Record<string, { label: string; badge: string }> = {
green: {
label: 'Im Plan',
badge: 'bg-[var(--color-ampel-green-bg)] text-[var(--color-ampel-green-fg)]',
},
amber: {
label: 'Gefährdet',
badge: 'bg-[var(--color-ampel-amber-bg)] text-[var(--color-ampel-amber-fg)]',
},
red: {
label: 'Blockiert',
badge: 'bg-[var(--color-ampel-red-bg)] text-[var(--color-ampel-red-fg)]',
},
};
const TREND_LABEL: Record<string, string> = {
besser: '↗ Besser',
gleich: '→ Gleich',
schlechter: '↘ Schlechter',
};
function formatDateLong(iso: string): string {
return new Intl.DateTimeFormat('de-DE', {
timeZone: 'Europe/Berlin',
weekday: 'short',
day: 'numeric',
month: 'long',
year: 'numeric',
}).format(new Date(`${iso}T12:00:00Z`));
}
const todayStr = new Intl.DateTimeFormat('en-CA', { timeZone: 'Europe/Berlin' }).format(new Date());
// Editierbar bis 3 Kalendertage nach dem Tag (Spiegel der Backend-Nachfrist).
function isWithinGraceFE(dateIso: string): boolean {
const cur = new Date(`${dateIso}T12:00:00Z`).getTime();
const today = new Date(`${todayStr}T12:00:00Z`).getTime();
const diffDays = Math.round((today - cur) / 86_400_000);
return diffDays >= 0 && diffDays <= 3;
}
export function HistorieRoute() {
const [date, setDate] = useState<string | undefined>(undefined);
const me = useCurrentUser();
const navigate = useNavigate();
const q = trpc.dayEntry.historyForDate.useQuery({ date });
if (q.isPending) return <SkeletonCard lines={6} />;
if (q.isError || !q.data)
return (
<ErrorState
message="Historie konnte nicht geladen werden."
onRetry={() => void q.refetch()}
/>
);
const { date: current, prevDate, nextDate, entries, ohneEintrag } = q.data;
const editableDay = isWithinGraceFE(current);
return (
<div className="space-y-6">
<header>
<h1 className="text-3xl font-bold">Historie</h1>
<p className="text-[var(--color-ink-muted)]">
Was hat das Team an einem Tag gemacht — Reflexion & ToDos.
</p>
</header>
<div className="flex flex-wrap items-center gap-2">
<button
type="button"
onClick={() => prevDate && setDate(prevDate)}
disabled={!prevDate}
aria-label="Vorheriger Tag mit Eintrag"
className="inline-flex h-9 w-9 items-center justify-center rounded-[var(--radius-md)] border border-[var(--color-border)] text-[var(--color-ink-muted)] hover:border-[var(--color-ink)] hover:text-[var(--color-ink)] disabled:opacity-40 disabled:hover:border-[var(--color-border)]"
>
<ChevronLeft size={16} />
</button>
<span className="min-w-[200px] text-center font-medium">{formatDateLong(current)}</span>
<button
type="button"
onClick={() => nextDate && setDate(nextDate)}
disabled={!nextDate}
aria-label="Nächster Tag mit Eintrag"
className="inline-flex h-9 w-9 items-center justify-center rounded-[var(--radius-md)] border border-[var(--color-border)] text-[var(--color-ink-muted)] hover:border-[var(--color-ink)] hover:text-[var(--color-ink)] disabled:opacity-40 disabled:hover:border-[var(--color-border)]"
>
<ChevronRight size={16} />
</button>
<input
type="date"
value={current}
max={todayStr}
onChange={(e) => setDate(e.target.value || undefined)}
className="ml-2 rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-2 py-1.5 text-sm"
/>
</div>
{entries.length === 0 ? (
<Card.Root>
<Card.Body>
<p className="text-sm text-[var(--color-ink-muted)]">Keine Einträge an diesem Tag.</p>
</Card.Body>
</Card.Root>
) : (
<div className="space-y-3">
{entries.map((p) => (
<PersonCard
key={p.userId}
person={p}
canEdit={p.userId === me?.id && editableDay}
onEdit={() => navigate(`/reflexion?date=${current}`)}
/>
))}
</div>
)}
{ohneEintrag.length > 0 && (
<p className="text-xs text-[var(--color-ink-faint)]">
Ohne Eintrag an diesem Tag: {ohneEintrag.join(', ')}
</p>
)}
</div>
);
}
function PersonCard({
person: p,
canEdit,
onEdit,
}: {
person: HistoryPerson;
canEdit: boolean;
onEdit: () => void;
}) {
const ampel = p.ampel ? AMPEL_META[p.ampel] : null;
return (
<Card.Root>
<Card.Body className="space-y-2">
<div className="flex flex-wrap items-center gap-2">
<p className="font-semibold">{p.name}</p>
{ampel && (
<span className={clsx('rounded-full px-2 py-0.5 text-xs font-medium', ampel.badge)}>
{ampel.label}
</span>
)}
{p.trend && (
<span className="text-xs text-[var(--color-ink-muted)]">
{TREND_LABEL[p.trend] ?? p.trend}
</span>
)}
{p.status === 'begun' && (
<span className="rounded-full bg-black/5 px-2 py-0.5 text-xs text-[var(--color-ink-muted)]">
nicht reflektiert
</span>
)}
{canEdit && (
<Button size="sm" variant="ghost" className="ml-auto" onClick={onEdit}>
<Pencil size={13} /> Bearbeiten
</Button>
)}
</div>
{p.todos.length > 0 && (
<ul className="space-y-1 text-sm">
{p.todos.map((t) => (
<li key={t.id} className="flex items-start gap-2">
<span
className={clsx(
'mt-1.5 inline-block h-2 w-2 shrink-0 rounded-full',
t.status === 'done'
? 'bg-[var(--color-ampel-green-fg)]'
: t.status === 'dropped'
? 'bg-[var(--color-ink-faint)]'
: 'bg-[var(--color-border-strong)]',
)}
/>
<div className="flex-1">
<span
className={clsx(
t.status === 'dropped' && 'text-[var(--color-ink-muted)] line-through',
)}
>
{t.title}
{t.unplanned && (
<span className="ml-2 rounded-full bg-black/5 px-1.5 py-0.5 text-[10px] text-[var(--color-ink-muted)]">
ungeplant
</span>
)}
</span>
{t.dropReason && (
<span className="mt-0.5 block whitespace-pre-wrap text-xs text-[var(--color-ink-muted)]">
{t.dropReason}
</span>
)}
</div>
</li>
))}
</ul>
)}
{p.reflectionText && (
<p className="whitespace-pre-wrap text-sm text-[var(--color-ink)]">{p.reflectionText}</p>
)}
{p.url && (
<a
href={p.url}
target="_blank"
rel="noopener noreferrer"
className="block truncate text-sm text-[var(--color-ink-muted)] underline hover:text-[var(--color-ink)]"
>
{p.url}
</a>
)}
{p.todos.length === 0 && !p.reflectionText && !p.url && (
<p className="text-xs text-[var(--color-ink-faint)]">Keine Details.</p>
)}
</Card.Body>
</Card.Root>
);
}
+173 -40
View File
@@ -10,6 +10,9 @@ import { voice } from '../lib/voice';
import { Card } from '../components/ui/Card'; import { Card } from '../components/ui/Card';
import { Button } from '../components/ui/Button'; import { Button } from '../components/ui/Button';
import { SkeletonCard } from '../components/ui/SkeletonCard'; import { SkeletonCard } from '../components/ui/SkeletonCard';
import { ErrorState } from '../components/ui/ErrorState';
import { Modal } from '../components/ui/Modal';
import { useConfirm } from '../components/ui/ConfirmProvider';
import { import {
LEAD_STATUS_META, LEAD_STATUS_META,
LEAD_STATUS_ORDER, LEAD_STATUS_ORDER,
@@ -61,7 +64,8 @@ const inputCls =
'w-full rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-3 py-2 text-sm'; 'w-full rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-3 py-2 text-sm';
function today(): string { function today(): string {
return new Date().toISOString().slice(0, 10); // Berlin-Datum (nicht UTC) — sonst springt der Default abends auf morgen.
return new Intl.DateTimeFormat('en-CA', { timeZone: 'Europe/Berlin' }).format(new Date());
} }
export function LeadRoute() { export function LeadRoute() {
@@ -70,7 +74,10 @@ export function LeadRoute() {
const q = trpc.lead.byId.useQuery({ id }); const q = trpc.lead.byId.useQuery({ id });
if (q.isPending) return <SkeletonCard lines={8} />; if (q.isPending) return <SkeletonCard lines={8} />;
if (!q.data) return null; if (q.isError || !q.data)
return (
<ErrorState message="Lead konnte nicht geladen werden." onRetry={() => void q.refetch()} />
);
const { lead, contacts, touchpoints } = q.data; const { lead, contacts, touchpoints } = q.data;
function goBack() { function goBack() {
@@ -184,6 +191,8 @@ function Header({ lead, onBack }: { lead: LeadDossier; onBack: () => void }) {
}); });
const users = trpc.user.list.useQuery(); const users = trpc.user.list.useQuery();
const projectsQ = trpc.project.list.useQuery();
const projects = (projectsQ.data ?? []).map((r) => ({ id: r.project.id, name: r.project.name }));
const meta = LEAD_STATUS_META[lead.status as LeadStatus]; const meta = LEAD_STATUS_META[lead.status as LeadStatus];
return ( return (
@@ -294,9 +303,7 @@ function Header({ lead, onBack }: { lead: LeadDossier; onBack: () => void }) {
<span className="text-[var(--color-ink-muted)]">Owner</span> <span className="text-[var(--color-ink-muted)]">Owner</span>
<select <select
value={lead.ownerUserId ?? ''} value={lead.ownerUserId ?? ''}
onChange={(e) => onChange={(e) => update.mutate({ id: lead.id, ownerUserId: e.target.value || null })}
update.mutate({ id: lead.id, ownerUserId: e.target.value || null })
}
className="rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-2 py-1 text-sm" className="rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-2 py-1 text-sm"
> >
<option value="">— niemand —</option> <option value="">— niemand —</option>
@@ -307,6 +314,30 @@ function Header({ lead, onBack }: { lead: LeadDossier; onBack: () => void }) {
))} ))}
</select> </select>
</label> </label>
<label className="flex items-center gap-2 text-sm">
<span className="text-[var(--color-ink-muted)]">Projekt</span>
<select
value={lead.projectId ?? ''}
onChange={(e) => update.mutate({ id: lead.id, projectId: e.target.value || null })}
className="rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-2 py-1 text-sm"
>
<option value="">— keins —</option>
{projects.map((p) => (
<option key={p.id} value={p.id}>
{p.name}
</option>
))}
</select>
{lead.projectId && (
<Link
to={`/projekt/${lead.projectId}`}
className="text-xs text-[var(--color-ink-muted)] hover:text-[var(--color-ink)] hover:underline"
>
öffnen ↗
</Link>
)}
</label>
</div> </div>
{promoteOpen && <PromoteDialog leadId={lead.id} onClose={() => setPromoteOpen(false)} />} {promoteOpen && <PromoteDialog leadId={lead.id} onClose={() => setPromoteOpen(false)} />}
@@ -327,12 +358,7 @@ function PromoteDialog({ leadId, onClose }: { leadId: string; onClose: () => voi
}, },
}); });
return ( return (
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/30" onClick={onClose}> <Modal open onClose={onClose} title="Zu Deal machen" size="sm">
<div
className="w-full max-w-sm rounded-[var(--radius-xl)] bg-[var(--color-bg)] p-6 shadow-[var(--shadow-lg)]"
onClick={(e) => e.stopPropagation()}
>
<h2 className="text-xl font-semibold">Zu Deal machen</h2>
<p className="mt-1 text-sm text-[var(--color-ink-muted)]"> <p className="mt-1 text-sm text-[var(--color-ink-muted)]">
Legt einen Pipeline-Deal in Stufe „Lead“ an und verknüpft ihn. Legt einen Pipeline-Deal in Stufe „Lead“ an und verknüpft ihn.
</p> </p>
@@ -373,8 +399,7 @@ function PromoteDialog({ leadId, onClose }: { leadId: string; onClose: () => voi
</Button> </Button>
</div> </div>
</form> </form>
</div> </Modal>
</div>
); );
} }
@@ -495,13 +520,7 @@ function EditableSection({
); );
} }
function VertrauenslevelControl({ function VertrauenslevelControl({ leadId, value }: { leadId: string; value: number | null }) {
leadId,
value,
}: {
leadId: string;
value: number | null;
}) {
const utils = trpc.useUtils(); const utils = trpc.useUtils();
const update = trpc.lead.update.useMutation({ const update = trpc.lead.update.useMutation({
onSuccess: async () => { onSuccess: async () => {
@@ -514,7 +533,10 @@ function VertrauenslevelControl({
<select <select
value={value ?? ''} value={value ?? ''}
onChange={(e) => onChange={(e) =>
update.mutate({ id: leadId, vertrauenslevel: e.target.value ? Number(e.target.value) : null }) update.mutate({
id: leadId,
vertrauenslevel: e.target.value ? Number(e.target.value) : null,
})
} }
className="rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-2 py-1 text-sm" className="rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-2 py-1 text-sm"
> >
@@ -566,6 +588,7 @@ function ContactRow({ leadId, contact }: { leadId: string; contact: Contact }) {
await utils.lead.byId.invalidate({ id: leadId }); await utils.lead.byId.invalidate({ id: leadId });
}, },
}); });
const confirm = useConfirm();
const details = [ const details = [
contact.email, contact.email,
contact.telefon, contact.telefon,
@@ -603,7 +626,16 @@ function ContactRow({ leadId, contact }: { leadId: string; contact: Contact }) {
</div> </div>
<button <button
type="button" type="button"
onClick={() => remove.mutate({ contactId: contact.id })} onClick={async () => {
if (
await confirm({
title: 'Kontakt entfernen?',
destructive: true,
confirmLabel: 'Entfernen',
})
)
remove.mutate({ contactId: contact.id });
}}
aria-label="Kontakt entfernen" aria-label="Kontakt entfernen"
className="text-[var(--color-ink-faint)] hover:text-[var(--color-ampel-red-fg)]" className="text-[var(--color-ink-faint)] hover:text-[var(--color-ampel-red-fg)]"
> >
@@ -660,8 +692,18 @@ function AddContactForm({ leadId, onDone }: { leadId: string; onDone: () => void
}} }}
> >
<div className="grid grid-cols-2 gap-2"> <div className="grid grid-cols-2 gap-2">
<input placeholder="Name *" value={name} onChange={(e) => setName(e.target.value)} className={inputCls} /> <input
<input placeholder="Rolle / Titel" value={rolle} onChange={(e) => setRolle(e.target.value)} className={inputCls} /> placeholder="Name *"
value={name}
onChange={(e) => setName(e.target.value)}
className={inputCls}
/>
<input
placeholder="Rolle / Titel"
value={rolle}
onChange={(e) => setRolle(e.target.value)}
className={inputCls}
/>
<select value={funktion} onChange={(e) => setFunktion(e.target.value)} className={inputCls}> <select value={funktion} onChange={(e) => setFunktion(e.target.value)} className={inputCls}>
<option value="">Funktion im Kaufprozess</option> <option value="">Funktion im Kaufprozess</option>
{Object.entries(CONTACT_FUNKTION_LABEL).map(([v, l]) => ( {Object.entries(CONTACT_FUNKTION_LABEL).map(([v, l]) => (
@@ -670,14 +712,43 @@ function AddContactForm({ leadId, onDone }: { leadId: string; onDone: () => void
</option> </option>
))} ))}
</select> </select>
<input placeholder="E-Mail" value={email} onChange={(e) => setEmail(e.target.value)} className={inputCls} /> <input
<input placeholder="Telefon" value={telefon} onChange={(e) => setTelefon(e.target.value)} className={inputCls} /> placeholder="E-Mail"
<input placeholder="LinkedIn-URL" value={linkedin} onChange={(e) => setLinkedin(e.target.value)} className={inputCls} /> value={email}
<input placeholder="Sprache / Anrede" value={sprache} onChange={(e) => setSprache(e.target.value)} className={inputCls} /> onChange={(e) => setEmail(e.target.value)}
<input placeholder="Im Buying-Center seit" value={seit} onChange={(e) => setSeit(e.target.value)} className={inputCls} /> className={inputCls}
/>
<input
placeholder="Telefon"
value={telefon}
onChange={(e) => setTelefon(e.target.value)}
className={inputCls}
/>
<input
placeholder="LinkedIn-URL"
value={linkedin}
onChange={(e) => setLinkedin(e.target.value)}
className={inputCls}
/>
<input
placeholder="Sprache / Anrede"
value={sprache}
onChange={(e) => setSprache(e.target.value)}
className={inputCls}
/>
<input
placeholder="Im Buying-Center seit"
value={seit}
onChange={(e) => setSeit(e.target.value)}
className={inputCls}
/>
</div> </div>
<label className="flex items-center gap-2 text-sm"> <label className="flex items-center gap-2 text-sm">
<input type="checkbox" checked={isPrimary} onChange={(e) => setIsPrimary(e.target.checked)} /> <input
type="checkbox"
checked={isPrimary}
onChange={(e) => setIsPrimary(e.target.checked)}
/>
Hauptkontakt Hauptkontakt
</label> </label>
<div className="flex justify-end gap-2"> <div className="flex justify-end gap-2">
@@ -740,6 +811,7 @@ function TouchpointRow({ leadId, touchpoint }: { leadId: string; touchpoint: Tou
await utils.lead.byId.invalidate({ id: leadId }); await utils.lead.byId.invalidate({ id: leadId });
}, },
}); });
const confirm = useConfirm();
return ( return (
<div className="rounded-[var(--radius-md)] border border-[var(--color-border)] p-3 text-sm"> <div className="rounded-[var(--radius-md)] border border-[var(--color-border)] p-3 text-sm">
<div className="flex items-start justify-between gap-2"> <div className="flex items-start justify-between gap-2">
@@ -757,7 +829,16 @@ function TouchpointRow({ leadId, touchpoint }: { leadId: string; touchpoint: Tou
</div> </div>
<button <button
type="button" type="button"
onClick={() => remove.mutate({ touchpointId: touchpoint.id })} onClick={async () => {
if (
await confirm({
title: 'Touchpoint löschen?',
destructive: true,
confirmLabel: 'Löschen',
})
)
remove.mutate({ touchpointId: touchpoint.id });
}}
aria-label="Eintrag entfernen" aria-label="Eintrag entfernen"
className="text-[var(--color-ink-faint)] hover:text-[var(--color-ampel-red-fg)]" className="text-[var(--color-ink-faint)] hover:text-[var(--color-ampel-red-fg)]"
> >
@@ -805,7 +886,12 @@ function AddTouchpointForm({ leadId, onDone }: { leadId: string; onDone: () => v
}} }}
> >
<div className="grid grid-cols-2 gap-2"> <div className="grid grid-cols-2 gap-2">
<input type="date" value={datum} onChange={(e) => setDatum(e.target.value)} className={inputCls} /> <input
type="date"
value={datum}
onChange={(e) => setDatum(e.target.value)}
className={inputCls}
/>
<select value={kanal} onChange={(e) => setKanal(e.target.value)} className={inputCls}> <select value={kanal} onChange={(e) => setKanal(e.target.value)} className={inputCls}>
{Object.entries(TOUCHPOINT_KANAL_LABEL).map(([v, l]) => ( {Object.entries(TOUCHPOINT_KANAL_LABEL).map(([v, l]) => (
<option key={v} value={v}> <option key={v} value={v}>
@@ -822,10 +908,20 @@ function AddTouchpointForm({ leadId, onDone }: { leadId: string; onDone: () => v
className={inputCls} className={inputCls}
/> />
<div className="grid grid-cols-2 gap-2"> <div className="grid grid-cols-2 gap-2">
<input placeholder="Outcome" value={outcome} onChange={(e) => setOutcome(e.target.value)} className={inputCls} /> <input
placeholder="Outcome"
value={outcome}
onChange={(e) => setOutcome(e.target.value)}
className={inputCls}
/>
<label className="flex flex-col text-xs text-[var(--color-ink-muted)]"> <label className="flex flex-col text-xs text-[var(--color-ink-muted)]">
Follow-up bis Follow-up bis
<input type="date" value={followUp} onChange={(e) => setFollowUp(e.target.value)} className={inputCls} /> <input
type="date"
value={followUp}
onChange={(e) => setFollowUp(e.target.value)}
className={inputCls}
/>
</label> </label>
</div> </div>
<div className="flex justify-end gap-2"> <div className="flex justify-end gap-2">
@@ -855,6 +951,7 @@ function OffeneFragenSection({
await utils.lead.byId.invalidate({ id: leadId }); await utils.lead.byId.invalidate({ id: leadId });
}, },
}); });
const confirm = useConfirm();
function persist(next: Array<{ text: string; done: boolean }>) { function persist(next: Array<{ text: string; done: boolean }>) {
update.mutate({ id: leadId, offeneFragen: next }); update.mutate({ id: leadId, offeneFragen: next });
} }
@@ -877,12 +974,23 @@ function OffeneFragenSection({
persist(fragen.map((x, j) => (j === i ? { ...x, done: !x.done } : x))) persist(fragen.map((x, j) => (j === i ? { ...x, done: !x.done } : x)))
} }
/> />
<span className={clsx('flex-1', f.done && 'text-[var(--color-ink-muted)] line-through')}> <span
className={clsx('flex-1', f.done && 'text-[var(--color-ink-muted)] line-through')}
>
{f.text} {f.text}
</span> </span>
<button <button
type="button" type="button"
onClick={() => persist(fragen.filter((_, j) => j !== i))} onClick={async () => {
if (
await confirm({
title: 'Frage löschen?',
destructive: true,
confirmLabel: 'Löschen',
})
)
persist(fragen.filter((_, j) => j !== i));
}}
aria-label="Frage entfernen" aria-label="Frage entfernen"
className="text-[var(--color-ink-faint)] hover:text-[var(--color-ampel-red-fg)]" className="text-[var(--color-ink-faint)] hover:text-[var(--color-ampel-red-fg)]"
> >
@@ -932,6 +1040,7 @@ function AnhaengeSection({
await utils.lead.byId.invalidate({ id: leadId }); await utils.lead.byId.invalidate({ id: leadId });
}, },
}); });
const confirm = useConfirm();
function persist(next: Array<{ label: string; url: string }>) { function persist(next: Array<{ label: string; url: string }>) {
update.mutate({ id: leadId, anhaenge: next }); update.mutate({ id: leadId, anhaenge: next });
} }
@@ -950,7 +1059,16 @@ function AnhaengeSection({
<ExternalLink url={a.url} label={a.label} /> <ExternalLink url={a.url} label={a.label} />
<button <button
type="button" type="button"
onClick={() => persist(anhaenge.filter((_, j) => j !== i))} onClick={async () => {
if (
await confirm({
title: 'Anhang entfernen?',
destructive: true,
confirmLabel: 'Entfernen',
})
)
persist(anhaenge.filter((_, j) => j !== i));
}}
aria-label="Anhang entfernen" aria-label="Anhang entfernen"
className="text-[var(--color-ink-faint)] hover:text-[var(--color-ampel-red-fg)]" className="text-[var(--color-ink-faint)] hover:text-[var(--color-ampel-red-fg)]"
> >
@@ -969,8 +1087,18 @@ function AnhaengeSection({
setUrl(''); setUrl('');
}} }}
> >
<input placeholder="Bezeichnung" value={label} onChange={(e) => setLabel(e.target.value)} className={inputCls} /> <input
<input placeholder="URL" value={url} onChange={(e) => setUrl(e.target.value)} className={inputCls} /> placeholder="Bezeichnung"
value={label}
onChange={(e) => setLabel(e.target.value)}
className={inputCls}
/>
<input
placeholder="URL"
value={url}
onChange={(e) => setUrl(e.target.value)}
className={inputCls}
/>
<Button type="submit" size="sm" variant="secondary"> <Button type="submit" size="sm" variant="secondary">
<Plus size={14} /> <Plus size={14} />
</Button> </Button>
@@ -983,7 +1111,12 @@ function AnhaengeSection({
function ExternalLink({ url, label }: { url: string; label?: string }) { function ExternalLink({ url, label }: { url: string; label?: string }) {
const href = url.startsWith('http') ? url : `https://${url}`; const href = url.startsWith('http') ? url : `https://${url}`;
return ( return (
<a href={href} target="_blank" rel="noreferrer" className="truncate text-[var(--color-ink)] hover:underline"> <a
href={href}
target="_blank"
rel="noreferrer"
className="truncate text-[var(--color-ink)] hover:underline"
>
{label ?? url} {label ?? url}
</a> </a>
); );
+194 -18
View File
@@ -1,21 +1,20 @@
import { useState } from 'react'; import { useState } from 'react';
import { Link } from 'react-router'; import { Link } from 'react-router';
import { BellRing } from 'lucide-react';
import { clsx } from 'clsx'; import { clsx } from 'clsx';
import { toast } from 'sonner'; import { toast } from 'sonner';
import { trpc } from '../lib/trpc'; import { trpc } from '../lib/trpc';
import { voice } from '../lib/voice'; import { voice } from '../lib/voice';
import { Card } from '../components/ui/Card'; import { Card } from '../components/ui/Card';
import { Button } from '../components/ui/Button'; import { Button } from '../components/ui/Button';
import { Modal } from '../components/ui/Modal';
import { SkeletonCard } from '../components/ui/SkeletonCard'; import { SkeletonCard } from '../components/ui/SkeletonCard';
import { import { LEAD_STATUS_META, LEAD_STATUS_ORDER, type LeadStatus } from '../lib/lead-meta';
LEAD_STATUS_META,
LEAD_STATUS_ORDER,
type LeadStatus,
} from '../lib/lead-meta';
export function LeadsRoute() { export function LeadsRoute() {
const q = trpc.lead.list.useQuery(); const q = trpc.lead.list.useQuery();
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const [importOpen, setImportOpen] = useState(false);
if (q.isPending) return <SkeletonCard lines={6} />; if (q.isPending) return <SkeletonCard lines={6} />;
const leads = q.data ?? []; const leads = q.data ?? [];
@@ -35,15 +34,26 @@ export function LeadsRoute() {
Qualitative Lead-Dossiers — Stammdaten, Pain, Strategie, Austausch-Log. Qualitative Lead-Dossiers — Stammdaten, Pain, Strategie, Austausch-Log.
</p> </p>
</div> </div>
<div className="flex gap-2">
<Link
to="/pipeline"
className="inline-flex h-9 items-center rounded-md px-4 text-sm font-medium text-[var(--color-ink)] transition-colors hover:bg-black/5"
>
Pipeline
</Link>
<Button variant="secondary" onClick={() => setImportOpen(true)}>
CSV importieren
</Button>
<Button onClick={() => setOpen(true)}>{voice.cta.newLead}</Button> <Button onClick={() => setOpen(true)}>{voice.cta.newLead}</Button>
</div>
</header> </header>
<DueFollowUps />
{leads.length === 0 ? ( {leads.length === 0 ? (
<Card.Root> <Card.Root>
<Card.Body> <Card.Body>
<p className="text-sm text-[var(--color-ink-muted)]"> <p className="text-sm text-[var(--color-ink-muted)]">Noch keine Leads. Leg einen an.</p>
Noch keine Leads. Leg einen an.
</p>
</Card.Body> </Card.Body>
</Card.Root> </Card.Root>
) : ( ) : (
@@ -69,10 +79,150 @@ export function LeadsRoute() {
)} )}
{open && <LeadCreateDialog onClose={() => setOpen(false)} />} {open && <LeadCreateDialog onClose={() => setOpen(false)} />}
{importOpen && <LeadImportDialog onClose={() => setImportOpen(false)} />}
</div> </div>
); );
} }
function DueFollowUps() {
const q = trpc.lead.dueFollowUps.useQuery();
if (!q.data || q.data.length === 0) return null;
return (
<Card.Root>
<Card.Body>
<h2 className="mb-2 flex items-center gap-2 text-lg font-semibold">
<BellRing size={16} className="text-[var(--color-ampel-amber-fg)]" />
Fällige Wiedervorlagen ({q.data.length})
</h2>
<ul className="space-y-1.5 text-sm">
{q.data.map((l) => (
<li key={l.id} className="flex items-center justify-between gap-3">
<Link to={`/lead/${l.id}`} className="min-w-0 flex-1 truncate hover:underline">
<span className="font-medium">{l.firma}</span>
{l.naechsterSchritt && (
<span className="text-[var(--color-ink-muted)]"> — {l.naechsterSchritt}</span>
)}
</Link>
<span className="shrink-0 font-mono text-xs text-[var(--color-ampel-amber-fg)]">
{l.faelligAm}
</span>
</li>
))}
</ul>
</Card.Body>
</Card.Root>
);
}
function LeadImportDialog({ onClose }: { onClose: () => void }) {
const projectsQ = trpc.project.list.useQuery();
const projects = (projectsQ.data ?? []).map((r) => ({ id: r.project.id, name: r.project.name }));
const [projectId, setProjectId] = useState('');
const [fileName, setFileName] = useState('');
const [csv, setCsv] = useState('');
const [result, setResult] = useState<{
created: number;
skippedEmpty: number;
skippedDuplicate: number;
contacts: number;
touchpoints: number;
} | null>(null);
const utils = trpc.useUtils();
const importMut = trpc.lead.importCsv.useMutation({
onSuccess: async (res) => {
setResult(res);
await utils.lead.list.invalidate();
toast(`${res.created} Leads importiert.`);
},
});
function onFile(e: React.ChangeEvent<HTMLInputElement>) {
const file = e.target.files?.[0];
if (!file) return;
setFileName(file.name);
setResult(null);
const reader = new FileReader();
reader.onload = () => setCsv(typeof reader.result === 'string' ? reader.result : '');
reader.readAsText(file);
}
return (
<Modal open onClose={onClose} title="Leads aus CSV importieren">
<p className="mt-1 text-sm text-[var(--color-ink-muted)]">
Spalten: Quelle, Vorname, Nachname, Position, Firma, Straße, PLZ, Ort, Telefon, Mobil, Fax,
E-Mail, Website, Branche, Notizen. Je Zeile entsteht ein Lead mit primärem Kontakt; Notizen
werden als erster Austausch-Log-Eintrag gespeichert. Duplikate (gleicher Firmenname) werden
übersprungen.
</p>
<div className="mt-4 space-y-3">
<label className="block">
<span className="text-sm font-medium">Projekt zuordnen (optional)</span>
<select
value={projectId}
onChange={(e) => setProjectId(e.target.value)}
disabled={!!result}
className="mt-1 w-full rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-3 py-2 text-sm"
>
<option value="">— kein Projekt —</option>
{projects.map((p) => (
<option key={p.id} value={p.id}>
{p.name}
</option>
))}
</select>
</label>
<label className="block">
<span className="text-sm font-medium">CSV-Datei</span>
<input
type="file"
accept=".csv,text/csv"
onChange={onFile}
className="mt-1 block w-full text-sm file:mr-3 file:rounded-[var(--radius-md)] file:border file:border-[var(--color-border)] file:bg-white file:px-3 file:py-1.5 file:text-sm"
/>
</label>
{fileName && !result && (
<p className="text-xs text-[var(--color-ink-muted)]">
Bereit: {fileName} ({Math.max(0, csv.split('\n').filter((l) => l.trim()).length - 1)}{' '}
Datenzeilen)
</p>
)}
{result && (
<div className="rounded-[var(--radius-md)] border border-[var(--color-border)] p-3 text-sm">
<p className="font-medium text-[var(--color-ampel-green-fg)]">
{result.created} Leads importiert
</p>
<ul className="mt-1 space-y-0.5 text-xs text-[var(--color-ink-muted)]">
<li>{result.contacts} Kontakte angelegt</li>
<li>{result.touchpoints} Notizen als Log-Eintrag</li>
{result.skippedDuplicate > 0 && (
<li>{result.skippedDuplicate} Duplikate übersprungen</li>
)}
{result.skippedEmpty > 0 && <li>{result.skippedEmpty} leere Zeilen übersprungen</li>}
</ul>
</div>
)}
<div className="flex justify-end gap-2">
<Button type="button" variant="ghost" onClick={onClose}>
{result ? 'Schließen' : 'Abbrechen'}
</Button>
{!result && (
<Button
type="button"
onClick={() => importMut.mutate({ csv, projectId: projectId || undefined })}
disabled={!csv || importMut.isPending}
>
{importMut.isPending ? 'Importiere…' : 'Importieren'}
</Button>
)}
</div>
</div>
</Modal>
);
}
function LeadCard({ function LeadCard({
lead, lead,
}: { }: {
@@ -82,6 +232,7 @@ function LeadCard({
status: LeadStatus; status: LeadStatus;
score: number; score: number;
ownerName: string | null; ownerName: string | null;
projectName: string | null;
branche: string | null; branche: string | null;
subSegment: string | null; subSegment: string | null;
naechsterSchrittDatum: string | null; naechsterSchrittDatum: string | null;
@@ -100,6 +251,11 @@ function LeadCard({
</span> </span>
</div> </div>
{sub && <p className="text-xs text-[var(--color-ink-muted)]">{sub}</p>} {sub && <p className="text-xs text-[var(--color-ink-muted)]">{sub}</p>}
{lead.projectName && (
<p className="text-xs text-[var(--color-ink-muted)]">
<span className="rounded-full bg-black/5 px-2 py-0.5">↳ {lead.projectName}</span>
</p>
)}
<div className="flex items-center justify-between text-xs text-[var(--color-ink-muted)]"> <div className="flex items-center justify-between text-xs text-[var(--color-ink-muted)]">
<span>{lead.ownerName ?? 'ohne Owner'}</span> <span>{lead.ownerName ?? 'ohne Owner'}</span>
<span className="font-mono tabular-nums">Score {lead.score}/10</span> <span className="font-mono tabular-nums">Score {lead.score}/10</span>
@@ -117,12 +273,15 @@ function LeadCard({
function LeadCreateDialog({ onClose }: { onClose: () => void }) { function LeadCreateDialog({ onClose }: { onClose: () => void }) {
const users = trpc.user.list.useQuery(); const users = trpc.user.list.useQuery();
const projectsQ = trpc.project.list.useQuery();
const projects = (projectsQ.data ?? []).map((r) => ({ id: r.project.id, name: r.project.name }));
const [firma, setFirma] = useState(''); const [firma, setFirma] = useState('');
const [branche, setBranche] = useState(''); const [branche, setBranche] = useState('');
const [subSegment, setSubSegment] = useState(''); const [subSegment, setSubSegment] = useState('');
const [website, setWebsite] = useState(''); const [website, setWebsite] = useState('');
const [quelle, setQuelle] = useState(''); const [quelle, setQuelle] = useState('');
const [ownerUserId, setOwnerUserId] = useState(''); const [ownerUserId, setOwnerUserId] = useState('');
const [projectId, setProjectId] = useState('');
const [status, setStatus] = useState<LeadStatus>('cold'); const [status, setStatus] = useState<LeadStatus>('cold');
const [score, setScore] = useState(0); const [score, setScore] = useState(0);
@@ -145,18 +304,14 @@ function LeadCreateDialog({ onClose }: { onClose: () => void }) {
website: website.trim() || undefined, website: website.trim() || undefined,
quelle: quelle.trim() || undefined, quelle: quelle.trim() || undefined,
ownerUserId: ownerUserId || undefined, ownerUserId: ownerUserId || undefined,
projectId: projectId || undefined,
status, status,
score, score,
}); });
} }
return ( return (
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/30" onClick={onClose}> <Modal open onClose={onClose} title="Neuer Lead">
<div
className="max-h-[90vh] w-full max-w-md overflow-y-auto rounded-[var(--radius-xl)] bg-[var(--color-bg)] p-6 shadow-[var(--shadow-lg)]"
onClick={(e) => e.stopPropagation()}
>
<h2 className="text-xl font-semibold">Neuer Lead</h2>
<p className="mt-1 text-sm text-[var(--color-ink-muted)]"> <p className="mt-1 text-sm text-[var(--color-ink-muted)]">
Nur die Firma ist Pflicht — alles Weitere füllst du im Dossier. Nur die Firma ist Pflicht — alles Weitere füllst du im Dossier.
</p> </p>
@@ -171,7 +326,11 @@ function LeadCreateDialog({ onClose }: { onClose: () => void }) {
</Field> </Field>
<div className="grid grid-cols-2 gap-3"> <div className="grid grid-cols-2 gap-3">
<Field label="Branche"> <Field label="Branche">
<input value={branche} onChange={(e) => setBranche(e.target.value)} className={inputCls} /> <input
value={branche}
onChange={(e) => setBranche(e.target.value)}
className={inputCls}
/>
</Field> </Field>
<Field label="Nische / Sub-Segment"> <Field label="Nische / Sub-Segment">
<input <input
@@ -182,11 +341,29 @@ function LeadCreateDialog({ onClose }: { onClose: () => void }) {
</Field> </Field>
</div> </div>
<Field label="Website"> <Field label="Website">
<input value={website} onChange={(e) => setWebsite(e.target.value)} className={inputCls} /> <input
value={website}
onChange={(e) => setWebsite(e.target.value)}
className={inputCls}
/>
</Field> </Field>
<Field label="Quelle (wie gefunden)"> <Field label="Quelle (wie gefunden)">
<input value={quelle} onChange={(e) => setQuelle(e.target.value)} className={inputCls} /> <input value={quelle} onChange={(e) => setQuelle(e.target.value)} className={inputCls} />
</Field> </Field>
<Field label="Projekt (optional)">
<select
value={projectId}
onChange={(e) => setProjectId(e.target.value)}
className={inputCls}
>
<option value="">— kein Projekt —</option>
{projects.map((p) => (
<option key={p.id} value={p.id}>
{p.name}
</option>
))}
</select>
</Field>
<div className="grid grid-cols-2 gap-3"> <div className="grid grid-cols-2 gap-3">
<Field label="Owner"> <Field label="Owner">
<select <select
@@ -235,8 +412,7 @@ function LeadCreateDialog({ onClose }: { onClose: () => void }) {
</Button> </Button>
</div> </div>
</form> </form>
</div> </Modal>
</div>
); );
} }
+1 -3
View File
@@ -25,9 +25,7 @@ export function LoginRoute() {
<h1 className="inline-flex items-center gap-2 text-4xl font-bold"> <h1 className="inline-flex items-center gap-2 text-4xl font-bold">
everythingbutwork <ToolCtrlLogo size={32} /> everythingbutwork <ToolCtrlLogo size={32} />
</h1> </h1>
<p className="mt-3 text-[var(--color-ink-muted)]"> <p className="mt-3 text-[var(--color-ink-muted)]">Internes ToolCTRL-Projektmanagement.</p>
Internes ToolCTRL-Projektmanagement.
</p>
{error && ( {error && (
<p <p
className="mt-4 rounded-[var(--radius-md)] border border-[var(--color-ampel-red-bg)] bg-[var(--color-ampel-red-bg)] px-4 py-2 text-sm text-[var(--color-ampel-red-fg)]" className="mt-4 rounded-[var(--radius-md)] border border-[var(--color-ampel-red-bg)] bg-[var(--color-ampel-red-bg)] px-4 py-2 text-sm text-[var(--color-ampel-red-fg)]"
+92
View File
@@ -0,0 +1,92 @@
import { trpc } from '../lib/trpc';
import { Card } from '../components/ui/Card';
import { SkeletonCard } from '../components/ui/SkeletonCard';
import { ErrorState } from '../components/ui/ErrorState';
const AMPEL_DOT: Record<string, string> = {
green: 'bg-[var(--color-ampel-green-fg)]',
amber: 'bg-[var(--color-ampel-amber-fg)]',
red: 'bg-[var(--color-ampel-red-fg)]',
};
const TREND_LABEL: Record<string, string> = { besser: '↗', gleich: '→', schlechter: '↘' };
function weekday(iso: string): string {
return new Intl.DateTimeFormat('de-DE', {
timeZone: 'Europe/Berlin',
weekday: 'short',
day: 'numeric',
month: 'short',
}).format(new Date(`${iso}T12:00:00Z`));
}
function hhmm(d: string | Date | null): string {
return d
? new Intl.DateTimeFormat('de-DE', {
timeZone: 'Europe/Berlin',
hour: '2-digit',
minute: '2-digit',
}).format(new Date(d))
: '—';
}
export function MeineWocheRoute() {
const q = trpc.dayEntry.myWeek.useQuery();
if (q.isPending) return <SkeletonCard lines={7} />;
if (q.isError || !q.data)
return (
<ErrorState
message="Wochenübersicht konnte nicht geladen werden."
onRetry={() => void q.refetch()}
/>
);
const days = q.data;
const totalDone = days.reduce((s, d) => s + d.todos.done, 0);
return (
<div className="mx-auto max-w-2xl space-y-6">
<header>
<h1 className="text-3xl font-bold">Meine Woche</h1>
<p className="mt-1 text-[var(--color-ink-muted)]">
Die letzten 7 Tage — {totalDone} ToDos erledigt.
</p>
</header>
{days.length === 0 ? (
<Card.Root>
<Card.Body>
<p className="text-sm text-[var(--color-ink-muted)]">
Noch keine Einträge in den letzten 7 Tagen.
</p>
</Card.Body>
</Card.Root>
) : (
<Card.Root>
<Card.Body className="divide-y divide-[var(--color-border)]">
{days.map((d) => (
<div
key={d.date}
className="flex items-center gap-3 py-2.5 text-sm first:pt-0 last:pb-0"
>
<span className="w-28 shrink-0 font-medium">{weekday(d.date)}</span>
<span
className={`h-2 w-2 shrink-0 rounded-full ${d.ampel ? (AMPEL_DOT[d.ampel] ?? '') : 'bg-[var(--color-border-strong)]'}`}
aria-hidden="true"
/>
<span className="flex-1 truncate text-[var(--color-ink-muted)]">
{hhmm(d.checkedInAt)}
{d.checkedOutAt ? `–${hhmm(d.checkedOutAt)}` : d.checkedInAt ? ' …' : ''}
{d.trend ? ` · ${TREND_LABEL[d.trend] ?? ''}` : ''}
</span>
<span className="shrink-0 text-xs text-[var(--color-ink-muted)]">
{d.todos.done}✓{d.todos.open > 0 ? ` · ${d.todos.open} offen` : ''}
{d.todos.dropped > 0 ? ` · ${d.todos.dropped} verworfen` : ''}
</span>
</div>
))}
</Card.Body>
</Card.Root>
)}
</div>
);
}
+154
View File
@@ -0,0 +1,154 @@
import { Link } from 'react-router';
import type { inferRouterOutputs } from '@trpc/server';
import type { AppRouter } from '@cockpit/api/router';
import { trpc } from '../lib/trpc';
import { Card } from '../components/ui/Card';
import { SkeletonCard } from '../components/ui/SkeletonCard';
import { ErrorState } from '../components/ui/ErrorState';
type Deal = inferRouterOutputs<AppRouter>['deal']['list'][number];
const STAGES = [
{ key: 'lead', label: 'Lead' },
{ key: 'erstgespraech', label: 'Erstgespräch' },
{ key: 'demo', label: 'Demo' },
{ key: 'angebot', label: 'Angebot' },
{ key: 'abschluss', label: 'Abschluss' },
] as const;
type Stage = (typeof STAGES)[number]['key'];
// valueEur wird in Cent gespeichert.
const euro = (cents: number) =>
new Intl.NumberFormat('de-DE', {
style: 'currency',
currency: 'EUR',
maximumFractionDigits: 0,
}).format(cents / 100);
export function PipelineRoute() {
const dealsQ = trpc.deal.list.useQuery();
const kpisQ = trpc.deal.kpis.useQuery();
if (dealsQ.isPending) return <SkeletonCard lines={6} />;
if (dealsQ.isError || !dealsQ.data)
return (
<ErrorState
message="Pipeline konnte nicht geladen werden."
onRetry={() => void dealsQ.refetch()}
/>
);
const deals = dealsQ.data;
const k = kpisQ.data;
return (
<div className="space-y-6">
<header>
<p className="text-sm text-[var(--color-ink-muted)]">
<Link to="/bereich/vertrieb" className="hover:underline">
Vertrieb
</Link>
{' › Pipeline'}
</p>
<h1 className="text-3xl font-bold">Pipeline</h1>
<p className="text-[var(--color-ink-muted)]">
Deals nach Stufe. Stufe ändern verschiebt den Deal; „Abschluss“ zählt als gewonnen.
</p>
</header>
{k && (
<div className="grid grid-cols-2 gap-3 sm:grid-cols-3">
<KpiCard label="Gewichtete Pipeline" value={euro(k.weightedPipelineEur)} />
<KpiCard label="Offene Deals" value={String(k.openDealCount)} />
<KpiCard
label="Gewonnen (Quartal)"
value={`${euro(k.wonValueQuarterEur)} · ${k.wonCountQuarter}`}
/>
</div>
)}
{deals.length === 0 ? (
<Card.Root>
<Card.Body>
<p className="text-sm text-[var(--color-ink-muted)]">
Noch keine Deals. Promote einen Lead über das Lead-Dossier („Zu Deal machen“).
</p>
</Card.Body>
</Card.Root>
) : (
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-5">
{STAGES.map((stage) => {
const stageDeals = deals.filter((d) => d.stage === stage.key);
const sum = stageDeals.reduce((acc, d) => acc + d.valueEur, 0);
return (
<div key={stage.key} className="space-y-2">
<div className="flex items-baseline justify-between">
<h2 className="text-sm font-semibold">
{stage.label}{' '}
<span className="font-normal text-[var(--color-ink-muted)]">
({stageDeals.length})
</span>
</h2>
{sum > 0 && (
<span className="text-xs text-[var(--color-ink-muted)]">{euro(sum)}</span>
)}
</div>
<div className="space-y-2">
{stageDeals.map((d) => (
<DealCard key={d.id} deal={d} />
))}
</div>
</div>
);
})}
</div>
)}
</div>
);
}
function KpiCard({ label, value }: { label: string; value: string }) {
return (
<Card.Root>
<Card.Body>
<p className="text-xs text-[var(--color-ink-muted)]">{label}</p>
<p className="mt-0.5 text-lg font-semibold">{value}</p>
</Card.Body>
</Card.Root>
);
}
function DealCard({ deal }: { deal: Deal }) {
const utils = trpc.useUtils();
const move = trpc.deal.updateStage.useMutation({
onSuccess: async () => {
await utils.deal.list.invalidate();
await utils.deal.kpis.invalidate();
},
});
return (
<div className="rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white p-2.5 text-sm">
<p className="font-medium">{deal.name}</p>
<p className="mt-0.5 text-xs text-[var(--color-ink-muted)]">
{euro(deal.valueEur)} · {deal.probability}%{deal.wonAt ? ' · gewonnen' : ''}
</p>
<label className="sr-only" htmlFor={`stage-${deal.id}`}>
Stufe von {deal.name}
</label>
<select
id={`stage-${deal.id}`}
value={deal.stage}
onChange={(e) => move.mutate({ dealId: deal.id, stage: e.target.value as Stage })}
disabled={move.isPending}
className="mt-1.5 w-full rounded-[var(--radius-sm)] border border-[var(--color-border)] bg-white px-1.5 py-1 text-xs"
>
{STAGES.map((s) => (
<option key={s.key} value={s.key}>
{s.label}
</option>
))}
</select>
</div>
);
}
File diff suppressed because it is too large. Load diff
+120 -23
View File
@@ -1,5 +1,5 @@
import { useState } from 'react'; import { useState } from 'react';
import { useNavigate } from 'react-router'; import { useNavigate, useSearchParams } from 'react-router';
import { trpc } from '../lib/trpc'; import { trpc } from '../lib/trpc';
import { voice } from '../lib/voice'; import { voice } from '../lib/voice';
import { Card } from '../components/ui/Card'; import { Card } from '../components/ui/Card';
@@ -14,27 +14,56 @@ type Trend = 'besser' | 'gleich' | 'schlechter';
type TodoStatus = 'open' | 'done' | 'dropped'; type TodoStatus = 'open' | 'done' | 'dropped';
export function ReflexionRoute() { export function ReflexionRoute() {
const today = trpc.dayEntry.today.useQuery(); const [params] = useSearchParams();
const dateParam = params.get('date') ?? undefined;
const navigate = useNavigate(); const navigate = useNavigate();
if (today.isPending) return <SkeletonCard lines={6} />; // Ohne ?date: heutige Reflexion. Mit ?date: nachträglich aus der Historie.
if (!today.data?.entry) { const todayQ = trpc.dayEntry.today.useQuery(undefined, { enabled: !dateParam });
const pastQ = trpc.dayEntry.ownForDate.useQuery(
{ date: dateParam ?? '' },
{ enabled: !!dateParam },
);
const active = dateParam ? pastQ : todayQ;
if (active.isPending) return <SkeletonCard lines={6} />;
const entry = active.data?.entry ?? null;
const todos = active.data?.todos ?? [];
const editable = dateParam ? (pastQ.data?.editable ?? false) : true;
if (!entry) {
return ( return (
<div className="mx-auto max-w-2xl text-center"> <div className="mx-auto max-w-2xl text-center">
<p className="text-[var(--color-ink-muted)]"> <p className="text-[var(--color-ink-muted)]">
Du bist heute noch nicht locked in. {voice.hint.notCheckedInToday} {dateParam
? 'Für diesen Tag gibt es keinen Eintrag von dir.'
: `Du bist heute noch nicht locked in. ${voice.hint.notCheckedInToday}`}
</p> </p>
<Button className="mt-4" onClick={() => navigate('/heute')}> <Button className="mt-4" onClick={() => navigate(dateParam ? '/historie' : '/heute')}>
Zum Lock-in {dateParam ? 'Zur Historie' : 'Zum Lock-in'}
</Button>
</div>
);
}
if (!editable) {
return (
<div className="mx-auto max-w-2xl text-center">
<p className="text-[var(--color-ink-muted)]">
Dieser Tag ist älter als 3 Tage und kann nicht mehr bearbeitet werden.
</p>
<Button className="mt-4" onClick={() => navigate('/historie')}>
Zur Historie
</Button> </Button>
</div> </div>
); );
} }
return ( return (
<ReflectForm <ReflectForm
entry={today.data.entry} entry={entry}
todos={today.data.todos} todos={todos}
onDone={() => navigate('/dashboard')} allowUnplanned={!dateParam}
onDone={() => navigate(dateParam ? '/historie' : '/dashboard')}
/> />
); );
} }
@@ -42,29 +71,46 @@ export function ReflexionRoute() {
function ReflectForm({ function ReflectForm({
entry, entry,
todos, todos,
allowUnplanned = true,
onDone, onDone,
}: { }: {
entry: { id: string }; entry: {
id: string;
reflectionText?: string | null;
ampel?: Ampel | null;
trend?: Trend | null;
};
todos: Array<{ todos: Array<{
id: string; id: string;
title: string; title: string;
status: TodoStatus; status: TodoStatus;
bezugKind: 'project' | 'deal' | 'campaign' | 'allgemein' | null; bezugKind: 'project' | 'deal' | 'campaign' | 'allgemein' | null;
unplanned?: boolean;
dropReason?: string | null;
}>; }>;
allowUnplanned?: boolean;
onDone: () => void; onDone: () => void;
}) { }) {
const [todoStates, setTodoStates] = useState< const [todoStates, setTodoStates] = useState<
Record<string, { status: TodoStatus; reason?: string }> Record<string, { status: TodoStatus; reason?: string }>
>(Object.fromEntries(todos.map((t) => [t.id, { status: t.status }]))); >(Object.fromEntries(todos.map((t) => [t.id, { status: t.status, reason: t.dropReason ?? '' }])));
const [reflectionText, setReflectionText] = useState(''); const [reflectionText, setReflectionText] = useState(entry.reflectionText ?? '');
const [ampel, setAmpel] = useState<Ampel | null>(null); const [ampel, setAmpel] = useState<Ampel | null>(entry.ampel ?? null);
const [trend, setTrend] = useState<Trend | null>(null); const [trend, setTrend] = useState<Trend | null>(entry.trend ?? null);
const [blockerEnabled, setBlockerEnabled] = useState(false); const [blockerEnabled, setBlockerEnabled] = useState(false);
const [blockerTitle, setBlockerTitle] = useState(''); const [blockerTitle, setBlockerTitle] = useState('');
const [blockerDescription, setBlockerDescription] = useState(''); const [blockerDescription, setBlockerDescription] = useState('');
const [unplannedTitle, setUnplannedTitle] = useState('');
const hasProjectBezug = todos.some((t) => t.bezugKind === 'project'); const hasProjectBezug = todos.some((t) => t.bezugKind === 'project');
const utils = trpc.useUtils(); const utils = trpc.useUtils();
const addUnplanned = trpc.dayEntry.addUnplanned.useMutation({
onSuccess: async () => {
setUnplannedTitle('');
toast('Ungeplant erledigt eingetragen.');
await utils.dayEntry.today.invalidate();
},
});
const mutation = trpc.dayEntry.submitReflection.useMutation({ const mutation = trpc.dayEntry.submitReflection.useMutation({
onSuccess: async () => { onSuccess: async () => {
toast(voice.toast.reflected); toast(voice.toast.reflected);
@@ -77,6 +123,10 @@ function ReflectForm({
setTodoStates((prev) => ({ ...prev, [id]: { ...prev[id], status } })); setTodoStates((prev) => ({ ...prev, [id]: { ...prev[id], status } }));
} }
function setTodoReason(id: string, reason: string) {
setTodoStates((prev) => ({ ...prev, [id]: { status: prev[id]?.status ?? 'open', reason } }));
}
function handleSubmit(e: React.FormEvent) { function handleSubmit(e: React.FormEvent) {
e.preventDefault(); e.preventDefault();
if (!ampel) { if (!ampel) {
@@ -93,10 +143,12 @@ function ReflectForm({
} }
mutation.mutate({ mutation.mutate({
dayEntryId: entry.id, dayEntryId: entry.id,
todos: Object.entries(todoStates).map(([id, s]) => ({ // Über die aktuelle ToDo-Liste mappen (nicht nur den initialen Snapshot),
id, // damit mitten am Tag ergänzte ToDos ihren Status behalten.
status: s.status, todos: todos.map((t) => ({
dropReason: s.reason, id: t.id,
status: todoStates[t.id]?.status ?? t.status,
dropReason: todoStates[t.id]?.reason?.trim() || undefined,
})), })),
reflectionText, reflectionText,
ampel, ampel,
@@ -125,10 +177,16 @@ function ReflectForm({
</p> </p>
<ul className="space-y-2"> <ul className="space-y-2">
{todos.map((t) => { {todos.map((t) => {
const status = todoStates[t.id]?.status ?? 'open'; const status = todoStates[t.id]?.status ?? t.status;
return ( return (
<li key={t.id} className="flex items-center gap-2"> <li key={t.id} className="space-y-1">
<div className="flex items-center gap-2">
<EditableTodoTitle id={t.id} title={t.title} /> <EditableTodoTitle id={t.id} title={t.title} />
{t.unplanned && (
<span className="rounded-full bg-black/5 px-1.5 py-0.5 text-[10px] text-[var(--color-ink-muted)]">
ungeplant
</span>
)}
<div className="flex gap-1"> <div className="flex gap-1">
<StatusBtn <StatusBtn
active={status === 'done'} active={status === 'done'}
@@ -152,17 +210,55 @@ function ReflectForm({
<X size={14} /> <X size={14} />
</StatusBtn> </StatusBtn>
</div> </div>
</div>
<input
type="text"
value={todoStates[t.id]?.reason ?? ''}
onChange={(e) => setTodoReason(t.id, e.target.value)}
placeholder="Notiz (optional) — Ergebnis, Kontext, Link …"
maxLength={500}
aria-label={`Notiz zu ${t.title}`}
className="w-full rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-2 py-1 text-xs focus:border-[var(--color-ink)] focus:outline-none"
/>
</li> </li>
); );
})} })}
</ul> </ul>
{allowUnplanned && (
<div className="mt-1 flex items-center gap-2">
<input
type="text"
value={unplannedTitle}
onChange={(e) => setUnplannedTitle(e.target.value)}
placeholder="Ungeplant erledigt? Hier nachtragen …"
maxLength={200}
onKeyDown={(e) => {
if (e.key === 'Enter') {
e.preventDefault();
const v = unplannedTitle.trim();
if (v) addUnplanned.mutate({ title: v });
}
}}
className="flex-1 rounded-[var(--radius-md)] border border-dashed border-[var(--color-border)] bg-white px-3 py-2 text-sm focus:border-[var(--color-ink)] focus:outline-none"
/>
<Button
type="button"
size="sm"
variant="ghost"
disabled={!unplannedTitle.trim() || addUnplanned.isPending}
onClick={() => addUnplanned.mutate({ title: unplannedTitle.trim() })}
>
Erledigt eintragen
</Button>
</div>
)}
</Card.Body> </Card.Body>
</Card.Root> </Card.Root>
<Card.Root> <Card.Root>
<Card.Body className="space-y-3"> <Card.Body className="space-y-3">
<label className="block text-sm font-medium" htmlFor="reflection"> <label className="block text-sm font-medium" htmlFor="reflection">
Sonst noch was? Fazit
</label> </label>
<textarea <textarea
id="reflection" id="reflection"
@@ -170,6 +266,7 @@ function ReflectForm({
onChange={(e) => setReflectionText(e.target.value)} onChange={(e) => setReflectionText(e.target.value)}
maxLength={1000} maxLength={1000}
rows={4} rows={4}
placeholder="Fasse kurz zusammen, was du heute gemacht hast."
className="w-full rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-3 py-2 text-sm focus:border-[var(--color-ink)] focus:outline-none" className="w-full rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-3 py-2 text-sm focus:border-[var(--color-ink)] focus:outline-none"
/> />
<p className="text-xs text-[var(--color-ink-faint)] text-right"> <p className="text-xs text-[var(--color-ink-faint)] text-right">
@@ -348,7 +445,7 @@ function EditableTodoTitle({ id, title }: { id: string; title: string }) {
<span>{title}</span> <span>{title}</span>
<Pencil <Pencil
size={12} size={12}
className="text-[var(--color-ink-faint)] opacity-0 transition-opacity group-hover:opacity-100" className="text-[var(--color-ink-faint)] opacity-100 transition-opacity sm:opacity-0 sm:group-hover:opacity-100"
/> />
</button> </button>
); );
+299
View File
@@ -0,0 +1,299 @@
import { useEffect, useState } from 'react';
import { ChevronLeft, ChevronRight } from 'lucide-react';
import { clsx } from 'clsx';
import { trpc } from '../lib/trpc';
import { Card } from '../components/ui/Card';
import { Button } from '../components/ui/Button';
import { SkeletonCard } from '../components/ui/SkeletonCard';
import { ErrorState } from '../components/ui/ErrorState';
import { formatDurationCompact } from '../lib/format-duration';
import { TIME_CATEGORIES } from '../lib/time-categories';
const CATEGORY_LABEL: Record<string, string> = Object.fromEntries(
TIME_CATEGORIES.map((c) => [c.value, c.label]),
);
const CATEGORY_TINT: Record<string, string> = {
focus: 'bg-[var(--color-ink)] text-[var(--color-brand-fg)]',
meeting: 'bg-[var(--color-ampel-amber-fg)] text-white',
admin: 'bg-[var(--color-ink-muted)] text-white',
learning: 'bg-[var(--color-ampel-green-fg)] text-white',
break: 'bg-[var(--color-ink-faint)] text-white',
other: 'bg-[var(--color-border-strong)] text-[var(--color-ink)]',
};
const BAR_H = 22; // px pro Sub-Spur
const GAP = 4;
const todayStr = new Intl.DateTimeFormat('en-CA', { timeZone: 'Europe/Berlin' }).format(new Date());
function shiftDay(iso: string, delta: number): string {
const d = new Date(`${iso}T12:00:00Z`);
d.setUTCDate(d.getUTCDate() + delta);
return d.toISOString().slice(0, 10);
}
function pad(n: number): string {
return n.toString().padStart(2, '0');
}
function hhmm(ms: number): string {
const d = new Date(ms);
return `${pad(d.getHours())}:${pad(d.getMinutes())}`;
}
function floorHourMs(ms: number): number {
const d = new Date(ms);
d.setMinutes(0, 0, 0);
return d.getTime();
}
function ceilHourMs(ms: number): number {
const d = new Date(ms);
if (d.getMinutes() || d.getSeconds() || d.getMilliseconds()) {
d.setHours(d.getHours() + 1, 0, 0, 0);
}
return d.getTime();
}
function formatDateLong(iso: string): string {
return new Intl.DateTimeFormat('de-DE', {
timeZone: 'Europe/Berlin',
weekday: 'short',
day: 'numeric',
month: 'long',
year: 'numeric',
}).format(new Date(`${iso}T12:00:00Z`));
}
type RawEntry = {
id: string;
start: string;
end: string | null;
category: string;
description: string | null;
todoTitle: string | null;
};
type Bar = {
id: string;
startMs: number;
endMs: number;
running: boolean;
category: string;
label: string;
row: number;
};
// Überlappende Blöcke auf parallele Sub-Spuren verteilen.
function layout(entries: RawEntry[], nowMs: number): { bars: Bar[]; rows: number } {
const sorted = entries
.map((e) => {
const startMs = new Date(e.start).getTime();
const running = e.end === null;
const endMs = running ? nowMs : new Date(e.end!).getTime();
return {
id: e.id,
startMs,
endMs: Math.max(endMs, startMs + 1),
running,
category: e.category,
label: e.todoTitle || e.description || CATEGORY_LABEL[e.category] || 'Eintrag',
};
})
.sort((a, b) => a.startMs - b.startMs);
const rowEnds: number[] = [];
const bars: Bar[] = sorted.map((e) => {
let row = rowEnds.findIndex((end) => end <= e.startMs);
if (row === -1) {
row = rowEnds.length;
rowEnds.push(e.endMs);
} else {
rowEnds[row] = e.endMs;
}
return { ...e, row };
});
return { bars, rows: Math.max(rowEnds.length, 1) };
}
export function TeamViewRoute() {
const [date, setDate] = useState(todayStr);
const isToday = date === todayStr;
const q = trpc.time.teamTimeline.useQuery(
{ date },
{ refetchInterval: isToday ? 30_000 : false },
);
// 1-Sekunden-Tick nur heute (für laufende Balken).
const [, setTick] = useState(0);
useEffect(() => {
if (!isToday) return undefined;
const id = window.setInterval(() => setTick((t) => t + 1), 1000);
return () => window.clearInterval(id);
}, [isToday]);
if (q.isPending) return <SkeletonCard lines={6} />;
if (q.isError || !q.data)
return (
<ErrorState
message="Team-Ansicht konnte nicht geladen werden."
onRetry={() => void q.refetch()}
/>
);
const lanes = q.data.lanes;
const nowMs = Date.now();
// Achse aus allen Einträgen bestimmen.
const allMs: number[] = [];
for (const lane of lanes) {
for (const e of lane.entries) {
allMs.push(new Date(e.start).getTime());
allMs.push(e.end === null ? nowMs : new Date(e.end).getTime());
}
}
const hasData = allMs.length > 0;
const axisStart = hasData ? floorHourMs(Math.min(...allMs)) : floorHourMs(nowMs);
let axisEnd = hasData ? ceilHourMs(Math.max(...allMs)) : axisStart + 2 * 3600_000;
if (axisEnd - axisStart < 2 * 3600_000) axisEnd = axisStart + 2 * 3600_000;
const range = axisEnd - axisStart;
const pct = (ms: number) =>
((Math.min(Math.max(ms, axisStart), axisEnd) - axisStart) / range) * 100;
const hours: number[] = [];
for (let t = axisStart; t <= axisEnd; t += 3600_000) hours.push(t);
return (
<div className="space-y-6">
<header>
<h1 className="text-3xl font-bold">Team-View</h1>
<p className="text-[var(--color-ink-muted)]">
Wer hat wann woran gearbeitet — horizontale Tages-Timeline mit parallelen Strängen.
</p>
</header>
<div className="flex flex-wrap items-center gap-2">
<button
type="button"
onClick={() => setDate(shiftDay(date, -1))}
aria-label="Vorheriger Tag"
className="inline-flex h-9 w-9 items-center justify-center rounded-[var(--radius-md)] border border-[var(--color-border)] text-[var(--color-ink-muted)] hover:border-[var(--color-ink)] hover:text-[var(--color-ink)]"
>
<ChevronLeft size={16} />
</button>
<span className="min-w-[200px] text-center font-medium">{formatDateLong(date)}</span>
<button
type="button"
onClick={() => setDate(shiftDay(date, 1))}
disabled={date >= todayStr}
aria-label="Nächster Tag"
className="inline-flex h-9 w-9 items-center justify-center rounded-[var(--radius-md)] border border-[var(--color-border)] text-[var(--color-ink-muted)] hover:border-[var(--color-ink)] hover:text-[var(--color-ink)] disabled:opacity-40 disabled:hover:border-[var(--color-border)]"
>
<ChevronRight size={16} />
</button>
<input
type="date"
value={date}
max={todayStr}
onChange={(e) => setDate(e.target.value || todayStr)}
className="ml-2 rounded-[var(--radius-md)] border border-[var(--color-border)] bg-white px-2 py-1.5 text-sm"
/>
{!isToday && (
<Button size="sm" variant="ghost" onClick={() => setDate(todayStr)}>
Heute
</Button>
)}
</div>
{lanes.length === 0 ? (
<Card.Root>
<Card.Body>
<p className="text-sm text-[var(--color-ink-muted)]">
Keine Zeiterfassung an diesem Tag.
</p>
</Card.Body>
</Card.Root>
) : (
<Card.Root>
<Card.Body className="overflow-x-auto">
<div className="min-w-[640px]">
{/* Stunden-Achse */}
<div className="flex">
<div className="w-40 shrink-0" />
<div className="relative h-5 flex-1">
{hours.map((t) => (
<span
key={t}
className="absolute -translate-x-1/2 text-[10px] text-[var(--color-ink-faint)]"
style={{ left: `${pct(t)}%` }}
>
{pad(new Date(t).getHours())}
</span>
))}
</div>
</div>
{/* Spuren */}
{lanes.map((lane) => {
const { bars, rows } = layout(lane.entries, nowMs);
const laneHeight = rows * BAR_H + (rows - 1) * GAP;
return (
<div
key={lane.userId}
className="flex items-stretch border-t border-[var(--color-border)] py-1.5"
>
<div className="flex w-40 shrink-0 flex-col justify-center pr-2">
<span className="truncate text-sm font-medium">{lane.name}</span>
<span className="text-[10px] text-[var(--color-ink-muted)]">
{bars.length} {bars.length === 1 ? 'Block' : 'Blöcke'}
</span>
</div>
<div className="relative flex-1" style={{ height: laneHeight }}>
{/* Stunden-Gitter */}
{hours.map((t) => (
<div
key={t}
className="absolute top-0 bottom-0 w-px bg-[var(--color-border)]"
style={{ left: `${pct(t)}%` }}
/>
))}
{/* Blöcke */}
{bars.map((b) => {
const left = pct(b.startMs);
const width = Math.max(pct(b.endMs) - left, 0.7);
const dur = formatDurationCompact(Math.round((b.endMs - b.startMs) / 1000));
return (
<div
key={b.id}
title={`${b.label} · ${hhmm(b.startMs)}–${b.running ? 'läuft' : hhmm(b.endMs)} (${dur})`}
className={clsx(
'absolute flex items-center overflow-hidden rounded-[var(--radius-sm)] px-1.5 text-[11px]',
CATEGORY_TINT[b.category] ?? CATEGORY_TINT.other,
b.running && 'ring-2 ring-[var(--color-ampel-red-fg)]',
)}
style={{
left: `${left}%`,
width: `${width}%`,
top: b.row * (BAR_H + GAP),
height: BAR_H,
}}
>
<span className="truncate">{b.label}</span>
</div>
);
})}
</div>
</div>
);
})}
</div>
</Card.Body>
</Card.Root>
)}
{/* Legende */}
<div className="flex flex-wrap gap-x-3 gap-y-1 text-xs text-[var(--color-ink-muted)]">
{TIME_CATEGORIES.map((c) => (
<span key={c.value} className="inline-flex items-center gap-1">
<span className={clsx('h-2.5 w-2.5 rounded-sm', CATEGORY_TINT[c.value])} />
{c.label}
</span>
))}
</div>
</div>
);
}
+6 -6
View File
@@ -8,9 +8,9 @@
font-weight: 300 700; font-weight: 300 700;
font-display: swap; font-display: swap;
src: url(/fonts/space-grotesk-latin.woff2) format('woff2'); src: url(/fonts/space-grotesk-latin.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, unicode-range:
U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329,
U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
} }
@font-face { @font-face {
font-family: 'Space Grotesk'; font-family: 'Space Grotesk';
@@ -18,9 +18,9 @@
font-weight: 300 700; font-weight: 300 700;
font-display: swap; font-display: swap;
src: url(/fonts/space-grotesk-latin-ext.woff2) format('woff2'); src: url(/fonts/space-grotesk-latin-ext.woff2) format('woff2');
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, unicode-range:
U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329,
U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F,
U+A720-A7FF; U+A720-A7FF;
} }
+27
View File
@@ -21,6 +21,33 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
# Backup-Sidecar: täglicher pg_dump des postgres-Service nach cockpit_backups.
# Nutzt scripts/backup.sh (Custom-Format-Dump + Retention + API-Heartbeat),
# getaktet von scripts/backup-loop.sh. Stock postgres-Image → pg_dump passt
# versionsgenau (16) zur DB. Restore: siehe docs/operations.md.
backup:
image: postgres:16-alpine
container_name: cockpit-backup
restart: unless-stopped
depends_on:
postgres:
condition: service_healthy
environment:
POSTGRES_USER: ${POSTGRES_USER:-cockpit}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
POSTGRES_DB: ${POSTGRES_DB:-cockpit}
PGHOST: postgres
API_URL: http://api:3000
CRON_BEARER_TOKEN: ${CRON_BEARER_TOKEN}
BACKUP_HOUR: ${BACKUP_HOUR:-03}
BACKUP_RETENTION_DAYS: ${BACKUP_RETENTION_DAYS:-14}
TZ: Europe/Berlin
volumes:
- cockpit_backups:/backups
- ./scripts/backup.sh:/usr/local/bin/backup.sh:ro
- ./scripts/backup-loop.sh:/usr/local/bin/backup-loop.sh:ro
entrypoint: ['/bin/sh', '/usr/local/bin/backup-loop.sh']
api: api:
build: build:
context: . context: .
+25 -4
View File
@@ -54,14 +54,35 @@ docker compose exec api node -e "import('@cockpit/db/client').then(async ({ crea
## Backups (Story 6.3) ## Backups (Story 6.3)
Tägliches `pg_dump` via Cron-Endpoint `POST /internal/cron/pg-dump-backup` mit Bearer-Token. Tägliches `pg_dump` läuft im **Backup-Sidecar** (`docker-compose.yml` service `backup`):
14 Tage Retention. Restore-Drill quartalsweise. `scripts/backup-loop.sh` triggert `scripts/backup.sh` einmal pro Tag um
`BACKUP_HOUR` (Default 03:00 Europe/Berlin). Dump im **Custom-Format** (`-Fc`,
bereits komprimiert) nach `cockpit_backups:/backups` als `cockpit-<ts>.dump`.
Retention `BACKUP_RETENTION_DAYS` (Default 14). Nach jedem Lauf ein Heartbeat an
`POST /internal/cron/pg-dump-backup` (nur Logging — der Endpoint macht **kein**
Backup). Restore-Drill quartalsweise.
Konfiguration (optional, in `.env.production`): `BACKUP_HOUR`, `BACKUP_RETENTION_DAYS`.
```bash
# Status / letztes Backup ansehen
docker compose logs --tail=20 backup
docker compose exec backup ls -lh /backups
# Sofort ein Backup auslösen (außer der Reihe)
docker compose exec backup /usr/local/bin/backup.sh
```
### Restore-Anleitung ### Restore-Anleitung
1. API stoppen: `docker compose stop api` 1. API stoppen: `docker compose stop api`
2. Backup aus `/backups` auswählen. 2. Backup aus `/backups` auswählen (`docker compose exec postgres ls -lh /backups`).
3. Restore in temporäre DB: `docker compose exec postgres pg_restore -U cockpit -d cockpit_restore /backups/<file>.sql.gz` 3. Restore in temporäre DB:
```bash
docker compose exec postgres createdb -U cockpit cockpit_restore
docker compose exec postgres pg_restore -U cockpit -d cockpit_restore /backups/<file>.dump
```
(In die Produktiv-DB stattdessen mit `--clean --if-exists -d cockpit`.)
4. Smoke-Test: `curl http://localhost:3000/api/health` 4. Smoke-Test: `curl http://localhost:3000/api/health`
5. API wieder starten: `docker compose start api` 5. API wieder starten: `docker compose start api`
@@ -0,0 +1,3 @@
ALTER TABLE "lead" ADD COLUMN "project_id" uuid;--> statement-breakpoint
ALTER TABLE "lead" ADD CONSTRAINT "lead_project_id_project_id_fk" FOREIGN KEY ("project_id") REFERENCES "public"."project"("id") ON DELETE set null ON UPDATE no action;--> statement-breakpoint
CREATE INDEX "idx_lead_project" ON "lead" USING btree ("project_id");
@@ -0,0 +1 @@
ALTER TABLE "todo" ADD COLUMN "unplanned" boolean DEFAULT false NOT NULL;
@@ -0,0 +1,2 @@
DROP INDEX "uniq_time_entry_user_active";--> statement-breakpoint
CREATE INDEX "idx_time_entry_user_active" ON "time_entry" USING btree ("user_id") WHERE "time_entry"."ended_at" IS NULL;
@@ -0,0 +1,3 @@
ALTER TABLE "day_entry" ADD COLUMN "checked_out_at" timestamp with time zone;--> statement-breakpoint
ALTER TABLE "day_entry" ADD COLUMN "kimai_timesheet_id" integer;--> statement-breakpoint
ALTER TABLE "day_entry" ADD COLUMN "kimai_synced" boolean DEFAULT false NOT NULL;
@@ -0,0 +1,4 @@
-- Daten-Migration: ehemalige Pausen entfernen. Das Pause-Feature wurde
-- abgeschafft (Lücken zwischen Tasks = Pause); alte 'break'-Einträge sollen
-- nicht mehr als graue Blöcke in der Timeline erscheinen.
DELETE FROM "time_entry" WHERE "category" = 'break';
@@ -0,0 +1 @@
ALTER TABLE "project" ADD COLUMN "logo_url" text;
@@ -0,0 +1,8 @@
-- Verwaiste Verweise vor dem Setzen der Foreign Keys auf NULL bereinigen — sonst
-- schlaegt ADD CONSTRAINT fehl, falls Altdaten auf geloeschte Zeilen zeigen.
UPDATE "blocker" SET "area_id" = NULL WHERE "area_id" IS NOT NULL AND "area_id" NOT IN (SELECT "id" FROM "area");--> statement-breakpoint
UPDATE "blocker" SET "project_id" = NULL WHERE "project_id" IS NOT NULL AND "project_id" NOT IN (SELECT "id" FROM "project");--> statement-breakpoint
UPDATE "day_entry" SET "blocker_id" = NULL WHERE "blocker_id" IS NOT NULL AND "blocker_id" NOT IN (SELECT "id" FROM "blocker");--> statement-breakpoint
ALTER TABLE "blocker" ADD CONSTRAINT "blocker_area_id_area_id_fk" FOREIGN KEY ("area_id") REFERENCES "public"."area"("id") ON DELETE set null ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "blocker" ADD CONSTRAINT "blocker_project_id_project_id_fk" FOREIGN KEY ("project_id") REFERENCES "public"."project"("id") ON DELETE set null ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "day_entry" ADD CONSTRAINT "day_entry_blocker_id_blocker_id_fk" FOREIGN KEY ("blocker_id") REFERENCES "public"."blocker"("id") ON DELETE set null ON UPDATE no action;
@@ -0,0 +1 @@
ALTER TABLE "project" ADD COLUMN "lessons_learned" jsonb;
@@ -0,0 +1,4 @@
ALTER TABLE "day_entry" ADD COLUMN "auto_checked_in" boolean DEFAULT false NOT NULL;--> statement-breakpoint
UPDATE "day_entry" SET "auto_checked_in" = true
WHERE "checked_in_at" IS NOT NULL
AND ("checked_in_at" AT TIME ZONE 'Europe/Berlin')::time = TIME '06:00:00';
+42 -126
View File
@@ -69,12 +69,8 @@
"name": "absence_day_user_id_user_id_fk", "name": "absence_day_user_id_user_id_fk",
"tableFrom": "absence_day", "tableFrom": "absence_day",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -261,12 +257,8 @@
"name": "audit_event_actor_user_id_user_id_fk", "name": "audit_event_actor_user_id_user_id_fk",
"tableFrom": "audit_event", "tableFrom": "audit_event",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["actor_user_id"],
"actor_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -402,12 +394,8 @@
"name": "blocker_owner_user_id_user_id_fk", "name": "blocker_owner_user_id_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -415,12 +403,8 @@
"name": "blocker_opened_by_user_id_fk", "name": "blocker_opened_by_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["opened_by"],
"opened_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -428,12 +412,8 @@
"name": "blocker_resolved_by_user_id_fk", "name": "blocker_resolved_by_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["resolved_by"],
"resolved_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -517,12 +497,8 @@
"name": "campaign_area_id_area_id_fk", "name": "campaign_area_id_area_id_fk",
"tableFrom": "campaign", "tableFrom": "campaign",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -530,12 +506,8 @@
"name": "campaign_owner_user_id_user_id_fk", "name": "campaign_owner_user_id_user_id_fk",
"tableFrom": "campaign", "tableFrom": "campaign",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -702,12 +674,8 @@
"name": "day_entry_user_id_user_id_fk", "name": "day_entry_user_id_user_id_fk",
"tableFrom": "day_entry", "tableFrom": "day_entry",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -831,12 +799,8 @@
"name": "deal_area_id_area_id_fk", "name": "deal_area_id_area_id_fk",
"tableFrom": "deal", "tableFrom": "deal",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -844,12 +808,8 @@
"name": "deal_owner_user_id_user_id_fk", "name": "deal_owner_user_id_user_id_fk",
"tableFrom": "deal", "tableFrom": "deal",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -933,12 +893,8 @@
"name": "gtm_step_owner_user_id_user_id_fk", "name": "gtm_step_owner_user_id_user_id_fk",
"tableFrom": "gtm_step", "tableFrom": "gtm_step",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -992,12 +948,8 @@
"name": "lead_handover_campaign_id_campaign_id_fk", "name": "lead_handover_campaign_id_campaign_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "campaign", "tableTo": "campaign",
"columnsFrom": [ "columnsFrom": ["campaign_id"],
"campaign_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1005,12 +957,8 @@
"name": "lead_handover_deal_id_deal_id_fk", "name": "lead_handover_deal_id_deal_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "deal", "tableTo": "deal",
"columnsFrom": [ "columnsFrom": ["deal_id"],
"deal_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1018,12 +966,8 @@
"name": "lead_handover_uebergeben_von_user_id_fk", "name": "lead_handover_uebergeben_von_user_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["uebergeben_von"],
"uebergeben_von" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1113,12 +1057,8 @@
"name": "milestone_project_id_project_id_fk", "name": "milestone_project_id_project_id_fk",
"tableFrom": "milestone", "tableFrom": "milestone",
"tableTo": "project", "tableTo": "project",
"columnsFrom": [ "columnsFrom": ["project_id"],
"project_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1309,12 +1249,8 @@
"name": "project_area_id_area_id_fk", "name": "project_area_id_area_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1322,12 +1258,8 @@
"name": "project_verantwortliche_user_id_user_id_fk", "name": "project_verantwortliche_user_id_user_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["verantwortliche_user_id"],
"verantwortliche_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1335,12 +1267,8 @@
"name": "project_created_by_user_id_fk", "name": "project_created_by_user_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["created_by"],
"created_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1431,12 +1359,8 @@
"name": "session_user_id_user_id_fk", "name": "session_user_id_user_id_fk",
"tableFrom": "session", "tableFrom": "session",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1577,12 +1501,8 @@
"name": "todo_day_entry_id_day_entry_id_fk", "name": "todo_day_entry_id_day_entry_id_fk",
"tableFrom": "todo", "tableFrom": "todo",
"tableTo": "day_entry", "tableTo": "day_entry",
"columnsFrom": [ "columnsFrom": ["day_entry_id"],
"day_entry_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1590,12 +1510,8 @@
"name": "todo_user_id_user_id_fk", "name": "todo_user_id_user_id_fk",
"tableFrom": "todo", "tableFrom": "todo",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
+42 -126
View File
@@ -69,12 +69,8 @@
"name": "absence_day_user_id_user_id_fk", "name": "absence_day_user_id_user_id_fk",
"tableFrom": "absence_day", "tableFrom": "absence_day",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -261,12 +257,8 @@
"name": "audit_event_actor_user_id_user_id_fk", "name": "audit_event_actor_user_id_user_id_fk",
"tableFrom": "audit_event", "tableFrom": "audit_event",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["actor_user_id"],
"actor_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -402,12 +394,8 @@
"name": "blocker_owner_user_id_user_id_fk", "name": "blocker_owner_user_id_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -415,12 +403,8 @@
"name": "blocker_opened_by_user_id_fk", "name": "blocker_opened_by_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["opened_by"],
"opened_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -428,12 +412,8 @@
"name": "blocker_resolved_by_user_id_fk", "name": "blocker_resolved_by_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["resolved_by"],
"resolved_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -517,12 +497,8 @@
"name": "campaign_area_id_area_id_fk", "name": "campaign_area_id_area_id_fk",
"tableFrom": "campaign", "tableFrom": "campaign",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -530,12 +506,8 @@
"name": "campaign_owner_user_id_user_id_fk", "name": "campaign_owner_user_id_user_id_fk",
"tableFrom": "campaign", "tableFrom": "campaign",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -702,12 +674,8 @@
"name": "day_entry_user_id_user_id_fk", "name": "day_entry_user_id_user_id_fk",
"tableFrom": "day_entry", "tableFrom": "day_entry",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -831,12 +799,8 @@
"name": "deal_area_id_area_id_fk", "name": "deal_area_id_area_id_fk",
"tableFrom": "deal", "tableFrom": "deal",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -844,12 +808,8 @@
"name": "deal_owner_user_id_user_id_fk", "name": "deal_owner_user_id_user_id_fk",
"tableFrom": "deal", "tableFrom": "deal",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -933,12 +893,8 @@
"name": "gtm_step_owner_user_id_user_id_fk", "name": "gtm_step_owner_user_id_user_id_fk",
"tableFrom": "gtm_step", "tableFrom": "gtm_step",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -992,12 +948,8 @@
"name": "lead_handover_campaign_id_campaign_id_fk", "name": "lead_handover_campaign_id_campaign_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "campaign", "tableTo": "campaign",
"columnsFrom": [ "columnsFrom": ["campaign_id"],
"campaign_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1005,12 +957,8 @@
"name": "lead_handover_deal_id_deal_id_fk", "name": "lead_handover_deal_id_deal_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "deal", "tableTo": "deal",
"columnsFrom": [ "columnsFrom": ["deal_id"],
"deal_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1018,12 +966,8 @@
"name": "lead_handover_uebergeben_von_user_id_fk", "name": "lead_handover_uebergeben_von_user_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["uebergeben_von"],
"uebergeben_von" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1113,12 +1057,8 @@
"name": "milestone_project_id_project_id_fk", "name": "milestone_project_id_project_id_fk",
"tableFrom": "milestone", "tableFrom": "milestone",
"tableTo": "project", "tableTo": "project",
"columnsFrom": [ "columnsFrom": ["project_id"],
"project_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1309,12 +1249,8 @@
"name": "project_area_id_area_id_fk", "name": "project_area_id_area_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1322,12 +1258,8 @@
"name": "project_verantwortliche_user_id_user_id_fk", "name": "project_verantwortliche_user_id_user_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["verantwortliche_user_id"],
"verantwortliche_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1335,12 +1267,8 @@
"name": "project_created_by_user_id_fk", "name": "project_created_by_user_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["created_by"],
"created_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1431,12 +1359,8 @@
"name": "session_user_id_user_id_fk", "name": "session_user_id_user_id_fk",
"tableFrom": "session", "tableFrom": "session",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1611,12 +1535,8 @@
"name": "todo_day_entry_id_day_entry_id_fk", "name": "todo_day_entry_id_day_entry_id_fk",
"tableFrom": "todo", "tableFrom": "todo",
"tableTo": "day_entry", "tableTo": "day_entry",
"columnsFrom": [ "columnsFrom": ["day_entry_id"],
"day_entry_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1624,12 +1544,8 @@
"name": "todo_user_id_user_id_fk", "name": "todo_user_id_user_id_fk",
"tableFrom": "todo", "tableFrom": "todo",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
+48 -144
View File
@@ -69,12 +69,8 @@
"name": "absence_day_user_id_user_id_fk", "name": "absence_day_user_id_user_id_fk",
"tableFrom": "absence_day", "tableFrom": "absence_day",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -261,12 +257,8 @@
"name": "audit_event_actor_user_id_user_id_fk", "name": "audit_event_actor_user_id_user_id_fk",
"tableFrom": "audit_event", "tableFrom": "audit_event",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["actor_user_id"],
"actor_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -402,12 +394,8 @@
"name": "blocker_owner_user_id_user_id_fk", "name": "blocker_owner_user_id_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -415,12 +403,8 @@
"name": "blocker_opened_by_user_id_fk", "name": "blocker_opened_by_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["opened_by"],
"opened_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -428,12 +412,8 @@
"name": "blocker_resolved_by_user_id_fk", "name": "blocker_resolved_by_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["resolved_by"],
"resolved_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -517,12 +497,8 @@
"name": "campaign_area_id_area_id_fk", "name": "campaign_area_id_area_id_fk",
"tableFrom": "campaign", "tableFrom": "campaign",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -530,12 +506,8 @@
"name": "campaign_owner_user_id_user_id_fk", "name": "campaign_owner_user_id_user_id_fk",
"tableFrom": "campaign", "tableFrom": "campaign",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -702,12 +674,8 @@
"name": "day_entry_user_id_user_id_fk", "name": "day_entry_user_id_user_id_fk",
"tableFrom": "day_entry", "tableFrom": "day_entry",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -831,12 +799,8 @@
"name": "deal_area_id_area_id_fk", "name": "deal_area_id_area_id_fk",
"tableFrom": "deal", "tableFrom": "deal",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -844,12 +808,8 @@
"name": "deal_owner_user_id_user_id_fk", "name": "deal_owner_user_id_user_id_fk",
"tableFrom": "deal", "tableFrom": "deal",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -933,12 +893,8 @@
"name": "gtm_step_owner_user_id_user_id_fk", "name": "gtm_step_owner_user_id_user_id_fk",
"tableFrom": "gtm_step", "tableFrom": "gtm_step",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -992,12 +948,8 @@
"name": "lead_handover_campaign_id_campaign_id_fk", "name": "lead_handover_campaign_id_campaign_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "campaign", "tableTo": "campaign",
"columnsFrom": [ "columnsFrom": ["campaign_id"],
"campaign_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1005,12 +957,8 @@
"name": "lead_handover_deal_id_deal_id_fk", "name": "lead_handover_deal_id_deal_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "deal", "tableTo": "deal",
"columnsFrom": [ "columnsFrom": ["deal_id"],
"deal_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1018,12 +966,8 @@
"name": "lead_handover_uebergeben_von_user_id_fk", "name": "lead_handover_uebergeben_von_user_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["uebergeben_von"],
"uebergeben_von" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1113,12 +1057,8 @@
"name": "milestone_project_id_project_id_fk", "name": "milestone_project_id_project_id_fk",
"tableFrom": "milestone", "tableFrom": "milestone",
"tableTo": "project", "tableTo": "project",
"columnsFrom": [ "columnsFrom": ["project_id"],
"project_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1309,12 +1249,8 @@
"name": "project_area_id_area_id_fk", "name": "project_area_id_area_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1322,12 +1258,8 @@
"name": "project_verantwortliche_user_id_user_id_fk", "name": "project_verantwortliche_user_id_user_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["verantwortliche_user_id"],
"verantwortliche_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1335,12 +1267,8 @@
"name": "project_created_by_user_id_fk", "name": "project_created_by_user_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["created_by"],
"created_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1431,12 +1359,8 @@
"name": "session_user_id_user_id_fk", "name": "session_user_id_user_id_fk",
"tableFrom": "session", "tableFrom": "session",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1593,12 +1517,8 @@
"name": "time_entry_user_id_user_id_fk", "name": "time_entry_user_id_user_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1606,12 +1526,8 @@
"name": "time_entry_day_entry_id_day_entry_id_fk", "name": "time_entry_day_entry_id_day_entry_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "day_entry", "tableTo": "day_entry",
"columnsFrom": [ "columnsFrom": ["day_entry_id"],
"day_entry_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1619,12 +1535,8 @@
"name": "time_entry_todo_id_todo_id_fk", "name": "time_entry_todo_id_todo_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "todo", "tableTo": "todo",
"columnsFrom": [ "columnsFrom": ["todo_id"],
"todo_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1799,12 +1711,8 @@
"name": "todo_day_entry_id_day_entry_id_fk", "name": "todo_day_entry_id_day_entry_id_fk",
"tableFrom": "todo", "tableFrom": "todo",
"tableTo": "day_entry", "tableTo": "day_entry",
"columnsFrom": [ "columnsFrom": ["day_entry_id"],
"day_entry_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1812,12 +1720,8 @@
"name": "todo_user_id_user_id_fk", "name": "todo_user_id_user_id_fk",
"tableFrom": "todo", "tableFrom": "todo",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
+48 -144
View File
@@ -69,12 +69,8 @@
"name": "absence_day_user_id_user_id_fk", "name": "absence_day_user_id_user_id_fk",
"tableFrom": "absence_day", "tableFrom": "absence_day",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -261,12 +257,8 @@
"name": "audit_event_actor_user_id_user_id_fk", "name": "audit_event_actor_user_id_user_id_fk",
"tableFrom": "audit_event", "tableFrom": "audit_event",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["actor_user_id"],
"actor_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -402,12 +394,8 @@
"name": "blocker_owner_user_id_user_id_fk", "name": "blocker_owner_user_id_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -415,12 +403,8 @@
"name": "blocker_opened_by_user_id_fk", "name": "blocker_opened_by_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["opened_by"],
"opened_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -428,12 +412,8 @@
"name": "blocker_resolved_by_user_id_fk", "name": "blocker_resolved_by_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["resolved_by"],
"resolved_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -517,12 +497,8 @@
"name": "campaign_area_id_area_id_fk", "name": "campaign_area_id_area_id_fk",
"tableFrom": "campaign", "tableFrom": "campaign",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -530,12 +506,8 @@
"name": "campaign_owner_user_id_user_id_fk", "name": "campaign_owner_user_id_user_id_fk",
"tableFrom": "campaign", "tableFrom": "campaign",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -702,12 +674,8 @@
"name": "day_entry_user_id_user_id_fk", "name": "day_entry_user_id_user_id_fk",
"tableFrom": "day_entry", "tableFrom": "day_entry",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -831,12 +799,8 @@
"name": "deal_area_id_area_id_fk", "name": "deal_area_id_area_id_fk",
"tableFrom": "deal", "tableFrom": "deal",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -844,12 +808,8 @@
"name": "deal_owner_user_id_user_id_fk", "name": "deal_owner_user_id_user_id_fk",
"tableFrom": "deal", "tableFrom": "deal",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -933,12 +893,8 @@
"name": "gtm_step_owner_user_id_user_id_fk", "name": "gtm_step_owner_user_id_user_id_fk",
"tableFrom": "gtm_step", "tableFrom": "gtm_step",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -992,12 +948,8 @@
"name": "lead_handover_campaign_id_campaign_id_fk", "name": "lead_handover_campaign_id_campaign_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "campaign", "tableTo": "campaign",
"columnsFrom": [ "columnsFrom": ["campaign_id"],
"campaign_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1005,12 +957,8 @@
"name": "lead_handover_deal_id_deal_id_fk", "name": "lead_handover_deal_id_deal_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "deal", "tableTo": "deal",
"columnsFrom": [ "columnsFrom": ["deal_id"],
"deal_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1018,12 +966,8 @@
"name": "lead_handover_uebergeben_von_user_id_fk", "name": "lead_handover_uebergeben_von_user_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["uebergeben_von"],
"uebergeben_von" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1113,12 +1057,8 @@
"name": "milestone_project_id_project_id_fk", "name": "milestone_project_id_project_id_fk",
"tableFrom": "milestone", "tableFrom": "milestone",
"tableTo": "project", "tableTo": "project",
"columnsFrom": [ "columnsFrom": ["project_id"],
"project_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1315,12 +1255,8 @@
"name": "project_area_id_area_id_fk", "name": "project_area_id_area_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1328,12 +1264,8 @@
"name": "project_verantwortliche_user_id_user_id_fk", "name": "project_verantwortliche_user_id_user_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["verantwortliche_user_id"],
"verantwortliche_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1341,12 +1273,8 @@
"name": "project_created_by_user_id_fk", "name": "project_created_by_user_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["created_by"],
"created_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1437,12 +1365,8 @@
"name": "session_user_id_user_id_fk", "name": "session_user_id_user_id_fk",
"tableFrom": "session", "tableFrom": "session",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1599,12 +1523,8 @@
"name": "time_entry_user_id_user_id_fk", "name": "time_entry_user_id_user_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1612,12 +1532,8 @@
"name": "time_entry_day_entry_id_day_entry_id_fk", "name": "time_entry_day_entry_id_day_entry_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "day_entry", "tableTo": "day_entry",
"columnsFrom": [ "columnsFrom": ["day_entry_id"],
"day_entry_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1625,12 +1541,8 @@
"name": "time_entry_todo_id_todo_id_fk", "name": "time_entry_todo_id_todo_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "todo", "tableTo": "todo",
"columnsFrom": [ "columnsFrom": ["todo_id"],
"todo_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1805,12 +1717,8 @@
"name": "todo_day_entry_id_day_entry_id_fk", "name": "todo_day_entry_id_day_entry_id_fk",
"tableFrom": "todo", "tableFrom": "todo",
"tableTo": "day_entry", "tableTo": "day_entry",
"columnsFrom": [ "columnsFrom": ["day_entry_id"],
"day_entry_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1818,12 +1726,8 @@
"name": "todo_user_id_user_id_fk", "name": "todo_user_id_user_id_fk",
"tableFrom": "todo", "tableFrom": "todo",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
+62 -186
View File
@@ -69,12 +69,8 @@
"name": "absence_day_user_id_user_id_fk", "name": "absence_day_user_id_user_id_fk",
"tableFrom": "absence_day", "tableFrom": "absence_day",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -261,12 +257,8 @@
"name": "audit_event_actor_user_id_user_id_fk", "name": "audit_event_actor_user_id_user_id_fk",
"tableFrom": "audit_event", "tableFrom": "audit_event",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["actor_user_id"],
"actor_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -402,12 +394,8 @@
"name": "blocker_owner_user_id_user_id_fk", "name": "blocker_owner_user_id_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -415,12 +403,8 @@
"name": "blocker_opened_by_user_id_fk", "name": "blocker_opened_by_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["opened_by"],
"opened_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -428,12 +412,8 @@
"name": "blocker_resolved_by_user_id_fk", "name": "blocker_resolved_by_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["resolved_by"],
"resolved_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -517,12 +497,8 @@
"name": "campaign_area_id_area_id_fk", "name": "campaign_area_id_area_id_fk",
"tableFrom": "campaign", "tableFrom": "campaign",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -530,12 +506,8 @@
"name": "campaign_owner_user_id_user_id_fk", "name": "campaign_owner_user_id_user_id_fk",
"tableFrom": "campaign", "tableFrom": "campaign",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -702,12 +674,8 @@
"name": "day_entry_user_id_user_id_fk", "name": "day_entry_user_id_user_id_fk",
"tableFrom": "day_entry", "tableFrom": "day_entry",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -831,12 +799,8 @@
"name": "deal_area_id_area_id_fk", "name": "deal_area_id_area_id_fk",
"tableFrom": "deal", "tableFrom": "deal",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -844,12 +808,8 @@
"name": "deal_owner_user_id_user_id_fk", "name": "deal_owner_user_id_user_id_fk",
"tableFrom": "deal", "tableFrom": "deal",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -933,12 +893,8 @@
"name": "gtm_step_owner_user_id_user_id_fk", "name": "gtm_step_owner_user_id_user_id_fk",
"tableFrom": "gtm_step", "tableFrom": "gtm_step",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1256,12 +1212,8 @@
"name": "lead_area_id_area_id_fk", "name": "lead_area_id_area_id_fk",
"tableFrom": "lead", "tableFrom": "lead",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1269,12 +1221,8 @@
"name": "lead_owner_user_id_user_id_fk", "name": "lead_owner_user_id_user_id_fk",
"tableFrom": "lead", "tableFrom": "lead",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1282,12 +1230,8 @@
"name": "lead_promoted_deal_id_deal_id_fk", "name": "lead_promoted_deal_id_deal_id_fk",
"tableFrom": "lead", "tableFrom": "lead",
"tableTo": "deal", "tableTo": "deal",
"columnsFrom": [ "columnsFrom": ["promoted_deal_id"],
"promoted_deal_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1295,12 +1239,8 @@
"name": "lead_created_by_user_id_fk", "name": "lead_created_by_user_id_fk",
"tableFrom": "lead", "tableFrom": "lead",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["created_by"],
"created_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1420,12 +1360,8 @@
"name": "lead_contact_lead_id_lead_id_fk", "name": "lead_contact_lead_id_lead_id_fk",
"tableFrom": "lead_contact", "tableFrom": "lead_contact",
"tableTo": "lead", "tableTo": "lead",
"columnsFrom": [ "columnsFrom": ["lead_id"],
"lead_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1479,12 +1415,8 @@
"name": "lead_handover_campaign_id_campaign_id_fk", "name": "lead_handover_campaign_id_campaign_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "campaign", "tableTo": "campaign",
"columnsFrom": [ "columnsFrom": ["campaign_id"],
"campaign_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1492,12 +1424,8 @@
"name": "lead_handover_deal_id_deal_id_fk", "name": "lead_handover_deal_id_deal_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "deal", "tableTo": "deal",
"columnsFrom": [ "columnsFrom": ["deal_id"],
"deal_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1505,12 +1433,8 @@
"name": "lead_handover_uebergeben_von_user_id_fk", "name": "lead_handover_uebergeben_von_user_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["uebergeben_von"],
"uebergeben_von" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1619,12 +1543,8 @@
"name": "lead_touchpoint_lead_id_lead_id_fk", "name": "lead_touchpoint_lead_id_lead_id_fk",
"tableFrom": "lead_touchpoint", "tableFrom": "lead_touchpoint",
"tableTo": "lead", "tableTo": "lead",
"columnsFrom": [ "columnsFrom": ["lead_id"],
"lead_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1632,12 +1552,8 @@
"name": "lead_touchpoint_bearbeiter_user_id_user_id_fk", "name": "lead_touchpoint_bearbeiter_user_id_user_id_fk",
"tableFrom": "lead_touchpoint", "tableFrom": "lead_touchpoint",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["bearbeiter_user_id"],
"bearbeiter_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1727,12 +1643,8 @@
"name": "milestone_project_id_project_id_fk", "name": "milestone_project_id_project_id_fk",
"tableFrom": "milestone", "tableFrom": "milestone",
"tableTo": "project", "tableTo": "project",
"columnsFrom": [ "columnsFrom": ["project_id"],
"project_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1929,12 +1841,8 @@
"name": "project_area_id_area_id_fk", "name": "project_area_id_area_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1942,12 +1850,8 @@
"name": "project_verantwortliche_user_id_user_id_fk", "name": "project_verantwortliche_user_id_user_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["verantwortliche_user_id"],
"verantwortliche_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1955,12 +1859,8 @@
"name": "project_created_by_user_id_fk", "name": "project_created_by_user_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["created_by"],
"created_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -2051,12 +1951,8 @@
"name": "session_user_id_user_id_fk", "name": "session_user_id_user_id_fk",
"tableFrom": "session", "tableFrom": "session",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -2213,12 +2109,8 @@
"name": "time_entry_user_id_user_id_fk", "name": "time_entry_user_id_user_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -2226,12 +2118,8 @@
"name": "time_entry_day_entry_id_day_entry_id_fk", "name": "time_entry_day_entry_id_day_entry_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "day_entry", "tableTo": "day_entry",
"columnsFrom": [ "columnsFrom": ["day_entry_id"],
"day_entry_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -2239,12 +2127,8 @@
"name": "time_entry_todo_id_todo_id_fk", "name": "time_entry_todo_id_todo_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "todo", "tableTo": "todo",
"columnsFrom": [ "columnsFrom": ["todo_id"],
"todo_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -2419,12 +2303,8 @@
"name": "todo_day_entry_id_day_entry_id_fk", "name": "todo_day_entry_id_day_entry_id_fk",
"tableFrom": "todo", "tableFrom": "todo",
"tableTo": "day_entry", "tableTo": "day_entry",
"columnsFrom": [ "columnsFrom": ["day_entry_id"],
"day_entry_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -2432,12 +2312,8 @@
"name": "todo_user_id_user_id_fk", "name": "todo_user_id_user_id_fk",
"tableFrom": "todo", "tableFrom": "todo",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
+68 -204
View File
@@ -69,12 +69,8 @@
"name": "absence_day_user_id_user_id_fk", "name": "absence_day_user_id_user_id_fk",
"tableFrom": "absence_day", "tableFrom": "absence_day",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -261,12 +257,8 @@
"name": "audit_event_actor_user_id_user_id_fk", "name": "audit_event_actor_user_id_user_id_fk",
"tableFrom": "audit_event", "tableFrom": "audit_event",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["actor_user_id"],
"actor_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -402,12 +394,8 @@
"name": "blocker_owner_user_id_user_id_fk", "name": "blocker_owner_user_id_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -415,12 +403,8 @@
"name": "blocker_opened_by_user_id_fk", "name": "blocker_opened_by_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["opened_by"],
"opened_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -428,12 +412,8 @@
"name": "blocker_resolved_by_user_id_fk", "name": "blocker_resolved_by_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["resolved_by"],
"resolved_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -517,12 +497,8 @@
"name": "campaign_area_id_area_id_fk", "name": "campaign_area_id_area_id_fk",
"tableFrom": "campaign", "tableFrom": "campaign",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -530,12 +506,8 @@
"name": "campaign_owner_user_id_user_id_fk", "name": "campaign_owner_user_id_user_id_fk",
"tableFrom": "campaign", "tableFrom": "campaign",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -702,12 +674,8 @@
"name": "day_entry_user_id_user_id_fk", "name": "day_entry_user_id_user_id_fk",
"tableFrom": "day_entry", "tableFrom": "day_entry",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -831,12 +799,8 @@
"name": "deal_area_id_area_id_fk", "name": "deal_area_id_area_id_fk",
"tableFrom": "deal", "tableFrom": "deal",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -844,12 +808,8 @@
"name": "deal_owner_user_id_user_id_fk", "name": "deal_owner_user_id_user_id_fk",
"tableFrom": "deal", "tableFrom": "deal",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -933,12 +893,8 @@
"name": "gtm_step_owner_user_id_user_id_fk", "name": "gtm_step_owner_user_id_user_id_fk",
"tableFrom": "gtm_step", "tableFrom": "gtm_step",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1256,12 +1212,8 @@
"name": "lead_area_id_area_id_fk", "name": "lead_area_id_area_id_fk",
"tableFrom": "lead", "tableFrom": "lead",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1269,12 +1221,8 @@
"name": "lead_owner_user_id_user_id_fk", "name": "lead_owner_user_id_user_id_fk",
"tableFrom": "lead", "tableFrom": "lead",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1282,12 +1230,8 @@
"name": "lead_promoted_deal_id_deal_id_fk", "name": "lead_promoted_deal_id_deal_id_fk",
"tableFrom": "lead", "tableFrom": "lead",
"tableTo": "deal", "tableTo": "deal",
"columnsFrom": [ "columnsFrom": ["promoted_deal_id"],
"promoted_deal_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1295,12 +1239,8 @@
"name": "lead_created_by_user_id_fk", "name": "lead_created_by_user_id_fk",
"tableFrom": "lead", "tableFrom": "lead",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["created_by"],
"created_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1420,12 +1360,8 @@
"name": "lead_contact_lead_id_lead_id_fk", "name": "lead_contact_lead_id_lead_id_fk",
"tableFrom": "lead_contact", "tableFrom": "lead_contact",
"tableTo": "lead", "tableTo": "lead",
"columnsFrom": [ "columnsFrom": ["lead_id"],
"lead_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1479,12 +1415,8 @@
"name": "lead_handover_campaign_id_campaign_id_fk", "name": "lead_handover_campaign_id_campaign_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "campaign", "tableTo": "campaign",
"columnsFrom": [ "columnsFrom": ["campaign_id"],
"campaign_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1492,12 +1424,8 @@
"name": "lead_handover_deal_id_deal_id_fk", "name": "lead_handover_deal_id_deal_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "deal", "tableTo": "deal",
"columnsFrom": [ "columnsFrom": ["deal_id"],
"deal_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1505,12 +1433,8 @@
"name": "lead_handover_uebergeben_von_user_id_fk", "name": "lead_handover_uebergeben_von_user_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["uebergeben_von"],
"uebergeben_von" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1619,12 +1543,8 @@
"name": "lead_touchpoint_lead_id_lead_id_fk", "name": "lead_touchpoint_lead_id_lead_id_fk",
"tableFrom": "lead_touchpoint", "tableFrom": "lead_touchpoint",
"tableTo": "lead", "tableTo": "lead",
"columnsFrom": [ "columnsFrom": ["lead_id"],
"lead_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1632,12 +1552,8 @@
"name": "lead_touchpoint_bearbeiter_user_id_user_id_fk", "name": "lead_touchpoint_bearbeiter_user_id_user_id_fk",
"tableFrom": "lead_touchpoint", "tableFrom": "lead_touchpoint",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["bearbeiter_user_id"],
"bearbeiter_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1739,12 +1655,8 @@
"name": "milestone_project_id_project_id_fk", "name": "milestone_project_id_project_id_fk",
"tableFrom": "milestone", "tableFrom": "milestone",
"tableTo": "project", "tableTo": "project",
"columnsFrom": [ "columnsFrom": ["project_id"],
"project_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1954,12 +1866,8 @@
"name": "project_area_id_area_id_fk", "name": "project_area_id_area_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1967,12 +1875,8 @@
"name": "project_verantwortliche_user_id_user_id_fk", "name": "project_verantwortliche_user_id_user_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["verantwortliche_user_id"],
"verantwortliche_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1980,12 +1884,8 @@
"name": "project_created_by_user_id_fk", "name": "project_created_by_user_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["created_by"],
"created_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -2124,12 +2024,8 @@
"name": "risk_project_id_project_id_fk", "name": "risk_project_id_project_id_fk",
"tableFrom": "risk", "tableFrom": "risk",
"tableTo": "project", "tableTo": "project",
"columnsFrom": [ "columnsFrom": ["project_id"],
"project_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -2137,12 +2033,8 @@
"name": "risk_created_by_user_id_fk", "name": "risk_created_by_user_id_fk",
"tableFrom": "risk", "tableFrom": "risk",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["created_by"],
"created_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -2233,12 +2125,8 @@
"name": "session_user_id_user_id_fk", "name": "session_user_id_user_id_fk",
"tableFrom": "session", "tableFrom": "session",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -2348,12 +2236,8 @@
"name": "stakeholder_project_id_project_id_fk", "name": "stakeholder_project_id_project_id_fk",
"tableFrom": "stakeholder", "tableFrom": "stakeholder",
"tableTo": "project", "tableTo": "project",
"columnsFrom": [ "columnsFrom": ["project_id"],
"project_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -2510,12 +2394,8 @@
"name": "time_entry_user_id_user_id_fk", "name": "time_entry_user_id_user_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -2523,12 +2403,8 @@
"name": "time_entry_day_entry_id_day_entry_id_fk", "name": "time_entry_day_entry_id_day_entry_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "day_entry", "tableTo": "day_entry",
"columnsFrom": [ "columnsFrom": ["day_entry_id"],
"day_entry_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -2536,12 +2412,8 @@
"name": "time_entry_todo_id_todo_id_fk", "name": "time_entry_todo_id_todo_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "todo", "tableTo": "todo",
"columnsFrom": [ "columnsFrom": ["todo_id"],
"todo_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -2716,12 +2588,8 @@
"name": "todo_day_entry_id_day_entry_id_fk", "name": "todo_day_entry_id_day_entry_id_fk",
"tableFrom": "todo", "tableFrom": "todo",
"tableTo": "day_entry", "tableTo": "day_entry",
"columnsFrom": [ "columnsFrom": ["day_entry_id"],
"day_entry_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -2729,12 +2597,8 @@
"name": "todo_user_id_user_id_fk", "name": "todo_user_id_user_id_fk",
"tableFrom": "todo", "tableFrom": "todo",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
+82 -246
View File
@@ -69,12 +69,8 @@
"name": "absence_day_user_id_user_id_fk", "name": "absence_day_user_id_user_id_fk",
"tableFrom": "absence_day", "tableFrom": "absence_day",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -261,12 +257,8 @@
"name": "audit_event_actor_user_id_user_id_fk", "name": "audit_event_actor_user_id_user_id_fk",
"tableFrom": "audit_event", "tableFrom": "audit_event",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["actor_user_id"],
"actor_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -402,12 +394,8 @@
"name": "blocker_owner_user_id_user_id_fk", "name": "blocker_owner_user_id_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -415,12 +403,8 @@
"name": "blocker_opened_by_user_id_fk", "name": "blocker_opened_by_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["opened_by"],
"opened_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -428,12 +412,8 @@
"name": "blocker_resolved_by_user_id_fk", "name": "blocker_resolved_by_user_id_fk",
"tableFrom": "blocker", "tableFrom": "blocker",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["resolved_by"],
"resolved_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -517,12 +497,8 @@
"name": "campaign_area_id_area_id_fk", "name": "campaign_area_id_area_id_fk",
"tableFrom": "campaign", "tableFrom": "campaign",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -530,12 +506,8 @@
"name": "campaign_owner_user_id_user_id_fk", "name": "campaign_owner_user_id_user_id_fk",
"tableFrom": "campaign", "tableFrom": "campaign",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -618,12 +590,8 @@
"name": "change_entry_project_id_project_id_fk", "name": "change_entry_project_id_project_id_fk",
"tableFrom": "change_entry", "tableFrom": "change_entry",
"tableTo": "project", "tableTo": "project",
"columnsFrom": [ "columnsFrom": ["project_id"],
"project_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -631,12 +599,8 @@
"name": "change_entry_created_by_user_id_fk", "name": "change_entry_created_by_user_id_fk",
"tableFrom": "change_entry", "tableFrom": "change_entry",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["created_by"],
"created_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -803,12 +767,8 @@
"name": "day_entry_user_id_user_id_fk", "name": "day_entry_user_id_user_id_fk",
"tableFrom": "day_entry", "tableFrom": "day_entry",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -932,12 +892,8 @@
"name": "deal_area_id_area_id_fk", "name": "deal_area_id_area_id_fk",
"tableFrom": "deal", "tableFrom": "deal",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -945,12 +901,8 @@
"name": "deal_owner_user_id_user_id_fk", "name": "deal_owner_user_id_user_id_fk",
"tableFrom": "deal", "tableFrom": "deal",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1034,12 +986,8 @@
"name": "gtm_step_owner_user_id_user_id_fk", "name": "gtm_step_owner_user_id_user_id_fk",
"tableFrom": "gtm_step", "tableFrom": "gtm_step",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1357,12 +1305,8 @@
"name": "lead_area_id_area_id_fk", "name": "lead_area_id_area_id_fk",
"tableFrom": "lead", "tableFrom": "lead",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1370,12 +1314,8 @@
"name": "lead_owner_user_id_user_id_fk", "name": "lead_owner_user_id_user_id_fk",
"tableFrom": "lead", "tableFrom": "lead",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1383,12 +1323,8 @@
"name": "lead_promoted_deal_id_deal_id_fk", "name": "lead_promoted_deal_id_deal_id_fk",
"tableFrom": "lead", "tableFrom": "lead",
"tableTo": "deal", "tableTo": "deal",
"columnsFrom": [ "columnsFrom": ["promoted_deal_id"],
"promoted_deal_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1396,12 +1332,8 @@
"name": "lead_created_by_user_id_fk", "name": "lead_created_by_user_id_fk",
"tableFrom": "lead", "tableFrom": "lead",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["created_by"],
"created_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1521,12 +1453,8 @@
"name": "lead_contact_lead_id_lead_id_fk", "name": "lead_contact_lead_id_lead_id_fk",
"tableFrom": "lead_contact", "tableFrom": "lead_contact",
"tableTo": "lead", "tableTo": "lead",
"columnsFrom": [ "columnsFrom": ["lead_id"],
"lead_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1580,12 +1508,8 @@
"name": "lead_handover_campaign_id_campaign_id_fk", "name": "lead_handover_campaign_id_campaign_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "campaign", "tableTo": "campaign",
"columnsFrom": [ "columnsFrom": ["campaign_id"],
"campaign_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1593,12 +1517,8 @@
"name": "lead_handover_deal_id_deal_id_fk", "name": "lead_handover_deal_id_deal_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "deal", "tableTo": "deal",
"columnsFrom": [ "columnsFrom": ["deal_id"],
"deal_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1606,12 +1526,8 @@
"name": "lead_handover_uebergeben_von_user_id_fk", "name": "lead_handover_uebergeben_von_user_id_fk",
"tableFrom": "lead_handover", "tableFrom": "lead_handover",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["uebergeben_von"],
"uebergeben_von" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1720,12 +1636,8 @@
"name": "lead_touchpoint_lead_id_lead_id_fk", "name": "lead_touchpoint_lead_id_lead_id_fk",
"tableFrom": "lead_touchpoint", "tableFrom": "lead_touchpoint",
"tableTo": "lead", "tableTo": "lead",
"columnsFrom": [ "columnsFrom": ["lead_id"],
"lead_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1733,12 +1645,8 @@
"name": "lead_touchpoint_bearbeiter_user_id_user_id_fk", "name": "lead_touchpoint_bearbeiter_user_id_user_id_fk",
"tableFrom": "lead_touchpoint", "tableFrom": "lead_touchpoint",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["bearbeiter_user_id"],
"bearbeiter_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1840,12 +1748,8 @@
"name": "milestone_project_id_project_id_fk", "name": "milestone_project_id_project_id_fk",
"tableFrom": "milestone", "tableFrom": "milestone",
"tableTo": "project", "tableTo": "project",
"columnsFrom": [ "columnsFrom": ["project_id"],
"project_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -1927,12 +1831,8 @@
"name": "phase_gate_project_id_project_id_fk", "name": "phase_gate_project_id_project_id_fk",
"tableFrom": "phase_gate", "tableFrom": "phase_gate",
"tableTo": "project", "tableTo": "project",
"columnsFrom": [ "columnsFrom": ["project_id"],
"project_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -1940,12 +1840,8 @@
"name": "phase_gate_reviewed_by_user_id_fk", "name": "phase_gate_reviewed_by_user_id_fk",
"tableFrom": "phase_gate", "tableFrom": "phase_gate",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["reviewed_by"],
"reviewed_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -2192,12 +2088,8 @@
"name": "project_area_id_area_id_fk", "name": "project_area_id_area_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "area", "tableTo": "area",
"columnsFrom": [ "columnsFrom": ["area_id"],
"area_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "restrict", "onDelete": "restrict",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -2205,12 +2097,8 @@
"name": "project_verantwortliche_user_id_user_id_fk", "name": "project_verantwortliche_user_id_user_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["verantwortliche_user_id"],
"verantwortliche_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -2218,12 +2106,8 @@
"name": "project_created_by_user_id_fk", "name": "project_created_by_user_id_fk",
"tableFrom": "project", "tableFrom": "project",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["created_by"],
"created_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -2312,12 +2196,8 @@
"name": "project_status_project_id_project_id_fk", "name": "project_status_project_id_project_id_fk",
"tableFrom": "project_status", "tableFrom": "project_status",
"tableTo": "project", "tableTo": "project",
"columnsFrom": [ "columnsFrom": ["project_id"],
"project_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -2325,12 +2205,8 @@
"name": "project_status_created_by_user_id_fk", "name": "project_status_created_by_user_id_fk",
"tableFrom": "project_status", "tableFrom": "project_status",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["created_by"],
"created_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -2481,12 +2357,8 @@
"name": "risk_project_id_project_id_fk", "name": "risk_project_id_project_id_fk",
"tableFrom": "risk", "tableFrom": "risk",
"tableTo": "project", "tableTo": "project",
"columnsFrom": [ "columnsFrom": ["project_id"],
"project_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -2494,12 +2366,8 @@
"name": "risk_owner_user_id_user_id_fk", "name": "risk_owner_user_id_user_id_fk",
"tableFrom": "risk", "tableFrom": "risk",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["owner_user_id"],
"owner_user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -2507,12 +2375,8 @@
"name": "risk_created_by_user_id_fk", "name": "risk_created_by_user_id_fk",
"tableFrom": "risk", "tableFrom": "risk",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["created_by"],
"created_by" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -2603,12 +2467,8 @@
"name": "session_user_id_user_id_fk", "name": "session_user_id_user_id_fk",
"tableFrom": "session", "tableFrom": "session",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -2718,12 +2578,8 @@
"name": "stakeholder_project_id_project_id_fk", "name": "stakeholder_project_id_project_id_fk",
"tableFrom": "stakeholder", "tableFrom": "stakeholder",
"tableTo": "project", "tableTo": "project",
"columnsFrom": [ "columnsFrom": ["project_id"],
"project_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -2880,12 +2736,8 @@
"name": "time_entry_user_id_user_id_fk", "name": "time_entry_user_id_user_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -2893,12 +2745,8 @@
"name": "time_entry_day_entry_id_day_entry_id_fk", "name": "time_entry_day_entry_id_day_entry_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "day_entry", "tableTo": "day_entry",
"columnsFrom": [ "columnsFrom": ["day_entry_id"],
"day_entry_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -2906,12 +2754,8 @@
"name": "time_entry_todo_id_todo_id_fk", "name": "time_entry_todo_id_todo_id_fk",
"tableFrom": "time_entry", "tableFrom": "time_entry",
"tableTo": "todo", "tableTo": "todo",
"columnsFrom": [ "columnsFrom": ["todo_id"],
"todo_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "set null", "onDelete": "set null",
"onUpdate": "no action" "onUpdate": "no action"
} }
@@ -3086,12 +2930,8 @@
"name": "todo_day_entry_id_day_entry_id_fk", "name": "todo_day_entry_id_day_entry_id_fk",
"tableFrom": "todo", "tableFrom": "todo",
"tableTo": "day_entry", "tableTo": "day_entry",
"columnsFrom": [ "columnsFrom": ["day_entry_id"],
"day_entry_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
}, },
@@ -3099,12 +2939,8 @@
"name": "todo_user_id_user_id_fk", "name": "todo_user_id_user_id_fk",
"tableFrom": "todo", "tableFrom": "todo",
"tableTo": "user", "tableTo": "user",
"columnsFrom": [ "columnsFrom": ["user_id"],
"user_id" "columnsTo": ["id"],
],
"columnsTo": [
"id"
],
"onDelete": "cascade", "onDelete": "cascade",
"onUpdate": "no action" "onUpdate": "no action"
} }
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
+63
View File
@@ -78,6 +78,69 @@
"when": 1780672129310, "when": 1780672129310,
"tag": "0010_leitfaden_phases", "tag": "0010_leitfaden_phases",
"breakpoints": true "breakpoints": true
},
{
"idx": 11,
"version": "7",
"when": 1780754557002,
"tag": "0011_lead_project_link",
"breakpoints": true
},
{
"idx": 12,
"version": "7",
"when": 1780761840614,
"tag": "0012_todo_unplanned",
"breakpoints": true
},
{
"idx": 13,
"version": "7",
"when": 1780763141548,
"tag": "0013_parallel_timers",
"breakpoints": true
},
{
"idx": 14,
"version": "7",
"when": 1780764129593,
"tag": "0014_checkout_kimai",
"breakpoints": true
},
{
"idx": 15,
"version": "7",
"when": 1780765384409,
"tag": "0015_delete_break_entries",
"breakpoints": true
},
{
"idx": 16,
"version": "7",
"when": 1780771242601,
"tag": "0016_project_logo_url",
"breakpoints": true
},
{
"idx": 17,
"version": "7",
"when": 1780826387755,
"tag": "0017_rare_oracle",
"breakpoints": true
},
{
"idx": 18,
"version": "7",
"when": 1780828837324,
"tag": "0018_last_lake",
"breakpoints": true
},
{
"idx": 19,
"version": "7",
"when": 1781259091924,
"tag": "0019_shocking_starbolt",
"breakpoints": true
} }
] ]
} }
+27
View File
@@ -0,0 +1,27 @@
import { drizzle } from 'drizzle-orm/node-postgres';
import pg from 'pg';
import { area } from './schema.js';
// Fachliche Basis-Bereiche — Referenzdaten, die jede Instanz braucht (auch Prod,
// die nicht geseedet wird). Werden idempotent beim API-Start sichergestellt.
export const BASE_AREAS = [
{ slug: 'entwicklung', name: 'Entwicklung', kind: 'dev' as const, order: 1 },
{ slug: 'vertrieb', name: 'Vertrieb', kind: 'sales' as const, order: 2 },
{ slug: 'marketing', name: 'Marketing', kind: 'marketing' as const, order: 3 },
{ slug: 'allgemein', name: 'Allgemein', kind: 'allgemein' as const, order: 99 },
];
/**
* Legt die Basis-Bereiche an, falls sie fehlen. Idempotent (ON CONFLICT DO
* NOTHING auf slug). Wird beim API-Start nach den Migrationen aufgerufen, damit
* z. B. der „Neues Projekt"-Bereich-Dropdown nie leer ist.
*/
export async function ensureBaseAreas(connectionString: string): Promise<void> {
const pool = new pg.Pool({ connectionString, max: 1 });
try {
const db = drizzle(pool);
await db.insert(area).values(BASE_AREAS).onConflictDoNothing();
} finally {
await pool.end();
}
}
+2
View File
@@ -1,5 +1,7 @@
export * from './schema.js'; export * from './schema.js';
export { createDbClient } from './client.js'; export { createDbClient } from './client.js';
export { runMigrations } from './migrate.js';
export { ensureBaseAreas, BASE_AREAS } from './base-data.js';
export type { Db, CreateDbClientOptions } from './client.js'; export type { Db, CreateDbClientOptions } from './client.js';
export const DB_VERSION = '0.0.1'; export const DB_VERSION = '0.0.1';
+31
View File
@@ -0,0 +1,31 @@
import { drizzle } from 'drizzle-orm/node-postgres';
import { migrate } from 'drizzle-orm/node-postgres/migrator';
import pg from 'pg';
import { fileURLToPath } from 'node:url';
import path from 'node:path';
/**
* Wendet alle ausstehenden Drizzle-Migrationen aus `packages/db/migrations` an.
* Idempotent: Drizzle führt Buch über bereits eingespielte Migrationen in
* `__drizzle_migrations` und überspringt sie. Wird beim API-Start aufgerufen,
* damit ein Deploy automatisch das Schema aktualisiert.
*
* Der Migrations-Ordner liegt eine Ebene über dieser Datei — funktioniert
* sowohl für die kompilierte Variante (`dist/migrate.js` → `../migrations`)
* als auch im Dev-Modus (`src/migrate.ts` → `../migrations`).
*/
export async function runMigrations(connectionString: string): Promise<void> {
const migrationsFolder = path.resolve(
path.dirname(fileURLToPath(import.meta.url)),
'..',
'migrations',
);
const pool = new pg.Pool({ connectionString, max: 1 });
try {
const db = drizzle(pool);
await migrate(db, { migrationsFolder });
} finally {
await pool.end();
}
}
+44 -12
View File
@@ -125,7 +125,9 @@ export const project = pgTable(
.references(() => area.id, { onDelete: 'restrict' }), .references(() => area.id, { onDelete: 'restrict' }),
name: text('name').notNull(), name: text('name').notNull(),
description: text('description'), description: text('description'),
// Maxime / roter Faden (ein Satz) — Leitsatz fürs ganze Team (Buch Kap. 4 Strategie). // Quadratisches Projektlogo als Data-URL (client-seitig auf 256px verkleinert).
logoUrl: text('logo_url'),
// Maxime / roter Faden (ein Satz) — Leitsatz fürs ganze Team (Leitfaden: Strategie).
maxime: text('maxime'), maxime: text('maxime'),
// Definition (Leitfaden Phase 1) — Kurzfassung; Volltext-Steckbrief lebt in Outline. // Definition (Leitfaden Phase 1) — Kurzfassung; Volltext-Steckbrief lebt in Outline.
ziel: text('ziel'), // SMART formuliert ziel: text('ziel'), // SMART formuliert
@@ -138,7 +140,7 @@ export const project = pgTable(
onDelete: 'set null', onDelete: 'set null',
}), }),
arbeitsmodus: text('arbeitsmodus', { enum: ['cycle', 'kanban'] }), arbeitsmodus: text('arbeitsmodus', { enum: ['cycle', 'kanban'] }),
// Projekt-Modus / Intensität — muss laut Buch jederzeit ans Team kommuniziert sein. // Projekt-Modus / Intensität — muss laut Leitfaden jederzeit ans Team kommuniziert sein.
modus: text('modus', { enum: ['relax', 'standard', 'eskalation', 'taskforce'] }) modus: text('modus', { enum: ['relax', 'standard', 'eskalation', 'taskforce'] })
.notNull() .notNull()
.default('standard'), .default('standard'),
@@ -164,6 +166,14 @@ export const project = pgTable(
lessonsLearnedUrl: text('lessons_learned_url'), lessonsLearnedUrl: text('lessons_learned_url'),
// Abschluss (Leitfaden Phase 4): kurzer Abschlussvermerk — Ziel erreicht? Aufwand vs. Plan? // Abschluss (Leitfaden Phase 4): kurzer Abschlussvermerk — Ziel erreicht? Aufwand vs. Plan?
abschlussvermerk: text('abschlussvermerk'), abschlussvermerk: text('abschlussvermerk'),
// Strukturierte Retrospektive (Lessons-Learned-Vorlage). Ersetzt die freie
// Vermerk-Textarea durch geführte Felder; alte Einträge nutzen abschlussvermerk.
lessonsLearned: jsonb('lessons_learned').$type<{
zielErreicht: string;
aufwand: string;
liefGut: string;
liefSchlecht: string;
} | null>(),
createdBy: uuid('created_by').references(() => user.id, { onDelete: 'set null' }), createdBy: uuid('created_by').references(() => user.id, { onDelete: 'set null' }),
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(), createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
updatedAt: timestamp('updated_at', { withTimezone: true }).notNull().defaultNow(), updatedAt: timestamp('updated_at', { withTimezone: true }).notNull().defaultNow(),
@@ -192,7 +202,7 @@ export const milestone = pgTable(
.notNull() .notNull()
.default('open'), .default('open'),
description: text('description'), description: text('description'),
// Ergebnis-Übersicht („Patchnotes") + konkreter Kundennutzen je Meilenstein (Buch Kap. 4). // Ergebnis-Übersicht („Patchnotes") + konkreter Kundennutzen je Meilenstein (Leitfaden).
ergebnis: text('ergebnis'), ergebnis: text('ergebnis'),
kundennutzen: text('kundennutzen'), kundennutzen: text('kundennutzen'),
order: integer('order').notNull().default(0), order: integer('order').notNull().default(0),
@@ -219,12 +229,20 @@ export const dayEntry = pgTable(
date: date('date').notNull(), // YYYY-MM-DD im Europe/Berlin date: date('date').notNull(), // YYYY-MM-DD im Europe/Berlin
status: text('status', { enum: ['begun', 'full', 'absent'] }).notNull(), status: text('status', { enum: ['begun', 'full', 'absent'] }).notNull(),
checkedInAt: timestamp('checked_in_at', { withTimezone: true }), checkedInAt: timestamp('checked_in_at', { withTimezone: true }),
// True, wenn der Eintrag vom 6-Uhr-Schnitt automatisch angelegt wurde (kein
// echter Lock-in um 06:00) — Anwesenheits-Anzeigen ignorieren solche Check-ins.
autoCheckedIn: boolean('auto_checked_in').notNull().default(false),
// Arbeitsende (Check-Out) — markiert das Ende der Arbeits-Session des Tages.
checkedOutAt: timestamp('checked_out_at', { withTimezone: true }),
// Kimai-Sync: ID des bei Check-In gestarteten Timesheets + Sync-Status.
kimaiTimesheetId: integer('kimai_timesheet_id'),
kimaiSynced: boolean('kimai_synced').notNull().default(false),
reflectedAt: timestamp('reflected_at', { withTimezone: true }), reflectedAt: timestamp('reflected_at', { withTimezone: true }),
reflectionText: text('reflection_text'), reflectionText: text('reflection_text'),
ampel: text('ampel', { enum: ['green', 'amber', 'red'] }), ampel: text('ampel', { enum: ['green', 'amber', 'red'] }),
trend: text('trend', { enum: ['besser', 'gleich', 'schlechter'] }), trend: text('trend', { enum: ['besser', 'gleich', 'schlechter'] }),
url: text('url'), url: text('url'),
blockerId: uuid('blocker_id'), blockerId: uuid('blocker_id').references(() => blocker.id, { onDelete: 'set null' }),
editLockedAt: timestamp('edit_locked_at', { withTimezone: true }), editLockedAt: timestamp('edit_locked_at', { withTimezone: true }),
publishedAt: timestamp('published_at', { withTimezone: true }), publishedAt: timestamp('published_at', { withTimezone: true }),
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(), createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
@@ -261,6 +279,8 @@ export const todo = pgTable(
.notNull() .notNull()
.default('open'), .default('open'),
dropReason: text('drop_reason'), dropReason: text('drop_reason'),
// Ungeplant dazugekommen & erledigt (Drive-by, „btw das habe ich heute auch gemacht").
unplanned: boolean('unplanned').notNull().default(false),
carriedOver: boolean('carried_over').notNull().default(false), carriedOver: boolean('carried_over').notNull().default(false),
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(), createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
completedAt: timestamp('completed_at', { withTimezone: true }), completedAt: timestamp('completed_at', { withTimezone: true }),
@@ -393,8 +413,12 @@ export const leadHandover = pgTable('lead_handover', {
export const timeEntry = pgTable( export const timeEntry = pgTable(
'time_entry', 'time_entry',
{ {
id: uuid('id').default(sql`gen_random_uuid()`).primaryKey(), id: uuid('id')
userId: uuid('user_id').notNull().references(() => user.id, { onDelete: 'cascade' }), .default(sql`gen_random_uuid()`)
.primaryKey(),
userId: uuid('user_id')
.notNull()
.references(() => user.id, { onDelete: 'cascade' }),
dayEntryId: uuid('day_entry_id').references(() => dayEntry.id, { onDelete: 'set null' }), dayEntryId: uuid('day_entry_id').references(() => dayEntry.id, { onDelete: 'set null' }),
todoId: uuid('todo_id').references(() => todo.id, { onDelete: 'set null' }), todoId: uuid('todo_id').references(() => todo.id, { onDelete: 'set null' }),
bezugKind: text('bezug_kind', { enum: ['project', 'deal', 'campaign', 'allgemein'] }), bezugKind: text('bezug_kind', { enum: ['project', 'deal', 'campaign', 'allgemein'] }),
@@ -413,7 +437,8 @@ export const timeEntry = pgTable(
}, },
(t) => ({ (t) => ({
idxUserStart: index('idx_time_entry_user_start').on(t.userId, t.startedAt), idxUserStart: index('idx_time_entry_user_start').on(t.userId, t.startedAt),
idxUserActive: uniqueIndex('uniq_time_entry_user_active') // Kein Unique mehr: mehrere parallele aktive Timer pro User erlaubt (ENTWICKLUN-6).
idxUserActive: index('idx_time_entry_user_active')
.on(t.userId) .on(t.userId)
.where(sql`${t.endedAt} IS NULL`), .where(sql`${t.endedAt} IS NULL`),
idxTodo: index('idx_time_entry_todo').on(t.todoId), idxTodo: index('idx_time_entry_todo').on(t.todoId),
@@ -432,8 +457,8 @@ export const blocker = pgTable(
.primaryKey(), .primaryKey(),
title: text('title').notNull(), title: text('title').notNull(),
description: text('description'), description: text('description'),
areaId: uuid('area_id'), areaId: uuid('area_id').references(() => area.id, { onDelete: 'set null' }),
projectId: uuid('project_id'), projectId: uuid('project_id').references(() => project.id, { onDelete: 'set null' }),
ownerUserId: uuid('owner_user_id').references(() => user.id, { onDelete: 'set null' }), ownerUserId: uuid('owner_user_id').references(() => user.id, { onDelete: 'set null' }),
openedBy: uuid('opened_by') openedBy: uuid('opened_by')
.notNull() .notNull()
@@ -465,6 +490,10 @@ export const lead = pgTable(
areaId: uuid('area_id') areaId: uuid('area_id')
.notNull() .notNull()
.references(() => area.id, { onDelete: 'restrict' }), .references(() => area.id, { onDelete: 'restrict' }),
// Optionale Verknüpfung zum (universellen) Projekt — egal in welchem Bereich
// dieses wohnt. So sind „HiveGrid-Leads" mit dem HiveGrid-Projekt verbunden,
// ohne dass das Projekt im Vertrieb redundant angelegt werden muss.
projectId: uuid('project_id').references(() => project.id, { onDelete: 'set null' }),
// 1. Stammdaten // 1. Stammdaten
firma: text('firma').notNull(), firma: text('firma').notNull(),
status: text('status', { enum: ['cold', 'warm', 'hot', 'won', 'lost'] }) status: text('status', { enum: ['cold', 'warm', 'hot', 'won', 'lost'] })
@@ -525,6 +554,7 @@ export const lead = pgTable(
(t) => ({ (t) => ({
idxStatus: index('idx_lead_status').on(t.status), idxStatus: index('idx_lead_status').on(t.status),
idxOwner: index('idx_lead_owner').on(t.ownerUserId), idxOwner: index('idx_lead_owner').on(t.ownerUserId),
idxProject: index('idx_lead_project').on(t.projectId),
}), }),
); );
@@ -575,7 +605,9 @@ export const leadTouchpoint = pgTable(
kanal: text('kanal', { kanal: text('kanal', {
enum: ['call', 'mail', 'linkedin', 'termin', 'event', 'sonstiges'], enum: ['call', 'mail', 'linkedin', 'termin', 'event', 'sonstiges'],
}).notNull(), }).notNull(),
bearbeiterUserId: uuid('bearbeiter_user_id').references(() => user.id, { onDelete: 'set null' }), bearbeiterUserId: uuid('bearbeiter_user_id').references(() => user.id, {
onDelete: 'set null',
}),
inhalt: text('inhalt').notNull(), inhalt: text('inhalt').notNull(),
outcome: text('outcome'), outcome: text('outcome'),
followUpBis: date('follow_up_bis'), followUpBis: date('follow_up_bis'),
@@ -588,7 +620,7 @@ export const leadTouchpoint = pgTable(
); );
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// stakeholder — Stakeholder-Analyse pro Projekt (Buch Kap. 4). Interesse × // stakeholder — Stakeholder-Analyse pro Projekt (Leitfaden). Interesse ×
// Einfluss ergibt die Macht/Interesse-Matrix; Haltung = Grundeinstellung. // Einfluss ergibt die Macht/Interesse-Matrix; Haltung = Grundeinstellung.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
export const stakeholder = pgTable( export const stakeholder = pgTable(
@@ -622,7 +654,7 @@ export const stakeholder = pgTable(
); );
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// risk — Risiko- & Chancen-Register pro Projekt (Buch Kap. 4). `kind` // risk — Risiko- & Chancen-Register pro Projekt (Leitfaden). `kind`
// unterscheidet Gefahr vs. Chance. Showstopper = bringt das Projekt zum Stillstand. // unterscheidet Gefahr vs. Chance. Showstopper = bringt das Projekt zum Stillstand.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
export const risk = pgTable( export const risk = pgTable(
+183 -28
View File
@@ -1,7 +1,7 @@
// Seed-Skript: idempotent. Legt Areas, Test-Mitarbeiter (inkl. Admin Dejan) und // Seed-Skript: idempotent. Legt Areas, Test-Mitarbeiter (inkl. Admin Dejan) und
// Dummy-Daten (Projekte, Deals, Kampagnen, Tageseinträge, Blocker) an. // Dummy-Daten (Projekte, Deals, Kampagnen, Tageseinträge, Blocker) an.
import { sql, eq } from 'drizzle-orm'; import { eq } from 'drizzle-orm';
import { createDbClient } from './client.js'; import { createDbClient } from './client.js';
import { import {
area, area,
@@ -210,12 +210,48 @@ export async function seed(connectionString: string): Promise<void> {
if (proj1 && proj2 && proj3) { if (proj1 && proj2 && proj3) {
await db.insert(milestone).values([ await db.insert(milestone).values([
{ projectId: proj1.id, title: 'Auftragsformular Phase 1', due: isoDateOffset(-5), status: 'done', order: 0 }, {
{ projectId: proj1.id, title: 'Stripe Webhook-Tests', due: isoDateOffset(10), status: 'open', order: 1 }, projectId: proj1.id,
{ projectId: proj1.id, title: 'Pilot mit Kunde', due: isoDateOffset(25), status: 'open', order: 2 }, title: 'Auftragsformular Phase 1',
{ projectId: proj2.id, title: 'Tagesrhythmus produktiv', due: isoDateOffset(5), status: 'open', order: 0 }, due: isoDateOffset(-5),
{ projectId: proj2.id, title: 'Pflicht-Minimum vollständig', due: isoDateOffset(20), status: 'open', order: 1 }, status: 'done',
{ projectId: proj3.id, title: 'Token-Refresh Bugfix', due: isoDateOffset(-3), status: 'overdue', order: 0 }, order: 0,
},
{
projectId: proj1.id,
title: 'Stripe Webhook-Tests',
due: isoDateOffset(10),
status: 'open',
order: 1,
},
{
projectId: proj1.id,
title: 'Pilot mit Kunde',
due: isoDateOffset(25),
status: 'open',
order: 2,
},
{
projectId: proj2.id,
title: 'Tagesrhythmus produktiv',
due: isoDateOffset(5),
status: 'open',
order: 0,
},
{
projectId: proj2.id,
title: 'Pflicht-Minimum vollständig',
due: isoDateOffset(20),
status: 'open',
order: 1,
},
{
projectId: proj3.id,
title: 'Token-Refresh Bugfix',
due: isoDateOffset(-3),
status: 'overdue',
order: 0,
},
]); ]);
} }
} }
@@ -225,10 +261,38 @@ export async function seed(connectionString: string): Promise<void> {
if (existingDeals.length === 0) { if (existingDeals.length === 0) {
const sales = areaBySlug.vertrieb!; const sales = areaBySlug.vertrieb!;
await db.insert(deal).values([ await db.insert(deal).values([
{ areaId: sales.id, name: 'Schmidt & Söhne Wartungsvertrag', ownerUserId: anna.id, valueEur: 1_200_000, probability: 70, stage: 'angebot' }, {
{ areaId: sales.id, name: 'Bauwerk AG Plattform', ownerUserId: anna.id, valueEur: 850_000, probability: 50, stage: 'demo' }, areaId: sales.id,
{ areaId: sales.id, name: 'Müller GmbH Onboarding', ownerUserId: anna.id, valueEur: 250_000, probability: 30, stage: 'erstgespraech' }, name: 'Schmidt & Söhne Wartungsvertrag',
{ areaId: sales.id, name: 'Hartmann KG Pilot', ownerUserId: anna.id, valueEur: 180_000, probability: 80, stage: 'angebot' }, ownerUserId: anna.id,
valueEur: 1_200_000,
probability: 70,
stage: 'angebot',
},
{
areaId: sales.id,
name: 'Bauwerk AG Plattform',
ownerUserId: anna.id,
valueEur: 850_000,
probability: 50,
stage: 'demo',
},
{
areaId: sales.id,
name: 'Müller GmbH Onboarding',
ownerUserId: anna.id,
valueEur: 250_000,
probability: 30,
stage: 'erstgespraech',
},
{
areaId: sales.id,
name: 'Hartmann KG Pilot',
ownerUserId: anna.id,
valueEur: 180_000,
probability: 80,
stage: 'angebot',
},
{ {
areaId: sales.id, areaId: sales.id,
name: 'Becker Logistik Phase 1', name: 'Becker Logistik Phase 1',
@@ -246,9 +310,27 @@ export async function seed(connectionString: string): Promise<void> {
const existingGtm = await db.select().from(gtmStep); const existingGtm = await db.select().from(gtmStep);
if (existingGtm.length === 0) { if (existingGtm.length === 0) {
await db.insert(gtmStep).values([ await db.insert(gtmStep).values([
{ product: 'ToolCTRL Suite', title: 'Landingpage live', ownerUserId: marco.id, status: 'done', order: 0 }, {
{ product: 'ToolCTRL Suite', title: 'Pricing-Sheet final', ownerUserId: anna.id, status: 'in_progress', order: 1 }, product: 'ToolCTRL Suite',
{ product: 'ToolCTRL Suite', title: 'Demo-Video produzieren', ownerUserId: marco.id, status: 'open', order: 2 }, title: 'Landingpage live',
ownerUserId: marco.id,
status: 'done',
order: 0,
},
{
product: 'ToolCTRL Suite',
title: 'Pricing-Sheet final',
ownerUserId: anna.id,
status: 'in_progress',
order: 1,
},
{
product: 'ToolCTRL Suite',
title: 'Demo-Video produzieren',
ownerUserId: marco.id,
status: 'open',
order: 2,
},
]); ]);
} }
@@ -259,9 +341,27 @@ export async function seed(connectionString: string): Promise<void> {
const [c1, c2] = await db const [c1, c2] = await db
.insert(campaign) .insert(campaign)
.values([ .values([
{ areaId: mkt.id, name: 'LinkedIn Q2 Outbound', status: 'active', reach: 18500, ownerUserId: marco.id }, {
{ areaId: mkt.id, name: 'Webinar-Serie „Workflows"', status: 'active', reach: 4200, ownerUserId: marco.id }, areaId: mkt.id,
{ areaId: mkt.id, name: 'Newsletter Spring', status: 'done', reach: 2200, ownerUserId: marco.id }, name: 'LinkedIn Q2 Outbound',
status: 'active',
reach: 18500,
ownerUserId: marco.id,
},
{
areaId: mkt.id,
name: 'Webinar-Serie „Workflows"',
status: 'active',
reach: 4200,
ownerUserId: marco.id,
},
{
areaId: mkt.id,
name: 'Newsletter Spring',
status: 'done',
reach: 2200,
ownerUserId: marco.id,
},
]) ])
.returning(); .returning();
if (c1 && c2) { if (c1 && c2) {
@@ -296,9 +396,33 @@ export async function seed(connectionString: string): Promise<void> {
.returning(); .returning();
if (d1) { if (d1) {
await db.insert(todo).values([ await db.insert(todo).values([
{ dayEntryId: d1.id, userId: dejan.id, date: yesterday, title: 'Stripe-Webhook implementieren', order: 0, status: 'done', bezugKind: 'project' }, {
{ dayEntryId: d1.id, userId: dejan.id, date: yesterday, title: 'Pilot-Demo vorbereiten', order: 1, status: 'done', bezugKind: 'project' }, dayEntryId: d1.id,
{ dayEntryId: d1.id, userId: dejan.id, date: yesterday, title: 'Marketing-Briefing review', order: 2, status: 'dropped', dropReason: 'Marco war krank' }, userId: dejan.id,
date: yesterday,
title: 'Stripe-Webhook implementieren',
order: 0,
status: 'done',
bezugKind: 'project',
},
{
dayEntryId: d1.id,
userId: dejan.id,
date: yesterday,
title: 'Pilot-Demo vorbereiten',
order: 1,
status: 'done',
bezugKind: 'project',
},
{
dayEntryId: d1.id,
userId: dejan.id,
date: yesterday,
title: 'Marketing-Briefing review',
order: 2,
status: 'dropped',
dropReason: 'Marco war krank',
},
]); ]);
} }
@@ -310,7 +434,8 @@ export async function seed(connectionString: string): Promise<void> {
status: 'full', status: 'full',
checkedInAt: new Date(`${yesterday}T09:00:00+02:00`), checkedInAt: new Date(`${yesterday}T09:00:00+02:00`),
reflectedAt: new Date(`${yesterday}T18:00:00+02:00`), reflectedAt: new Date(`${yesterday}T18:00:00+02:00`),
reflectionText: 'Token-Refresh Bug reproduziert, Fix-Hypothese steht. Komme morgen weiter.', reflectionText:
'Token-Refresh Bug reproduziert, Fix-Hypothese steht. Komme morgen weiter.',
ampel: 'red', ampel: 'red',
trend: 'schlechter', trend: 'schlechter',
publishedAt: new Date(), publishedAt: new Date(),
@@ -318,8 +443,23 @@ export async function seed(connectionString: string): Promise<void> {
.returning(); .returning();
if (d2) { if (d2) {
await db.insert(todo).values([ await db.insert(todo).values([
{ dayEntryId: d2.id, userId: lukas.id, date: yesterday, title: 'Token-Refresh debuggen', order: 0, status: 'open', bezugKind: 'project' }, {
{ dayEntryId: d2.id, userId: lukas.id, date: yesterday, title: 'PR Review für Anna', order: 1, status: 'done' }, dayEntryId: d2.id,
userId: lukas.id,
date: yesterday,
title: 'Token-Refresh debuggen',
order: 0,
status: 'open',
bezugKind: 'project',
},
{
dayEntryId: d2.id,
userId: lukas.id,
date: yesterday,
title: 'PR Review für Anna',
order: 1,
status: 'done',
},
]); ]);
} }
@@ -339,8 +479,24 @@ export async function seed(connectionString: string): Promise<void> {
.returning(); .returning();
if (d3) { if (d3) {
await db.insert(todo).values([ await db.insert(todo).values([
{ dayEntryId: d3.id, userId: anna.id, date: yesterday, title: 'Hartmann-Angebot rausschicken', order: 0, status: 'done', bezugKind: 'deal' }, {
{ dayEntryId: d3.id, userId: anna.id, date: yesterday, title: 'Demo-Termin Schmidt fixieren', order: 1, status: 'done', bezugKind: 'deal' }, dayEntryId: d3.id,
userId: anna.id,
date: yesterday,
title: 'Hartmann-Angebot rausschicken',
order: 0,
status: 'done',
bezugKind: 'deal',
},
{
dayEntryId: d3.id,
userId: anna.id,
date: yesterday,
title: 'Demo-Termin Schmidt fixieren',
order: 1,
status: 'done',
bezugKind: 'deal',
},
]); ]);
} }
@@ -438,7 +594,8 @@ export async function seed(connectionString: string): Promise<void> {
datum: pickWerktag(2), datum: pickWerktag(2),
kanal: 'linkedin', kanal: 'linkedin',
bearbeiterUserId: anna.id, bearbeiterUserId: anna.id,
inhalt: 'Erste Nachricht über das MitApp-Profil geschickt, Bezug auf KI-Optimierung für PM.', inhalt:
'Erste Nachricht über das MitApp-Profil geschickt, Bezug auf KI-Optimierung für PM.',
outcome: 'positiv geantwortet, Interesse an kurzem Austausch', outcome: 'positiv geantwortet, Interesse an kurzem Austausch',
followUpBis: isoDateOffset(4), followUpBis: isoDateOffset(4),
}, },
@@ -582,8 +739,6 @@ export async function seed(connectionString: string): Promise<void> {
}); });
} }
} }
await db.update(user).set({ updatedAt: new Date() }).where(sql`true`);
} finally { } finally {
await pool.end(); await pool.end();
} }
+27 -1
View File
@@ -28,7 +28,9 @@ export const submitReflectionInput = z.object({
z.object({ z.object({
id: z.string().uuid(), id: z.string().uuid(),
status: todoStatusSchema, status: todoStatusSchema,
dropReason: z.string().max(200).optional(), // Optionale Notiz pro Task (frühere „Verworfen-Grund"-Spalte, jetzt für
// jeden Status als freie Beschreibung nutzbar).
dropReason: z.string().max(500).optional(),
}), }),
) )
.default([]), .default([]),
@@ -57,6 +59,30 @@ export const editTodoTitleInput = z.object({
}); });
export type EditTodoTitleInput = z.infer<typeof editTodoTitleInput>; export type EditTodoTitleInput = z.infer<typeof editTodoTitleInput>;
// Einzelnes ToDo mitten am Tag zum heutigen Tageseintrag hinzufügen.
export const addTodoInput = z.object({
title: z.string().min(1).max(200),
bezugKind: bezugKindSchema.optional(),
bezugId: z.string().uuid().optional(),
});
export type AddTodoInput = z.infer<typeof addTodoInput>;
// Ungeplant dazugekommenes & bereits erledigtes Item nachtragen (Drive-by).
export const addUnplannedInput = z.object({
title: z.string().min(1).max(200),
bezugKind: bezugKindSchema.optional(),
bezugId: z.string().uuid().optional(),
});
export type AddUnplannedInput = z.infer<typeof addUnplannedInput>;
export const historyForDateInput = z.object({
date: z
.string()
.regex(/^\d{4}-\d{2}-\d{2}$/)
.optional(), // Default: vorheriger Werktag
});
export type HistoryForDateInput = z.infer<typeof historyForDateInput>;
export const markAbsentInput = z.object({ export const markAbsentInput = z.object({
from: z.string().regex(/^\d{4}-\d{2}-\d{2}$/), from: z.string().regex(/^\d{4}-\d{2}-\d{2}$/),
to: z.string().regex(/^\d{4}-\d{2}-\d{2}$/), to: z.string().regex(/^\d{4}-\d{2}-\d{2}$/),
+15 -1
View File
@@ -39,6 +39,7 @@ const leadCoreFields = {
status: leadStatusSchema, status: leadStatusSchema,
score: z.number().int().min(0).max(10), score: z.number().int().min(0).max(10),
ownerUserId: z.string().uuid().nullable(), ownerUserId: z.string().uuid().nullable(),
projectId: z.string().uuid().nullable(),
branche: z.string().max(200).nullable(), branche: z.string().max(200).nullable(),
subSegment: z.string().max(200).nullable(), subSegment: z.string().max(200).nullable(),
standorte: z.string().max(500).nullable(), standorte: z.string().max(500).nullable(),
@@ -67,7 +68,10 @@ const leadCoreFields = {
nutzenHypothese: z.string().max(1000).nullable(), nutzenHypothese: z.string().max(1000).nullable(),
differenzierer: z.string().max(1000).nullable(), differenzierer: z.string().max(1000).nullable(),
naechsterSchritt: z.string().max(1000).nullable(), naechsterSchritt: z.string().max(1000).nullable(),
naechsterSchrittDatum: z.string().regex(/^\d{4}-\d{2}-\d{2}$/).nullable(), naechsterSchrittDatum: z
.string()
.regex(/^\d{4}-\d{2}-\d{2}$/)
.nullable(),
risiken: z.string().max(1000).nullable(), risiken: z.string().max(1000).nullable(),
planB: z.string().max(1000).nullable(), planB: z.string().max(1000).nullable(),
offeneFragen: z.array(offeneFrageSchema).max(100), offeneFragen: z.array(offeneFrageSchema).max(100),
@@ -80,6 +84,7 @@ export const createLeadInput = z.object({
status: leadStatusSchema.default('cold'), status: leadStatusSchema.default('cold'),
score: z.number().int().min(0).max(10).default(0), score: z.number().int().min(0).max(10).default(0),
ownerUserId: z.string().uuid().optional(), ownerUserId: z.string().uuid().optional(),
projectId: z.string().uuid().optional(),
branche: z.string().max(200).optional(), branche: z.string().max(200).optional(),
subSegment: z.string().max(200).optional(), subSegment: z.string().max(200).optional(),
website: z.string().max(500).optional(), website: z.string().max(500).optional(),
@@ -87,6 +92,8 @@ export const createLeadInput = z.object({
}); });
export type CreateLeadInput = z.infer<typeof createLeadInput>; export type CreateLeadInput = z.infer<typeof createLeadInput>;
export const leadsForProjectInput = z.object({ projectId: z.string().uuid() });
// Update: id + beliebige Teilmenge der Kernfelder (partial patch). // Update: id + beliebige Teilmenge der Kernfelder (partial patch).
export const updateLeadInput = z export const updateLeadInput = z
.object({ id: z.string().uuid() }) .object({ id: z.string().uuid() })
@@ -135,3 +142,10 @@ export const promoteToDealInput = z.object({
probability: z.number().int().min(0).max(100).default(50), probability: z.number().int().min(0).max(100).default(50),
}); });
export type PromoteToDealInput = z.infer<typeof promoteToDealInput>; export type PromoteToDealInput = z.infer<typeof promoteToDealInput>;
// CSV-Import: rohe CSV-Datei wird serverseitig geparst (header-basiert).
export const importLeadsCsvInput = z.object({
csv: z.string().min(1).max(2_000_000),
projectId: z.string().uuid().optional(), // alle importierten Leads diesem Projekt zuordnen
});
export type ImportLeadsCsvInput = z.infer<typeof importLeadsCsvInput>;
Loaded 100 of 104 files, more files were not shown because too many files have changed in this diff. Show more