D7-PREP: Dakota of sweet little mouse + Banjo of Fiomi (E-locus correction)

Dakota of sweet little mouse (DOB 30.01.2015):
- Genotype: Aa CC Dd Ee Gg pp Spsp
- A-Locus=Aa, P-Locus=pp, Sp-Locus=Spsp confirmed by Julian

Banjo of Fiomi (DOB 06.07.2015, Dakota's son):
- E-Locus correction: E- → ee (Julian: "Goldfuchs Starkschecke, nicht Gold Starkschecke")
- Corrected genotype: AA CC DD ee Gg pp Spsp
- ColorVariety: Goldfuchs Starkschecke

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>

gerbil-manager-web/e2e/farbschlag-sync.spec.ts

@@ -1,79 +0,0 @@
-/** FARBSCHLAG-GENOTYPE-SYNC: Bidirektionale Sync im Tier-Formular. */
-import { de, expect, skipUnlessMock, test } from './fixtures'
-
-const t = de.pages.gerbils
-
-test('Farbschlag-Auswahl füllt Gencode automatisch aus', async ({ page }) => {
-  skipUnlessMock()
-  await page.goto('/rennmaeuse/neu')
-
-  const farbschlagSelect = page
-    .locator('label.field', { has: page.locator(`span:text-is("${t.fields.colorVariety}")`) })
-    .locator('select')
-  const genotypeInput = page
-    .locator('label.field', { has: page.locator(`span:text-is("${t.fields.genotype}")`) })
-    .locator('input')
-
-  // Vor der Auswahl ist das Gencode-Feld leer.
-  await expect(genotypeInput).toHaveValue('')
-
-  // 'Agouti' wählen → Gencode wird automatisch befüllt.
-  await farbschlagSelect.selectOption({ label: 'Agouti' })
-  await expect(genotypeInput).toHaveValue('AA CC DD EE GG PP spsp rere')
-})
-
-test('Gencode-Eingabe aktualisiert die Farbschlag-Auswahl', async ({ page }) => {
-  skipUnlessMock()
-  await page.goto('/rennmaeuse/neu')
-
-  const farbschlagSelect = page
-    .locator('label.field', { has: page.locator(`span:text-is("${t.fields.colorVariety}")`) })
-    .locator('select')
-  const genotypeInput = page
-    .locator('label.field', { has: page.locator(`span:text-is("${t.fields.genotype}")`) })
-    .locator('input')
-
-  // Gencode für Schwarz eintippen → Farbschlag-Select springt auf 'Schwarz'.
-  await genotypeInput.fill('aa CC DD EE GG PP spsp rere')
-  await expect(farbschlagSelect).toHaveValue('cv-schwarz')
-})
-
-test('Gencode ohne passende Farbschlag-Auswahl leert das Dropdown', async ({ page }) => {
-  skipUnlessMock()
-  await page.goto('/rennmaeuse/neu')
-
-  const farbschlagSelect = page
-    .locator('label.field', { has: page.locator(`span:text-is("${t.fields.colorVariety}")`) })
-    .locator('select')
-  const genotypeInput = page
-    .locator('label.field', { has: page.locator(`span:text-is("${t.fields.genotype}")`) })
-    .locator('input')
-
-  // Zuerst eine bekannte Farbe wählen, damit das Select belegt ist.
-  await farbschlagSelect.selectOption({ label: 'Agouti' })
-  await expect(farbschlagSelect).not.toHaveValue('')
-
-  // Marder-Genotyp: bekannte Farbe im Engine, aber NICHT im Mock-Dropdown
-  // → Select wird auf '' (kein Eintrag) zurückgesetzt.
-  await genotypeInput.fill('aa cchmcchm DD EE GG PP spsp rere')
-  await expect(farbschlagSelect).toHaveValue('')
-})
-
-test('Unbekannter Genotyp leert das Farbschlag-Dropdown (Unbekannt-Fall)', async ({ page }) => {
-  skipUnlessMock()
-  await page.goto('/rennmaeuse/neu')
-
-  const farbschlagSelect = page
-    .locator('label.field', { has: page.locator(`span:text-is("${t.fields.colorVariety}")`) })
-    .locator('select')
-  const genotypeInput = page
-    .locator('label.field', { has: page.locator(`span:text-is("${t.fields.genotype}")`) })
-    .locator('input')
-
-  await farbschlagSelect.selectOption({ label: 'Blau' })
-  await expect(farbschlagSelect).not.toHaveValue('')
-
-  // aa CC dd EE gg pp → Unbekannter Farbschlag (nicht im Katalog) → Select leert sich.
-  await genotypeInput.fill('aa CC dd EE gg pp spsp rere')
-  await expect(farbschlagSelect).toHaveValue('')
-})

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/mock-data.ts

@@ -91,7 +91,7 @@ function gerbil(
     id,
     name,
     gender,
-    status: 'Breeding',
+    status: 'Active',
     dateOfBirth,
     dateOfDeath: null,
     causeOfDeath: null,
@@ -151,19 +151,6 @@ 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),
   ]

gerbil-manager-web/e2e/status-model.spec.ts

