STATUS-MODEL-FE: Zucht/Liebhaber/Abzugeben wählbar; Verstorben+Abgegeben abgeleitet (gated auf Pam BE)

2026-06-07 03:36:10 +02:00
15 changed files with 114 additions and 183 deletions
--- a/GerbilManager.Tests/GerbilProfilePhotoTests.cs
+++ b/GerbilManager.Tests/GerbilProfilePhotoTests.cs
@@ -1,83 +0,0 @@
-using System.Net;
-using System.Net.Http.Json;
-using System.Text.Json;
-using System.Text.RegularExpressions;
-using GerbilManagerWebAPI.Models;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace GerbilManager.Tests;
-
-/// <summary>profilePhotoUrl: computed field on GerbilDto — first photo by sortOrder, or null.</summary>
-public class GerbilProfilePhotoTests : IClassFixture<ApiFactory>
-{
-    private readonly HttpClient _client;
-    private readonly ApiFactory _factory;
-
-    public GerbilProfilePhotoTests(ApiFactory factory)
-    {
-        _factory = factory;
-        _client = factory.CreateClient();
-    }
-
-    private static Guid ExtractId(string json) =>
-        Guid.Parse(Regex.Match(json, "\"id\":\"([^\"]+)\"").Groups[1].Value);
-
-    private static string? GetStr(JsonElement el, string prop) =>
-        el.TryGetProperty(prop, out var v) && v.ValueKind == JsonValueKind.String
-            ? v.GetString() : null;
-
-    private async Task<Guid> CreateGerbil(string name)
-    {
-        var resp = await _client.PostAsync("/gerbils", JsonContent.Create(new { name, gender = "female" }));
-        Assert.Equal(HttpStatusCode.Created, resp.StatusCode);
-        return ExtractId(await resp.Content.ReadAsStringAsync());
-    }
-
-    private void InsertPhotos(Guid gerbilId, params (string fileName, int sortOrder)[] photos)
-    {
-        using var scope = _factory.Services.CreateScope();
-        var db = scope.ServiceProvider.GetRequiredService<ApplicationContext>();
-        foreach (var (fn, so) in photos)
-            db.GerbilPhotos.Add(new GerbilPhoto
-            {
-                Id = Guid.NewGuid(), GerbilId = gerbilId,
-                FileName = fn, SortOrder = so, CreatedAt = DateTimeOffset.UtcNow,
-            });
-        db.SaveChanges();
-    }
-
-    [Fact]
-    public async Task GetById_without_photos_returns_null_profilePhotoUrl()
-    {
-        var id = await CreateGerbil("NoPhoto");
-        var json = await _client.GetStringAsync($"/gerbils/{id}");
-        var el = JsonDocument.Parse(json).RootElement;
-        Assert.True(el.TryGetProperty("profilePhotoUrl", out var v));
-        Assert.Equal(JsonValueKind.Null, v.ValueKind);
-    }
-
-    [Fact]
-    public async Task GetById_with_photos_returns_lowest_sortOrder_url()
-    {
-        var id = await CreateGerbil("PhotoGerbil");
-        InsertPhotos(id, ("second.jpg", 1), ("first.jpg", 0));
-
-        var json = await _client.GetStringAsync($"/gerbils/{id}");
-        var el = JsonDocument.Parse(json).RootElement;
-        Assert.Equal("/photos/files/first.jpg", GetStr(el, "profilePhotoUrl"));
-    }
-
-    [Fact]
-    public async Task GetList_returns_profilePhotoUrl_without_n_plus_1()
-    {
-        var id = await CreateGerbil("ListPhoto");
-        InsertPhotos(id, ("list-photo.jpg", 0));
-
-        var json = await _client.GetStringAsync("/gerbils");
-        var root = JsonDocument.Parse(json).RootElement;
-        var items = root.GetProperty("items").EnumerateArray().ToList();
-        var gerbil = items.FirstOrDefault(x => GetStr(x, "id") == id.ToString());
-        Assert.NotEqual(default, gerbil);
-        Assert.Equal("/photos/files/list-photo.jpg", GetStr(gerbil, "profilePhotoUrl"));
-    }
-}
--- a/GerbilManagerWebAPI/Dtos/ApiDtos.cs
+++ b/GerbilManagerWebAPI/Dtos/ApiDtos.cs
@@ -29,8 +29,7 @@ namespace GerbilManagerWebAPI.Dtos
        List<string> CharacterTraits,
        string? CharacterNote,
        bool? IsDeaf,
