1.2.0-rc1

backend/src/auth.ts

@@ -21,8 +21,10 @@ export type AuthUser = {
   has_teamspace_credentials: boolean;
   zammad_email_session_webhook_enabled: boolean;
   session_billing_prompt_enabled: boolean;
+  session_work_segments_enabled: boolean;
   teamspace_time_tracking_enabled: boolean;
   zammad_session_note_default_enabled: boolean;
+  zammad_session_note_date_header_enabled: boolean;
   zammad_time_unit_rounding_enabled: boolean;
   zammad_time_unit_rounding_minutes: number;
   zammad_atoss_email_sync_enabled: boolean;
@@ -97,8 +99,10 @@ function publicUser(user: AuthUser) {
     has_teamspace_credentials: Boolean(user.has_teamspace_credentials),
     zammad_email_session_webhook_enabled: Boolean(user.zammad_email_session_webhook_enabled),
     session_billing_prompt_enabled: Boolean(user.session_billing_prompt_enabled),
+    session_work_segments_enabled: Boolean(user.session_work_segments_enabled),
     teamspace_time_tracking_enabled: Boolean(user.teamspace_time_tracking_enabled ?? true),
     zammad_session_note_default_enabled: Boolean(user.zammad_session_note_default_enabled),
+    zammad_session_note_date_header_enabled: Boolean(user.zammad_session_note_date_header_enabled),
     zammad_time_unit_rounding_enabled: Boolean(user.zammad_time_unit_rounding_enabled),
     zammad_time_unit_rounding_minutes: Number(user.zammad_time_unit_rounding_minutes ?? 15),
     zammad_atoss_email_sync_enabled: Boolean(user.zammad_atoss_email_sync_enabled ?? true),
@@ -169,8 +173,10 @@ export async function requireAuth(req: Request, res: Response, next: NextFunctio
           (u.teamspace_device_id IS NOT NULL AND u.teamspace_device_password IS NOT NULL) AS has_teamspace_credentials,
           u.zammad_email_session_webhook_enabled,
           u.session_billing_prompt_enabled,
+          u.session_work_segments_enabled,
           u.teamspace_time_tracking_enabled,
           u.zammad_session_note_default_enabled,
+          u.zammad_session_note_date_header_enabled,
           u.zammad_time_unit_rounding_enabled,
           u.zammad_time_unit_rounding_minutes,
           u.zammad_atoss_email_sync_enabled,

backend/src/databaseExport.ts

@@ -12,10 +12,17 @@ export const databaseExportTables = [
   "auth_sessions",
   "app_settings",
   "user_preferences",
+  "organization_attribute_options",
+  "teamspace_project_exclusions",
+  "teamspace_assignment_rules",
   "organizations",
   "tickets",
   "projects",
+  "teamspace_project_resources",
   "project_teamspace_entries",
+  "teamspace_monthly_user_actuals",
+  "project_teamspace_monthly_actuals",
+  "project_teamspace_subentries",
   "hidden_user_projects",
   "ticket_todos",
   "recurring_billings",
@@ -40,6 +47,17 @@ type ColumnInfo = {
 };
 
 const jsonDataTypes = new Set(["json", "jsonb"]);
+const arrayElementTypes = new Map<string, string>([
+  ["_bool", "boolean"],
+  ["_date", "date"],
+  ["_int2", "smallint"],
+  ["_int4", "integer"],
+  ["_int8", "bigint"],
+  ["_numeric", "numeric"],
+  ["_text", "text"],
+  ["_timestamptz", "timestamptz"],
+  ["_uuid", "uuid"]
+]);
 const insertBatchSize = 500;
 
 export function quoteIdentifier(value: string) {
@@ -76,6 +94,20 @@ export function sqlLiteral(value: unknown, column?: Pick<ColumnInfo, "dataType"
     return quoteSqlString(jsonValueForSql(value));
   }
 
+  if (column?.dataType === "ARRAY") {
+    if (!Array.isArray(value)) {
+      throw new Error(`Expected PostgreSQL array value for ${column.udtName}`);
+    }
+
+    const elementType = arrayElementTypes.get(column.udtName);
+
+    if (!elementType) {
+      throw new Error(`Unsupported PostgreSQL array type: ${column.udtName}`);
+    }
+
+    return `ARRAY[${value.map((entry) => sqlLiteral(entry)).join(", ")}]::${elementType}[]`;
+  }
+
   if (value instanceof Date) {
     return quoteSqlString(value.toISOString());
   }

backend/src/zammadOrganizationAttributes.ts

@@ -0,0 +1,71 @@
+export const organizationAttributeNames = ["customer_owner", "hotline_contract"] as const;
+
+export type OrganizationAttributeName = (typeof organizationAttributeNames)[number];
+
+export type ZammadOrganizationAttributeOption = {
+  zammadAttributeId: number;
+  attributeName: OrganizationAttributeName;
+  optionKey: string;
+  displayName: string;
+};
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+
+function isOrganizationAttributeName(value: unknown): value is OrganizationAttributeName {
+  return typeof value === "string" && organizationAttributeNames.includes(value as OrganizationAttributeName);
+}
+
+export function parseZammadOrganizationAttributeOptions(payload: unknown): ZammadOrganizationAttributeOption[] {
+  if (!Array.isArray(payload)) {
+    throw new Error("Zammad response must be an object-manager attribute array");
+  }
+
+  const options: ZammadOrganizationAttributeOption[] = [];
+  const foundAttributes = new Set<OrganizationAttributeName>();
+
+  for (const item of payload) {
+    if (!isRecord(item) || !isOrganizationAttributeName(item.name)) {
+      continue;
+    }
+
+    const zammadAttributeId = Number(item.id);
+    const dataOption = isRecord(item.data_option)
+      ? item.data_option
+      : isRecord(item.data_options)
+        ? item.data_options
+        : null;
+    const rawOptions = dataOption && isRecord(dataOption.options) ? dataOption.options : null;
+
+    if (!Number.isInteger(zammadAttributeId) || zammadAttributeId <= 0 || !rawOptions) {
+      throw new Error(`Zammad object-manager attribute ${item.name} is invalid`);
+    }
+
+    foundAttributes.add(item.name);
+
+    for (const [rawKey, rawDisplayName] of Object.entries(rawOptions)) {
+      const optionKey = rawKey.trim();
+      const displayName = typeof rawDisplayName === "string" ? rawDisplayName.trim() : "";
+
+      if (!optionKey || !displayName) {
+        continue;
+      }
+
+      options.push({
+        zammadAttributeId,
+        attributeName: item.name,
+        optionKey,
+        displayName
+      });
+    }
+  }
+
+  const missingAttributes = organizationAttributeNames.filter((name) => !foundAttributes.has(name));
+
+  if (missingAttributes.length > 0) {
+    throw new Error(`Zammad object-manager attributes missing: ${missingAttributes.join(", ")}`);
+  }
+
+  return options;
+}

backend/test/databaseExport.test.ts

@@ -1,9 +1,17 @@
 import assert from "node:assert/strict";
 import test from "node:test";
-import { nextSequenceIdAfterRestore, restoreSqlText, sequenceSetvalSql, sqlLiteral, type QueryExecutor } from "../src/databaseExport.ts";
+import {
-import { exportTableSql } from "../src/databaseExport.ts";
+  databaseExportTables,
+  exportTableSql,
+  nextSequenceIdAfterRestore,
+  restoreSqlText,
+  sequenceSetvalSql,
+  sqlLiteral,
+  type QueryExecutor
+} from "../src/databaseExport.ts";
 
 const jsonbColumn = { dataType: "jsonb", udtName: "jsonb" };
+const bigintArrayColumn = { dataType: "ARRAY", udtName: "_int8" };
 
 test("sqlLiteral serializes primitive values", () => {
   assert.equal(sqlLiteral(null), "NULL");
@@ -36,6 +44,20 @@ test("sqlLiteral serializes JSON columns as valid JSON values", () => {
   assert.equal(sqlLiteral(true, jsonbColumn), "'true'");
 });
 
+test("sqlLiteral serializes PostgreSQL arrays with an explicit element type", () => {
+  assert.equal(sqlLiteral([], bigintArrayColumn), "ARRAY[]::bigint[]");
+  assert.equal(sqlLiteral(["32349965", "32349982"], bigintArrayColumn), "ARRAY['32349965', '32349982']::bigint[]");
+  assert.throws(
+    () => sqlLiteral(["value"], { dataType: "ARRAY", udtName: "_unsupported" }),
+    /Unsupported PostgreSQL array type/
+  );
+});
+
+test("database export inserts assignment rules before tickets that reference them", () => {
+  assert.ok(databaseExportTables.indexOf("organization_attribute_options") < databaseExportTables.indexOf("teamspace_assignment_rules"));
+  assert.ok(databaseExportTables.indexOf("teamspace_assignment_rules") < databaseExportTables.indexOf("tickets"));
+});
+
 test("generated table export never contains implicit object stringification", async () => {
   const client: QueryExecutor = {
     async query<T extends Record<string, unknown>>(text: string): Promise<{ rows: T[]; rowCount: number | null }> {

backend/test/zammadOrganizationAttributes.test.ts

@@ -0,0 +1,38 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { parseZammadOrganizationAttributeOptions } from "../src/zammadOrganizationAttributes.ts";
+
+test("parses the two organization select attributes and ignores unrelated attributes", () => {
+  const options = parseZammadOrganizationAttributeOptions([
+    {
+      id: 85,
+      name: "customer_owner",
+      data_option: { options: { ATOSS: "ATOSS", sdw: "SD Worx" } }
+    },
+    {
+      id: 12,
+      name: "unrelated",
+      data_option: { options: { no: "No" } }
+    },
+    {
+      id: 86,
+      name: "hotline_contract",
+      data_option: { options: { none: "(kein Hotlinevertrag)" } }
+    }
+  ]);
+
+  assert.deepEqual(options, [
+    { zammadAttributeId: 85, attributeName: "customer_owner", optionKey: "ATOSS", displayName: "ATOSS" },
+    { zammadAttributeId: 85, attributeName: "customer_owner", optionKey: "sdw", displayName: "SD Worx" },
+    { zammadAttributeId: 86, attributeName: "hotline_contract", optionKey: "none", displayName: "(kein Hotlinevertrag)" }
+  ]);
+});
+
+test("rejects responses without both required attributes", () => {
+  assert.throws(
+    () => parseZammadOrganizationAttributeOptions([
+      { id: 85, name: "customer_owner", data_option: { options: { ATOSS: "ATOSS" } } }
+    ]),
+    /hotline_contract/
+  );
+});

bla.json

@@ -1 +0,0 @@
-{"_url":"https://app1.teamspace.de/api/project;limit=1000;depth=1;sort=projectId?parent=18260325&isActive=true&isTemplate=false","_links":[{"caption":"Self","href":"https://app1.teamspace.de/api/project;limit=1000;depth=1;sort=projectId?parent=18260325&isActive=true&isTemplate=false","rel":"self"},{"caption":"|< firstPage","href":"https://app1.teamspace.de/api/project;offset=0;limit=1000;sort=projectId?parent=18260325&isActive=true&isTemplate=false","rel":"first","title":"First page of projects of this CollectionResource"},{"caption":">| lastPage","href":"https://app1.teamspace.de/api/project;offset=0;limit=1000;sort=projectId?parent=18260325&isActive=true&isTemplate=false","rel":"last","title":"Last page of projects of this CollectionResource"}],"_etag":{"value":"ee49b390d3cca9c74112cb0d0dc361be","weak":false},"size":13,"offset":0,"limit":1000,"items":[{"caption":"Time Control Installation Software","title":"referenced resource","href":"https://app1.teamspace.de/api/project/18260341","lastModifiedDate":"2026-09-30T12:01:22.000+00:00","value":18260341,"idKey":"22","data":{"_url":"https://app1.teamspace.de/api/project/18260341","_id":18260341,"_idKey":"22","_links":[{"caption":"Holzwerk Schilling GmbH & Co. KG ∕ 49951 ∕ Neukunde","title":"parent project","href":"https://app1.teamspace.de/api/project/18260325","value":18260325,"idKey":"22","rel":"parent"}],"_lastModifiedDate":"2026-09-30T12:01:22.000+00:00","name":"Time Control Installation Software","mainprojectId":"EP-2025-Comp-009","mainProject":{"caption":"Holzwerk Schilling GmbH & Co. KG / 49951 / Neukunde","title":"main project","href":"https://app1.teamspace.de/api/project/18260325","value":18260325,"idKey":"22"},"projectId":"0001","path":"Holzwerk Schilling GmbH & Co. KG ∕ 49951 ∕ Neukunde/Time Control Installation Software","description":"","isMainproject":false,"isWorkpackage":true,"isActive":true,"type":null,"projectFolder":null,"projectWorkflow":null,"priority":null,"state":{"caption":"Abgeschlossen","title":"projectState","href":"https://app1.teamspace.de/api/projectstate/13338166","value":13338166,"idKey":"154","rel":"projectState set to this project","optionsUrl":"https://app1.teamspace.de/api/projectstate?workflow=13338231"},"stateRelevant":{"caption":"Abgeschlossen","title":"projectStateRelevant","href":"https://app1.teamspace.de/api/projectstate/13338166","value":13338166,"idKey":"154","rel":"effective projectState of this project"},"progress":100,"progressRelevant":100,"plannedMinutesEnabled":true,"sumMinutes":360,"plannedMinutesBillableEnabled":true,"sumMinutesBillable":180,"plannedMinutesPerformanceEnabled":true,"sumMinutesPerformance":0,"plannedWorkingCostsEnabled":true,"sumWorkingCosts":0.0,"plannedExpensesEnabled":true,"sumExpenses":0.0,"plannedIncomeEnabled":true,"plannedIncome":360.0,"plannedIncomeCalculated":360.0,"sumIncome":360.0,"customer":{"caption":"CompData Computer GmbH","title":"customer","href":"https://app1.teamspace.de/api/organization/13905417","value":13905417,"idKey":"78"},"customerContact":null,"contractor":{"caption":"AIKAVA GmbH","title":"contractor","href":"https://app1.teamspace.de/api/organization/13343077","value":13343077,"idKey":"78"},"contractorContact":null,"currency":{"title":"currency","href":"https://app1.teamspace.de/api/currency/13337775","value":13337775,"idKey":"105"},"colorlabel":null,"colorlabelRelevant":null,"contractPositions":[{"caption":"Contract position","title":"contractPosition","href":"https://app1.teamspace.de/api/contractposition/18260213","value":18260213,"idKey":"104"}],"exportId":null,"exportComment":null,"exportDate":null,"customfields":[],"article":null,"articleRelevant":null,"ticket":null,"endless":false,"parent":{"caption":"Holzwerk Schilling GmbH & Co. KG ∕ 49951 ∕ Neukunde","title":"parent project","href":"https://app1.teamspace.de/api/project/18260325","value":18260325,"idKey":"22","rel":"parent"}},"path":"Holzwerk Schilling GmbH & Co. KG ∕ 49951 ∕ Neukunde/Time Control Installation Software","rel":"link"},{"caption":"Time Control Installation Kommunikationssoftware","title":"referenced resource","href":"https://app1.teamspace.de/api/project/18260349","lastModifiedDate":"2026-09-30T12:01:22.000+00:00","value":18260349,"idKey":"22","data":{"_url":"https://app1.teamspace.de/api/project/18260349","_id":18260349,"_idKey":"22","_links":[{"caption":"Holzwerk Schilling GmbH & Co. KG ∕ 49951 ∕ Neukunde","title":"parent project","href":"https://app1.teamspace.de/api/project/18260325","value":18260325,"idKey":"22","rel":"parent"}],"_lastModifiedDate":"2026-09-30T12:01:22.000+00:00","name":"Time Control Installation Kommunikationssoftware","mainprojectId":"EP-2025-Comp-009","mainProject":{"caption":"Holzwerk Schilling GmbH & Co. KG / 49951 / Neukunde","title":"main project","href":"https://app1.teamspace.de/api/project/18260325","value":18260325,"idKey":"22"},"projectId":"0002","path":"Holzwerk Schilling GmbH & Co. KG ∕ 49951 ∕ Neukunde/Time Control Installation KoLine truncated

docs/confluence/00-tickettracker-hauptseite.md

@@ -0,0 +1,89 @@
+# TicketTracker
+
+Stand: Oktober 2026
+
+TicketTracker ist ein Arbeits-, Projekt- und Abrechnungscockpit für ticketbasierte Arbeit. Das System ergänzt Zammad und Teamspace: Zammad bleibt das Ticketsystem, Teamspace bleibt die Quelle für Projektbudgets und gebuchte Projektwerte, TicketTracker führt Erfassung, Bewertung, ToDos, Projektüberwachung und Monatsabschluss zusammen.
+
+Der Kernnutzen: Jeder Benutzer sieht, was er gearbeitet hat, was noch bewertet werden muss, welche Projektbudgets kritisch sind, welche Teamspace-Daten fehlen oder abweichen und wann ein Monat sauber abgeschlossen werden kann.
+
+## Zielgruppe und Einsatz
+
+TicketTracker ist für Teams oder Einzelpersonen gedacht, die viel mit Tickets arbeiten und ihre Zeiten zuverlässig nachvollziehen müssen.
+
+Typische Einsatzfälle:
+
+- Support- und Consulting-Zeiten per Timer erfassen
+- Sessions nachträglich ergänzen
+- Arbeit am Ticket dokumentieren
+- Sessions als offen, abrechenbar, abgerechnet oder nicht abrechenbar bewerten
+- Teamspace-Tageswerte für abrechnungsrelevante Projektzeiten pflegen oder Teamspace als Ist-Quelle nutzen
+- Monatsabschlüsse kontrolliert vorbereiten
+- Consulting-Projekte mit Teamspace-Budgets, Reststunden und Unterpositionen überwachen
+- ToDos und Wiedervorlagen direkt am Ticket oder Projekt organisieren
+- wiederkehrende Leistungen automatisch erzeugen lassen
+- interne Zammad-Notizen aus TicketTracker heraus erzeugen
+
+## Grundprinzip
+
+TicketTracker arbeitet auf drei Ebenen:
+
+1. **Session-Zeit**  
+   Die tatsächlich gemessene oder manuell erfasste Arbeitszeit.
+2. **Teamspace-/Projekt-Ist**  
+   Je nach Profilmodus entweder in TicketTracker gepflegte Teamspace-Tageswerte oder direkt aus Teamspace synchronisierte Ist-Werte.
+3. **Monatsabschluss**  
+   Der kontrollierte Abschluss eines Monats, sobald alle Sessions final bewertet und die benötigten Prüfpunkte erledigt sind.
+
+Wichtig: Tickets werden nicht abgeschlossen. Tickets dienen als Arbeits- und Auswertungsrahmen. Abgeschlossen wird der Monat.
+
+## Die wichtigsten Bereiche
+
+- **Timer und Sessions:** Zeiten erfassen, nachtragen, bewerten und dokumentieren.
+- **Tickets:** Sessions pro Ticket, Tag und Monat prüfen.
+- **Projekte:** Consulting-Projekte, Teamspace-Projekte, Budgets, Reststunden und Unterpositionen überwachen.
+- **Teamspace:** Projekt-IDs, Budgets, Unterpositionen, Monatszeiten und Istwerte synchronisieren.
+- **Zammad:** Organisationen, Ticketstammdaten, Status, Priorität und interne Notizen anbinden.
+- **ToDos:** Aufgaben, Termine, Wiedervorlagen und Projektfollow-ups verwalten.
+- **Dashboard:** Tagessteuerung für offene Bewertungen, ToDos, Teamspace-Nacharbeit und Projektwarnungen.
+- **Statistiken:** Monatswerte, Organisationen, Tickets, Projektbudgets und Teamspace-Abgleich auswerten.
+- **Monatsabschluss:** Einen Monat kontrolliert schließen oder wieder öffnen.
+
+## Unterseiten für Confluence
+
+Diese Dokumentation ist für den Import als Confluence-Seitenbaum vorbereitet:
+
+1. `01-zeiterfassung-sessions-monatsabschluss.md`
+2. `02-projekte-budgets-teamspace.md`
+3. `03-zammad-sync-und-integration.md`
+4. `04-dashboard-statistiken-und-widgets.md`
+5. `05-todos-wiedervorlagen-fixe-abrechnungen.md`
+6. `06-profil-admin-und-betrieb.md`
+
+## Typischer Tagesablauf
+
+1. Ticketnummer eingeben und Timer starten.
+2. Tätigkeit dokumentieren.
+3. Timer beenden und Session speichern.
+4. Bei Bedarf Session nachtragen.
+5. Sessions im Ticket bewerten.
+6. Wenn Teamspace-Erfassung in TT aktiv ist: Teamspace-Tageswerte pro Projekt/Tag pflegen.
+7. ToDos und Wiedervorlagen bearbeiten.
+8. Dashboard prüfen, ob offene Bewertungen oder Teamspace-Nacharbeiten vorhanden sind.
+
+## Typischer Monatsablauf
+
+1. Monat in Tickets, Statistiken oder Monatsabschluss auswählen.
+2. Offene Sessions prüfen.
+3. Sessions final als **Abgerechnet** oder **Nicht abrechenbar** bewerten.
+4. **Abrechenbar**-Zwischenstände klären, weil sie den Abschluss blockieren.
+5. Bei aktivierter Teamspace-Erfassung: Teamspace-Tageswerte und Differenzen prüfen.
+6. Im Zammad-Sync bei Bedarf den Teamspace-Monatsabgleich ausführen, um echte TS-Monatszeiten pro Projekt gegen TT zu prüfen.
+7. Bei deaktivierter Teamspace-Erfassung: Teamspace-Differenzen entfallen; nur Session-Status ist relevant.
+8. ToDos, Wiedervorlagen und Projektwarnungen prüfen.
+9. Monat abschließen.
+
+TicketTracker ist damit das Kontrollzentrum zwischen täglicher Ticketarbeit, Zammad-Dokumentation, Teamspace-Projekten und sauberer Abrechnung.
+
+Die zentrale Frage bleibt:
+
+**Ist alles vollständig, bewertet, dokumentiert und abrechnungsbereit?**

docs/confluence/01-zeiterfassung-sessions-monatsabschluss.md

@@ -0,0 +1,100 @@
+# Zeiterfassung, Sessions und Monatsabschluss
+
+Diese Seite beschreibt die tägliche Erfassung, Bewertung und Monatsprüfung in TicketTracker.
+
+## Timer
+
+Benutzer starten einen Timer über eine Ticketnummer. Es können mehrere Timer vorbereitet sein, aber immer nur einer läuft aktiv. Wird ein anderer Timer gestartet, pausiert TicketTracker die übrigen Timer automatisch.
+
+Beim Beenden werden Tätigkeit, Zeit, Ticket, Organisation, Art und optional Bewertung gespeichert. Wenn die Zammad-Notiz im Profil aktiv ist, kann TicketTracker beim Speichern einen internen Zammad-Article erzeugen.
+
+## Sessions nachtragen
+
+Vergessene Arbeit kann manuell als Session nachgetragen werden. Dabei werden erfasst:
+
+- Datum
+- Start und Ende
+- Ticket
+- Organisation
+- Art, zum Beispiel Support oder Consulting
+- Tätigkeit
+- Bewertung
+- optional interne Zammad-Notiz
+
+Nachgetragene Sessions laufen genauso in Statistiken, Ticketansichten und Monatsabschluss ein wie per Timer erzeugte Sessions.
+
+## Session-Bewertungen
+
+Jede Session kann einen dieser Zustände haben:
+
+- **Offen**
+- **Abrechenbar**
+- **Abgerechnet**
+- **Nicht abrechenbar**
+
+Nur **Abgerechnet** und **Nicht abrechenbar** gelten als final. **Abrechenbar** ist ein Zwischenstatus und blockiert weiterhin den Monatsabschluss.
+
+Ein erneuter Klick auf den bereits gesetzten Status nimmt die Bewertung wieder zurück und macht die Session offen.
+
+## Ticketdetailansicht
+
+In der Ticketdetailansicht werden Sessions nach Tagen gruppiert. Dort werden Sessions bewertet, bearbeitet, gelöscht und aufgeklappt.
+
+Pro Tag sieht man unter anderem:
+
+- Summe abgerechneter Session-Zeit
+- Summe abrechenbarer Session-Zeit
+- Summe nicht abrechenbarer Session-Zeit
+- offene Session-Zeit
+- Teamspace-Tageswert, falls die Teamspace-Erfassung in TT aktiv ist
+
+Die Tageswerte sind pro Benutzer und Projekt/Teamspace-Eintrag gespeichert. Sie sind nicht an einzelne Sessions gebunden.
+
+## Teamspace-Tageswerte
+
+Wenn im Profil **Teamspace-Zeiten in TT erfassen** aktiv ist, kann der Benutzer in der Ticketdetailansicht Teamspace-Tageswerte pflegen.
+
+Die Eingabe erfolgt in Stunden, zum Beispiel:
+
+- `1`
+- `1,5`
+- `2.25`
+- `0,75`
+
+Der Wert wird nicht während der Eingabe gespeichert. Sobald sich der Wert ändert, erscheint ein Speichern-Button. Ein leeres Feld entfernt den gespeicherten Teamspace-Wert für diesen Tag.
+
+Wenn mehrere Teamspace-Projekte an einem Ticket hängen, wird der Tageswert pro Teamspace-Projekt-Eintrag geführt.
+
+Wenn die Teamspace-Erfassung im Profil deaktiviert ist, sind diese Eingaben ausgeblendet und auch serverseitig gesperrt.
+
+## Monatsabschluss
+
+Der Monatsabschluss ist die zentrale Kontrollseite für einen Benutzer und Monat.
+
+Sie zeigt unter anderem:
+
+- eine nach Ticket zusammengefuehrte Pruefliste
+- offene Bewertungen und Sessions mit Zwischenstatus **Abrechenbar**
+- fehlende oder abweichende Teamspace-Werte als farbige, spaltenweise ausgerichtete Badges; die Tagesdetails stehen am jeweiligen Tag im Ticketdetail
+- Prüfpunkte vor dem Abschluss
+- Möglichkeit, den Monat zu schließen oder wieder zu öffnen
+
+Jedes Ticket erscheint in der Pruefliste nur einmal. Monatsabweichungen, offene Bewertungen und betroffene Tage werden innerhalb dieses Eintrags gebuendelt; Hinweise zum gleichen Tag stehen in einer gemeinsamen Tageszeile.
+
+Ein TT-Teamspace-Tageswert ist nur konsistent, wenn fuer dasselbe Ticket und denselben Tag mindestens eine Session den Status **Abgerechnet** hat. Bei ausschliesslich abrechenbaren, nicht abrechenbaren oder unbewerteten Sessions wird der hinterlegte Wert als Fehler ausgewiesen; ein zusaetzlicher Unterschied zur TS-API bleibt ebenfalls sichtbar.
+
+Ein abgeschlossener Monat ist gegen versehentliche Änderungen geschützt. Wird eine Session in einem abgeschlossenen Zeitraum geändert, muss der Zeitraum vorher wieder geöffnet werden.
+
+## Regeln bei deaktivierter Teamspace-Erfassung
+
+Der Profil-Schalter **Teamspace-Zeiten in TT erfassen** ist userbezogen.
+
+Wenn er ausgeschaltet ist:
+
+- Teamspace-Tageswerte können nicht in TicketTracker gepflegt werden.
+- Manuelle Projektstunden sind nicht editierbar.
+- Monatsprüfung und Widgets prüfen nur Session-Status.
+- Teamspace-Differenzen werden nicht angezeigt.
+- Projekt-Istwerte kommen aus Teamspace.
+
+Das ist für Benutzer gedacht, die keine Teamspace-Zeiten in TicketTracker nachpflegen, sondern Teamspace als führende Ist-Quelle verwenden.

docs/confluence/02-projekte-budgets-teamspace.md

@@ -0,0 +1,150 @@
+# Projekte, Budgets und Teamspace
+
+Diese Seite beschreibt die aktuelle Projekt- und Teamspace-Logik in TicketTracker.
+
+## Projekte
+
+Projekte erweitern normale Tickets um Consulting-Projektinformationen.
+
+Ein Projekt enthält unter anderem:
+
+- Ticketnummer
+- Titel und Organisation
+- Teamspace-Projekt-Einträge
+- Beschreibung und Ziele
+- Zeitraum
+- Projektstatus offen oder geschlossen
+- ToDos
+- Teamspace-Budgets und Verbrauchswerte
+- Teamspace-Unterpositionen
+
+Projekt-Tickets sind Consulting-Tickets. Wird ein Projekt gelöscht, bleiben Ticket, Sessions und ToDos erhalten. Gelöscht werden nur die Projektinformationen.
+
+## Teamspace als Budgetquelle
+
+Teamspace ist die fachliche Quelle für Projektbudgets.
+
+Aktuelle Budgetregeln:
+
+- Teamspace ist die Source of Truth für Projektbudgets.
+- Zammad-Budgets werden nicht mehr als Budgetquelle verwendet.
+- Das Gesamtbudget eines Projekts kommt aus Teamspace.
+- Wenn mehrere Teamspace-Projekte an einem Ticket hängen, wird das Gesamtbudget aus diesen Teamspace-Projekten zusammengesetzt.
+- Unterpositionen zeigen ihre eigenen Teamspace-Budgets und Teamspace-Istwerte.
+- Stückpositionen werden nicht als Stundenbudget in die Stundenbetrachtung eingerechnet.
+
+## Verbrauchslogik
+
+Der Projektverbrauch hängt vom Profil-Schalter **Teamspace-Zeiten in TT erfassen** ab.
+
+Wenn der Schalter aktiv ist:
+
+- Projekt-Ist kommt aus Teamspace-Tageswerten, die in TicketTracker gepflegt werden.
+- Zusätzlich können manuelle Projektstunden erfasst werden.
+- Progress Bars, Reststunden und Budgetwarnungen verwenden diese Werte.
+
+Wenn der Schalter deaktiviert ist:
+
+- Projekt-Ist kommt aus Teamspace.
+- Manuelle Projektstunden sind ausgeblendet und serverseitig gesperrt.
+- Teamspace-Tageswerte können nicht in TicketTracker erfasst werden.
+- Statistiken und Widgets zeigen keine TT/Teamspace-Differenzprüfung für diesen Benutzer.
+
+## Mehrere Teamspace-Projekte pro Ticket
+
+Ein Ticket kann mehrere Teamspace-Projekt-IDs haben. TicketTracker speichert dafür mehrere Teamspace-Einträge am Projekt.
+
+Beispiel:
+
+- `EP-2025-Comp-009`
+- `EP-2025-Comp-025`
+
+Einer der Einträge ist der Standard. Sessions können einem Teamspace-Projekt-Eintrag zugeordnet werden. Diese Zuordnung erfolgt auf Ebene des Teamspace-Projekts, nicht auf Ebene einzelner Unterpositionen.
+
+## Gemeinsames Teamspace-Budget über mehrere Tickets
+
+Mehrere unterschiedliche Ticketnummern können dieselbe Teamspace-Projekt-ID verwenden. TicketTracker behandelt diese Teamspace-Nummer dann als gemeinsame Budgetquelle.
+
+Dabei gilt:
+
+- Es gibt keine automatische Aufteilung auf die Ticketnummern.
+- Teamspace-API-ID, Teamspace-API-URL, Budget, Unterpositionen und Teamspace-Monatswerte werden für dieselbe Teamspace-Nummer konsolidiert.
+- Der Teamspace-Sync zieht gleiche Teamspace-Nummern nach jedem Lauf wieder auf denselben Datenstand.
+- Die Migration konsolidiert bereits vorhandene doppelte Teamspace-Nummern beim Start.
+- Ticket-spezifische Felder wie Standard-Eintrag, Reihenfolge, Session-Zuordnung und manuelle Projektstunden bleiben am jeweiligen Ticket.
+
+## Teamspace-Projekt-ID-Sync
+
+Der Sync auf der Zammad-Sync-Seite löst offene Consulting-Projekte gegen die Teamspace-API auf.
+
+Gespeichert werden unter anderem:
+
+- Teamspace-API-ID des Projekts
+- Teamspace-API-URL
+- Teamspace-Gesamtbudget
+- Teamspace-Unterpositionen
+- Teamspace-Budgets und Istwerte der Unterpositionen
+- Stückpositionen und deren Erfüllungsstand
+- echte Teamspace-Monatszeiten aus `/api/time` für den gewählten Monat
+
+Die fachliche Teamspace-ID aus Zammad oder Projektinformationen, zum Beispiel `EP-2026-A-035`, ist nicht identisch mit der API-ID für Einzelabfragen. TicketTracker speichert deshalb die interne Teamspace-API-ID, sobald sie gefunden wurde.
+
+## Teamspace-Monatsabgleich
+
+Der Teamspace-Projekt-ID-Sync auf der Zammad-Sync-Seite enthält zusätzlich einen Monatsabgleich. Der Benutzer wählt einen Monat aus, TicketTracker ruft für diesen Zeitraum die Teamspace-Zeitbuchungen des angemeldeten Teamspace-Benutzers ab und speichert einen Snapshot pro Teamspace-Projekt-Eintrag.
+
+Technische Grundlage:
+
+- API-Endpoint: `/api/time`
+- Filter: `worker={Teamspace User-ID}` und `date=YYYY-MM-01..YYYY-MM-letzterTag`
+- gezählt werden Einträge mit `draftStatus.value = NORMAL`
+- relevante Minuten sind `amountBillable`
+- `amount` wird als Gesamtzeit mitgeführt, ist aber nicht die Vergleichsgröße
+
+Die Monatswerte werden pro Benutzer, Teamspace-Projekt-Eintrag und Monat gespeichert. Dadurch bleiben drei Dinge getrennt:
+
+- TT-Tageswerte, die in TicketTracker gepflegt werden
+- echte Teamspace-Monatszeiten aus Teamspace
+- Teamspace-Budget- und Unterpositionswerte aus dem Projektsync
+
+Im Ergebnis des Syncs sieht man pro Teamspace-Projekt:
+
+- TT-Monatswert
+- TS-Monatswert
+- Differenz
+- Anzahl der gefundenen TS-Zeitbuchungen
+- betroffene Haupt- oder Unterpositionen mit TS-Minuten
+
+Wenn Teamspace-Zeiten auf Unterpositionen gebucht wurden, werden diese ebenfalls dem passenden Teamspace-Projekt-Eintrag zugeordnet. TicketTracker mappt dafür nicht nur die Hauptprojekt-API-ID, sondern auch die synchronisierten Unterpositions-API-IDs. Die Positionsaufschlüsselung wird im Monats-Snapshot gespeichert und kann dadurch später in der Monatsübersicht angezeigt werden.
+
+## Unterpositionen
+
+Unterpositionen werden aus Teamspace synchronisiert und im Projektdetail angezeigt. Sie dienen als Teamspace-Anzeige, um Budget, Verbrauch und freie Ressourcen pro Teamspace-Position sichtbar zu machen.
+
+Wichtig:
+
+- Zeiten werden nicht auf Unterpositionen in TicketTracker erfasst.
+- Unterpositionen bekommen ihre Budgets und Istwerte aus Teamspace.
+- Teamspace-Descriptions werden dekodiert und formatiert ausgegeben.
+- Unterpositionen können einen Alias in TicketTracker bekommen.
+- Akkordions der Unterpositionsgruppen merken sich den letzten offenen oder geschlossenen Zustand pro Benutzer und Projekt.
+- Bei Teamspace-Strukturen mit Überpositionen werden nur echte bebuchbare Unterpositionen angezeigt, nicht reine Summenpositionen.
+- Positionsnummern werden lesbar dargestellt, zum Beispiel `1` statt `0001` oder `1.1` statt `0001.0001`.
+
+## Stückpositionen
+
+Teamspace-Positionen mit `billingType = INVOICEABLE_FIX` sind Stück- oder Fixpositionen.
+
+Für diese Positionen gelten andere Regeln:
+
+- Stundenwerte werden nicht als Stundenbudget interpretiert.
+- TicketTracker zeigt sie als Stückpositionen an.
+- Der Erfüllungsstand wird über `plannedIncome` gegen `sumIncome` geprüft.
+- Ist das Soll erreicht, wird die Position als abgerechnet beziehungsweise erfüllt markiert.
+- Überschreitungen werden mit einem Hinweis-Icon angezeigt.
+
+## Projektansichten
+
+Die Projektliste zeigt Gesamtbudget, Verbrauch, Reststunden und Projektwarnungen. Bei mehreren Teamspace-Projekten können Detailbalken pro Teamspace-Projekt angezeigt oder ausgeblendet werden. Der Hauptbalken zeigt weiterhin das Gesamtbudget aller Teamspace-Projekte.
+
+Im Projektdetail stehen Projektinformationen und ToDos getrennt von den Teamspace-Unterpositionen. Die Unterpositionen liegen in einer eigenen breiten Card unterhalb der Projekt-/ToDo-Informationen.

docs/confluence/03-zammad-sync-und-integration.md

@@ -0,0 +1,82 @@
+# Zammad Sync und Integration
+
+TicketTracker nutzt Zammad, ohne Zammad zu ersetzen. Zammad bleibt das führende Ticketsystem für Ticketstammdaten, Organisationen, Status und Prioritäten.
+
+## Persönlicher Zammad-Token
+
+Jeder Benutzer kann im Profil einen persönlichen Zammad API-Token speichern. Beim Speichern ruft TicketTracker Zammad ab, prüft den Token und speichert die Zammad User-ID.
+
+Der Token wird verschlüsselt in der Datenbank gespeichert.
+
+Der persönliche Token wird unter anderem für benutzerbezogene Zammad-Funktionen verwendet, zum Beispiel interne Notizen oder personenbezogene Synchronisierungen.
+
+## Admin-Zammad-Zugang
+
+Im Adminbereich wird der Zammad-Zugang für systemweite Synchronisierungen gepflegt.
+
+Der Admin kann Organisationen aus Zammad synchronisieren. Dabei werden lokale Organisationen angelegt, aktualisiert oder entfernt beziehungsweise von alten Verknüpfungen gelöst.
+
+## Ticketdaten aus Zammad
+
+TicketTracker kann Ticketdaten aus Zammad übernehmen:
+
+- Ticketnummer
+- Titel
+- Organisation
+- Work-Type, zum Beispiel Support oder Consulting
+- Status
+- Priorität
+- Owner
+- Teamspace-Projektinformationen
+
+Zammad-verwaltete Ticketstammdaten bleiben geschützt. Ticketnummer, Titel, Art und Organisation können dann in TicketTracker nicht beliebig überschrieben werden.
+
+## Consulting-Projekte aus Zammad
+
+Beim Zammad-Sync oder beim Anlegen eines Projekts können Consulting-Projektinformationen übernommen werden.
+
+Dazu gehören insbesondere:
+
+- Teamspace-Projekt-ID oder mehrere Teamspace-Projekt-IDs
+- Zammad-Owner
+- Projektstatus-Hinweise, zum Beispiel Review bei Abschlussstatus
+
+Die Teamspace-Projekt-ID aus Zammad ist die fachliche ID, zum Beispiel `EP-2026-A-035`. Für Teamspace-API-Abfragen speichert TicketTracker zusätzlich die interne Teamspace-API-ID.
+
+## Teamspace-Projekt-ID-Sync auf der Zammad-Sync-Seite
+
+Auf der Zammad-Sync-Seite gibt es den Sync für Teamspace-Projekt-IDs, Budgets und Positionen.
+
+Voraussetzungen:
+
+- Admin hat die Teamspace-Base-URL gespeichert.
+- Benutzer hat im Profil Teamspace-Geraete-ID und Geraetepasswort gespeichert.
+- Die Teamspace User-ID ist bekannt.
+- Das Projekt hat eine Teamspace-Projekt-ID.
+
+Der Sync speichert:
+
+- Teamspace-API-ID
+- Teamspace-API-URL
+- Gesamtbudget
+- Unterpositionen
+- Budgets und Istwerte der Unterpositionen
+- Stückpositionen
+
+## Interne Zammad-Notizen
+
+Beim Timerabschluss und beim manuellen Nachtragen kann TicketTracker einen internen Zammad-Article erzeugen.
+
+Der Article enthält die Tätigkeit und optional den `time_unit`-Wert. Im Profil kann eingestellt werden:
+
+- ob die interne Notiz standardmäßig aktiv ist
+- welcher Zammad-Zeitbuchungstyp vorausgewählt wird
+- ob `time_unit` auf 5, 10, 15 oder 30 Minuten aufgerundet wird
+
+Wenn Zammad nicht erreichbar ist oder die Notiz fehlschlägt, speichert TicketTracker die Session trotzdem. Die fehlgeschlagene Notiz wird geparkt und kann später im Profil erneut gesendet werden.
+
+## eMail-/Article-Import
+
+TicketTracker kann Zammad-Articles prüfen und daraus Sessions vorbereiten. Das ist besonders hilfreich, wenn Arbeit per eMail-Import ins Ticket kam.
+
+Solche Sessions können nachträglich geprüft, zugeordnet und bewertet werden. Wenn ein importierter Eintrag keinem Teamspace-Projekt zugeordnet ist, kann das im Projektdetail sichtbar werden.

docs/confluence/04-dashboard-statistiken-und-widgets.md

@@ -0,0 +1,95 @@
+# Dashboard, Statistiken und Widgets
+
+Diese Seite beschreibt die Kontroll- und Auswertungsflächen in TicketTracker.
+
+## Dashboard
+
+Das Dashboard ist das Tagescockpit. Es zeigt, ob heute oder in der aktuellen Arbeitslage noch etwas offen ist.
+
+Typische Hinweise:
+
+- offene Session-Bewertungen
+- Sessions im Zwischenstatus **Abrechenbar**
+- heutige oder überfällige ToDos
+- fällige Wiedervorlagen
+- fehlende Teamspace-Tageswerte, wenn Teamspace-Erfassung in TT aktiv ist
+- Projektbudget-Hinweise
+- Nacharbeit für heutige Tickets
+
+Widgets können je nach Konfiguration angeordnet und genutzt werden. Favoriten und persönliche Notizen unterstützen die tägliche Arbeit.
+
+## Teamspace-Verhalten im Dashboard
+
+Der Profil-Schalter **Teamspace-Zeiten in TT erfassen** beeinflusst die Dashboard-Logik.
+
+Wenn aktiv:
+
+- Dashboard kann fehlende Teamspace-Tageswerte anzeigen.
+- Nacharbeitslisten können Teamspace-Differenzen berücksichtigen.
+- Projektverbrauch basiert auf TT-Teamspace-Tageswerten plus manuellen Projektstunden.
+
+Wenn deaktiviert:
+
+- Teamspace-Erfassung wird als ausgeschaltet angezeigt.
+- Monatsprüfung läuft statusbasiert.
+- Teamspace-Differenzhinweise werden ausgeblendet.
+- Projekt-Istwerte kommen aus Teamspace.
+
+## Statistiken
+
+Die Statistikseite betrachtet einen Monat.
+
+Sie zeigt unter anderem:
+
+- abgerechnete Zeit
+- abrechenbare Zwischenstände
+- nicht abrechenbare Zeit
+- offene Sessions
+- Organisationen mit Aufwand
+- Tickets mit Aufwand
+- Projektbudget-Hinweise
+- manuelle und fixe Sessions
+- Teamspace-Abgleich, wenn Teamspace-Erfassung in TT aktiv ist
+- Teamspace als Ist-Quelle, wenn die Erfassung in TT deaktiviert ist
+
+## Abgerechnet, abrechenbar und offen
+
+Für statistische Auswertungen gilt:
+
+- **Abgerechnet** zählt in die abgerechnete Session-Zeit.
+- **Abrechenbar** ist ein Zwischenstatus und bleibt offen für den Monatsabschluss.
+- **Nicht abrechenbar** ist final, zählt aber nicht als abgerechnete Zeit.
+- **Offen** blockiert den Monatsabschluss.
+
+## Teamspace-Abgleich in Statistiken
+
+Wenn Teamspace-Erfassung in TT aktiv ist, vergleicht TicketTracker:
+
+`Teamspace-Zeit minus abgerechnete Session-Zeit`
+
+Bedeutung:
+
+- Positive Differenz: In Teamspace steht mehr Zeit als abgerechnet wurde.
+- Negative Differenz: In Teamspace steht weniger Zeit als abgerechnet wurde.
+- Null: Teamspace und abgerechnete Session-Zeit sind ausgeglichen.
+
+Wenn Teamspace-Erfassung deaktiviert ist, werden Differenzspalten, Differenzbadges und Teamspace-Linien ausgeblendet oder angepasst. Die Statistik zeigt dann Teamspace als Ist-Quelle und prüft primär die Session-Status.
+
+## Teamspace-Monatsabgleich aus dem Sync
+
+Zusätzlich zum Tageswert-Abgleich kann der Zammad-Sync echte Teamspace-Monatszeiten abrufen. Diese Daten kommen aus Teamspace `/api/time` und verwenden `amountBillable` der Projektzeitbuchungen.
+
+Der Sync speichert die Werte als Monats-Snapshot pro Benutzer und Teamspace-Projekt-Eintrag. Dadurch wird sichtbar, ob der in TicketTracker gepflegte Monatswert zu den echten Teamspace-Buchungen passt und bei welchem Projekt die Abweichung liegt.
+
+Der Monatsabgleich ist besonders hilfreich, wenn mehrere Teamspace-Projekte an einem Ticket hängen oder wenn Teamspace-Zeiten direkt auf Unterpositionen gebucht wurden. Diese Unterpositionszeiten werden dem passenden Teamspace-Projekt-Eintrag zugerechnet.
+
+In der Monatsübersicht wird der gespeicherte Snapshot direkt am Ticket ausgegeben: TS-Monatswert, Differenz und die betroffenen Haupt- oder Unterpositionen. So ist nicht nur sichtbar, dass eine Abweichung existiert, sondern auch, auf welcher Teamspace-Position die Zeit gebucht wurde.
+
+## Projektbudget-Hinweise
+
+Projektbudget-Hinweise basieren auf den aktuellen Projektregeln:
+
+- Budget kommt aus Teamspace.
+- Ist kommt entweder aus TT-Teamspace-Tageswerten plus manuellen Projektstunden oder aus Teamspace, abhängig vom Profil-Schalter.
+- Überschreitungen werden als Warnung angezeigt.
+- Stückpositionen werden gesondert bewertet und nicht als Stundenbudget behandelt.

docs/confluence/05-todos-wiedervorlagen-fixe-abrechnungen.md

@@ -0,0 +1,79 @@
+# ToDos, Wiedervorlagen und fixe Abrechnungen
+
+Diese Seite beschreibt die Aufgabenlogik und automatisch erzeugte Sessions.
+
+## ToDos
+
+ToDos können direkt an Tickets oder Projekte gehängt werden.
+
+Ein ToDo enthält:
+
+- Aufgabe
+- Priorität
+- Status offen oder erledigt
+- optional Umsetzung von
+- optional Umsetzung bis
+- optionale Beschreibung
+
+ToDos können bearbeitet, erledigt, wieder geöffnet oder gelöscht werden.
+
+## ToDo-Seite
+
+Die zentrale ToDo-Seite bietet:
+
+- heutige ToDos
+- offene, erledigte oder alle ToDos
+- Suche nach Ticketnummer
+- Sortierung
+- Gruppierung
+- freie Reihenfolge per Drag and Drop
+- Kalenderansicht
+
+Überfällige ToDos werden hervorgehoben. ToDos mit Zeitraum zählen an jedem Arbeitstag im Zeitraum. Ein-Tages-ToDos erscheinen einzeln am jeweiligen Tag.
+
+## Wiedervorlagen
+
+Für Consulting-Projekte können automatische Wiedervorlagen entstehen, wenn länger keine Aktivität im TicketTracker passiert ist.
+
+Mögliche Regeln:
+
+- erste Wiedervorlage nach einer definierten Anzahl Wochen ohne Aktivität
+- optionale zweite Wiedervorlage nach weiterem Stillstand
+- automatische Erledigung, wenn später wieder eine Session auf dem Projekt erfasst wird
+
+Die Einstellungen dafür liegen im Profil.
+
+## Zammad-Termine
+
+Aus Zammad-Tickets im Status **Wartend** oder **Abschluss** mit Datum kann TicketTracker Termin-ToDos erzeugen.
+
+So werden Zammad-Termine direkt im TicketTracker-Dashboard, in der ToDo-Seite und im Kalender sichtbar.
+
+## Fixe Abrechnungen
+
+Regelmäßige Leistungen können als fixe Abrechnung angelegt werden.
+
+Beispiele:
+
+- jeden Donnerstag 4 Stunden
+- bestimmte Wochentage mit festen Zeiten
+- alle 2 Wochen eine Leistung
+
+TicketTracker erzeugt daraus automatisch Sessions.
+
+## Feiertage und Ausnahmen
+
+Bayerische Feiertage werden berücksichtigt. Für Feiertage werden keine fixen Sessions erzeugt.
+
+Einzelne automatisch erzeugte Sessions können gelöscht werden, zum Beispiel wegen Urlaub, Krankheit oder Verschiebung. Diese Löschung wird als Ausnahme gespeichert, damit die Session beim nächsten Aufruf nicht automatisch wieder erscheint.
+
+Wenn eine wiederkehrende Leistung an einem anderen Tag erbracht wurde, kann die erzeugte Session bearbeitet oder verschoben werden.
+
+## Bewertung fixer Sessions
+
+Fix erzeugte Sessions verhalten sich im Abschluss wie normale Sessions:
+
+- Sie müssen bewertet werden.
+- **Abrechenbar** bleibt ein Zwischenstatus.
+- **Abgerechnet** und **Nicht abrechenbar** sind final.
+- Offene oder abrechenbare Sessions blockieren den Monatsabschluss.

docs/confluence/06-profil-admin-und-betrieb.md

@@ -0,0 +1,107 @@
+# Profil, Adminbereich und Betrieb
+
+Diese Seite beschreibt persönliche Einstellungen, Adminfunktionen und betriebliche Hinweise.
+
+## Profil
+
+Jeder Benutzer pflegt im Profil seine persönlichen Einstellungen:
+
+- Benutzername und Anzeigename
+- Passwort
+- persönlicher Zammad API-Token
+- Teamspace-Geraete-ID und Geraetepasswort
+- angezeigte Zammad User-ID
+- angezeigte Teamspace User-ID
+- Bewertungsabfrage beim Timerabschluss
+- Teamspace-Zeiten in TT erfassen
+- interne Zammad-Notiz beim Timerabschluss
+- Standard-Typ für interne Zammad-Notizen
+- optionale Zammad-Zeitaufrundung für `time_unit`
+- ATOSS/eMail-Sync-Optionen, sofern aktiviert
+- Projekt-Wiedervorlagen
+
+Passwortänderungen erfordern das aktuelle Passwort. Bleiben die Passwortfelder leer, werden nur die übrigen Profildaten gespeichert.
+
+## Zammad-Zugang im Profil
+
+Normale Benutzer können im Profil einen persönlichen Zammad API-Token hinterlegen. Beim Speichern eines neuen Tokens ruft TicketTracker Zammad ab und speichert die User-ID, die Zammad für diesen Token zurückliefert.
+
+Der Token wird verschlüsselt gespeichert. Die User-ID wird danach read-only im Profil angezeigt.
+
+## Teamspace-Zugang im Profil
+
+Jeder Benutzer kann seine Teamspace-Geraete-ID und sein Geraetepasswort speichern.
+
+Beim Speichern werden die Zugangsdaten gegen Teamspace geprüft. Wenn die Prüfung erfolgreich ist, speichert TicketTracker die Teamspace User-ID und zeigt sie im Profil an.
+
+Geraete-ID und Passwort werden verschlüsselt in der Datenbank gespeichert.
+
+## Teamspace-Zeiten in TT erfassen
+
+Der Schalter **Teamspace-Zeiten in TT erfassen** ist userbezogen und steuert, ob ein Benutzer Teamspace-Tageswerte in TicketTracker pflegt.
+
+**An:**
+
+- Teamspace-Tageswerte können in TicketTracker erfasst werden.
+- Manuelle Projektstunden sind editierbar.
+- Projekt-Ist kommt aus TT-Teamspace-Tageswerten plus manuellen Projektstunden.
+- Statistiken und Monatsprüfung vergleichen TT gegen Teamspace-Werte.
+
+**Aus:**
+
+- Teamspace-Tageswerte können nicht erfasst werden.
+- Manuelle Projektstunden sind ausgeblendet und serverseitig gesperrt.
+- Projekt-Ist kommt aus Teamspace.
+- Monatsprüfung und Widgets prüfen nur Session-Status.
+- Teamspace-Differenzen werden ausgeblendet.
+
+Der Schalter ist bewusst userbezogen. Zwei Benutzer können am gleichen Projekt arbeiten und trotzdem unterschiedliche Erfassungs- und Prüflogiken nutzen.
+
+## Adminbereich
+
+Der feste Admin ist für Systemverwaltung vorgesehen. Er kann:
+
+- Benutzer anlegen und bearbeiten
+- Passwörter für Benutzer setzen
+- Zammad-Adminzugang für Organisationssync pflegen
+- Teamspace-Base-URL speichern
+- Organisationen aus Zammad synchronisieren
+- SQL-Backups herunterladen
+- Restore-fähige SQL-Backups wieder einspielen
+
+Der Admin sieht keine Timer, keine persönlichen Auswertungen, keine Statistiken, keine fixen Abrechnungen und keinen Monatsabschluss. Diese Bereiche sind für normale Benutzer vorgesehen.
+
+## Teamspace-Base-URL
+
+Die Teamspace-Base-URL wird im Adminbereich gespeichert. Ohne diese URL können Benutzer ihre Teamspace-Zugangsdaten nicht sinnvoll für API-Syncs nutzen.
+
+Die persönlichen Teamspace-Zugangsdaten liegen dagegen im Benutzerprofil.
+
+## Backup und Restore
+
+Der Adminbereich kann SQL-Backups erzeugen und wieder einspielen.
+
+Der Export enthält alle Tabellen, die für den Systemstand notwendig sind, unter anderem:
+
+- Benutzer
+- Einstellungen
+- Organisationen
+- Tickets
+- Sessions
+- Teamspace-Werte
+- Projektinformationen
+- Unterpositionen
+- fixe Abrechnungen
+- Ausnahmen
+- Monatsabschlüsse
+
+Ein Restore ersetzt den aktuellen Datenbestand durch den Stand des Backups. Vor dem Restore wird die Struktur geprüft. Nach dem Restore ist eine neue Anmeldung mit den Zugangsdaten aus dem Backup notwendig.
+
+## Technischer Stack
+
+- Frontend: Next.js, React, shadcn/ui, Tailwind CSS
+- Backend: Node.js, Express, TypeScript
+- Datenbank: PostgreSQL
+- Deployment: Docker-fähig
+
+Secrets wie Zammad-Token und Teamspace-Zugangsdaten werden verschlüsselt gespeichert.

docs/user-guide.md

@@ -400,13 +400,14 @@ Einen separaten Tagesabschluss gibt es nicht. Die Tagesansicht ist nur eine gefi
 Die Seite `Monatsabschluss` enthaelt:
 
 - Checkliste
-- Offene Bewertungen
+- eine gemeinsame Pruefliste nach Ticket
-- Tage ohne Teamspace-Wert
 - Button zum Monat abschliessen oder wieder oeffnen
 
-Offene Bewertungen werden nach Ticket gruppiert. Mit `Ticket oeffnen` gelangt man direkt zur Bewertung.
+Die Pruefliste fuehrt offene Bewertungen, fehlende Teamspace-Tageswerte sowie Monats- und ticketgenaue Tagesabweichungen zusammen. Jedes Ticket erscheint nur einmal. Farbige Badges stehen in festen Spalten fuer die jeweilige Pruefart. Die zugehoerigen Tagesdetails mit TT-Teamspace-Wert, TS-API-Wert und Differenz werden im Ticketdetail am betroffenen Tag angezeigt. Mit `Ticket oeffnen` gelangt man direkt dorthin.
 
-Tage ohne Teamspace-Wert sind eine Pruefliste. Wenn ein Tag bewusst keinen Teamspace-Wert bekommen soll, kann der Eintrag mit `Zur Kenntnis` abgehakt werden.
+Wenn ein Tag bewusst keinen Teamspace-Wert bekommen soll, kann er innerhalb des Ticket-Eintrags mit `Zur Kenntnis` abgehakt werden. Trifft fuer denselben Tag zugleich eine TT/TS-Abweichung zu, werden beide Hinweise in einer gemeinsamen Tageszeile dargestellt.
+
+Ein hinterlegter TT-Teamspace-Wert setzt mindestens eine als `Abgerechnet` bewertete Session desselben Tickets und Tages voraus. Gibt es nur `Abrechenbar`, `Nicht abrechenbar` oder unbewertete Sessions, erscheint der Tageswert als Fehler. Der TT-Teamspace-Wert und eine eventuelle Abweichung zur TS-API werden trotzdem angezeigt.
 
 Zur Kenntnis genommene Eintraege koennen ueber die Checkbox `Zur Kenntnis anzeigen` wieder eingeblendet werden. Diese Anzeigeeinstellung bleibt im Browser gespeichert. Ein abgehakter Eintrag kann mit `Zuruecknehmen` wieder offen gemacht werden.
 

frontend/src/App.tsx

@@ -1,5 +1,6 @@
 import {
   CalendarDays,
+  Building2,
   CheckCircle2,
   ClipboardCheck,
   Command,
@@ -87,8 +88,10 @@ import { isRecurringBillingTicketNumber, ticketHasRecurringBilling } from "./rec
 import { activeElapsedMs, mergeTimerActivityDrafts, readStoredTimers, storageKeyForUser, ticketPattern, type TimerEntry } from "./timers";
 import { formatTodoPeriod, isTodoActiveOnDay, isTodoFixedOnDay, isTodoOverdue } from "./todos";
 import { AdminUsersPage } from "./views/AdminUsersPage";
+import { AdminOrganizationsPage } from "./views/AdminOrganizationsPage";
 import { AnalysisPage } from "./views/AnalysisPage";
 import { DashboardPage } from "./views/DashboardPage";
+import { DashboardTimersPage } from "./views/DashboardTimersPage";
 import { FaqPage } from "./views/FaqPage";
 import { LoginPage } from "./views/LoginPage";
 import { MonthlyClosePage } from "./views/MonthlyClosePage";
@@ -136,6 +139,10 @@ function pathWithoutSearch(value: string) {
   return value.split("?")[0];
 }
 
+function openTicketKey(ticketId: string) {
+  return `ticket:${ticketId}`;
+}
+
 function readOpenTickets(userId: string): OpenTicketNavItem[] {
   try {
     const raw = localStorage.getItem(openTicketsStorageKey(userId));
@@ -145,11 +152,15 @@ function readOpenTickets(userId: string): OpenTicketNavItem[] {
     }
 
     const parsed = JSON.parse(raw) as Partial<OpenTicketNavItem>[];
+    const tickets: OpenTicketNavItem[] = [];
 
-    return parsed
+    for (const item of parsed) {
-      .filter((item) => item.key && item.ticketId && item.ticketNumber && item.path)
+      if (!item.ticketId || !item.ticketNumber || !item.path) {
-      .map((item) => ({
+        continue;
-        key: String(item.key),
+      }
+
+      const ticket: OpenTicketNavItem = {
+        key: openTicketKey(String(item.ticketId)),
         ticketId: String(item.ticketId),
         ticketNumber: String(item.ticketNumber),
         periodType: item.periodType === "day" ? "day" : item.periodType === "month" ? "month" : "all",
@@ -157,7 +168,17 @@ function readOpenTickets(userId: string): OpenTicketNavItem[] {
         path: String(item.path),
         returnPath: typeof item.returnPath === "string" ? item.returnPath : undefined,
         dirty: false
-      }));
+      };
+      const existingIndex = tickets.findIndex((existing) => existing.ticketId === ticket.ticketId);
+
+      if (existingIndex >= 0) {
+        tickets[existingIndex] = ticket;
+      } else {
+        tickets.push(ticket);
+      }
+    }
+
+    return tickets.slice(-12);
   } catch {
     return [];
   }
@@ -207,6 +228,10 @@ function routeFromPath(pathWithSearch: string) {
   }
 
   if (pathname.startsWith("/dashboard")) {
+    if (pathname.startsWith("/dashboard/timers")) {
+      return { page: "dashboard-timers" as const };
+    }
+
     return { page: "dashboard" as const };
   }
 
@@ -242,6 +267,10 @@ function routeFromPath(pathWithSearch: string) {
     return { page: "admin-users" as const };
   }
 
+  if (pathname.startsWith("/admin/organizations")) {
+    return { page: "admin-organizations" as const };
+  }
+
   if (pathname.startsWith("/profile")) {
     return { page: "profile" as const };
   }
@@ -809,6 +838,7 @@ export function App() {
   const [timersLoaded, setTimersLoaded] = useState(false);
   const [timerOwnerId, setTimerOwnerId] = useState<string | null>(null);
   const [selectedTimerId, setSelectedTimerId] = useState<string | null>(null);
+  const [finishRequestTimerId, setFinishRequestTimerId] = useState<string | null>(null);
   const [tick, setTick] = useState(Date.now());
   const [openTickets, setOpenTickets] = useState<OpenTicketNavItem[]>([]);
   const [ticketReturnPaths, setTicketReturnPaths] = useState<Record<string, string>>({});
@@ -1142,7 +1172,7 @@ export function App() {
       return;
     }
 
-    if (route.page === "admin-users" || route.page === "profile" || route.page === "faq") {
+    if (route.page === "admin-users" || route.page === "admin-organizations" || route.page === "profile" || route.page === "faq") {
       return;
     }
 
@@ -1245,13 +1275,31 @@ export function App() {
 
   const updateOpenTicket = useCallback((ticket: OpenTicketNavItem) => {
     setOpenTickets((current) => {
-      const existingIndex = current.findIndex((item) => item.key === ticket.key);
+      const normalizedTicket = {
+        ...ticket,
+        key: openTicketKey(ticket.ticketId)
+      };
+      const existingIndex = current.findIndex((item) => item.ticketId === normalizedTicket.ticketId || item.key === normalizedTicket.key);
 
       if (existingIndex >= 0) {
-        return current.map((item, index) => (index === existingIndex ? ticket : item));
+        return current
+          .map((item, index) => {
+            if (item.ticketId === normalizedTicket.ticketId || item.key === normalizedTicket.key) {
+              return index === existingIndex
+                ? {
+                    ...item,
+                    ...normalizedTicket,
+                    returnPath: normalizedTicket.returnPath ?? item.returnPath
+                  }
+                : null;
+            }
+
+            return item;
+          })
+          .filter((item): item is OpenTicketNavItem => item !== null);
       }
 
-      return [...current, ticket].slice(-12);
+      return [...current, normalizedTicket].slice(-12);
     });
   }, []);
 
@@ -1313,7 +1361,7 @@ export function App() {
       return;
     }
 
-    setOpenTickets((items) => items.filter((item) => item.key !== ticket.key));
+    setOpenTickets((items) => items.filter((item) => item.ticketId !== ticket.ticketId && item.key !== ticket.key));
 
     if (route.page === "ticket" && route.ticketId === ticket.ticketId) {
       const returnPath = current.returnPath && pathWithoutSearch(current.returnPath) !== pathWithoutSearch(ticket.path) ? current.returnPath : "/analysis";
@@ -1354,13 +1402,15 @@ export function App() {
     ...(currentUser.role === "admin"
       ? [
           { type: "item" as const, href: "/admin/users", label: "Administration", icon: Shield, active: path.startsWith("/admin/users") },
+          { type: "item" as const, href: "/admin/organizations", label: "Organisationen", icon: Building2, active: path.startsWith("/admin/organizations") },
           { type: "separator" as const, key: "before-profile" },
           { type: "item" as const, href: "/profile", label: "Profil", icon: UserCog, active: path.startsWith("/profile") },
           { type: "separator" as const, key: "before-faq" },
           { type: "item" as const, href: "/faq", label: "FAQ", icon: CircleHelp, active: path.startsWith("/faq") }
         ]
       : [
-          { type: "item" as const, href: "/dashboard", label: "Dashboard", icon: LayoutDashboard, active: path.startsWith("/dashboard") },
+          { type: "item" as const, href: "/dashboard", label: "Dashboard", icon: LayoutDashboard, active: path === "/dashboard" },
+          { type: "item" as const, href: "/dashboard/timers", label: "Timer-Übersicht", icon: Timer, active: path.startsWith("/dashboard/timers") },
           { type: "separator" as const, key: "after-dashboard" },
           { type: "item" as const, href: "/timer", label: "Session starten", icon: Timer, active: path.startsWith("/timer") || path === "/" },
           { type: "item" as const, href: "/analysis", label: "Ticket-Sessions", icon: Ticket, active: path.startsWith("/analysis") },
@@ -1472,7 +1522,7 @@ export function App() {
                 <div ref={openTicketsListRef} className="max-h-[clamp(8rem,calc(100svh-31rem),24rem)] overflow-y-auto overscroll-contain pr-1 [scrollbar-gutter:stable] [scrollbar-width:thin]">
                   <SidebarMenu>
                     {openTickets.map((ticket) => {
-                      const isActive = pathWithoutSearch(path) === pathWithoutSearch(ticket.path);
+                      const isActive = route.page === "ticket" && route.ticketId === ticket.ticketId;
 
                       return (
                         <SidebarMenuItem key={ticket.key}>
@@ -1531,7 +1581,7 @@ export function App() {
             <SidebarMenuItem>
               <SidebarMenuButton tooltip="Worklog">
                 <FolderGit />
-                <span className="text-xs text-muted-foreground">v1.0.11-rc1</span>
+                <span className="text-xs text-muted-foreground">v1.2.0-rc1</span>
               </SidebarMenuButton>
             </SidebarMenuItem>
           </SidebarMenu>
@@ -1626,11 +1676,29 @@ export function App() {
                 setSelectedTimerId={setSelectedTimerId}
                 tick={tick}
                 currentUser={currentUser}
+                finishRequestId={finishRequestTimerId}
+                onFinishRequestHandled={() => setFinishRequestTimerId(null)}
               />
             ) : null}
             {!isAdmin && route.page === "dashboard" ? <DashboardPage currentUser={currentUser} onNavigate={navigate} /> : null}
+            {!isAdmin && route.page === "dashboard-timers" ? (
+              <DashboardTimersPage
+                timers={timers}
+                setTimers={setTimers}
+                selectedTimerId={selectedTimerId}
+                setSelectedTimerId={setSelectedTimerId}
+                tick={tick}
+                currentUser={currentUser}
+                onFinishTimer={(timerId) => {
+                  setSelectedTimerId(timerId);
+                  setFinishRequestTimerId(timerId);
+                  navigate("/timer");
+                }}
+                onOpenActiveTimer={() => navigate("/timer")}
+              />
+            ) : null}
             {!isAdmin && route.page === "analysis" ? <AnalysisPage currentUser={currentUser} onNavigate={navigate} /> : null}
-            {!isAdmin && route.page === "monthly-close" ? <MonthlyClosePage onNavigate={navigate} /> : null}
+            {!isAdmin && route.page === "monthly-close" ? <MonthlyClosePage currentUser={currentUser} onNavigate={navigate} /> : null}
             {!isAdmin && route.page === "statistics" ? <StatisticsPage currentUser={currentUser} onNavigate={navigate} /> : null}
             {!isAdmin && route.page === "projects" ? <ProjectsPage currentUser={currentUser} onNavigate={navigate} onStartTimer={startQuickTimer} /> : null}
             {!isAdmin && route.page === "todos" ? <TodosPage onNavigate={navigate} /> : null}
@@ -1639,6 +1707,7 @@ export function App() {
             {route.page === "faq" ? <FaqPage /> : null}
             {route.page === "profile" ? <ProfilePage currentUser={currentUser} onUserUpdated={setCurrentUser} /> : null}
             {route.page === "admin-users" && isAdmin ? <AdminUsersPage currentUser={currentUser} /> : null}
+            {route.page === "admin-organizations" && isAdmin ? <AdminOrganizationsPage /> : null}
             {route.page === "admin-users" && !isAdmin ? (
               <TimerPage
                 timers={timers}
@@ -1661,7 +1730,7 @@ export function App() {
                 returnPath={ticketReturnPaths[route.ticketId] ?? openTickets.find((ticket) => ticket.ticketId === route.ticketId)?.returnPath ?? "/analysis"}
               />
             ) : null}
-            {isAdmin && route.page !== "admin-users" && route.page !== "profile" && route.page !== "faq" ? <AdminUsersPage currentUser={currentUser} /> : null}
+            {isAdmin && route.page !== "admin-users" && route.page !== "admin-organizations" && route.page !== "profile" && route.page !== "faq" ? <AdminUsersPage currentUser={currentUser} /> : null}
           </div>
         </main>
       </SidebarInset>

frontend/src/api.ts

@@ -19,6 +19,7 @@ import type {
   TodoPriority,
   TodoStatus,
   WorkType,
+  WorkSegment,
   ZammadSessionArticleQueueItem
 } from "./types";
 import type { TimerEntry, TimerPhase } from "./timers";
@@ -32,10 +33,12 @@ type CreateSessionPayload = {
   startedAt: string;
   endedAt: string;
   durationSeconds: number;
+  workSegments?: WorkSegment[];
   zammadLookup?: boolean;
   projectTeamspaceEntryId?: string | null;
   billingStatus?: BillingStatus;
   createZammadArticle?: boolean;
+  zammadArticleDateHeader?: boolean;
   zammadArticleTypeId?: number;
 };
 
@@ -134,11 +137,35 @@ export type TeamspaceProjectIdSyncItem = {
   previousApiProjectId: string | null;
   apiProjectId: string | null;
   apiProjectUrl: string | null;
-  status: "updated" | "current" | "missing" | "ambiguous";
+  ttMonthBillableMinutes: number;
+  teamspaceMonthMinutes: number;
+  teamspaceMonthBillableMinutes: number;
+  teamspaceMonthEntryCount: number;
+  teamspaceMonthDeltaMinutes: number;
+  teamspaceMonthPositions: TeamspaceProjectIdSyncPosition[];
+  status: "updated" | "current" | "missing" | "ambiguous" | "excluded";
   message: string | null;
 };
 
+export type TeamspaceProjectIdSyncPosition = {
+  apiProjectId: string;
+  projectId: string | null;
+  label: string;
+  isSubentry: boolean;
+  billingType?: string | null;
+  minutes: number;
+  billableMinutes: number;
+  entryCount: number;
+  days?: Array<{
+    day: string;
+    minutes: number;
+    billableMinutes: number;
+    entryCount: number;
+  }>;
+};
+
 export type TeamspaceProjectIdSyncResult = {
+  month: string;
   checkedEntries: number;
   matched: number;
   updated: number;
@@ -151,6 +178,10 @@ export type TeamspaceProjectIdSyncResult = {
   remoteSubprojectsScanned: number;
   subentriesSynced: number;
   subentriesRemoved: number;
+  teamspaceTimeEntriesScanned: number;
+  teamspaceTimeEntriesMapped: number;
+  teamspaceTimeBillableMinutes: number;
+  teamspaceTimeDeltaMinutes: number;
   duplicateRemoteProjectIds: string[];
   items: TeamspaceProjectIdSyncItem[];
 };
@@ -161,6 +192,10 @@ export type TeamspaceProjectSubentrySyncResult = {
   remoteProjectsScanned: number;
   subentriesSynced: number;
   subentriesRemoved: number;
+  monthsSynced: string[];
+  teamspaceTimeEntriesScanned: number;
+  teamspaceTimeEntriesMapped: number;
+  teamspaceTimeBillableMinutes: number;
 };
 
 export type TeamspaceAllSubentrySyncResult = {
@@ -298,8 +333,10 @@ export function updateCurrentUser(payload: {
   teamspaceDevicePassword?: string;
   zammadEmailSessionWebhookEnabled?: boolean;
   sessionBillingPromptEnabled?: boolean;
+  sessionWorkSegmentsEnabled?: boolean;
   teamspaceTimeTrackingEnabled?: boolean;
   zammadSessionNoteDefaultEnabled?: boolean;
+  zammadSessionNoteDateHeaderEnabled?: boolean;
   zammadTimeUnitRoundingEnabled?: boolean;
   zammadTimeUnitRoundingMinutes?: number;
   zammadAtossEmailSyncEnabled?: boolean;
@@ -404,6 +441,37 @@ export function updateAdminUser(
   });
 }
 
+export type TeamspaceInitialActualsSyncResult = {
+  userId: string;
+  fromMonth: string;
+  toMonth: string;
+  checkedEntries: number;
+  matchedEntries: number;
+  updatedProjectIds: number;
+  missingEntries: number;
+  ambiguousEntries: number;
+  monthsChecked: number;
+  monthsSkippedClosed: number;
+  teamspaceTimeEntriesScanned: number;
+  updatedManualEntries: number;
+  importedManualMinutes: number;
+  existingDayBillingMinutes: number;
+};
+
+export function syncAdminUserTeamspaceInitialActuals(userId: string, payload: { fromMonth?: string; toMonth?: string }) {
+  return request<{ result: TeamspaceInitialActualsSyncResult }>(`/api/admin/users/${userId}/teamspace-initial-actuals/sync`, {
+    method: "POST",
+    timeoutMs: 10 * 60 * 1000,
+    body: JSON.stringify(payload)
+  });
+}
+
+export function unlockAdminUserTeamspaceInitialActuals(userId: string) {
+  return request<{ user: AdminUser }>(`/api/admin/users/${userId}/teamspace-initial-actuals/unlock`, {
+    method: "POST"
+  });
+}
+
 export async function downloadDatabaseExport() {
   const response = await fetch("/api/admin/export/database", {
     credentials: "same-origin"
@@ -470,6 +538,33 @@ export function getOrganizations(search = "") {
   return request<{ organizations: Organization[] }>(`/api/organizations${params.size ? `?${params}` : ""}`);
 }
 
+export function getAdminOrganizations(options: {
+  search?: string;
+  page?: number;
+  pageSize?: number | "all";
+  missingAssignment?: boolean;
+} = {}) {
+  const params = new URLSearchParams();
+
+  if (options.search?.trim()) {
+    params.set("search", options.search.trim());
+  }
+
+  if (options.page) {
+    params.set("page", String(options.page));
+  }
+
+  if (options.pageSize) {
+    params.set("pageSize", String(options.pageSize));
+  }
+
+  if (options.missingAssignment) {
+    params.set("missingAssignment", "true");
+  }
+
+  return request<{ organizations: Organization[]; total: number; page: number; pageSize: number | "all" }>(`/api/admin/organizations${params.size ? `?${params}` : ""}`);
+}
+
 export function getZammadSettings() {
   return request<{ settings: { baseUrl: string; hasApiKey: boolean } }>("/api/admin/zammad/settings");
 }
@@ -482,18 +577,81 @@ export function saveZammadSettings(payload: { baseUrl: string; apiKey?: string }
 }
 
 export function getTeamspaceSettings() {
-  return request<{ settings: { baseUrl: string } }>("/api/admin/teamspace/settings");
+  return request<{ settings: { baseUrl: string; credentialsUserId: string | null } }>("/api/admin/teamspace/settings");
 }
 
-export function saveTeamspaceSettings(payload: { baseUrl: string }) {
+export function saveTeamspaceSettings(payload: { baseUrl: string; credentialsUserId?: string | null }) {
-  return request<{ settings: { baseUrl: string } }>("/api/admin/teamspace/settings", {
+  return request<{ settings: { baseUrl: string; credentialsUserId: string | null } }>("/api/admin/teamspace/settings", {
     method: "PUT",
     body: JSON.stringify(payload)
   });
 }
 
+export type TeamspaceProjectExclusion = {
+  teamspace_project: string;
+  teamspace_api_project_id: string | null;
+  teamspace_api_project_ids: string[] | null;
+  teamspace_name: string | null;
+  customer_name: string | null;
+  atoss_support_default: boolean;
+  atoss_support_valid_from: string | null;
+  atoss_support_valid_to: string | null;
+  customer_owner_option_id: string | null;
+  hotline_contract_option_id: string | null;
+  note: string;
+};
+
+export type OrganizationAttributeOption = {
+  id: string;
+  zammad_attribute_id: string;
+  attribute_name: "customer_owner" | "hotline_contract";
+  option_key: string;
+  display_name: string;
+  active: boolean;
+};
+
+export type TeamspaceAssignmentRule = {
+  id?: string;
+  name: string;
+  active: boolean;
+  priority: number;
+  customer_owner_option_id: string | null;
+  hotline_contract_option_id: string | null;
+  support_enabled: boolean;
+  consulting_enabled: boolean;
+  teamspace_project: string;
+  created_at?: string;
+  updated_at?: string;
+};
+
+export function getOrganizationAttributeOptions() {
+  return request<{ options: OrganizationAttributeOption[] }>("/api/admin/zammad/organization-attribute-options");
+}
+
+export function getTeamspaceAssignmentRules() {
+  return request<{ rules: TeamspaceAssignmentRule[] }>("/api/admin/teamspace/assignment-rules");
+}
+
+export function saveTeamspaceAssignmentRules(rules: TeamspaceAssignmentRule[]) {
+  return request<{ rules: TeamspaceAssignmentRule[] }>("/api/admin/teamspace/assignment-rules", {
+    method: "PUT",
+    body: JSON.stringify({ rules })
+  });
+}
+
+export function getTeamspaceProjectExclusions() {
+  return request<{ exclusions: TeamspaceProjectExclusion[] }>("/api/admin/teamspace/project-exclusions");
+}
+
+export function saveTeamspaceProjectExclusions(projects: Array<Pick<TeamspaceProjectExclusion, "teamspace_project" | "atoss_support_default" | "atoss_support_valid_from" | "atoss_support_valid_to" | "customer_owner_option_id" | "hotline_contract_option_id">>) {
+  return request<{ exclusions: TeamspaceProjectExclusion[] }>("/api/admin/teamspace/project-exclusions", {
+    method: "PUT",
+    body: JSON.stringify({ projects })
+  });
+}
+
 export function syncZammadOrganizations(payload: { baseUrl?: string; apiKey?: string }) {
-  return request<{ synced: number; skipped: number; removed: number; unlinkedTickets: number; unlinkedSessions: number }>("/api/admin/zammad/organizations/sync", {
+  return request<{ synced: number; attributeOptions: number; skipped: number; removed: number; unlinkedTickets: number; unlinkedSessions: number }>("/api/admin/zammad/organizations/sync", {
     method: "POST",
     body: JSON.stringify(payload)
   });
@@ -538,25 +696,46 @@ async function runZammadSyncJob(url: string, body: Record<string, unknown>, onJo
   return { jobId: job.id, result };
 }
 
-export async function syncExistingZammadTickets(fields: ZammadSyncExistingFields, options: { dryRun?: boolean; ticketNumbers?: string[] } = {}) {
+export async function syncExistingZammadTickets(fields: ZammadSyncExistingFields, options: { dryRun?: boolean; ticketNumbers?: string[] } = {}, onJobStarted?: (job: ZammadSyncJob) => void) {
   const { result } = await runZammadSyncJob("/api/zammad-sync/jobs/existing", {
     fields,
     dryRun: options.dryRun ?? true,
     ticketNumbers: options.ticketNumbers
-  });
+  }, onJobStarted);
 
   return result;
 }
 
-export async function importOwnZammadConsultingTickets(options: { dryRun?: boolean; ticketNumbers?: string[] } = {}) {
+export async function importOwnZammadConsultingTickets(options: { dryRun?: boolean; ticketNumbers?: string[] } = {}, onJobStarted?: (job: ZammadSyncJob) => void) {
   const { result } = await runZammadSyncJob("/api/zammad-sync/jobs/consulting-import", {
     dryRun: options.dryRun ?? true,
     ticketNumbers: options.ticketNumbers
-  });
+  }, onJobStarted);
 
   return result;
 }
 
+export function syncExistingZammadTicketsDirect(fields: ZammadSyncExistingFields, onJobStarted?: (job: ZammadSyncJob) => void) {
+  return runZammadSyncJob("/api/zammad-sync/jobs/existing", {
+    fields,
+    dryRun: false
+  }, onJobStarted);
+}
+
+export function importOwnZammadConsultingTicketsDirect(onJobStarted?: (job: ZammadSyncJob) => void) {
+  return runZammadSyncJob("/api/zammad-sync/jobs/consulting-import", {
+    dryRun: false
+  }, onJobStarted);
+}
+
+export function syncZammadMailSessionsDirect(daysBack: number, perPage: number, onJobStarted?: (job: ZammadSyncJob) => void) {
+  return runZammadSyncJob("/api/zammad-sync/jobs/mail-sessions", {
+    dryRun: false,
+    daysBack,
+    perPage
+  }, onJobStarted);
+}
+
 export function previewExistingZammadTickets(fields: ZammadSyncExistingFields, onJobStarted?: (job: ZammadSyncJob) => void) {
   return runZammadSyncJob("/api/zammad-sync/jobs/existing", {
     fields,
@@ -597,16 +776,18 @@ export function applyZammadMailSessionsFromPreview(previewJobId: string, article
   }, onJobStarted);
 }
 
-export function syncTeamspaceProjectIds() {
+export function syncTeamspaceProjectIds(month?: string) {
   return request<{ result: TeamspaceProjectIdSyncResult }>("/api/teamspace/project-ids/sync", {
     method: "POST",
+    body: JSON.stringify(month ? { month } : {}),
     timeoutMs: 5 * 60 * 1000
   });
 }
 
-export function syncProjectTeamspaceSubentries(projectId: string) {
+export function syncProjectTeamspaceSubentries(projectId: string, months?: string[]) {
   return request<{ result: TeamspaceProjectSubentrySyncResult }>(`/api/projects/${projectId}/teamspace-subentries/sync`, {
     method: "POST",
+    body: JSON.stringify(months?.length ? { months } : {}),
     timeoutMs: 5 * 60 * 1000
   });
 }
@@ -639,6 +820,9 @@ export function createRecurringBilling(payload: {
   organizationId: string;
   activity: string;
   workType: WorkType;
+  teamspaceProject?: string | null;
+  hourBudgetMinutes?: number | null;
+  manualConsumptionMinutes?: number | null;
   recurrenceType: "weekly" | "every_n_weeks";
   intervalValue: number;
   validFrom: string;
@@ -664,6 +848,9 @@ export function updateRecurringBilling(
         organizationId: string;
         activity: string;
         workType: WorkType;
+        teamspaceProject?: string | null;
+        hourBudgetMinutes?: number | null;
+        manualConsumptionMinutes?: number | null;
         recurrenceType: "weekly" | "every_n_weeks";
         intervalValue: number;
         validFrom: string;
@@ -935,6 +1122,13 @@ export function updateTicket(
   });
 }
 
+export function updateTicketAtossSupport(ticketId: string, atossSupport: boolean) {
+  return request<{ ticket: { atoss_support: boolean } }>(`/api/tickets/${ticketId}/atoss-support`, {
+    method: "PATCH",
+    body: JSON.stringify({ atossSupport })
+  });
+}
+
 export function updateSessionDetails(
   sessionId: string,
   payload: {

frontend/src/app/globals.css

@@ -54,7 +54,7 @@
   --font-sans: var(--font-sans);
   --breakpoint-xxl: 108.125rem;
   --breakpoint-details: 85rem;
-
+  --text-xxs: 0.65rem;
 }
 
 /* Default theme styles (used when no data-theme-preset is set or when 'default' is selected).
@@ -166,6 +166,11 @@ These serve as the fallback; there is no separate default.css file. */
 }
 
 @layer utilities {
+  .text-xxs {
+    font-size: var(--text-xxs);
+    line-height: 0.65rem;
+  }
+
   [data-theme-preset]:not([data-theme-preset="default"]) .shadow-2xs {
     box-shadow: var(--shadow-2xs);
   }

frontend/src/components/TodoPanel.tsx

@@ -1,5 +1,5 @@
 import { CalendarDays, CheckCircle2, Circle, GripVertical, Pencil, Plus, Save, Trash2, X } from "lucide-react";
-import { FormEvent, useState } from "react";
+import { type FormEvent, type ReactNode, useState } from "react";
 import { toast } from "sonner";
 
 import { Badge } from "@/components/ui/badge";
@@ -40,9 +40,11 @@ type TodoPanelProps = {
   onNavigate?: (to: string) => void;
   reorderEnabled?: boolean;
   onReorder?: (draggedTodoId: string, targetTodoId: string) => void;
+  toolbar?: ReactNode;
+  compact?: boolean;
 };
 
-export function TodoPanel({ ticketId, todos, onChanged, showCreate = true, showTicketMeta = false, onNavigate, reorderEnabled = false, onReorder }: TodoPanelProps) {
+export function TodoPanel({ ticketId, todos, onChanged, showCreate = true, showTicketMeta = false, onNavigate, reorderEnabled = false, onReorder, toolbar, compact = false }: TodoPanelProps) {
   const [title, setTitle] = useState("");
   const [description, setDescription] = useState("");
   const [priority, setPriority] = useState<TodoPriority>("medium");
@@ -156,97 +158,100 @@ export function TodoPanel({ ticketId, todos, onChanged, showCreate = true, showT
   }
 
   return (
-    <div className="space-y-3">
+    <div className={compact ? "space-y-2" : "space-y-3"}>
-      {showCreate && ticketId ? (
+      {toolbar || (showCreate && ticketId) ? (
-        <div className="flex justify-end">
+        <div className={cn("flex flex-wrap items-center gap-2", toolbar ? "justify-start" : "justify-end")}>
-          <Dialog open={createOpen} onOpenChange={setCreateOpen}>
+          <div className="min-w-0">{toolbar}</div>
-            <DialogTrigger asChild>
+          {showCreate && ticketId ? (
-              <Button type="button" size="sm">
+            <Dialog open={createOpen} onOpenChange={setCreateOpen}>
-                <Plus className="size-4" />
+              <DialogTrigger asChild>
-                ToDo anlegen
+                <Button type="button" size="sm">
-              </Button>
+                  <Plus className="size-4" />
-            </DialogTrigger>
+                  ToDo anlegen
-            <DialogContent>
+                </Button>
-              <DialogHeader>
+              </DialogTrigger>
-                <DialogTitle>ToDo anlegen</DialogTitle>
+              <DialogContent>
-                <DialogDescription>Neue Aufgabe zu diesem Ticket oder Projekt erfassen.</DialogDescription>
+                <DialogHeader>
-              </DialogHeader>
+                  <DialogTitle>ToDo anlegen</DialogTitle>
-              <form className="space-y-4" onSubmit={submitTodo}>
+                  <DialogDescription>Neue Aufgabe zu diesem Ticket oder Projekt erfassen.</DialogDescription>
-                <div className="space-y-2">
+                </DialogHeader>
-                  <label className="text-sm font-medium" htmlFor={`todo-title-${ticketId}`}>
+                <form className="space-y-4" onSubmit={submitTodo}>
-                    Aufgabe
-                  </label>
-                  <Input id={`todo-title-${ticketId}`} value={title} onChange={(event) => setTitle(event.currentTarget.value)} autoFocus required />
-                </div>
-                <div className="space-y-2">
-                  <label className="text-sm font-medium" htmlFor={`todo-priority-${ticketId}`}>
-                    Priorität
-                  </label>
-                  <select
-                    id={`todo-priority-${ticketId}`}
-                    className="h-9 w-full rounded-lg border border-input bg-background px-2 text-sm focus-visible:outline-none focus-visible:ring-3 focus-visible:ring-ring/50"
-                    value={priority}
-                    onChange={(event) => setPriority(event.currentTarget.value as TodoPriority)}
-                  >
-                    {Object.entries(priorityLabels).map(([value, label]) => (
-                      <option key={value} value={value}>
-                        {label}
-                      </option>
-                    ))}
-                  </select>
-                </div>
-                <div className="grid gap-3 sm:grid-cols-2">
                   <div className="space-y-2">
-                    <label className="text-sm font-medium" htmlFor={`todo-starts-on-${ticketId}`}>
+                    <label className="text-sm font-medium" htmlFor={`todo-title-${ticketId}`}>
-                      Umsetzung von
+                      Aufgabe
                     </label>
-                    <div className="flex gap-2">
+                    <Input id={`todo-title-${ticketId}`} value={title} onChange={(event) => setTitle(event.currentTarget.value)} autoFocus required />
-                      <Input id={`todo-starts-on-${ticketId}`} type="date" value={startsOn} onChange={(event) => setStartsOn(event.currentTarget.value)} />
+                  </div>
-                      {startsOn ? (
+                  <div className="space-y-2">
-                        <Button type="button" size="icon" variant="ghost" className="shrink-0" onClick={() => setStartsOn("")} aria-label="Von-Datum entfernen">
+                    <label className="text-sm font-medium" htmlFor={`todo-priority-${ticketId}`}>
-                          <X className="size-4" />
+                      Priorität
-                        </Button>
+                    </label>
-                      ) : null}
+                    <select
+                      id={`todo-priority-${ticketId}`}
+                      className="h-9 w-full rounded-lg border border-input bg-background px-2 text-sm focus-visible:outline-none focus-visible:ring-3 focus-visible:ring-ring/50"
+                      value={priority}
+                      onChange={(event) => setPriority(event.currentTarget.value as TodoPriority)}
+                    >
+                      {Object.entries(priorityLabels).map(([value, label]) => (
+                        <option key={value} value={value}>
+                          {label}
+                        </option>
+                      ))}
+                    </select>
+                  </div>
+                  <div className="grid gap-3 sm:grid-cols-2">
+                    <div className="space-y-2">
+                      <label className="text-sm font-medium" htmlFor={`todo-starts-on-${ticketId}`}>
+                        Umsetzung von
+                      </label>
+                      <div className="flex gap-2">
+                        <Input id={`todo-starts-on-${ticketId}`} type="date" value={startsOn} onChange={(event) => setStartsOn(event.currentTarget.value)} />
+                        {startsOn ? (
+                          <Button type="button" size="icon" variant="ghost" className="shrink-0" onClick={() => setStartsOn("")} aria-label="Von-Datum entfernen">
+                            <X className="size-4" />
+                          </Button>
+                        ) : null}
+                      </div>
+                    </div>
+                    <div className="space-y-2">
+                      <label className="text-sm font-medium" htmlFor={`todo-ends-on-${ticketId}`}>
+                        Umsetzung bis
+                      </label>
+                      <div className="flex gap-2">
+                        <Input id={`todo-ends-on-${ticketId}`} type="date" value={endsOn} onChange={(event) => setEndsOn(event.currentTarget.value)} />
+                        {endsOn ? (
+                          <Button type="button" size="icon" variant="ghost" className="shrink-0" onClick={() => setEndsOn("")} aria-label="Bis-Datum entfernen">
+                            <X className="size-4" />
+                          </Button>
+                        ) : null}
+                      </div>
                     </div>
                   </div>
                   <div className="space-y-2">
-                    <label className="text-sm font-medium" htmlFor={`todo-ends-on-${ticketId}`}>
+                    <label className="text-sm font-medium" htmlFor={`todo-description-${ticketId}`}>
-                      Umsetzung bis
+                      Details
                     </label>
-                    <div className="flex gap-2">
+                    <Textarea
-                      <Input id={`todo-ends-on-${ticketId}`} type="date" value={endsOn} onChange={(event) => setEndsOn(event.currentTarget.value)} />
+                      id={`todo-description-${ticketId}`}
-                      {endsOn ? (
+                      className="min-h-24"
-                        <Button type="button" size="icon" variant="ghost" className="shrink-0" onClick={() => setEndsOn("")} aria-label="Bis-Datum entfernen">
+                      value={description}
-                          <X className="size-4" />
+                      onChange={(event) => setDescription(event.currentTarget.value)}
-                        </Button>
+                    />
-                      ) : null}
-                    </div>
                   </div>
-                </div>
+                  <div className="flex justify-end">
-                <div className="space-y-2">
+                    <Button type="submit" disabled={saving}>
-                  <label className="text-sm font-medium" htmlFor={`todo-description-${ticketId}`}>
+                      <Plus className="size-4" />
-                    Details
+                      {saving ? "Speichert..." : "Anlegen"}
-                  </label>
+                    </Button>
-                  <Textarea
+                  </div>
-                    id={`todo-description-${ticketId}`}
+                </form>
-                    className="min-h-24"
+              </DialogContent>
-                    value={description}
+            </Dialog>
-                    onChange={(event) => setDescription(event.currentTarget.value)}
+          ) : null}
-                  />
-                </div>
-                <div className="flex justify-end">
-                  <Button type="submit" disabled={saving}>
-                    <Plus className="size-4" />
-                    {saving ? "Speichert..." : "Anlegen"}
-                  </Button>
-                </div>
-              </form>
-            </DialogContent>
-          </Dialog>
         </div>
       ) : null}
 
-      <div className="space-y-2">
+      <div className={compact ? "space-y-1.5" : "space-y-2"}>
         {todos.map((todo) => {
           const isEditing = editingId === todo.id;
           const periodLabel = formatTodoPeriod(todo);
@@ -256,7 +261,8 @@ export function TodoPanel({ ticketId, todos, onChanged, showCreate = true, showT
             <div
               key={todo.id}
               className={cn(
-                "rounded-md border bg-card/50 p-3 transition-colors",
+                "rounded-md border bg-card/50 transition-colors",
+                compact ? "p-2" : "p-3",
                 overdue && "border-red-500/50 bg-red-500/10",
                 todo.status === "done" && "opacity-70",
                 reorderEnabled && draggingId === todo.id && "border-primary/50 bg-primary/5"
@@ -393,7 +399,7 @@ export function TodoPanel({ ticketId, todos, onChanged, showCreate = true, showT
         })}
       </div>
 
-      {todos.length === 0 ? <p className="rounded-md border bg-muted/20 p-4 text-center text-sm text-muted-foreground">Keine ToDos vorhanden.</p> : null}
+      {todos.length === 0 ? <p className={cn("rounded-md border bg-muted/20 text-center text-sm text-muted-foreground", compact ? "p-3" : "p-4")}>Keine ToDos vorhanden.</p> : null}
     </div>
   );
 }

frontend/src/components/icons/ListClockIcon.tsx

@@ -0,0 +1,16 @@
+import { Icon, type IconNode, type LucideProps } from "lucide-react";
+
+const listClockIconNode: IconNode = [
+  ["path", { d: "M3 6h.01", key: "1es8zl" }],
+  ["path", { d: "M3 12h.01", key: "1v72e3" }],
+  ["path", { d: "M3 18h.01", key: "1h3o6d" }],
+  ["path", { d: "M7 6h10", key: "1b9f9n" }],
+  ["path", { d: "M7 12h5", key: "1f8yah" }],
+  ["path", { d: "M7 18h3", key: "1ul03r" }],
+  ["circle", { cx: "17", cy: "17", r: "4", key: "y9qv7f" }],
+  ["path", { d: "M17 15v2l1.5 1.5", key: "d4d9bm" }]
+];
+
+export function ListClockIcon(props: LucideProps) {
+  return <Icon iconNode={listClockIconNode} {...props} />;
+}

frontend/src/help-content.ts

@@ -158,12 +158,16 @@ export const helpSections: HelpSection[] = [
     quickItems: [
       "Ticketnummer, Organisation und Art sind bearbeitbar.",
       "Organisationen kommen aus der lokalen Zammad-Synchronisation.",
+      "Atoss Support ist ein bewusster Fallback am gesamten Support-Ticket.",
       "Die Art wiederkehrender Sessions kommt aus der Regel."
     ],
     details: [
       "Ticketnummern können korrigiert werden, falls beim Starten oder Nachtragen ein falscher Bezug gewählt wurde.",
       "Die Organisation wird immer über die Suchliste gewählt. Dadurch sind spätere Auswertungen pro Organisation zuverlässig.",
       "Änderungen an Organisation und Art werden auf vorhandene manuelle Sessions dieses Tickets übernommen.",
+      "Zammad-Verwaltung und automatische Teamspace-Zuordnungen werden kompakt als Badges in den Ticketdaten angezeigt.",
+      "Die automatische TS-Zuordnung prüft zuerst ein am Ticket hinterlegtes Projekt und danach die Zuordnungsregeln aus dem Adminbereich. Der Haken Atoss Support greift nur, wenn beides fehlt.",
+      "Die Auswahl Atoss Support wird nur bei Support-Tickets ohne Projekt- oder Regelzuordnung angezeigt. Ist sie aktiviert, werden alle Sessions des Tickets anhand ihres Datums dem dafür im Adminbereich gültigen Atoss-Support-Projekt zugewiesen. Ohne Haken bleibt das Ticket bewusst unzugeordnet und muss manuell geprüft werden.",
       "Bei wiederkehrenden Sessions ist die Art nicht direkt an der Session änderbar. Sie wird ausschließlich über die fixe Abrechnungsregel gesteuert.",
       "Wenn ein Ticket bereits durch einen anderen Benutzer bekannt ist, können dessen Ticketdaten beim Beenden eines Timers übernommen werden. Die Session selbst bleibt trotzdem deinem Benutzer zugeordnet."
     ]
@@ -341,7 +345,9 @@ export const helpSections: HelpSection[] = [
     description: "Der Monatsabschluss ist die Kontrollseite für offene Bewertungen und Teamspace-Punkte vor dem Abschluss.",
     quickItems: [
       "Bewertungen sind Pflicht für den Abschluss.",
-      "Tage ohne Teamspace-Wert können zur Kenntnis genommen werden.",
+      "Alle Prüfpunkte werden pro Ticket in einem Eintrag zusammengeführt.",
+      "Tage ohne Teamspace-Wert können innerhalb des Tickets zur Kenntnis genommen werden.",
+      "Support und ausgenommene Consulting-Projekte werden über Ticket#XXXXXX pro Tag mit der TS-API abgeglichen.",
       "Der Monat kann wieder geöffnet werden."
     ],
     details: [
@@ -351,7 +357,11 @@ export const helpSections: HelpSection[] = [
       "Zur Kenntnis genommene Einträge können über die Checkbox Zur Kenntnis anzeigen wieder eingeblendet werden.",
       "Die Kenntnisnahme kann pro Eintrag über Zurücknehmen rückgängig gemacht werden.",
       "Die Einstellung, ob zur Kenntnis genommene Einträge angezeigt werden, bleibt im Browser gespeichert.",
-      "Offene Bewertungen werden nach Ticket gruppiert. Ein Klick auf Ticket öffnen führt zur Bewertung im Ticket.",
+      "Die Prüfliste führt offene Bewertungen, fehlende Teamspace-Tageswerte sowie Monats- und Tagesabweichungen nach Ticket zusammen. Dadurch erscheint jedes Ticket nur einmal.",
+      "Die Ticketzeile zeigt die Prüfarten als farbige Badges in festen Spalten. Die betroffenen Tage mit TT-Teamspace-Wert, TS-API-Wert und Differenz stehen direkt im Ticketdetail. Ein Klick auf Ticket öffnen führt dorthin.",
+      "Ein hinterlegter TT-Teamspace-Wert ist nur gültig, wenn es an diesem Ticket-Tag mindestens eine als Abgerechnet bewertete Session gibt. Andernfalls zeigt die Prüfliste einen Fehler und nennt zusätzlich vorhandene abrechenbare, nicht abrechenbare oder unbewertete Sessions.",
+      "Der ticketgenaue TS-Abgleich erkennt Teamspace-Unterpositionen, deren Bezeichnung mit Ticket#XXXXXX beginnt. Er vergleicht deren API-Tageswerte mit den in TicketTracker gepflegten Teamspace-Zeiten an den Session-Tagen desselben Tickets.",
+      "Der ticketgenaue Abgleich gilt für Support-Tickets und für Consulting-Tickets auf einem in der Administration ausgenommenen Teamspace-Projekt. Angezeigt werden sowohl fehlende Zeit in Teamspace als auch fehlende Zeit in TicketTracker.",
       "Es gibt keinen Tagesabschluss. Tagesansichten dienen nur der Kontrolle."
     ]
   },
@@ -561,6 +571,10 @@ export const helpSections: HelpSection[] = [
       "Admins können bestehende Benutzer bearbeiten, Passwörter setzen und Benutzer deaktivieren.",
       "Der feste Admin-Zugang kann nicht deaktiviert oder zur normalen User-Rolle herabgestuft werden.",
       "Der Data-Sync speichert Zammad-Zugangsdaten und synchronisiert Organisationen in die lokale Datenbank.",
+      "Beim Organisationsabgleich werden zuerst die Zammad-Auswahloptionen für Zugeordnet und Hotline synchronisiert. In den globalen Teamspace-Projektausnahmen können diese Optionen anschließend pro Projekt ausgewählt werden.",
+      "Automatische TS-Zuordnungsregeln kombinieren optional Zugeordnet und Hotline mit Support und/oder Consulting sowie einem Zielprojekt. Sind beide Attribute gesetzt, müssen beide passen; bei mehreren Treffern gewinnt die kleinste Priorität.",
+      "Beim Zammad-Sync gilt die Reihenfolge: Ein konkretes TS-Projekt hat Vorrang. Genau ein Projekt wird allen Sessions automatisch zugeordnet; bei mehreren Projekten erfolgt die Auswahl beim Speichern einer Session manuell. Nur ohne konkretes Projekt wird eine passende Regel angewendet und allen Sessions des Tickets zugeordnet.",
+      "Die im Sync ermittelte Regelzuordnung wird im Ticketdetail angezeigt. Greift keine Regel, bleibt das Ticket ohne automatische TS-Zuordnung.",
       "Der Zammad-Ticket-Sync aktualisiert Titel, Organisation, Typ, Zammad-Status, Zammad-Priorität sowie Teamspace-Projekte und Budgets je nach gewählter Option.",
       "Zammad-Projektwerte können mehrere Teamspace-IDs enthalten. TicketTracker erkennt zusammenhängende IDs und legt entsprechend mehrere Teamspace-Einträge an.",
       "Beim Budget-Sync bleiben geschützte TicketTracker-Budgets unverändert. Die Option Budget-Schutz im Sync ignorieren überschreibt auch geschützte Budgets mit Zammad-Werten.",

frontend/src/timers.ts

@@ -1,4 +1,4 @@
-import type { BillingStatus } from "./types";
+import type { BillingStatus, WorkSegment } from "./types";
 
 export type TimerPhase = "running" | "paused";
 
@@ -16,6 +16,7 @@ export type TimerEntry = {
   startedAt: number;
   pausedTotalMs: number;
   pausedAt: number | null;
+  workSegments?: WorkSegment[];
   phase: TimerPhase;
 };
 
@@ -58,6 +59,34 @@ export function resumeEntry(timer: TimerEntry, now = Date.now()): TimerEntry {
   };
 }
 
+function normalizeWorkSegments(value: unknown): WorkSegment[] {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+
+  return value
+    .map((segment) => {
+      if (!segment || typeof segment !== "object") {
+        return null;
+      }
+
+      const raw = segment as Partial<WorkSegment>;
+      if (typeof raw.startedAt !== "string" || Number.isNaN(new Date(raw.startedAt).getTime())) {
+        return null;
+      }
+
+      if (raw.endedAt !== null && raw.endedAt !== undefined && (typeof raw.endedAt !== "string" || Number.isNaN(new Date(raw.endedAt).getTime()))) {
+        return null;
+      }
+
+      return {
+        startedAt: new Date(raw.startedAt).toISOString(),
+        endedAt: raw.endedAt ? new Date(raw.endedAt).toISOString() : null,
+      };
+    })
+    .filter((segment): segment is WorkSegment => Boolean(segment));
+}
+
 export function normalizeTimers(timers: TimerEntry[]) {
   let runningSeen = false;
   const now = Date.now();
@@ -70,6 +99,7 @@ export function normalizeTimers(timers: TimerEntry[]) {
         activity: typeof timer.activity === "string" ? timer.activity : "",
         zammadArticleBody: typeof timer.zammadArticleBody === "string" ? timer.zammadArticleBody : "",
         billingStatus: timer.billingStatus === "billed" ? "billable" : timer.billingStatus === "billable" || timer.billingStatus === "non_billable" ? timer.billingStatus : null,
+        workSegments: normalizeWorkSegments(timer.workSegments),
       };
 
       if (timer.phase !== "running") {

frontend/src/types.ts

@@ -16,8 +16,10 @@ export type AuthUser = {
   has_teamspace_credentials: boolean;
   zammad_email_session_webhook_enabled: boolean;
   session_billing_prompt_enabled: boolean;
+  session_work_segments_enabled: boolean;
   teamspace_time_tracking_enabled: boolean;
   zammad_session_note_default_enabled: boolean;
+  zammad_session_note_date_header_enabled: boolean;
   zammad_time_unit_rounding_enabled: boolean;
   zammad_time_unit_rounding_minutes: number;
   zammad_atoss_email_sync_enabled: boolean;
@@ -73,10 +75,19 @@ export type DashboardDayTicket = {
 };
 
 export type AdminUser = AuthUser & {
+  teamspace_initial_actuals_synced_at: string | null;
+  teamspace_initial_actuals_synced_by: string | null;
+  teamspace_initial_actuals_unlocked_at: string | null;
+  teamspace_initial_actuals_unlocked_by: string | null;
   created_at: string;
   updated_at: string;
 };
 
+export type WorkSegment = {
+  startedAt: string;
+  endedAt: string | null;
+};
+
 export type ZammadSessionArticleQueueItem = {
   id: string;
   session_id: string;
@@ -98,7 +109,15 @@ export type Organization = {
   id: string;
   zammad_id: string;
   name: string;
+  customer_owner_option_id?: string | null;
+  customer_owner?: string | null;
+  customer_owner_display_name?: string | null;
+  hotline_contract_option_id?: string | null;
+  hotline_contract?: string | null;
+  hotline_contract_display_name?: string | null;
   synced_at: string;
+  created_at?: string;
+  updated_at?: string;
 };
 
 export type RecurringBillingSlot = {
@@ -119,6 +138,9 @@ export type RecurringBilling = {
   organization_name: string;
   activity: string;
   work_type: WorkType;
+  teamspace_project: string | null;
+  hour_budget_minutes: number | null;
+  manual_consumption_minutes: number;
   recurrence_type: "weekly" | "every_n_weeks";
   interval_value: number;
   valid_from: string;
@@ -138,6 +160,12 @@ export type TicketMeta = {
   organization_name: string | null;
   customer_name: string | null;
   work_type: WorkType | null;
+  atoss_support?: boolean;
+  can_manage_atoss_support?: boolean;
+  teamspace_assignment_rule_id?: string | null;
+  teamspace_assignment_rule_name?: string | null;
+  teamspace_assignment_project?: string | null;
+  teamspace_assignment_synced_at?: string | null;
   zammad_ticket_id?: string | null;
   zammad_group_id?: string | null;
   zammad_priority_id?: string | null;
@@ -204,6 +232,7 @@ export type ProjectSummary = {
   starts_on: string | null;
   ends_on: string | null;
   hour_budget_minutes: number | null;
+  teamspace_budget_excluded?: boolean;
   manual_consumption_minutes: number;
   teamspace_consumption_minutes?: number;
   consumption_minutes?: number;
@@ -236,6 +265,7 @@ export type ProjectTeamspaceEntry = {
   subentries?: ProjectTeamspaceSubentry[];
   is_default: boolean;
   hour_budget_minutes: number | null;
+  teamspace_budget_excluded?: boolean;
   budget_sync_disabled?: boolean;
   manual_consumption_minutes: number;
   teamspace_consumption_minutes?: number;
@@ -311,6 +341,44 @@ export type TicketSummary = {
   requires_closure: boolean;
   closed: boolean;
   closed_at: string | null;
+  teamspace_month_billable_minutes?: number;
+  teamspace_month_delta_minutes?: number;
+  teamspace_month_actuals?: TeamspaceMonthActual[];
+};
+
+export type TeamspaceMonthActual = {
+  entry_id: string;
+  teamspace_project: string | null;
+  teamspace_description: string | null;
+  teamspace_api_project_id: string | null;
+  teamspace_minutes: number;
+  teamspace_billable_minutes: number;
+  teamspace_time_entry_count: number;
+  delta_minutes: number;
+  positions: TeamspaceMonthActualPosition[];
+};
+
+export type TeamspaceMonthActualPosition = {
+  apiProjectId: string;
+  projectId: string | null;
+  mainProjectId?: string | null;
+  label: string;
+  description?: string | null;
+  ticketNumber?: string | null;
+  customerName?: string | null;
+  isSubentry: boolean;
+  billingType?: string | null;
+  minutes: number;
+  billableMinutes: number;
+  entryCount: number;
+  days?: TeamspaceMonthActualPositionDay[];
+};
+
+export type TeamspaceMonthActualPositionDay = {
+  day: string;
+  minutes: number;
+  billableMinutes: number;
+  entryCount: number;
 };
 
 export type OpenSession = {
@@ -362,6 +430,27 @@ export type TicketDayBilling = {
   billed_minutes: number;
 };
 
+export type TicketTeamspaceDay = {
+  day: string;
+  tracked_minutes: number;
+  crm_billed_minutes: number;
+  teamspace_entry_count: number;
+  delta_minutes: number;
+  session_count: number;
+  billed_session_count: number;
+  billable_session_count: number;
+  non_billable_session_count: number;
+  unrated_session_count: number;
+  has_tt_value: boolean;
+  missing_tt_value: boolean;
+  tt_value_without_billed_session: boolean;
+  acknowledged: boolean;
+  acknowledged_at: string | null;
+  comparison_enabled: boolean;
+  teamspace_excluded: boolean;
+  work_type: WorkType | null;
+};
+
 export type TicketAvailableMonth = {
   month: string;
   session_count: number;
@@ -381,6 +470,7 @@ export type SessionEntry = {
   ended_at: string;
   duration_seconds: number;
   rounded_minutes: number;
+  work_segments: WorkSegment[];
   billing_status: BillingStatus;
   billing_updated_at: string | null;
   created_at: string;
@@ -412,6 +502,12 @@ export type TicketPeriod = {
     organization_name: string | null;
     customer_name: string | null;
     work_type: WorkType | null;
+    atoss_support?: boolean;
+    can_manage_atoss_support?: boolean;
+    teamspace_assignment_rule_id?: string | null;
+    teamspace_assignment_rule_name?: string | null;
+    teamspace_assignment_project?: string | null;
+    teamspace_assignment_synced_at?: string | null;
     zammad_ticket_id?: string | null;
     zammad_group_id?: string | null;
     zammad_priority_id?: string | null;
@@ -430,8 +526,12 @@ export type TicketPeriod = {
   };
   sessions: SessionEntry[];
   dayBillings: TicketDayBilling[];
+  ticketTeamspaceDays?: TicketTeamspaceDay[];
   project?: ProjectSummary | null;
   todos?: TicketTodo[];
+  teamspaceMonthActuals?: TeamspaceMonthActual[];
+  teamspaceMonthBillableMinutes?: number;
+  teamspaceMonthDeltaMinutes?: number;
   canClose: boolean;
   openCount: number;
   ticketOpenCount: number;
@@ -472,6 +572,9 @@ export type StatisticsGroup = {
   open_sessions: number;
   crm_billed_minutes: number;
   crm_delta_minutes: number;
+  teamspace_month_billable_minutes?: number;
+  teamspace_month_delta_minutes?: number;
+  teamspace_month_actuals?: TeamspaceMonthActual[];
 };
 
 export type StatisticsTicket = {
@@ -492,6 +595,9 @@ export type StatisticsTicket = {
   open_sessions: number;
   crm_billed_minutes: number;
   crm_delta_minutes: number;
+  teamspace_month_billable_minutes?: number;
+  teamspace_month_delta_minutes?: number;
+  teamspace_month_actuals?: TeamspaceMonthActual[];
 };
 
 export type StatisticsOpenSession = {
@@ -517,15 +623,35 @@ export type StatisticsCrmDay = {
 };
 
 export type StatisticsTeamspaceDay = {
-  ticket_id: string;
+  ticket_id: string | null;
-  ticket_number: string;
+  ticket_number: string | null;
   organization_name: string;
   day: string;
   tracked_minutes: number;
   crm_billed_minutes: number;
+  teamspace_entry_count: number;
   delta_minutes: number;
   session_count: number;
   project_teamspace_project: string | null;
+  api_project_id?: string | null;
+  teamspace_project_id?: string | null;
+  teamspace_excluded?: boolean;
+  work_type?: WorkType | null;
+  tt_value_without_billed_session?: boolean;
+  billed_session_count?: number;
+  billable_session_count?: number;
+  non_billable_session_count?: number;
+  unrated_session_count?: number;
+};
+
+export type StatisticsTeamspaceMonthMismatch = {
+  ticket_id: string;
+  ticket_number: string;
+  organization_name: string;
+  crm_billed_minutes: number;
+  teamspace_month_billable_minutes: number;
+  teamspace_month_delta_minutes: number;
+  teamspace_month_actuals: TeamspaceMonthActual[];
 };
 
 export type StatisticsProjectFollowup = {
@@ -536,6 +662,7 @@ export type StatisticsProjectFollowup = {
   organization_name: string | null;
   teamspace_project: string | null;
   hour_budget_minutes: number | null;
+  teamspace_budget_excluded?: boolean;
   consumption_minutes: number;
   remaining_minutes: number | null;
   latest_tt_update: string;
@@ -582,6 +709,8 @@ export type StatisticsOverview = {
     activeDays: number;
     crmBilledMinutes: number;
     crmDeltaMinutes: number;
+    teamspaceApiBillableMinutes?: number;
+    teamspaceApiDeltaMinutes?: number;
   };
   dailySeries: StatisticsDailyBucket[];
   organizations: StatisticsGroup[];
@@ -592,6 +721,8 @@ export type StatisticsOverview = {
     missingCrmDays: StatisticsCrmDay[];
     acknowledgedMissingCrmDays: StatisticsCrmDay[];
     crmMismatches: StatisticsCrmDay[];
+    teamspaceMonthMismatches: StatisticsTeamspaceMonthMismatch[];
+    ticketTeamspaceMismatches: StatisticsTeamspaceDay[];
   };
   teamspaceDays: StatisticsTeamspaceDay[];
 };

frontend/src/views/AdminOrganizationsPage.tsx

@@ -0,0 +1,330 @@
+import { FormEvent, useEffect, useMemo, useRef, useState } from "react";
+import { Building2, DatabaseZap, RefreshCcw, Save, Search } from "lucide-react";
+import { toast } from "sonner";
+
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
+import { Checkbox } from "@/components/ui/checkbox";
+import { Input } from "@/components/ui/input";
+import { NativeSelect, NativeSelectOption } from "@/components/ui/native-select";
+import { Pagination, PaginationContent, PaginationItem, PaginationNext, PaginationPrevious } from "@/components/ui/pagination";
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
+import { HelpLink } from "@/components/HelpLink";
+import { getAdminOrganizations, getZammadSettings, saveZammadSettings, syncZammadOrganizations } from "../api";
+import { formatDateTime } from "../format";
+import type { Organization } from "../types";
+
+type PageSize = 10 | 20 | 50 | 100 | "all";
+
+const pageSizeOptions: PageSize[] = [10, 20, 50, 100, "all"];
+
+function pageSizeFromValue(value: string): PageSize {
+  if (value === "all") {
+    return "all";
+  }
+
+  const parsed = Number(value);
+  return pageSizeOptions.includes(parsed as PageSize) ? parsed as PageSize : 20;
+}
+
+function emptyText(value: string | null | undefined) {
+  return value?.trim() || "leer";
+}
+
+export function AdminOrganizationsPage() {
+  const [organizations, setOrganizations] = useState<Organization[]>([]);
+  const [total, setTotal] = useState(0);
+  const [page, setPage] = useState(1);
+  const [pageSize, setPageSize] = useState<PageSize>(20);
+  const [search, setSearch] = useState("");
+  const [missingAssignment, setMissingAssignment] = useState(false);
+  const [zammadBaseUrl, setZammadBaseUrl] = useState("");
+  const [zammadApiKey, setZammadApiKey] = useState("");
+  const [hasZammadApiKey, setHasZammadApiKey] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [savingZammadSettings, setSavingZammadSettings] = useState(false);
+  const [syncingOrganizations, setSyncingOrganizations] = useState(false);
+  const loadRequestId = useRef(0);
+
+  const pageCount = pageSize === "all" ? 1 : Math.max(1, Math.ceil(total / pageSize));
+  const safePage = Math.min(page, pageCount);
+  const rangeStart = total === 0 ? 0 : pageSize === "all" ? 1 : (safePage - 1) * pageSize + 1;
+  const rangeEnd = pageSize === "all" ? total : Math.min(safePage * pageSize, total);
+  const activeFilterCount = useMemo(
+    () => [search.trim(), missingAssignment].filter(Boolean).length,
+    [missingAssignment, search]
+  );
+
+  async function loadSettings() {
+    const result = await getZammadSettings();
+    setZammadBaseUrl(result.settings.baseUrl);
+    setHasZammadApiKey(result.settings.hasApiKey);
+  }
+
+  async function loadOrganizations() {
+    const requestId = loadRequestId.current + 1;
+    loadRequestId.current = requestId;
+    setLoading(true);
+
+    try {
+      const result = await getAdminOrganizations({
+        search,
+        page: safePage,
+        pageSize,
+        missingAssignment
+      });
+
+      if (requestId === loadRequestId.current) {
+        setOrganizations(result.organizations);
+        setTotal(result.total);
+      }
+    } catch (error) {
+      if (requestId === loadRequestId.current) {
+        toast.error("Organisationen konnten nicht geladen werden", {
+          description: error instanceof Error ? error.message : "Unbekannter Fehler"
+        });
+      }
+    } finally {
+      if (requestId === loadRequestId.current) {
+        setLoading(false);
+      }
+    }
+  }
+
+  useEffect(() => {
+    void loadSettings();
+  }, []);
+
+  useEffect(() => {
+    setPage(1);
+  }, [search, pageSize, missingAssignment]);
+
+  useEffect(() => {
+    void loadOrganizations();
+  }, [safePage, pageSize, search, missingAssignment]);
+
+  async function saveZammadAccess() {
+    setSavingZammadSettings(true);
+
+    try {
+      const result = await saveZammadSettings({
+        baseUrl: zammadBaseUrl,
+        apiKey: zammadApiKey.trim() || undefined
+      });
+      setZammadBaseUrl(result.settings.baseUrl);
+      setHasZammadApiKey(result.settings.hasApiKey);
+      setZammadApiKey("");
+      toast.success("Zammad-Zugang gespeichert", {
+        description: result.settings.hasApiKey ? "URL und API-Key sind hinterlegt." : "URL wurde gespeichert."
+      });
+    } catch (error) {
+      toast.error("Zammad-Zugang konnte nicht gespeichert werden", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setSavingZammadSettings(false);
+    }
+  }
+
+  async function syncOrganizations(event: FormEvent) {
+    event.preventDefault();
+    setSyncingOrganizations(true);
+
+    try {
+      const result = await syncZammadOrganizations({
+        baseUrl: zammadBaseUrl,
+        apiKey: zammadApiKey.trim() || undefined
+      });
+      toast.success("Organisationen synchronisiert", {
+        description: `${result.attributeOptions} Attributoptionen und ${result.synced} Organisationen gespeichert, ${result.removed} Organisationen entfernt, ${result.unlinkedTickets + result.unlinkedSessions} Verknüpfung(en) gelöst.`
+      });
+      setHasZammadApiKey(true);
+      setZammadApiKey("");
+      await loadOrganizations();
+    } catch (error) {
+      toast.error("Zammad-Sync fehlgeschlagen", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setSyncingOrganizations(false);
+    }
+  }
+
+  return (
+    <div className="space-y-4">
+      <div className="flex flex-col gap-3 lg:flex-row lg:items-end lg:justify-between">
+        <div>
+          <h2 className="text-xl font-semibold tracking-normal sm:text-2xl">Organisationsabgleich</h2>
+          <p className="text-sm text-muted-foreground">Zammad-Organisationen synchronisieren, prüfen und nach fehlenden Zuordnungen filtern.</p>
+        </div>
+        <Badge variant={activeFilterCount > 0 ? "secondary" : "outline"}>{activeFilterCount} Filter aktiv</Badge>
+      </div>
+
+      <Card>
+        <CardHeader className="gap-3 p-4 sm:flex-row sm:items-start sm:justify-between sm:space-y-0">
+          <div>
+            <CardTitle>Zammad-Sync</CardTitle>
+            <CardDescription>Zugang speichern und Organisationen aus Zammad in die lokale Datenbank übernehmen.</CardDescription>
+          </div>
+          <HelpLink anchor="organisationen" label="Hilfe zum Organisationsabgleich" />
+        </CardHeader>
+        <CardContent className="px-4 pb-4">
+          <form className="grid gap-3 lg:grid-cols-[minmax(220px,1fr)_minmax(220px,1fr)_auto_auto] lg:items-end" onSubmit={syncOrganizations}>
+            <div className="space-y-2">
+              <label className="text-sm font-medium" htmlFor="zammad-base-url">Zammad URL</label>
+              <Input
+                id="zammad-base-url"
+                placeholder="https://zammad.example.de"
+                value={zammadBaseUrl}
+                onChange={(event) => setZammadBaseUrl(event.currentTarget.value)}
+                required
+              />
+            </div>
+            <div className="space-y-2">
+              <label className="text-sm font-medium" htmlFor="zammad-api-key">API-Key</label>
+              <Input
+                id="zammad-api-key"
+                type="password"
+                placeholder={hasZammadApiKey ? "••••••••••••••••" : ""}
+                value={zammadApiKey}
+                onChange={(event) => setZammadApiKey(event.currentTarget.value)}
+              />
+            </div>
+            <Button type="button" variant="secondary" disabled={savingZammadSettings} onClick={() => void saveZammadAccess()}>
+              <Save className="size-4" />
+              {savingZammadSettings ? "Speichert..." : "Zugang speichern"}
+            </Button>
+            <Button type="submit" disabled={syncingOrganizations}>
+              <DatabaseZap className="size-4" />
+              {syncingOrganizations ? "Synchronisiert..." : "Synchronisieren"}
+            </Button>
+          </form>
+        </CardContent>
+      </Card>
+
+      <Card>
+        <CardHeader className="gap-3 p-4 xl:flex-row xl:items-end xl:justify-between xl:space-y-0">
+          <div>
+            <CardTitle>Organisationen</CardTitle>
+            <CardDescription>{loading ? "Lädt..." : `${rangeStart}-${rangeEnd} von ${total} Organisation(en)`}</CardDescription>
+          </div>
+          <div className="grid gap-2 md:grid-cols-[minmax(220px,1fr)_auto_auto] md:items-end">
+            <div className="space-y-1">
+              <label className="text-xs font-medium text-muted-foreground" htmlFor="organization-search">Suche</label>
+              <div className="relative">
+                <Search className="pointer-events-none absolute left-2.5 top-1/2 size-4 -translate-y-1/2 text-muted-foreground" />
+                <Input
+                  id="organization-search"
+                  className="pl-8"
+                  placeholder="Name, ID, Zuordnung, Hotline..."
+                  value={search}
+                  onChange={(event) => setSearch(event.currentTarget.value)}
+                />
+              </div>
+            </div>
+            <label className="flex h-9 items-center gap-2 rounded-md border bg-background px-3 text-sm">
+              <Checkbox checked={missingAssignment} onCheckedChange={(checked) => setMissingAssignment(checked === true)} />
+              Zuordnung fehlt
+            </label>
+            <div className="space-y-1">
+              <label className="text-xs font-medium text-muted-foreground" htmlFor="organization-page-size">Anzeigen</label>
+              <NativeSelect
+                id="organization-page-size"
+                className="w-28"
+                value={String(pageSize)}
+                onChange={(event) => setPageSize(pageSizeFromValue(event.currentTarget.value))}
+              >
+                {pageSizeOptions.map((option) => (
+                  <NativeSelectOption key={String(option)} value={String(option)}>
+                    {option === "all" ? "Alle" : option}
+                  </NativeSelectOption>
+                ))}
+              </NativeSelect>
+            </div>
+          </div>
+        </CardHeader>
+        <CardContent className="space-y-3 px-4 pb-4">
+          <div className="overflow-x-auto rounded-md border">
+            <Table>
+              <TableHeader>
+                <TableRow>
+                  <TableHead className="min-w-20">Zammad-ID</TableHead>
+                  <TableHead className="min-w-[260px]">Organisation</TableHead>
+                  <TableHead className="min-w-[180px]">Zugeordnet</TableHead>
+                  <TableHead className="min-w-[160px]">Hotline</TableHead>
+                  <TableHead className="min-w-[150px]">Synchronisiert</TableHead>
+                  <TableHead className="min-w-[150px]">Geändert</TableHead>
+                </TableRow>
+              </TableHeader>
+              <TableBody>
+                {organizations.map((organization) => (
+                  <TableRow key={organization.zammad_id}>
+                    <TableCell className="font-mono text-xs">{organization.zammad_id}</TableCell>
+                    <TableCell>
+                      <div className="flex min-w-0 items-center gap-2">
+                        <Building2 className="size-4 shrink-0 text-muted-foreground" />
+                        <span className="truncate font-medium">{organization.name}</span>
+                      </div>
+                    </TableCell>
+                    <TableCell className={organization.customer_owner ? "" : "text-muted-foreground"}>{emptyText(organization.customer_owner)}</TableCell>
+                    <TableCell className={organization.hotline_contract ? "" : "text-muted-foreground"}>{emptyText(organization.hotline_contract)}</TableCell>
+                    <TableCell className="text-xs text-muted-foreground">{formatDateTime(organization.synced_at)}</TableCell>
+                    <TableCell className="text-xs text-muted-foreground">{organization.updated_at ? formatDateTime(organization.updated_at) : "-"}</TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+            {organizations.length === 0 ? (
+              <div className="grid place-items-center gap-2 px-4 py-10 text-center text-sm text-muted-foreground">
+                <Building2 className="size-8" />
+                Keine Organisationen für die aktuellen Filter.
+              </div>
+            ) : null}
+          </div>
+
+          {pageSize !== "all" ? (
+            <Pagination className="justify-end">
+              <PaginationContent>
+                <PaginationItem>
+                  <PaginationPrevious
+                    href="#"
+                    text="Zurück"
+                    aria-disabled={safePage <= 1}
+                    className={safePage <= 1 ? "pointer-events-none opacity-50" : undefined}
+                    onClick={(event) => {
+                      event.preventDefault();
+                      setPage((current) => Math.max(1, current - 1));
+                    }}
+                  />
+                </PaginationItem>
+                <PaginationItem>
+                  <span className="flex h-9 items-center px-3 text-sm text-muted-foreground">
+                    Seite {safePage} von {pageCount}
+                  </span>
+                </PaginationItem>
+                <PaginationItem>
+                  <PaginationNext
+                    href="#"
+                    text="Weiter"
+                    aria-disabled={safePage >= pageCount}
+                    className={safePage >= pageCount ? "pointer-events-none opacity-50" : undefined}
+                    onClick={(event) => {
+                      event.preventDefault();
+                      setPage((current) => Math.min(pageCount, current + 1));
+                    }}
+                  />
+                </PaginationItem>
+              </PaginationContent>
+            </Pagination>
+          ) : null}
+
+          <Button type="button" variant="secondary" size="sm" disabled={loading} onClick={() => void loadOrganizations()}>
+            <RefreshCcw className="size-4" />
+            Aktualisieren
+          </Button>
+        </CardContent>
+      </Card>
+    </div>
+  );
+}

frontend/src/views/AdminUsersPage.tsx

@@ -1,5 +1,5 @@
 import { ChangeEvent, FormEvent, useEffect, useState } from "react";
-import { CheckCircle2, DatabaseBackup, DatabaseZap, Save, Shield, Unplug, Upload, UserPlus } from "lucide-react";
+import { CheckCircle2, DatabaseBackup, Plus, RotateCcw, Save, Shield, TimerReset, Trash2, Unplug, Upload, UserPlus } from "lucide-react";
 import { toast } from "sonner";
 
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
@@ -14,14 +14,21 @@ import {
   createAdminUser,
   downloadDatabaseExport,
   getAdminUsers,
+  getOrganizationAttributeOptions,
+  getTeamspaceAssignmentRules,
   getTeamspaceSettings,
-  getZammadSettings,
+  getTeamspaceProjectExclusions,
   restoreDatabaseBackup,
-  saveZammadSettings,
   saveTeamspaceSettings,
-  syncZammadOrganizations,
+  saveTeamspaceAssignmentRules,
+  saveTeamspaceProjectExclusions,
+  syncAdminUserTeamspaceInitialActuals,
+  unlockAdminUserTeamspaceInitialActuals,
   updateAdminUser,
   validateDatabaseBackup,
+  type TeamspaceProjectExclusion,
+  type TeamspaceAssignmentRule,
+  type OrganizationAttributeOption,
   type RestoreValidationResult
 } from "../api";
 import type { AdminUser, AuthUser } from "../types";
@@ -53,13 +60,15 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
   const [users, setUsers] = useState<AdminUser[]>([]);
   const [forms, setForms] = useState<Record<string, UserFormState>>({});
   const [newUser, setNewUser] = useState<UserFormState>(emptyForm);
-  const [zammadBaseUrl, setZammadBaseUrl] = useState("");
-  const [zammadApiKey, setZammadApiKey] = useState("");
-  const [hasZammadApiKey, setHasZammadApiKey] = useState(false);
   const [teamspaceBaseUrl, setTeamspaceBaseUrl] = useState("");
-  const [syncingOrganizations, setSyncingOrganizations] = useState(false);
+  const [teamspaceCredentialsUserId, setTeamspaceCredentialsUserId] = useState("");
-  const [savingZammadSettings, setSavingZammadSettings] = useState(false);
+  const [teamspaceProjectExclusions, setTeamspaceProjectExclusions] = useState<TeamspaceProjectExclusion[]>([]);
+  const [organizationAttributeOptions, setOrganizationAttributeOptions] = useState<OrganizationAttributeOption[]>([]);
+  const [teamspaceAssignmentRules, setTeamspaceAssignmentRules] = useState<TeamspaceAssignmentRule[]>([]);
+  const [newTeamspaceProjectExclusion, setNewTeamspaceProjectExclusion] = useState("");
   const [savingTeamspaceSettings, setSavingTeamspaceSettings] = useState(false);
+  const [savingTeamspaceProjectExclusions, setSavingTeamspaceProjectExclusions] = useState(false);
+  const [savingTeamspaceAssignmentRules, setSavingTeamspaceAssignmentRules] = useState(false);
   const [exportingDatabase, setExportingDatabase] = useState(false);
   const [restoreSql, setRestoreSql] = useState("");
   const [restoreValidation, setRestoreValidation] = useState<RestoreValidationResult | null>(null);
@@ -67,18 +76,29 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
   const [restoringDatabase, setRestoringDatabase] = useState(false);
   const [loading, setLoading] = useState(false);
   const [savingId, setSavingId] = useState<string | null>(null);
+  const [syncingInitialActualsId, setSyncingInitialActualsId] = useState<string | null>(null);
+  const [unlockingInitialActualsId, setUnlockingInitialActualsId] = useState<string | null>(null);
+  const [initialActualsFromMonthByUser, setInitialActualsFromMonthByUser] = useState<Record<string, string>>({});
   const [creating, setCreating] = useState(false);
 
   async function load(options: { preserveEdits?: boolean } = {}) {
     setLoading(true);
     try {
-      const [usersResult, zammadSettingsResult, teamspaceSettingsResult] = await Promise.all([getAdminUsers(), getZammadSettings(), getTeamspaceSettings()]);
+      const [usersResult, teamspaceSettingsResult, teamspaceProjectExclusionsResult, organizationAttributeOptionsResult, teamspaceAssignmentRulesResult] = await Promise.all([
+        getAdminUsers(),
+        getTeamspaceSettings(),
+        getTeamspaceProjectExclusions(),
+        getOrganizationAttributeOptions(),
+        getTeamspaceAssignmentRules()
+      ]);
       setUsers(usersResult.users);
 
       if (!options.preserveEdits) {
-        setZammadBaseUrl(zammadSettingsResult.settings.baseUrl);
-        setHasZammadApiKey(zammadSettingsResult.settings.hasApiKey);
         setTeamspaceBaseUrl(teamspaceSettingsResult.settings.baseUrl);
+        setTeamspaceCredentialsUserId(teamspaceSettingsResult.settings.credentialsUserId ?? "");
+        setTeamspaceProjectExclusions(teamspaceProjectExclusionsResult.exclusions);
+        setOrganizationAttributeOptions(organizationAttributeOptionsResult.options);
+        setTeamspaceAssignmentRules(teamspaceAssignmentRulesResult.rules);
       }
 
       setForms((current) =>
@@ -171,49 +191,64 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
     }
   }
 
-  async function syncOrganizations(event: FormEvent) {
+  function initialActualsLocked(user: AdminUser) {
-    event.preventDefault();
+    return Boolean(
-    setSyncingOrganizations(true);
+      user.teamspace_initial_actuals_synced_at &&
+      (!user.teamspace_initial_actuals_unlocked_at || user.teamspace_initial_actuals_unlocked_at <= user.teamspace_initial_actuals_synced_at)
+    );
+  }
 
+  function initialActualsStatus(user: AdminUser) {
+    if (initialActualsLocked(user)) {
+      return `ausgeführt ${new Date(user.teamspace_initial_actuals_synced_at as string).toLocaleDateString("de-DE")}`;
+    }
+
+    if (user.teamspace_initial_actuals_unlocked_at) {
+      return "entsperrt";
+    }
+
+    return "bereit";
+  }
+
+  async function syncInitialActuals(user: AdminUser) {
+    if (!window.confirm(`Teamspace-Istzeiten für ${user.display_name} initial als manuelle TS-Zeiten übernehmen? Vorhandene Tageswerte bleiben unverändert.`)) {
+      return;
+    }
+
+    setSyncingInitialActualsId(user.id);
     try {
-      const result = await syncZammadOrganizations({
+      const result = await syncAdminUserTeamspaceInitialActuals(user.id, {
-        baseUrl: zammadBaseUrl,
+        fromMonth: initialActualsFromMonthByUser[user.id] || undefined
-        apiKey: zammadApiKey.trim() || undefined
       });
-      toast.success("Organisationen synchronisiert", {
+      toast.success("TS-Istzeiten übernommen", {
-        description: `${result.synced} gespeichert, ${result.removed} entfernt, ${result.unlinkedTickets + result.unlinkedSessions} Verknüpfung(en) gelöst.`
+        description: `${result.result.updatedManualEntries} TS-Eintrag(e), ${Math.round(result.result.importedManualMinutes / 60 * 100) / 100} Std., Zeitraum ${result.result.fromMonth} bis ${result.result.toMonth}.`
       });
-      setHasZammadApiKey(true);
+      await load();
-      setZammadApiKey("");
     } catch (error) {
-      toast.error("Zammad-Sync fehlgeschlagen", {
+      toast.error("TS-Istzeiten konnten nicht übernommen werden", {
         description: error instanceof Error ? error.message : "Unbekannter Fehler"
       });
     } finally {
-      setSyncingOrganizations(false);
+      setSyncingInitialActualsId(null);
     }
   }
 
-  async function saveZammadAccess() {
+  async function unlockInitialActuals(user: AdminUser) {
-    setSavingZammadSettings(true);
+    if (!window.confirm(`Initialen Teamspace-Istzeiten-Sync für ${user.display_name} wieder freigeben?`)) {
+      return;
+    }
 
+    setUnlockingInitialActualsId(user.id);
     try {
-      const result = await saveZammadSettings({
+      await unlockAdminUserTeamspaceInitialActuals(user.id);
-        baseUrl: zammadBaseUrl,
+      toast.success("Initialsync entsperrt");
-        apiKey: zammadApiKey.trim() || undefined
+      await load({ preserveEdits: true });
-      });
-      setZammadBaseUrl(result.settings.baseUrl);
-      setHasZammadApiKey(result.settings.hasApiKey);
-      setZammadApiKey("");
-      toast.success("Zammad-Zugang gespeichert", {
-        description: result.settings.hasApiKey ? "URL und API-Key sind hinterlegt." : "URL wurde gespeichert."
-      });
     } catch (error) {
-      toast.error("Zammad-Zugang konnte nicht gespeichert werden", {
+      toast.error("Initialsync konnte nicht entsperrt werden", {
         description: error instanceof Error ? error.message : "Unbekannter Fehler"
       });
     } finally {
-      setSavingZammadSettings(false);
+      setUnlockingInitialActualsId(null);
     }
   }
 
@@ -222,9 +257,11 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
 
     try {
       const result = await saveTeamspaceSettings({
-        baseUrl: teamspaceBaseUrl
+        baseUrl: teamspaceBaseUrl,
+        credentialsUserId: teamspaceCredentialsUserId || null
       });
       setTeamspaceBaseUrl(result.settings.baseUrl);
+      setTeamspaceCredentialsUserId(result.settings.credentialsUserId ?? "");
       toast.success("Teamspace-Zugang gespeichert", {
         description: "URL ist hinterlegt."
       });
@@ -237,6 +274,131 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
     }
   }
 
+  function addTeamspaceExclusion() {
+    const project = newTeamspaceProjectExclusion.trim();
+
+    if (!project) {
+      return;
+    }
+
+    const exists = teamspaceProjectExclusions.some((entry) => entry.teamspace_project.toLocaleLowerCase("de") === project.toLocaleLowerCase("de"));
+
+    if (exists) {
+      toast.info("Teamspace-Projekt ist bereits in der Liste");
+      setNewTeamspaceProjectExclusion("");
+      return;
+    }
+
+    setTeamspaceProjectExclusions((current) => [
+      ...current,
+      {
+        teamspace_project: project,
+        teamspace_name: null,
+        customer_name: null,
+        teamspace_api_project_id: null,
+        teamspace_api_project_ids: [],
+        atoss_support_default: false,
+        atoss_support_valid_from: null,
+        atoss_support_valid_to: null,
+        customer_owner_option_id: null,
+        hotline_contract_option_id: null,
+        note: ""
+      }
+    ]);
+    setNewTeamspaceProjectExclusion("");
+  }
+
+  function removeTeamspaceExclusion(project: string) {
+    setTeamspaceProjectExclusions((current) => current.filter((entry) => entry.teamspace_project !== project));
+  }
+
+  function updateTeamspaceExclusion(project: string, patch: Partial<TeamspaceProjectExclusion>) {
+    setTeamspaceProjectExclusions((current) =>
+      current.map((entry) => entry.teamspace_project === project ? { ...entry, ...patch } : entry)
+    );
+  }
+
+  async function saveTeamspaceExclusions() {
+    setSavingTeamspaceProjectExclusions(true);
+
+    try {
+      const projects = teamspaceProjectExclusions
+        .map((entry) => ({
+          teamspace_project: entry.teamspace_project.trim(),
+          atoss_support_default: entry.atoss_support_default,
+          atoss_support_valid_from: entry.atoss_support_valid_from || null,
+          atoss_support_valid_to: entry.atoss_support_valid_to || null,
+          customer_owner_option_id: entry.customer_owner_option_id || null,
+          hotline_contract_option_id: entry.hotline_contract_option_id || null
+        }))
+        .filter((entry) => entry.teamspace_project);
+      const result = await saveTeamspaceProjectExclusions(projects);
+      setTeamspaceProjectExclusions(result.exclusions);
+      toast.success("Teamspace-Ausnahmen gespeichert", {
+        description: `${result.exclusions.length} Projektnummer(n) geprüft und gespeichert.`
+      });
+    } catch (error) {
+      toast.error("Teamspace-Ausnahmen konnten nicht gespeichert werden", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setSavingTeamspaceProjectExclusions(false);
+    }
+  }
+
+  function addTeamspaceAssignmentRule() {
+    const highestPriority = teamspaceAssignmentRules.reduce((highest, rule) => Math.max(highest, rule.priority), 0);
+    const defaultTarget = teamspaceProjectExclusions[0] ?? null;
+    setTeamspaceAssignmentRules((current) => [
+      ...current,
+      {
+        name: `Regel ${current.length + 1}`,
+        active: true,
+        priority: highestPriority + 10,
+        customer_owner_option_id: defaultTarget?.customer_owner_option_id ?? null,
+        hotline_contract_option_id: defaultTarget?.hotline_contract_option_id ?? null,
+        support_enabled: true,
+        consulting_enabled: false,
+        teamspace_project: defaultTarget?.teamspace_project ?? ""
+      }
+    ]);
+  }
+
+  function updateTeamspaceAssignmentRule(index: number, patch: Partial<TeamspaceAssignmentRule>) {
+    setTeamspaceAssignmentRules((current) => current.map((rule, currentIndex) => currentIndex === index ? { ...rule, ...patch } : rule));
+  }
+
+  function removeTeamspaceAssignmentRule(index: number) {
+    setTeamspaceAssignmentRules((current) => current.filter((_, currentIndex) => currentIndex !== index));
+  }
+
+  function updateTeamspaceAssignmentRuleTarget(index: number, teamspaceProject: string) {
+    const target = teamspaceProjectExclusions.find((entry) => entry.teamspace_project === teamspaceProject);
+    updateTeamspaceAssignmentRule(index, {
+      teamspace_project: teamspaceProject,
+      customer_owner_option_id: target?.customer_owner_option_id ?? null,
+      hotline_contract_option_id: target?.hotline_contract_option_id ?? null
+    });
+  }
+
+  async function saveAssignmentRules() {
+    setSavingTeamspaceAssignmentRules(true);
+
+    try {
+      const result = await saveTeamspaceAssignmentRules(teamspaceAssignmentRules);
+      setTeamspaceAssignmentRules(result.rules);
+      toast.success("Automatische Zuordnungsregeln gespeichert", {
+        description: `${result.rules.length} Regel(n) gespeichert. Kleinere Prioritätswerte werden zuerst geprüft.`
+      });
+    } catch (error) {
+      toast.error("Zuordnungsregeln konnten nicht gespeichert werden", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setSavingTeamspaceAssignmentRules(false);
+    }
+  }
+
   async function exportDatabase() {
     setExportingDatabase(true);
 
@@ -342,6 +504,16 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
   }
 
   const regularUserCount = users.filter((user) => user.role === "user").length;
+  const customerOwnerOptions = organizationAttributeOptions.filter((option) => option.attribute_name === "customer_owner");
+  const hotlineContractOptions = organizationAttributeOptions.filter((option) => option.attribute_name === "hotline_contract");
+
+  function organizationAttributeOptionLabel(option: OrganizationAttributeOption) {
+    const label = option.display_name === option.option_key
+      ? option.display_name
+      : `${option.display_name} (${option.option_key})`;
+
+    return option.active ? label : `${label} · nicht mehr in Zammad`;
+  }
 
   return (
     <div className="space-y-4">
@@ -350,57 +522,21 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
         <p className="text-sm text-muted-foreground">Systemverwaltung für Benutzer, Zammad-Organisationen und restore-fähige Backups.</p>
       </div>
 
-      <div className="grid min-w-0 gap-4 2xl:grid-cols-[minmax(0,1.2fr)_minmax(340px,0.8fr)]">
+      <div className="grid min-w-0 gap-4">
         <Card className="min-w-0">
           <CardHeader className="p-4">
             <div className="flex items-start justify-between gap-3">
               <div className="flex items-center gap-2">
-                <DatabaseZap className="size-5 text-muted-foreground" />
+                <Unplug className="size-5 text-muted-foreground" />
-                <CardTitle>Data-Sync</CardTitle>
+                <CardTitle>Teamspace API</CardTitle>
               </div>
-              <HelpLink anchor="organisationen" label="Hilfe zum Zammad-Sync" />
+              <HelpLink anchor="admin" label="Hilfe zu Teamspace API" />
             </div>
-            <CardDescription>Zammad-Zugang speichern und Organisationen in die lokale TicketTracker-Datenbank übernehmen.</CardDescription>
+            <CardDescription>Teamspace-Zugang für Adminabfragen und globale Projekt-Ausnahmen verwalten.</CardDescription>
           </CardHeader>
           <CardContent className="px-4 pb-4">
-            <form className="grid gap-3 xl:grid-cols-2" onSubmit={syncOrganizations}>
+            <div className="space-y-4">
-              <div className="space-y-2">
+              <div className="grid gap-3 xl:grid-cols-[minmax(220px,1fr)_minmax(220px,1fr)_auto] xl:items-end">
-                <label className="text-sm font-medium" htmlFor="zammad-base-url">Zammad URL</label>
-                <Input
-                  id="zammad-base-url"
-                  placeholder="https://zammad.example.de"
-                  value={zammadBaseUrl}
-                  onChange={(event) => setZammadBaseUrl(event.currentTarget.value)}
-                  required
-                />
-              </div>
-              <div className="space-y-2">
-                <label className="text-sm font-medium" htmlFor="zammad-api-key">API-Key</label>
-                <Input
-                  id="zammad-api-key"
-                  type="password"
-                  placeholder={hasZammadApiKey ? "••••••••••••••••" : ""}
-                  value={zammadApiKey}
-                  onChange={(event) => setZammadApiKey(event.currentTarget.value)}
-                />
-              </div>
-              <div className="flex flex-wrap gap-2 xl:col-span-2">
-                <Button type="button" variant="secondary" disabled={savingZammadSettings} onClick={() => void saveZammadAccess()}>
-                  <Save className="size-4" />
-                  {savingZammadSettings ? "Speichert..." : "Zugang speichern"}
-                </Button>
-                <Button type="submit" disabled={syncingOrganizations}>
-                  <DatabaseZap className="size-4" />
-                  {syncingOrganizations ? "Synchronisiert..." : "Organisationen synchronisieren"}
-                </Button>
-              </div>
-            </form>
-            <div className="mt-4 border-t pt-4">
-              <div className="mb-3 flex items-center gap-2">
-                <Unplug className="size-4 text-muted-foreground" />
-                <p className="text-sm font-medium">Teamspace API</p>
-              </div>
-              <div className="grid gap-3 xl:grid-cols-[minmax(220px,1fr)_auto] xl:items-end">
                 <div className="space-y-2">
                   <label className="text-sm font-medium" htmlFor="teamspace-base-url">Teamspace URL</label>
                   <Input
@@ -410,11 +546,243 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
                     onChange={(event) => setTeamspaceBaseUrl(event.currentTarget.value)}
                   />
                 </div>
+                <div className="space-y-2">
+                  <label className="text-sm font-medium" htmlFor="teamspace-credentials-user">Credentials für Adminabfragen</label>
+                  <select
+                    id="teamspace-credentials-user"
+                    className="h-10 w-full rounded-md border border-input bg-background px-3 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                    value={teamspaceCredentialsUserId}
+                    onChange={(event) => setTeamspaceCredentialsUserId(event.currentTarget.value)}
+                  >
+                    <option value="">Bitte wählen</option>
+                    {users.filter((user) => user.active && user.has_teamspace_credentials).map((user) => (
+                      <option key={user.id} value={user.id}>
+                        {user.display_name} ({user.username})
+                      </option>
+                    ))}
+                  </select>
+                  <p className="text-xs text-muted-foreground">Dieser Benutzer wird für Admin-Checks gegen Teamspace verwendet.</p>
+                </div>
                 <Button type="button" variant="secondary" disabled={savingTeamspaceSettings} onClick={() => void saveTeamspaceAccess()}>
                   <Save className="size-4" />
-                  {savingTeamspaceSettings ? "Speichert..." : "URL speichern"}
+                  {savingTeamspaceSettings ? "Speichert..." : "Einstellungen speichern"}
                 </Button>
               </div>
+              <div className="mt-4 space-y-3 rounded-md border bg-muted/20 p-3">
+                <div>
+                  <p className="text-sm font-medium">TS-Projekte ohne Differenz-/Budgetprüfung</p>
+                  <p className="text-xs text-muted-foreground">
+                    Sync und Gesamtverbrauch laufen weiter, aber TS/TT-Differenzen, Budgetbalken und Budgetverbrauch werden für diese TS-Projekte ausgeblendet. Zugeordnet und Hotline stammen aus den Zammad-Organisationsattributen.
+                  </p>
+                </div>
+                <div className="flex flex-col gap-2 sm:flex-row">
+                  <Input
+                    id="teamspace-project-exclusion-new"
+                    placeholder="BP-2026-A-023"
+                    value={newTeamspaceProjectExclusion}
+                    onChange={(event) => setNewTeamspaceProjectExclusion(event.currentTarget.value)}
+                    onKeyDown={(event) => {
+                      if (event.key === "Enter") {
+                        event.preventDefault();
+                        addTeamspaceExclusion();
+                      }
+                    }}
+                  />
+                  <Button type="button" variant="secondary" onClick={addTeamspaceExclusion}>
+                    <Plus className="size-4" />
+                    Hinzufügen
+                  </Button>
+                </div>
+                <div className="overflow-x-auto rounded-md border bg-background">
+                  {teamspaceProjectExclusions.length === 0 ? (
+                    <p className="px-3 py-4 text-sm text-muted-foreground">Noch keine Teamspace-Projekte ausgenommen.</p>
+                  ) : (
+                    <div className="min-w-[1120px] divide-y">
+                      {teamspaceProjectExclusions.map((entry) => (
+                        <div key={entry.teamspace_project} className="grid grid-cols-[180px_minmax(280px,1fr)_minmax(240px,0.9fr)_210px_210px_2.5rem] items-center gap-4 px-4 py-3">
+                          <div className="font-mono text-sm font-semibold">{entry.teamspace_project}</div>
+                          <div className="min-w-0">
+                            <p className="truncate text-sm font-medium">{entry.teamspace_name ?? "Name wird beim Speichern aus Teamspace geladen"}</p>
+                            {entry.teamspace_api_project_ids?.length ? <p className="text-xs text-muted-foreground">{entry.teamspace_api_project_ids.length} API-ID(s)</p> : null}
+                          </div>
+                          <div className="min-w-0 text-sm text-muted-foreground">
+                            <p className="truncate">{entry.customer_name ?? "Kunde wird beim Speichern aus Teamspace geladen"}</p>
+                          </div>
+                          <div className="space-y-1">
+                            <label className="text-xs text-muted-foreground" htmlFor={`customer-owner-${entry.teamspace_project}`}>Zugeordnet</label>
+                            <select
+                              id={`customer-owner-${entry.teamspace_project}`}
+                              className="h-9 w-full rounded-md border border-input bg-background px-3 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                              value={entry.customer_owner_option_id ?? ""}
+                              onChange={(event) => updateTeamspaceExclusion(entry.teamspace_project, { customer_owner_option_id: event.currentTarget.value || null })}
+                            >
+                              <option value="">Nicht zugeordnet</option>
+                              {customerOwnerOptions.map((option) => (
+                                <option key={option.id} value={option.id} disabled={!option.active && option.id !== entry.customer_owner_option_id}>
+                                  {organizationAttributeOptionLabel(option)}
+                                </option>
+                              ))}
+                            </select>
+                          </div>
+                          <div className="space-y-1">
+                            <label className="text-xs text-muted-foreground" htmlFor={`hotline-contract-${entry.teamspace_project}`}>Hotline</label>
+                            <select
+                              id={`hotline-contract-${entry.teamspace_project}`}
+                              className="h-9 w-full rounded-md border border-input bg-background px-3 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                              value={entry.hotline_contract_option_id ?? ""}
+                              onChange={(event) => updateTeamspaceExclusion(entry.teamspace_project, { hotline_contract_option_id: event.currentTarget.value || null })}
+                            >
+                              <option value="">Nicht zugeordnet</option>
+                              {hotlineContractOptions.map((option) => (
+                                <option key={option.id} value={option.id} disabled={!option.active && option.id !== entry.hotline_contract_option_id}>
+                                  {organizationAttributeOptionLabel(option)}
+                                </option>
+                              ))}
+                            </select>
+                          </div>
+                          <Button type="button" variant="ghost" size="icon" className="justify-self-end" onClick={() => removeTeamspaceExclusion(entry.teamspace_project)}>
+                            <Trash2 className="size-4" />
+                            <span className="sr-only">Teamspace-Projekt entfernen</span>
+                          </Button>
+                        </div>
+                      ))}
+                    </div>
+                  )}
+                </div>
+                <Button type="button" variant="secondary" disabled={savingTeamspaceProjectExclusions} onClick={() => void saveTeamspaceExclusions()}>
+                  <Save className="size-4" />
+                  {savingTeamspaceProjectExclusions ? "Speichert..." : "Ausnahmen speichern"}
+                </Button>
+              </div>
+              <div className="space-y-3 rounded-md border bg-muted/20 p-3">
+                <div className="flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between">
+                  <div>
+                    <p className="text-sm font-medium">Automatische TS-Zuordnung</p>
+                    <p className="text-xs text-muted-foreground">
+                      Angegebene Bedingungen innerhalb einer Regel gelten gemeinsam. Beim Auswählen des Zielprojekts werden dessen hinterlegte Zugeordnet-/Hotline-Werte übernommen und können danach angepasst werden. Die erste passende aktive Regel gewinnt. Regeln werden beim Zammad-Sync nur angewendet, wenn das Ticket keine konkrete TS-Projektnummer besitzt; anschließend werden alle Sessions dem Zielprojekt zugeordnet.
+                    </p>
+                  </div>
+                  <Button type="button" variant="secondary" onClick={addTeamspaceAssignmentRule}>
+                    <Plus className="size-4" />
+                    Regel hinzufügen
+                  </Button>
+                </div>
+                <div className="overflow-x-auto rounded-md border bg-background">
+                  {teamspaceAssignmentRules.length === 0 ? (
+                    <p className="px-3 py-4 text-sm text-muted-foreground">Noch keine automatische Zuordnungsregel angelegt.</p>
+                  ) : (
+                    <div className="min-w-[1580px] divide-y">
+                      {teamspaceAssignmentRules.map((rule, index) => {
+                        const targetExists = teamspaceProjectExclusions.some((entry) => entry.teamspace_project === rule.teamspace_project);
+
+                        return (
+                          <div key={rule.id ?? `new-${index}`} className="grid grid-cols-[230px_100px_220px_220px_300px_240px_110px_2.5rem] items-end gap-3 px-4 py-3">
+                            <div className="space-y-1">
+                              <label className="text-xs text-muted-foreground" htmlFor={`assignment-rule-name-${rule.id ?? index}`}>Regelname</label>
+                              <Input
+                                id={`assignment-rule-name-${rule.id ?? index}`}
+                                className="h-9"
+                                value={rule.name}
+                                onChange={(event) => updateTeamspaceAssignmentRule(index, { name: event.currentTarget.value })}
+                              />
+                            </div>
+                            <div className="space-y-1">
+                              <label className="text-xs text-muted-foreground" htmlFor={`assignment-rule-priority-${rule.id ?? index}`}>Priorität</label>
+                              <Input
+                                id={`assignment-rule-priority-${rule.id ?? index}`}
+                                className="h-9"
+                                type="number"
+                                min={0}
+                                max={100000}
+                                value={rule.priority}
+                                onChange={(event) => updateTeamspaceAssignmentRule(index, { priority: Number(event.currentTarget.value) || 0 })}
+                              />
+                            </div>
+                            <div className="space-y-1">
+                              <label className="text-xs text-muted-foreground" htmlFor={`assignment-rule-owner-${rule.id ?? index}`}>Zugeordnet ist</label>
+                              <select
+                                id={`assignment-rule-owner-${rule.id ?? index}`}
+                                className="h-9 w-full rounded-md border border-input bg-background px-3 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                                value={rule.customer_owner_option_id ?? ""}
+                                onChange={(event) => updateTeamspaceAssignmentRule(index, { customer_owner_option_id: event.currentTarget.value || null })}
+                              >
+                                <option value="">Bedingung nicht verwenden</option>
+                                {customerOwnerOptions.map((option) => (
+                                  <option key={option.id} value={option.id} disabled={!option.active && option.id !== rule.customer_owner_option_id}>
+                                    {organizationAttributeOptionLabel(option)}
+                                  </option>
+                                ))}
+                              </select>
+                            </div>
+                            <div className="space-y-1">
+                              <label className="text-xs text-muted-foreground" htmlFor={`assignment-rule-hotline-${rule.id ?? index}`}>Hotline ist</label>
+                              <select
+                                id={`assignment-rule-hotline-${rule.id ?? index}`}
+                                className="h-9 w-full rounded-md border border-input bg-background px-3 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                                value={rule.hotline_contract_option_id ?? ""}
+                                onChange={(event) => updateTeamspaceAssignmentRule(index, { hotline_contract_option_id: event.currentTarget.value || null })}
+                              >
+                                <option value="">Bedingung nicht verwenden</option>
+                                {hotlineContractOptions.map((option) => (
+                                  <option key={option.id} value={option.id} disabled={!option.active && option.id !== rule.hotline_contract_option_id}>
+                                    {organizationAttributeOptionLabel(option)}
+                                  </option>
+                                ))}
+                              </select>
+                            </div>
+                            <div className="flex h-9 items-center gap-4 rounded-md border bg-background px-3">
+                              <label className="flex items-center gap-2 text-sm">
+                                <Switch
+                                  checked={rule.support_enabled}
+                                  onCheckedChange={(checked) => updateTeamspaceAssignmentRule(index, { support_enabled: checked })}
+                                />
+                                Support
+                              </label>
+                              <label className="flex items-center gap-2 text-sm">
+                                <Switch
+                                  checked={rule.consulting_enabled}
+                                  onCheckedChange={(checked) => updateTeamspaceAssignmentRule(index, { consulting_enabled: checked })}
+                                />
+                                Consulting
+                              </label>
+                            </div>
+                            <div className="space-y-1">
+                              <label className="text-xs text-muted-foreground" htmlFor={`assignment-rule-target-${rule.id ?? index}`}>Ziel-TS-Projekt</label>
+                              <select
+                                id={`assignment-rule-target-${rule.id ?? index}`}
+                                className="h-9 w-full rounded-md border border-input bg-background px-3 font-mono text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                                value={rule.teamspace_project}
+                                onChange={(event) => updateTeamspaceAssignmentRuleTarget(index, event.currentTarget.value)}
+                              >
+                                <option value="">Bitte wählen</option>
+                                {!targetExists && rule.teamspace_project ? <option value={rule.teamspace_project}>{rule.teamspace_project} · nicht mehr vorhanden</option> : null}
+                                {teamspaceProjectExclusions.map((entry) => (
+                                  <option key={entry.teamspace_project} value={entry.teamspace_project}>{entry.teamspace_project}</option>
+                                ))}
+                              </select>
+                            </div>
+                            <label className="flex h-9 items-center gap-2 text-sm">
+                              <Switch checked={rule.active} onCheckedChange={(checked) => updateTeamspaceAssignmentRule(index, { active: checked })} />
+                              Aktiv
+                            </label>
+                            <Button type="button" variant="ghost" size="icon" onClick={() => removeTeamspaceAssignmentRule(index)}>
+                              <Trash2 className="size-4" />
+                              <span className="sr-only">Zuordnungsregel entfernen</span>
+                            </Button>
+                          </div>
+                        );
+                      })}
+                    </div>
+                  )}
+                </div>
+                <div className="flex flex-wrap items-center gap-3">
+                  <Button type="button" variant="secondary" disabled={savingTeamspaceAssignmentRules} onClick={() => void saveAssignmentRules()}>
+                    <Save className="size-4" />
+                    {savingTeamspaceAssignmentRules ? "Speichert..." : "Zuordnungsregeln speichern"}
+                  </Button>
+                  <p className="text-xs text-muted-foreground">Zielprojekte müssen zuvor in der Ausnahmen-Liste gespeichert worden sein.</p>
+                </div>
+              </div>
             </div>
           </CardContent>
         </Card>
@@ -534,6 +902,7 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
                   <TableHead>Rolle</TableHead>
                   <TableHead>Status</TableHead>
                   <TableHead>Neues Passwort</TableHead>
+                  <TableHead>TS-Istzeiten</TableHead>
                   <TableHead />
                 </TableRow>
               </TableHeader>
@@ -568,6 +937,45 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
                           onChange={(event) => updateForm(user.id, { password: event.currentTarget.value })}
                         />
                       </TableCell>
+                      <TableCell>
+                        {isFixedAdmin ? (
+                          <span className="text-sm text-muted-foreground">-</span>
+                        ) : (
+                          <div className="grid min-w-[280px] gap-2">
+                            <div className="flex items-center gap-2">
+                              <Badge variant={initialActualsLocked(user) ? "secondary" : "outline"}>{initialActualsStatus(user)}</Badge>
+                              {!user.has_teamspace_credentials || !user.teamspace_user_id ? <Badge variant="warning">TS-Zugang fehlt</Badge> : null}
+                            </div>
+                            <div className="grid grid-cols-[minmax(120px,1fr)_auto_auto] gap-2">
+                              <Input
+                                className="h-8"
+                                type="month"
+                                value={initialActualsFromMonthByUser[user.id] ?? ""}
+                                onChange={(event) => setInitialActualsFromMonthByUser((current) => ({ ...current, [user.id]: event.currentTarget.value }))}
+                                disabled={initialActualsLocked(user) || syncingInitialActualsId === user.id}
+                              />
+                              <Button
+                                size="sm"
+                                variant="secondary"
+                                disabled={initialActualsLocked(user) || !user.has_teamspace_credentials || !user.teamspace_user_id || syncingInitialActualsId === user.id}
+                                onClick={() => void syncInitialActuals(user)}
+                              >
+                                <TimerReset className="size-4" />
+                                {syncingInitialActualsId === user.id ? "Läuft..." : "Sync"}
+                              </Button>
+                              <Button
+                                size="sm"
+                                variant="ghost"
+                                disabled={!initialActualsLocked(user) || unlockingInitialActualsId === user.id}
+                                onClick={() => void unlockInitialActuals(user)}
+                              >
+                                <RotateCcw className="size-4" />
+                                Entsperren
+                              </Button>
+                            </div>
+                          </div>
+                        )}
+                      </TableCell>
                       <TableCell className="text-right">
                         <Button size="sm" onClick={() => void saveUser(user)} disabled={savingId === user.id}>
                           <Save className="size-4" />
@@ -603,6 +1011,41 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
                     value={form.password}
                     onChange={(event) => updateForm(user.id, { password: event.currentTarget.value })}
                   />
+                  {!isFixedAdmin ? (
+                    <div className="space-y-2 rounded-md border bg-muted/20 p-2">
+                      <div className="flex flex-wrap items-center gap-2">
+                        <span className="text-sm font-medium">TS-Istzeiten</span>
+                        <Badge variant={initialActualsLocked(user) ? "secondary" : "outline"}>{initialActualsStatus(user)}</Badge>
+                        {!user.has_teamspace_credentials || !user.teamspace_user_id ? <Badge variant="warning">TS-Zugang fehlt</Badge> : null}
+                      </div>
+                      <div className="grid gap-2 sm:grid-cols-[minmax(140px,1fr)_auto_auto]">
+                        <Input
+                          type="month"
+                          value={initialActualsFromMonthByUser[user.id] ?? ""}
+                          onChange={(event) => setInitialActualsFromMonthByUser((current) => ({ ...current, [user.id]: event.currentTarget.value }))}
+                          disabled={initialActualsLocked(user) || syncingInitialActualsId === user.id}
+                        />
+                        <Button
+                          size="sm"
+                          variant="secondary"
+                          disabled={initialActualsLocked(user) || !user.has_teamspace_credentials || !user.teamspace_user_id || syncingInitialActualsId === user.id}
+                          onClick={() => void syncInitialActuals(user)}
+                        >
+                          <TimerReset className="size-4" />
+                          {syncingInitialActualsId === user.id ? "Läuft..." : "Sync"}
+                        </Button>
+                        <Button
+                          size="sm"
+                          variant="ghost"
+                          disabled={!initialActualsLocked(user) || unlockingInitialActualsId === user.id}
+                          onClick={() => void unlockInitialActuals(user)}
+                        >
+                          <RotateCcw className="size-4" />
+                          Entsperren
+                        </Button>
+                      </div>
+                    </div>
+                  ) : null}
                   <div className="flex items-center justify-between gap-2">
                     <label className="flex items-center gap-2 text-sm">
                       <Switch checked={form.active} disabled={isFixedAdmin} onCheckedChange={(active) => updateForm(user.id, { active })} />

frontend/src/views/AnalysisPage.tsx

@@ -1,4 +1,4 @@
-import { ArrowDown, ArrowUp, ChevronLeft, ChevronRight, Clock3, Download, ExternalLink, RotateCcw, SlidersHorizontal, Ticket, UserCheck, Users } from "lucide-react";
+import { AlertCircle, ArrowDown, ArrowUp, ChevronLeft, ChevronRight, Clock3, Download, ExternalLink, RotateCcw, SlidersHorizontal, Ticket, UserCheck, Users } from "lucide-react";
 import type { LucideIcon } from "lucide-react";
 import { Fragment, useEffect, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
@@ -168,6 +168,41 @@ function TicketStatus({ ticket }: { ticket: TicketSummary }) {
   return <Badge variant="success">bewertet</Badge>;
 }
 
+function formatSignedMinutes(minutes: number) {
+  if (minutes === 0) {
+    return formatMinutes(0);
+  }
+
+  return `${minutes > 0 ? "+" : "-"}${formatMinutes(Math.abs(minutes))}`;
+}
+
+function teamspaceMonthDeltaMinutes(ticket: TicketSummary) {
+  const actuals = ticket.teamspace_month_actuals ?? [];
+
+  if (actuals.length === 0) {
+    return 0;
+  }
+
+  const tsMinutes = ticket.teamspace_month_billable_minutes ?? actuals.reduce((sum, actual) => sum + actual.teamspace_billable_minutes, 0);
+  return ticket.teamspace_month_delta_minutes ?? tsMinutes - ticket.crm_billed_minutes;
+}
+
+function TeamspaceDeviationIcon({ ticket }: { ticket: TicketSummary }) {
+  const deltaMinutes = teamspaceMonthDeltaMinutes(ticket);
+
+  if (deltaMinutes === 0) {
+    return <span className="inline-block size-4" aria-hidden="true" />;
+  }
+
+  const title = deltaMinutes > 0 ? `${formatMinutes(deltaMinutes)} mehr in TS API` : `${formatMinutes(Math.abs(deltaMinutes))} mehr in TT-Teamspace`;
+
+  return (
+    <span title={`${formatSignedMinutes(deltaMinutes)} · ${title}`} aria-label={`Teamspace-Abweichung: ${title}`}>
+      <AlertCircle className="mx-auto size-4 text-amber-500" />
+    </span>
+  );
+}
+
 function ticketStatusKey(ticket: TicketSummary): "open" | "evaluated" {
   return (ticket.ticket_open_count ?? ticket.open_count) > 0 ? "open" : "evaluated";
 }
@@ -690,6 +725,9 @@ export function AnalysisPage({ currentUser, onNavigate }: AnalysisPageProps) {
               <TableHeader>
                 <TableRow>
                   <TableHead>Ticket</TableHead>
+                  <TableHead className="w-10 text-center">
+                    <span className="sr-only">Teamspace-Abweichung</span>
+                  </TableHead>
                   <TableHead>Organisation</TableHead>
                   <TableHead>Art</TableHead>
                   <TableHead>Sessions</TableHead>
@@ -730,6 +768,9 @@ export function AnalysisPage({ currentUser, onNavigate }: AnalysisPageProps) {
                           </div>
                           {ticket.title ? <p className="max-w-[220px] truncate text-xs text-muted-foreground">{ticket.title}</p> : null}
                         </TableCell>
+                        <TableCell className="text-center">
+                          <TeamspaceDeviationIcon ticket={ticket} />
+                        </TableCell>
                         <TableCell>{ticket.customer_name ?? "-"}</TableCell>
                         <TableCell>{workTypeLabel(ticket.work_type)}</TableCell>
                         <TableCell>{ticket.session_count}</TableCell>
@@ -785,7 +826,10 @@ export function AnalysisPage({ currentUser, onNavigate }: AnalysisPageProps) {
                         {ticket.title ? <p className="truncate text-xs text-muted-foreground">{ticket.title}</p> : null}
                         <p className="text-sm text-muted-foreground">{ticket.customer_name ?? "Keine Organisation"} · {workTypeLabel(ticket.work_type)} · {ticket.session_count} Session(s)</p>
                       </div>
-                      <TicketStatus ticket={ticket} />
+                      <div className="flex shrink-0 items-center gap-2">
+                        <TeamspaceDeviationIcon ticket={ticket} />
+                        <TicketStatus ticket={ticket} />
+                      </div>
                     </div>
                     <div className="grid grid-cols-2 gap-2 text-sm">
                       <div className="rounded-md bg-muted/50 p-2">

frontend/src/views/DashboardPage.tsx

@@ -722,7 +722,7 @@ function projectFilterGroup(filter: string) {
 
 function matchesSingleProjectFilter(project: ProjectSummary, filterBy: string, fixedBillingTickets: Set<string>) {
   const consumptionMinutes = project.consumption_minutes ?? 0;
-  const budgetMinutes = project.hour_budget_minutes ?? 0;
+  const budgetMinutes = projectBudgetExcluded(project) ? 0 : project.hour_budget_minutes ?? 0;
   const percent = budgetMinutes > 0 ? consumptionMinutes / budgetMinutes : 0;
   const hasFixedBilling = Number(project.recurring_session_count ?? 0) > 0 || hasFixedBillingForTicket(fixedBillingTickets, project.ticket_id, project.ticket_number);
 
@@ -792,6 +792,10 @@ function matchesProjectFilters(project: ProjectSummary, filters: string[], fixed
 }
 
 function projectConsumptionPercent(project: ProjectSummary) {
+  if (projectBudgetExcluded(project)) {
+    return null;
+  }
+
   const budgetMinutes = project.hour_budget_minutes ?? 0;
 
   if (budgetMinutes <= 0) {
@@ -821,12 +825,20 @@ function projectTeamspaceEntries(project: ProjectSummary): ProjectTeamspaceEntry
   ];
 }
 
+function projectBudgetExcluded(project: ProjectSummary) {
+  return Boolean(project.teamspace_budget_excluded || projectTeamspaceEntries(project).some((entry) => entry.teamspace_budget_excluded));
+}
+
 function projectTeamspaceEntryLabel(entry: ProjectTeamspaceEntry) {
   return entry.teamspace_description?.trim() || entry.teamspace_project || (entry.is_default ? "Standard" : "Ohne Teamspace-ID");
 }
 
 function budgetedProjectTeamspaceEntries(project: ProjectSummary) {
-  return projectTeamspaceEntries(project).filter((entry) => Number(entry.hour_budget_minutes ?? 0) > 0);
+  if (projectBudgetExcluded(project)) {
+    return [];
+  }
+
+  return projectTeamspaceEntries(project).filter((entry) => !entry.teamspace_budget_excluded && Number(entry.hour_budget_minutes ?? 0) > 0);
 }
 
 function openRatingFilterGroup(filter: string) {
@@ -1017,9 +1029,9 @@ export function DashboardPage({ currentUser, onNavigate }: DashboardPageProps) {
 	  const dashboardStats = useMemo(() => {
     const monthTotals = monthOverview?.totals;
     const dayTotals = todayOverview?.totals;
-    const overBudget = projects.filter((project) => project.hour_budget_minutes !== null && project.hour_budget_minutes !== undefined && (project.consumption_minutes ?? 0) > project.hour_budget_minutes);
+    const overBudget = projects.filter((project) => !projectBudgetExcluded(project) && project.hour_budget_minutes !== null && project.hour_budget_minutes !== undefined && (project.consumption_minutes ?? 0) > project.hour_budget_minutes);
     const nearlyFull = projects.filter((project) => {
-      if (!project.hour_budget_minutes || project.hour_budget_minutes <= 0) {
+      if (projectBudgetExcluded(project) || !project.hour_budget_minutes || project.hour_budget_minutes <= 0) {
         return false;
       }
 
@@ -2349,7 +2361,8 @@ function ProjectBudgetWidget({ widget, editing, projects, stats, onNavigate, onU
         <div className="space-y-1">
           {visible.map((project) => {
             const consumptionMinutes = project.consumption_minutes ?? 0;
-            const budgetMinutes = project.hour_budget_minutes ?? 0;
+            const budgetExcluded = projectBudgetExcluded(project);
+            const budgetMinutes = budgetExcluded ? 0 : project.hour_budget_minutes ?? 0;
             const percent = projectConsumptionPercent(project);
             const budgetedEntries = budgetedProjectTeamspaceEntries(project);
             const showBudgetedTeamspaceEntries = budgetedEntries.length > 1;
@@ -2358,7 +2371,7 @@ function ProjectBudgetWidget({ widget, editing, projects, stats, onNavigate, onU
               <button key={project.id} type="button" className="block w-full min-w-0 rounded-md px-2 py-1.5 text-left hover:bg-muted" onClick={() => onNavigate(`/tickets/${project.ticket_id}?month=${currentMonth()}`)}>
                 <span className="block truncate text-xs font-medium">{project.title || project.ticket_number}</span>
                 <span className="block truncate text-[11px] text-muted-foreground">
-                  {project.ticket_number} · {showBudgetedTeamspaceEntries ? `${budgetedEntries.length} Budgets · ` : ""}{budgetMinutes > 0 ? `${decimalHours(consumptionMinutes)} / ${decimalHours(budgetMinutes)} · ${percent ?? 0}%` : "ohne Kontingent"}
+                  {project.ticket_number} · {budgetExcluded ? `${decimalHours(consumptionMinutes)} · Budgetprüfung ausgenommen` : `${showBudgetedTeamspaceEntries ? `${budgetedEntries.length} Budgets · ` : ""}${budgetMinutes > 0 ? `${decimalHours(consumptionMinutes)} / ${decimalHours(budgetMinutes)} · ${percent ?? 0}%` : "ohne Kontingent"}`}
                 </span>
                 <span className="mt-1 flex flex-wrap gap-1">
                   <ZammadStateBadge stateId={project.zammad_state_id} />

frontend/src/views/DashboardTimersPage.tsx

@@ -0,0 +1,179 @@
+import { useMemo, useState } from "react";
+import type { Dispatch, SetStateAction } from "react";
+import { FolderGit, Pause, Play, RotateCcw, Square, Timer } from "lucide-react";
+import { toast } from "sonner";
+
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
+import { deleteActiveTimer, updateActiveTimer } from "../api";
+import { formatDateTime, formatTimer } from "../format";
+import { activeElapsedMs, mergeTimerActivityDrafts, removeTimerActivityDraft, type TimerEntry } from "../timers";
+import type { AuthUser } from "../types";
+
+type DashboardTimersPageProps = {
+  timers: TimerEntry[];
+  setTimers: Dispatch<SetStateAction<TimerEntry[]>>;
+  selectedTimerId: string | null;
+  setSelectedTimerId: Dispatch<SetStateAction<string | null>>;
+  tick: number;
+  currentUser: AuthUser;
+  onFinishTimer: (timerId: string) => void;
+  onOpenActiveTimer: () => void;
+};
+
+export function DashboardTimersPage({
+  timers,
+  setTimers,
+  selectedTimerId,
+  setSelectedTimerId,
+  tick,
+  currentUser,
+  onFinishTimer,
+  onOpenActiveTimer
+}: DashboardTimersPageProps) {
+  const [busyTimerId, setBusyTimerId] = useState<string | null>(null);
+  const sortedTimers = useMemo(
+    () =>
+      [...timers].sort((first, second) => {
+        if (first.phase === second.phase) {
+          return first.ticketNumber.localeCompare(second.ticketNumber);
+        }
+
+        return first.phase === "running" ? -1 : 1;
+      }),
+    [timers]
+  );
+  const runningTimer = timers.find((timer) => timer.phase === "running") ?? null;
+
+  async function setTimerPhase(timer: TimerEntry, phase: "running" | "paused") {
+    setBusyTimerId(timer.id);
+
+    try {
+      const result = await updateActiveTimer(timer.id, { phase });
+      setTimers(mergeTimerActivityDrafts(currentUser.id, result.timers));
+      setSelectedTimerId(timer.id);
+    } catch (error) {
+      toast.error("Timer konnte nicht aktualisiert werden", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setBusyTimerId(null);
+    }
+  }
+
+  async function discardTimer(timer: TimerEntry) {
+    const confirmed = window.confirm(`Timer ${timer.ticketNumber} verwerfen? Alle bisherigen Änderungen und Notizen an diesem Timer gehen verloren.`);
+
+    if (!confirmed) {
+      return;
+    }
+
+    setBusyTimerId(timer.id);
+
+    try {
+      const result = await deleteActiveTimer(timer.id);
+      removeTimerActivityDraft(currentUser.id, timer.id);
+      setTimers(mergeTimerActivityDrafts(currentUser.id, result.timers));
+      toast.success("Timer verworfen", {
+        description: timer.ticketNumber
+      });
+    } catch (error) {
+      toast.error("Timer konnte nicht verworfen werden", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setBusyTimerId(null);
+    }
+  }
+
+  return (
+    <div className="space-y-4">
+      <div className="flex flex-col gap-2 sm:flex-row sm:items-end sm:justify-between">
+        <div>
+          <h2 className="text-xl font-semibold tracking-normal sm:text-2xl">Timer-Übersicht</h2>
+          <p className="text-sm text-muted-foreground">Aktiven Timer und pausierte Timer zentral umschalten.</p>
+        </div>
+        {runningTimer ? <Badge variant="success">Aktiv: {runningTimer.ticketNumber}</Badge> : timers.length > 0 ? <Badge variant="warning">Alle pausiert</Badge> : <Badge variant="info">Kein Timer</Badge>}
+      </div>
+
+      <div className="grid gap-3">
+        {sortedTimers.map((timer) => {
+          const isRunning = timer.phase === "running";
+          const isSelected = selectedTimerId === timer.id;
+          const elapsedSeconds = Math.floor(activeElapsedMs(timer, tick) / 1000);
+
+          return (
+            <Card key={timer.id} className={isSelected ? "border-primary/60" : ""}>
+              <CardContent className="grid gap-3 p-4 lg:grid-cols-[minmax(0,1fr)_180px_auto] lg:items-center">
+                <button
+                  type="button"
+                  className={isRunning ? "min-w-0 text-left underline-offset-4 hover:underline" : "min-w-0 cursor-default text-left"}
+                  onClick={() => {
+                    setSelectedTimerId(timer.id);
+
+                    if (isRunning) {
+                      onOpenActiveTimer();
+                    }
+                  }}
+                >
+                  <div className="flex min-w-0 flex-wrap items-center gap-2">
+                    <span className={isRunning ? "size-2 rounded-full bg-emerald-500" : "size-2 rounded-full bg-muted-foreground/50"} />
+                    <span className="font-semibold">{timer.ticketNumber}</span>
+                    <Badge variant={isRunning ? "success" : "secondary"}>{isRunning ? "aktiv" : "pausiert"}</Badge>
+                    {timer.workType ? <Badge variant="outline">{timer.workType === "support" ? "Support" : "Consulting"}</Badge> : null}
+                  </div>
+                  <p className="mt-1 truncate text-sm text-muted-foreground">
+                    {timer.isProject ? <FolderGit className="mr-1 inline size-3.5" /> : null}
+                    {timer.organizationName ?? timer.projectName ?? "Ticketdaten noch nicht geladen"}
+                  </p>
+                  {timer.activity.trim() ? <p className="mt-1 line-clamp-2 text-sm">{timer.activity}</p> : null}
+                  <p className="mt-1 text-xs text-muted-foreground">Gestartet: {formatDateTime(new Date(timer.startedAt).toISOString())}</p>
+                </button>
+
+                <div className="rounded-md border bg-muted/20 px-3 py-2">
+                  <p className="text-xs text-muted-foreground">Gemessen</p>
+                  <p className="font-mono text-2xl font-semibold tracking-normal">{formatTimer(elapsedSeconds)}</p>
+                </div>
+
+                <div className="flex flex-wrap gap-2 lg:justify-end">
+                  {isRunning ? (
+                    <Button type="button" variant="secondary" disabled={busyTimerId === timer.id} onClick={() => void setTimerPhase(timer, "paused")}>
+                      <Pause className="size-4" />
+                      Pausieren
+                    </Button>
+                  ) : (
+                    <Button type="button" disabled={busyTimerId === timer.id} onClick={() => void setTimerPhase(timer, "running")}>
+                      <Play className="size-4" />
+                      Aktivieren
+                    </Button>
+                  )}
+                  <Button type="button" variant="destructive" onClick={() => onFinishTimer(timer.id)}>
+                    <Square className="size-4" />
+                    Stoppen
+                  </Button>
+                  <Button type="button" variant="ghost" disabled={busyTimerId === timer.id} onClick={() => void discardTimer(timer)}>
+                    <RotateCcw className="size-4" />
+                    Verwerfen
+                  </Button>
+                </div>
+              </CardContent>
+            </Card>
+          );
+        })}
+
+        {sortedTimers.length === 0 ? (
+          <Card>
+            <CardContent className="grid place-items-center gap-2 p-8 text-center">
+              <Timer className="size-8 text-muted-foreground" />
+              <div>
+                <p className="font-medium">Keine Timer vorbereitet</p>
+                <p className="text-sm text-muted-foreground">Starte oben einen Timer oder nutze den Schnellstart in der Kopfzeile.</p>
+              </div>
+            </CardContent>
+          </Card>
+        ) : null}
+      </div>
+    </div>
+  );
+}

frontend/src/views/MonthlyClosePage.tsx

@@ -7,12 +7,10 @@ import {
   FileWarning,
   Lock,
   LockOpen,
-  Sparkles,
 } from "lucide-react";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
 
-import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion";
 import { Alert } from "@/components/ui/alert";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -21,16 +19,15 @@ import { Checkbox } from "@/components/ui/checkbox";
 import { Input } from "@/components/ui/input";
 import { CopyTicketButton } from "@/components/CopyTicketButton";
 import { HelpLink } from "@/components/HelpLink";
-import { acknowledgeMissingTicketDayBilling, closePeriod, getStatisticsOverview, reopenPeriod } from "../api";
+import { closePeriod, getStatisticsOverview, reopenPeriod } from "../api";
-import { currentMonth, currentWeek, formatDate, formatDateTime, formatMinutes } from "../format";
+import { currentMonth, currentWeek, formatDateTime, formatMinutes } from "../format";
-import type { StatisticsCrmDay, StatisticsOpenSession, StatisticsOverview, StatisticsTeamspaceDay } from "../types";
+import type { AuthUser, StatisticsCrmDay, StatisticsOpenSession, StatisticsOverview, StatisticsTeamspaceDay, StatisticsTeamspaceMonthMismatch } from "../types";
 
 type MonthlyClosePageProps = {
+  currentUser: AuthUser;
   onNavigate: (to: string) => void;
 };
 
-const trackedTextClass = "text-sky-700 dark:text-sky-300";
-const teamspaceTextClass = "text-emerald-700 dark:text-emerald-300";
 const showAcknowledgedMissingCrmStorageKey = "tickettracker.monthlyClose.showAcknowledgedMissingCrm";
 const monthlyCloseViewModeStorageKey = "tickettracker.monthlyClose.viewMode";
 
@@ -44,16 +41,16 @@ function readMonthlyCloseViewMode(): MonthlyCloseViewMode {
   return window.localStorage.getItem(monthlyCloseViewModeStorageKey) === "week" ? "week" : "month";
 }
 
-function formatSignedMinutes(minutes: number) {
+function formatMissingTarget(minutes: number, teamspaceTimeTrackingEnabled: boolean) {
   if (minutes === 0) {
     return "ausgeglichen";
   }
 
-  return `${minutes > 0 ? "+" : "-"}${formatMinutes(Math.abs(minutes))}`;
+  if (minutes > 0) {
-}
+    return `${formatMinutes(minutes)} mehr in TS API`;
+  }
 
-function formatTeamspaceDelta(minutes: number) {
+  return `${formatMinutes(Math.abs(minutes))} mehr ${teamspaceTimeTrackingEnabled ? "in TT-Teamspace" : "in den abgerechneten Zeiten"}`;
-  return formatSignedMinutes(minutes);
 }
 
 function StatusCard({ label, value, detail, tone }: { label: string; value: string | number; detail: string; tone?: "ok" | "warn" | "neutral" }) {
@@ -64,60 +61,177 @@ function StatusCard({ label, value, detail, tone }: { label: string; value: stri
       <CardContent className="p-3">
         <p className="text-xs font-medium text-muted-foreground">{label}</p>
         <p className={`text-xl font-semibold tracking-normal ${valueClassName}`}>{value}</p>
-        <p className="text-xs text-muted-foreground">{detail}</p>
+        <p className="text-xs text-muted-foreground whitespace-pre-line">{detail}</p>
       </CardContent>
     </Card>
   );
 }
 
-type OpenTicketGroup = {
+type MonthlyCloseTicketDay = {
+  day: string;
+  missingCrm: StatisticsCrmDay | null;
+  ticketMismatch: StatisticsTeamspaceDay | null;
+};
+
+type MonthlyCloseTicketGroup = {
   ticketId: string;
   ticketNumber: string;
   organizationName: string;
   month: string;
   openCount: number;
   totalMinutes: number;
+  mismatch: StatisticsTeamspaceMonthMismatch | null;
+  days: MonthlyCloseTicketDay[];
 };
 
-function groupOpenSessions(sessions: StatisticsOpenSession[]) {
+type MutableMonthlyCloseTicketGroup = Omit<MonthlyCloseTicketGroup, "days"> & {
-  const groups = new Map<string, OpenTicketGroup>();
+  days: Map<string, MonthlyCloseTicketDay>;
+};
 
-  for (const session of sessions) {
+const monthlyCloseTicketGridClassName =
-    const existing = groups.get(session.ticket_id);
+  "xl:grid-cols-[minmax(10rem,1fr)_minmax(4.25rem,7rem)_minmax(4.25rem,7rem)_minmax(4.25rem,7rem)_minmax(4.25rem,7rem)_minmax(4.25rem,7rem)_11.5rem]";
+
+function buildMonthlyCloseTicketGroups(
+  sessions: StatisticsOpenSession[],
+  monthMismatches: StatisticsTeamspaceMonthMismatch[],
+  ticketDayMismatches: StatisticsTeamspaceDay[],
+  missingCrmDays: StatisticsCrmDay[],
+  fallbackMonth: string
+) {
+  const groups = new Map<string, MutableMonthlyCloseTicketGroup>();
+
+  function ensureGroup(ticketId: string, ticketNumber: string, organizationName: string, month: string) {
+    const existing = groups.get(ticketId);
 
     if (existing) {
-      existing.openCount += 1;
+      if (!existing.organizationName && organizationName) {
-      existing.totalMinutes += session.rounded_minutes;
+        existing.organizationName = organizationName;
+      }
+
+      return existing;
+    }
+
+    const group: MutableMonthlyCloseTicketGroup = {
+      ticketId,
+      ticketNumber,
+      organizationName,
+      month,
+      openCount: 0,
+      totalMinutes: 0,
+      mismatch: null,
+      days: new Map()
+    };
+    groups.set(ticketId, group);
+    return group;
+  }
+
+  for (const session of sessions) {
+    const group = ensureGroup(session.ticket_id, session.ticket_number, session.organization_name, session.started_at.slice(0, 7));
+    group.openCount += 1;
+    group.totalMinutes += session.rounded_minutes;
+  }
+
+  for (const mismatch of monthMismatches) {
+    ensureGroup(mismatch.ticket_id, mismatch.ticket_number, mismatch.organization_name, fallbackMonth).mismatch = mismatch;
+  }
+
+  for (const mismatch of ticketDayMismatches) {
+    if (!mismatch.ticket_id || !mismatch.ticket_number) {
       continue;
     }
 
-    groups.set(session.ticket_id, {
+    const group = ensureGroup(mismatch.ticket_id, mismatch.ticket_number, mismatch.organization_name, mismatch.day.slice(0, 7));
-      ticketId: session.ticket_id,
+    const day = group.days.get(mismatch.day) ?? { day: mismatch.day, missingCrm: null, ticketMismatch: null };
-      ticketNumber: session.ticket_number,
+    day.ticketMismatch = mismatch;
-      organizationName: session.organization_name,
+    group.days.set(mismatch.day, day);
-      month: session.started_at.slice(0, 7),
-      openCount: 1,
-      totalMinutes: session.rounded_minutes
-    });
   }
 
-  return Array.from(groups.values()).sort((left, right) => left.ticketNumber.localeCompare(right.ticketNumber, "de", { numeric: true, sensitivity: "base" }));
+  for (const missingCrm of missingCrmDays) {
+    const group = ensureGroup(missingCrm.ticket_id, missingCrm.ticket_number, missingCrm.organization_name, missingCrm.day.slice(0, 7));
+    const day = group.days.get(missingCrm.day) ?? { day: missingCrm.day, missingCrm: null, ticketMismatch: null };
+    day.missingCrm = missingCrm;
+    group.days.set(missingCrm.day, day);
+  }
+
+  return Array.from(groups.values())
+    .map((group): MonthlyCloseTicketGroup => ({
+      ...group,
+      days: Array.from(group.days.values()).sort((left, right) => left.day.localeCompare(right.day))
+    }))
+    .sort((left, right) => left.ticketNumber.localeCompare(right.ticketNumber, "de", { numeric: true, sensitivity: "base" }));
 }
 
-function OpenTicketItem({ group, onNavigate }: { group: OpenTicketGroup; onNavigate: (to: string) => void }) {
+function MonthlyCloseTicketItem({
+  group,
+  onNavigate
+}: {
+  group: MonthlyCloseTicketGroup;
+  onNavigate: (to: string) => void;
+}) {
+  const missingDayCount = group.days.filter((day) => day.missingCrm && !day.missingCrm.acknowledged).length;
+  const acknowledgedDayCount = group.days.filter((day) => day.missingCrm?.acknowledged).length;
+  const mismatchDayCount = group.days.filter((day) => day.ticketMismatch && day.ticketMismatch.delta_minutes !== 0).length;
+  const invalidTeamspaceValueDayCount = group.days.filter((day) => day.ticketMismatch?.tt_value_without_billed_session).length;
+  const monthDeltaMinutes = group.mismatch?.teamspace_month_delta_minutes ?? 0;
+  const monthDeltaLabel = monthDeltaMinutes > 0
+    ? `TS +${formatMinutes(monthDeltaMinutes)}`
+    : `TT +${formatMinutes(Math.abs(monthDeltaMinutes))}`;
+  const metricClassName = (visible: boolean) => `${visible ? "flex" : "hidden xl:flex"} min-h-7 items-center justify-between gap-2 rounded-md bg-muted/30 px-2 xl:min-h-5 xl:justify-center xl:rounded-none xl:bg-transparent xl:px-0`;
+
   return (
-    <div className="rounded-md border bg-background px-3 py-2">
+    <div className={`grid grid-cols-1 items-center gap-1.5 rounded-md border bg-background px-3 py-2.5 sm:grid-cols-2 xl:gap-2 ${monthlyCloseTicketGridClassName}`}>
-      <div className="flex items-start justify-between gap-3">
+      <div className="min-w-0 sm:col-span-2 xl:col-span-1">
-        <div className="min-w-0 space-y-1">
+        <p className="font-medium">{group.ticketNumber}</p>
-          <div className="flex flex-wrap items-center gap-2">
+        <p className="truncate text-xs text-muted-foreground">{group.organizationName}</p>
-            <span className="font-medium">{group.ticketNumber}</span>
+      </div>
-            <CopyTicketButton ticketNumber={group.ticketNumber} />
+      <div className={metricClassName(group.openCount > 0)}>
-            <Badge variant="warning">{group.openCount} offen</Badge>
+        <span className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground xl:hidden">Offene Bewertungen</span>
-          </div>
+        {group.openCount > 0 ? (
-          <p className="truncate text-sm text-muted-foreground">{group.organizationName}</p>
+          <Badge className="bg-amber-500/12 text-amber-800 dark:bg-amber-500/20 dark:text-amber-200" title={`${group.openCount} offene Bewertung(en) · ${formatMinutes(group.totalMinutes)}`}>
-          <p className={`text-xs font-medium ${trackedTextClass}`}>{formatMinutes(group.totalMinutes)} offen zu bewerten</p>
+            {group.openCount}
-        </div>
+          </Badge>
-        <Button className="h-8 shrink-0" variant="secondary" size="sm" onClick={() => onNavigate(`/tickets/${group.ticketId}?month=${group.month}`)}>
+        ) : null}
+      </div>
+      <div className={metricClassName(Boolean(group.mismatch))}>
+        <span className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground xl:hidden">Monatsabweichung</span>
+        {group.mismatch ? (
+          <Badge className="bg-orange-500/12 text-orange-800 dark:bg-orange-500/20 dark:text-orange-200" title="Monatsabweichung zwischen TT-Teamspace und TS-API">
+            {monthDeltaLabel}
+          </Badge>
+        ) : null}
+      </div>
+      <div className={metricClassName(missingDayCount > 0 || acknowledgedDayCount > 0)}>
+        <span className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground xl:hidden">Fehlender TT-Wert</span>
+        <span className="flex flex-wrap items-center justify-end gap-1 xl:flex-col xl:justify-center">
+          {missingDayCount > 0 ? (
+            <Badge className="bg-sky-500/12 text-sky-800 dark:bg-sky-500/20 dark:text-sky-200" title={`${missingDayCount} Tag(e) ohne TT-Teamspace-Wert`}>
+              TT {missingDayCount}
+            </Badge>
+          ) : null}
+          {acknowledgedDayCount > 0 ? (
+            <Badge className="bg-emerald-500/12 text-emerald-800 dark:bg-emerald-500/20 dark:text-emerald-200" title={`${acknowledgedDayCount} zur Kenntnis genommene(r) Tag(e)`}>
+              ✓ {acknowledgedDayCount}
+            </Badge>
+          ) : null}
+        </span>
+      </div>
+      <div className={metricClassName(mismatchDayCount > 0)}>
+        <span className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground xl:hidden">Tagesabweichung</span>
+        {mismatchDayCount > 0 ? (
+          <Badge className="bg-violet-500/12 text-violet-800 dark:bg-violet-500/20 dark:text-violet-200" title={`${mismatchDayCount} Tag(e) mit Abweichung zwischen TT und TS`}>
+            {mismatchDayCount}
+          </Badge>
+        ) : null}
+      </div>
+      <div className={metricClassName(invalidTeamspaceValueDayCount > 0)}>
+        <span className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground xl:hidden">TT-Wert ohne Abrechnung</span>
+        {invalidTeamspaceValueDayCount > 0 ? (
+          <Badge variant="destructive" title={`${invalidTeamspaceValueDayCount} Tag(e) mit TT-Teamspace-Wert, aber ohne abgerechnete Session`}>{invalidTeamspaceValueDayCount}</Badge>
+        ) : null}
+      </div>
+      <div className="flex shrink-0 items-center justify-end gap-1.5 pt-0.5 sm:col-span-2 xl:col-span-1 xl:pt-0">
+        <CopyTicketButton ticketNumber={group.ticketNumber} />
+        <Button className="h-8" variant="secondary" size="sm" onClick={() => onNavigate(`/tickets/${group.ticketId}?month=${group.month}`)}>
           Ticket öffnen
           <ExternalLink className="size-4" />
         </Button>
@@ -126,78 +240,7 @@ function OpenTicketItem({ group, onNavigate }: { group: OpenTicketGroup; onNavig
   );
 }
 
-function CrmDayItem({
+export function MonthlyClosePage({ currentUser, onNavigate }: MonthlyClosePageProps) {
-  item,
-  busy,
-  onSetAcknowledgement,
-  onNavigate
-}: {
-  item: StatisticsCrmDay;
-  busy: boolean;
-  onSetAcknowledgement: (item: StatisticsCrmDay, acknowledged: boolean) => void;
-  onNavigate: (to: string) => void;
-}) {
-  const isAcknowledged = Boolean(item.acknowledged);
-
-  return (
-    <div className={`rounded-md border bg-background px-3 py-2 ${isAcknowledged ? "opacity-75" : ""}`}>
-      <div className="flex items-start justify-between gap-3">
-        <div className="min-w-0 space-y-1">
-          <div className="flex flex-wrap items-center gap-2">
-            <span className="font-medium">{item.ticket_number}</span>
-            <CopyTicketButton ticketNumber={item.ticket_number} />
-            <Badge variant="outline">{formatDate(`${item.day}T00:00:00`)}</Badge>
-            <Badge variant={isAcknowledged ? "success" : "warning"}>{isAcknowledged ? "zur Kenntnis" : "offen"}</Badge>
-          </div>
-          <p className="truncate text-sm text-muted-foreground">{item.organization_name}</p>
-          <p className="flex flex-wrap gap-x-3 gap-y-1 text-xs">
-            <span className={trackedTextClass}>Abgerechnet {formatMinutes(item.tracked_minutes)}</span>
-            <span className={teamspaceTextClass}>Teamspace {formatMinutes(item.crm_billed_minutes)}</span>
-            {typeof item.delta_minutes === "number" ? <span className="text-muted-foreground">Differenz {formatTeamspaceDelta(item.delta_minutes)}</span> : null}
-          </p>
-        </div>
-        <div className="flex shrink-0 flex-wrap justify-end gap-2">
-          <Button className="h-8" variant={isAcknowledged ? "secondary" : "ghost"} size="sm" disabled={busy} onClick={() => onSetAcknowledgement(item, !isAcknowledged)}>
-            {isAcknowledged ? "Zurücknehmen" : "Zur Kenntnis"}
-          </Button>
-          <Button className="h-8" variant="secondary" size="sm" onClick={() => onNavigate(`/tickets/${item.ticket_id}?month=${item.day.slice(0, 7)}`)}>
-            Tag öffnen
-            <ExternalLink className="size-4" />
-          </Button>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-function TeamspaceDayItem({ item, onNavigate }: { item: StatisticsTeamspaceDay; onNavigate: (to: string) => void }) {
-  return (
-    <div className="grid gap-3 rounded-md border bg-background px-3 py-2 lg:grid-cols-[minmax(8rem,0.75fr)_minmax(0,1.65fr)_minmax(8rem,0.6fr)] lg:items-center">
-      <div className="flex flex-wrap items-center gap-2">
-        <Badge variant="outline">{formatDate(`${item.day}T00:00:00`)}</Badge>
-      </div>
-      <div className="min-w-0 space-y-1">
-        <div className="flex min-w-0 flex-wrap items-center gap-2">
-          <button
-            type="button"
-            className="font-medium underline-offset-4 hover:underline"
-            onClick={() => onNavigate(`/tickets/${item.ticket_id}?month=${item.day.slice(0, 7)}`)}
-          >
-            {item.ticket_number}
-          </button>
-          <CopyTicketButton ticketNumber={item.ticket_number} />
-          {item.project_teamspace_project ? <Badge variant="secondary">{item.project_teamspace_project}</Badge> : null}
-        </div>
-        <p className="truncate text-sm text-muted-foreground">{item.organization_name}</p>
-      </div>
-      <div className="text-sm">
-        <Badge variant="success">{formatMinutes(item.crm_billed_minutes)}</Badge>
-      </div>
-    </div>
-  );
-}
-
-export function MonthlyClosePage({ onNavigate }: MonthlyClosePageProps) {
   const [viewMode, setViewMode] = useState<MonthlyCloseViewMode>(() => readMonthlyCloseViewMode());
   const [month, setMonth] = useState(currentMonth());
   const [week, setWeek] = useState(currentWeek());
@@ -205,7 +248,6 @@ export function MonthlyClosePage({ onNavigate }: MonthlyClosePageProps) {
   const [loading, setLoading] = useState(false);
   const [closing, setClosing] = useState(false);
   const [reopening, setReopening] = useState(false);
-  const [acknowledgingKeys, setAcknowledgingKeys] = useState<Set<string>>(() => new Set());
   const [showAcknowledgedMissingCrm, setShowAcknowledgedMissingCrm] = useState(false);
   const [showAcknowledgedMissingCrmLoaded, setShowAcknowledgedMissingCrmLoaded] = useState(false);
   const loadRequestId = useRef(0);
@@ -214,6 +256,7 @@ export function MonthlyClosePage({ onNavigate }: MonthlyClosePageProps) {
   const periodAttentionLabel = viewMode === "month" ? "diesen Monat" : "diese Woche";
   const periodInLabel = viewMode === "month" ? "diesem Monat" : "dieser Woche";
   const isMonthView = viewMode === "month";
+  const teamspaceTimeTrackingEnabled = currentUser.teamspace_time_tracking_enabled ?? true;
 
   async function load() {
     const requestId = loadRequestId.current + 1;
@@ -316,52 +359,47 @@ export function MonthlyClosePage({ onNavigate }: MonthlyClosePageProps) {
     }
   }
 
-  async function setMissingCrmAcknowledgement(item: StatisticsCrmDay, acknowledged: boolean) {
-    const key = `${item.ticket_id}:${item.day}`;
-    setAcknowledgingKeys((current) => new Set(current).add(key));
-
-    try {
-      await acknowledgeMissingTicketDayBilling(item.ticket_id, item.day, acknowledged);
-      toast.success(acknowledged ? "Teamspace-Prüfung abgehakt" : "Kenntnisnahme zurückgenommen", {
-        description: `${item.ticket_number} am ${formatDate(`${item.day}T00:00:00`)}`
-      });
-      await load();
-    } catch (error) {
-      toast.error(acknowledged ? "Konnte nicht abgehakt werden" : "Konnte nicht zurückgenommen werden", {
-        description: error instanceof Error ? error.message : "Unbekannter Fehler"
-      });
-    } finally {
-      setAcknowledgingKeys((current) => {
-        const next = new Set(current);
-        next.delete(key);
-        return next;
-      });
-    }
-  }
-
   const openSessions = stats?.attention.openSessions ?? [];
   const missingCrmDays = stats?.attention.missingCrmDays ?? [];
   const acknowledgedMissingCrmDays = stats?.attention.acknowledgedMissingCrmDays ?? [];
-  const teamspaceDays = stats?.teamspaceDays ?? [];
+  const teamspaceMonthMismatches = stats?.attention.teamspaceMonthMismatches ?? [];
-  const openTicketGroups = useMemo(() => groupOpenSessions(openSessions), [openSessions]);
+  const ticketTeamspaceMismatches = stats?.attention.ticketTeamspaceMismatches ?? [];
+  const billedMinutes = stats?.totals.billedMinutes ?? 0;
+  const ttTeamspaceMinutes = stats?.totals.crmBilledMinutes ?? 0;
+  const teamspaceApiBillableMinutes = stats?.totals.teamspaceApiBillableMinutes ?? 0;
+  const teamspaceApiDeltaMinutes = stats?.totals.teamspaceApiDeltaMinutes ?? 0;
   const visibleMissingCrmDays = useMemo(() => {
     const days = showAcknowledgedMissingCrm ? [...missingCrmDays, ...acknowledgedMissingCrmDays] : [...missingCrmDays];
     return days.sort((left, right) => left.day.localeCompare(right.day) || left.ticket_number.localeCompare(right.ticket_number, "de", { numeric: true, sensitivity: "base" }));
   }, [acknowledgedMissingCrmDays, missingCrmDays, showAcknowledgedMissingCrm]);
+  const activeReviewTicketGroups = useMemo(
+    () => buildMonthlyCloseTicketGroups(openSessions, teamspaceMonthMismatches, ticketTeamspaceMismatches, missingCrmDays, month),
+    [missingCrmDays, month, openSessions, teamspaceMonthMismatches, ticketTeamspaceMismatches]
+  );
+  const visibleReviewTicketGroups = useMemo(
+    () => buildMonthlyCloseTicketGroups(openSessions, teamspaceMonthMismatches, ticketTeamspaceMismatches, visibleMissingCrmDays, month),
+    [month, openSessions, teamspaceMonthMismatches, ticketTeamspaceMismatches, visibleMissingCrmDays]
+  );
+  const teamspaceAttentionTicketCount = activeReviewTicketGroups.filter((group) => group.mismatch || group.days.length > 0).length;
+  const missingCrmTicketCount = new Set(missingCrmDays.map((item) => item.ticket_id)).size;
+  const ticketTeamspaceDeviationCount = ticketTeamspaceMismatches.filter((item) => item.delta_minutes !== 0).length;
+  const invalidTeamspaceValueDayCount = ticketTeamspaceMismatches.filter((item) => item.tt_value_without_billed_session).length;
   const canClose = Boolean(isMonthView && stats && !stats.closed && stats.totals.sessions > 0 && openSessions.length === 0);
   const checklist = useMemo(
     () => [
       {
-        label: "Offene Bewertungen",
+        label: "Tickets zu prüfen",
-        ok: openSessions.length === 0,
+        ok: activeReviewTicketGroups.length === 0,
-        value: openSessions.length,
+        value: activeReviewTicketGroups.length,
-        detail: openSessions.length === 0 ? "Keine offenen Bewertungen." : `${openTicketGroups.length} Ticket(s) bearbeiten`
+        detail: activeReviewTicketGroups.length === 0 ? "Keine offenen Prüfpunkte." : `${activeReviewTicketGroups.length} Ticket(s) mit mindestens einem Prüfpunkt`
       },
       {
         label: "Teamspace geprüft",
-        ok: missingCrmDays.length === 0,
+        ok: teamspaceAttentionTicketCount === 0,
-        value: missingCrmDays.length,
+        value: teamspaceAttentionTicketCount,
-        detail: missingCrmDays.length === 0 ? "Keine offenen Teamspace-Prüfpunkte." : `${acknowledgedMissingCrmDays.length} zur Kenntnis genommen`
+        detail: teamspaceAttentionTicketCount === 0
+          ? "Keine offenen Teamspace-Prüfpunkte."
+          : `${missingCrmDays.length} fehlende Tageswerte, ${ticketTeamspaceDeviationCount} Tagesabweichungen, ${invalidTeamspaceValueDayCount} TS-Werte ohne Abrechnung, ${teamspaceMonthMismatches.length} Monatsabweichungen`
       },
       {
         label: isMonthView ? "Monat abschließbar" : "Wochenansicht",
@@ -370,7 +408,7 @@ export function MonthlyClosePage({ onNavigate }: MonthlyClosePageProps) {
         detail: isMonthView ? (stats?.closed ? "Monat ist gesperrt." : canClose ? "Kann abgeschlossen werden." : "Bewertungen prüfen.") : "Abschluss bleibt monatlich."
       }
     ],
-    [acknowledgedMissingCrmDays.length, canClose, isMonthView, openSessions.length, openTicketGroups.length, missingCrmDays.length, stats?.closed]
+    [activeReviewTicketGroups.length, canClose, invalidTeamspaceValueDayCount, isMonthView, missingCrmDays.length, stats?.closed, teamspaceAttentionTicketCount, teamspaceMonthMismatches.length, ticketTeamspaceDeviationCount]
   );
 
   return (
@@ -378,7 +416,7 @@ export function MonthlyClosePage({ onNavigate }: MonthlyClosePageProps) {
       <div className="flex flex-col gap-3 xl:flex-row xl:items-end xl:justify-between">
         <div>
           <h2 className="text-2xl font-semibold tracking-normal">Monatsabschluss</h2>
-          <p className="text-sm text-muted-foreground">Offene Bewertungen und Teamspace-Abgleich für {periodAttentionLabel}; der Abschluss selbst bleibt monatlich.</p>
+          <p className="text-sm text-muted-foreground">Offene Bewertungen und TS-API-Abgleich für {periodAttentionLabel}; der Abschluss selbst bleibt monatlich.</p>
         </div>
         <div className="grid gap-2 sm:grid-cols-[auto_minmax(220px,300px)_auto] sm:items-end">
           <div className="space-y-1">
@@ -439,10 +477,29 @@ export function MonthlyClosePage({ onNavigate }: MonthlyClosePageProps) {
       ) : null}
 
       <div className="grid gap-3 sm:grid-cols-2 xl:grid-cols-5">
-        <StatusCard label="Sessions" value={stats?.totals.sessions ?? 0} detail={`${formatMinutes(stats?.totals.minutes ?? 0)} abgerechnet`} />
+        <StatusCard
-        <StatusCard label="Teamspace" value={formatMinutes(stats?.totals.crmBilledMinutes ?? 0)} detail={`Differenz ${formatTeamspaceDelta(stats?.totals.crmDeltaMinutes ?? 0)}`} />
+          label="Tickettracker-Werte"
-        <StatusCard label="Offene Bewertungen" value={openSessions.length} detail={`${openTicketGroups.length} Ticket(s)`} tone={openSessions.length > 0 ? "warn" : "ok"} />
+          value={stats?.totals.sessions ?? 0}
-        <StatusCard label="Ohne Teamspace" value={missingCrmDays.length} detail={`${acknowledgedMissingCrmDays.length} zur Kenntnis genommen`} tone={missingCrmDays.length > 0 ? "warn" : "ok"} />
+          detail={`${formatMinutes(stats?.totals.minutes ?? 0)} abgerechnet`}
+        />
+        <StatusCard
+          label="TT-Teamspace"
+          value={formatMinutes(ttTeamspaceMinutes)}
+          detail={`aus TS API ${formatMinutes(teamspaceApiBillableMinutes)}\n${formatMissingTarget(teamspaceApiDeltaMinutes, teamspaceTimeTrackingEnabled)}`}
+          tone={teamspaceApiDeltaMinutes !== 0 ? "warn" : "ok"}
+        />
+        <StatusCard
+          label="Tickets zu prüfen"
+          value={activeReviewTicketGroups.length}
+          detail={`${openSessions.length} offene Bewertung(en)\n${teamspaceAttentionTicketCount} Ticket(s) mit TS-Prüfpunkten`}
+          tone={activeReviewTicketGroups.length > 0 ? "warn" : "ok"}
+        />
+        <StatusCard
+          label="Ohne TT-Teamspace"
+          value={missingCrmTicketCount}
+          detail={`${missingCrmDays.length} Tag(e) · ${acknowledgedMissingCrmDays.length} zur Kenntnis`}
+          tone={missingCrmDays.length > 0 ? "warn" : "ok"}
+        />
         <StatusCard
           label="Status"
           value={isMonthView ? (stats?.closed ? "geschlossen" : canClose ? "bereit" : "offen") : "Ansicht"}
@@ -478,8 +535,11 @@ export function MonthlyClosePage({ onNavigate }: MonthlyClosePageProps) {
         <CardHeader className="p-4">
           <div className="flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between">
             <div>
-              <CardTitle>Aufräumen</CardTitle>
+              <CardTitle className="flex items-center gap-2">
-              <CardDescription>Alles, was für {periodAttentionLabel} noch Aufmerksamkeit braucht.</CardDescription>
+                <FileWarning className="size-4 text-muted-foreground" />
+                Prüfliste nach Ticket
+              </CardTitle>
+              <CardDescription>Offene Bewertungen, fehlende Tageswerte sowie Monats- und Tagesabweichungen – je Ticket einmal in festen Statusspalten.</CardDescription>
             </div>
             <div className="flex flex-wrap items-center gap-2">
               <div className="inline-flex h-8 items-center gap-2 rounded-md border bg-background px-3 text-sm">
@@ -494,63 +554,40 @@ export function MonthlyClosePage({ onNavigate }: MonthlyClosePageProps) {
             </div>
           </div>
         </CardHeader>
-        <CardContent className="grid gap-4 px-4 pb-4 xl:grid-cols-2">
+        <CardContent className="space-y-3 px-4 pb-4">
-          <section className="space-y-2">
+          <div className="flex flex-wrap items-center justify-between gap-2 text-xs text-muted-foreground">
-            <div className="flex min-h-8 items-center gap-2 text-sm font-medium">
+            <span>{visibleReviewTicketGroups.length} Ticket(s) angezeigt</span>
-              <FileWarning className="size-4 text-muted-foreground" />
+            <span>Tagesdetails stehen im jeweiligen Ticket</span>
-              Offene Bewertungen
+          </div>
+          {visibleReviewTicketGroups.length > 0 ? (
+            <div className="space-y-2">
+              <div className={`hidden items-end gap-2 border border-transparent px-3 text-[11px] font-medium leading-tight uppercase tracking-wide text-muted-foreground xl:grid ${monthlyCloseTicketGridClassName}`}>
+                <span>Ticket</span>
+                <span className="text-center">Offene<br />Bewertungen</span>
+                <span className="text-center">Monatsabweichung<br />TT / TS</span>
+                <span className="text-center">Fehlender<br />TT-Wert</span>
+                <span className="text-center">Tagesabweichung<br />TT / TS</span>
+                <span className="text-center">TT-Wert ohne<br />Abrechnung</span>
+                <span className="sr-only">Aktionen</span>
+              </div>
+              {visibleReviewTicketGroups.map((group) => (
+                <MonthlyCloseTicketItem
+                  key={group.ticketId}
+                  group={group}
+                  onNavigate={onNavigate}
+                />
+              ))}
             </div>
-            {openTicketGroups.map((group) => (
+          ) : (
-              <OpenTicketItem key={group.ticketId} group={group} onNavigate={onNavigate} />
+            <p className="rounded-md border bg-muted/20 p-3 text-sm text-muted-foreground">
-            ))}
+              {acknowledgedMissingCrmDays.length > 0 && !showAcknowledgedMissingCrm
-            {openTicketGroups.length === 0 ? <p className="rounded-md border bg-muted/20 p-3 text-sm text-muted-foreground">Keine offenen Bewertungen.</p> : null}
+                ? "Keine offenen Prüfpunkte. Zur Kenntnis genommene Tageswerte können eingeblendet werden."
-          </section>
+                : "Keine offenen Prüfpunkte für diesen Zeitraum."}
-
+            </p>
-          <section className="space-y-2">
+          )}
-            <div className="flex min-h-8 items-center gap-2 text-sm font-medium">
-              <Sparkles className="size-4 text-muted-foreground" />
-              Tage ohne Teamspace-Wert
-            </div>
-            {visibleMissingCrmDays.map((item) => (
-              <CrmDayItem
-                key={`${item.ticket_id}-${item.day}-missing`}
-                item={item}
-                busy={acknowledgingKeys.has(`${item.ticket_id}:${item.day}`)}
-                onSetAcknowledgement={setMissingCrmAcknowledgement}
-                onNavigate={onNavigate}
-              />
-            ))}
-            {visibleMissingCrmDays.length === 0 ? (
-              <p className="rounded-md border bg-muted/20 p-3 text-sm text-muted-foreground">
-                {acknowledgedMissingCrmDays.length > 0 ? "Alle offenen Punkte sind zur Kenntnis genommen." : "Alle abrechenbaren Tage haben einen Teamspace-Wert."}
-              </p>
-            ) : null}
-          </section>
         </CardContent>
       </Card>
 
-      <Accordion type="single" collapsible className="rounded-md border bg-card px-4">
-        <AccordionItem value="teamspace-entries" className="border-b-0">
-          <AccordionTrigger className="py-3 hover:no-underline">
-            <span className="flex min-w-0 flex-wrap items-center gap-2">
-              <span>Teamspace-Einträge</span>
-              <Badge variant="outline">{teamspaceDays.length} Eintrag(e)</Badge>
-            </span>
-          </AccordionTrigger>
-          <AccordionContent className="space-y-2 pb-4">
-            {teamspaceDays.length > 0 ? (
-              <div className="max-h-[28rem] space-y-2 overflow-y-auto pr-1">
-                {teamspaceDays.map((item) => (
-                  <TeamspaceDayItem key={`${item.ticket_id}-${item.day}`} item={item} onNavigate={onNavigate} />
-                ))}
-              </div>
-            ) : (
-              <p className="rounded-md border bg-muted/20 p-3 text-sm text-muted-foreground">Für {periodAttentionLabel} sind noch keine Teamspace-Werte zu abgerechneten Ticket-Tagen vorhanden.</p>
-            )}
-          </AccordionContent>
-        </AccordionItem>
-      </Accordion>
-
       {stats && stats.totals.sessions === 0 ? (
         <Card>
           <CardContent className="grid place-items-center gap-2 p-8 text-center">

frontend/src/views/ProfilePage.tsx

@@ -6,6 +6,7 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/com
 import { Input } from "@/components/ui/input";
 import { Switch } from "@/components/ui/switch";
 import { HelpLink } from "@/components/HelpLink";
+import { ListClockIcon } from "@/components/icons/ListClockIcon";
 import { getZammadSessionArticleQueue, retryZammadSessionArticleQueue, updateCurrentUser } from "../api";
 import { formatDateTime, formatMinutes } from "../format";
 import type { AuthUser, ZammadSessionArticleQueueItem } from "../types";
@@ -30,8 +31,10 @@ export function ProfilePage({ currentUser, onUserUpdated }: ProfilePageProps) {
   const [zammadEmailSessionWebhookEnabled, setZammadEmailSessionWebhookEnabled] = useState(currentUser.zammad_email_session_webhook_enabled);
   const [zammadAtossEmailSyncEnabled, setZammadAtossEmailSyncEnabled] = useState(currentUser.zammad_atoss_email_sync_enabled);
   const [sessionBillingPromptEnabled, setSessionBillingPromptEnabled] = useState(currentUser.session_billing_prompt_enabled);
+  const [sessionWorkSegmentsEnabled, setSessionWorkSegmentsEnabled] = useState(currentUser.session_work_segments_enabled);
   const [teamspaceTimeTrackingEnabled, setTeamspaceTimeTrackingEnabled] = useState(currentUser.teamspace_time_tracking_enabled ?? true);
   const [zammadSessionNoteDefaultEnabled, setZammadSessionNoteDefaultEnabled] = useState(currentUser.zammad_session_note_default_enabled);
+  const [zammadSessionNoteDateHeaderEnabled, setZammadSessionNoteDateHeaderEnabled] = useState(currentUser.zammad_session_note_date_header_enabled);
   const [zammadTimeUnitRoundingEnabled, setZammadTimeUnitRoundingEnabled] = useState(currentUser.zammad_time_unit_rounding_enabled);
   const [zammadTimeUnitRoundingMinutes, setZammadTimeUnitRoundingMinutes] = useState(currentUser.zammad_time_unit_rounding_minutes);
   const [zammadArticleTypeId, setZammadArticleTypeId] = useState<ZammadArticleTypeId>(currentUser.zammad_article_type_id ?? 6);
@@ -56,8 +59,10 @@ export function ProfilePage({ currentUser, onUserUpdated }: ProfilePageProps) {
     setZammadEmailSessionWebhookEnabled(currentUser.zammad_email_session_webhook_enabled);
     setZammadAtossEmailSyncEnabled(currentUser.zammad_atoss_email_sync_enabled);
     setSessionBillingPromptEnabled(currentUser.session_billing_prompt_enabled);
+    setSessionWorkSegmentsEnabled(currentUser.session_work_segments_enabled);
     setTeamspaceTimeTrackingEnabled(currentUser.teamspace_time_tracking_enabled ?? true);
     setZammadSessionNoteDefaultEnabled(currentUser.zammad_session_note_default_enabled);
+    setZammadSessionNoteDateHeaderEnabled(currentUser.zammad_session_note_date_header_enabled);
     setZammadTimeUnitRoundingEnabled(currentUser.zammad_time_unit_rounding_enabled);
     setZammadTimeUnitRoundingMinutes(currentUser.zammad_time_unit_rounding_minutes);
     setZammadArticleTypeId(currentUser.zammad_article_type_id ?? 6);
@@ -148,8 +153,10 @@ export function ProfilePage({ currentUser, onUserUpdated }: ProfilePageProps) {
           zammadEmailSessionWebhookEnabled,
           zammadAtossEmailSyncEnabled,
           sessionBillingPromptEnabled,
+          sessionWorkSegmentsEnabled,
           teamspaceTimeTrackingEnabled,
           zammadSessionNoteDefaultEnabled,
+          zammadSessionNoteDateHeaderEnabled,
           zammadTimeUnitRoundingEnabled,
           zammadTimeUnitRoundingMinutes,
           zammadArticleTypeId,
@@ -442,6 +449,22 @@ export function ProfilePage({ currentUser, onUserUpdated }: ProfilePageProps) {
                     onCheckedChange={setSessionBillingPromptEnabled}
                   />
                 </div>
+                <div className="mt-3 flex items-center justify-between gap-3 rounded-md border bg-background p-3">
+                  <div className="flex items-center gap-2">
+                    <ListClockIcon className="size-4 text-muted-foreground" />
+                    <div>
+                      <label className="text-sm font-medium" htmlFor="profile-session-work-segments">
+                        Arbeitsbereiche bei Pausen speichern
+                      </label>
+                      <p className="text-xs text-muted-foreground">Beim Pausieren und Fortsetzen die konkreten Von-bis-Zeiten an der Session merken.</p>
+                    </div>
+                  </div>
+                  <Switch
+                    id="profile-session-work-segments"
+                    checked={sessionWorkSegmentsEnabled}
+                    onCheckedChange={setSessionWorkSegmentsEnabled}
+                  />
+                </div>
                 <div className="mt-3 space-y-3 rounded-md border bg-background p-3">
                   <div className="flex items-center justify-between gap-3">
                     <div>
@@ -547,6 +570,24 @@ export function ProfilePage({ currentUser, onUserUpdated }: ProfilePageProps) {
                     }}
                   />
                 </div>
+                <div className="mt-3 rounded-md border bg-background p-3">
+                  <div className="flex items-center justify-between gap-3">
+                    <div className="flex items-center gap-2">
+                      <FileText className="size-4 text-muted-foreground" />
+                      <div>
+                        <label className="text-sm font-medium" htmlFor="profile-zammad-date-header">
+                          Datum bei nachgetragenen Sessions voranstellen
+                        </label>
+                        <p className="text-xs text-muted-foreground">Bei Einträgen vor heute wird nur in der Zammad-Notiz das Datum mit Leerzeile eingefügt.</p>
+                      </div>
+                    </div>
+                    <Switch
+                      id="profile-zammad-date-header"
+                      checked={zammadSessionNoteDateHeaderEnabled}
+                      onCheckedChange={setZammadSessionNoteDateHeaderEnabled}
+                    />
+                  </div>
+                </div>
                 {zammadSessionNoteDefaultEnabled ? (
                   <div className="mt-3 space-y-3">
                     <div className="rounded-md border bg-background p-3">

frontend/src/views/ProjectsPage.tsx

@@ -95,6 +95,7 @@ const projectStaticFilterOptions: ProjectFilterOption[] = [
   { value: "open", label: "TT Offen" },
   { value: "closed", label: "TT Geschl." },
   { value: "hidden", label: "Ausgebl." },
+  { value: "teamspaceExcluded", label: "TS ausgenommen" },
   { value: "budgeted", label: "Mit Kontingent" },
   { value: "withoutBudget", label: "Ohne Kontingent" },
   { value: "remaining", label: "Mit Rest" },
@@ -347,7 +348,11 @@ function projectTeamspaceEntryLabel(entry: { teamspace_project: string | null; t
 }
 
 function budgetedProjectTeamspaceEntries(project: ProjectSummary) {
-  return projectTeamspaceEntries(project).filter((entry) => Number(entry.hour_budget_minutes ?? 0) > 0);
+  if (projectBudgetExcluded(project)) {
+    return [];
+  }
+
+  return projectTeamspaceEntries(project).filter((entry) => !entry.teamspace_budget_excluded && Number(entry.hour_budget_minutes ?? 0) > 0);
 }
 
 function projectEntryConsumption(entry: ProjectTeamspaceEntry) {
@@ -412,7 +417,15 @@ function projectOrganizationKey(project: ProjectSummary) {
   return project.organization_id ? `id:${project.organization_id}` : `name:${projectOrganizationLabel(project)}`;
 }
 
+function projectBudgetExcluded(project: ProjectSummary) {
+  return Boolean(project.teamspace_budget_excluded || projectTeamspaceEntries(project).some((entry) => entry.teamspace_budget_excluded));
+}
+
 function projectBudget(project: ProjectSummary, _standardTeamspaceOnly = false) {
+  if (projectBudgetExcluded(project)) {
+    return null;
+  }
+
   return project.hour_budget_minutes ?? null;
 }
 
@@ -487,6 +500,10 @@ function projectFilterGroup(filter: string) {
     return "visibility";
   }
 
+  if (filter === "teamspaceExcluded") {
+    return "teamspaceExclusion";
+  }
+
   if (filter.startsWith("zammadState:")) {
     return "zammadState";
   }
@@ -511,6 +528,10 @@ function matchesSingleProjectFilter(project: ProjectSummary, filter: string, sta
     return Boolean(project.hidden_for_user);
   }
 
+  if (filter === "teamspaceExcluded") {
+    return projectBudgetExcluded(project);
+  }
+
   if (filter.startsWith("zammadState:")) {
     return matchesZammadStateFilter(project.zammad_state_id, filter.slice("zammadState:".length) as Parameters<typeof matchesZammadStateFilter>[1]);
   }
@@ -546,6 +567,12 @@ function matchesProjectFilters(project: ProjectSummary, filters: string[], organ
     return false;
   }
 
+  const showTeamspaceExcluded = filters.includes("teamspaceExcluded");
+
+  if (projectBudgetExcluded(project) !== showTeamspaceExcluded) {
+    return false;
+  }
+
   return groupedProjectFilterMatch(filters, projectFilterGroup, (filter) => matchesSingleProjectFilter(project, filter, standardTeamspaceOnly));
 }
 
@@ -1656,6 +1683,7 @@ export function ProjectsPage({ currentUser, onNavigate, onStartTimer }: Projects
               const usedPercent = projectConsumptionPercent(project, viewSettings.standardTeamspaceOnly);
               const budgetExceeded = budgetMinutes !== null && budgetMinutes > 0 && consumptionMinutes > budgetMinutes;
               const showBudgetedTeamspaceEntries = !viewSettings.standardTeamspaceOnly && budgetedTeamspaceEntries.length > 1;
+              const budgetExcluded = projectBudgetExcluded(project);
               const canEditProject = project.can_edit === true;
               const unassignedTeamspaceEntryCount = Number(project.unassigned_teamspace_session_count ?? 0);
               const unassignedTeamspaceSubentryCount = 0;
@@ -1695,17 +1723,28 @@ export function ProjectsPage({ currentUser, onNavigate, onStartTimer }: Projects
                 </div>
                 <div className="min-w-0">
                   <p className="truncate text-sm font-medium xl:hidden">Verbrauch/Gesamt</p>
+                  {budgetExcluded ? (
+                    <>
+                      <p className="text-sm font-semibold">{formatDecimalHours(consumptionMinutes)}</p>
+                      <p className="text-xs text-muted-foreground">Budgetprüfung ausgenommen</p>
+                    </>
+                  ) : (
 	                  <p className={cn("inline-flex items-center gap-1 text-sm font-semibold", remaining !== null && remaining < 0 ? "text-destructive" : undefined)}>
-                      {budgetExceeded ? <AlertCircle className="size-3.5 text-amber-500" aria-label="Budgetüberschreitung" /> : null}
+                        {budgetExceeded ? <AlertCircle className="size-3.5 text-amber-500" aria-label="Budgetüberschreitung" /> : null}
-	                    {formatDecimalHours(consumptionMinutes)} / {budgetMinutes ? formatDecimalHours(budgetMinutes) : "offen"}
+	                      {formatDecimalHours(consumptionMinutes)} / {budgetMinutes ? formatDecimalHours(budgetMinutes) : "offen"}
-	                  </p>
+	                    </p>
+                  )}
                   {showBudgetedTeamspaceEntries ? <p className="text-xs text-muted-foreground">{budgetedTeamspaceEntries.length} Budgets</p> : null}
                 </div>
                 <div className="min-w-0 text-sm">
                   <p className="truncate font-medium xl:hidden">Verbrauch %</p>
-                  <p className={cn("font-semibold", usedPercent !== null && usedPercent >= 100 ? "text-blue-500" : usedPercent !== null && usedPercent >= 90 ? "text-red-500" : undefined)}>
+                  {budgetExcluded ? (
-                    {usedPercent !== null ? `${usedPercent}%` : "-"}
+                    <p className="text-xs text-muted-foreground">keine Prüfung</p>
-                  </p>
+                  ) : (
+                    <p className={cn("font-semibold", usedPercent !== null && usedPercent >= 100 ? "text-blue-500" : usedPercent !== null && usedPercent >= 90 ? "text-red-500" : undefined)}>
+                      {usedPercent !== null ? `${usedPercent}%` : "-"}
+                    </p>
+                  )}
                 </div>
                 <div className="flex justify-end">
                   <DropdownMenu>
@@ -1807,7 +1846,9 @@ export function ProjectsPage({ currentUser, onNavigate, onStartTimer }: Projects
                     </Button>
                   </div>
                 ) : null}
-                {showBudgetedTeamspaceEntries ? (
+                {budgetExcluded ? (
+                  <p className="text-xs text-muted-foreground">Für dieses Teamspace-Projekt werden keine Differenzen und kein Budgetverbrauch ausgewertet. Der Verbrauch zählt weiter in Summen.</p>
+                ) : showBudgetedTeamspaceEntries ? (
                   <div className="grid gap-1.5 md:grid-cols-2">
                     {budgetedTeamspaceEntries.map((entry) => {
 	                      const entryPercent = projectEntryPercent(entry);

frontend/src/views/RecurringBillingsPage.tsx

@@ -26,6 +26,9 @@ type RecurringFormState = {
   organizationName: string | null;
   activity: string;
   workType: WorkType;
+  teamspaceProject: string;
+  hourBudgetHours: string;
+  manualConsumptionHours: string;
   recurrenceType: "weekly" | "every_n_weeks";
   intervalValue: number;
   validFrom: string;
@@ -50,6 +53,9 @@ function emptyRecurringForm(): RecurringFormState {
     organizationName: null,
     activity: "",
     workType: "support",
+    teamspaceProject: "",
+    hourBudgetHours: "",
+    manualConsumptionHours: "",
     recurrenceType: "weekly",
     intervalValue: 1,
     validFrom: currentDay(),
@@ -118,6 +124,9 @@ export function RecurringBillingsPage() {
       organizationName: billing.organization_name,
       activity: billing.activity,
       workType: billing.work_type,
+      teamspaceProject: billing.teamspace_project ?? "",
+      hourBudgetHours: billing.hour_budget_minutes === null ? "" : durationHoursLabel(billing.hour_budget_minutes),
+      manualConsumptionHours: billing.manual_consumption_minutes > 0 ? durationHoursLabel(billing.manual_consumption_minutes) : "",
       recurrenceType: billing.recurrence_type,
       intervalValue: billing.recurrence_type === "weekly" ? 1 : billing.interval_value,
       validFrom: billing.valid_from,
@@ -162,8 +171,26 @@ export function RecurringBillingsPage() {
     }
 
     let slots: Array<{ id?: string; weekday: number | null; startTime: string; durationMinutes: number }>;
+    let hourBudgetMinutes: number | null;
+    let manualConsumptionMinutes: number;
 
     try {
+      const parseOptionalHours = (value: string, label: string) => {
+        if (!value.trim()) {
+          return null;
+        }
+
+        const hours = Number(value.replace(",", "."));
+
+        if (!Number.isFinite(hours) || hours < 0) {
+          throw new Error(`${label} prüfen`);
+        }
+
+        return Math.round(hours * 60);
+      };
+
+      hourBudgetMinutes = parseOptionalHours(recurringForm.hourBudgetHours, "Budget");
+      manualConsumptionMinutes = parseOptionalHours(recurringForm.manualConsumptionHours, "Manuelle Stunden") ?? 0;
       slots = recurringForm.slots.map((slot) => {
         const hours = Number(slot.durationHours.replace(",", "."));
 
@@ -191,6 +218,9 @@ export function RecurringBillingsPage() {
         organizationId: recurringForm.organizationId,
         activity: recurringForm.activity,
         workType: recurringForm.workType,
+        teamspaceProject: recurringForm.teamspaceProject.trim() || null,
+        hourBudgetMinutes,
+        manualConsumptionMinutes,
         recurrenceType: recurringForm.recurrenceType,
         intervalValue: recurringForm.recurrenceType === "weekly" ? 1 : recurringForm.intervalValue,
         validFrom: recurringForm.validFrom,
@@ -355,6 +385,44 @@ export function RecurringBillingsPage() {
               ) : null}
             </div>
 
+            <div className="grid gap-3 lg:grid-cols-[minmax(220px,1fr)_180px_180px]">
+              <div className="space-y-2">
+                <label className="text-sm font-medium" htmlFor="recurring-teamspace-project">
+                  TS-Projekt (optional)
+                </label>
+                <Input
+                  id="recurring-teamspace-project"
+                  value={recurringForm.teamspaceProject}
+                  onChange={(event) => setRecurringForm({ ...recurringForm, teamspaceProject: event.currentTarget.value })}
+                  placeholder="Teamspace-Projekt"
+                />
+              </div>
+              <div className="space-y-2">
+                <label className="text-sm font-medium" htmlFor="recurring-budget-hours">
+                  Budget in Stunden (optional)
+                </label>
+                <Input
+                  id="recurring-budget-hours"
+                  inputMode="decimal"
+                  value={recurringForm.hourBudgetHours}
+                  onChange={(event) => setRecurringForm({ ...recurringForm, hourBudgetHours: event.currentTarget.value })}
+                  placeholder="z. B. 20"
+                />
+              </div>
+              <div className="space-y-2">
+                <label className="text-sm font-medium" htmlFor="recurring-manual-hours">
+                  Manuelle Stunden (optional)
+                </label>
+                <Input
+                  id="recurring-manual-hours"
+                  inputMode="decimal"
+                  value={recurringForm.manualConsumptionHours}
+                  onChange={(event) => setRecurringForm({ ...recurringForm, manualConsumptionHours: event.currentTarget.value })}
+                  placeholder="z. B. 2,5"
+                />
+              </div>
+            </div>
+
             <div className="space-y-2">
               <label className="text-sm font-medium" htmlFor="recurring-activity">
                 Tätigkeit
@@ -473,6 +541,9 @@ export function RecurringBillingsPage() {
                   {billing.valid_until ? ` bis ${formatDateLabel(billing.valid_until)}` : ""}
                 </p>
                 <div className="mt-1 flex flex-wrap gap-1">
+                  {billing.teamspace_project ? <Badge variant="secondary">TS {billing.teamspace_project}</Badge> : null}
+                  {billing.hour_budget_minutes !== null ? <Badge variant="outline">Budget {formatMinutes(billing.hour_budget_minutes)}</Badge> : null}
+                  {billing.manual_consumption_minutes > 0 ? <Badge variant="outline">Manuell {formatMinutes(billing.manual_consumption_minutes)}</Badge> : null}
                   {billing.slots.map((slot) => (
                     <Badge key={slot.id} variant="outline">
                       {slot.weekday === null ? "Starttag" : weekdays.find((weekday) => weekday.value === slot.weekday)?.label} · {slot.start_time?.slice(0, 5)} · {formatMinutes(slot.duration_minutes)}

frontend/src/views/StatisticsPage.tsx

@@ -27,7 +27,7 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@
 import { HelpLink } from "@/components/HelpLink";
 import { getProjectFollowups, getStatisticsOverview } from "../api";
 import { currentMonth, formatDate, formatDateTime, formatMinutes } from "../format";
-import type { AuthUser, StatisticsDailyBucket, StatisticsGroup, StatisticsOverview, StatisticsProjectFollowup, StatisticsProjectFollowupOverview, StatisticsTicket, WorkType } from "../types";
+import type { AuthUser, StatisticsDailyBucket, StatisticsGroup, StatisticsOverview, StatisticsProjectFollowup, StatisticsProjectFollowupOverview, StatisticsTicket, TeamspaceMonthActual, WorkType } from "../types";
 
 type StatisticsPageProps = {
   currentUser: AuthUser;
@@ -76,6 +76,63 @@ function formatTeamspaceDelta(minutes: number) {
   return formatSignedMinutes(minutes);
 }
 
+function teamspaceActualLabel(actual: TeamspaceMonthActual) {
+  return actual.teamspace_description?.trim() || actual.teamspace_project || actual.teamspace_api_project_id || "Teamspace";
+}
+
+function TeamspaceMonthActualsLine({
+  actuals,
+  tsMinutes,
+  deltaMinutes
+}: {
+  actuals: TeamspaceMonthActual[] | undefined;
+  tsMinutes: number | undefined;
+  deltaMinutes: number | undefined;
+}) {
+  const visibleActuals = actuals ?? [];
+
+  if (visibleActuals.length === 0) {
+    return null;
+  }
+
+  const effectiveTsMinutes = tsMinutes ?? visibleActuals.reduce((sum, actual) => sum + actual.teamspace_billable_minutes, 0);
+  const effectiveDeltaMinutes = deltaMinutes ?? visibleActuals.reduce((sum, actual) => sum + actual.delta_minutes, 0);
+  const positions = visibleActuals.flatMap((actual) =>
+    (actual.positions ?? []).map((position) => ({
+      ...position,
+      entryLabel: teamspaceActualLabel(actual)
+    }))
+  );
+
+  return (
+    <div className="mt-1 space-y-1 text-[11px] text-muted-foreground">
+      <div className="flex flex-wrap items-center gap-1.5">
+        <Badge variant={effectiveDeltaMinutes === 0 ? "success" : "warning"} className="h-5 px-1.5 text-[10px]">
+          TS API {formatMinutes(effectiveTsMinutes)} · Diff {formatTeamspaceDelta(effectiveDeltaMinutes)}
+        </Badge>
+        {visibleActuals
+          .filter((actual) => actual.delta_minutes !== 0)
+          .slice(0, 3)
+          .map((actual) => (
+            <span key={actual.entry_id} className="rounded-sm bg-muted px-1.5 py-0.5">
+              {teamspaceActualLabel(actual)}: {formatTeamspaceDelta(actual.delta_minutes)}
+            </span>
+          ))}
+      </div>
+      {positions.length > 0 ? (
+        <div className="flex flex-wrap gap-x-2 gap-y-0.5">
+          {positions.slice(0, 4).map((position) => (
+            <span key={`${position.entryLabel}-${position.apiProjectId}`} title={`${position.entryLabel} · API ${position.apiProjectId}`}>
+              {position.isSubentry ? `Pos. ${position.projectId ?? position.apiProjectId}` : "Hauptprojekt"}: {position.label} · {formatMinutes(position.billableMinutes)}
+            </span>
+          ))}
+          {positions.length > 4 ? <span>+{positions.length - 4} weitere</span> : null}
+        </div>
+      ) : null}
+    </div>
+  );
+}
+
 function deltaTextClass(minutes: number) {
   return minutes < 0 ? "text-red-700 dark:text-red-300" : "text-emerald-700 dark:text-emerald-300";
 }
@@ -90,21 +147,21 @@ function DeltaBadge({ minutes }: { minutes: number }) {
 
 function deltaDescription(minutes: number) {
   if (minutes > 0) {
-    return "Teamspace liegt über der abgerechneten Zeit";
+    return "TT-Teamspace liegt über der Session-Zeit";
   }
 
   if (minutes < 0) {
-    return "Teamspace liegt unter der abgerechneten Zeit";
+    return "TT-Teamspace liegt unter der Session-Zeit";
   }
 
-  return "Teamspace und abgerechnete Zeit sind ausgeglichen";
+  return "TT-Teamspace und Session-Zeit sind ausgeglichen";
 }
 
 function TimeComparison({ trackedMinutes, crmMinutes, sessions }: { trackedMinutes: number; crmMinutes: number; sessions?: number }) {
   return (
     <div className="space-y-0.5 text-sm">
-      <div className={`font-semibold ${trackedTextClass}`}>Abgerechnet {formatMinutes(trackedMinutes)}</div>
+      <div className={`font-semibold ${trackedTextClass}`}>Session-Zeit {formatMinutes(trackedMinutes)}</div>
-      <div className={`font-semibold ${teamspaceTextClass}`}>Teamspace {formatMinutes(crmMinutes)}</div>
+      <div className={`font-semibold ${teamspaceTextClass}`}>TT-Teamspace {formatMinutes(crmMinutes)}</div>
       {typeof sessions === "number" ? <div className="text-xs text-muted-foreground">{sessions} Session(s)</div> : null}
     </div>
   );
@@ -119,7 +176,7 @@ function ColorLegend({ showDifference = true }: { showDifference?: boolean }) {
       </span>
       <span className="inline-flex items-center gap-1.5">
         <span className={`h-0.5 w-4 ${teamspaceDotClass}`} />
-        <span className={teamspaceTextClass}>Teamspace</span>
+        <span className={teamspaceTextClass}>TT-Teamspace</span>
       </span>
       <span className="inline-flex items-center gap-1.5">
         <span className="size-2 rounded-sm bg-slate-500 dark:bg-slate-400" />
@@ -376,12 +433,17 @@ function TicketHotspot({
         <p className="truncate text-sm text-muted-foreground">{ticket.organization_name ?? "Keine Organisation"}</p>
         <div className="mt-1 flex flex-wrap gap-x-3 gap-y-1 text-xs">
           <span className={trackedTextClass}>Abgerechnet {formatMinutes(ticket.total_minutes)}</span>
-          <span className={teamspaceTextClass}>Teamspace {formatMinutes(ticket.crm_billed_minutes)}</span>
+          <span className={teamspaceTextClass}>TT-Teamspace {formatMinutes(ticket.crm_billed_minutes)}</span>
           <span className="text-muted-foreground">{ticket.billed_sessions} abgerechnet</span>
           <span className="text-muted-foreground">{ticket.billable_sessions} abrechenbar</span>
           <span>{ticket.active_days} Tag(e)</span>
           {showDifference ? <span className={deltaTextClass(ticket.crm_delta_minutes)}>{formatTeamspaceDelta(ticket.crm_delta_minutes)}</span> : null}
         </div>
+        <TeamspaceMonthActualsLine
+          actuals={ticket.teamspace_month_actuals}
+          tsMinutes={ticket.teamspace_month_billable_minutes}
+          deltaMinutes={ticket.teamspace_month_delta_minutes}
+        />
       </div>
       <Button variant="secondary" size="sm" onClick={() => onNavigate(`/tickets/${ticket.ticket_id}?month=${month}`)}>
         Öffnen
@@ -403,14 +465,17 @@ function daysSince(value: string) {
 
 function ProjectFollowupRow({ project, onNavigate }: { project: StatisticsProjectFollowup; onNavigate: (to: string) => void }) {
   const inactiveDays = daysSince(project.latest_tt_update);
-  const hasBudget = project.hour_budget_minutes !== null;
+  const budgetExcluded = Boolean(project.teamspace_budget_excluded);
+  const hasBudget = !budgetExcluded && project.hour_budget_minutes !== null;
 
   return (
     <div className="grid gap-3 rounded-md border bg-background p-3 lg:grid-cols-[minmax(0,1fr)_auto] lg:items-center">
       <div className="min-w-0 space-y-2">
         <div className="flex flex-wrap items-center gap-2">
           <span className="font-semibold">{project.ticket_number}</span>
-          {hasBudget ? (
+          {budgetExcluded ? (
+            <Badge variant="outline">Budgetprüfung ausgenommen</Badge>
+          ) : hasBudget ? (
             <Badge variant={project.remaining_minutes !== null && project.remaining_minutes > 0 ? "warning" : "secondary"}>
               {project.remaining_minutes !== null && project.remaining_minutes > 0 ? `${formatMinutes(project.remaining_minutes)} offen` : "Budget verbraucht"}
             </Badge>
@@ -429,7 +494,7 @@ function ProjectFollowupRow({ project, onNavigate }: { project: StatisticsProjec
         <div className="flex flex-wrap gap-x-3 gap-y-1 text-xs text-muted-foreground">
           <span>Letztes TT-Update {formatDateTime(project.latest_tt_update)}</span>
           {inactiveDays !== null ? <span>{inactiveDays} Tag(e) inaktiv</span> : null}
-          <span>Budget {hasBudget ? formatMinutes(project.hour_budget_minutes!) : "nicht gesetzt"}</span>
+          <span>Budget {budgetExcluded ? "Prüfung ausgenommen" : hasBudget ? formatMinutes(project.hour_budget_minutes!) : "nicht gesetzt"}</span>
           <span>Verbraucht {formatMinutes(project.consumption_minutes)}</span>
           <span>{project.open_todos} offene ToDo(s)</span>
         </div>
@@ -588,7 +653,7 @@ export function StatisticsPage({ currentUser, onNavigate }: StatisticsPageProps)
           <h2 className="text-2xl font-semibold tracking-normal">Statistiken</h2>
 	          <p className="text-sm text-muted-foreground">
 	            {teamspaceTimeTrackingEnabled
-	              ? "Monatswerte, Teamspace-Abgleich, Organisationen und offene Nacharbeit."
+	              ? "Monatswerte, TT-Teamspace-Abgleich, Organisationen und offene Nacharbeit."
 	              : "Monatswerte, Session-Status, Organisationen und Teamspace-Istwerte."}
 	          </p>
         </div>
@@ -637,7 +702,7 @@ export function StatisticsPage({ currentUser, onNavigate }: StatisticsPageProps)
           helpLabel="Hilfe zu Bewertungen"
         />
         <MetricCard
-          label="Teamspace"
+          label="TT-Teamspace"
           value={formatMinutes(totals?.crmBilledMinutes ?? 0)}
 	          detail={teamspaceTimeTrackingEnabled
 	            ? <span className={deltaTextClass(totals?.crmDeltaMinutes ?? 0)}>Differenz {formatTeamspaceDelta(totals?.crmDeltaMinutes ?? 0)}</span>
@@ -669,12 +734,12 @@ export function StatisticsPage({ currentUser, onNavigate }: StatisticsPageProps)
             <CardTitle>Monatsverlauf und Abrechnungsqualität</CardTitle>
 	            <CardDescription>
 	              {teamspaceTimeTrackingEnabled
-	                ? "Abgerechnete Zeit pro Tag, Teamspace-Linie und Bewertungsstand in einem Überblick."
+		                ? "Abgerechnete Zeit pro Tag, TT-Teamspace-Linie und Bewertungsstand in einem Überblick."
 	                : "Abgerechnete Zeit pro Tag und Bewertungsstand in einem Überblick."}
 	            </CardDescription>
           </div>
           <div className="flex items-center gap-2">
-	            {teamspaceTimeTrackingEnabled ? <Badge variant="outline">{crmCoverage}% Teamspace-Abdeckung</Badge> : <Badge variant="outline">Teamspace als Ist-Quelle</Badge>}
+	            {teamspaceTimeTrackingEnabled ? <Badge variant="outline">{crmCoverage}% TT-Teamspace-Abdeckung</Badge> : <Badge variant="outline">Teamspace als Ist-Quelle</Badge>}
             <HelpLink anchor="statistik-verlauf" label="Hilfe zu Monatsverlauf und Abrechnungsqualität" />
           </div>
         </CardHeader>
@@ -703,13 +768,13 @@ export function StatisticsPage({ currentUser, onNavigate }: StatisticsPageProps)
 	              <div className="space-y-2 rounded-md border bg-muted/20 p-3">
 	                <div className="flex items-start justify-between gap-3">
 	                  <div>
-	                    <p className="text-sm font-medium">Teamspace-Abgleich</p>
+	                    <p className="text-sm font-medium">TT-Teamspace-Abgleich</p>
 	                    <p className="text-xs text-muted-foreground">{deltaDescription(totals?.crmDeltaMinutes ?? 0)}</p>
 	                  </div>
 	                  <DeltaBadge minutes={totals?.crmDeltaMinutes ?? 0} />
 	                </div>
 	                <TimeComparison trackedMinutes={totals?.minutes ?? 0} crmMinutes={totals?.crmBilledMinutes ?? 0} sessions={totals?.billedSessions ?? 0} />
-	                <div className="text-xs text-muted-foreground">Teamspace-Abdeckung: {crmCoverage}% der abgerechneten Zeit</div>
+	                <div className="text-xs text-muted-foreground">TT-Teamspace-Abdeckung: {crmCoverage}% der Session-Zeit</div>
 	              </div>
 	            ) : (
 	              <div className="space-y-2 rounded-md border bg-muted/20 p-3">
@@ -747,7 +812,7 @@ export function StatisticsPage({ currentUser, onNavigate }: StatisticsPageProps)
                 <p className="truncate font-semibold">{topOrganization.organization_name}</p>
                 <p className="flex flex-wrap gap-x-3 gap-y-1 text-xs">
                   <span className={trackedTextClass}>Abgerechnet {formatMinutes(topOrganization.total_minutes)}</span>
-                  <span className={teamspaceTextClass}>Teamspace {formatMinutes(topOrganization.crm_billed_minutes)}</span>
+                  <span className={teamspaceTextClass}>TT-Teamspace {formatMinutes(topOrganization.crm_billed_minutes)}</span>
                 </p>
               </div>
             ) : null}
@@ -814,7 +879,7 @@ export function StatisticsPage({ currentUser, onNavigate }: StatisticsPageProps)
                   <Progress value={percentage(organization.total_minutes, maxOrganizationMinutes)} />
                   <div className="flex flex-wrap gap-x-3 gap-y-1 text-xs">
                     <span className={trackedTextClass}>Abgerechnet {formatMinutes(organization.total_minutes)}</span>
-                    <span className={teamspaceTextClass}>Teamspace {formatMinutes(organization.crm_billed_minutes)}</span>
+                    <span className={teamspaceTextClass}>TT-Teamspace {formatMinutes(organization.crm_billed_minutes)}</span>
                     <span className="text-muted-foreground">{percentage(organization.total_minutes, totals?.minutes ?? 0)}% vom Monat</span>
 	                    {teamspaceTimeTrackingEnabled ? <span className={deltaTextClass(organization.crm_delta_minutes)}>{formatTeamspaceDelta(organization.crm_delta_minutes)}</span> : null}
                   </div>
@@ -883,7 +948,7 @@ export function StatisticsPage({ currentUser, onNavigate }: StatisticsPageProps)
                 <Progress value={percentage(group.total_minutes, totals?.minutes ?? 0)} />
                 <div className="flex flex-wrap gap-x-3 gap-y-1 text-xs">
                   <span className={trackedTextClass}>Abgerechnet {formatMinutes(group.total_minutes)}</span>
-                  <span className={teamspaceTextClass}>Teamspace {formatMinutes(group.crm_billed_minutes)}</span>
+                  <span className={teamspaceTextClass}>TT-Teamspace {formatMinutes(group.crm_billed_minutes)}</span>
                 </div>
                 <div className="grid gap-2 text-xs text-muted-foreground sm:grid-cols-3">
                   <span>Abr. {group.billed_sessions} / {formatMinutes(group.billed_minutes)}</span>

frontend/src/views/TicketDetailPage.tsx

@@ -1,4 +1,4 @@
-import { AlertCircle, ArrowLeft, CheckCircle2, ChevronDown, ChevronUp, ClipboardList, Copy, EyeOff, FolderKanban, MailCheck, MailPlus, Pencil, Play, Plus, RefreshCw, RotateCcw, Save, Send, Star, Trash2 } from "lucide-react";
+import { AlertCircle, ArrowLeft, CheckCircle2, ChevronDown, ChevronUp, ClipboardList, Copy, FolderKanban, Info, MailCheck, MailPlus, Pencil, Play, Plus, RefreshCw, RotateCcw, Save, Send, Star, Trash2 } from "lucide-react";
 import { type ClipboardEvent, FormEvent, useEffect, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
@@ -12,10 +12,12 @@ import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { CopyTicketButton } from "@/components/CopyTicketButton";
 import { HelpLink } from "@/components/HelpLink";
+import { ListClockIcon } from "@/components/icons/ListClockIcon";
 import { OrganizationSelect } from "@/components/OrganizationSelect";
 import { readRichActivityEditorValue, RichActivityEditor } from "@/components/RichActivityEditor";
 import { TodoPanel } from "@/components/TodoPanel";
 import {
+  acknowledgeMissingTicketDayBilling,
   acknowledgeProjectReview,
   createSession,
   deleteProject,
@@ -34,6 +36,7 @@ import {
   updateSessionBilling,
   updateSessionDetails,
   updateTicket,
+  updateTicketAtossSupport,
   updateTicketDayBilling,
   updateProject,
   updateProjectStatus
@@ -41,7 +44,7 @@ import {
 import type { CreateSessionResult, TicketZammadMailSessionItem, TicketZammadMailSessionResult } from "../api";
 import { currentDay, currentMonth, formatDate, formatDateTime, formatMinutes, formatTimeRange } from "../format";
 import { ticketHasRecurringBilling } from "../recurring-billings";
-import type { AuthUser, BillingStatus, PeriodType, ProjectSummary, ProjectTeamspaceEntry, ProjectTeamspaceSubentry, SessionEntry, TicketDetailPeriodType, TicketPeriod, WorkType } from "../types";
+import type { AuthUser, BillingStatus, PeriodType, ProjectSummary, ProjectTeamspaceEntry, ProjectTeamspaceSubentry, SessionEntry, TicketDetailPeriodType, TicketPeriod, TicketTeamspaceDay, WorkType } from "../types";
 import { ZammadPriorityBadge, ZammadStateBadge } from "../zammad-meta";
 import { zammadArticleTypeFromValue, zammadArticleTypeLabel, zammadArticleTypeOptions, zammadArticleTypeValue, type ZammadArticleTypeId } from "../zammad-article-types";
 import { getLocalStorageValue, setLocalStorageValue } from "@/lib/local-storage.client";
@@ -123,6 +126,10 @@ function emptyTicketSessionForm(): TicketSessionFormState {
   };
 }
 
+function hasActivityContent(activity: string, zammadArticleBody: string | null | undefined) {
+  return activity.trim().length > 0 || Boolean(zammadArticleBody);
+}
+
 function notifyZammadArticleResult(result: CreateSessionResult) {
   if (result.zammadArticle?.status === "sent") {
     toast.success("Zammad-Notiz übertragen");
@@ -140,6 +147,52 @@ function notifyTodosChanged() {
   window.dispatchEvent(new Event("tickettracker:todos-changed"));
 }
 
+function formatSignedMinutes(minutes: number) {
+  if (minutes === 0) {
+    return formatMinutes(0);
+  }
+
+  return `${minutes > 0 ? "+" : "-"}${formatMinutes(Math.abs(minutes))}`;
+}
+
+function formatSegmentClock(value: string) {
+  const date = new Date(value);
+
+  if (Number.isNaN(date.getTime())) {
+    return "--:--";
+  }
+
+  return date.toLocaleTimeString("de-DE", { hour: "2-digit", minute: "2-digit" });
+}
+
+function formatWorkSegmentRange(segment: SessionEntry["work_segments"][number]) {
+  return `${formatSegmentClock(segment.startedAt)} - ${segment.endedAt ? formatSegmentClock(segment.endedAt) : "läuft"}`;
+}
+
+function formatTeamspaceMissingTarget(minutes: number, teamspaceTimeTrackingEnabled: boolean) {
+  if (minutes === 0) {
+    return "ausgeglichen";
+  }
+
+  if (minutes > 0) {
+    return `${formatMinutes(minutes)} fehlt ${teamspaceTimeTrackingEnabled ? "in TT" : "in den abgerechneten Zeiten"}`;
+  }
+
+  return `${formatMinutes(Math.abs(minutes))} fehlt in TS`;
+}
+
+function formatTeamspaceDifferenceTarget(minutes: number, teamspaceTimeTrackingEnabled: boolean) {
+  if (minutes === 0) {
+    return "0 min";
+  }
+
+  const target = minutes > 0
+    ? teamspaceTimeTrackingEnabled ? "TT" : "abgerechnet"
+    : "TS";
+
+  return `${minutes > 0 ? "+" : "-"}${formatMinutes(Math.abs(minutes))} in ${target}`;
+}
+
 function zammadSyncStorageKey(userId: string) {
   return `tickettracker.zammad-sync.${userId}`;
 }
@@ -271,7 +324,15 @@ function projectTeamspaceEntries(project: ProjectSummary): ProjectTeamspaceEntry
 }
 
 function budgetedProjectTeamspaceEntries(project: ProjectSummary) {
-  return projectTeamspaceEntries(project).filter((entry) => Number(entry.hour_budget_minutes ?? 0) > 0);
+  if (projectBudgetExcluded(project)) {
+    return [];
+  }
+
+  return projectTeamspaceEntries(project).filter((entry) => !entry.teamspace_budget_excluded && Number(entry.hour_budget_minutes ?? 0) > 0);
+}
+
+function projectBudgetExcluded(project: ProjectSummary) {
+  return Boolean(project.teamspace_budget_excluded || projectTeamspaceEntries(project).some((entry) => entry.teamspace_budget_excluded));
 }
 
 function teamspaceEntryDisplayLabel(entry: { teamspace_project: string | null; teamspace_description?: string | null; is_default: boolean }) {
@@ -914,6 +975,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
   const [loadingId, setLoadingId] = useState<string | null>(null);
   const [deletingId, setDeletingId] = useState<string | null>(null);
   const [savingTicket, setSavingTicket] = useState(false);
+  const [savingAtossSupport, setSavingAtossSupport] = useState(false);
   const [savingFavorite, setSavingFavorite] = useState(false);
   const [isFavorite, setIsFavorite] = useState(false);
   const [editTicketNumber, setEditTicketNumber] = useState("");
@@ -936,6 +998,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
   const [sendingZammadSessionId, setSendingZammadSessionId] = useState<string | null>(null);
   const [dayBillingInputs, setDayBillingInputs] = useState<Record<string, string>>({});
   const [savingDayBillingKey, setSavingDayBillingKey] = useState<string | null>(null);
+  const [acknowledgingTeamspaceDay, setAcknowledgingTeamspaceDay] = useState<string | null>(null);
   const [selectedTeamspaceEntryId, setSelectedTeamspaceEntryId] = useState<string | null>(null);
   const [ticketSession, setTicketSession] = useState<TicketSessionFormState>(() => emptyTicketSessionForm());
   const [savingTicketSession, setSavingTicketSession] = useState(false);
@@ -998,6 +1061,24 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
     }
   }
 
+  async function setMissingTeamspaceDayAcknowledgement(day: TicketTeamspaceDay, acknowledged: boolean) {
+    setAcknowledgingTeamspaceDay(day.day);
+
+    try {
+      await acknowledgeMissingTicketDayBilling(ticketId, day.day, acknowledged);
+      toast.success(acknowledged ? "Teamspace-Prüfung abgehakt" : "Kenntnisnahme zurückgenommen", {
+        description: formatDate(`${day.day}T00:00:00`)
+      });
+      await load();
+    } catch (error) {
+      toast.error(acknowledged ? "Konnte nicht abgehakt werden" : "Konnte nicht zurückgenommen werden", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setAcknowledgingTeamspaceDay(null);
+    }
+  }
+
   useEffect(() => {
     void load();
   }, [periodType, period, ticketId, globalMonthFilter, globalStatusFilter, globalSourceFilter]);
@@ -1083,6 +1164,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
 
   const ticket = data?.ticket;
   const project = data?.project ?? null;
+  const ticketSessionEffectiveWorkType = ticket?.organization_id && ticket.work_type ? ticket.work_type : ticketSession.workType;
   const isRecurringBillingTicket = ticketHasRecurringBilling(ticket);
   const projectDescription = project ? combinedProjectDescription(project) : "";
   const projectEntries = useMemo(() => (project ? projectTeamspaceEntries(project) : []), [project]);
@@ -1129,13 +1211,15 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
 
   const hasMultipleProjectTeamspaceEntries = projectEntries.length > 1;
   const hasProjectTeamspaceApiIds = projectEntries.some((entry) => Boolean(entry.teamspace_api_project_id));
-	  const showTeamspaceSubentryCard = Boolean(project && hasProjectTeamspaceApiIds);
+	  const showTeamspaceSubentryCard = false;
 	  const usesTeamspaceSubentries = false;
+  const budgetExcluded = project ? projectBudgetExcluded(project) : false;
+  const budgetConsumptionExcluded = budgetExcluded;
 	  const showBudgetedProjectEntries = budgetedProjectEntries.length > 1;
 	  const requiresProjectTeamspaceEntry = Boolean(project && hasMultipleProjectTeamspaceEntries);
   const teamspaceTimeTrackingEnabled = currentUser.teamspace_time_tracking_enabled ?? true;
   const projectConsumptionMinutes = project?.consumption_minutes ?? 0;
-  const projectBudgetMinutes = project?.hour_budget_minutes ?? null;
+  const projectBudgetMinutes = budgetConsumptionExcluded ? null : project?.hour_budget_minutes ?? null;
   const projectConsumptionUsagePercent = project ? projectConsumptionPercent(projectConsumptionMinutes, projectBudgetMinutes) : null;
   const projectRemainingMinutes = projectBudgetMinutes && projectBudgetMinutes > 0 ? projectBudgetMinutes - projectConsumptionMinutes : null;
   const canEditProject = project?.can_edit === true;
@@ -1150,10 +1234,20 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
     || project?.owner_username
     || (project?.zammad_owner_id ? `Zammad-Owner ${project.zammad_owner_id}` : null)
     || zammadOwnerLabel;
-  const currentZammadUserLabel = currentUser.zammad_user_id ? `Zammad-User ${currentUser.zammad_user_id}` : "dein Zammad-User";
+  const canChooseAtossSupportFallback = Boolean(
+    ticket?.work_type === "support"
+    && !isRecurringBillingTicket
+    && !project
+    && !ticket.teamspace_assignment_rule_id
+    && !ticket.teamspace_assignment_project
+  );
   const isProject = Boolean(project);
   const isGlobalTicket = periodType === "all";
   const isPeriodClosed = Boolean(data?.closed);
+  const selectedTeamspaceMonth = isGlobalTicket ? globalMonthFilter : periodType === "month" ? period : period.slice(0, 7);
+  const teamspaceMonthActuals = data?.teamspaceMonthActuals ?? [];
+  const teamspaceMonthBillableMinutes = data?.teamspaceMonthBillableMinutes ?? teamspaceMonthActuals.reduce((sum, actual) => sum + actual.teamspace_billable_minutes, 0);
+  const teamspaceMonthDeltaMinutes = data?.teamspaceMonthDeltaMinutes ?? teamspaceMonthActuals.reduce((sum, actual) => sum + actual.delta_minutes, 0);
   const mailDaysBack = useMemo(() => mailDaysBackFromZammadSyncSettings(currentUser.id), [currentUser.id]);
   const selectedMailArticleIds = useMemo(
     () => (mailPreview?.items ?? []).filter((item) => mailSelection[item.articleId] !== false).map((item) => item.articleId),
@@ -1167,7 +1261,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
       ? "im gesamten Ticketverlauf"
       : `im Monat ${globalMonthFilter}`
     : `im ${periodLabel.toLowerCase()} ${period}`;
-  const teamspaceLabel = isGlobalTicket || periodType === "month" ? "Teamspace gesamt" : "Teamspace Tag";
+  const teamspaceLabel = isGlobalTicket || periodType === "month" ? "Für Teamspace gesamt" : "Für Teamspace Tag";
   const availableMonths = data?.availableMonths ?? [];
   const selectedMonthHasSessions = availableMonths.some((month) => month.month === globalMonthFilter);
   const defaultProjectEntryId = projectEntries.find((entry) => entry.is_default)?.id ?? null;
@@ -1186,6 +1280,77 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
 		  }, [data?.dayBillings, defaultProjectEntryId, requiresProjectTeamspaceEntry]);
 	  const savedDayBillingInput = (key: string) => formatHoursInput(dayBillingMap.get(key));
   const isDayBillingDirty = (key: string) => (dayBillingInputs[key] ?? "") !== savedDayBillingInput(key);
+  const dayBillingTotalByDayMap = useMemo(() => {
+    const billingMap = new Map<string, number>();
+
+    for (const billing of data?.dayBillings ?? []) {
+      billingMap.set(billing.day, (billingMap.get(billing.day) ?? 0) + Number(billing.billed_minutes ?? 0));
+    }
+
+    return billingMap;
+  }, [data?.dayBillings]);
+  const sessionBilledTotalByDayMap = useMemo(() => {
+    const billingMap = new Map<string, number>();
+
+    for (const session of data?.sessions ?? []) {
+      if (session.billing_status !== "billed") {
+        continue;
+      }
+
+      const day = sessionDayKey(session.started_at);
+      billingMap.set(day, (billingMap.get(day) ?? 0) + Number(session.rounded_minutes ?? 0));
+    }
+
+    return billingMap;
+  }, [data?.sessions]);
+  const teamspaceApiDayBillingTotalByDayMap = useMemo(() => {
+    const billingMap = new Map<string, number>();
+
+    for (const actual of teamspaceMonthActuals) {
+      for (const position of actual.positions ?? []) {
+        for (const day of position.days ?? []) {
+          billingMap.set(day.day, (billingMap.get(day.day) ?? 0) + Number(day.billableMinutes ?? 0));
+        }
+      }
+    }
+
+    return billingMap;
+  }, [teamspaceMonthActuals]);
+  const ticketTeamspaceDayByDayMap = useMemo(
+    () => new Map((data?.ticketTeamspaceDays ?? []).map((day) => [day.day, day])),
+    [data?.ticketTeamspaceDays]
+  );
+  const teamspaceDayDeviation = (day: string) => {
+    const ticketComparison = ticketTeamspaceDayByDayMap.get(day);
+
+    if (ticketComparison) {
+      return {
+        ttMinutes: Number(ticketComparison.tracked_minutes ?? 0),
+        tsMinutes: Number(ticketComparison.crm_billed_minutes ?? 0),
+        deltaMinutes: Number(ticketComparison.delta_minutes ?? 0),
+        comparison: ticketComparison
+      };
+    }
+
+    if (!project || ticket?.work_type === "support" || budgetExcluded) {
+      return {
+        ttMinutes: 0,
+        tsMinutes: 0,
+        deltaMinutes: 0,
+        comparison: null
+      };
+    }
+
+    const ttMinutes = teamspaceTimeTrackingEnabled ? dayBillingTotalByDayMap.get(day) ?? 0 : sessionBilledTotalByDayMap.get(day) ?? 0;
+    const tsMinutes = teamspaceApiDayBillingTotalByDayMap.get(day) ?? 0;
+
+    return {
+      ttMinutes,
+      tsMinutes,
+      deltaMinutes: tsMinutes - ttMinutes,
+      comparison: null
+    };
+  };
 	  const unassignedTeamspaceSessions = useMemo(
 	    () => teamspaceTimeTrackingEnabled
         ? (data?.sessions ?? []).filter((session) =>
@@ -1293,13 +1458,36 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
       });
     }
 
+    for (const comparison of data?.ticketTeamspaceDays ?? []) {
+      const hasAttention = Number(comparison.delta_minutes ?? 0) !== 0
+        || comparison.tt_value_without_billed_session
+        || comparison.missing_tt_value;
+
+      if (!hasAttention || Array.from(groups.values()).some((group) => group.day === comparison.day)) {
+        continue;
+      }
+
+      const key = teamspaceBillingKey(comparison.day, null);
+      groups.set(key, {
+        key,
+        day: comparison.day,
+        projectTeamspaceEntryId: null,
+        label: formatDate(`${comparison.day}T00:00:00`),
+        totalMinutes: 0,
+        billableMinutes: 0,
+        nonBillableMinutes: 0,
+        openMinutes: 0,
+        sessions: []
+      });
+    }
+
     return Array.from(groups.values())
       .map((group) => ({
         ...group,
         sessions: [...group.sessions].sort((left, right) => new Date(right.started_at).getTime() - new Date(left.started_at).getTime())
       }))
       .sort((left, right) => right.key.localeCompare(left.key));
-	  }, [activeTeamspaceEntryId, data?.sessions, projectEntries, usesTeamspaceEntryTabs, usesTeamspaceSubentries]);
+	  }, [activeTeamspaceEntryId, data?.sessions, data?.ticketTeamspaceDays, projectEntries, usesTeamspaceEntryTabs, usesTeamspaceSubentries]);
 	  const sessionIds = useMemo(() => sessionGroups.flatMap((group) => group.sessions.map((session) => session.id)), [sessionGroups]);
 	  const allSessionsExpanded = sessionIds.length > 0 && sessionIds.every((sessionId) => expandedSessionIds.includes(sessionId));
 	  const periodTotalMinutes = sessionGroups.reduce((sum, group) => sum + group.totalMinutes, 0);
@@ -1396,7 +1584,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
   }
 
   async function sendSessionToZammad(session: SessionEntry) {
-    if (!session.activity.trim() && !session.zammad_article_body) {
+    if (!hasActivityContent(session.activity, session.zammad_article_body)) {
       toast.warning("Keine Zammad-Notiz möglich", {
         description: "Die Session hat keine Tätigkeit."
       });
@@ -1593,6 +1781,29 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
     }
   }
 
+  async function setTicketAtossSupport(enabled: boolean) {
+    if (!ticket || ticket.work_type !== "support" || ticket.can_manage_atoss_support !== true) {
+      return;
+    }
+
+    setSavingAtossSupport(true);
+    try {
+      await updateTicketAtossSupport(ticket.id, enabled);
+      toast.success(enabled ? "Atoss-Support-Fallback aktiviert" : "Atoss-Support-Fallback deaktiviert", {
+        description: enabled
+          ? "Der Fallback greift nur, wenn weder ein Projekt noch eine Zuordnungsregel vorhanden ist."
+          : "Ohne Projekt oder Regel bleibt das Ticket künftig unzugeordnet."
+      });
+      await load();
+    } catch (error) {
+      toast.error("Atoss-Support-Fallback konnte nicht gespeichert werden", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setSavingAtossSupport(false);
+    }
+  }
+
   function openProjectEditor() {
     if (!project) {
       return;
@@ -1700,9 +1911,12 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
     setSyncingTeamspaceSubentries(true);
 
     try {
-      const { result } = await syncProjectTeamspaceSubentries(project.id);
+      const syncMonths = selectedTeamspaceMonth === "all"
+        ? availableMonths.map((month) => month.month)
+        : [selectedTeamspaceMonth];
+      const { result } = await syncProjectTeamspaceSubentries(project.id, syncMonths);
       toast.success("Teamspace-Unterpositionen synchronisiert", {
-        description: `${result.subentriesSynced} Position(en) abgeglichen, ${result.subentriesRemoved} entfernt.`
+        description: `${result.subentriesSynced} Position(en), ${result.teamspaceTimeEntriesMapped} Zeiteintrag/Zeiteinträge in ${result.monthsSynced.length} Monat(en).`
       });
       await load();
     } catch (error) {
@@ -1793,7 +2007,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
       return;
     }
 
-    if (!ticketSession.activity.trim() && !ticketSession.zammadArticleBody) {
+    if (!hasActivityContent(ticketSession.activity, ticketSession.zammadArticleBody)) {
       toast.error("Tätigkeit erfassen");
       return;
     }
@@ -1838,7 +2052,8 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
         durationSeconds,
         projectTeamspaceEntryId: effectiveWorkType === "consulting" && requiresProjectTeamspaceEntry ? ticketSession.projectTeamspaceEntryId : null,
         billingStatus: ticketSession.billingStatus,
-        createZammadArticle: ticketSession.createZammadArticle && (activityValue.activity.trim().length > 0 || Boolean(activityValue.zammadArticleBody)),
+        createZammadArticle: ticketSession.createZammadArticle && hasActivityContent(activityValue.activity, activityValue.zammadArticleBody),
+        zammadArticleDateHeader: true,
         zammadArticleTypeId: ticketSession.zammadArticleTypeId
       });
       toast.success("Session nachgetragen", {
@@ -2128,50 +2343,35 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
         </Alert>
       ) : null}
 
-      {ticket?.is_foreign_zammad_owner ? (
-        <Alert className="py-3 text-sm">
-          <AlertCircle className="size-4" />
-          <AlertTitle>Anderer Zammad-Owner</AlertTitle>
-          <AlertDescription>
-            Dieses Ticket gehört in Zammad {zammadOwnerLabel ? `${zammadOwnerLabel}` : "einem anderen Owner"}; du bist {currentZammadUserLabel}. Du kannst deine Sessions sehen, Projekt- und Ticketdaten sind für dich geschützt.
-          </AlertDescription>
-        </Alert>
-      ) : null}
-
-      {ticketManagedByZammad ? (
-        <Alert className="py-3 text-sm">
-          <AlertCircle className="size-4" />
-          <AlertTitle>Ticketdaten werden von Zammad verwaltet</AlertTitle>
-          <AlertDescription>
-            Nummer, Art, Titel und Organisation wurden durch den Zammad-Sync übernommen und können in TicketTracker nicht manuell geändert werden.
-          </AlertDescription>
-        </Alert>
-      ) : null}
-
       <div className="grid gap-4">
         <Card>
-          <CardHeader className="p-4 pb-2">
+          <CardHeader className="p-3 pb-2">
             <div className="flex items-start justify-between gap-3">
-              <div>
+              <CardTitle className="flex min-w-0 flex-wrap items-center gap-2">
-                <CardTitle>Ticketdaten</CardTitle>
+                Ticketdaten
-                <CardDescription>
+                {ticket?.is_foreign_zammad_owner ? (
-                  {canEditTicketData
+                  <Badge variant="warning" title={zammadOwnerLabel ? `Zammad-Owner: ${zammadOwnerLabel}` : "Anderer Zammad-Owner"}>Fremder Zammad-Owner</Badge>
-                    ? "Änderungen an Organisation und Art werden auf alle vorhandenen Sessions dieses Tickets übernommen."
+                ) : null}
-                    : ticketManagedByZammad
+                {ticketManagedByZammad ? <Badge variant="secondary">Zammad-verwaltet</Badge> : null}
-                      ? "Nummer, Art, Titel und Organisation kommen aus Zammad und sind lokal gesperrt."
+                {isRecurringBillingTicket ? <Badge variant="secondary">Fixabrechnung</Badge> : null}
-                      : "Nur der Owner kann Ticketdaten ändern."}
+                {ticket?.teamspace_assignment_project ? (
-                </CardDescription>
+                  <Badge variant="success" title={ticket.teamspace_assignment_rule_name ?? "Automatische Zuordnung"}>
-              </div>
+                    TS automatisch: {ticket.teamspace_assignment_project}
+                  </Badge>
+                ) : null}
+                {canChooseAtossSupportFallback && ticket?.atoss_support ? <Badge variant="secondary">Atoss-Fallback</Badge> : null}
+                {canChooseAtossSupportFallback && !ticket?.atoss_support ? <Badge variant="warning">Keine TS-Zuordnung</Badge> : null}
+              </CardTitle>
               <HelpLink anchor="ticketdaten" label="Hilfe zu Ticketdaten" />
             </div>
           </CardHeader>
-          <CardContent className="px-4 pb-3">
+          <CardContent className="px-3 pb-3">
-            <form className="grid gap-3 md:grid-cols-2 xl:grid-cols-[140px_145px_minmax(220px,1fr)_minmax(240px,1.2fr)_150px] xl:items-end" onSubmit={saveTicketData}>
+            <form className="grid gap-2 md:grid-cols-2 xl:grid-cols-[140px_145px_minmax(220px,1fr)_minmax(240px,1.2fr)_150px] xl:items-end" onSubmit={saveTicketData}>
-              <div className="space-y-2">
+              <div className="space-y-1">
                 <label className="text-sm font-medium" htmlFor="edit-ticket-number">Ticketnummer</label>
                 <Input id="edit-ticket-number" value={editTicketNumber} disabled={!canEditTicketData} onChange={(event) => setEditTicketNumber(event.currentTarget.value)} required />
               </div>
-              <div className="space-y-2">
+              <div className="space-y-1">
                 <label className="text-sm font-medium" htmlFor="edit-ticket-work-type">Art</label>
                 <select
                   id="edit-ticket-work-type"
@@ -2184,11 +2384,11 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                   <option value="consulting">Consulting</option>
                 </select>
               </div>
-              <div className="space-y-2">
+              <div className="space-y-1">
                 <label className="text-sm font-medium" htmlFor="edit-ticket-title">Titel</label>
                 <Input id="edit-ticket-title" value={editTicketTitle} disabled={!canEditTicketData} onChange={(event) => setEditTicketTitle(event.currentTarget.value)} placeholder="optional" />
               </div>
-              <div className="space-y-2">
+              <div className="space-y-1">
                 <label className="text-sm font-medium" htmlFor="edit-ticket-organization">Organisation</label>
                 {ticket?.customer_name && !ticket.organization_id ? (
                   <p className="text-xs text-muted-foreground">Bisheriger Freitext: {ticket.customer_name}</p>
@@ -2209,6 +2409,17 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                 {savingTicket ? "Speichert..." : "Speichern"}
               </Button>
             </form>
+            {canChooseAtossSupportFallback ? (
+              <div className="mt-2 flex items-center gap-2 rounded-md border bg-muted/20 px-2.5 py-2">
+                <Checkbox
+                  id="ticket-atoss-support"
+                  checked={Boolean(ticket?.atoss_support)}
+                  disabled={ticket?.can_manage_atoss_support !== true || savingAtossSupport}
+                  onCheckedChange={(checked) => void setTicketAtossSupport(checked === true)}
+                />
+                <label className="text-sm font-medium" htmlFor="ticket-atoss-support">Atoss-Support-Fallback</label>
+              </div>
+            ) : null}
           </CardContent>
         </Card>
       </div>
@@ -2225,13 +2436,13 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                   {project.closed_at ? <Badge variant="secondary">Geschlossen</Badge> : <Badge variant="success">Offen</Badge>}
                   <ZammadStateBadge stateId={project.zammad_state_id} />
                   <ZammadPriorityBadge priorityId={project.zammad_priority_id} />
-                  {!canEditProject ? <Badge variant="outline">geteilt</Badge> : null}
+                  {!canEditProject ? <Badge variant="outline">{isRecurringBillingTicket ? "Fixabrechnung" : "geteilt"}</Badge> : null}
                   {project.close_review_required ? <Badge variant="warning">TS/TT prüfen</Badge> : null}
                   {unassignedTeamspaceEntryCount > 0 ? <Badge variant="warning">{unassignedTeamspaceEntryCount} ohne TS</Badge> : null}
                   {unassignedTeamspaceSubentryCount > 0 ? <Badge variant="warning">{unassignedTeamspaceSubentryCount} ohne Pos.</Badge> : null}
                 </CardTitle>
                 <CardDescription>
-                  {!canEditProject && projectOwnerLabel
+                  {!canEditProject && !isRecurringBillingTicket && projectOwnerLabel
                     ? `Eigentümer: ${projectOwnerLabel}`
                     : showBudgetedProjectEntries
                       ? `${budgetedProjectEntries.length} budgetierte Teamspace-Einträge`
@@ -2239,20 +2450,24 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                 </CardDescription>
               </div>
               <div className="flex shrink-0 items-center gap-1">
-                <Button
+                {!isRecurringBillingTicket ? (
-                  type="button"
+                  <>
-                  size="sm"
+                    <Button
-                  variant="secondary"
+                      type="button"
-                  disabled={!canEditProject || savingProjectStatus}
+                      size="sm"
-                  onClick={() => void setProjectClosed(!project.closed_at)}
+                      variant="secondary"
-                >
+                      disabled={!canEditProject || savingProjectStatus}
-                  {project.closed_at ? <RotateCcw className="size-4" /> : <CheckCircle2 className="size-4" />}
+                      onClick={() => void setProjectClosed(!project.closed_at)}
-                  {project.closed_at ? "Öffnen" : "Schließen"}
+                    >
-                </Button>
+                      {project.closed_at ? <RotateCcw className="size-4" /> : <CheckCircle2 className="size-4" />}
-                <Button type="button" size="sm" variant="secondary" disabled={!canEditProject} onClick={openProjectEditor}>
+                      {project.closed_at ? "Öffnen" : "Schließen"}
-                  <Pencil className="size-4" />
+                    </Button>
-                  Bearbeiten
+                    <Button type="button" size="sm" variant="secondary" disabled={!canEditProject} onClick={openProjectEditor}>
-                </Button>
+                      <Pencil className="size-4" />
+                      Bearbeiten
+                    </Button>
+                  </>
+                ) : null}
                 <HelpLink anchor="projekte" label="Hilfe zu Projekten" />
               </div>
             </div>
@@ -2298,12 +2513,22 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
             ) : null}
             <div className="flex flex-wrap gap-2 text-sm">
               <Badge variant="secondary">Zeitraum {project.starts_on || "offen"} - {project.ends_on || "offen"}</Badge>
-              <Badge variant="secondary">Kontingent {projectBudgetMinutes ? formatMinutes(projectBudgetMinutes) : "offen"}</Badge>
+              {budgetConsumptionExcluded ? <Badge variant="outline">Budgetprüfung ausgenommen</Badge> : <Badge variant="secondary">Kontingent {projectBudgetMinutes ? formatMinutes(projectBudgetMinutes) : "offen"}</Badge>}
               <Badge variant="secondary">Verbrauch {formatMinutes(projectConsumptionMinutes)}</Badge>
-              <Badge variant={projectRemainingMinutes !== null && projectRemainingMinutes < 0 ? "destructive" : "secondary"}>{projectRemainingLabel(projectRemainingMinutes)}</Badge>
+              {project.manual_consumption_minutes > 0 ? <Badge variant="outline">Manuell {formatMinutes(project.manual_consumption_minutes)}</Badge> : null}
-              {showBudgetedProjectEntries ? <Badge variant="outline">{budgetedProjectEntries.length} Budgets</Badge> : null}
+              {budgetConsumptionExcluded ? null : <Badge variant={projectRemainingMinutes !== null && projectRemainingMinutes < 0 ? "destructive" : "secondary"}>{projectRemainingLabel(projectRemainingMinutes)}</Badge>}
+              {!budgetConsumptionExcluded && showBudgetedProjectEntries ? <Badge variant="outline">{budgetedProjectEntries.length} Budgets</Badge> : null}
             </div>
             <div className="space-y-2">
+              {budgetConsumptionExcluded ? (
+                <Alert>
+                  <Info className="size-4" />
+                  <AlertTitle>Budgetverbrauch nicht auswertbar</AlertTitle>
+                  <AlertDescription>
+                    Dieses Teamspace-Projekt ist systemweit von Differenz- und Budgetprüfung ausgenommen. Der Verbrauch zählt weiter in Summen.
+                  </AlertDescription>
+                </Alert>
+              ) : (
               <div>
                 <div className="mb-1 flex items-center justify-between gap-2 text-xs text-muted-foreground">
                   <span>Budgetverbrauch</span>
@@ -2327,7 +2552,8 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                   />
                 </div>
               </div>
-              {showBudgetedProjectEntries ? (
+              )}
+              {!budgetConsumptionExcluded && showBudgetedProjectEntries ? (
                 <div className="grid gap-1.5 md:grid-cols-2">
                   {budgetedProjectEntries.map((entry) => {
                     const consumption = projectEntryConsumptionById.get(entry.id) ?? Number(entry.consumption_minutes ?? 0);
@@ -2472,16 +2698,22 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
         </Dialog>
 
         <Card>
-          <CardHeader className="p-4">
+          <CardHeader className="p-3 pb-2">
             <div className="flex items-start justify-between gap-3">
-              <div>
+              <CardTitle className="flex items-center gap-2">
-                <CardTitle className="flex items-center gap-2">
+                <ClipboardList className="size-4 text-muted-foreground" />
-                  <ClipboardList className="size-5 text-muted-foreground" />
+                ToDos
-                  ToDos
+              </CardTitle>
-                </CardTitle>
+              <HelpLink anchor="todos" label="Hilfe zu ToDos" />
-                <CardDescription>Aufgaben zu diesem Ticket oder Projekt verwalten.</CardDescription>
+            </div>
-              </div>
+          </CardHeader>
-              <div className="flex shrink-0 items-center gap-2">
+          <CardContent className="px-3 pb-3">
+            <TodoPanel
+              ticketId={ticket?.id}
+              todos={visibleTodos}
+              onChanged={load}
+              compact
+              toolbar={(
                 <div className="flex rounded-md border bg-muted/20 p-0.5">
                   {(["open", "all", "done"] as const).map((value) => (
                     <Button
@@ -2496,12 +2728,8 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                     </Button>
                   ))}
                 </div>
-                <HelpLink anchor="todos" label="Hilfe zu ToDos" />
+              )}
-              </div>
+            />
-            </div>
-          </CardHeader>
-          <CardContent className="px-4 pb-4">
-            <TodoPanel ticketId={ticket?.id} todos={visibleTodos} onChanged={load} />
           </CardContent>
         </Card>
       </div>
@@ -2515,7 +2743,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                   <FolderKanban className="size-5 text-muted-foreground" />
                   Teamspace-Unterpositionen
                 </CardTitle>
-                <CardDescription>Positionen aus Teamspace für die granulare Zuordnung dieses Projekts.</CardDescription>
+                <CardDescription>Positionen aus Teamspace als reine Ansicht dieses Projekts.</CardDescription>
               </div>
               <div className="flex shrink-0 flex-wrap justify-end gap-2">
                 {canEditProject && projectTeamspaceSubentryCount > 0 ? (
@@ -2563,12 +2791,15 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
 	                onValueChange={updateOpenTeamspaceSubentryGroups}
 	                className="overflow-hidden rounded-md border bg-background/50"
 	              >
-                {projectTeamspaceSubentryGroups.map(({ entry, subentries }) => (
+                {projectTeamspaceSubentryGroups.map(({ entry, subentries }) => {
+                  return (
                   <AccordionItem key={entry.id} value={entry.id} className="border-b last:border-b-0">
                     <AccordionTrigger className="rounded-none border-l-4 border-l-primary/50 bg-muted/40 px-3 py-2 hover:bg-muted/55 hover:no-underline">
                       <div className="grid min-w-0 flex-1 gap-1 pr-3 text-left sm:grid-cols-[minmax(220px,1fr)_auto] sm:items-center">
                         <div className="min-w-0">
-                          <p className="truncate text-sm font-semibold">{teamspaceEntryDisplayLabel(entry)}</p>
+                          <p className="flex min-w-0 items-center gap-2 truncate text-sm font-semibold">
+                            <span className="truncate">{teamspaceEntryDisplayLabel(entry)}</span>
+                          </p>
                           <p className="truncate text-xs font-normal text-muted-foreground">
                             {entry.teamspace_project || "Ohne Teamspace-ID"}
                             {entry.teamspace_api_project_id ? ` · API ${entry.teamspace_api_project_id}` : ""}
@@ -2579,14 +2810,13 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                     </AccordionTrigger>
                     <AccordionContent className="p-0">
                       <div className="divide-y border-t bg-background">
-                        {subentries.map((subentry, index) => {
+	                        {subentries.map((subentry, index) => {
-                          const description = teamspaceFormattedText(subentry.description);
+	                          const description = teamspaceFormattedText(subentry.description);
-                          const title = teamspaceFormattedText(subentry.alias) || teamspaceFormattedText(subentry.name) || subentry.teamspace_project_id || "Teamspace-Position";
+	                          const title = teamspaceFormattedText(subentry.alias) || teamspaceFormattedText(subentry.name) || subentry.teamspace_project_id || "Teamspace-Position";
-                          const positionDisplayId = teamspacePositionDisplayId(subentry.teamspace_project_id);
+	                          const positionDisplayId = teamspacePositionDisplayId(subentry.teamspace_project_id);
-                          const fixedPrice = isTeamspaceFixedPricePosition(subentry.billing_type);
+	                          const fixedPrice = isTeamspaceFixedPricePosition(subentry.billing_type);
-                          const fixedPriceFulfilled = fixedPrice && teamspaceFixedPriceFulfilled(subentry);
+	                          const fixedPriceFulfilled = fixedPrice && teamspaceFixedPriceFulfilled(subentry);
                           const assignedConsumptionMinutes = Number(subentry.sum_minutes_billable ?? subentry.sum_minutes ?? 0);
-                          const fixedPricePlannedMinutes = teamspaceFixedUnitCount(subentry, "planned");
                           const plannedIncome = teamspaceIncomeValue(subentry.planned_income);
                           const sumIncome = teamspaceIncomeValue(subentry.sum_income);
                           const plannedBillableMinutes = Number(subentry.planned_minutes_billable ?? subentry.planned_minutes ?? 0);
@@ -2605,8 +2835,10 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                               className="grid gap-2 px-3 py-2 text-xs hover:bg-muted/20 lg:grid-cols-[3.5rem_minmax(190px,0.95fr)_minmax(240px,1.45fr)_105px_136px] lg:items-center"
                             >
                               <div className="hidden text-muted-foreground lg:block">{positionDisplayId || index + 1}</div>
-                              <div className="min-w-0">
+	                              <div className="min-w-0">
-                                <p className="truncate font-medium text-foreground/90">{title}</p>
+	                                <p className="flex min-w-0 items-center gap-2 truncate font-medium text-foreground/90">
+	                                  <span className="truncate">{title}</span>
+	                                </p>
                                 <p className="truncate text-muted-foreground">
                                   {positionDisplayId ? `Position ${positionDisplayId}` : "Ohne Positions-ID"}
                                   {subentry.teamspace_api_project_id ? ` · API ${subentry.teamspace_api_project_id}` : ""}
@@ -2653,17 +2885,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                                         </>
                                       )}
                                 </span>
-	                                {fixedPrice ? (
+	                              </div>
-                                    <span className="block text-[11px] text-muted-foreground/85">
-                                      TS {formatMinutes(assignedConsumptionMinutes)}
-                                      {fixedPricePlannedMinutes > 0 ? ` / ${formatMinutes(fixedPricePlannedMinutes)}` : ""}
-                                    </span>
-                                  ) : (
-                                    <span className="block text-[11px] text-muted-foreground/85">
-                                      TS {formatMinutes(assignedConsumptionMinutes)}
-                                    </span>
-                                )}
-                              </div>
                               {canEditProject && editingTeamspaceSubentries ? (
 	                                <div className={cn(
 	                                  "grid gap-2 rounded-md border border-dashed bg-muted/10 p-2 lg:col-span-5 lg:items-end",
@@ -2706,7 +2928,8 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                       </div>
                     </AccordionContent>
                   </AccordionItem>
-                ))}
+                  );
+                })}
               </Accordion>
             ) : (
               <p className="rounded-md border bg-muted/20 p-3 text-sm text-muted-foreground">
@@ -2725,7 +2948,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
           </div>
           <div className="flex flex-wrap items-center gap-2">
             <div className="flex items-center gap-2 rounded-md border bg-muted/30 px-3 py-2 text-sm">
-              <span className="text-muted-foreground">Abgerechnet</span>
+              <span className="text-muted-foreground">Abgerechnet (netto)</span>
               <span className="font-semibold">{formatMinutes(periodTotalMinutes)}</span>
             </div>
             <div className="flex items-center gap-2 rounded-md border bg-muted/30 px-3 py-2 text-sm">
@@ -2823,41 +3046,48 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
             </div>
           ) : null}
 
-          <div className="space-y-2">
+	          <div className="space-y-2">
-            {sessionGroups.map((group) => (
+	            {sessionGroups.map((group) => {
+	              const dayDeviation = teamspaceDayDeviation(group.day);
+	              const hasDayDeviation = dayDeviation.deltaMinutes !== 0;
+		              const dayComparison = dayDeviation.comparison;
+		              const hasInvalidTeamspaceValue = Boolean(dayComparison?.tt_value_without_billed_session);
+		              const hasMissingTeamspaceValue = Boolean(dayComparison?.missing_tt_value);
+		              const showDayTeamspaceDetails = hasDayDeviation || hasInvalidTeamspaceValue || hasMissingTeamspaceValue;
+
+              return (
               <div key={group.key} className="rounded-md border bg-background">
-                <div className="grid min-w-0 gap-2 border-b bg-muted/25 px-3 py-2 lg:grid-cols-[220px_minmax(0,150px)_minmax(260px,1fr)_220px] lg:items-center">
+                <div className="grid min-w-0 gap-2 border-b bg-muted/25 px-3 py-2 lg:grid-cols-[210px_minmax(0,120px)_minmax(240px,1fr)_44px_minmax(130px,0.45fr)_220px] lg:items-center">
                   <div className="min-w-0 text-left">
-                    <p className="truncate font-medium">{group.label}</p>
+                    <p className="flex min-w-0 items-center gap-2 truncate font-medium">
+                      <span className="truncate">{group.label}</span>
+                    </p>
                     <p className="text-xs text-muted-foreground">{group.sessions.length} Session(s)</p>
                   </div>
-                  <Button
+                  {group.sessions.length > 0 ? (
-                    type="button"
+                    <Button
-                    size="sm"
+                      type="button"
-                    variant="secondary"
+                      size="sm"
-                    className="h-8 min-w-32 justify-center justify-self-start"
+                      variant="secondary"
-                    title="Teamspace-Aufbereitung"
+                      className="h-8 min-w-32 justify-center justify-self-start"
-                    onClick={() => openTeamspacePreparation(group)}
+                      title="Teamspace-Aufbereitung"
-                  >
+                      onClick={() => openTeamspacePreparation(group)}
-                    <ClipboardList className="size-3.5" />
+                    >
-                    TS
+                      <ClipboardList className="size-3.5" />
-                  </Button>
+                      TS
-                  <div className="grid min-w-0 grid-cols-3 gap-2 lg:gap-3">
+                    </Button>
-                    <Badge variant="outline" className="flex h-8 min-w-0 justify-center gap-1 whitespace-nowrap px-2" title="Abrechenbar">
+                  ) : <span />}
-                      <Play className="size-3.5 shrink-0" />
+                  <div className="flex min-w-0 flex-wrap gap-x-3 gap-y-1 text-xs text-muted-foreground">
-                      <span className="truncate">{formatMinutes(group.billableMinutes)}</span>
+                  </div>
-                    </Badge>
+                  <div className="flex justify-start lg:justify-center">
-                    <Badge variant="outline" className="flex h-8 min-w-0 justify-center gap-1 whitespace-nowrap px-2" title="Abgerechnet">
+
-                      <CheckCircle2 className="size-3.5 shrink-0" />
+                      <span className="h-4 w-4" aria-hidden="true" />
-                      <span className="truncate">{formatMinutes(group.totalMinutes)}</span>
+                  </div>
-                    </Badge>
+                  <div className="min-w-0 text-xs lg:text-right">
-                    <Badge variant="secondary" className="flex h-8 min-w-0 justify-center gap-1 whitespace-nowrap px-2" title="Nicht abrechenbar">
+
-                      <EyeOff className="size-3.5 shrink-0" />
-                      <span className="truncate">{formatMinutes(group.nonBillableMinutes)}</span>
-                    </Badge>
                   </div>
 		                  <div className="flex min-w-0 items-center justify-start gap-2 lg:justify-end">
-                        {teamspaceTimeTrackingEnabled ? (
+	                        {teamspaceTimeTrackingEnabled && group.sessions.length > 0 ? (
 		                      <div className="flex min-w-0 items-center gap-1.5 text-xs text-muted-foreground">
 	                        <label htmlFor={`crm-billing-${group.key}`}>Teamspace</label>
 	                        <Input
@@ -2901,18 +3131,70 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
 		                          <span className="sr-only">{savingDayBillingKey === group.key ? "Speichert..." : "Speichern"}</span>
 		                        </Button>
 		                      </div>
-                        ) : (
+	                        ) : group.sessions.length > 0 ? (
                           <span className="text-xs text-muted-foreground">Teamspace-Erfassung aus</span>
-                        )}
+	                        ) : null}
 		                  </div>
                 </div>
+                {showDayTeamspaceDetails ? (
+                  <div className="flex flex-col gap-2 border-b bg-muted/10 px-3 py-2 sm:flex-row sm:items-center sm:justify-between">
+                    <div className="flex min-w-0 flex-wrap items-center gap-2">
+                      {hasMissingTeamspaceValue ? (
+                        <Badge className={dayComparison?.acknowledged
+                          ? "bg-emerald-500/12 text-emerald-800 dark:bg-emerald-500/20 dark:text-emerald-200"
+                          : "bg-sky-500/12 text-sky-800 dark:bg-sky-500/20 dark:text-sky-200"}
+                        >
+                          {dayComparison?.acknowledged ? "Fehlender TT-Wert zur Kenntnis" : "TT-Teamspace-Wert fehlt"}
+                        </Badge>
+                      ) : null}
+                      {hasInvalidTeamspaceValue ? (
+                        <Badge variant="destructive">Fehler: TT-Teamspace-Wert ohne abgerechneten Eintrag</Badge>
+                      ) : null}
+                      {hasDayDeviation ? (
+                        <>
+                          <Badge className="bg-cyan-500/12 text-cyan-800 dark:bg-cyan-500/20 dark:text-cyan-200">
+                            TT-Teamspace {formatMinutes(dayDeviation.ttMinutes)}
+                          </Badge>
+                          <Badge className="bg-violet-500/12 text-violet-800 dark:bg-violet-500/20 dark:text-violet-200">
+                            TS-API {formatMinutes(dayDeviation.tsMinutes)}
+                          </Badge>
+                          <Badge className="bg-orange-500/12 text-orange-800 dark:bg-orange-500/20 dark:text-orange-200">
+                            {formatTeamspaceDifferenceTarget(dayDeviation.deltaMinutes, teamspaceTimeTrackingEnabled)}
+                          </Badge>
+                        </>
+                      ) : null}
+                      {hasInvalidTeamspaceValue ? (
+                        <span className="text-xs text-destructive">
+                          Kein abgerechneter Eintrag
+                          {Number(dayComparison?.non_billable_session_count ?? 0) > 0 ? ` · ${dayComparison?.non_billable_session_count} nicht abrechenbar` : ""}
+                          {Number(dayComparison?.billable_session_count ?? 0) > 0 ? ` · ${dayComparison?.billable_session_count} abrechenbar` : ""}
+                          {Number(dayComparison?.unrated_session_count ?? 0) > 0 ? ` · ${dayComparison?.unrated_session_count} ohne Bewertung` : ""}
+                        </span>
+                      ) : null}
+                    </div>
+                    {hasMissingTeamspaceValue && dayComparison ? (
+                      <Button
+                        type="button"
+                        size="sm"
+                        variant={dayComparison.acknowledged ? "secondary" : "ghost"}
+                        className="h-8 shrink-0"
+                        disabled={isPeriodClosed || acknowledgingTeamspaceDay === group.day}
+                        onClick={() => void setMissingTeamspaceDayAcknowledgement(dayComparison, !dayComparison.acknowledged)}
+                      >
+                        {dayComparison.acknowledged ? "Zurücknehmen" : "Zur Kenntnis"}
+                      </Button>
+                    ) : null}
+                  </div>
+                ) : null}
                 <div className="space-y-1.5 p-2 sm:p-3 lg:px-0">
                   {group.sessions.map((session) => {
                     const expanded = expandedSessionIds.includes(session.id);
                     const zammadSent = session.zammad_article_status === "sent";
                     const zammadPending = session.zammad_article_status === "pending";
                     const zammadMailImported = Boolean(session.zammad_source_article_id);
-		                    const canSendZammad = !zammadMailImported && (session.activity.trim().length > 0 || Boolean(session.zammad_article_body));
+	                    const workSegments = Array.isArray(session.work_segments) ? session.work_segments : [];
+	                    const hasWorkSegments = workSegments.length > 1;
+		                    const canSendZammad = !zammadMailImported && hasActivityContent(session.activity, session.zammad_article_body);
 		                    const sendingZammad = sendingZammadSessionId === session.id;
 		                    const billedMissingTeamspaceEntry =
                           teamspaceTimeTrackingEnabled
@@ -2922,7 +3204,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
 
                     return (
                       <div key={session.id} className="rounded-md border bg-card/40">
-                        <div className="grid gap-2 p-2 lg:grid-cols-[220px_minmax(0,150px)_minmax(260px,1fr)_220px] lg:items-center">
+	                        <div className="grid gap-2 p-2 lg:grid-cols-[220px_minmax(0,170px)_minmax(260px,1fr)_220px] lg:items-center">
                           <button
                             type="button"
                             className="flex min-w-0 items-center gap-2 rounded-md text-left text-sm text-muted-foreground hover:cursor-pointer hover:text-foreground focus-visible:outline-none focus-visible:ring-3 focus-visible:ring-ring/50"
@@ -2946,9 +3228,16 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
 	                              </Badge>
 	                            ) : null}
 	                          </button>
-                          <div className="flex min-w-0 flex-col items-start gap-1">
+	                          <div className="grid min-w-0 grid-cols-[minmax(0,max-content)_2rem] items-start gap-2">
-                            <Badge variant="outline" className="w-fit">{formatMinutes(session.rounded_minutes)}</Badge>
+	                            <div className="flex min-w-0 flex-col items-start gap-1">
-                            {session.recurring_billing_id ? <Badge variant="secondary">fix</Badge> : null}
+	                              <Badge variant="outline" className="w-fit">{formatMinutes(session.rounded_minutes)}</Badge>
+	                              {session.recurring_billing_id ? <Badge variant="secondary">fix</Badge> : null}
+	                            </div>
+	                            <div className="flex size-8 items-center justify-center">
+	                              {hasWorkSegments ? (
+	                                <ListClockIcon className="size-4 text-muted-foreground" aria-label="Arbeitsbereiche gespeichert" />
+	                              ) : null}
+	                            </div>
                           </div>
 	                          <BillingButtons
 	                            session={session}
@@ -2998,31 +3287,42 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                         </div>
                         {expanded ? (
                           <div className="border-t px-3 pb-3 pt-2">
-                            <SessionActivityBody session={session} />
+	                            <div className="grid gap-3 lg:grid-cols-[minmax(0,1fr)_auto]">
-                            <div className="mt-2 flex flex-wrap gap-x-3 gap-y-1 text-xs text-muted-foreground">
+	                              <div className="min-w-0">
-                              <span>{session.organization_name ?? session.customer_name}</span>
+	                                <SessionActivityBody session={session} />
-                              <span>{session.work_type === "support" ? "Support" : "Consulting"}</span>
+	                                <div className="mt-2 flex flex-wrap gap-x-3 gap-y-1 text-xs text-muted-foreground">
-                              {zammadMailImported ? (
+	                                  <span>{session.organization_name ?? session.customer_name}</span>
-                                <span className="inline-flex items-center gap-1">
+	                                  <span>{session.work_type === "support" ? "Support" : "Consulting"}</span>
-                                  <MailCheck className="size-3.5 text-sky-500" aria-hidden="true" />
+	                                  {zammadMailImported ? (
-                                  <span>Zammad-Mail importiert · Article {session.zammad_source_article_id}</span>
+	                                    <span className="inline-flex items-center gap-1">
-                                </span>
+	                                      <MailCheck className="size-3.5 text-sky-500" aria-hidden="true" />
-                              ) : null}
+	                                      <span>Zammad-Mail importiert · Article {session.zammad_source_article_id}</span>
-                              {!zammadMailImported ? (
+	                                    </span>
-                                <span className="inline-flex items-center gap-1">
+	                                  ) : null}
-                                  {zammadSent ? <Send className="size-3.5 text-emerald-500" aria-hidden="true" /> : zammadPending ? <RotateCcw className="size-3.5 text-amber-500" aria-hidden="true" /> : <Send className="size-3.5 text-muted-foreground/60" aria-hidden="true" />}
+	                                  {!zammadMailImported ? (
-                                  <span>
+	                                    <span className="inline-flex items-center gap-1">
-                                    {zammadSent
+	                                      {zammadSent ? <Send className="size-3.5 text-emerald-500" aria-hidden="true" /> : zammadPending ? <RotateCcw className="size-3.5 text-amber-500" aria-hidden="true" /> : <Send className="size-3.5 text-muted-foreground/60" aria-hidden="true" />}
-                                      ? `Zammad übertragen · ${zammadArticleTypeLabel(session.zammad_article_type_id)}`
+	                                      <span>
-                                      : zammadPending
+	                                        {zammadSent
-                                        ? `Zammad geparkt · ${zammadArticleTypeLabel(session.zammad_article_type_id)}`
+	                                          ? `Zammad übertragen · ${zammadArticleTypeLabel(session.zammad_article_type_id)}`
-                                        : canSendZammad
+	                                          : zammadPending
-                                          ? "Nicht an Zammad übertragen"
+	                                            ? `Zammad geparkt · ${zammadArticleTypeLabel(session.zammad_article_type_id)}`
-                                          : "Keine Zammad-Notiz (Tätigkeit leer)"}
+	                                            : canSendZammad
-                                  </span>
+	                                              ? "Nicht an Zammad übertragen"
-                                </span>
+	                                              : "Keine Zammad-Notiz (Tätigkeit leer)"}
-                              ) : null}
+	                                      </span>
-                              <span>Erfasst {formatDateTime(session.created_at)}</span>
+	                                    </span>
+	                                  ) : null}
+	                                  <span>Erfasst {formatDateTime(session.created_at)}</span>
+	                                </div>
+	                              </div>
+	                              {hasWorkSegments ? (
+	                                <div className="space-y-1 text-right text-xs text-muted-foreground">
+	                                  {workSegments.map((segment, index) => (
+	                                    <div key={`${segment.startedAt}-${segment.endedAt ?? "open"}-${index}`}>{formatWorkSegmentRange(segment)}</div>
+	                                  ))}
+	                                </div>
+	                              ) : null}
                             </div>
                           </div>
                         ) : null}
@@ -3031,7 +3331,8 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                   })}
                 </div>
               </div>
-            ))}
+              );
+            })}
           </div>
 
           {data?.sessions.length === 0 ? (

frontend/src/views/TimerPage.tsx

@@ -17,7 +17,7 @@ import type { CreateSessionResult } from "../api";
 import { formatTimer } from "../format";
 import { isRecurringBillingTicketNumber, ticketHasRecurringBilling } from "../recurring-billings";
 import { activeElapsedMs, mergeTimerActivityDrafts, removeTimerActivityDraft, ticketPattern, type TimerEntry, writeTimerActivityDraft } from "../timers";
-import type { AuthUser, BillingStatus, RecurringBilling, TicketMeta, WorkType } from "../types";
+import type { AuthUser, BillingStatus, RecurringBilling, TicketMeta, WorkSegment, WorkType } from "../types";
 import { zammadArticleTypeFromValue, zammadArticleTypeOptions, zammadArticleTypeValue, type ZammadArticleTypeId } from "../zammad-article-types";
 
 type ManualSessionFormState = {
@@ -59,6 +59,10 @@ function emptyManualSession(): ManualSessionFormState {
   };
 }
 
+function hasActivityContent(activity: string, zammadArticleBody: string | null | undefined) {
+  return activity.trim().length > 0 || Boolean(zammadArticleBody);
+}
+
 type FinishedSession = {
   timerId: string;
   ticketNumber: string;
@@ -73,6 +77,7 @@ type FinishedSession = {
   endedAt: string;
   durationSeconds: number;
   roundedMinutes: number;
+  workSegments: WorkSegment[];
 };
 
 function ticketTeamspaceEntries(ticket: TicketMeta | null | undefined) {
@@ -100,6 +105,8 @@ type TimerPageProps = {
   setSelectedTimerId: Dispatch<SetStateAction<string | null>>;
   tick: number;
   currentUser: AuthUser;
+  finishRequestId?: string | null;
+  onFinishRequestHandled?: () => void;
 };
 
 function BillingStatusSelect({
@@ -293,7 +300,7 @@ function InlineImageActivityEditor({
   );
 }
 
-export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimerId, tick, currentUser }: TimerPageProps) {
+export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimerId, tick, currentUser, finishRequestId, onFinishRequestHandled }: TimerPageProps) {
   const [ticketNumber, setTicketNumber] = useState("");
   const [finished, setFinished] = useState<FinishedSession | null>(null);
   const [finishingId, setFinishingId] = useState<string | null>(null);
@@ -676,6 +683,7 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
       });
       setTimers(mergeTimerActivityDrafts(currentUser.id, timerResult.timers));
       setSelectedTimerId(timer.id);
+      const finishedTimer = timerResult.timers.find((entry) => entry.id === timer.id) ?? timer;
 
       const result = await lookupTicket(timer.ticketNumber);
       const ticket = result.ticket;
@@ -702,12 +710,13 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
         zammadArticleBody: timerZammadArticleBody,
         billingStatus: timer.billingStatus,
         promptBillingStatus: currentUser.session_billing_prompt_enabled && timer.billingStatus === null,
-        createZammadArticle: currentUser.zammad_session_note_default_enabled && timerActivity.trim().length > 0,
+        createZammadArticle: currentUser.zammad_session_note_default_enabled && hasActivityContent(timerActivity, timerZammadArticleBody),
         zammadArticleTypeId: currentUser.zammad_article_type_id,
         startedAt: new Date(timer.startedAt).toISOString(),
         endedAt: new Date(now).toISOString(),
         durationSeconds,
-        roundedMinutes
+        roundedMinutes,
+        workSegments: currentUser.session_work_segments_enabled ? finishedTimer.workSegments ?? [] : []
       });
     } catch (error) {
       toast.error("Ticket konnte nicht geprüft werden", {
@@ -718,6 +727,22 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
     }
   }
 
+  useEffect(() => {
+    if (!finishRequestId) {
+      return;
+    }
+
+    const timerExists = timers.some((timer) => timer.id === finishRequestId);
+    onFinishRequestHandled?.();
+
+    if (!timerExists) {
+      return;
+    }
+
+    setSelectedTimerId(finishRequestId);
+    void finishTimer(finishRequestId);
+  }, [finishRequestId]);
+
   async function submitSession(event: FormEvent) {
     event.preventDefault();
 
@@ -764,6 +789,7 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
         startedAt: finished.startedAt,
         endedAt: finished.endedAt,
         durationSeconds: finished.durationSeconds,
+        workSegments: finished.workSegments,
         organizationId: effectiveOrganizationId,
         activity: activityValue.activity,
         zammadArticleBody: activityValue.zammadArticleBody || null,
@@ -771,7 +797,7 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
         zammadLookup: Boolean(finished.ticket?.zammad_ticket_id),
         projectTeamspaceEntryId: finishedRequiresTeamspaceEntry ? projectTeamspaceEntryId : null,
         billingStatus: finished.billingStatus,
-        createZammadArticle: finished.createZammadArticle && (activityValue.activity.trim().length > 0 || Boolean(activityValue.zammadArticleBody)),
+        createZammadArticle: finished.createZammadArticle && hasActivityContent(activityValue.activity, activityValue.zammadArticleBody),
         zammadArticleTypeId: finished.zammadArticleTypeId
       });
 
@@ -870,7 +896,8 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
         zammadLookup: Boolean(manualLookupTicket?.zammad_ticket_id),
         projectTeamspaceEntryId: manualRequiresTeamspaceEntry ? manualSession.projectTeamspaceEntryId : null,
         billingStatus: manualSession.billingStatus,
-        createZammadArticle: manualSession.createZammadArticle && (activityValue.activity.trim().length > 0 || Boolean(activityValue.zammadArticleBody)),
+        createZammadArticle: manualSession.createZammadArticle && hasActivityContent(activityValue.activity, activityValue.zammadArticleBody),
+        zammadArticleDateHeader: true,
         zammadArticleTypeId: manualSession.zammadArticleTypeId
       });
       toast.success("Session nachgetragen", {
@@ -893,6 +920,8 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
     }
   }
 
+  const finishedEffectiveWorkType = finished?.ticket?.organization_id && finished.ticket.work_type ? finished.ticket.work_type : workType;
+
   return (
     <div className="space-y-4">
       <section className="space-y-4">
@@ -1297,7 +1326,7 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
                     ...current,
                     activity,
                     zammadArticleBody,
-                    createZammadArticle: activity.trim().length > 0 || zammadArticleBody ? current.createZammadArticle : false
+                    createZammadArticle: hasActivityContent(activity, zammadArticleBody) ? current.createZammadArticle : false
                   } : current);
                 }}
               />
@@ -1306,7 +1335,7 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
               <div className="min-w-0 space-y-3 rounded-md border bg-muted/30 p-3">
                 <div className="flex min-w-0 items-start gap-3">
                   {(() => {
-                    const hasZammadContent = finished.activity.trim().length > 0 || Boolean(finished.zammadArticleBody);
+                    const hasZammadContent = hasActivityContent(finished.activity, finished.zammadArticleBody);
 
                     return (
                       <>
@@ -1314,7 +1343,7 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
                     id="finished-zammad-article"
                     checked={finished.createZammadArticle && hasZammadContent}
                     disabled={!hasZammadContent}
-                    onCheckedChange={(checked) => setFinished((current) => (current ? { ...current, createZammadArticle: checked === true && (current.activity.trim().length > 0 || Boolean(current.zammadArticleBody)) } : current))}
+                    onCheckedChange={(checked) => setFinished((current) => (current ? { ...current, createZammadArticle: checked === true && hasActivityContent(current.activity, current.zammadArticleBody) } : current))}
                   />
                   <div className="min-w-0 space-y-1">
                     <label className="break-words text-sm font-medium" htmlFor="finished-zammad-article">

mailexample.json

@@ -1,37 +0,0 @@
-[
-  {
-    "id": 66368,
-    "ticket_id": 3122,
-    "type_id": 1,
-    "sender_id": 1,
-    "from": "XX",
-    "to": "XX",
-    "cc": "XX",
-    "subject": "XX",
-    "reply_to": null,
-    "message_id": "XX",
-    "message_id_md5": "XX",
-    "in_reply_to": "XX",
-    "content_type": "text/html",
-    "body": "",
-    "internal": false,
-    "preferences": {
-      "subtype": "reply",
-      "email_address_id": 7,
-      "delivery_retry": 1,
-      "delivery_channel_id": 24,
-      "delivery_status_message": null,
-      "delivery_status": "success",
-      "delivery_status_date": "2026-09-25T10:55:51.214Z"
-    },
-    "updated_by_id": 77,
-    "created_by_id": 77,
-    "origin_by_id": null,
-    "created_at": "2026-09-25T10:55:48.201Z",
-    "updated_at": "2026-09-25T10:55:51.215Z",
-    "detected_language": null,
-    "ai_stored_result_ids": [],
-    "attachments": [],
-    "body_rendering_error": false
-  }
-]

objects.json

@@ -0,0 +1,164 @@
+[
+  {
+    "id": 85,
+    "name": "customer_owner",
+    "display": "Kunde zugeordnet zu",
+    "data_type": "select",
+    "data_option": {
+      "options": {
+        "AIKAVA": "AIKAVA",
+        "ATOSS": "ATOSS",
+        "Compdata": "Compdata",
+        "OSC": "OSC",
+        "SD Worx": "SD Worx",
+        "Pro Active": "Pro Active"
+      },
+      "default": "ATOSS",
+      "linktemplate": "",
+      "translate": false,
+      "null": true,
+      "relation": "",
+      "nulloption": true,
+      "maxlength": 255,
+      "historical_options": {
+        "ATOSS": "ATOSS",
+        "AIKAVA": "AIKAVA",
+        "Compdata": "Compdata",
+        "OSC": "OSC",
+        "SD Worx": "SD Worx",
+        "Pro Active": "Pro Active"
+      }
+    },
+    "data_option_new": {
+
+    },
+    "editable": true,
+    "active": true,
+    "screens": {
+      "view": {
+        "ticket.customer": {
+          "shown": true
+        },
+        "ticket.agent": {
+          "shown": true
+        },
+        "admin.organization": {
+          "shown": true
+        }
+      },
+      "create": {
+        "ticket.agent": {
+          "shown": true,
+          "required": false
+        },
+        "admin.organization": {
+          "shown": true,
+          "required": false
+        }
+      },
+      "edit": {
+        "ticket.agent": {
+          "shown": true,
+          "required": false
+        },
+        "admin.organization": {
+          "shown": true,
+          "required": false
+        }
+      }
+    },
+    "to_create": false,
+    "to_migrate": false,
+    "to_delete": false,
+    "to_config": false,
+    "position": 1813,
+    "created_by_id": 4,
+    "updated_by_id": 4,
+    "created_at": "2026-04-22T14:46:46.993Z",
+    "updated_at": "2026-08-19T12:35:58.304Z",
+    "internal": false,
+    "object": "Organization",
+    "deletable": true
+  },
+  {
+    "id": 86,
+    "name": "hotline_contract",
+    "display": "Hotlinevertrag bei",
+    "data_type": "select",
+    "data_option": {
+      "options": {
+        "AIKAVA": "AIKAVA",
+        "ATOSS": "ATOSS",
+        "Compdata": "Compdata",
+        "OSC": "OSC",
+        "SD Worx": "SD Worx",
+        "(kein Hotlinevertrag)": "(kein Hotlinevertrag)"
+      },
+      "default": "ATOSS",
+      "linktemplate": "",
+      "translate": false,
+      "null": true,
+      "relation": "",
+      "nulloption": true,
+      "maxlength": 255,
+      "historical_options": {
+        "ATOSS": "ATOSS",
+        "AIKAVA": "AIKAVA",
+        "Compdata": "Compdata",
+        "OSC": "OSC",
+        "SD Worx": "SD Worx",
+        "(kein Hotlinevertrag)": "(kein Hotlinevertrag)"
+      }
+    },
+    "data_option_new": {
+
+    },
+    "editable": true,
+    "active": true,
+    "screens": {
+      "view": {
+        "ticket.customer": {
+          "shown": true
+        },
+        "ticket.agent": {
+          "shown": true
+        },
+        "admin.organization": {
+          "shown": true
+        }
+      },
+      "create": {
+        "ticket.agent": {
+          "shown": true,
+          "required": false
+        },
+        "admin.organization": {
+          "shown": true,
+          "required": false
+        }
+      },
+      "edit": {
+        "ticket.agent": {
+          "shown": true,
+          "required": false
+        },
+        "admin.organization": {
+          "shown": true,
+          "required": false
+        }
+      }
+    },
+    "to_create": false,
+    "to_migrate": false,
+    "to_delete": false,
+    "to_config": false,
+    "position": 1814,
+    "created_by_id": 4,
+    "updated_by_id": 4,
+    "created_at": "2026-04-22T14:48:44.782Z",
+    "updated_at": "2026-04-22T15:11:55.575Z",
+    "internal": false,
+    "object": "Organization",
+    "deletable": true
+  }
+]

scripts/normalize-teamspace-main-projects.mts

@@ -0,0 +1,277 @@
+import pg from "pg";
+
+import { decryptSecret } from "../backend/src/secrets.js";
+
+const apply = process.argv.includes("--apply");
+
+if (!process.env.DATABASE_URL) {
+  throw new Error("DATABASE_URL fehlt");
+}
+
+type JsonPosition = {
+  apiProjectId?: string | number | null;
+  minutes?: number;
+  billableMinutes?: number;
+  entryCount?: number;
+  days?: Array<{ day?: string; minutes?: number; billableMinutes?: number; entryCount?: number }>;
+};
+
+type RemoteProject = {
+  apiProjectId: number;
+  mainApiProjectId: number;
+  projectId: string;
+  name: string;
+  customerApiId: number | null;
+  customerName: string | null;
+  url: string | null;
+};
+
+const pool = new pg.Pool({ connectionString: process.env.DATABASE_URL });
+
+function positiveInteger(value: unknown) {
+  const parsed = Number(value);
+  return Number.isInteger(parsed) && parsed > 0 ? parsed : null;
+}
+
+function text(value: unknown) {
+  return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+
+async function main() {
+  const settingsResult = await pool.query<{ key: string; value: string }>(
+    "SELECT key, value FROM app_settings WHERE key = ANY($1::text[]);",
+    [["teamspace.base_url", "teamspace.admin_credentials_user_id"]]
+  );
+  const settings = new Map(settingsResult.rows.map((row) => [row.key, row.value]));
+  const baseUrl = settings.get("teamspace.base_url")?.replace(/\/$/, "");
+  const credentialsUserId = settings.get("teamspace.admin_credentials_user_id");
+
+  if (!baseUrl || !credentialsUserId) {
+    throw new Error("Teamspace-Adminzugang ist nicht vollständig konfiguriert");
+  }
+
+  const credentialsResult = await pool.query<{ teamspace_device_id: string | null; teamspace_device_password: string | null }>(
+    "SELECT teamspace_device_id, teamspace_device_password FROM users WHERE id = $1;",
+    [credentialsUserId]
+  );
+  const deviceId = decryptSecret(credentialsResult.rows[0]?.teamspace_device_id);
+  const devicePassword = decryptSecret(credentialsResult.rows[0]?.teamspace_device_password);
+
+  if (!deviceId || !devicePassword) {
+    throw new Error("Teamspace-Adminzugang enthält keine Geräte-Credentials");
+  }
+
+  const authorization = `Basic ${Buffer.from(`${deviceId}:${devicePassword}`).toString("base64")}`;
+  const fetchJson = async (path: string) => {
+    const response = await fetch(`${baseUrl}${path}`, { headers: { Authorization: authorization, Accept: "application/json" } });
+
+    if (!response.ok) {
+      throw new Error(`Teamspace ${path} antwortet mit HTTP ${response.status}`);
+    }
+
+    return response.json() as Promise<Record<string, unknown>>;
+  };
+
+  const [entryResult, resourceResult, exclusionResult, userActualResult, entryActualResult] = await Promise.all([
+    pool.query<{ id: string; api_id: string }>("SELECT id::text, teamspace_api_project_id::text AS api_id FROM project_teamspace_entries WHERE teamspace_api_project_id IS NOT NULL;"),
+    pool.query<{ id: string; api_id: string }>("SELECT id::text, teamspace_api_project_id::text AS api_id FROM teamspace_project_resources WHERE teamspace_api_project_id IS NOT NULL;"),
+    pool.query<{ teamspace_project: string; api_id: string | null; api_ids: string[] }>(`
+      SELECT teamspace_project,
+             teamspace_api_project_id::text AS api_id,
+             ARRAY(SELECT value::text FROM unnest(teamspace_api_project_ids) AS value) AS api_ids
+      FROM teamspace_project_exclusions;
+    `),
+    pool.query<{ user_id: string; month: string; positions: JsonPosition[] }>("SELECT user_id::text, month::text, positions FROM teamspace_monthly_user_actuals;"),
+    pool.query<{ user_id: string; project_teamspace_entry_id: string; month: string; positions: JsonPosition[] }>(
+      "SELECT user_id::text, project_teamspace_entry_id::text, month::text, positions FROM project_teamspace_monthly_actuals;"
+    )
+  ]);
+
+  const apiIds = new Set<number>();
+  const addApiId = (value: unknown) => {
+    const apiId = positiveInteger(value);
+    if (apiId) apiIds.add(apiId);
+  };
+
+  entryResult.rows.forEach((row) => addApiId(row.api_id));
+  resourceResult.rows.forEach((row) => addApiId(row.api_id));
+  exclusionResult.rows.forEach((row) => {
+    addApiId(row.api_id);
+    row.api_ids.forEach(addApiId);
+  });
+  [...userActualResult.rows, ...entryActualResult.rows].forEach((row) => row.positions.forEach((position) => addApiId(position.apiProjectId)));
+
+  const rawProjects = new Map<number, Record<string, unknown>>();
+  const ids = [...apiIds].sort((left, right) => left - right);
+
+  for (let offset = 0; offset < ids.length; offset += 8) {
+    const projects = await Promise.all(ids.slice(offset, offset + 8).map(async (apiId) => [apiId, await fetchJson(`/api/project/${apiId}`)] as const));
+    projects.forEach(([apiId, project]) => rawProjects.set(apiId, project));
+  }
+
+  const mainIds = new Set<number>();
+  for (const [apiId, project] of rawProjects) {
+    mainIds.add(positiveInteger((project.mainProject as Record<string, unknown> | undefined)?.value) ?? apiId);
+  }
+
+  const missingMainIds = [...mainIds].filter((apiId) => !rawProjects.has(apiId));
+  for (let offset = 0; offset < missingMainIds.length; offset += 8) {
+    const projects = await Promise.all(missingMainIds.slice(offset, offset + 8).map(async (apiId) => [apiId, await fetchJson(`/api/project/${apiId}`)] as const));
+    projects.forEach(([apiId, project]) => rawProjects.set(apiId, project));
+  }
+
+  const customerIds = new Set<number>();
+  for (const apiId of mainIds) {
+    const customerApiId = positiveInteger((rawProjects.get(apiId)?.customer as Record<string, unknown> | undefined)?.value);
+    if (customerApiId) customerIds.add(customerApiId);
+  }
+  const customerNames = new Map<number, string>();
+
+  for (let offset = 0; offset < customerIds.size; offset += 8) {
+    const chunk = [...customerIds].slice(offset, offset + 8);
+    const customers = await Promise.all(chunk.map(async (apiId) => [apiId, await fetchJson(`/api/organization/${apiId}`)] as const));
+    customers.forEach(([apiId, customer]) => {
+      const name = text(customer.name) ?? text(customer.companyName) ?? text(customer.displayName);
+      if (name) customerNames.set(apiId, name);
+    });
+  }
+
+  const projectMap = new Map<number, RemoteProject>();
+  for (const sourceApiId of apiIds) {
+    const source = rawProjects.get(sourceApiId);
+    if (!source) throw new Error(`Teamspace API-ID ${sourceApiId} konnte nicht aufgelöst werden`);
+    const mainApiProjectId = positiveInteger((source.mainProject as Record<string, unknown> | undefined)?.value) ?? sourceApiId;
+    const project = rawProjects.get(mainApiProjectId);
+    if (!project) throw new Error(`Teamspace Hauptprojekt ${mainApiProjectId} konnte nicht aufgelöst werden`);
+    const customerApiId = positiveInteger((project.customer as Record<string, unknown> | undefined)?.value);
+    const projectId = text(project.projectId);
+    if (!projectId) throw new Error(`Teamspace Hauptprojekt ${mainApiProjectId} hat keine Projektnummer`);
+
+    projectMap.set(sourceApiId, {
+      apiProjectId: mainApiProjectId,
+      mainApiProjectId,
+      projectId,
+      name: text(project.name) ?? projectId,
+      customerApiId,
+      customerName: customerApiId ? customerNames.get(customerApiId) ?? null : null,
+      url: text(project._url)
+    });
+  }
+
+  const normalizePositions = (positions: JsonPosition[]) => {
+    const grouped = new Map<number, {
+      project: RemoteProject;
+      minutes: number;
+      billableMinutes: number;
+      entryCount: number;
+      days: Map<string, { minutes: number; billableMinutes: number; entryCount: number }>;
+    }>();
+
+    for (const position of positions) {
+      const sourceApiId = positiveInteger(position.apiProjectId);
+      if (!sourceApiId) continue;
+      const project = projectMap.get(sourceApiId);
+      if (!project) throw new Error(`Keine Hauptprojekt-Zuordnung für API-ID ${sourceApiId}`);
+      const current = grouped.get(project.mainApiProjectId) ?? { project, minutes: 0, billableMinutes: 0, entryCount: 0, days: new Map() };
+      current.minutes += Number(position.minutes ?? 0);
+      current.billableMinutes += Number(position.billableMinutes ?? 0);
+      current.entryCount += Number(position.entryCount ?? 0);
+
+      for (const sourceDay of position.days ?? []) {
+        const dayLabel = text(sourceDay.day);
+        if (!dayLabel) continue;
+        const day = current.days.get(dayLabel) ?? { minutes: 0, billableMinutes: 0, entryCount: 0 };
+        day.minutes += Number(sourceDay.minutes ?? 0);
+        day.billableMinutes += Number(sourceDay.billableMinutes ?? 0);
+        day.entryCount += Number(sourceDay.entryCount ?? 0);
+        current.days.set(dayLabel, day);
+      }
+
+      grouped.set(project.mainApiProjectId, current);
+    }
+
+    return [...grouped.values()].sort((left, right) => left.project.mainApiProjectId - right.project.mainApiProjectId).map((value) => ({
+      apiProjectId: String(value.project.mainApiProjectId),
+      projectId: value.project.projectId,
+      mainProjectId: value.project.projectId,
+      label: value.project.name,
+      customerName: value.project.customerName,
+      isSubentry: false,
+      billingType: null,
+      minutes: value.minutes,
+      billableMinutes: value.billableMinutes,
+      entryCount: value.entryCount,
+      days: [...value.days.entries()].sort(([left], [right]) => left.localeCompare(right)).map(([day, totals]) => ({ day, ...totals }))
+    }));
+  };
+
+  const normalizedUserActuals = userActualResult.rows.map((row) => ({ ...row, positions: normalizePositions(row.positions) }));
+  const normalizedEntryActuals = entryActualResult.rows.map((row) => ({ ...row, positions: normalizePositions(row.positions) }));
+  const subentryCountResult = await pool.query<{ count: number }>("SELECT count(*)::int AS count FROM project_teamspace_subentries;");
+  const changedSourceIds = [...projectMap.entries()].filter(([sourceApiId, project]) => sourceApiId !== project.mainApiProjectId).length;
+
+  console.log(JSON.stringify({
+    mode: apply ? "apply" : "dry-run",
+    apiIdsChecked: apiIds.size,
+    subprojectIdsNormalized: changedSourceIds,
+    monthlyUserActuals: normalizedUserActuals.length,
+    monthlyProjectActuals: normalizedEntryActuals.length,
+    legacySubentriesToDelete: subentryCountResult.rows[0]?.count ?? 0
+  }, null, 2));
+
+  if (!apply) return;
+
+  const client = await pool.connect();
+  try {
+    await client.query("BEGIN");
+
+    for (const row of entryResult.rows) {
+      const project = projectMap.get(Number(row.api_id));
+      if (!project) continue;
+      await client.query("UPDATE project_teamspace_entries SET teamspace_api_project_id=$2, teamspace_api_project_url=$3, updated_at=now() WHERE id=$1;", [row.id, project.mainApiProjectId, project.url]);
+    }
+    for (const row of resourceResult.rows) {
+      const project = projectMap.get(Number(row.api_id));
+      if (!project) continue;
+      await client.query("UPDATE teamspace_project_resources SET teamspace_api_project_id=$2, teamspace_api_project_url=$3, updated_at=now() WHERE id=$1;", [row.id, project.mainApiProjectId, project.url]);
+    }
+    for (const row of exclusionResult.rows) {
+      const sourceApiId = positiveInteger(row.api_id) ?? row.api_ids.map(positiveInteger).find((value): value is number => value !== null);
+      const project = sourceApiId ? projectMap.get(sourceApiId) : null;
+      await client.query(`
+        UPDATE teamspace_project_exclusions
+        SET teamspace_api_project_id=$2,
+            teamspace_api_project_ids=CASE WHEN $2::bigint IS NULL THEN '{}'::bigint[] ELSE ARRAY[$2::bigint] END,
+            teamspace_name=COALESCE($3, teamspace_name),
+            customer_name=COALESCE($4, customer_name),
+            updated_at=now()
+        WHERE teamspace_project=$1;
+      `, [row.teamspace_project, project?.mainApiProjectId ?? null, project?.name ?? null, project?.customerName ?? null]);
+    }
+    for (const row of normalizedUserActuals) {
+      const minutes = row.positions.reduce((sum, position) => sum + position.minutes, 0);
+      const billableMinutes = row.positions.reduce((sum, position) => sum + position.billableMinutes, 0);
+      const entryCount = row.positions.reduce((sum, position) => sum + position.entryCount, 0);
+      await client.query(`UPDATE teamspace_monthly_user_actuals SET positions=$3::jsonb, teamspace_minutes=$4, teamspace_billable_minutes=$5, teamspace_time_entry_count=$6, updated_at=now() WHERE user_id=$1 AND month=$2::date;`, [row.user_id, row.month, JSON.stringify(row.positions), minutes, billableMinutes, entryCount]);
+    }
+    for (const row of normalizedEntryActuals) {
+      const minutes = row.positions.reduce((sum, position) => sum + position.minutes, 0);
+      const billableMinutes = row.positions.reduce((sum, position) => sum + position.billableMinutes, 0);
+      const entryCount = row.positions.reduce((sum, position) => sum + position.entryCount, 0);
+      await client.query(`UPDATE project_teamspace_monthly_actuals SET positions=$4::jsonb, teamspace_minutes=$5, teamspace_billable_minutes=$6, teamspace_time_entry_count=$7, updated_at=now() WHERE user_id=$1 AND project_teamspace_entry_id=$2 AND month=$3::date;`, [row.user_id, row.project_teamspace_entry_id, row.month, JSON.stringify(row.positions), minutes, billableMinutes, entryCount]);
+    }
+    await client.query("DELETE FROM project_teamspace_subentries;");
+    await client.query("COMMIT");
+  } catch (error) {
+    await client.query("ROLLBACK");
+    throw error;
+  } finally {
+    client.release();
+  }
+}
+
+try {
+  await main();
+} finally {
+  await pool.end();
+}

triple.json

@@ -1,48 +0,0 @@
-{
-  "_url": "https://app1.teamspace.de/api/project;limit=1000;depth=2;sort=projectId?parent=32700722&isActive=true&isTemplate=false",
-  "_links": [
-    {
-      "caption": "Self",
-      "href": "https://app1.teamspace.de/api/project;limit=1000;depth=2;sort=projectId?parent=32700722&isActive=true&isTemplate=false",
-      "rel": "self"
-    },
-    {
-      "caption": "|< firstPage",
-      "href": "https://app1.teamspace.de/api/project;offset=0;limit=1000;sort=projectId?parent=32700722&isActive=true&isTemplate=false",
-      "rel": "first",
-      "title": "First page of projects of this CollectionResource"
-    },
-    {
-      "caption": ">| lastPage",
-      "href": "https://app1.teamspace.de/api/project;offset=0;limit=1000;sort=projectId?parent=32700722&isActive=true&isTemplate=false",
-      "rel": "last",
-      "title": "Last page of projects of this CollectionResource"
-    }
-  ],
-  "_etag": {
-    "value": "2cdf79c35612fb82487eed3923af2e43",
-    "weak": false
-  },
-  "size": 5,
-  "offset": 0,
-  "limit": 100,
-  "items": [
-    {
-      "data": {
-
-        "contractPositions": [
-          {
-              "billingType": {
-                "caption": "Fix price",
-                "href": "https://app1.teamspace.de/api/enum/financepositionbillingtype/INVOICEABLE_FIX",
-                "value": "INVOICEABLE_FIX",
-                "optionsUrl": "https://app1.teamspace.de/api/enum/financepositionbillingtype"
-
-            }
-          }
-        ]
-    }
-  }
-  ]
-}
-