CHARAKTERBOGEN-2 (E1): Trait-Katalog in 4 Kategorien + 10 neue Traits + Warnsignale

- de.ts: traits-Array -> traitCategories (4 Kategorien: Sozialverhalten / Eignung & Umgang / Hobbys & Eigenarten / Wesen & Temperament); alle 15 bestehenden Keys erhalten (stored auf Live-Tieren); 10 neue Keys additiv; warn:true auf schwer-vergesellschaftbar + territorial. - format/traits.ts: TraitEntry/TraitCategory-Interface, TRAIT_CATEGORIES-Export, ALL_TRAITS via flatMap, neuer isWarnTrait()-Helper. - Charakterbogen.tsx: grouped-Rendering nach Kategorie (section + h4); warn-Chips mit trait-chip--warn-Klasse + trait-warn-badge. - charakterbogen.css: .trait-category__heading + .trait-chip--warn (amber) + .trait-warn-badge. - format/__tests__/traits.test.ts: 14 neue Vitest-Tests (Kategorien, Keys, warn, traitLabel/traitLabels). - Gate: vitest 122/122, tsc clean, build clean, eslint clean.
2026-06-06 22:32:16 +02:00
10 changed files with 336 additions and 2249 deletions
--- a/GerbilManager.Tests/ImportServiceTests.cs
+++ b/GerbilManager.Tests/ImportServiceTests.cs
@@ -573,32 +573,27 @@ namespace GerbilManager.Tests
        [Fact]
        public void SeedGen3g_existing_varieties_preserve_id_name_binding()
        {
-            // CATALOG-RESEED regression: ID->Name bindings for all 66 existing entries must be
-            // stable. 4 new Dilute Fuchs varieties appended (IDs 67-70). CP-Fuchs (ID 58) and
-            // the CP-*-Hell entries (IDs 62-66) must survive with their original names intact.
-            using var db = NewDb();   // EnsureCreated applies HasData including 70-entry seed
+            // SEED-HELL bounce regression: the 61 existing entries must NOT change their
+            // Id->Name binding after GEN-3g. The 5 new entries (IDs 62-66) are appended.
+            // A hand-assigned Gerbil.ColorVarietyId pointing to "CP-Fuchs" (ID 58) must
+            // still map to CP-Fuchs after the migration runs (append-only, no rename-shift).
+            using var db = NewDb();   // EnsureCreated applies HasData including new 66-entry seed

-            // ID 58 = CP-Fuchs — must still be CP-Fuchs (no rename-shift from new entries)
+            // ID 58 (index 57 in old catalog, 0-based) = CP-Fuchs  — must still be CP-Fuchs
            var cpFuchsId = new Guid("00000000-0000-0000-0000-000000000058");
            var cpFuchs = db.ColorVarieties.Find(cpFuchsId);
            Assert.NotNull(cpFuchs);
            Assert.Equal("CP-Fuchs", cpFuchs!.Name);

-            // Existing CP-*-Hell entries (IDs 62-66) unchanged
+            // New entries at IDs 62-66 exist with correct names
            Assert.Equal("CP-Agouti-Hell",        db.ColorVarieties.Find(new Guid("00000000-0000-0000-0000-000000000062"))!.Name);
            Assert.Equal("CP-Silberagouti-Hell",   db.ColorVarieties.Find(new Guid("00000000-0000-0000-0000-000000000063"))!.Name);
            Assert.Equal("CP-Algierfuchs-Hell",    db.ColorVarieties.Find(new Guid("00000000-0000-0000-0000-000000000064"))!.Name);
            Assert.Equal("CP-Polarfuchs-Hell",     db.ColorVarieties.Find(new Guid("00000000-0000-0000-0000-000000000065"))!.Name);
            Assert.Equal("CP-Orangeschimmel-Hell", db.ColorVarieties.Find(new Guid("00000000-0000-0000-0000-000000000066"))!.Name);

-            // 4 new Dilute Fuchs varieties appended (IDs 67-70)
-            Assert.Equal("Dilute Algierfuchs", db.ColorVarieties.Find(new Guid("00000000-0000-0000-0000-000000000067"))!.Name);
-            Assert.Equal("Dilute Goldfuchs",   db.ColorVarieties.Find(new Guid("00000000-0000-0000-0000-000000000068"))!.Name);
-            Assert.Equal("Dilute Rotfuchs",    db.ColorVarieties.Find(new Guid("00000000-0000-0000-0000-000000000069"))!.Name);
-            Assert.Equal("Dilute Polarfuchs",  db.ColorVarieties.Find(new Guid("00000000-0000-0000-0000-000000000070"))!.Name);
-
-            // Total count is exactly 70
-            Assert.Equal(70, db.ColorVarieties.Count());
+            // Total count is exactly 66
+            Assert.Equal(66, db.ColorVarieties.Count());
        }

        [Theory]