-        bool IsResident,
-        string? ProfilePhotoUrl);
+        bool IsResident);

    public record LitterDto(
        Guid Id,
--- a/GerbilManagerWebAPI/Endpoints/GerbilEndpoints.cs
+++ b/GerbilManagerWebAPI/Endpoints/GerbilEndpoints.cs
@@ -2,7 +2,6 @@ using GerbilManagerWebAPI.Common;
 using GerbilManagerWebAPI.Dtos;
 using GerbilManagerWebAPI.Models;
 using Gridify;
-using Gridify.EntityFramework;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -17,21 +16,8 @@ namespace GerbilManagerWebAPI.Endpoints

            // GET /gerbils  (Gridify: filter/order/page; e.g. status==Active, litterId==…, orderBy=name)
            group.MapGet("/", async ([AsParameters] GridifyParams query, ApplicationContext db) =>
-            {
-                var q = query.ToQuery();
-                var paging = await db.Gerbils.AsNoTracking().GridifyAsync(q);
-                var ids = paging.Data.Select(g => g.Id).ToList();
-                var photoMap = ids.Count == 0 ? new Dictionary<Guid, string>() :
-                    await db.GerbilPhotos.AsNoTracking()
-                        .Where(p => ids.Contains(p.GerbilId))
-                        .GroupBy(p => p.GerbilId)
-                        .Select(g => new { GerbilId = g.Key, FileName = g.OrderBy(p => p.SortOrder).First().FileName })
-                        .ToDictionaryAsync(x => x.GerbilId, x => x.FileName);
-                var items = paging.Data
-                    .Select(g => ToDto(g, photoMap.TryGetValue(g.Id, out var fn) ? $"/photos/files/{fn}" : null))
-                    .ToList();
-                return TypedResults.Ok(new PagedResult<GerbilDto>(items, paging.Count, q.Page, q.PageSize));
-            });
+                TypedResults.Ok(await db.Gerbils.AsNoTracking()
+                    .ToPagedResultAsync(query, ToDto)));

            // GET /gerbils/breeders — distinct non-empty Herkunft values for the Tiere filter dropdown
            group.MapGet("/breeders", async (ApplicationContext db) =>
@@ -44,14 +30,7 @@ namespace GerbilManagerWebAPI.Endpoints
            group.MapGet("/{id:guid}", async Task<Results<Ok<GerbilDto>, NotFound>> (Guid id, ApplicationContext db) =>
            {
                var g = await db.Gerbils.AsNoTracking().FirstOrDefaultAsync(x => x.Id == id);
-                if (g is null) return TypedResults.NotFound();
-                var photoFileName = await db.GerbilPhotos.AsNoTracking()
-                    .Where(p => p.GerbilId == id)
-                    .OrderBy(p => p.SortOrder)
-                    .Select(p => p.FileName)
-                    .FirstOrDefaultAsync();
-                var profilePhotoUrl = photoFileName != null ? $"/photos/files/{photoFileName}" : null;
-                return TypedResults.Ok(ToDto(g, profilePhotoUrl));
+                return g is null ? TypedResults.NotFound() : TypedResults.Ok(ToDto(g));
            });

            // POST /gerbils
@@ -128,10 +107,10 @@ namespace GerbilManagerWebAPI.Endpoints
            g.IsResident = i.IsResident ?? (isCreate ? true : g.IsResident);
        }

