Merge feature/litter-juvenile-details (LITTER-JUVENILE-DETAILS): pro Jungtier Farbschlag/Abgabedatum/Abnehmer/Todestag/Ursache im Wurf-Detail

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

@@ -0,0 +1,30 @@
+/** 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

@@ -1,46 +0,0 @@
-/** 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,12 +151,25 @@ 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', deathsWithin8Weeks: 1 },
+    { id: 'w-kruemel', name: 'Wurf K', date: '2025-03-12', totalBorn: 5, expectedGoHomeDate: '2025-04-16', notes: null, fatherId: 'fridolin', motherId: 'luna' },
     { 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,8 +122,6 @@ 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. */
@@ -135,7 +133,6 @@ 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,13 +1,14 @@
-import { useMemo } from 'react'
+import { useCallback, 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 } from '../format/labels'
+import { formatDate, genderLabel } from '../format/labels'
 import { isValidGenotype } from '../format/genotypeText'
-import { breed, fromDisplayString, type BreedingResult } from '../genetics'
+import { breed, fromDisplayString, genotypeToFarbschlag, UNKNOWN_FARBSCHLAG, type BreedingResult } from '../genetics'
 import BreedingResultView from '../components/BreedingResultView'
 
 export default function WurfDetailPage() {
@@ -43,6 +44,38 @@ 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 (
@@ -92,12 +125,6 @@ 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>
@@ -123,14 +150,24 @@ 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) => (
-            <li key={g.id}>
-              <Link to={`/rennmaeuse/${g.id}`} className="gerbil-card">
-                <span className="gerbil-card__name">{g.name}</span>
-                <span className="gerbil-card__meta">{de.pages.gerbils.genderLabels[g.gender]}</span>
-              </Link>
-            </li>
-          ))}
+          {(juveniles.data?.items ?? []).map((g) => {
+            const farbe = farbschlagOf(g)
+            const receiver = g.receiverContactId ? contactNameById.get(g.receiverContactId) : null
+            const tJf = t.detail.juvenileFields
+            return (
+              <li key={g.id}>
+                <Link to={`/rennmaeuse/${g.id}`} className="gerbil-card">
+                  <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,7 +16,6 @@ interface FormState {
   motherId: string
   motherName: string
   totalBorn: string
-  deathsWithin8Weeks: string
   expectedGoHomeDate: string
   notes: string
 }
@@ -29,7 +28,6 @@ const EMPTY: FormState = {
   motherId: '',
   motherName: '',
   totalBorn: '',
-  deathsWithin8Weeks: '',
   expectedGoHomeDate: '',
   notes: '',
 }
@@ -77,7 +75,6 @@ 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 ?? '',
     })
@@ -112,14 +109,12 @@ 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),
     }
@@ -220,26 +215,6 @@ 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,7 +172,6 @@ export const de = {
         father: 'Vater',
         mother: 'Mutter',
         totalBorn: 'Wurfstärke',
-        deathsWithin8Weeks: 'In den ersten 8 Wochen verstorben',
         expectedGoHomeDate: 'Voraussichtliches Abgabedatum',
         notes: 'Notizen',
       },
@@ -190,6 +189,14 @@ 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: {
@@ -205,7 +212,6 @@ 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: {