--- a/GerbilManagerWebAPI/ApplicationContext.cs
+++ b/GerbilManagerWebAPI/ApplicationContext.cs
@@ -282,97 +282,79 @@ public class ApplicationContext : DbContext
    /// </summary>
    private static void SeedColorVarieties(ModelBuilder modelBuilder)
    {
-        // CATALOG-RESEED (AR-5 / colorVarietySeed.backend.json): 70 entries, frozen symbols.
-        // ID = array_index + 1 (stable, never changes — live FKs safe).
-        // SortOrder comes from colorVarietySeed.backend.json (decoupled from ID).
-        // New entries appended at end (IDs 67-70: Dilute Algierfuchs/Goldfuchs/Rotfuchs/Polarfuchs).
-        // GUARDRAIL: DO NOT reseed from colorVarietySeed.generated.json — it uses bracket display
-        // notation (e[f]/c[chm]) which breaks CR-11 GenotypePotentiallyMatches() (frozen vs brackets).
-        (string Name, string Genotype, int SortOrder)[] catalog =
+        // GEN-3g (Kevin): 5 CP-*-Hell variants appended at the end (IDs 62-66).
+        // Existing 61 entries are UNCHANGED (same ID->Name binding preserved).
+        // SortOrder for new entries is appended; Kevin's frontend catalog handles
+        // the interleaved display order via its own sortOrder values.
+        (string Name, string Genotype)[] catalog =
        {
-            // --- C-locus white / partial albino (IDs 1-3) ---
-            ("Pink Eyed White (PEW)", "AA chch DD EE GG pp spsp rere",  0),
-            ("Hermelin",              "aa chch DD EE GG PP spsp rere",  1),
-            ("Himalaya",              "AA chch DD EE GG PP spsp rere",  2),
-            // --- Zobel / colourpoint dark (ID 4) ---
-            ("Zobel", "aa cchmcchm DD EE gg PP spsp rere", 3),
-            // --- Schimmel family (IDs 5) ---
-            ("Rotaugenschimmel", "AA CC DD efef GG pp spsp rere", 4),
-            // --- Standard colours (IDs 6-15) ---
-            ("Agouti",      "AA CC DD EE GG PP spsp rere",  5),
-            ("Schwarz",     "aa CC DD EE GG PP spsp rere",  6),
-            ("Silberagouti","AA CC DD EE gg PP spsp rere",  7),
-            ("Anthrazit",   "aa CC DD EE gg PP spsp rere",  8),
-            ("Algierfuchs", "AA CC DD ee GG PP spsp rere",  9),
-            ("Blau",        "aa CC dd EE GG PP spsp rere", 10),
-            ("Gold",        "AA CC DD EE GG pp spsp rere", 11),
-            ("Platin",      "aa CC DD EE GG pp spsp rere", 12),
-            ("Goldfuchs",   "AA CC DD ee GG pp spsp rere", 13),
-            ("Rotfuchs",    "aa CC DD ee GG pp spsp rere", 14),
-            // --- Dilute (dd) standard (IDs 16-17) ---
-            ("Dilute Gold",  "AA CC dd EE GG pp spsp rere", 15),
-            ("Dilute Platin","aa CC dd EE GG pp spsp rere", 16),
-            // --- REW / Apricot / misc C-locus (IDs 18-28) ---
-            ("Altweiss (REW)",    "aa CC DD EE gg pp spsp rere", 17),
-            ("Apricot (Blassfuchs)","AA CC DD ee gg pp spsp rere", 18),
-            ("Blaufuchs",    "aa CC DD ee gg PP spsp rere", 19),
-            ("C-Separator",  "aa CC DD ee gg pp spsp rere", 20),
-            ("Elfenbein",    "AA CC DD EE gg pp spsp rere", 21),
-            ("Kohlfuchs",    "aa CC DD ee GG PP spsp rere", 22),
-            ("Polarfuchs",   "AA CC DD ee gg PP spsp rere", 23),
-            ("Saphir",       "aa CC DD EE GG pp spsp rere", 24),
-            ("Orangeschimmel","AA CC DD efef GG PP spsp rere", 25),
-            ("Topas",        "AA CC DD EE GG pp spsp rere", 26),
-            ("Platin-Hell",  "aa CC DD EE GG pp spsp rere", 27),
-            // --- Dilute (dd) varieties (IDs 29-32) ---
-            ("Dilute Agouti",      "AA CC dd EE GG PP spsp rere", 28),
-            ("Dilute Silberagouti","AA CC dd EE gg PP spsp rere", 29),
-            ("Dilute Kohlfuchs",   "aa CC dd ee GG PP spsp rere", 30),
-            ("Dilute Anthrazit",   "aa CC dd EE gg PP spsp rere", 31),
-            // --- Schimmel / Fuchsschimmel (IDs 33-37) ---
-            ("Silberschimmel",      "AA CC DD efef gg PP spsp rere", 36),
-            ("Polarfuchsschimmel",  "AA CC DD efef gg PP spsp rere", 37),
-            ("Algierfuchsschimmel", "AA CC DD efef GG PP spsp rere", 38),
-            ("Kohlfuchsschimmel",   "aa CC DD efef GG PP spsp rere", 39),
-            ("Blaufuchsschimmel",   "aa CC DD efef gg PP spsp rere", 40),
-            // --- Hell variants (IDs 38-48) ---
-            ("Kohlfuchs, hell",      "aa CC DD ee GG PP spsp rere", 41),
-            ("Goldfuchs, hell",      "AA CC DD ee GG pp spsp rere", 42),
-            ("Goldfuchsschimmel",    "AA CC DD efef GG pp spsp rere", 43),
-            ("Gold-Hell",            "AA CC DD EE GG pp spsp rere", 44),
-            ("Blaufuchs, hell",      "aa CC DD ee gg PP spsp rere", 45),
-            ("Rotfuchsschimmel",     "aa CC DD efef GG pp spsp rere", 46),
-            ("Polarfuchs, hell",     "AA CC DD ee gg PP spsp rere", 47),
-            ("Kohlfuchsschimmel, hell","aa CC DD efef GG PP spsp rere", 48),
-            ("Rotfuchs, hell",       "aa CC DD ee GG pp spsp rere", 49),
-            ("Kohlfuchs-Hell",       "aa CC DD ee GG PP spsp rere", 50),
-            ("Algierfuchs, hell",    "AA CC DD ee GG PP spsp rere", 51),
-            // --- Dilute (dd) renamed variants (IDs 49-50) ---
-            ("Dilute Topas",   "AA CC dd EE GG pp spsp rere", 52),
-            ("Dilute Blaufuchs","aa CC dd ee gg pp spsp rere", 53),
-            // --- Marder / Siam / CP- series (IDs 51-66) ---
-            ("Marder",    "aa cchmcchm DD EE GG PP spsp rere", 54),
-            ("Siam",      "aa cchmch DD EE GG PP spsp rere",   55),
-            ("Zobel-Hell","aa cchmch DD EE gg PP spsp rere",   56),
-            ("CP-Agouti",      "AA cchmcchm DD EE GG PP spsp rere", 57),
-            ("CP-Silberagouti","AA cchmcchm DD EE gg PP spsp rere", 59),
-            ("CP-Algierfuchs", "AA cchmcchm DD ee GG PP spsp rere", 61),
-            ("CP-Polarfuchs",  "AA cchmcchm DD ee gg PP spsp rere", 63),
-            ("CP-Fuchs",       "AA cchmcchm dd ee GG PP spsp rere", 65),
-            ("CP-Fuchs-Hell",  "AA cchmch dd ee GG PP spsp rere",   66),
-            ("CP-Blaufuchs",   "AA cchmcchm dd ee gg PP spsp rere", 67),
-            ("CP-Orangeschimmel","AA cchmcchm DD efef GG PP spsp rere", 68),
-            // GEN-3g / CATALOG-RESEED: CP-*-Hell interleaved (IDs 62-66, SortOrders from backend.json)
-            ("CP-Agouti-Hell",       "AA cchmch DD EE GG PP spsp rere",   58),
-            ("CP-Silberagouti-Hell", "AA cchmch DD EE gg PP spsp rere",   60),
-            ("CP-Algierfuchs-Hell",  "AA cchmch DD ee GG PP spsp rere",   62),
-            ("CP-Polarfuchs-Hell",   "AA cchmch DD ee gg PP spsp rere",   64),
-            ("CP-Orangeschimmel-Hell","AA cchmch DD efef GG PP spsp rere", 69),
-            // CATALOG-RESEED: 4 new Dilute (dd) Fuchs varieties appended (IDs 67-70)
-            ("Dilute Algierfuchs","AA CC dd ee GG PP spsp rere", 32),
-            ("Dilute Goldfuchs",  "AA CC dd ee GG pp spsp rere", 33),
-            ("Dilute Rotfuchs",   "aa CC dd ee GG pp spsp rere", 34),
-            ("Dilute Polarfuchs", "AA CC dd ee gg PP spsp rere", 35),
+            ("Pink Eyed White (PEW)", "AA chch DD EE GG pp spsp rere"),
+            ("Hermelin", "aa chch DD EE GG PP spsp rere"),
+            ("Himalaya", "AA chch DD EE GG PP spsp rere"),
+            ("Zobel", "aa cchmcchm DD EE gg PP spsp rere"),
+            ("Rotaugenschimmel", "AA CC DD efef GG pp spsp rere"),
+            ("Agouti", "AA CC DD EE GG PP spsp rere"),
+            ("Schwarz", "aa CC DD EE GG PP spsp rere"),
+            ("Silberagouti", "AA CC DD EE gg PP spsp rere"),
+            ("Anthrazit", "aa CC DD EE gg PP spsp rere"),
+            ("Algierfuchs", "AA CC DD ee GG PP spsp rere"),
+            ("Blau", "aa CC dd EE GG PP spsp rere"),
+            ("Gold", "AA CC DD EE GG pp spsp rere"),
+            ("Platin", "aa CC DD EE GG pp spsp rere"),
+            ("Goldfuchs", "AA CC DD ee GG pp spsp rere"),
+            ("Rotfuchs", "aa CC DD ee GG pp spsp rere"),
+            ("dd Gold", "AA CC dd EE GG pp spsp rere"),
+            ("dd Platin", "aa CC dd EE GG pp spsp rere"),
+            ("Altweiss (REW)", "aa CC DD EE gg pp spsp rere"),
+            ("Apricot (Blassfuchs)", "AA CC DD ee gg pp spsp rere"),
+            ("Blaufuchs", "aa CC DD ee gg PP spsp rere"),
+            ("C-Separator", "aa CC DD ee gg pp spsp rere"),
+            ("Elfenbein", "AA CC DD EE gg pp spsp rere"),
+            ("Kohlfuchs", "aa CC DD ee GG PP spsp rere"),
+            ("Polarfuchs", "AA CC DD ee gg PP spsp rere"),
+            ("Saphir", "aa CC DD EE GG pp spsp rere"),
+            ("Orangeschimmel", "AA CC DD efef GG PP spsp rere"),
+            ("Topas", "AA CC DD EE GG pp spsp rere"),
+            ("Platin-Hell", "aa CC DD EE GG pp spsp rere"),
+            ("Agouti dd", "AA CC dd EE GG PP spsp rere"),
+            ("Silberagouti dd", "AA CC dd EE gg PP spsp rere"),
+            ("Kohlfuchs dd", "aa CC dd ee GG PP spsp rere"),
+            ("Anthrazit dd", "aa CC dd EE gg PP spsp rere"),
+            ("Silberschimmel", "AA CC DD efef gg PP spsp rere"),
+            ("Polarfuchsschimmel", "AA CC DD efef gg PP spsp rere"),
+            ("Algierfuchsschimmel", "AA CC DD efef GG PP spsp rere"),
+            ("Kohlfuchsschimmel", "aa CC DD efef GG PP spsp rere"),
+            ("Blaufuchsschimmel", "aa CC DD efef gg PP spsp rere"),
+            ("Kohlfuchs, hell", "aa CC DD ee GG PP spsp rere"),
+            ("Goldfuchs, hell", "AA CC DD ee GG pp spsp rere"),
+            ("Goldfuchsschimmel", "AA CC DD efef GG pp spsp rere"),
+            ("Gold-Hell", "AA CC DD EE GG pp spsp rere"),
+            ("Blaufuchs, hell", "aa CC DD ee gg PP spsp rere"),
+            ("Rotfuchsschimmel", "aa CC DD efef GG pp spsp rere"),
+            ("Polarfuchs, hell", "AA CC DD ee gg PP spsp rere"),
+            ("Kohlfuchsschimmel, hell", "aa CC DD efef GG PP spsp rere"),
+            ("Rotfuchs, hell", "aa CC DD ee GG pp spsp rere"),
+            ("Kohlfuchs-Hell", "aa CC DD ee GG PP spsp rere"),
+            ("Algierfuchs, hell", "AA CC DD ee GG PP spsp rere"),
+            ("Topas dd", "AA CC dd EE GG pp spsp rere"),
+            ("Blaufuchs dd", "aa CC dd ee gg pp spsp rere"),
+            ("Marder", "aa cchmcchm DD EE GG PP spsp rere"),
+            ("Siam", "aa cchmch DD EE GG PP spsp rere"),
+            ("Zobel-Hell", "aa cchmch DD EE gg PP spsp rere"),
+            ("CP-Agouti", "AA cchmcchm DD EE GG PP spsp rere"),
+            ("CP-Silberagouti", "AA cchmcchm DD EE gg PP spsp rere"),
+            ("CP-Algierfuchs", "AA cchmcchm DD ee GG PP spsp rere"),
+            ("CP-Polarfuchs", "AA cchmcchm DD ee gg PP spsp rere"),
+            ("CP-Fuchs", "AA cchmcchm dd ee GG PP spsp rere"),
+            ("CP-Fuchs-Hell", "AA cchmch dd ee GG PP spsp rere"),
+            ("CP-Blaufuchs", "AA cchmcchm dd ee gg PP spsp rere"),
+            ("CP-Orangeschimmel", "AA cchmcchm DD efef GG PP spsp rere"),
+            // GEN-3g: 5 new CP-*-Hell variants appended (IDs 62-66, no ID->Name drift)
+            ("CP-Agouti-Hell",       "AA cchmch DD EE GG PP spsp rere"),
+            ("CP-Silberagouti-Hell", "AA cchmch DD EE gg PP spsp rere"),
+            ("CP-Algierfuchs-Hell",  "AA cchmch DD ee GG PP spsp rere"),
+            ("CP-Polarfuchs-Hell",   "AA cchmch DD ee gg PP spsp rere"),
+            ("CP-Orangeschimmel-Hell","AA cchmch DD efef GG PP spsp rere"),
        };

        var rows = new ColorVariety[catalog.Length];
@@ -380,11 +362,11 @@ public class ApplicationContext : DbContext
        {
            rows[i] = new ColorVariety
            {
-                // Stable, deterministic GUIDs — ID = array_index + 1 (never reorder existing entries).
+                // Stable, deterministic GUIDs so the HasData seed is migration-stable.
                Id = new Guid($"00000000-0000-0000-0000-{(i + 1):D12}"),
                Name = catalog[i].Name,
                CanonicalGenotype = catalog[i].Genotype,
-                SortOrder = catalog[i].SortOrder,
+                SortOrder = i,
            };
        }
        modelBuilder.Entity<ColorVariety>().HasData(rows);
--- a/GerbilManagerWebAPI/Migrations/20260606202850_ReseedColorVarietiesAR5.Designer.cs
+++ b/GerbilManagerWebAPI/Migrations/20260606202850_ReseedColorVarietiesAR5.Designer.cs
--- a/GerbilManagerWebAPI/Migrations/20260606202850_ReseedColorVarietiesAR5.cs
+++ b/GerbilManagerWebAPI/Migrations/20260606202850_ReseedColorVarietiesAR5.cs
@@ -1,598 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
-
-namespace GerbilManagerWebAPI.Migrations
-{
-    /// <inheritdoc />
-    public partial class ReseedColorVarietiesAR5 : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000016"),
-                column: "Name",
-                value: "Dilute Gold");
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000017"),
-                column: "Name",
-                value: "Dilute Platin");
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000029"),
-                column: "Name",
-                value: "Dilute Agouti");
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000030"),
-                column: "Name",
-                value: "Dilute Silberagouti");
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000031"),
-                column: "Name",
-                value: "Dilute Kohlfuchs");
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000032"),
-                column: "Name",
-                value: "Dilute Anthrazit");
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000033"),
-                column: "SortOrder",
-                value: 36);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000034"),
-                column: "SortOrder",
-                value: 37);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000035"),
-                column: "SortOrder",
-                value: 38);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000036"),
-                column: "SortOrder",
-                value: 39);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000037"),
-                column: "SortOrder",
-                value: 40);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000038"),
-                column: "SortOrder",
-                value: 41);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000039"),
-                column: "SortOrder",
-                value: 42);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000040"),
-                column: "SortOrder",
-                value: 43);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000041"),
-                column: "SortOrder",
-                value: 44);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000042"),
-                column: "SortOrder",
-                value: 45);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000043"),
-                column: "SortOrder",
-                value: 46);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000044"),
-                column: "SortOrder",
-                value: 47);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000045"),
-                column: "SortOrder",
-                value: 48);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000046"),
-                column: "SortOrder",
-                value: 49);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000047"),
-                column: "SortOrder",
-                value: 50);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000048"),
-                column: "SortOrder",
-                value: 51);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000049"),
-                columns: new[] { "Name", "SortOrder" },
-                values: new object[] { "Dilute Topas", 52 });
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000050"),
-                columns: new[] { "Name", "SortOrder" },
-                values: new object[] { "Dilute Blaufuchs", 53 });
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000051"),
-                column: "SortOrder",
-                value: 54);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000052"),
-                column: "SortOrder",
-                value: 55);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000053"),
-                column: "SortOrder",
-                value: 56);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000054"),
-                column: "SortOrder",
-                value: 57);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000055"),
-                column: "SortOrder",
-                value: 59);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000056"),
-                column: "SortOrder",
-                value: 61);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000057"),
-                column: "SortOrder",
-                value: 63);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000058"),
-                column: "SortOrder",
-                value: 65);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000059"),
-                column: "SortOrder",
-                value: 66);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000060"),
-                column: "SortOrder",
-                value: 67);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000061"),
-                column: "SortOrder",
-                value: 68);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000062"),
-                column: "SortOrder",
-                value: 58);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000063"),
-                column: "SortOrder",
-                value: 60);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000064"),
-                column: "SortOrder",
-                value: 62);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000066"),
-                column: "SortOrder",
-                value: 69);
-
-            migrationBuilder.InsertData(
-                table: "ColorVarieties",
-                columns: new[] { "Id", "CanonicalGenotype", "Name", "SortOrder" },
-                values: new object[,]
-                {
-                    { new Guid("00000000-0000-0000-0000-000000000067"), "AA CC dd ee GG PP spsp rere", "Dilute Algierfuchs", 32 },
-                    { new Guid("00000000-0000-0000-0000-000000000068"), "AA CC dd ee GG pp spsp rere", "Dilute Goldfuchs", 33 },
-                    { new Guid("00000000-0000-0000-0000-000000000069"), "aa CC dd ee GG pp spsp rere", "Dilute Rotfuchs", 34 },
-                    { new Guid("00000000-0000-0000-0000-000000000070"), "AA CC dd ee gg PP spsp rere", "Dilute Polarfuchs", 35 }
-                });
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DeleteData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000067"));
-
-            migrationBuilder.DeleteData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000068"));
-
-            migrationBuilder.DeleteData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000069"));
-
-            migrationBuilder.DeleteData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000070"));
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000016"),
-                column: "Name",
-                value: "dd Gold");
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000017"),
-                column: "Name",
-                value: "dd Platin");
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000029"),
-                column: "Name",
-                value: "Agouti dd");
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000030"),
-                column: "Name",
-                value: "Silberagouti dd");
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000031"),
-                column: "Name",
-                value: "Kohlfuchs dd");
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000032"),
-                column: "Name",
-                value: "Anthrazit dd");
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000033"),
-                column: "SortOrder",
-                value: 32);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000034"),
-                column: "SortOrder",
-                value: 33);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000035"),
-                column: "SortOrder",
-                value: 34);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000036"),
-                column: "SortOrder",
-                value: 35);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000037"),
-                column: "SortOrder",
-                value: 36);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000038"),
-                column: "SortOrder",
-                value: 37);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000039"),
-                column: "SortOrder",
-                value: 38);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000040"),
-                column: "SortOrder",
-                value: 39);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000041"),
-                column: "SortOrder",
-                value: 40);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000042"),
-                column: "SortOrder",
-                value: 41);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000043"),
-                column: "SortOrder",
-                value: 42);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000044"),
-                column: "SortOrder",
-                value: 43);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000045"),
-                column: "SortOrder",
-                value: 44);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000046"),
-                column: "SortOrder",
-                value: 45);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000047"),
-                column: "SortOrder",
-                value: 46);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000048"),
-                column: "SortOrder",
-                value: 47);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000049"),
-                columns: new[] { "Name", "SortOrder" },
-                values: new object[] { "Topas dd", 48 });
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000050"),
-                columns: new[] { "Name", "SortOrder" },
-                values: new object[] { "Blaufuchs dd", 49 });
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000051"),
-                column: "SortOrder",
-                value: 50);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000052"),
-                column: "SortOrder",
-                value: 51);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000053"),
-                column: "SortOrder",
-                value: 52);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000054"),
-                column: "SortOrder",
-                value: 53);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000055"),
-                column: "SortOrder",
-                value: 54);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000056"),
-                column: "SortOrder",
-                value: 55);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000057"),
-                column: "SortOrder",
-                value: 56);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000058"),
-                column: "SortOrder",
-                value: 57);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000059"),
-                column: "SortOrder",
-                value: 58);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000060"),
-                column: "SortOrder",
-                value: 59);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000061"),
-                column: "SortOrder",
-                value: 60);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000062"),
-                column: "SortOrder",
-                value: 61);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000063"),
-                column: "SortOrder",
-                value: 62);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000064"),
-                column: "SortOrder",
-                value: 63);
-
-            migrationBuilder.UpdateData(
-                table: "ColorVarieties",
-                keyColumn: "Id",
-                keyValue: new Guid("00000000-0000-0000-0000-000000000066"),
-                column: "SortOrder",
-                value: 65);
-        }
-    }
-}
--- a/GerbilManagerWebAPI/Migrations/ApplicationContextModelSnapshot.cs
+++ b/GerbilManagerWebAPI/Migrations/ApplicationContextModelSnapshot.cs
@@ -321,14 +321,14 @@ namespace GerbilManagerWebAPI.Migrations
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000016"),
                            CanonicalGenotype = "AA CC dd EE GG pp spsp rere",
