LITTER-MORTALITY-FE: deathsWithin8Weeks Feld im Wurf-Formular und -Detail (gated auf Pam BE)

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"));
-    }
-}

GerbilManagerWebAPI/Dtos/ApiDtos.cs

@@ -29,8 +29,7 @@ namespace GerbilManagerWebAPI.Dtos
         List<string> CharacterTraits,
         string? CharacterNote,
         bool? IsDeaf,
-        bool IsResident,
+        bool IsResident);
-        string? ProfilePhotoUrl);
 
     public record LitterDto(
         Guid Id,

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) =>
-            {
+                TypedResults.Ok(await db.Gerbils.AsNoTracking()
-                var q = query.ToQuery();
+                    .ToPagedResultAsync(query, ToDto)));
-                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));
-            });
 
             // 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();
+                return g is null ? TypedResults.NotFound() : TypedResults.Ok(ToDto(g));
-                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));
             });
 
             // 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);
     }
 }

gerbil-manager-web/e2e/juvenile-details.spec.ts

@@ -1,30 +0,0 @@
-/** LITTER-JUVENILE-DETAILS: Jungtier-Felder (Farbschlag/Abgabe/Verstorben) im Wurf-Detail. */
-import { de, expect, skipUnlessMock, test } from './fixtures'
-
-const t = de.pages.litters
-
-test('Jungtier-Liste zeigt Farbschlag, Abgabedatum, Abnehmer, Todesdatum und Todesursache', async ({
-  page,
-}) => {
-  skipUnlessMock()
-  await page.goto('/wuerfe/w-kruemel')
-  await expect(page.getByRole('heading', { name: 'Wurf K' })).toBeVisible()
-
-  // Krümel: Active, colorVarietyId cv-agouti → Farbschlag 'Agouti'
-  const kruemelCard = page.getByRole('link', { name: /Krümel/ })
-  await expect(kruemelCard).toBeVisible()
-  await expect(kruemelCard).toContainText(`${t.detail.juvenileFields.colorVariety}: Agouti`)
-
-  // Pippa: GivenAway, Gold, goHomeDate 2025-05-01, Abnehmer Familie Huber
-  const pippaCard = page.getByRole('link', { name: /Pippa/ })
-  await expect(pippaCard).toBeVisible()
-  await expect(pippaCard).toContainText(`${t.detail.juvenileFields.colorVariety}: Gold`)
-  await expect(pippaCard).toContainText(t.detail.juvenileFields.goHomeDate)
-  await expect(pippaCard).toContainText(`${t.detail.juvenileFields.receiver}: Familie Huber`)
-
-  // Benny: Deceased, no colorVarietyId, dateOfDeath + causeOfDeath
-  const bennyCard = page.getByRole('link', { name: /Benny/ })
-  await expect(bennyCard).toBeVisible()
-  await expect(bennyCard).toContainText(t.detail.juvenileFields.dateOfDeath)
-  await expect(bennyCard).toContainText(`${t.detail.juvenileFields.causeOfDeath}: Altersschwäche`)
-})

gerbil-manager-web/e2e/litter-mortality.spec.ts

@@ -0,0 +1,46 @@
+/** LITTER-MORTALITY: deathsWithin8Weeks im Wurf-Formular und -Detail. */
+import { de, expect, skipUnlessMock, test, uniqueName } from './fixtures'
+
+const t = de.pages.litters
+
+test('Wurf-Detail zeigt Frühverluste wenn gesetzt', async ({ page }) => {
+  skipUnlessMock()
+  await page.goto('/wuerfe/w-kruemel')
+  await expect(page.getByRole('heading', { name: 'Wurf K' })).toBeVisible()
+  // Frühverluste-Zeile im def-list: Label + Wert '1'
+  const mortalityRow = page.locator('.def-row', {
+    has: page.locator('dt', { hasText: t.fields.deathsWithin8Weeks }),
+  })
+  await expect(mortalityRow).toBeVisible()
+  await expect(mortalityRow.locator('dd')).toHaveText('1')
+})
+
+test('Wurf-Formular speichert Frühverluste und zeigt sie im Detail', async ({ page }) => {
+  skipUnlessMock()
+  const name = uniqueName('WurfM')
+  await page.goto('/wuerfe/neu')
+  await page.getByLabel(`${t.fields.name} *`).fill(name)
+  await page.getByLabel(`${t.fields.date} *`).fill('2026-01-10')
+
+  // Frühverluste eingeben
+  await page.getByLabel(t.fields.deathsWithin8Weeks).fill('2')
+  await expect(page.getByText(t.validation.deathsExceedTotalBorn)).not.toBeVisible()
+
+  await page.getByRole('button', { name: t.form.save, exact: true }).click()
+  await expect(page.getByRole('heading', { name })).toBeVisible()
+  // Frühverluste-Zeile im Detail
+  const mortalityRow = page.locator('.def-row', {
+    has: page.locator('dt', { hasText: t.fields.deathsWithin8Weeks }),
+  })
+  await expect(mortalityRow).toBeVisible()
+  await expect(mortalityRow.locator('dd')).toHaveText('2')
+})
+
+test('Frühverluste > Wurfstärke zeigt Warnmeldung', async ({ page }) => {
+  skipUnlessMock()
+  await page.goto('/wuerfe/neu')
+
+  await page.getByLabel(t.fields.totalBorn).fill('3')
+  await page.getByLabel(t.fields.deathsWithin8Weeks).fill('5')
+  await expect(page.getByText(t.validation.deathsExceedTotalBorn)).toBeVisible()
+})