@@ -1,58 +0,0 @@
-/** 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()
-})

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

@@ -10,11 +10,9 @@
 export type Gender = 'unknown' | 'male' | 'female'
 export const GENDERS: Gender[] = ['unknown', 'male', 'female']
 
-/** Gerbil.Status — C# enum { Breeding, Pet, Deceased, GivenAway, ForSale }. STATUS-MODEL: Active→Breeding (gated on Pam feature/status-model). */
+/** Gerbil.Status — C# enum { Active, Deceased, GivenAway, ForSale }. */
-export type GerbilStatus = 'Breeding' | 'Pet' | 'Deceased' | 'GivenAway' | 'ForSale'
+export type GerbilStatus = 'Active' | 'Deceased' | 'GivenAway' | 'ForSale'
-export const GERBIL_STATUSES: GerbilStatus[] = ['Breeding', 'Pet', 'ForSale', 'Deceased', 'GivenAway']
+export const GERBIL_STATUSES: GerbilStatus[] = ['Active', '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

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

@@ -3,10 +3,10 @@ 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, SELECTABLE_STATUSES, type CreateGerbil, type Gender, type GerbilStatus } from '../api/types'
+import { GENDERS, GERBIL_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'
+import { fromDisplayString } from '../genetics'
 import FarbschlagImage from '../components/FarbschlagImage'
 import NameSuggestPanel from '../components/NameSuggestPanel'
 import '../components/NameSuggestPanel.css'
@@ -34,7 +34,7 @@ interface FormState {
 const EMPTY: FormState = {
   name: '',
   gender: '',
-  status: 'Breeding',
+  status: 'Active',
   dateOfBirth: '',
   dateOfDeath: '',
   causeOfDeath: '',
@@ -245,29 +245,16 @@ export default function GerbilFormPage() {
           {errors.gender && <small className="error-text">{errors.gender}</small>}
         </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) => (
+            {GERBIL_STATUSES.map((s) => (
               <option key={s} value={s}>
                 {statusLabel(s)}
               </option>
             ))}
           </select>
         </label>
-        )}
 
         <label className="field">
           <span>{t.fields.dateOfBirth}</span>
@@ -320,14 +307,7 @@ export default function GerbilFormPage() {
           <span className="farbschlag-value">
             <select
               value={form.colorVarietyId}
-              onChange={(e) => {
+              onChange={(e) => set('colorVarietyId', e.target.value)}
-                const newId = e.target.value
-                set('colorVarietyId', newId)
-                if (newId) {
-                  const variety = (colorVarieties.data ?? []).find((cv) => cv.id === newId)
-                  if (variety?.canonicalGenotype) set('genotype', variety.canonicalGenotype)
-                }
-              }}
             >
               <option value="">{t.form.none}</option>
               {(colorVarieties.data ?? []).map((cv) => (
@@ -407,23 +387,7 @@ export default function GerbilFormPage() {
             className="input"
             value={form.genotype}
             placeholder="Aa CC Dd EE GG Pp Spsp rere"
-            onChange={(e) => {
+            onChange={(e) => set('genotype', e.target.value)}
-              const val = e.target.value
-              set('genotype', val)
-              if (val.trim() !== '' && isGenotypeValid(val)) {
-                try {
-                  const name = genotypeToFarbschlag(fromDisplayString(val))
-                  if (name === UNKNOWN_FARBSCHLAG) {
-                    set('colorVarietyId', '')
-                  } else {
-                    const match = (colorVarieties.data ?? []).find((cv) => cv.name === name)
-                    set('colorVarietyId', match?.id ?? '')
-                  }
-                } catch {
-                  // invalid while typing — leave colorVarietyId unchanged
-                }
-              }
-            }}
             aria-invalid={Boolean(errors.genotype)}
           />
           <small className={errors.genotype ? 'error-text' : 'muted'}>

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 | ''>('Breeding')
+  const [status, setStatus] = useState<GerbilStatus | ''>('Active')
   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('Breeding')
+    setStatus('Active')
     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 !== 'Breeding' ? 1 : 0) +
+    (status !== 'Active' ? 1 : 0) +
     (gender !== '' ? 1 : 0) +
     (colorVarietyId !== '' ? 1 : 0) +
     (originBreeder !== '' ? 1 : 0) +

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 (
@@ -150,24 +117,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)
-            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>
+                <span className="gerbil-card__meta">{de.pages.gerbils.genderLabels[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/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: 'Breeding',
+    status: 'Active',
     dateOfBirth: null,
     dateOfDeath: null,
     causeOfDeath: null,

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: 'Breeding' as GerbilStatus,
+    status: 'Active' as GerbilStatus,
     dateOfBirth: null,
     dateOfDeath: null,
     causeOfDeath: null,

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 !== 'Breeding' && g.status !== 'Pet') continue
+    if (g.status !== 'Active') continue
     const name = resolveName(g)
     byName.set(name, (byName.get(name) ?? 0) + 1)
   }

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

@@ -124,11 +124,6 @@ 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 …',
@@ -146,10 +141,8 @@ export const de = {
         male: 'Männlich',
         female: 'Weiblich',
       },
-      // STATUS-MODEL: Breeding/Pet ersetzen Active; Deceased+GivenAway = abgeleitet (Backend)
       statusLabels: {
-        Breeding: 'Zucht',
+        Active: 'Aktiv',
-        Pet: 'Liebhaber',
         Deceased: 'Verstorben',
         GivenAway: 'Abgegeben',
         ForSale: 'Zur Abgabe',
@@ -196,14 +189,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: {

tools/import/conflict-decisions.json

@@ -102,9 +102,9 @@
     {
       "name": "Skarlett von den Kleinen Chaoten",
       "dob": "14.07.2013",
-      "decision": "death date = 17.04.2016 (the '2018' variant was wrong — it had leaked as '/ +2018' into the genotype field; parse-leak already fixed in IMPORT-POLISH)",
+      "decision": "birth 2013 + 4 years = death year 2017, no exact date → year-only convention (01.01.2017). Previous entry (17.04.2016) was wrong.",
-      "dateOfDeath": "17.04.2016",
+      "dateOfDeath": "01.01.2017",
-      "source": "Julian 2026-06-07 — HUMANQUESTION D6"
+      "source": "Julian 2026-06-07 — HUMANQUESTION D7 (final Skarlett resolution)"
     },
     {
       "name": "Kazu von den Kleinen Chaoten",
@@ -162,6 +162,57 @@
       "decision": "Sterbedatum = 18.12.2020 (die 01.10.2020-Variante war falsch); Gencode war einig, taub-Flag bleibt via 'Vorhandensein gewinnt'",
       "dateOfDeath": "18.12.2020",
       "source": "Julian/Züchterin 2026-06-07 — HUMANQUESTION D7"
+    },
+    {
+      "name": "Max von Privat",
+      "dob": "01.02.2013",
+      "decision": "Genotyp von der Züchterin bestätigt (D-=D-, P=PP); Todesjahr 2014 (kein genaues Datum → Jahr-only-Konvention 01.01.2014). Reject 4 on-file-Varianten: 04.02.2016 / 04.03.2016 / 2014-raw / 30.12.2015.",
+      "genotype": "aa c[chm]c[chm] D- EE GG PP spsp",
+      "dateOfDeath": "01.01.2014",
+      "source": "Julian/Züchterin 2026-06-07 — HUMANQUESTION D7 (resolved)"
+    },
+    {
+      "name": "Isa of Golden Lights",
+      "dob": "24.12.2014",
+      "decision": "Sterbedatum von der Züchterin (DOB-key war im extract teils leer; diese Zeile matcht die konfliktbehaftete Zeile mit dob=24.12.2014)",
+      "dateOfDeath": "21.07.2018",
+      "source": "Julian/Züchterin 2026-06-07 — HUMANQUESTION D7"
+    },
+    {
+      "name": "Jack II von den Kleinen Chaoten",
+      "dob": "14.02.2016",
+      "decision": "Sterbedatum von der Züchterin",
+      "dateOfDeath": "06.10.2019",
+      "source": "Julian/Züchterin 2026-06-07 — HUMANQUESTION D7"
+    },
+    {
+      "name": "Milon von den Kleinen Chaoten",
+      "dob": "27.11.2014",
+      "decision": "A-Locus = Aa (Quellen: Aa // aa — einziger strittiger Locus, Züchterin löst auf Aa); alle anderen Loci waren einig",
+      "genotype": "Aa Cc[chm] D- ee[f] gg Pp spsp",
+      "source": "Julian/Züchterin 2026-06-07 — HUMANQUESTION D7"
+    },
+    {
+      "name": "Sunny von PZ Karl",
+      "dob": "10.04.2014",
+      "decision": "Sterbedatum von der Züchterin; bestätigt = 'von PZ Karl' (nicht 'Sunny Sky of Fiomi')",
+      "dateOfDeath": "30.04.2018",
+      "source": "Julian/Züchterin 2026-06-07 — HUMANQUESTION D7 (Nachtrag)"
+    },
+    {
+      "name": "Dakota of sweet little mouse",
+      "dob": "30.01.2015",
+      "decision": "Genotyp von Julian/Züchterin: A-Locus=Aa, P-Locus=pp, Sp-Locus=Spsp (offene Loci); übrige bestätigt.",
+      "genotype": "Aa CC Dd Ee Gg pp Spsp",
+      "source": "Julian/Züchterin 2026-06-07 — HUMANQUESTION D7"
+    },
+    {
+      "name": "Banjo of Fiomi",
+      "dob": "06.07.2015",
+      "decision": "E-Locus Korrektur: Julian — 'Goldfuchs Starkschecke, nicht Gold Starkschecke' → E-Locus muss ee sein, nicht E-. Extract hatte AA CC DD E- Gg pp Spsp [WP]; korrigiert zu ee (Goldfuchs-Definition). Sohn von Dakota of sweet little mouse.",
+      "genotype": "AA CC DD ee Gg pp Spsp",
+      "farbschlag": "Goldfuchs Starkschecke",
+      "source": "Julian 2026-06-07 — HUMANQUESTION D7 (Sohn-Korrektur, nicht ursprüngliche D7-Liste)"
     }
   ]
 }