-                            Name = "Dilute Gold",
+                            Name = "dd Gold",
                            SortOrder = 15
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000017"),
                            CanonicalGenotype = "aa CC dd EE GG pp spsp rere",
-                            Name = "Dilute Platin",
+                            Name = "dd Platin",
                            SortOrder = 16
                        },
                        new
@@ -412,28 +412,28 @@ namespace GerbilManagerWebAPI.Migrations
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000029"),
                            CanonicalGenotype = "AA CC dd EE GG PP spsp rere",
-                            Name = "Dilute Agouti",
+                            Name = "Agouti dd",
                            SortOrder = 28
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000030"),
                            CanonicalGenotype = "AA CC dd EE gg PP spsp rere",
-                            Name = "Dilute Silberagouti",
+                            Name = "Silberagouti dd",
                            SortOrder = 29
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000031"),
                            CanonicalGenotype = "aa CC dd ee GG PP spsp rere",
-                            Name = "Dilute Kohlfuchs",
+                            Name = "Kohlfuchs dd",
                            SortOrder = 30
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000032"),
                            CanonicalGenotype = "aa CC dd EE gg PP spsp rere",
-                            Name = "Dilute Anthrazit",
+                            Name = "Anthrazit dd",
                            SortOrder = 31
                        },
                        new