gerbil-manager-web/e2e/mock-data.ts

@@ -151,25 +151,12 @@ export function seedDb(): MockDb {
       enclosureId: 'enc-leer',
       notes: 'neugieriger Entdecker',
     },
-    // LITTER-JUVENILE-DETAILS: Jungtiere für Wurf K mit Zusatzinfos.
-    {
-      ...gerbil('pup-abgabe', 'Pippa', 'female', '2025-03-12', 'w-kruemel', 'cv-gold'),
-      status: 'GivenAway' as const,
-      goHomeDate: '2025-05-01',
-      receiverContactId: 'con-huber',
-    },
-    {
-      ...gerbil('pup-verstorben', 'Benny', 'male', '2025-03-12', 'w-kruemel', null),
-      status: 'Deceased' as const,
-      dateOfDeath: '2025-04-15',
-      causeOfDeath: 'Altersschwäche',
-    },
     // UI-POLISH-1: Import-Stub ohne Namen — testet den '(ohne Namen)'-Platzhalter in Liste + Detail.
     gerbil('nameless-stub', '', 'male', '2023-01-01', null, null),
   ]
 
   const litters: Litter[] = [
-    { id: 'w-kruemel', name: 'Wurf K', date: '2025-03-12', totalBorn: 5, expectedGoHomeDate: '2025-04-16', notes: null, fatherId: 'fridolin', motherId: 'luna' },
+    { id: 'w-kruemel', name: 'Wurf K', date: '2025-03-12', totalBorn: 5, expectedGoHomeDate: '2025-04-16', notes: null, fatherId: 'fridolin', motherId: 'luna', deathsWithin8Weeks: 1 },
     { id: 'w-fridolin', name: 'Wurf F', date: '2023-05-01', totalBorn: 4, expectedGoHomeDate: null, notes: null, fatherId: 'balu', motherId: 'maja' },
     { id: 'w-luna', name: 'Wurf L', date: '2023-08-15', totalBorn: 6, expectedGoHomeDate: null, notes: null, fatherId: 'karlsson', motherId: 'smilla' },
     { id: 'w-balu', name: 'Wurf B', date: '2021-04-20', totalBorn: 3, expectedGoHomeDate: null, notes: null, fatherId: 'anton', motherId: 'greta' },

gerbil-manager-web/src/api/types.ts

@@ -122,6 +122,8 @@ export interface Litter {
   notes?: string | null
   fatherId: string | null
   motherId: string | null
+  /** LITTER-MORTALITY: pups that died within the first 8 weeks. */
+  deathsWithin8Weeks?: number | null
 }
 
 /** Payload for POST /litters. */
@@ -133,6 +135,7 @@ export interface CreateLitter {
   notes?: string | null
   fatherId?: string | null
   motherId?: string | null
+  deathsWithin8Weeks?: number | null
 }
 
 export type UpdateLitter = Partial<CreateLitter>

gerbil-manager-web/src/pages/WurfDetailPage.tsx

@@ -1,14 +1,13 @@
-import { useCallback, useMemo } from 'react'
+import { useMemo } from 'react'
 import { Link, useParams } from 'react-router-dom'
 import { de } from '../strings/de'
 import { getLitter } from '../api/litters'
 import { getGerbil, listGerbils } from '../api/gerbils'
-import { listColorVarieties, listContacts } from '../api/lookups'
 import { condition } from '../api/gridify'
 import { useApi } from '../hooks/useApi'
-import { formatDate, genderLabel } from '../format/labels'
+import { formatDate } from '../format/labels'
 import { isValidGenotype } from '../format/genotypeText'
-import { breed, fromDisplayString, genotypeToFarbschlag, UNKNOWN_FARBSCHLAG, type BreedingResult } from '../genetics'
+import { breed, fromDisplayString, type BreedingResult } from '../genetics'
 import BreedingResultView from '../components/BreedingResultView'
 
 export default function WurfDetailPage() {
@@ -44,38 +43,6 @@ export default function WurfDetailPage() {
     return breed(fromDisplayString(fg), fromDisplayString(mg))
   }, [father.data, mother.data])
 
-  // Farbschlag + Abnehmer lookups for the juvenile list.
-  const colorVarieties = useApi(() => listColorVarieties(), [])
-  const contacts = useApi(() => listContacts(), [])
-
-  const colorNameById = useMemo(
-    () => new Map((colorVarieties.data ?? []).map((c) => [c.id, c.name])),
-    [colorVarieties.data],
-  )
-  const contactNameById = useMemo(
-    () => new Map((contacts.data ?? []).map((c) => [c.id, c.name])),
-    [contacts.data],
-  )
-
-  const farbschlagOf = useCallback(
-    (g: { colorVarietyId: string | null; genotype: string | null }): string | null => {
-      if (g.colorVarietyId) {
-        const name = colorNameById.get(g.colorVarietyId)
-        if (name) return name
-      }
-      if (g.genotype?.trim()) {
-        try {
-          const name = genotypeToFarbschlag(fromDisplayString(g.genotype))
-          return name === UNKNOWN_FARBSCHLAG ? null : name
-        } catch {
-          return null
-        }
-      }
-      return null
-    },
-    [colorNameById],
-  )
-
   if (litter.loading) return <p className="muted">{de.common.loading}</p>
   if (litter.error || !litter.data) {
     return (
@@ -125,6 +92,12 @@ export default function WurfDetailPage() {
             {l.totalBorn != null ? ` / ${l.totalBorn}` : ''}
           </dd>
         </div>
+        {l.deathsWithin8Weeks != null && (
+          <div className="def-row">
+            <dt>{t.fields.deathsWithin8Weeks}</dt>
+            <dd>{l.deathsWithin8Weeks}</dd>
+          </div>
+        )}
         <div className="def-row">
           <dt>{t.fields.expectedGoHomeDate}</dt>
           <dd>{formatDate(l.expectedGoHomeDate)}</dd>
@@ -150,24 +123,14 @@ export default function WurfDetailPage() {
       {!juveniles.loading && registered === 0 && <p className="muted">{t.detail.noJuveniles}</p>}
       {registered > 0 && (
         <ul className="card-list">
-          {(juveniles.data?.items ?? []).map((g) => {
+          {(juveniles.data?.items ?? []).map((g) => (
-            const farbe = farbschlagOf(g)
+            <li key={g.id}>
-            const receiver = g.receiverContactId ? contactNameById.get(g.receiverContactId) : null
+              <Link to={`/rennmaeuse/${g.id}`} className="gerbil-card">
-            const tJf = t.detail.juvenileFields
+                <span className="gerbil-card__name">{g.name}</span>
-            return (
+                <span className="gerbil-card__meta">{de.pages.gerbils.genderLabels[g.gender]}</span>
-              <li key={g.id}>
+              </Link>
-                <Link to={`/rennmaeuse/${g.id}`} className="gerbil-card">
+            </li>
-                  <span className="gerbil-card__name">{g.name}</span>
+          ))}
-                  <span className="gerbil-card__meta">{genderLabel(g.gender)}</span>
-                  {farbe && <span className="gerbil-card__meta">{tJf.colorVariety}: {farbe}</span>}
-                  {g.goHomeDate && <span className="gerbil-card__meta">{tJf.goHomeDate}: {formatDate(g.goHomeDate)}</span>}
-                  {receiver && <span className="gerbil-card__meta">{tJf.receiver}: {receiver}</span>}
-                  {g.dateOfDeath && <span className="gerbil-card__meta">{tJf.dateOfDeath}: {formatDate(g.dateOfDeath)}</span>}
-                  {g.causeOfDeath && <span className="gerbil-card__meta">{tJf.causeOfDeath}: {g.causeOfDeath}</span>}
-                </Link>
-              </li>
-            )
-          })}
         </ul>
       )}
 

gerbil-manager-web/src/pages/WurfFormPage.tsx

@@ -16,6 +16,7 @@ interface FormState {
   motherId: string
   motherName: string
   totalBorn: string
+  deathsWithin8Weeks: string
   expectedGoHomeDate: string
   notes: string
 }
@@ -28,6 +29,7 @@ const EMPTY: FormState = {
   motherId: '',
   motherName: '',
   totalBorn: '',
+  deathsWithin8Weeks: '',
   expectedGoHomeDate: '',
   notes: '',
 }
@@ -75,6 +77,7 @@ export default function WurfFormPage() {
       motherId: l.motherId ?? '',
       motherName: l.motherId ? (nameById.get(l.motherId) || de.pages.gerbils.nameless) : '',
       totalBorn: l.totalBorn != null ? String(l.totalBorn) : '',
+      deathsWithin8Weeks: l.deathsWithin8Weeks != null ? String(l.deathsWithin8Weeks) : '',
       expectedGoHomeDate: l.expectedGoHomeDate ?? '',
       notes: l.notes ?? '',
     })
@@ -109,12 +112,14 @@ export default function WurfFormPage() {
     e.preventDefault()
     if (!validate()) return
     const totalBornNum = form.totalBorn.trim() === '' ? null : Number(form.totalBorn)
+    const deathsNum = form.deathsWithin8Weeks.trim() === '' ? null : Number(form.deathsWithin8Weeks)
     const body: CreateLitter = {
       name: form.name.trim(),
       date: form.date,
       fatherId: nn(form.fatherId),
       motherId: nn(form.motherId),
       totalBorn: totalBornNum != null && Number.isFinite(totalBornNum) ? totalBornNum : null,
+      deathsWithin8Weeks: deathsNum != null && Number.isFinite(deathsNum) ? deathsNum : null,
       expectedGoHomeDate: nn(form.expectedGoHomeDate),
       notes: nn(form.notes),
     }
@@ -215,6 +220,26 @@ export default function WurfFormPage() {
           />
         </label>
 
+        <label className="field">
+          <span>{t.fields.deathsWithin8Weeks}</span>
+          <input
+            type="number"
+            min="0"
+            className="input"
+            value={form.deathsWithin8Weeks}
+            onChange={(e) => set('deathsWithin8Weeks', e.target.value)}
+          />
+          {(() => {
+            const d = Number(form.deathsWithin8Weeks)
+            const tb = Number(form.totalBorn)
+            return form.deathsWithin8Weeks.trim() !== '' &&
+              form.totalBorn.trim() !== '' &&
+              d > tb ? (
+              <small className="error-text">{t.validation.deathsExceedTotalBorn}</small>
+            ) : null
+          })()}
+        </label>
+
         <label className="field">
           <span>{t.fields.expectedGoHomeDate}</span>
           <input

gerbil-manager-web/src/strings/de.ts

@@ -172,6 +172,7 @@ export const de = {
         father: 'Vater',
         mother: 'Mutter',
         totalBorn: 'Wurfstärke',
+        deathsWithin8Weeks: 'In den ersten 8 Wochen verstorben',
         expectedGoHomeDate: 'Voraussichtliches Abgabedatum',
         notes: 'Notizen',
       },
@@ -189,14 +190,6 @@ export const de = {
         edit: 'Bearbeiten',
         back: 'Zurück zur Liste',
         notFound: 'Dieser Wurf wurde nicht gefunden.',
-        // LITTER-JUVENILE-DETAILS: pro-Jungtier-Felder
-        juvenileFields: {
-          colorVariety: 'Farbschlag',
-          goHomeDate: 'Abgegeben',
-          receiver: 'Abnehmer',
-          dateOfDeath: 'Verstorben',
-          causeOfDeath: 'Todesursache',
-        },
       },
       // Formular
       form: {
@@ -212,6 +205,7 @@ export const de = {
         nameRequired: 'Bitte eine Bezeichnung eingeben.',
         dateRequired: 'Bitte ein Wurfdatum angeben.',
         invalidParentGender: 'Der Vater muss männlich und die Mutter weiblich sein.',
+        deathsExceedTotalBorn: 'Die Anzahl der Frühverluste darf die Wurfstärke nicht überschreiten.',
       },
       // Zuchtpaar-Übersicht
       pairs: {