-        internal static GerbilDto ToDto(Gerbil g, string? profilePhotoUrl = null) => new(
+        internal static GerbilDto ToDto(Gerbil g) => new(
            g.Id, g.Name, g.Gender, g.Status, g.LitterId, g.OriginContactId, g.ReceiverContactId,
            g.EnclosureId, g.ColorVarietyId, g.DateOfBirth, g.DateOfDeath, g.CauseOfDeath,
            g.GoHomeDate, g.Genotype, g.Notes, g.ImportSource, g.ExternalRef, g.OriginBreeder,
-            g.CharacterTraits, g.CharacterNote, g.IsDeaf, g.IsResident, profilePhotoUrl);
+            g.CharacterTraits, g.CharacterNote, g.IsDeaf, g.IsResident);
    }
 }
--- a/gerbil-manager-web/e2e/mock-data.ts
+++ b/gerbil-manager-web/e2e/mock-data.ts
@@ -91,7 +91,7 @@ function gerbil(
    id,
    name,
    gender,
-    status: 'Active',
+    status: 'Breeding',
    dateOfBirth,
    dateOfDeath: null,
    causeOfDeath: null,
@@ -108,7 +108,6 @@ function gerbil(
    notes: null,
    // BESTAND-FILTER: default = eigener Bestand; einzelne externe Ahnen unten gesetzt.
    isResident: true,
-    profilePhotoUrl: null,
  }
 }

@@ -121,7 +120,7 @@ export function seedDb(): MockDb {
      originContactId: 'con-meier',
      originBreeder: 'Clan-Kleine-Chaoten',
    },