@@ -441,224 +441,224 @@ namespace GerbilManagerWebAPI.Migrations
                            Id = new Guid("00000000-0000-0000-0000-000000000033"),
                            CanonicalGenotype = "AA CC DD efef gg PP spsp rere",
                            Name = "Silberschimmel",
-                            SortOrder = 36
+                            SortOrder = 32
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000034"),
                            CanonicalGenotype = "AA CC DD efef gg PP spsp rere",
                            Name = "Polarfuchsschimmel",
-                            SortOrder = 37
+                            SortOrder = 33
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000035"),
                            CanonicalGenotype = "AA CC DD efef GG PP spsp rere",
                            Name = "Algierfuchsschimmel",
-                            SortOrder = 38
+                            SortOrder = 34
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000036"),
                            CanonicalGenotype = "aa CC DD efef GG PP spsp rere",
                            Name = "Kohlfuchsschimmel",
-                            SortOrder = 39
+                            SortOrder = 35
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000037"),
                            CanonicalGenotype = "aa CC DD efef gg PP spsp rere",
                            Name = "Blaufuchsschimmel",
-                            SortOrder = 40
+                            SortOrder = 36
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000038"),
                            CanonicalGenotype = "aa CC DD ee GG PP spsp rere",
                            Name = "Kohlfuchs, hell",
-                            SortOrder = 41
+                            SortOrder = 37
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000039"),
                            CanonicalGenotype = "AA CC DD ee GG pp spsp rere",
                            Name = "Goldfuchs, hell",
-                            SortOrder = 42
+                            SortOrder = 38
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000040"),
                            CanonicalGenotype = "AA CC DD efef GG pp spsp rere",
                            Name = "Goldfuchsschimmel",
-                            SortOrder = 43
+                            SortOrder = 39
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000041"),
                            CanonicalGenotype = "AA CC DD EE GG pp spsp rere",
                            Name = "Gold-Hell",
-                            SortOrder = 44
+                            SortOrder = 40
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000042"),
                            CanonicalGenotype = "aa CC DD ee gg PP spsp rere",
                            Name = "Blaufuchs, hell",
-                            SortOrder = 45
+                            SortOrder = 41
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000043"),
                            CanonicalGenotype = "aa CC DD efef GG pp spsp rere",
                            Name = "Rotfuchsschimmel",
-                            SortOrder = 46
+                            SortOrder = 42
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000044"),
                            CanonicalGenotype = "AA CC DD ee gg PP spsp rere",
                            Name = "Polarfuchs, hell",
-                            SortOrder = 47
+                            SortOrder = 43
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000045"),
                            CanonicalGenotype = "aa CC DD efef GG PP spsp rere",
                            Name = "Kohlfuchsschimmel, hell",
-                            SortOrder = 48
+                            SortOrder = 44
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000046"),
                            CanonicalGenotype = "aa CC DD ee GG pp spsp rere",
                            Name = "Rotfuchs, hell",
-                            SortOrder = 49
+                            SortOrder = 45
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000047"),
                            CanonicalGenotype = "aa CC DD ee GG PP spsp rere",
                            Name = "Kohlfuchs-Hell",
-                            SortOrder = 50
+                            SortOrder = 46
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000048"),
                            CanonicalGenotype = "AA CC DD ee GG PP spsp rere",
                            Name = "Algierfuchs, hell",