-    { ...gerbil('fridolin', 'Fridolin', 'male', '2023-05-01', 'w-fridolin', 'cv-schwarz', 'aa CC DD EE GG PP spsp rere'), enclosureId: 'enc-gross', originBreeder: 'Zoohandlung Meier', profilePhotoUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==' },
+    { ...gerbil('fridolin', 'Fridolin', 'male', '2023-05-01', 'w-fridolin', 'cv-schwarz', 'aa CC DD EE GG PP spsp rere'), enclosureId: 'enc-gross', originBreeder: 'Zoohandlung Meier' },
    gerbil('luna', 'Luna', 'female', '2023-08-15', 'w-luna', 'cv-gold', 'AA CC DD EE GG pp spsp rere'),
    gerbil('balu', 'Balu', 'male', '2021-04-20', 'w-balu', 'cv-agouti'),
    gerbil('maja', 'Maja', 'female', '2021-06-11', null, 'cv-schwarz-schecke', 'aa CC DD EE GG PP Spsp rere'),
--- a/gerbil-manager-web/e2e/stammbaum.spec.ts
+++ b/gerbil-manager-web/e2e/stammbaum.spec.ts
@@ -154,20 +154,3 @@ test('Gencode-Chip zeigt Genotyp statt Farbname (STAMMBAUM-GENCODE)', async ({ p
  const fridolinCard = page.locator('.pedigree-card').filter({ hasText: 'Fridolin' })
  await expect(fridolinCard.locator('.pedigree-chip')).toContainText('aa CC')
 })
-
-test('Tier mit Foto zeigt Avatar-Bild, Tier ohne Foto zeigt Rennmaus-Icon (STAMMBAUM-AVATAR)', async ({ page }) => {
-  skipUnlessMock()
-  // Fridolin hat profilePhotoUrl (data URI) → <img.pedigree-card__avatar> sichtbar
-  // Krümel hat profilePhotoUrl=null → kein img, SVG-Icon sichtbar
-  await page.goto('/rennmaeuse/kruemel/stammbaum')
-  await expect(page.locator('.pedigree-card').first()).toBeVisible()
-
-  // Fridolin ist Vater von Krümel → seine Karte enthält ein <img>
-  const fridolinCard = page.locator('.pedigree-card').filter({ hasText: 'Fridolin' })
-  await expect(fridolinCard.locator('img.pedigree-card__avatar')).toBeVisible()
-
-  // Krümel (root) hat kein Foto → SVG-Icon im Foto-Slot
-  const rootCard = page.locator('.pedigree-card.pedigree-card--root')
-  await expect(rootCard.locator('img.pedigree-card__avatar')).not.toBeAttached()
-  await expect(rootCard.locator('svg[role="img"]')).toBeVisible()
-})
--- a/gerbil-manager-web/e2e/status-model.spec.ts
+++ b/gerbil-manager-web/e2e/status-model.spec.ts
@@ -0,0 +1,58 @@
+/** STATUS-MODEL: Zucht/Liebhaber wählbar; Verstorben/Abgegeben abgeleitet (read-only). */
+import { de, expect, skipUnlessMock, test, uniqueName } from './fixtures'
+
+const t = de.pages.gerbils
+
+test('Tier-Formular zeigt nur wählbare Statuswerte im Dropdown', async ({ page }) => {
+  skipUnlessMock()
+  await page.goto('/rennmaeuse/neu')
+  const statusField = page.locator('label.field', {
+    has: page.locator(`span:text-is("${t.fields.status}")`),
+  })
+  // Zucht (Breeding) ist vorausgewählt
+  await expect(statusField.locator('select')).toHaveValue('Breeding')
+  // Optionen: nur Zucht, Liebhaber, Abzugeben (NICHT Verstorben/Abgegeben)
+  const opts = statusField.locator('select option')
+  await expect(opts.filter({ hasText: t.statusLabels.Breeding })).toHaveCount(1)
+  await expect(opts.filter({ hasText: t.statusLabels.Pet })).toHaveCount(1)
+  await expect(opts.filter({ hasText: t.statusLabels.ForSale })).toHaveCount(1)
+  await expect(opts.filter({ hasText: t.statusLabels.Deceased })).toHaveCount(0)
+  await expect(opts.filter({ hasText: t.statusLabels.GivenAway })).toHaveCount(0)
+})
+
+test('Tier-Formular zeigt abgeleiteten Status Verstorben als Text + Hinweis', async ({ page }) => {
+  skipUnlessMock()
+  // Willi ist Deceased
+  await page.goto('/rennmaeuse/willi/bearbeiten')
+  // Status-Select ist NICHT vorhanden (abgeleitet)
+  const statusField = page.locator('.field', {
+    has: page.locator(`span:text-is("${t.fields.status}")`),
+  })
+  await expect(statusField).toBeVisible()
+  await expect(statusField.locator('select')).toHaveCount(0)
+  await expect(statusField).toContainText(t.statusLabels.Deceased)
+  await expect(statusField).toContainText(t.form.statusDerivedHint.Deceased)
+})
+
+test('Tiere-Liste zeigt Zucht als Standard-Status-Filter', async ({ page }) => {
+  skipUnlessMock()
+  await page.goto('/rennmaeuse')
+  const statusSelect = page
+    .locator('label.field', { has: page.locator(`span:text-is("${t.filters.status}")`) })
+    .locator('select')
+  await expect(statusSelect).toHaveValue('Breeding')
+})
+
+test('Neues Tier anlegen mit Status Liebhaber', async ({ page }) => {
+  skipUnlessMock()
+  const name = uniqueName('Tier')
+  await page.goto('/rennmaeuse/neu')
+  await page.getByLabel(`${t.fields.name} *`).fill(name)
+  await page.getByLabel(`${t.fields.gender} *`).selectOption({ label: t.genderLabels.male })
+  const statusField = page.locator('label.field', {
+    has: page.locator(`span:text-is("${t.fields.status}")`),
+  })
+  await statusField.locator('select').selectOption({ label: t.statusLabels.Pet })
+  await page.getByRole('button', { name: t.form.save, exact: true }).click()
+  await expect(page.getByRole('heading', { name })).toBeVisible()
+})
--- a/gerbil-manager-web/src/api/types.ts
+++ b/gerbil-manager-web/src/api/types.ts
@@ -10,9 +10,11 @@
 export type Gender = 'unknown' | 'male' | 'female'
 export const GENDERS: Gender[] = ['unknown', 'male', 'female']

-/** Gerbil.Status — C# enum { Active, Deceased, GivenAway, ForSale }. */
-export type GerbilStatus = 'Active' | 'Deceased' | 'GivenAway' | 'ForSale'
-export const GERBIL_STATUSES: GerbilStatus[] = ['Active', 'ForSale', 'Deceased', 'GivenAway']
+/** Gerbil.Status — C# enum { Breeding, Pet, Deceased, GivenAway, ForSale }. STATUS-MODEL: Active→Breeding (gated on Pam feature/status-model). */
+export type GerbilStatus = 'Breeding' | 'Pet' | 'Deceased' | 'GivenAway' | 'ForSale'
+export const GERBIL_STATUSES: GerbilStatus[] = ['Breeding', 'Pet', 'ForSale', 'Deceased', 'GivenAway']
+/** Statuses the user can pick freely in the form; Deceased+GivenAway are derived by the backend. */
+export const SELECTABLE_STATUSES: GerbilStatus[] = ['Breeding', 'Pet', 'ForSale']

 /** ISO date string "YYYY-MM-DD" (maps to C# DateOnly). */
 export type DateOnlyString = string
@@ -56,8 +58,6 @@ export interface Gerbil {
  isResident?: boolean
  /** FORM-FIELDS-1: true=gehörlos, false=hörend, null=unbekannt. */
  isDeaf?: boolean | null
-  /** STAMMBAUM-AVATAR: URL des Profilfotos (erstes Foto nach sortOrder); null = kein Foto. API-relativ oder absolut. */
-  profilePhotoUrl?: string | null
 }

 /** Payload for POST /gerbils. */
--- a/gerbil-manager-web/src/pages/GerbilFormPage.tsx
+++ b/gerbil-manager-web/src/pages/GerbilFormPage.tsx
@@ -3,7 +3,7 @@ import { Link, useNavigate, useParams, useSearchParams } from 'react-router-dom'
 import { de } from '../strings/de'
 import { createGerbil, getGerbil, updateGerbil } from '../api/gerbils'
 import { listColorVarieties, listContacts, listEnclosures, listLitters } from '../api/lookups'
-import { GENDERS, GERBIL_STATUSES, type CreateGerbil, type Gender, type GerbilStatus } from '../api/types'
+import { GENDERS, SELECTABLE_STATUSES, type CreateGerbil, type Gender, type GerbilStatus } from '../api/types'
 import { useApi, useMutation } from '../hooks/useApi'
 import { genderLabel, statusLabel } from '../format/labels'
 import { fromDisplayString, genotypeToFarbschlag, UNKNOWN_FARBSCHLAG } from '../genetics'
@@ -34,7 +34,7 @@ interface FormState {
 const EMPTY: FormState = {
  name: '',
  gender: '',
-  status: 'Active',
+  status: 'Breeding',
  dateOfBirth: '',
  dateOfDeath: '',
  causeOfDeath: '',
@@ -245,16 +245,29 @@ export default function GerbilFormPage() {
          {errors.gender && <small className="error-text">{errors.gender}</small>}
        </label>

-        <label className="field">
-          <span>{t.fields.status}</span>
-          <select value={form.status} onChange={(e) => set('status', e.target.value as GerbilStatus)}>
-            {GERBIL_STATUSES.map((s) => (
-              <option key={s} value={s}>
-                {statusLabel(s)}
-              </option>
-            ))}
-          </select>
-        </label>
+        {/* STATUS-MODEL: Deceased/GivenAway are derived by the backend — show as read-only with hint */}
+        {form.status === 'Deceased' || form.status === 'GivenAway' ? (
+          <div className="field">
+            <span>{t.fields.status}</span>
+            <span className="muted">
+              {statusLabel(form.status)}
+              <small className="muted" style={{ marginLeft: '0.5rem' }}>
+                ({t.form.statusDerivedHint[form.status]})
+              </small>
+            </span>
+          </div>
+        ) : (
+          <label className="field">
+            <span>{t.fields.status}</span>
+            <select value={form.status} onChange={(e) => set('status', e.target.value as GerbilStatus)}>
+              {SELECTABLE_STATUSES.map((s) => (
+                <option key={s} value={s}>
+                  {statusLabel(s)}
+                </option>
+              ))}
+            </select>
+          </label>
+        )}

        <label className="field">
          <span>{t.fields.dateOfBirth}</span>
--- a/gerbil-manager-web/src/pages/GerbilsPage.tsx
+++ b/gerbil-manager-web/src/pages/GerbilsPage.tsx
@@ -29,7 +29,7 @@ const SORT_ORDER_BY: Record<SortKey, string> = {
 export default function GerbilsPage() {
  const t = de.pages.gerbils
  const [search, setSearch] = useState('')
-  const [status, setStatus] = useState<GerbilStatus | ''>('Active')
+  const [status, setStatus] = useState<GerbilStatus | ''>('Breeding')
  const [gender, setGender] = useState<Gender | ''>('')
  const [colorVarietyId, setColorVarietyId] = useState('')
  const [originBreeder, setOriginBreeder] = useState('')
@@ -64,7 +64,7 @@ export default function GerbilsPage() {

  const resetFilters = () => {
    setSearch('')
-    setStatus('Active')
+    setStatus('Breeding')
    setGender('')
    setColorVarietyId('')
    setOriginBreeder('')
@@ -85,7 +85,7 @@ export default function GerbilsPage() {

  // UX-MOBILE-1: count non-default filter values for the badge.
  const activeFilterCount =
-    (status !== 'Active' ? 1 : 0) +
+    (status !== 'Breeding' ? 1 : 0) +
    (gender !== '' ? 1 : 0) +
    (colorVarietyId !== '' ? 1 : 0) +
    (originBreeder !== '' ? 1 : 0) +
--- a/gerbil-manager-web/src/pages/StammbaumPage.tsx
+++ b/gerbil-manager-web/src/pages/StammbaumPage.tsx
@@ -21,7 +21,7 @@ import { Link, useNavigate, useParams } from 'react-router-dom'
 import Tree from 'react-d3-tree'
 import type { CustomNodeElementProps, Point, RawNodeDatum } from 'react-d3-tree'
 import { de } from '../strings/de'
-import { API_BASE_URL, ApiError } from '../api/client'
+import { ApiError } from '../api/client'
 import { listLitters } from '../api/litters'
 import { listColorVarieties } from '../api/lookups'
 import { getInbreedingCoefficient } from '../api/pedigree'
@@ -381,14 +381,6 @@ function PedigreeCard({
  const g = node.gerbil
  const chip = farbschlag ? chipColorFor(farbschlag) : null
  const dob = g.dateOfBirth ? formatDate(g.dateOfBirth) : null
-  const [imgError, setImgError] = useState(false)
-  useEffect(() => setImgError(false), [g.id])
-  const photoUrl =
-    !imgError && g.profilePhotoUrl
-      ? /^(https?:|data:|\/\/)/.test(g.profilePhotoUrl)
-        ? g.profilePhotoUrl
-        : `${API_BASE_URL}${g.profilePhotoUrl}`
-      : null
  return (
    <div
      className={isRoot ? 'pedigree-card pedigree-card--root' : 'pedigree-card'}
@@ -396,17 +388,9 @@ function PedigreeCard({
      role={isRoot ? undefined : 'button'}
      title={isRoot ? undefined : t.tapHint}
    >
-      <div className="pedigree-card__photo" aria-hidden={!photoUrl || undefined}>
-        {photoUrl ? (
-          <img
-            src={photoUrl}
-            alt={g.name || ''}
-            className="pedigree-card__avatar"
-            onError={() => setImgError(true)}
-          />
-        ) : (
-          <GerbilIcon size="1.6rem" aria-hidden="true" />
-        )}
+      {/* Foto-Platzhalter — echte Fotos kommen mit FEAT-6. */}
+      <div className="pedigree-card__photo" aria-hidden="true">
+        <GerbilIcon size="1.6rem" />
      </div>
      <div className="pedigree-card__body">
        <div className="pedigree-card__name">
--- a/gerbil-manager-web/src/pages/stammbaum.css
+++ b/gerbil-manager-web/src/pages/stammbaum.css
@@ -236,7 +236,6 @@
  width: 42px;
  height: 42px;
  border-radius: 50%;
-  overflow: hidden;
  background: var(--color-accent-soft);
  display: flex;
  align-items: center;
@@ -244,13 +243,6 @@
  font-size: 1.4rem;
 }

-.pedigree-card__avatar {
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-  display: block;
-}
-
 .pedigree-card__body {
  min-width: 0;
  display: flex;
--- a/gerbil-manager-web/src/pedigree/tests/build.test.ts
+++ b/gerbil-manager-web/src/pedigree/tests/build.test.ts
@@ -22,7 +22,7 @@ function makeGerbil(id: string, name: string, litterId: string | null = null): G
    id,
    name,
    gender: 'unknown',
-    status: 'Active',
+    status: 'Breeding',
    dateOfBirth: null,
    dateOfDeath: null,
    causeOfDeath: null,
--- a/gerbil-manager-web/src/statistics/tests/aggregate.test.ts
+++ b/gerbil-manager-web/src/statistics/tests/aggregate.test.ts
@@ -27,7 +27,7 @@ function makeGerbil(over: Partial<Gerbil> & { id: string }): Gerbil {
  return {
    name: over.id,
    gender: 'unknown',
-    status: 'Active' as GerbilStatus,
+    status: 'Breeding' as GerbilStatus,
    dateOfBirth: null,
    dateOfDeath: null,
    causeOfDeath: null,
--- a/gerbil-manager-web/src/statistics/aggregate.ts
+++ b/gerbil-manager-web/src/statistics/aggregate.ts
@@ -83,7 +83,7 @@ export function farbschlagDistribution(
 ): NameCount[] {
  const byName = new Map<string | null, number>()
  for (const g of gerbils) {
-    if (g.status !== 'Active') continue
+    if (g.status !== 'Breeding' && g.status !== 'Pet') continue
    const name = resolveName(g)
    byName.set(name, (byName.get(name) ?? 0) + 1)
  }
--- a/gerbil-manager-web/src/strings/de.ts
+++ b/gerbil-manager-web/src/strings/de.ts
@@ -124,6 +124,11 @@ export const de = {
        isDeafUnknown: 'Unbekannt',
        isDeafYes: 'Ja',
        isDeafNo: 'Nein',
+        // STATUS-MODEL: Hinweis für abgeleitete Statuswerte
+        statusDerivedHint: {
+          Deceased: 'Wird automatisch gesetzt wenn Todesdatum erfasst.',
+          GivenAway: 'Wird automatisch gesetzt nach Abgabe.',
+        },
        save: 'Speichern',
        cancel: 'Abbrechen',
        saving: 'Speichern …',
@@ -141,8 +146,10 @@ export const de = {
        male: 'Männlich',
        female: 'Weiblich',
      },
+      // STATUS-MODEL: Breeding/Pet ersetzen Active; Deceased+GivenAway = abgeleitet (Backend)
      statusLabels: {
-        Active: 'Aktiv',
+        Breeding: 'Zucht',
+        Pet: 'Liebhaber',
        Deceased: 'Verstorben',
        GivenAway: 'Abgegeben',
        ForSale: 'Zur Abgabe',