-                            SortOrder = 51
+                            SortOrder = 47
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000049"),
                            CanonicalGenotype = "AA CC dd EE GG pp spsp rere",
-                            Name = "Dilute Topas",
-                            SortOrder = 52
+                            Name = "Topas dd",
+                            SortOrder = 48
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000050"),
                            CanonicalGenotype = "aa CC dd ee gg pp spsp rere",
-                            Name = "Dilute Blaufuchs",
-                            SortOrder = 53
+                            Name = "Blaufuchs dd",
+                            SortOrder = 49
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000051"),
                            CanonicalGenotype = "aa cchmcchm DD EE GG PP spsp rere",
                            Name = "Marder",
-                            SortOrder = 54
+                            SortOrder = 50
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000052"),
                            CanonicalGenotype = "aa cchmch DD EE GG PP spsp rere",
                            Name = "Siam",
-                            SortOrder = 55
+                            SortOrder = 51
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000053"),
                            CanonicalGenotype = "aa cchmch DD EE gg PP spsp rere",
                            Name = "Zobel-Hell",
-                            SortOrder = 56
+                            SortOrder = 52
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000054"),
                            CanonicalGenotype = "AA cchmcchm DD EE GG PP spsp rere",
                            Name = "CP-Agouti",
-                            SortOrder = 57
+                            SortOrder = 53
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000055"),
                            CanonicalGenotype = "AA cchmcchm DD EE gg PP spsp rere",
                            Name = "CP-Silberagouti",
-                            SortOrder = 59
+                            SortOrder = 54
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000056"),
                            CanonicalGenotype = "AA cchmcchm DD ee GG PP spsp rere",
                            Name = "CP-Algierfuchs",
-                            SortOrder = 61
+                            SortOrder = 55
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000057"),
                            CanonicalGenotype = "AA cchmcchm DD ee gg PP spsp rere",
                            Name = "CP-Polarfuchs",
-                            SortOrder = 63
+                            SortOrder = 56
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000058"),
                            CanonicalGenotype = "AA cchmcchm dd ee GG PP spsp rere",
                            Name = "CP-Fuchs",
-                            SortOrder = 65
+                            SortOrder = 57
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000059"),
                            CanonicalGenotype = "AA cchmch dd ee GG PP spsp rere",
                            Name = "CP-Fuchs-Hell",
-                            SortOrder = 66
+                            SortOrder = 58
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000060"),
                            CanonicalGenotype = "AA cchmcchm dd ee gg PP spsp rere",
                            Name = "CP-Blaufuchs",
-                            SortOrder = 67
+                            SortOrder = 59
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000061"),
                            CanonicalGenotype = "AA cchmcchm DD efef GG PP spsp rere",
                            Name = "CP-Orangeschimmel",
-                            SortOrder = 68
+                            SortOrder = 60
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000062"),
                            CanonicalGenotype = "AA cchmch DD EE GG PP spsp rere",
                            Name = "CP-Agouti-Hell",
-                            SortOrder = 58
+                            SortOrder = 61
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000063"),
                            CanonicalGenotype = "AA cchmch DD EE gg PP spsp rere",
                            Name = "CP-Silberagouti-Hell",
-                            SortOrder = 60
+                            SortOrder = 62
                        },
                        new
                        {
                            Id = new Guid("00000000-0000-0000-0000-000000000064"),
                            CanonicalGenotype = "AA cchmch DD ee GG PP spsp rere",
                            Name = "CP-Algierfuchs-Hell",
-                            SortOrder = 62
+                            SortOrder = 63
                        },
                        new
                        {
@@ -672,35 +672,7 @@ namespace GerbilManagerWebAPI.Migrations
                            Id = new Guid("00000000-0000-0000-0000-000000000066"),
                            CanonicalGenotype = "AA cchmch DD efef GG PP spsp rere",
                            Name = "CP-Orangeschimmel-Hell",
-                            SortOrder = 69
-                        },
-                        new
-                        {
-                            Id = new Guid("00000000-0000-0000-0000-000000000067"),
-                            CanonicalGenotype = "AA CC dd ee GG PP spsp rere",
-                            Name = "Dilute Algierfuchs",
-                            SortOrder = 32
-                        },
-                        new
-                        {
-                            Id = new Guid("00000000-0000-0000-0000-000000000068"),
-                            CanonicalGenotype = "AA CC dd ee GG pp spsp rere",
-                            Name = "Dilute Goldfuchs",
-                            SortOrder = 33
-                        },
-                        new
-                        {
-                            Id = new Guid("00000000-0000-0000-0000-000000000069"),
-                            CanonicalGenotype = "aa CC dd ee GG pp spsp rere",
-                            Name = "Dilute Rotfuchs",
-                            SortOrder = 34
-                        },
-                        new
-                        {
-                            Id = new Guid("00000000-0000-0000-0000-000000000070"),
-                            CanonicalGenotype = "AA CC dd ee gg PP spsp rere",
-                            Name = "Dilute Polarfuchs",
-                            SortOrder = 35
+                            SortOrder = 65
                        });
                });

--- a/gerbil-manager-web/src/components/Charakterbogen.tsx
+++ b/gerbil-manager-web/src/components/Charakterbogen.tsx
@@ -1,5 +1,5 @@
 import { de } from '../strings/de'
-import { ALL_TRAITS } from '../format/traits'
+import { ALL_TRAITS, TRAIT_CATEGORIES } from '../format/traits'
 import './charakterbogen.css'

 export interface CharakterbogenProps {
@@ -10,12 +10,6 @@ export interface CharakterbogenProps {
  onNoteChange: (note: string) => void
 }

-/**
- * FEAT-14: character sheet — a checkbox grid of traits + a free note.
- * Controlled & reusable: rendered on the animal detail page (persisted) and in
- * the Abgabe listing composer (feeds the AI sale-text). German labels from
- * de.character.traits; the stored value is the trait KEY.
- */
 export default function Charakterbogen({
  traits,
  note,
@@ -29,26 +23,32 @@ export default function Charakterbogen({
    const next = new Set(selected)
    if (next.has(key)) next.delete(key)
    else next.add(key)
-    // Preserve the vocabulary order for stable output.
+    // Preserve vocabulary (category) order for stable output.
    onTraitsChange(ALL_TRAITS.filter((tr) => next.has(tr.key)).map((tr) => tr.key))
  }

  return (
    <div className="charakterbogen">
-      <ul className="trait-grid">
-        {ALL_TRAITS.map((tr) => (
-          <li key={tr.key}>
-            <label className="trait-chip">
-              <input
-                type="checkbox"
-                checked={selected.has(tr.key)}
-                onChange={() => toggle(tr.key)}
-              />
-              <span>{tr.label}</span>
-            </label>
-          </li>
-        ))}
-      </ul>
+      {TRAIT_CATEGORIES.map((cat) => (
+        <section key={cat.category} className="trait-category">
+          <h4 className="trait-category__heading">{cat.category}</h4>
+          <ul className="trait-grid">
+            {cat.traits.map((tr) => (
+              <li key={tr.key}>
+                <label className={`trait-chip${tr.warn ? ' trait-chip--warn' : ''}`}>
+                  <input
+                    type="checkbox"
+                    checked={selected.has(tr.key)}
+                    onChange={() => toggle(tr.key)}
+                  />
+                  <span>{tr.label}</span>
+                  {tr.warn && <span className="trait-warn-badge">{t.warnLabel}</span>}
+                </label>
+              </li>
+            ))}
+          </ul>
+        </section>
+      ))}
      <label className="field">
        <span>{t.noteLabel}</span>
        <textarea
--- a/gerbil-manager-web/src/components/charakterbogen.css
+++ b/gerbil-manager-web/src/components/charakterbogen.css
@@ -1,8 +1,21 @@
-/* FEAT-14 Charakterbogen — trait checkbox grid (mobile-first). */
+/* CHARAKTERBOGEN-2 — categorised trait grid with warn-signal styling (mobile-first). */
+
+.trait-category {
+  margin-bottom: 0.25rem;
+}
+
+.trait-category__heading {
+  font-size: 0.78rem;
+  font-weight: 600;
+  color: var(--color-muted, #666);
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  margin: 0.75rem 0 0.35rem;
+}

 .charakterbogen .trait-grid {
  list-style: none;
-  margin: 0 0 0.75rem;
+  margin: 0 0 0.5rem;
  padding: 0;
  display: grid;
  grid-template-columns: 1fr;
@@ -39,3 +52,16 @@
  min-height: 0;
  flex: 0 0 auto;
 }
+
+.trait-chip--warn {
+  border-color: #d97706;
+  background: #fff7ed;
+}
+
+.trait-warn-badge {
+  margin-left: auto;
+  font-size: 0.68rem;
+  font-weight: 600;
+  color: #d97706;
+  white-space: nowrap;
+}
--- a/gerbil-manager-web/src/format/tests/traits.test.ts
+++ b/gerbil-manager-web/src/format/tests/traits.test.ts
@@ -0,0 +1,91 @@
+import { describe, it, expect } from 'vitest'
+import { ALL_TRAITS, TRAIT_CATEGORIES, traitLabel, traitLabels, isWarnTrait } from '../traits'
+
+describe('trait catalog', () => {
+  it('has 4 categories', () => {
+    expect(TRAIT_CATEGORIES).toHaveLength(4)
+  })
+
+  it('category names match spec', () => {
+    const names = TRAIT_CATEGORIES.map((c) => c.category)
+    expect(names).toEqual([
+      'Sozialverhalten',
+      'Eignung & Umgang',
+      'Hobbys & Eigenarten',
+      'Wesen & Temperament',
+    ])
+  })
+
+  it('ALL_TRAITS flattens all categories', () => {
+    const total = TRAIT_CATEGORIES.reduce((sum, c) => sum + c.traits.length, 0)
+    expect(ALL_TRAITS).toHaveLength(total)
+  })
+
+  it('all keys are unique', () => {
+    const keys = ALL_TRAITS.map((t) => t.key)
+    expect(new Set(keys).size).toBe(keys.length)
+  })
+
+  it('existing 15 keys are still present (stored on live animals)', () => {
+    const legacy = [
+      'zutraulich', 'handzahm', 'neugierig', 'aufgeschlossen', 'ruhig', 'lebhaft',
+      'verschmust', 'eigenstaendig', 'anfaengergeeignet', 'futterfreudig',
+      'buddelt', 'klettert', 'laufrad', 'vertraeglich', 'schreckhaft',
+    ]
+    const allKeys = new Set(ALL_TRAITS.map((t) => t.key))
+    for (const key of legacy) {
+      expect(allKeys.has(key), `missing legacy key: ${key}`).toBe(true)
+    }
+  })
+
+  it('new keys are present', () => {
+    const newKeys = [
+      'dominant', 'rangniedrig', 'sozialkompetent', 'schwer-vergesellschaftbar',
+      'erfahrene-halter', 'beobachtungstier', 'familiengeeignet',
+      'schredder', 'nestbauer', 'territorial',
+    ]
+    const allKeys = new Set(ALL_TRAITS.map((t) => t.key))
+    for (const key of newKeys) {
+      expect(allKeys.has(key), `missing new key: ${key}`).toBe(true)
+    }
+  })
+
+  it('warn traits are schwer-vergesellschaftbar and territorial', () => {
+    expect(isWarnTrait('schwer-vergesellschaftbar')).toBe(true)
+    expect(isWarnTrait('territorial')).toBe(true)
+  })
+
+  it('non-warn traits return false from isWarnTrait', () => {
+    expect(isWarnTrait('zutraulich')).toBe(false)
+    expect(isWarnTrait('dominant')).toBe(false)
+    expect(isWarnTrait('beobachtungstier')).toBe(false)
+    expect(isWarnTrait('schreckhaft')).toBe(false)
+  })
+
+  it('unknown key returns false from isWarnTrait', () => {
+    expect(isWarnTrait('not-a-real-key')).toBe(false)
+  })
+
+  it('traitLabel returns German label for known key', () => {
+    expect(traitLabel('zutraulich')).toBe('zutraulich')
+    expect(traitLabel('dominant')).toBe('dominant (Leittier)')
+    expect(traitLabel('schwer-vergesellschaftbar')).toBe('schwer vergesellschaftbar')
+    expect(traitLabel('territorial')).toBe('territorial')
+  })
+
+  it('traitLabel returns the key itself for unknown key', () => {
+    expect(traitLabel('not-a-real-key')).toBe('not-a-real-key')
+  })
+
+  it('traitLabels maps a list of keys to labels', () => {
+    expect(traitLabels(['zutraulich', 'dominant'])).toEqual([
+      'zutraulich',
+      'dominant (Leittier)',
+    ])
+  })
+
+  it('traitLabels handles null and undefined gracefully', () => {
+    expect(traitLabels(null)).toEqual([])
+    expect(traitLabels(undefined)).toEqual([])
+  })
+})
--- a/gerbil-manager-web/src/format/traits.ts
+++ b/gerbil-manager-web/src/format/traits.ts
@@ -1,9 +1,23 @@
-/** FEAT-14: map character trait KEYS (stored) <-> German LABELS (de.character.traits). */
+/** CHARAKTERBOGEN-2: map character trait KEYS (stored) <-> German LABELS (de.character.traitCategories). */
 import { de } from '../strings/de'

-export const ALL_TRAITS = de.character.traits
+export interface TraitEntry {
+  key: string
+  label: string
+  warn?: true
+}

-const LABEL_BY_KEY = new Map<string, string>(de.character.traits.map((t) => [t.key, t.label]))
+export interface TraitCategory {
+  category: string
+  traits: readonly TraitEntry[]
+}
+
+export const TRAIT_CATEGORIES: ReadonlyArray<TraitCategory> =
+  de.character.traitCategories as unknown as ReadonlyArray<TraitCategory>
+
+export const ALL_TRAITS: readonly TraitEntry[] = TRAIT_CATEGORIES.flatMap((c) => c.traits)
+
+const LABEL_BY_KEY = new Map<string, string>(ALL_TRAITS.map((t) => [t.key, t.label]))

 export function traitLabel(key: string): string {
  return LABEL_BY_KEY.get(key) ?? key
@@ -13,3 +27,7 @@ export function traitLabel(key: string): string {
 export function traitLabels(keys: readonly string[] | null | undefined): string[] {
  return (keys ?? []).map(traitLabel)
 }
+
+export function isWarnTrait(key: string): boolean {
+  return ALL_TRAITS.some((t) => t.key === key && t.warn === true)
+}
--- a/gerbil-manager-web/src/strings/de.ts
+++ b/gerbil-manager-web/src/strings/de.ts
@@ -784,9 +784,9 @@ export const de = {
    },
    unknownFarbschlag: 'Unbekannter Farbschlag',
  },
-  // ── FEAT-14 (Kevin): Charakterbogen — Eigenschaften + Notiz, speist den KI-Verkaufstext ──
-  // Traits: stabile KEYS (gespeichert) + deutsche LABELS (UI + KI-Prompt).
-  // Erweitern = eine Zeile in der Liste; Julian verfeinert die Auswahl.
+  // ── FEAT-14 / CHARAKTERBOGEN-2: Charakterbogen — Eigenschaften + Notiz, speist KI-Verkaufstext ──
+  // Traits: stabile KEYS (gespeichert, NIEMALS umbenennen) + deutsche LABELS (UI + KI-Prompt).
+  // Neue Traits = neuen Eintrag hinzufügen; warn:true = Warnsignal (visuell abgesetzt).
  character: {
    sectionTitle: 'Charakter & Eigenschaften',
    noteLabel: 'Notizen zum Charakter',
@@ -794,22 +794,53 @@ export const de = {
    save: 'Charakter speichern',
    saved: 'Charakter gespeichert.',
    none: 'Noch keine Eigenschaften ausgewählt.',
-    traits: [
-      { key: 'zutraulich', label: 'zutraulich' },
-      { key: 'handzahm', label: 'handzahm' },
-      { key: 'neugierig', label: 'neugierig' },
-      { key: 'aufgeschlossen', label: 'aufgeschlossen' },
-      { key: 'ruhig', label: 'ruhig / ausgeglichen' },
-      { key: 'lebhaft', label: 'lebhaft / aktiv' },
-      { key: 'verschmust', label: 'verschmust' },
-      { key: 'eigenstaendig', label: 'eigenständig' },
-      { key: 'anfaengergeeignet', label: 'anfängergeeignet' },
-      { key: 'futterfreudig', label: 'futterfreudig' },
-      { key: 'buddelt', label: 'buddelt gern' },
-      { key: 'klettert', label: 'klettert gern' },
-      { key: 'laufrad', label: 'läuft gern im Laufrad' },
-      { key: 'vertraeglich', label: 'gut verträglich' },
-      { key: 'schreckhaft', label: 'schreckhaft' },
+    warnLabel: '⚠ Warnsignal',
+    traitCategories: [
+      {
+        category: 'Sozialverhalten',
+        traits: [
+          { key: 'dominant', label: 'dominant (Leittier)' },
+          { key: 'rangniedrig', label: 'rangniedrig / unterwürfig' },
+          { key: 'sozialkompetent', label: 'sozialkompetent / gut sozialisiert' },
+          { key: 'schwer-vergesellschaftbar', label: 'schwer vergesellschaftbar', warn: true },
+        ],
+      },
+      {
+        category: 'Eignung & Umgang',
+        traits: [
+          { key: 'anfaengergeeignet', label: 'anfängergeeignet' },
+          { key: 'erfahrene-halter', label: 'für erfahrene Halter' },
+          { key: 'beobachtungstier', label: 'reines Beobachtungstier' },
+          { key: 'familiengeeignet', label: 'familiengeeignet / stressresistent' },
+        ],
+      },
+      {
+        category: 'Hobbys & Eigenarten',
+        traits: [
+          { key: 'futterfreudig', label: 'futterfreudig' },
+          { key: 'buddelt', label: 'buddelt gern' },
+          { key: 'klettert', label: 'klettert gern' },
+          { key: 'laufrad', label: 'läuft gern im Laufrad' },
+          { key: 'schredder', label: 'Schredder-Meister' },
+          { key: 'nestbauer', label: 'Nestbauer / Architekt' },
+          { key: 'territorial', label: 'territorial', warn: true },
+        ],
+      },
+      {
+        category: 'Wesen & Temperament',
+        traits: [
+          { key: 'zutraulich', label: 'zutraulich' },
+          { key: 'handzahm', label: 'handzahm' },
+          { key: 'neugierig', label: 'neugierig' },
+          { key: 'aufgeschlossen', label: 'aufgeschlossen' },
+          { key: 'ruhig', label: 'ruhig / ausgeglichen' },
+          { key: 'lebhaft', label: 'lebhaft / aktiv' },
+          { key: 'verschmust', label: 'verschmust' },
+          { key: 'eigenstaendig', label: 'eigenständig' },
+          { key: 'vertraeglich', label: 'gut verträglich' },
+          { key: 'schreckhaft', label: 'schreckhaft' },
+        ],
+      },
    ],
  },
  // ── UX-MOBILE-1 (Kevin): FilterPanel — einklappbare Filter auf Mobil ──