From 70b28adbd11b152c218d5176d1dc08470bb46cdc Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Tue, 21 Jul 2026 10:53:27 +0300
Subject: [PATCH 01/24] feat/create-trials-planning

ref bej-103
---
 docs/planning/trials/README.md          |  99 ++++++++++++
 docs/planning/trials/event-creation.md  | 162 +++++++++++++++++++
 docs/planning/trials/later-ux.md        |  34 ++++
 docs/planning/trials/result-creation.md | 197 ++++++++++++++++++++++++
 4 files changed, 492 insertions(+)
 create mode 100644 docs/planning/trials/README.md
 create mode 100644 docs/planning/trials/event-creation.md
 create mode 100644 docs/planning/trials/later-ux.md
 create mode 100644 docs/planning/trials/result-creation.md

diff --git a/docs/planning/trials/README.md b/docs/planning/trials/README.md
new file mode 100644
index 00000000..9180c064
--- /dev/null
+++ b/docs/planning/trials/README.md
@@ -0,0 +1,99 @@
+# BEJ-103 Manual Trial Creation
+
+## Purpose
+
+These documents replace the earlier monolithic conversational plan for
+BEJ-103 (`create trials`) with small implementation gates that can be reviewed
+and approved independently. Future BEJ-103 implementation pull requests must
+reference this planning set and identify the single gate they implement.
+
+Creating or changing these planning documents does not approve any
+implementation gate. Passing a gate's validation also does not authorize work
+on the next gate.
+
+## Planning set
+
+- [Event creation](./event-creation.md) defines the event workspace, manual
+  event creation, and the persisted empty-event lifecycle.
+- [Result creation](./result-creation.md) defines the manual result write path
+  and the full-page result form.
+- [Later UX](./later-ux.md) records deferred ideas only and does not authorize
+  their implementation.
+
+Repository guardrails and current feature documentation:
+
+- [Architecture guardrails](../../../ARCHITECTURE.md)
+- [Documentation rules](../../documentation-rules.md)
+- [Current admin trial management](../../features/admin-trial-management.md)
+- [Koiratietokanta AJOK upsert](../../features/trials/koiratietokanta-api-ajok-upsert.md)
+
+## Grounded current state
+
+- The admin trials page is an event-first master-detail flow backed by
+  canonical `TrialEvent` and `TrialEntry` rows.
+- Admin event metadata and existing result rows can currently be edited, and
+  existing result rows can be deleted. The current feature documentation still
+  describes an older read-only state and must be updated when an implementation
+  slice changes durable feature behavior.
+- Admin event searches include persisted events even when they have no entries.
+- Public trial search explicitly requires an event to have at least one entry,
+  and public trial detail returns no result for an empty event.
+- Deleting the final `TrialEntry` currently deletes its `TrialEvent` in the
+  same transaction. [Event creation](./event-creation.md) defines the planned
+  replacement lifecycle.
+- Koiratietokanta ingestion currently resolves a `TrialEvent` by
+  `sklKoeId`, resolves a result within that event by registration snapshot,
+  and writes a source-derived `yksilointiAvain` in
+  `SKL:<sklKoeId>|REG:<registration>` form.
+
+## Accepted target direction
+
+- Manual creation is event-first and page-based.
+- A manually created event requires an SKL trial ID, event date, and place.
+- An empty event is valid persisted admin-only state, not a separate draft
+  state.
+- Manual result entry starts with a typed registration number. The write path
+  links an existing dog when the normalized registration resolves locally and
+  otherwise permits an unlinked result.
+- Manual results use identity compatible with Koiratietokanta ingestion. A
+  later matching Koiratietokanta upsert becomes authoritative.
+- Results are saved one dog at a time. The intended continuation supports both
+  adding another result to the same event and finishing at the event workspace.
+- The existing trials master-detail list and existing result-edit modal remain
+  in place for BEJ-103.
+
+## Implementation order and review rules
+
+Implement gates in this order:
+
+1. `E1` - event workspace
+2. `E2` - event creation and empty-event lifecycle
+3. `R1` - manual result backend and schema foundation
+4. `R2` - full-page manual result form
+
+For every gate:
+
+- Approve the gate explicitly before implementation begins.
+- Implement only that gate's stated scope.
+- Run its targeted validation and report the actual results.
+- Review the behavior and documentation diff before approving another gate.
+- Stop after the review; approval of one gate does not imply approval of the
+  next gate.
+- If review changes a product or architecture decision, update these planning
+  documents before implementation continues.
+
+## Non-goals
+
+BEJ-103 does not authorize:
+
+- changes to the public trial UI;
+- changes to trial statistics or their calculation;
+- redesign of legacy import or Koiratietokanta ingestion;
+- redesign of existing result editing;
+- batch entry of several unsaved dog results;
+- a draft/publish workflow;
+- autosave;
+- reconciliation or conflict-resolution UI.
+
+Potential future UX work is recorded in [Later UX](./later-ux.md) without
+implementation authorization.
diff --git a/docs/planning/trials/event-creation.md b/docs/planning/trials/event-creation.md
new file mode 100644
index 00000000..017650e4
--- /dev/null
+++ b/docs/planning/trials/event-creation.md
@@ -0,0 +1,162 @@
+# BEJ-103 Event Creation
+
+## Purpose
+
+This plan introduces a stable event workspace before adding manual event
+creation. It deliberately leaves the existing `/admin/trials` master-detail
+flow intact. The accepted cross-slice decisions and review rules are defined in
+the [planning overview](./README.md).
+
+## Target event lifecycle
+
+The planned lifecycle is:
+
+`Empty event -> results added -> event with results -> final result removed -> empty event remains persisted`
+
+Rules:
+
+- An empty `TrialEvent` is valid persisted admin-only state.
+- Empty state is not a separate draft or publish status.
+- Adding the first result makes the event eligible for the existing public
+  trial reads; no public UI behavior is changed here.
+- Removing the final result must not automatically delete the `TrialEvent`.
+- Explicit event deletion is permitted only while the event has zero results.
+- The server and database enforce the empty-only delete rule; hiding a UI
+  action is not sufficient authorization or consistency protection.
+
+## Gate E1: Event workspace
+
+### Scope
+
+- Add a dedicated admin event workspace route for one `trialEventId`.
+- Reuse the existing admin event detail query, event summary, result list,
+  event-edit action, result-edit modal, PDF action, and result-delete action
+  where practical.
+- Add an explicit way to open the workspace from the current trials page.
+- Provide loading, missing-event, and read-error states on the workspace.
+- Keep authorization at the existing admin layout and backend boundaries.
+
+### Exclusions
+
+- No event or result creation.
+- No event deletion or change to final-result deletion.
+- No redesign or removal of the current master-detail interface.
+- No change to existing result editing.
+- No public UI, statistics, import, schema, or API behavior changes.
+
+### Dependencies
+
+- Existing admin event list/detail contracts and HTTP read transport.
+- Existing admin event and result actions.
+- No dependency on E2, R1, or R2.
+
+### Acceptance criteria
+
+- An admin can open a stable URL for an existing event and see the same event
+  metadata and result rows available in the master-detail panel.
+- Existing edit, PDF, and result-delete actions retain their current behavior.
+- Missing and inaccessible event states are handled without falling back to a
+  different event.
+- The current trials list continues to work as before.
+
+### Targeted validation
+
+- Add focused route/component tests for loading, success, missing, and error
+  states.
+- Run the existing selected-event component and action tests affected by reuse.
+- Run targeted web type checking and linting for touched code.
+- Manually verify the workspace at desktop and mobile widths when browser
+  tooling is available.
+- Do not run cycle lint in the agent workflow.
+
+### Merge independence and review gate
+
+E1 can be merged safely on its own. It adds an alternate route to current
+behavior and does not leave a partially enabled creation workflow.
+
+Stop after validation and request explicit review. Do not start E2 without
+separate approval.
+
+## Gate E2: Event creation and empty-event lifecycle
+
+### Scope
+
+- Add admin event-create request/response contracts, a server use-case, a
+  focused DB write, and a Server Action mutation path.
+- Add a full-page event-create form linked from the existing trials page.
+- Require a positive `sklKoeId`, a valid event date, and a non-empty event
+  place. Keep the remaining existing event metadata fields optional.
+- Reject creation when the unique `TrialEvent.sklKoeId` already belongs to an
+  event; do not turn a create request into an update.
+- Resolve `trialRuleWindowId` from the event date using the existing active
+  rule-window behavior. When the event date is edited later, keep its resolved
+  rule window consistent with the new date.
+- Change result deletion so removing the final `TrialEntry` leaves the
+  `TrialEvent` persisted and empty.
+- Add explicit event deletion that succeeds only when the event has zero
+  entries and rejects a non-empty event.
+- Show the valid empty state and empty-only delete action in the event
+  workspace.
+
+### Temporary continuation behavior
+
+When E2 is implemented without R2, successful event creation returns to the
+new event workspace. This is intentional, complete temporary behavior: the
+admin can inspect, edit, or explicitly delete the empty event.
+
+Gate R2 later changes the primary successful continuation to the first manual
+result form. Canceling or leaving that later form still returns to the same
+persisted event workspace.
+
+### Exclusions
+
+- No manual result write path or result-create form.
+- No separate draft/publish state.
+- No automatic cleanup or expiry for empty events.
+- No cascade deletion of a non-empty event.
+- No redesign of the trials index or existing result-edit modal.
+- No public UI, statistics, or import redesign.
+
+### Dependencies
+
+- E1 must be approved and merged so event creation has a stable destination.
+- Existing event validation, date parsing, rule-window resolution, admin
+  authorization, and structured logging conventions must be reused.
+
+### Acceptance criteria
+
+- An authorized admin can create an event with the required identity fields
+  and optional existing event metadata.
+- Invalid required values and an already-used SKL ID return stable validation
+  or conflict errors without creating an event.
+- The created event is visible to admin reads, opens in its workspace, and is
+  absent from existing public trial search/detail while empty.
+- Removing the final result leaves the event empty and persisted.
+- Explicit deletion succeeds for an empty event and rejects an event that has
+  results.
+- Event creation and deletion are logged through the shared structured logger.
+
+### Targeted validation
+
+- DB tests for create, duplicate SKL ID, rule-window assignment, empty-only
+  delete, and final-result removal.
+- Server tests for authorization, normalization, validation, conflicts,
+  not-found behavior, and error mapping.
+- Server Action and mutation tests for authentication, error propagation,
+  navigation data, and query invalidation.
+- Web form/workspace tests for required fields, failure preservation, success,
+  empty state, and empty-only deletion.
+- Regression tests proving public search/detail continue to exclude an empty
+  event.
+- Targeted type checking and linting for touched packages; do not run cycle
+  lint in the agent workflow.
+
+### Merge independence and review gate
+
+E2 can be merged safely after E1 without R1 or R2. Empty events have a complete
+admin lifecycle, remain hidden from public reads, and can be removed explicitly.
+The temporary post-create workspace continuation must be included in the E2
+implementation and release communication.
+
+Stop after validation and request explicit review. The planned schema work in
+R1 requires separate approval before it begins.
diff --git a/docs/planning/trials/later-ux.md b/docs/planning/trials/later-ux.md
new file mode 100644
index 00000000..76170f9a
--- /dev/null
+++ b/docs/planning/trials/later-ux.md
@@ -0,0 +1,34 @@
+# Deferred Trial Management UX
+
+## Status
+
+This document records deferred ideas only. It does not authorize design,
+implementation, refactoring, schema work, or preparatory changes. BEJ-103 can
+be completed without any item in this file.
+
+To move an item into implementation, first update the relevant planning gate,
+define its scope and acceptance criteria, and obtain explicit approval under
+the review rules in the [BEJ-103 planning overview](./README.md).
+
+## Deferred ideas
+
+- Replace the current trials master-detail list with a navigation-only event
+  index.
+- Move editing of existing results from the modal to the reusable full-page
+  result form.
+- Add searchable dog selection to manual result creation.
+- Allow inline dog creation from the result flow.
+- Add an explicit draft/publish state for trial events or results.
+- Enter and submit several dog results as one batch.
+- Autosave event or result forms.
+- Add reconciliation UI for manual and Koiratietokanta data conflicts.
+
+## Explicit exclusions from current gates
+
+- E1 and E2 retain the existing trials master-detail list.
+- R1 and R2 retain the existing result-edit modal.
+- R2 uses a free-text registration field and saves one complete result at a
+  time.
+- Matching Koiratietokanta upserts are resolved by the authoritative backend
+  behavior documented in [Result creation](./result-creation.md), without a
+  manual reconciliation screen.
diff --git a/docs/planning/trials/result-creation.md b/docs/planning/trials/result-creation.md
new file mode 100644
index 00000000..49802df2
--- /dev/null
+++ b/docs/planning/trials/result-creation.md
@@ -0,0 +1,197 @@
+# BEJ-103 Result Creation
+
+## Purpose
+
+This plan adds one-at-a-time manual `TrialEntry` creation after the event
+workspace and empty-event lifecycle are complete. It preserves the existing
+result-edit modal. Cross-slice decisions and review rules are defined in the
+[planning overview](./README.md), and event dependencies are defined in
+[Event creation](./event-creation.md).
+
+## Existing identity and upsert behavior
+
+The current Koiratietokanta write path:
+
+- resolves a `TrialEvent` through unique `TrialEvent.sklKoeId`;
+- resolves an entry inside that event through the existing
+  `TrialEvent` plus `TrialEntry.rekisterinumeroSnapshot` uniqueness;
+- writes `TrialEntry.yksilointiAvain` as
+  `SKL:<sklKoeId>|REG:<normalizedRegistration>`; and
+- upserts the entry in place before replacing its era and lisatieto rows.
+
+Manual result creation must use these existing identity semantics. This plan
+does not add another database uniqueness constraint.
+
+## Authoritative matching upsert
+
+When a later Koiratietokanta payload has the same `TrialEvent.sklKoeId` and
+normalized registration as a manually created result:
+
+- the existing manual `TrialEntry` is updated in place;
+- a duplicate result is not created;
+- incoming Koiratietokanta result, era, lisatieto, snapshot, and event data
+  become authoritative according to the existing ingestion mapper and upsert;
+- `TrialEntry.lahde` changes to `KOIRATIETOKANTA_API`; and
+- `dogId` is updated when the authoritative registration resolves through
+  `DogRegistration`. If it does not resolve, the current upsert behavior
+  preserves an existing dog link rather than clearing it.
+
+This is automatic matching, not a reconciliation UI or import redesign.
+
+## Gate R1: Manual result backend and schema foundation
+
+### Scope
+
+- Add `MANUAL_ADMIN` to the existing `TrialSourceTag` enum in an explicitly
+  approved Prisma migration.
+- Add admin manual-result request/response contracts, a server use-case, a
+  focused transactional DB write, and a Server Action mutation path.
+- Accept `trialEventId`, a registration number, and the existing entry, era,
+  and lisatieto write shape used by result editing.
+- Normalize and validate registration using existing server-side registration
+  rules.
+- Load the target event and require its `sklKoeId` for API-compatible manual
+  identity.
+- Reject a second result with the same normalized registration in the event.
+- Resolve `dogId` through `DogRegistration`; save an unlinked entry when no
+  local dog owns the normalized registration.
+- Store `lahde=MANUAL_ADMIN`, the normalized
+  `rekisterinumeroSnapshot`, and the API-compatible `yksilointiAvain`.
+- Create the entry, eras, and lisatiedot atomically.
+- Share validation and normalization with result update where doing so avoids
+  divergent business rules, while keeping create and update as separate
+  use-cases and DB writes.
+- Add a regression test for the authoritative matching upsert described above.
+
+### Exclusions
+
+- No result-create UI or navigation changes.
+- No existing result-editing redesign.
+- No batch creation, autosave, draft/publish state, or reconciliation UI.
+- No new ingestion endpoint or change to the external Koiratietokanta
+  contract.
+- No new database uniqueness constraint. The only planned schema change in
+  this gate is the new source enum value.
+
+### Dependencies
+
+- E2 must be approved and merged so the target event and empty-event lifecycle
+  exist.
+- The `MANUAL_ADMIN` migration requires explicit schema-change approval before
+  implementation.
+- Existing registration normalization, admin authorization, structured
+  logging, entry validation, and transaction conventions must be reused.
+
+### Acceptance criteria
+
+- An authorized call creates exactly one manual entry with its complete nested
+  writes or creates nothing if the transaction fails.
+- A matching local dog is linked; an unknown registration remains a valid
+  unlinked result.
+- Invalid registration, missing event, event without an SKL ID, duplicate
+  event registration, and invalid entry/era/lisatieto data return stable errors.
+- Manual source and identity fields match the documented API-compatible
+  semantics.
+- A later matching Koiratietokanta upsert updates the same entry without a
+  duplicate and makes the incoming data authoritative.
+
+### Targeted validation
+
+- Migration/schema checks for the new enum value and regenerated Prisma client.
+- DB tests for linked and unlinked creation, identity fields, duplicate
+  rejection, nested writes, and rollback.
+- Server tests for authorization, registration normalization, event
+  validation, entry/era/lisatieto validation, conflict mapping, and logging.
+- Server Action tests for authentication and service-result mapping.
+- Existing Koiratietokanta DB/service tests plus a manual-to-API replacement
+  regression case.
+- Targeted type checking and linting for contracts, server, DB, and web action
+  code; do not run cycle lint in the agent workflow.
+
+### Merge independence and review gate
+
+R1 can be merged safely after E2 without R2. The write path has no linked admin
+UI yet, so it does not expose an unfinished user workflow. Its migration and
+backend behavior must nevertheless be complete, documented, and validated.
+
+Stop after validation and request explicit review. Do not begin R2 without
+separate approval.
+
+## Gate R2: Full-page manual result form
+
+### Scope
+
+- Add a dedicated full-page result-create route under one event workspace.
+- Keep the event identity visible while entering a dog result.
+- Add a required free-text registration field. Do not require selecting an
+  existing dog.
+- Reuse the existing result, era, lisatieto, judge, and note sections where
+  practical, with one initial era and the existing validation semantics.
+- Preserve entered values after server or validation failure and prevent
+  duplicate submissions while a save is pending.
+- Add two successful submission paths:
+  - **Save and add another** creates one result, then opens a clean result form
+    for the same event.
+  - **Save and finish** creates one result, then returns to the event workspace.
+- Change E2's temporary successful event-create continuation so the primary
+  action opens the first result form for the newly persisted event.
+- Define cancel and browser navigation:
+  - Cancel returns to the event workspace.
+  - Cancel asks for confirmation before discarding a dirty form.
+  - Browser back follows the same dirty-form protection and otherwise returns
+    to the event workspace.
+  - A failed or rejected save stays on the populated form.
+- Add Finnish and Swedish labels, helper text, errors, and success feedback.
+- Keep existing result editing in its current modal.
+
+### Exclusions
+
+- No migration of existing result editing to a page.
+- No searchable dog picker or inline dog creation.
+- No batch form, autosave, draft/publish state, or reconciliation UI.
+- No redesign of the existing trials master-detail list.
+- No public UI or trial-statistics changes.
+
+### Dependencies
+
+- E1 and E2 must be merged for the workspace and persisted event lifecycle.
+- R1 must be merged for the manual-result action and persistence contract.
+- Existing entry form sections and form-model behavior are the reuse baseline;
+  any extraction must preserve the current edit-modal behavior.
+
+### Acceptance criteria
+
+- Successful event creation continues to the first result form for that exact
+  event.
+- An admin can save a result for a known or unknown registration.
+- Save and add another clears dog-specific state while retaining the event
+  context and produces no duplicate submission.
+- Save and finish returns to the event workspace where the new result appears.
+- Cancel and browser back protect dirty input and return to the correct event
+  when confirmed.
+- Validation and server errors preserve entered data and provide actionable
+  localized feedback.
+- The existing result-edit modal behaves as before.
+
+### Targeted validation
+
+- Component/form-model tests for initial state, validation, dirty state,
+  reset, and localized feedback.
+- Mutation tests for success, failure, query invalidation, and duplicate-submit
+  protection.
+- Route/workflow tests for event-create continuation, add-another, finish,
+  cancel, and browser-back handling.
+- Regression tests for the existing result-edit modal and selected-event panel.
+- Targeted web type checking and linting; do not run cycle lint in the agent
+  workflow.
+- Manual desktop and mobile checks for the long form and both continuation
+  paths when browser tooling is available.
+
+### Merge independence and review gate
+
+R2 is the final BEJ-103 creation gate and can merge safely after E1, E2, and R1.
+It replaces E2's documented temporary redirect with the final continuation
+behavior and leaves no dependency on deferred UX work.
+
+Stop after validation and request final BEJ-103 review. Deferred items remain
+unauthorized unless they are moved into an approved planning gate.

From 29fd214c7c7ac3f9ae33fc0f5f30bed4c7c5a449 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Tue, 21 Jul 2026 11:00:49 +0300
Subject: [PATCH 02/24] docs(trials): limit E2 rule-window resolution to
 creation

ref bej-103
---
 docs/planning/trials/event-creation.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/planning/trials/event-creation.md b/docs/planning/trials/event-creation.md
index 017650e4..66c09756 100644
--- a/docs/planning/trials/event-creation.md
+++ b/docs/planning/trials/event-creation.md
@@ -88,9 +88,8 @@ separate approval.
   place. Keep the remaining existing event metadata fields optional.
 - Reject creation when the unique `TrialEvent.sklKoeId` already belongs to an
   event; do not turn a create request into an update.
-- Resolve `trialRuleWindowId` from the event date using the existing active
-  rule-window behavior. When the event date is edited later, keep its resolved
-  rule window consistent with the new date.
+- During event creation, resolve the initial `trialRuleWindowId` from the
+  entered event date using the existing active rule-window behavior.
 - Change result deletion so removing the final `TrialEntry` leaves the
   `TrialEvent` persisted and empty.
 - Add explicit event deletion that succeeds only when the event has zero
@@ -115,6 +114,9 @@ persisted event workspace.
 - No automatic cleanup or expiry for empty events.
 - No cascade deletion of a non-empty event.
 - No redesign of the trials index or existing result-edit modal.
+- No change to later event-edit behavior, including rule-window recalculation
+  when an existing event date is edited. Any such change requires its own
+  approved planning change.
 - No public UI, statistics, or import redesign.
 
 ### Dependencies
@@ -126,7 +128,8 @@ persisted event workspace.
 ### Acceptance criteria
 
 - An authorized admin can create an event with the required identity fields
-  and optional existing event metadata.
+  and optional existing event metadata, with its initial `trialRuleWindowId`
+  resolved from the entered event date.
 - Invalid required values and an already-used SKL ID return stable validation
   or conflict errors without creating an event.
 - The created event is visible to admin reads, opens in its workspace, and is

From c519d268bcdebe097b73af6c3383b62f16070971 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Tue, 21 Jul 2026 12:36:14 +0300
Subject: [PATCH 03/24] feat(admin-trials): add dedicated event workspace

  Implement BEJ-103 Gate E1 with a stable full-page
  workspace for an
  existing trial event at /admin/trials/[trialEventId].

  - reuse the existing event summary, result list, edit
    dialogs, PDF action,
    and result deletion
  - add loading, not-found, generic error, and retry
    states
  - link the selected event to its workspace with
    centralized route helpers
  - preserve the current final-result deletion lifecycle
  - add Finnish and Swedish translations and focused
    tests
  - update trial-management documentation and the
    changelog

Refs: BEJ-103
---
 CHANGELOG.md                                  |   2 +
 .../[trialEventId]/__tests__/page.test.tsx    |  22 +++
 .../admin/trials/[trialEventId]/page.tsx      |  11 ++
 .../admin-trial-entry-actions.test.tsx        |  34 +++-
 ...trial-event-workspace-page-client.test.tsx | 160 ++++++++++++++++++
 .../admin-trial-selected-event-panel.test.tsx |  42 ++++-
 .../admin-trials-page-client.test.tsx         |   6 +-
 ...dmin-trial-event-workspace-page-client.tsx |  69 ++++++++
 .../admin-trial-selected-event-panel.tsx      |  34 ++--
 .../admin/trials/admin-trials-page-client.tsx |   6 +
 apps/web/components/admin/trials/index.ts     |   1 +
 .../trials/__tests__/trial-route.test.ts      |  18 ++
 apps/web/lib/admin/trials/index.ts            |   1 +
 apps/web/lib/admin/trials/trial-route.ts      |   9 +
 .../admin/trials/__tests__/index.test.ts      |  16 ++
 .../lib/i18n/messages/admin/trials/manage.ts  |  13 ++
 .../manage/use-admin-trial-event-query.ts     |  12 +-
 docs/features/admin-trial-management.md       |  29 +++-
 docs/planning/trials/event-creation.md        |  11 +-
 19 files changed, 467 insertions(+), 29 deletions(-)
 create mode 100644 apps/web/app/(admin)/admin/trials/[trialEventId]/__tests__/page.test.tsx
 create mode 100644 apps/web/app/(admin)/admin/trials/[trialEventId]/page.tsx
 create mode 100644 apps/web/components/admin/trials/__tests__/admin-trial-event-workspace-page-client.test.tsx
 create mode 100644 apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx
 create mode 100644 apps/web/lib/admin/trials/__tests__/trial-route.test.ts
 create mode 100644 apps/web/lib/admin/trials/index.ts
 create mode 100644 apps/web/lib/admin/trials/trial-route.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb3871f8..5f9c7860 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ This project uses a user-facing changelog format.
 
 ### Added
 
+- Ylläpitäjä voi avata ajokoetapahtuman omalle sivulleen tarkastelua ja nykyisiä muokkaustoimintoja varten.
+
 ### Changed
 
 ### Fixed
diff --git a/apps/web/app/(admin)/admin/trials/[trialEventId]/__tests__/page.test.tsx b/apps/web/app/(admin)/admin/trials/[trialEventId]/__tests__/page.test.tsx
new file mode 100644
index 00000000..195da362
--- /dev/null
+++ b/apps/web/app/(admin)/admin/trials/[trialEventId]/__tests__/page.test.tsx
@@ -0,0 +1,22 @@
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it, vi } from "vitest";
+import AdminTrialEventWorkspacePage from "../page";
+
+vi.mock("@/components/admin/trials", () => ({
+  AdminTrialEventWorkspacePageClient: ({
+    trialEventId,
+  }: {
+    trialEventId: string;
+  }) => React.createElement("div", null, trialEventId),
+}));
+
+describe("AdminTrialEventWorkspacePage", () => {
+  it("forwards the route trial event id", async () => {
+    const page = await AdminTrialEventWorkspacePage({
+      params: Promise.resolve({ trialEventId: "event-1" }),
+    });
+
+    expect(renderToStaticMarkup(page)).toContain("event-1");
+  });
+});
diff --git a/apps/web/app/(admin)/admin/trials/[trialEventId]/page.tsx b/apps/web/app/(admin)/admin/trials/[trialEventId]/page.tsx
new file mode 100644
index 00000000..a7c7d62b
--- /dev/null
+++ b/apps/web/app/(admin)/admin/trials/[trialEventId]/page.tsx
@@ -0,0 +1,11 @@
+import { AdminTrialEventWorkspacePageClient } from "@/components/admin/trials";
+
+export default async function AdminTrialEventWorkspacePage({
+  params,
+}: {
+  params: Promise<{ trialEventId: string }>;
+}) {
+  const { trialEventId } = await params;
+
+  return <AdminTrialEventWorkspacePageClient trialEventId={trialEventId} />;
+}
diff --git a/apps/web/components/admin/trials/__tests__/admin-trial-entry-actions.test.tsx b/apps/web/components/admin/trials/__tests__/admin-trial-entry-actions.test.tsx
index a0d60d5e..a1be33dc 100644
--- a/apps/web/components/admin/trials/__tests__/admin-trial-entry-actions.test.tsx
+++ b/apps/web/components/admin/trials/__tests__/admin-trial-entry-actions.test.tsx
@@ -93,6 +93,7 @@ describe("AdminTrialEntryActions", () => {
 
   it("calls delete mutation with correct ids", async () => {
     vi.stubGlobal("window", { confirm: () => true, alert: vi.fn() });
+    const onDeletedTrialEvent = vi.fn();
     const mutateAsync = vi.fn().mockResolvedValue({
       deletedTrialEntryId: "entry-1",
       trialEventId: "event-1",
@@ -113,7 +114,7 @@ describe("AdminTrialEntryActions", () => {
         eventPlace: "Helsinki",
         eventName: "Kevatkoe",
         onEditEntry: vi.fn(),
-        onDeletedTrialEvent: vi.fn(),
+        onDeletedTrialEvent,
       }),
     );
 
@@ -123,6 +124,37 @@ describe("AdminTrialEntryActions", () => {
       trialEventId: "event-1",
       trialEntryId: "entry-1",
     });
+    expect(onDeletedTrialEvent).not.toHaveBeenCalled();
+    vi.unstubAllGlobals();
+  });
+
+  it("keeps the current event selected when deletion fails", async () => {
+    const alert = vi.fn();
+    vi.stubGlobal("window", { confirm: () => true, alert });
+    const onDeletedTrialEvent = vi.fn();
+    useDeleteAdminTrialEntryMutationMock.mockReturnValue({
+      mutateAsync: vi.fn().mockRejectedValue(new Error("Delete failed")),
+      isPending: false,
+    });
+
+    renderToStaticMarkup(
+      React.createElement(AdminTrialEntryActions, {
+        trialEventId: "event-1",
+        trialEntryId: "entry-1",
+        dogName: "Rex",
+        registrationNo: "FI123",
+        eventDate: "2026-04-14",
+        eventPlace: "Helsinki",
+        eventName: "Kevatkoe",
+        onEditEntry: vi.fn(),
+        onDeletedTrialEvent,
+      }),
+    );
+
+    await rowActionsMock.current[1]?.onSelect();
+
+    expect(onDeletedTrialEvent).not.toHaveBeenCalled();
+    expect(alert).toHaveBeenCalledWith("Delete failed");
     vi.unstubAllGlobals();
   });
 
diff --git a/apps/web/components/admin/trials/__tests__/admin-trial-event-workspace-page-client.test.tsx b/apps/web/components/admin/trials/__tests__/admin-trial-event-workspace-page-client.test.tsx
new file mode 100644
index 00000000..2d3e23a6
--- /dev/null
+++ b/apps/web/components/admin/trials/__tests__/admin-trial-event-workspace-page-client.test.tsx
@@ -0,0 +1,160 @@
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { AdminTrialEventWorkspacePageClient } from "../admin-trial-event-workspace-page-client";
+
+const {
+  buttonActionsRef,
+  panelPropsRef,
+  queryState,
+  refetchMock,
+  replaceMock,
+} = vi.hoisted(() => ({
+  buttonActionsRef: {
+    current: {} as Record<string, (() => void) | undefined>,
+  },
+  panelPropsRef: { current: null as Record<string, unknown> | null },
+  queryState: {
+    data: undefined as { event: { trialEventId: string } } | undefined,
+    error: null as { errorCode?: string } | null,
+    isError: false,
+    isLoading: false,
+  },
+  refetchMock: vi.fn(),
+  replaceMock: vi.fn(),
+}));
+
+vi.mock("next/navigation", () => ({
+  useRouter: () => ({ replace: replaceMock }),
+}));
+
+vi.mock("@/components/ui/button", () => ({
+  Button: ({
+    children,
+    asChild,
+    ...props
+  }: {
+    children: React.ReactNode;
+    asChild?: boolean;
+    [key: string]: unknown;
+  }) => {
+    if (typeof children === "string") {
+      buttonActionsRef.current[children] = props.onClick as
+        | (() => void)
+        | undefined;
+    }
+    return asChild
+      ? React.createElement(React.Fragment, null, children)
+      : React.createElement("button", props, children);
+  },
+}));
+
+vi.mock("@/components/ui/card", () => ({
+  Card: ({ children }: { children: React.ReactNode }) =>
+    React.createElement("section", null, children),
+  CardContent: ({ children }: { children: React.ReactNode }) =>
+    React.createElement("div", null, children),
+}));
+
+vi.mock("@/hooks/i18n", () => ({
+  useI18n: () => ({ t: (key: string) => key }),
+}));
+
+vi.mock("@/queries/admin/trials", () => ({
+  useAdminTrialEventQuery: () => ({ ...queryState, refetch: refetchMock }),
+}));
+
+vi.mock("../admin-trial-selected-event-panel", () => ({
+  AdminTrialSelectedEventPanel: (props: Record<string, unknown>) => {
+    panelPropsRef.current = props;
+    return React.createElement("section", null, "selected-event-panel");
+  },
+}));
+
+describe("AdminTrialEventWorkspacePageClient", () => {
+  beforeEach(() => {
+    queryState.data = undefined;
+    queryState.error = null;
+    queryState.isError = false;
+    queryState.isLoading = false;
+    panelPropsRef.current = null;
+    buttonActionsRef.current = {};
+    refetchMock.mockReset();
+    replaceMock.mockReset();
+  });
+
+  it("loads the requested event and renders the reused panel without a self-link", () => {
+    queryState.data = { event: { trialEventId: "event-1" } };
+
+    const html = renderToStaticMarkup(
+      React.createElement(AdminTrialEventWorkspacePageClient, {
+        trialEventId: "event-1",
+      }),
+    );
+
+    expect(html).toContain("admin.trials.manage.workspace.title");
+    expect(html).toContain("selected-event-panel");
+    expect(panelPropsRef.current?.selectedEvent).toEqual({
+      trialEventId: "event-1",
+    });
+    expect(panelPropsRef.current?.workspaceHref).toBeUndefined();
+  });
+
+  it("passes loading state to the reused panel", () => {
+    queryState.isLoading = true;
+
+    renderToStaticMarkup(
+      React.createElement(AdminTrialEventWorkspacePageClient, {
+        trialEventId: "event-1",
+      }),
+    );
+
+    expect(panelPropsRef.current?.isLoading).toBe(true);
+  });
+
+  it("renders a dedicated not-found state without another event", () => {
+    queryState.isError = true;
+    queryState.error = { errorCode: "TRIAL_EVENT_NOT_FOUND" };
+
+    const html = renderToStaticMarkup(
+      React.createElement(AdminTrialEventWorkspacePageClient, {
+        trialEventId: "missing-event",
+      }),
+    );
+
+    expect(html).toContain("admin.trials.manage.workspace.notFound");
+    expect(html).not.toContain("selected-event-panel");
+    expect(html).not.toContain("admin.trials.manage.workspace.retry");
+  });
+
+  it("renders a retry action for generic read errors", () => {
+    queryState.isError = true;
+    queryState.error = { errorCode: "INTERNAL_ERROR" };
+
+    const html = renderToStaticMarkup(
+      React.createElement(AdminTrialEventWorkspacePageClient, {
+        trialEventId: "event-1",
+      }),
+    );
+
+    expect(html).toContain("admin.trials.manage.workspace.error");
+    expect(html).toContain("admin.trials.manage.workspace.retry");
+    buttonActionsRef.current["admin.trials.manage.workspace.retry"]?.();
+    expect(refetchMock).toHaveBeenCalledOnce();
+  });
+
+  it("returns to the trials page when the current event is deleted", () => {
+    queryState.data = { event: { trialEventId: "event-1" } };
+
+    renderToStaticMarkup(
+      React.createElement(AdminTrialEventWorkspacePageClient, {
+        trialEventId: "event-1",
+      }),
+    );
+    const onDeletedTrialEvent = panelPropsRef.current
+      ?.onDeletedTrialEvent as () => void;
+    onDeletedTrialEvent();
+
+    expect(replaceMock).toHaveBeenCalledWith("/admin/trials");
+  });
+});
diff --git a/apps/web/components/admin/trials/__tests__/admin-trial-selected-event-panel.test.tsx b/apps/web/components/admin/trials/__tests__/admin-trial-selected-event-panel.test.tsx
index 9f33a278..a4ff0fb8 100644
--- a/apps/web/components/admin/trials/__tests__/admin-trial-selected-event-panel.test.tsx
+++ b/apps/web/components/admin/trials/__tests__/admin-trial-selected-event-panel.test.tsx
@@ -38,11 +38,16 @@ vi.mock("@/components/ui/card", () => ({
 vi.mock("@/components/ui/button", () => ({
   Button: ({
     children,
+    asChild,
     ...props
   }: {
     children: React.ReactNode;
+    asChild?: boolean;
     [key: string]: unknown;
-  }) => React.createElement("button", props, children),
+  }) =>
+    asChild
+      ? React.createElement(React.Fragment, null, children)
+      : React.createElement("button", props, children),
 }));
 
 vi.mock("next/link", () => ({
@@ -123,5 +128,40 @@ describe("AdminTrialSelectedEventPanel", () => {
     expect(html).toContain("actions-trial-1");
     expect(html).toContain("admin.trials.manage.selected.actions.editEvent");
     expect(html).toContain("edit-dialog-false");
+    expect(html).not.toContain(
+      "admin.trials.manage.selected.actions.openWorkspace",
+    );
+  });
+
+  it("renders an optional event workspace link", () => {
+    const html = renderToStaticMarkup(
+      React.createElement(AdminTrialSelectedEventPanel, {
+        selectedEvent: {
+          trialEventId: "event-1",
+          eventDate: "2026-04-14",
+          eventPlace: "Helsinki",
+          eventName: null,
+          jarjestaja: null,
+          ylituomari: null,
+          ylituomariNumero: null,
+          ytKertomus: null,
+          kennelpiiri: null,
+          kennelpiirinro: null,
+          sklKoeId: 12345,
+          dogCount: 0,
+          entries: [],
+        },
+        isLoading: false,
+        isError: false,
+        errorText: "error",
+        workspaceHref: "/admin/trials/event-1",
+        onDeletedTrialEvent: vi.fn(),
+      }),
+    );
+
+    expect(html).toContain('href="/admin/trials/event-1"');
+    expect(html).toContain(
+      "admin.trials.manage.selected.actions.openWorkspace",
+    );
   });
 });
diff --git a/apps/web/components/admin/trials/__tests__/admin-trials-page-client.test.tsx b/apps/web/components/admin/trials/__tests__/admin-trials-page-client.test.tsx
index 3e481b2e..a7ffb103 100644
--- a/apps/web/components/admin/trials/__tests__/admin-trials-page-client.test.tsx
+++ b/apps/web/components/admin/trials/__tests__/admin-trials-page-client.test.tsx
@@ -72,17 +72,19 @@ vi.mock("../admin-trial-selected-event-panel", () => ({
     isError,
     errorText,
     onDeletedTrialEvent,
+    workspaceHref,
   }: {
     selectedEvent: { trialEventId: string } | null;
     isLoading: boolean;
     isError: boolean;
     errorText: string;
     onDeletedTrialEvent: (deletedTrialEventId: string) => void;
+    workspaceHref?: string;
   }) =>
     React.createElement(
       "section",
       { "data-testid": "selected" },
-      `${selectedEvent?.trialEventId ?? ""}|${isLoading}|${isError}|${errorText}|${typeof onDeletedTrialEvent}`,
+      `${selectedEvent?.trialEventId ?? ""}|${isLoading}|${isError}|${errorText}|${typeof onDeletedTrialEvent}|${workspaceHref ?? ""}`,
     ),
 }));
 
@@ -170,7 +172,7 @@ describe("AdminTrialsPageClient", () => {
     expect(html).toContain("year|||");
     expect(html).toContain("2|1|1|event-1|admin.trials.manage.error");
     expect(html).toContain(
-      "event-1|false|false|admin.trials.manage.selected.error|function",
+      "event-1|false|false|admin.trials.manage.selected.error|function|/admin/trials/event-1",
     );
   });
 
diff --git a/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx b/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx
new file mode 100644
index 00000000..1741900d
--- /dev/null
+++ b/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx
@@ -0,0 +1,69 @@
+"use client";
+
+import { useRouter } from "next/navigation";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
+import { useI18n } from "@/hooks/i18n";
+import { getAdminTrialsHref } from "@/lib/admin/trials";
+import { useAdminTrialEventQuery } from "@/queries/admin/trials";
+import { AdminTrialSelectedEventPanel } from "./admin-trial-selected-event-panel";
+
+type AdminTrialEventWorkspacePageClientProps = {
+  trialEventId: string;
+};
+
+export function AdminTrialEventWorkspacePageClient({
+  trialEventId,
+}: AdminTrialEventWorkspacePageClientProps) {
+  const { t } = useI18n();
+  const router = useRouter();
+  const eventQuery = useAdminTrialEventQuery({ trialEventId });
+  const errorCode = eventQuery.error?.errorCode;
+
+  return (
+    <div className="space-y-4">
+      <div className="space-y-2">
+        <h1 className="text-2xl font-semibold tracking-tight">
+          {t("admin.trials.manage.workspace.title")}
+        </h1>
+      </div>
+
+      {eventQuery.isError ? (
+        <Card>
+          <CardContent className="space-y-4 p-5">
+            <p
+              className={
+                errorCode === "TRIAL_EVENT_NOT_FOUND"
+                  ? "text-sm text-muted-foreground"
+                  : "text-sm text-destructive"
+              }
+            >
+              {t(
+                errorCode === "TRIAL_EVENT_NOT_FOUND"
+                  ? "admin.trials.manage.workspace.notFound"
+                  : "admin.trials.manage.workspace.error",
+              )}
+            </p>
+            {errorCode === "TRIAL_EVENT_NOT_FOUND" ? null : (
+              <Button
+                type="button"
+                variant="outline"
+                onClick={() => void eventQuery.refetch()}
+              >
+                {t("admin.trials.manage.workspace.retry")}
+              </Button>
+            )}
+          </CardContent>
+        </Card>
+      ) : (
+        <AdminTrialSelectedEventPanel
+          selectedEvent={eventQuery.data?.event ?? null}
+          isLoading={eventQuery.isLoading}
+          isError={false}
+          errorText={t("admin.trials.manage.workspace.error")}
+          onDeletedTrialEvent={() => router.replace(getAdminTrialsHref())}
+        />
+      )}
+    </div>
+  );
+}
diff --git a/apps/web/components/admin/trials/admin-trial-selected-event-panel.tsx b/apps/web/components/admin/trials/admin-trial-selected-event-panel.tsx
index 9cf740e2..5c6f3b8c 100644
--- a/apps/web/components/admin/trials/admin-trial-selected-event-panel.tsx
+++ b/apps/web/components/admin/trials/admin-trial-selected-event-panel.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import React from "react";
+import Link from "next/link";
 import {
   ListingSectionShell,
   ListingResponsiveResults,
@@ -33,6 +34,7 @@ type AdminTrialSelectedEventPanelProps = {
   isError: boolean;
   errorText: string;
   onDeletedTrialEvent: (deletedTrialEventId: string) => void;
+  workspaceHref?: string;
 };
 
 const EMPTY_ENTRIES: AdminTrialEventEntry[] = [];
@@ -43,6 +45,7 @@ export function AdminTrialSelectedEventPanel({
   isError,
   errorText,
   onDeletedTrialEvent,
+  workspaceHref,
 }: AdminTrialSelectedEventPanelProps) {
   const { t } = useI18n();
   const [isEditOpen, setIsEditOpen] = React.useState(false);
@@ -163,16 +166,27 @@ export function AdminTrialSelectedEventPanel({
                     </p>
                   </div>
                 </div>
-                <Button
-                  type="button"
-                  onClick={() => {
-                    setEditError(null);
-                    setIsEditOpen(true);
-                  }}
-                  disabled={updateMutation.isPending}
-                >
-                  {t("admin.trials.manage.selected.actions.editEvent")}
-                </Button>
+                <div className="flex flex-wrap gap-2">
+                  {workspaceHref ? (
+                    <Button asChild variant="outline">
+                      <Link href={workspaceHref}>
+                        {t(
+                          "admin.trials.manage.selected.actions.openWorkspace",
+                        )}
+                      </Link>
+                    </Button>
+                  ) : null}
+                  <Button
+                    type="button"
+                    onClick={() => {
+                      setEditError(null);
+                      setIsEditOpen(true);
+                    }}
+                    disabled={updateMutation.isPending}
+                  >
+                    {t("admin.trials.manage.selected.actions.editEvent")}
+                  </Button>
+                </div>
               </div>
             </div>
             <SelectedEventEntries
diff --git a/apps/web/components/admin/trials/admin-trials-page-client.tsx b/apps/web/components/admin/trials/admin-trials-page-client.tsx
index 644e3b0a..3bbf235d 100644
--- a/apps/web/components/admin/trials/admin-trials-page-client.tsx
+++ b/apps/web/components/admin/trials/admin-trials-page-client.tsx
@@ -3,6 +3,7 @@
 import React, { useState } from "react";
 import type { AdminTrialEventSearchRequest } from "@beagle/contracts";
 import { useI18n } from "@/hooks/i18n";
+import { getAdminTrialEventHref } from "@/lib/admin/trials";
 import { AdminTrialEventsFilters } from "./admin-trial-events-filters";
 import { AdminTrialEventsResults } from "./admin-trial-events-results";
 import { AdminTrialSelectedEventPanel } from "./admin-trial-selected-event-panel";
@@ -190,6 +191,11 @@ export function AdminTrialsPageClient() {
         isLoading={eventQuery.isLoading}
         isError={eventQuery.isError}
         errorText={selectedErrorText}
+        workspaceHref={
+          eventQuery.data?.event
+            ? getAdminTrialEventHref(eventQuery.data.event.trialEventId)
+            : undefined
+        }
         onDeletedTrialEvent={(deletedTrialEventId) => {
           setSelectedEventIdInput("");
           setBlockedAutoSelectedEventId(deletedTrialEventId);
diff --git a/apps/web/components/admin/trials/index.ts b/apps/web/components/admin/trials/index.ts
index 68d53bb6..f015b28d 100644
--- a/apps/web/components/admin/trials/index.ts
+++ b/apps/web/components/admin/trials/index.ts
@@ -1 +1,2 @@
+export { AdminTrialEventWorkspacePageClient } from "./admin-trial-event-workspace-page-client";
 export { AdminTrialsPageClient } from "./admin-trials-page-client";
diff --git a/apps/web/lib/admin/trials/__tests__/trial-route.test.ts b/apps/web/lib/admin/trials/__tests__/trial-route.test.ts
new file mode 100644
index 00000000..31d1388b
--- /dev/null
+++ b/apps/web/lib/admin/trials/__tests__/trial-route.test.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from "vitest";
+import { getAdminTrialEventHref, getAdminTrialsHref } from "../trial-route";
+
+describe("admin trial route helpers", () => {
+  it("returns the admin trials root", () => {
+    expect(getAdminTrialsHref()).toBe("/admin/trials");
+  });
+
+  it("builds an event workspace href", () => {
+    expect(getAdminTrialEventHref("event-1")).toBe("/admin/trials/event-1");
+  });
+
+  it("encodes the event id as one path segment", () => {
+    expect(getAdminTrialEventHref("event/with spaces")).toBe(
+      "/admin/trials/event%2Fwith%20spaces",
+    );
+  });
+});
diff --git a/apps/web/lib/admin/trials/index.ts b/apps/web/lib/admin/trials/index.ts
new file mode 100644
index 00000000..2f3dfb12
--- /dev/null
+++ b/apps/web/lib/admin/trials/index.ts
@@ -0,0 +1 @@
+export * from "./trial-route";
diff --git a/apps/web/lib/admin/trials/trial-route.ts b/apps/web/lib/admin/trials/trial-route.ts
new file mode 100644
index 00000000..fc4f9324
--- /dev/null
+++ b/apps/web/lib/admin/trials/trial-route.ts
@@ -0,0 +1,9 @@
+const ADMIN_TRIALS_ROUTE_ROOT = "/admin/trials";
+
+export function getAdminTrialsHref(): string {
+  return ADMIN_TRIALS_ROUTE_ROOT;
+}
+
+export function getAdminTrialEventHref(trialEventId: string): string {
+  return `${ADMIN_TRIALS_ROUTE_ROOT}/${encodeURIComponent(trialEventId)}`;
+}
diff --git a/apps/web/lib/i18n/messages/admin/trials/__tests__/index.test.ts b/apps/web/lib/i18n/messages/admin/trials/__tests__/index.test.ts
index 2396b14b..2861a72a 100644
--- a/apps/web/lib/i18n/messages/admin/trials/__tests__/index.test.ts
+++ b/apps/web/lib/i18n/messages/admin/trials/__tests__/index.test.ts
@@ -15,6 +15,14 @@ describe("admin trial message index", () => {
     expect(
       fiAdminTrialsMessages["admin.trials.manage.selected.actions.editEvent"],
     ).toBe("Muokkaa tapahtumaa");
+    expect(
+      fiAdminTrialsMessages["admin.trials.manage.workspace.notFound"],
+    ).toBe("Ajokoetapahtumaa ei löytynyt.");
+    expect(
+      fiAdminTrialsMessages[
+        "admin.trials.manage.selected.actions.openWorkspace"
+      ],
+    ).toBe("Avaa tapahtuman sivu");
     expect(svAdminTrialsMessages["admin.trials.manage.events.title"]).toBe(
       "Evenemang",
     );
@@ -27,5 +35,13 @@ describe("admin trial message index", () => {
     expect(
       svAdminTrialsMessages["admin.trials.manage.selected.actions.editEvent"],
     ).toBe("Redigera evenemang");
+    expect(
+      svAdminTrialsMessages["admin.trials.manage.workspace.notFound"],
+    ).toBe("Jaktprovsevenemanget hittades inte.");
+    expect(
+      svAdminTrialsMessages[
+        "admin.trials.manage.selected.actions.openWorkspace"
+      ],
+    ).toBe("Öppna evenemangssidan");
   });
 });
diff --git a/apps/web/lib/i18n/messages/admin/trials/manage.ts b/apps/web/lib/i18n/messages/admin/trials/manage.ts
index 3d9f0b1b..c07f2248 100644
--- a/apps/web/lib/i18n/messages/admin/trials/manage.ts
+++ b/apps/web/lib/i18n/messages/admin/trials/manage.ts
@@ -40,6 +40,11 @@ export const fiAdminTrialsManageMessages = {
   "admin.trials.manage.events.columns.name": "Tapahtuma",
   "admin.trials.manage.events.columns.judge": "Ylituomari",
   "admin.trials.manage.events.columns.dogs": "Koiria",
+  "admin.trials.manage.workspace.title": "Ajokoetapahtuma",
+  "admin.trials.manage.workspace.notFound": "Ajokoetapahtumaa ei löytynyt.",
+  "admin.trials.manage.workspace.error":
+    "Ajokoetapahtuman lataaminen epäonnistui.",
+  "admin.trials.manage.workspace.retry": "Yritä uudelleen",
   "admin.trials.manage.selected.title": "Valittu tapahtuma",
   "admin.trials.manage.selected.subtitle":
     "Tapahtuman koirarivit ja rivikohtaiset toiminnot.",
@@ -60,6 +65,7 @@ export const fiAdminTrialsManageMessages = {
   "admin.trials.manage.selected.columns.actions": "Toiminnot",
   "admin.trials.manage.selected.actions.openPdf": "Avaa pöytäkirja",
   "admin.trials.manage.selected.actions.more": "Lisää toimintoja",
+  "admin.trials.manage.selected.actions.openWorkspace": "Avaa tapahtuman sivu",
   "admin.trials.manage.selected.actions.editEvent": "Muokkaa tapahtumaa",
   "admin.trials.manage.selected.actions.editEntry": "Muokkaa riviä",
   "admin.trials.manage.entryModal.header.title": "Muokattava koerivi",
@@ -167,6 +173,12 @@ export const svAdminTrialsManageMessages = {
   "admin.trials.manage.events.columns.name": "Evenemang",
   "admin.trials.manage.events.columns.judge": "Överdomare",
   "admin.trials.manage.events.columns.dogs": "Hundar",
+  "admin.trials.manage.workspace.title": "Jaktprovsevenemang",
+  "admin.trials.manage.workspace.notFound":
+    "Jaktprovsevenemanget hittades inte.",
+  "admin.trials.manage.workspace.error":
+    "Det gick inte att ladda jaktprovsevenemanget.",
+  "admin.trials.manage.workspace.retry": "Försök igen",
   "admin.trials.manage.selected.title": "Valt evenemang",
   "admin.trials.manage.selected.subtitle":
     "Hundrader och radåtgärder för valt evenemang.",
@@ -186,6 +198,7 @@ export const svAdminTrialsManageMessages = {
   "admin.trials.manage.selected.columns.actions": "Åtgärder",
   "admin.trials.manage.selected.actions.openPdf": "Öppna protokoll",
   "admin.trials.manage.selected.actions.more": "Fler åtgärder",
+  "admin.trials.manage.selected.actions.openWorkspace": "Öppna evenemangssidan",
   "admin.trials.manage.selected.actions.editEvent": "Redigera evenemang",
   "admin.trials.manage.selected.actions.editEntry": "Redigera rad",
   "admin.trials.manage.entryModal.header.title": "Redigerad provrad",
diff --git a/apps/web/queries/admin/trials/manage/use-admin-trial-event-query.ts b/apps/web/queries/admin/trials/manage/use-admin-trial-event-query.ts
index 6293fe99..9a20ea17 100644
--- a/apps/web/queries/admin/trials/manage/use-admin-trial-event-query.ts
+++ b/apps/web/queries/admin/trials/manage/use-admin-trial-event-query.ts
@@ -10,13 +10,13 @@ import { adminTrialEventQueryKey } from "./query-keys";
 
 const adminTrialsApiClient = createAdminTrialsApiClient();
 
-class AdminTrialEventQueryError extends Error {
-  errorCode?: string;
-
-  constructor(message: string, errorCode?: string) {
+export class AdminTrialEventQueryError extends Error {
+  constructor(
+    message: string,
+    readonly errorCode?: string,
+  ) {
     super(message);
     this.name = "AdminTrialEventQueryError";
-    this.errorCode = errorCode;
   }
 }
 
@@ -26,7 +26,7 @@ type UseAdminTrialEventQueryInput = AdminTrialEventDetailsRequest & {
 
 export function useAdminTrialEventQuery(input: UseAdminTrialEventQueryInput) {
   const normalizedTrialEventId = input.trialEventId.trim();
-  return useQuery<AdminTrialEventDetailsResponse>({
+  return useQuery<AdminTrialEventDetailsResponse, AdminTrialEventQueryError>({
     queryKey: adminTrialEventQueryKey(normalizedTrialEventId),
     queryFn: async () => {
       const result = await adminTrialsApiClient.getAdminTrialEvent({
diff --git a/docs/features/admin-trial-management.md b/docs/features/admin-trial-management.md
index b1dcb6d9..17c90851 100644
--- a/docs/features/admin-trial-management.md
+++ b/docs/features/admin-trial-management.md
@@ -1,21 +1,24 @@
 # Admin Trial Management
 
-Developer notes for the admin trial read-only event flow (`BEJ-76`, `BEJ-81`
+Developer notes for the admin trial event flow (`BEJ-76`, `BEJ-81`, `BEJ-103`
 and follow-up admin flow redesign).
 
 ## Primary purpose
 
 - The admin list page is an event-first master-detail workflow for canonical
   AJOK `TrialEvent` + `TrialEntry` rows.
-- The main user task is to search events, select one event, then inspect its
-  dog rows without editing.
-- Per-dog inspection opens the generated trial PDF. There is no separate admin
-  trial row detail page.
+- An admin can search events, select one event, inspect and edit its metadata
+  and dog rows, delete a result, or open the event at the stable
+  `/admin/trials/[trialEventId]` workspace URL.
+- Per-dog inspection opens the generated trial PDF. Existing event and result
+  editing remains modal-based.
 
 ## Main files
 
 - `apps/web/app/(admin)/admin/trials/page.tsx`: route entrypoint for event master-detail list
+- `apps/web/app/(admin)/admin/trials/[trialEventId]/page.tsx`: stable event workspace route
 - `apps/web/components/admin/trials/admin-trials-page-client.tsx`: event filters + event list + selected-event rows
+- `apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx`: one-event workspace states and navigation
 - `apps/web/components/admin/trials/admin-trial-selected-event-panel.tsx`: selected-event rows and row actions
 - `apps/web/components/admin/trials/admin-trial-entry-actions.tsx`: per-dog PDF action
 - `apps/web/queries/admin/trials/manage/use-admin-trial-events-query.ts`: event list query hook
@@ -32,7 +35,10 @@ and follow-up admin flow redesign).
 
 1. List page fetches event summaries through `useAdminTrialEventsQuery`.
 2. Event selection fetches selected event rows through `useAdminTrialEventQuery`.
-3. Row action opens `/api/trials/[trialId]/pdf` in a new tab.
+3. The selected-event panel links to the stable event workspace, which fetches
+   only the `trialEventId` from its route.
+4. Event and result changes use the existing admin mutations; the PDF action
+   opens `/api/trials/[trialEntryId]/pdf` in a new tab.
 
 ## Contract rules
 
@@ -48,11 +54,18 @@ and follow-up admin flow redesign).
 ## Render rules
 
 - Event rows/cards are the interaction target for choosing a selected event.
-- Selected event dog rows have one action: open the dog-specific trial PDF.
-- The admin flow has no update/remove controls and no separate row detail page.
+- The selected-event header has event edit and workspace navigation actions.
+- Selected dog rows have PDF, edit, and result-delete actions.
+- A missing workspace event is shown explicitly and never falls back to a
+  different event.
+- Until BEJ-103 Gate E2 changes the lifecycle, deleting the final result also
+  deletes its event. The workspace then returns to `/admin/trials`; non-final
+  and failed deletions remain on the workspace.
 
 ## Tests
 
+- `apps/web/app/(admin)/admin/trials/[trialEventId]/__tests__/page.test.tsx`
+- `apps/web/components/admin/trials/__tests__/admin-trial-event-workspace-page-client.test.tsx`
 - `apps/web/components/admin/trials/__tests__/admin-trials-page-client.test.tsx`
 - `apps/web/components/admin/trials/__tests__/admin-trial-entry-actions.test.tsx`
 - `apps/web/components/admin/trials/__tests__/admin-trial-selected-event-panel.test.tsx`
diff --git a/docs/planning/trials/event-creation.md b/docs/planning/trials/event-creation.md
index 66c09756..21d53989 100644
--- a/docs/planning/trials/event-creation.md
+++ b/docs/planning/trials/event-creation.md
@@ -28,12 +28,16 @@ Rules:
 
 ### Scope
 
-- Add a dedicated admin event workspace route for one `trialEventId`.
+- Add a dedicated `/admin/trials/[trialEventId]` workspace route for one
+  `trialEventId`.
 - Reuse the existing admin event detail query, event summary, result list,
   event-edit action, result-edit modal, PDF action, and result-delete action
   where practical.
 - Add an explicit way to open the workspace from the current trials page.
 - Provide loading, missing-event, and read-error states on the workspace.
+- Provide retry for generic read failures.
+- Never select or display a different event when the requested event is
+  missing.
 - Keep authorization at the existing admin layout and backend boundaries.
 
 ### Exclusions
@@ -57,12 +61,17 @@ Rules:
 - Existing edit, PDF, and result-delete actions retain their current behavior.
 - Missing and inaccessible event states are handled without falling back to a
   different event.
+- Deleting a non-final result or failing to delete a result leaves the admin on
+  the workspace. If current final-result deletion also deletes the event, the
+  workspace returns to `/admin/trials`.
 - The current trials list continues to work as before.
 
 ### Targeted validation
 
 - Add focused route/component tests for loading, success, missing, and error
   states.
+- Cover retry, workspace navigation, no self-link, no missing-event fallback,
+  and all current result-deletion outcomes.
 - Run the existing selected-event component and action tests affected by reuse.
 - Run targeted web type checking and linting for touched code.
 - Manually verify the workspace at desktop and mobile widths when browser

From 8f25a9e67815937cf51d64705b9ad65aa22d0f28 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Tue, 21 Jul 2026 12:45:16 +0300
Subject: [PATCH 04/24] chore(admin-trials): remove redundant workspace heading
 wrapper

  Remove an unnecessary layout wrapper around the trial
  event workspace
  heading without changing its appearance or behaviour.

ref bej-103
---
 .../trials/admin-trial-event-workspace-page-client.tsx    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx b/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx
index 1741900d..793fdaff 100644
--- a/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx
+++ b/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx
@@ -22,11 +22,9 @@ export function AdminTrialEventWorkspacePageClient({
 
   return (
     <div className="space-y-4">
-      <div className="space-y-2">
-        <h1 className="text-2xl font-semibold tracking-tight">
-          {t("admin.trials.manage.workspace.title")}
-        </h1>
-      </div>
+      <h1 className="text-2xl font-semibold tracking-tight">
+        {t("admin.trials.manage.workspace.title")}
+      </h1>
 
       {eventQuery.isError ? (
         <Card>

From d7cc9200563b4e1391d220fd4bc2827bd5baa245 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Tue, 21 Jul 2026 15:03:53 +0300
Subject: [PATCH 05/24] feat(admin-trials): add event creation and empty-event
 lifecycle

  Implement BEJ-103 Gate E2 with full-page trial event creation
  and explicit management of empty events.

  - add contracts, Server Actions, mutations, and persistence use cases
    for creating and deleting trial events
  - require a positive SKL event ID, date, and place during creation
  - default new events to the current Helsinki business date
  - resolve active rule windows through the shared DB repository
  - preserve an event when its final result is deleted
  - allow explicit deletion only for events without results
  - add localized confirmation and toast feedback for event deletion
  - reuse event form fields without changing existing edit behavior
  - retain empty events in admin views while excluding them publicly
  - add focused web, server, DB, and integration coverage
  - update trial-management documentation and the changelog

  Refs: BEJ-103
---
 CHANGELOG.md                                  |   4 +
 .../admin/trials/new/__tests__/page.test.tsx  |  32 +++
 .../web/app/(admin)/admin/trials/new/page.tsx |  10 +
 .../create-admin-trial-event.test.ts          |  84 ++++++++
 .../delete-admin-trial-event.test.ts          |  60 ++++++
 .../trials/manage/create-admin-trial-event.ts |  62 ++++++
 .../trials/manage/delete-admin-trial-event.ts |  62 ++++++
 .../app/actions/admin/trials/manage/index.ts  |   2 +
 ...in-trial-event-create-page-client.test.tsx | 203 ++++++++++++++++++
 .../admin-trial-event-delete-action.test.tsx  | 148 +++++++++++++
 ...trial-event-workspace-page-client.test.tsx |   1 +
 .../admin-trial-selected-event-panel.test.tsx |  34 +++
 .../admin-trials-page-client.test.tsx         |   2 +
 .../admin-trial-event-create-page-client.tsx  |  84 ++++++++
 .../admin-trial-event-delete-action.tsx       |  77 +++++++
 .../admin-trial-event-edit-dialog-helpers.ts  |  31 ++-
 .../trials/admin-trial-event-edit-dialog.tsx  | 137 +-----------
 .../trials/admin-trial-event-form-fields.tsx  | 120 +++++++++++
 ...dmin-trial-event-workspace-page-client.tsx |   2 +
 .../admin-trial-selected-event-panel.tsx      |  12 ++
 .../admin/trials/admin-trials-page-client.tsx |  28 ++-
 apps/web/components/admin/trials/index.ts     |   1 +
 .../trials/__tests__/trial-route.test.ts      |  10 +-
 apps/web/lib/admin/trials/index.ts            |   1 +
 .../submit-admin-trial-event-creation.ts      | 106 +++++++++
 apps/web/lib/admin/trials/trial-route.ts      |   4 +
 .../admin/trials/__tests__/index.test.ts      |   6 +
 .../lib/i18n/messages/admin/trials/manage.ts  |  48 ++++-
 ...-create-admin-trial-event-mutation.test.ts |  66 ++++++
 ...-delete-admin-trial-event-mutation.test.ts |  52 +++++
 apps/web/queries/admin/trials/manage/index.ts |   2 +
 .../use-create-admin-trial-event-mutation.ts  |  42 ++++
 .../use-delete-admin-trial-event-mutation.ts  |  42 ++++
 docs/features/admin-trial-management.md       |  25 ++-
 .../trials/manage/create-admin-trial-event.ts |  15 ++
 .../trials/manage/delete-admin-trial-event.ts |   7 +
 .../contracts/admin/trials/manage/index.ts    |   8 +
 packages/contracts/index.ts                   |   4 +
 .../__tests__/create-trial-event.test.ts      |  68 ++++++
 .../__tests__/delete-trial-entry.test.ts      |  49 +----
 .../__tests__/delete-trial-event.test.ts      |  65 ++++++
 .../admin/trials/manage/create-trial-event.ts |  43 ++++
 .../admin/trials/manage/delete-trial-entry.ts |  22 +-
 .../admin/trials/manage/delete-trial-event.ts |  39 ++++
 packages/db/admin/trials/manage/index.ts      |  10 +
 packages/db/index.ts                          |   8 +
 .../list-active-trial-rule-windows.test.ts    |  32 +++
 packages/db/trials/index.ts                   |   4 +
 .../trials/list-active-trial-rule-windows.ts  |  22 ++
 packages/server/admin/index.ts                |   2 +
 .../create-trial-event.integration.test.ts    |  92 ++++++++
 .../__tests__/create-trial-event.test.ts      | 109 ++++++++++
 .../__tests__/delete-trial-entry.test.ts      |   4 +-
 .../__tests__/delete-trial-event.test.ts      |  64 ++++++
 .../admin/trials/manage/create-trial-event.ts | 155 +++++++++++++
 .../admin/trials/manage/delete-trial-event.ts | 124 +++++++++++
 packages/server/admin/trials/manage/index.ts  |   2 +
 .../parse-admin-trial-event-write-input.ts    | 108 ++++++++++
 .../admin/trials/manage/update-trial-event.ts |  88 ++------
 packages/server/index.ts                      |   2 +
 .../__tests__/upsert-ajok-result.test.ts      |  14 +-
 .../koiratietokanta/upsert-ajok-result.ts     |  10 +-
 62 files changed, 2458 insertions(+), 312 deletions(-)
 create mode 100644 apps/web/app/(admin)/admin/trials/new/__tests__/page.test.tsx
 create mode 100644 apps/web/app/(admin)/admin/trials/new/page.tsx
 create mode 100644 apps/web/app/actions/admin/trials/manage/__tests__/create-admin-trial-event.test.ts
 create mode 100644 apps/web/app/actions/admin/trials/manage/__tests__/delete-admin-trial-event.test.ts
 create mode 100644 apps/web/app/actions/admin/trials/manage/create-admin-trial-event.ts
 create mode 100644 apps/web/app/actions/admin/trials/manage/delete-admin-trial-event.ts
 create mode 100644 apps/web/components/admin/trials/__tests__/admin-trial-event-create-page-client.test.tsx
 create mode 100644 apps/web/components/admin/trials/__tests__/admin-trial-event-delete-action.test.tsx
 create mode 100644 apps/web/components/admin/trials/admin-trial-event-create-page-client.tsx
 create mode 100644 apps/web/components/admin/trials/admin-trial-event-delete-action.tsx
 create mode 100644 apps/web/components/admin/trials/admin-trial-event-form-fields.tsx
 create mode 100644 apps/web/lib/admin/trials/submit-admin-trial-event-creation.ts
 create mode 100644 apps/web/queries/admin/trials/manage/__tests__/use-create-admin-trial-event-mutation.test.ts
 create mode 100644 apps/web/queries/admin/trials/manage/__tests__/use-delete-admin-trial-event-mutation.test.ts
 create mode 100644 apps/web/queries/admin/trials/manage/use-create-admin-trial-event-mutation.ts
 create mode 100644 apps/web/queries/admin/trials/manage/use-delete-admin-trial-event-mutation.ts
 create mode 100644 packages/contracts/admin/trials/manage/create-admin-trial-event.ts
 create mode 100644 packages/contracts/admin/trials/manage/delete-admin-trial-event.ts
 create mode 100644 packages/db/admin/trials/manage/__tests__/create-trial-event.test.ts
 create mode 100644 packages/db/admin/trials/manage/__tests__/delete-trial-event.test.ts
 create mode 100644 packages/db/admin/trials/manage/create-trial-event.ts
 create mode 100644 packages/db/admin/trials/manage/delete-trial-event.ts
 create mode 100644 packages/db/trials/__tests__/list-active-trial-rule-windows.test.ts
 create mode 100644 packages/db/trials/list-active-trial-rule-windows.ts
 create mode 100644 packages/server/admin/trials/manage/__tests__/create-trial-event.integration.test.ts
 create mode 100644 packages/server/admin/trials/manage/__tests__/create-trial-event.test.ts
 create mode 100644 packages/server/admin/trials/manage/__tests__/delete-trial-event.test.ts
 create mode 100644 packages/server/admin/trials/manage/create-trial-event.ts
 create mode 100644 packages/server/admin/trials/manage/delete-trial-event.ts
 create mode 100644 packages/server/admin/trials/manage/internal/parse-admin-trial-event-write-input.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f9c7860..c3daad43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,9 +15,13 @@ This project uses a user-facing changelog format.
 ### Added
 
 - Ylläpitäjä voi avata ajokoetapahtuman omalle sivulleen tarkastelua ja nykyisiä muokkaustoimintoja varten.
+- Ylläpitäjä voi luoda ajokoetapahtuman perustietoineen ja avata sen omalle sivulleen ennen koetulosten lisäämistä.
+- Ylläpitäjä voi poistaa tyhjän ajokoetapahtuman sen omalta sivulta.
 
 ### Changed
 
+- Viimeisen koetuloksen poistaminen säilyttää ajokoetapahtuman tyhjänä, kunnes ylläpitäjä poistaa tapahtuman erikseen.
+
 ### Fixed
 
 ### Removed
diff --git a/apps/web/app/(admin)/admin/trials/new/__tests__/page.test.tsx b/apps/web/app/(admin)/admin/trials/new/__tests__/page.test.tsx
new file mode 100644
index 00000000..c48701b1
--- /dev/null
+++ b/apps/web/app/(admin)/admin/trials/new/__tests__/page.test.tsx
@@ -0,0 +1,32 @@
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it, vi } from "vitest";
+import AdminTrialEventCreatePage from "../page";
+
+const { clientPropsRef, toBusinessDateInputValueMock } = vi.hoisted(() => ({
+  clientPropsRef: { current: null as { initialEventDate: string } | null },
+  toBusinessDateInputValueMock: vi.fn(() => "2026-07-21"),
+}));
+
+vi.mock("@/components/admin/trials", () => ({
+  AdminTrialEventCreatePageClient: (props: { initialEventDate: string }) => {
+    clientPropsRef.current = props;
+    return React.createElement("div", null, "create-trial-event");
+  },
+}));
+
+vi.mock("@/lib/admin/core/date", () => ({
+  toBusinessDateInputValue: toBusinessDateInputValueMock,
+}));
+
+describe("AdminTrialEventCreatePage", () => {
+  it("renders the event creation client", () => {
+    expect(renderToStaticMarkup(<AdminTrialEventCreatePage />)).toContain(
+      "create-trial-event",
+    );
+    expect(toBusinessDateInputValueMock).toHaveBeenCalledWith(expect.any(Date));
+    expect(clientPropsRef.current).toEqual({
+      initialEventDate: "2026-07-21",
+    });
+  });
+});
diff --git a/apps/web/app/(admin)/admin/trials/new/page.tsx b/apps/web/app/(admin)/admin/trials/new/page.tsx
new file mode 100644
index 00000000..651a4ae3
--- /dev/null
+++ b/apps/web/app/(admin)/admin/trials/new/page.tsx
@@ -0,0 +1,10 @@
+import { AdminTrialEventCreatePageClient } from "@/components/admin/trials";
+import { toBusinessDateInputValue } from "@/lib/admin/core/date";
+
+export default function AdminTrialEventCreatePage() {
+  return (
+    <AdminTrialEventCreatePageClient
+      initialEventDate={toBusinessDateInputValue(new Date())}
+    />
+  );
+}
diff --git a/apps/web/app/actions/admin/trials/manage/__tests__/create-admin-trial-event.test.ts b/apps/web/app/actions/admin/trials/manage/__tests__/create-admin-trial-event.test.ts
new file mode 100644
index 00000000..df1dc044
--- /dev/null
+++ b/apps/web/app/actions/admin/trials/manage/__tests__/create-admin-trial-event.test.ts
@@ -0,0 +1,84 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createAdminTrialEventAction } from "../create-admin-trial-event";
+
+const { guardMock, userMock, createMock } = vi.hoisted(() => ({
+  guardMock: vi.fn(),
+  userMock: vi.fn(),
+  createMock: vi.fn(),
+}));
+
+vi.mock("@/lib/server/admin-guard", () => ({
+  requireAdminLayoutAccess: guardMock,
+}));
+vi.mock("@/lib/server/current-user", () => ({
+  getSessionCurrentUser: userMock,
+}));
+vi.mock("@beagle/server", () => ({ createAdminTrialEvent: createMock }));
+
+const input = {
+  eventDate: "2026-07-21",
+  eventPlace: "Helsinki",
+  jarjestaja: null,
+  ylituomari: null,
+  ylituomariNumero: null,
+  ytKertomus: null,
+  kennelpiiri: null,
+  kennelpiirinro: null,
+  sklKoeId: 123,
+};
+
+describe("createAdminTrialEventAction", () => {
+  beforeEach(() => {
+    guardMock.mockReset();
+    userMock.mockReset();
+    createMock.mockReset();
+  });
+
+  it("rejects missing admin access", async () => {
+    guardMock.mockResolvedValue({ ok: false, status: 403 });
+
+    await expect(createAdminTrialEventAction(input)).resolves.toMatchObject({
+      hasError: true,
+      errorCode: "FORBIDDEN",
+    });
+    expect(createMock).not.toHaveBeenCalled();
+  });
+
+  it("propagates service errors", async () => {
+    guardMock.mockResolvedValue({ ok: true });
+    userMock.mockResolvedValue({
+      id: "u_1",
+      email: "admin@example.com",
+      role: "ADMIN",
+    });
+    createMock.mockResolvedValue({
+      status: 409,
+      body: { ok: false, code: "SKL_KOE_ID_CONFLICT", error: "Conflict" },
+    });
+
+    await expect(createAdminTrialEventAction(input)).resolves.toEqual({
+      data: null,
+      hasError: true,
+      errorCode: "SKL_KOE_ID_CONFLICT",
+      message: "Conflict",
+    });
+  });
+
+  it("returns navigation data", async () => {
+    guardMock.mockResolvedValue({ ok: true });
+    userMock.mockResolvedValue({
+      id: "u_1",
+      email: "admin@example.com",
+      role: "ADMIN",
+    });
+    createMock.mockResolvedValue({
+      status: 201,
+      body: { ok: true, data: { trialEventId: "event-1" } },
+    });
+
+    await expect(createAdminTrialEventAction(input)).resolves.toEqual({
+      data: { trialEventId: "event-1" },
+      hasError: false,
+    });
+  });
+});
diff --git a/apps/web/app/actions/admin/trials/manage/__tests__/delete-admin-trial-event.test.ts b/apps/web/app/actions/admin/trials/manage/__tests__/delete-admin-trial-event.test.ts
new file mode 100644
index 00000000..4028ac1f
--- /dev/null
+++ b/apps/web/app/actions/admin/trials/manage/__tests__/delete-admin-trial-event.test.ts
@@ -0,0 +1,60 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { deleteAdminTrialEventAction } from "../delete-admin-trial-event";
+
+const { guardMock, userMock, deleteMock } = vi.hoisted(() => ({
+  guardMock: vi.fn(),
+  userMock: vi.fn(),
+  deleteMock: vi.fn(),
+}));
+
+vi.mock("@/lib/server/admin-guard", () => ({
+  requireAdminLayoutAccess: guardMock,
+}));
+vi.mock("@/lib/server/current-user", () => ({
+  getSessionCurrentUser: userMock,
+}));
+vi.mock("@beagle/server", () => ({ deleteAdminTrialEvent: deleteMock }));
+
+describe("deleteAdminTrialEventAction", () => {
+  beforeEach(() => {
+    guardMock.mockReset();
+    userMock.mockReset();
+    deleteMock.mockReset();
+    guardMock.mockResolvedValue({ ok: true });
+    userMock.mockResolvedValue({
+      id: "u_1",
+      email: "admin@example.com",
+      role: "ADMIN",
+    });
+  });
+
+  it("propagates the non-empty conflict", async () => {
+    deleteMock.mockResolvedValue({
+      status: 409,
+      body: { ok: false, code: "TRIAL_EVENT_NOT_EMPTY", error: "Not empty" },
+    });
+
+    await expect(
+      deleteAdminTrialEventAction({ trialEventId: "event-1" }),
+    ).resolves.toEqual({
+      data: null,
+      hasError: true,
+      errorCode: "TRIAL_EVENT_NOT_EMPTY",
+      message: "Not empty",
+    });
+  });
+
+  it("returns the deleted event id", async () => {
+    deleteMock.mockResolvedValue({
+      status: 200,
+      body: { ok: true, data: { deletedTrialEventId: "event-1" } },
+    });
+
+    await expect(
+      deleteAdminTrialEventAction({ trialEventId: "event-1" }),
+    ).resolves.toEqual({
+      data: { deletedTrialEventId: "event-1" },
+      hasError: false,
+    });
+  });
+});
diff --git a/apps/web/app/actions/admin/trials/manage/create-admin-trial-event.ts b/apps/web/app/actions/admin/trials/manage/create-admin-trial-event.ts
new file mode 100644
index 00000000..e8cf4d9d
--- /dev/null
+++ b/apps/web/app/actions/admin/trials/manage/create-admin-trial-event.ts
@@ -0,0 +1,62 @@
+"use server";
+
+import type {
+  CreateAdminTrialEventRequest,
+  CreateAdminTrialEventResponse,
+} from "@beagle/contracts";
+import { createAdminTrialEvent } from "@beagle/server";
+import { requireAdminLayoutAccess } from "@/lib/server/admin-guard";
+import { getSessionCurrentUser } from "@/lib/server/current-user";
+
+export type CreateAdminTrialEventActionResult = {
+  data: CreateAdminTrialEventResponse | null;
+  hasError: boolean;
+  errorCode?: string;
+  message?: string;
+};
+
+export async function createAdminTrialEventAction(
+  input: CreateAdminTrialEventRequest,
+): Promise<CreateAdminTrialEventActionResult> {
+  const adminAccess = await requireAdminLayoutAccess();
+  if (!adminAccess.ok) {
+    return {
+      data: null,
+      hasError: true,
+      errorCode: adminAccess.status === 401 ? "UNAUTHENTICATED" : "FORBIDDEN",
+      message: "Admin access required.",
+    };
+  }
+
+  const currentUser = await getSessionCurrentUser();
+  if (!currentUser) {
+    return {
+      data: null,
+      hasError: true,
+      errorCode: "UNAUTHENTICATED",
+      message: "Admin access required.",
+    };
+  }
+
+  const result = await createAdminTrialEvent(
+    input,
+    {
+      id: currentUser.id,
+      email: currentUser.email,
+      username: null,
+      role: currentUser.role,
+    },
+    { actorUserId: currentUser.id },
+  );
+
+  if (!result.body.ok) {
+    return {
+      data: null,
+      hasError: true,
+      errorCode: result.body.code,
+      message: result.body.error,
+    };
+  }
+
+  return { data: result.body.data, hasError: false };
+}
diff --git a/apps/web/app/actions/admin/trials/manage/delete-admin-trial-event.ts b/apps/web/app/actions/admin/trials/manage/delete-admin-trial-event.ts
new file mode 100644
index 00000000..eb184920
--- /dev/null
+++ b/apps/web/app/actions/admin/trials/manage/delete-admin-trial-event.ts
@@ -0,0 +1,62 @@
+"use server";
+
+import type {
+  DeleteAdminTrialEventRequest,
+  DeleteAdminTrialEventResponse,
+} from "@beagle/contracts";
+import { deleteAdminTrialEvent } from "@beagle/server";
+import { requireAdminLayoutAccess } from "@/lib/server/admin-guard";
+import { getSessionCurrentUser } from "@/lib/server/current-user";
+
+export type DeleteAdminTrialEventActionResult = {
+  data: DeleteAdminTrialEventResponse | null;
+  hasError: boolean;
+  errorCode?: string;
+  message?: string;
+};
+
+export async function deleteAdminTrialEventAction(
+  input: DeleteAdminTrialEventRequest,
+): Promise<DeleteAdminTrialEventActionResult> {
+  const adminAccess = await requireAdminLayoutAccess();
+  if (!adminAccess.ok) {
+    return {
+      data: null,
+      hasError: true,
+      errorCode: adminAccess.status === 401 ? "UNAUTHENTICATED" : "FORBIDDEN",
+      message: "Admin access required.",
+    };
+  }
+
+  const currentUser = await getSessionCurrentUser();
+  if (!currentUser) {
+    return {
+      data: null,
+      hasError: true,
+      errorCode: "UNAUTHENTICATED",
+      message: "Admin access required.",
+    };
+  }
+
+  const result = await deleteAdminTrialEvent(
+    input,
+    {
+      id: currentUser.id,
+      email: currentUser.email,
+      username: null,
+      role: currentUser.role,
+    },
+    { actorUserId: currentUser.id },
+  );
+
+  if (!result.body.ok) {
+    return {
+      data: null,
+      hasError: true,
+      errorCode: result.body.code,
+      message: result.body.error,
+    };
+  }
+
+  return { data: result.body.data, hasError: false };
+}
diff --git a/apps/web/app/actions/admin/trials/manage/index.ts b/apps/web/app/actions/admin/trials/manage/index.ts
index 5bbd9528..d31db353 100644
--- a/apps/web/app/actions/admin/trials/manage/index.ts
+++ b/apps/web/app/actions/admin/trials/manage/index.ts
@@ -1,3 +1,5 @@
+export { createAdminTrialEventAction } from "./create-admin-trial-event";
+export { deleteAdminTrialEventAction } from "./delete-admin-trial-event";
 export { deleteAdminTrialEntryAction } from "./delete-admin-trial-entry";
 export { updateAdminTrialEventAction } from "./update-admin-trial-event";
 export { updateAdminTrialEntryAction } from "./update-admin-trial-entry";
diff --git a/apps/web/components/admin/trials/__tests__/admin-trial-event-create-page-client.test.tsx b/apps/web/components/admin/trials/__tests__/admin-trial-event-create-page-client.test.tsx
new file mode 100644
index 00000000..9b492494
--- /dev/null
+++ b/apps/web/components/admin/trials/__tests__/admin-trial-event-create-page-client.test.tsx
@@ -0,0 +1,203 @@
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { AdminMutationError } from "@/queries/admin/mutation-error";
+import { submitAdminTrialEventCreation } from "@/lib/admin/trials";
+import { AdminTrialEventCreatePageClient } from "../admin-trial-event-create-page-client";
+
+const { formDraftRef, mutationState, mutateAsyncMock, replaceMock } =
+  vi.hoisted(() => ({
+    formDraftRef: {
+      current: null as { eventDate: string } | null,
+    },
+    mutationState: { isPending: false },
+    mutateAsyncMock: vi.fn(),
+    replaceMock: vi.fn(),
+  }));
+
+vi.mock("next/navigation", () => ({
+  useRouter: () => ({ replace: replaceMock }),
+}));
+vi.mock("@/hooks/i18n", () => ({
+  useI18n: () => ({ t: (key: string) => key }),
+}));
+vi.mock("@/queries/admin/trials", () => ({
+  useCreateAdminTrialEventMutation: () => ({
+    mutateAsync: mutateAsyncMock,
+    isPending: mutationState.isPending,
+  }),
+}));
+vi.mock("../admin-trial-event-form-fields", () => ({
+  AdminTrialEventFormFields: (props: { draft: { eventDate: string } }) => {
+    formDraftRef.current = props.draft;
+    return React.createElement("div", null, "event-form-fields");
+  },
+}));
+vi.mock("@/components/ui/card", () => ({
+  Card: ({ children }: { children: React.ReactNode }) =>
+    React.createElement("section", null, children),
+  CardContent: ({ children }: { children: React.ReactNode }) =>
+    React.createElement("div", null, children),
+}));
+
+describe("AdminTrialEventCreatePageClient", () => {
+  beforeEach(() => {
+    mutationState.isPending = false;
+    formDraftRef.current = null;
+    mutateAsyncMock.mockReset();
+    replaceMock.mockReset();
+  });
+
+  it("renders the full-page form and cancel destination", () => {
+    const html = renderToStaticMarkup(
+      <AdminTrialEventCreatePageClient initialEventDate="2026-07-21" />,
+    );
+
+    expect(html).toContain("admin.trials.manage.create.title");
+    expect(html).toContain("event-form-fields");
+    expect(html).toContain('href="/admin/trials"');
+    expect(html).toContain("admin.trials.manage.create.save");
+    expect(formDraftRef.current?.eventDate).toBe("2026-07-21");
+  });
+
+  it("disables submission while the create mutation is pending", () => {
+    mutationState.isPending = true;
+
+    const html = renderToStaticMarkup(
+      <AdminTrialEventCreatePageClient initialEventDate="2026-07-21" />,
+    );
+
+    expect(html).toContain("admin.trials.manage.create.saving");
+    expect(html).toContain('type="submit" disabled=""');
+  });
+
+  const validDraft = {
+    eventDate: " 2026-07-21 ",
+    eventPlace: " Helsinki ",
+    jarjestaja: " Club ",
+    ylituomari: " Judge ",
+    ylituomariNumero: " 123 ",
+    ytKertomus: " Report ",
+    kennelpiiri: " District ",
+    kennelpiirinro: " 10 ",
+    sklKoeId: " 456 ",
+  };
+  const t = (key: string) => key;
+
+  it.each([
+    [
+      "event date",
+      { eventDate: " " },
+      "admin.trials.manage.eventModal.validation.invalidDate",
+    ],
+    [
+      "event place",
+      { eventPlace: " " },
+      "admin.trials.manage.eventModal.validation.requiredPlace",
+    ],
+    [
+      "SKL id",
+      { sklKoeId: "0" },
+      "admin.trials.manage.eventModal.validation.invalidSklKoeId",
+    ],
+  ])(
+    "validates the required %s before mutation",
+    async (_label, override, error) => {
+      const setErrorText = vi.fn();
+
+      await submitAdminTrialEventCreation({
+        draft: { ...validDraft, ...override },
+        isPending: false,
+        mutateAsync: mutateAsyncMock,
+        replace: replaceMock,
+        setErrorText,
+        t,
+      });
+
+      expect(mutateAsyncMock).not.toHaveBeenCalled();
+      expect(setErrorText).toHaveBeenLastCalledWith(error);
+    },
+  );
+
+  it("normalizes the request and navigates to the exact workspace", async () => {
+    mutateAsyncMock.mockResolvedValue({ trialEventId: "event/with spaces" });
+
+    await submitAdminTrialEventCreation({
+      draft: validDraft,
+      isPending: false,
+      mutateAsync: mutateAsyncMock,
+      replace: replaceMock,
+      setErrorText: vi.fn(),
+      t,
+    });
+
+    expect(mutateAsyncMock).toHaveBeenCalledWith({
+      eventDate: "2026-07-21",
+      eventPlace: "Helsinki",
+      jarjestaja: "Club",
+      ylituomari: "Judge",
+      ylituomariNumero: "123",
+      ytKertomus: "Report",
+      kennelpiiri: "District",
+      kennelpiirinro: "10",
+      sklKoeId: 456,
+    });
+    expect(replaceMock).toHaveBeenCalledWith(
+      "/admin/trials/event%2Fwith%20spaces",
+    );
+  });
+
+  it("preserves the draft and shows localized duplicate feedback", async () => {
+    const draft = { ...validDraft };
+    const originalDraft = { ...draft };
+    const setErrorText = vi.fn();
+    mutateAsyncMock.mockRejectedValue(
+      new AdminMutationError("Conflict", "SKL_KOE_ID_CONFLICT"),
+    );
+
+    await submitAdminTrialEventCreation({
+      draft,
+      isPending: false,
+      mutateAsync: mutateAsyncMock,
+      replace: replaceMock,
+      setErrorText,
+      t,
+    });
+
+    expect(draft).toEqual(originalDraft);
+    expect(setErrorText).toHaveBeenLastCalledWith(
+      "admin.trials.manage.create.conflict",
+    );
+    expect(replaceMock).not.toHaveBeenCalled();
+  });
+
+  it("maps unexpected failures and blocks duplicate pending submissions", async () => {
+    const setErrorText = vi.fn();
+    mutateAsyncMock.mockRejectedValue(new Error("boom"));
+
+    await submitAdminTrialEventCreation({
+      draft: validDraft,
+      isPending: false,
+      mutateAsync: mutateAsyncMock,
+      replace: replaceMock,
+      setErrorText,
+      t,
+    });
+    expect(setErrorText).toHaveBeenLastCalledWith(
+      "admin.trials.manage.create.error",
+    );
+
+    mutateAsyncMock.mockClear();
+    setErrorText.mockClear();
+    await submitAdminTrialEventCreation({
+      draft: validDraft,
+      isPending: true,
+      mutateAsync: mutateAsyncMock,
+      replace: replaceMock,
+      setErrorText,
+      t,
+    });
+    expect(mutateAsyncMock).not.toHaveBeenCalled();
+    expect(setErrorText).not.toHaveBeenCalled();
+  });
+});
diff --git a/apps/web/components/admin/trials/__tests__/admin-trial-event-delete-action.test.tsx b/apps/web/components/admin/trials/__tests__/admin-trial-event-delete-action.test.tsx
new file mode 100644
index 00000000..72e0bb7a
--- /dev/null
+++ b/apps/web/components/admin/trials/__tests__/admin-trial-event-delete-action.test.tsx
@@ -0,0 +1,148 @@
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { AdminMutationError } from "@/queries/admin/mutation-error";
+import { AdminTrialEventDeleteAction } from "../admin-trial-event-delete-action";
+
+const {
+  confirmModalPropsRef,
+  mutationState,
+  mutateAsyncMock,
+  toastErrorMock,
+  toastSuccessMock,
+} = vi.hoisted(() => ({
+  confirmModalPropsRef: { current: null as Record<string, unknown> | null },
+  mutationState: { isPending: false },
+  mutateAsyncMock: vi.fn(),
+  toastErrorMock: vi.fn(),
+  toastSuccessMock: vi.fn(),
+}));
+
+vi.mock("@/hooks/i18n", () => ({
+  useI18n: () => ({ t: (key: string) => key }),
+}));
+
+vi.mock("@/queries/admin/trials", () => ({
+  useDeleteAdminTrialEventMutation: () => ({
+    mutateAsync: mutateAsyncMock,
+    isPending: mutationState.isPending,
+  }),
+}));
+
+vi.mock("@/components/ui/sonner", () => ({
+  toast: {
+    error: toastErrorMock,
+    success: toastSuccessMock,
+  },
+}));
+
+vi.mock("@/components/ui/confirm-modal", () => ({
+  ConfirmModal: (props: Record<string, unknown>) => {
+    confirmModalPropsRef.current = props;
+    return React.createElement("div", null, String(props.description));
+  },
+}));
+
+vi.mock("@/components/ui/button", () => ({
+  Button: ({
+    children,
+    ...props
+  }: React.ButtonHTMLAttributes<HTMLButtonElement>) =>
+    React.createElement("button", props, children),
+}));
+
+function renderAction(overrides?: {
+  onDeleted?: (trialEventId: string) => void;
+  onNotEmpty?: () => void;
+}) {
+  const onDeleted = overrides?.onDeleted ?? vi.fn();
+  const onNotEmpty = overrides?.onNotEmpty ?? vi.fn();
+  const html = renderToStaticMarkup(
+    <AdminTrialEventDeleteAction
+      trialEventId="event-1"
+      onDeleted={onDeleted}
+      onNotEmpty={onNotEmpty}
+    />,
+  );
+
+  return { html, onDeleted, onNotEmpty };
+}
+
+function confirmDeletion() {
+  const onConfirm = confirmModalPropsRef.current?.onConfirm as () => void;
+  onConfirm();
+}
+
+describe("AdminTrialEventDeleteAction", () => {
+  beforeEach(() => {
+    confirmModalPropsRef.current = null;
+    mutationState.isPending = false;
+    mutateAsyncMock.mockReset();
+    toastErrorMock.mockReset();
+    toastSuccessMock.mockReset();
+  });
+
+  it("wires the destructive confirmation and pending state", () => {
+    mutationState.isPending = true;
+
+    const { html } = renderAction();
+
+    expect(html).toContain("admin.trials.manage.deleteEvent.action");
+    expect(html).not.toContain("admin.trials.manage.deleteEvent.error");
+    expect(confirmModalPropsRef.current).toMatchObject({
+      open: false,
+      isConfirming: true,
+      title: "admin.trials.manage.deleteEvent.confirmTitle",
+      description: "admin.trials.manage.deleteEvent.confirmBody",
+    });
+  });
+
+  it("shows success feedback and reports the deleted event", async () => {
+    mutateAsyncMock.mockResolvedValue({ deletedTrialEventId: "event-1" });
+    const { onDeleted, onNotEmpty } = renderAction();
+
+    confirmDeletion();
+
+    await vi.waitFor(() => {
+      expect(toastSuccessMock).toHaveBeenCalledWith(
+        "admin.trials.manage.deleteEvent.success",
+      );
+    });
+    expect(onDeleted).toHaveBeenCalledWith("event-1");
+    expect(onNotEmpty).not.toHaveBeenCalled();
+    expect(toastErrorMock).not.toHaveBeenCalled();
+  });
+
+  it("shows one generic error toast without reporting deletion", async () => {
+    mutateAsyncMock.mockRejectedValue(new Error("boom"));
+    const { onDeleted, onNotEmpty } = renderAction();
+
+    confirmDeletion();
+
+    await vi.waitFor(() => {
+      expect(toastErrorMock).toHaveBeenCalledWith(
+        "admin.trials.manage.deleteEvent.error",
+      );
+    });
+    expect(toastErrorMock).toHaveBeenCalledOnce();
+    expect(onDeleted).not.toHaveBeenCalled();
+    expect(onNotEmpty).not.toHaveBeenCalled();
+  });
+
+  it("refreshes and shows localized feedback for a non-empty conflict", async () => {
+    mutateAsyncMock.mockRejectedValue(
+      new AdminMutationError("Conflict", "TRIAL_EVENT_NOT_EMPTY"),
+    );
+    const { onDeleted, onNotEmpty } = renderAction();
+
+    confirmDeletion();
+
+    await vi.waitFor(() => {
+      expect(toastErrorMock).toHaveBeenCalledWith(
+        "admin.trials.manage.deleteEvent.notEmpty",
+      );
+    });
+    expect(onNotEmpty).toHaveBeenCalledOnce();
+    expect(onDeleted).not.toHaveBeenCalled();
+  });
+});
diff --git a/apps/web/components/admin/trials/__tests__/admin-trial-event-workspace-page-client.test.tsx b/apps/web/components/admin/trials/__tests__/admin-trial-event-workspace-page-client.test.tsx
index 2d3e23a6..8fd60994 100644
--- a/apps/web/components/admin/trials/__tests__/admin-trial-event-workspace-page-client.test.tsx
+++ b/apps/web/components/admin/trials/__tests__/admin-trial-event-workspace-page-client.test.tsx
@@ -98,6 +98,7 @@ describe("AdminTrialEventWorkspacePageClient", () => {
       trialEventId: "event-1",
     });
     expect(panelPropsRef.current?.workspaceHref).toBeUndefined();
+    expect(panelPropsRef.current?.allowEmptyEventDeletion).toBe(true);
   });
 
   it("passes loading state to the reused panel", () => {
diff --git a/apps/web/components/admin/trials/__tests__/admin-trial-selected-event-panel.test.tsx b/apps/web/components/admin/trials/__tests__/admin-trial-selected-event-panel.test.tsx
index a4ff0fb8..41dd1c23 100644
--- a/apps/web/components/admin/trials/__tests__/admin-trial-selected-event-panel.test.tsx
+++ b/apps/web/components/admin/trials/__tests__/admin-trial-selected-event-panel.test.tsx
@@ -72,6 +72,11 @@ vi.mock("../admin-trial-event-edit-dialog", () => ({
     React.createElement("div", null, `edit-dialog-${open}`),
 }));
 
+vi.mock("../admin-trial-event-delete-action", () => ({
+  AdminTrialEventDeleteAction: ({ trialEventId }: { trialEventId: string }) =>
+    React.createElement("div", null, `delete-event-${trialEventId}`),
+}));
+
 vi.mock("@/queries/admin/trials", () => ({
   useUpdateAdminTrialEventMutation: () => ({
     mutateAsync: vi.fn(),
@@ -164,4 +169,33 @@ describe("AdminTrialSelectedEventPanel", () => {
       "admin.trials.manage.selected.actions.openWorkspace",
     );
   });
+
+  it("shows event deletion only for an empty event when explicitly allowed", () => {
+    const html = renderToStaticMarkup(
+      React.createElement(AdminTrialSelectedEventPanel, {
+        selectedEvent: {
+          trialEventId: "event-1",
+          eventDate: "2026-04-14",
+          eventPlace: "Helsinki",
+          eventName: null,
+          jarjestaja: null,
+          ylituomari: null,
+          ylituomariNumero: null,
+          ytKertomus: null,
+          kennelpiiri: null,
+          kennelpiirinro: null,
+          sklKoeId: 12345,
+          dogCount: 0,
+          entries: [],
+        },
+        isLoading: false,
+        isError: false,
+        errorText: "error",
+        onDeletedTrialEvent: vi.fn(),
+        allowEmptyEventDeletion: true,
+      }),
+    );
+
+    expect(html).toContain("delete-event-event-1");
+  });
 });
diff --git a/apps/web/components/admin/trials/__tests__/admin-trials-page-client.test.tsx b/apps/web/components/admin/trials/__tests__/admin-trials-page-client.test.tsx
index a7ffb103..5418cf17 100644
--- a/apps/web/components/admin/trials/__tests__/admin-trials-page-client.test.tsx
+++ b/apps/web/components/admin/trials/__tests__/admin-trials-page-client.test.tsx
@@ -169,6 +169,8 @@ describe("AdminTrialsPageClient", () => {
 
     expect(html).toContain("admin.trials.title");
     expect(html).toContain("admin.trials.description");
+    expect(html).toContain("admin.trials.manage.create.action");
+    expect(html).toContain("/admin/trials/new");
     expect(html).toContain("year|||");
     expect(html).toContain("2|1|1|event-1|admin.trials.manage.error");
     expect(html).toContain(
diff --git a/apps/web/components/admin/trials/admin-trial-event-create-page-client.tsx b/apps/web/components/admin/trials/admin-trial-event-create-page-client.tsx
new file mode 100644
index 00000000..df510cd5
--- /dev/null
+++ b/apps/web/components/admin/trials/admin-trial-event-create-page-client.tsx
@@ -0,0 +1,84 @@
+"use client";
+
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
+import { useI18n } from "@/hooks/i18n";
+import {
+  getAdminTrialsHref,
+  submitAdminTrialEventCreation,
+} from "@/lib/admin/trials";
+import { useCreateAdminTrialEventMutation } from "@/queries/admin/trials";
+import { createEmptyTrialEventDraft } from "./admin-trial-event-edit-dialog-helpers";
+import { AdminTrialEventFormFields } from "./admin-trial-event-form-fields";
+
+// Renders and submits the full-page manual trial event creation flow.
+export function AdminTrialEventCreatePageClient({
+  initialEventDate,
+}: {
+  initialEventDate: string;
+}) {
+  const { t } = useI18n();
+  const router = useRouter();
+  const createMutation = useCreateAdminTrialEventMutation();
+  const [draft, setDraft] = useState(() => ({
+    ...createEmptyTrialEventDraft(),
+    eventDate: initialEventDate,
+  }));
+  const [errorText, setErrorText] = useState<string | null>(null);
+
+  return (
+    <div className="space-y-4">
+      <div className="space-y-2">
+        <h1 className="text-2xl font-semibold tracking-tight">
+          {t("admin.trials.manage.create.title")}
+        </h1>
+        <p className="text-sm text-muted-foreground">
+          {t("admin.trials.manage.create.description")}
+        </p>
+      </div>
+      <Card>
+        <CardContent className="p-5">
+          <form
+            className="space-y-4"
+            onSubmit={(event) => {
+              event.preventDefault();
+              void submitAdminTrialEventCreation({
+                draft,
+                isPending: createMutation.isPending,
+                mutateAsync: createMutation.mutateAsync,
+                replace: router.replace,
+                setErrorText,
+                t,
+              });
+            }}
+          >
+            {errorText ? (
+              <p className="text-sm text-destructive">{errorText}</p>
+            ) : null}
+            <AdminTrialEventFormFields
+              draft={draft}
+              disabled={createMutation.isPending}
+              onChange={setDraft}
+              requireSklKoeId
+            />
+            <div className="flex flex-wrap gap-2">
+              <Button type="submit" disabled={createMutation.isPending}>
+                {createMutation.isPending
+                  ? t("admin.trials.manage.create.saving")
+                  : t("admin.trials.manage.create.save")}
+              </Button>
+              <Button asChild variant="outline">
+                <Link href={getAdminTrialsHref()}>
+                  {t("admin.trials.manage.create.cancel")}
+                </Link>
+              </Button>
+            </div>
+          </form>
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/apps/web/components/admin/trials/admin-trial-event-delete-action.tsx b/apps/web/components/admin/trials/admin-trial-event-delete-action.tsx
new file mode 100644
index 00000000..41501818
--- /dev/null
+++ b/apps/web/components/admin/trials/admin-trial-event-delete-action.tsx
@@ -0,0 +1,77 @@
+"use client";
+
+import { useState } from "react";
+import { Button } from "@/components/ui/button";
+import { ConfirmModal } from "@/components/ui/confirm-modal";
+import { toast } from "@/components/ui/sonner";
+import { useI18n } from "@/hooks/i18n";
+import { AdminMutationError } from "@/queries/admin/mutation-error";
+import { useDeleteAdminTrialEventMutation } from "@/queries/admin/trials";
+
+type AdminTrialEventDeleteActionProps = {
+  trialEventId: string;
+  onDeleted: (deletedTrialEventId: string) => void;
+  onNotEmpty: () => void;
+};
+
+// Coordinates confirmation, mutation feedback, and workspace callbacks for empty-event deletion.
+export function AdminTrialEventDeleteAction({
+  trialEventId,
+  onDeleted,
+  onNotEmpty,
+}: AdminTrialEventDeleteActionProps) {
+  const { t } = useI18n();
+  const deleteMutation = useDeleteAdminTrialEventMutation();
+  const [isOpen, setIsOpen] = useState(false);
+
+  async function handleDelete() {
+    try {
+      const result = await deleteMutation.mutateAsync({ trialEventId });
+      toast.success(t("admin.trials.manage.deleteEvent.success"));
+      setIsOpen(false);
+      onDeleted(result.deletedTrialEventId);
+    } catch (error) {
+      if (
+        error instanceof AdminMutationError &&
+        error.errorCode === "TRIAL_EVENT_NOT_EMPTY"
+      ) {
+        onNotEmpty();
+      }
+      toast.error(
+        error instanceof AdminMutationError
+          ? error.errorCode === "TRIAL_EVENT_NOT_EMPTY"
+            ? t("admin.trials.manage.deleteEvent.notEmpty")
+            : error.message
+          : t("admin.trials.manage.deleteEvent.error"),
+      );
+    }
+  }
+
+  return (
+    <>
+      <div className="space-y-1">
+        <Button
+          type="button"
+          variant="destructive"
+          disabled={deleteMutation.isPending}
+          onClick={() => setIsOpen(true)}
+        >
+          {t("admin.trials.manage.deleteEvent.action")}
+        </Button>
+      </div>
+      <ConfirmModal
+        open={isOpen}
+        title={t("admin.trials.manage.deleteEvent.confirmTitle")}
+        description={t("admin.trials.manage.deleteEvent.confirmBody")}
+        confirmLabel={t("admin.trials.manage.deleteEvent.confirm")}
+        confirmingLabel={t("admin.trials.manage.deleteEvent.deleting")}
+        cancelLabel={t("admin.trials.manage.deleteEvent.cancel")}
+        isConfirming={deleteMutation.isPending}
+        onConfirm={() => void handleDelete()}
+        onCancel={() => {
+          if (!deleteMutation.isPending) setIsOpen(false);
+        }}
+      />
+    </>
+  );
+}
diff --git a/apps/web/components/admin/trials/admin-trial-event-edit-dialog-helpers.ts b/apps/web/components/admin/trials/admin-trial-event-edit-dialog-helpers.ts
index 718b1e21..d4284e87 100644
--- a/apps/web/components/admin/trials/admin-trial-event-edit-dialog-helpers.ts
+++ b/apps/web/components/admin/trials/admin-trial-event-edit-dialog-helpers.ts
@@ -1,4 +1,5 @@
 import type { AdminTrialEventDetails } from "@beagle/contracts";
+export { parseSklKoeIdDraft } from "@/lib/admin/trials/submit-admin-trial-event-creation";
 
 export type TrialEventDraft = {
   eventDate: string;
@@ -12,6 +13,20 @@ export type TrialEventDraft = {
   sklKoeId: string;
 };
 
+export function createEmptyTrialEventDraft(): TrialEventDraft {
+  return {
+    eventDate: "",
+    eventPlace: "",
+    jarjestaja: "",
+    ylituomari: "",
+    ylituomariNumero: "",
+    ytKertomus: "",
+    kennelpiiri: "",
+    kennelpiirinro: "",
+    sklKoeId: "",
+  };
+}
+
 export function toTrialEventDraft(
   event: AdminTrialEventDetails,
 ): TrialEventDraft {
@@ -44,19 +59,3 @@ export function areTrialEventDraftsEqual(
     (left.sklKoeId === null ? "" : String(left.sklKoeId)) === right.sklKoeId
   );
 }
-
-const VALID_SKL_KOE_ID_PATTERN = /^[1-9]\d*$/;
-
-export function parseSklKoeIdDraft(value: string): number | null {
-  const trimmed = value.trim();
-  if (!trimmed) {
-    return null;
-  }
-
-  if (!VALID_SKL_KOE_ID_PATTERN.test(trimmed)) {
-    return null;
-  }
-
-  const parsed = Number(trimmed);
-  return Number.isSafeInteger(parsed) ? parsed : null;
-}
diff --git a/apps/web/components/admin/trials/admin-trial-event-edit-dialog.tsx b/apps/web/components/admin/trials/admin-trial-event-edit-dialog.tsx
index cb1e0f20..2d63bead 100644
--- a/apps/web/components/admin/trials/admin-trial-event-edit-dialog.tsx
+++ b/apps/web/components/admin/trials/admin-trial-event-edit-dialog.tsx
@@ -3,7 +3,6 @@
 import React, { useMemo, useState } from "react";
 import { AdminFormModalShell } from "@/components/admin";
 import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
 import { useI18n } from "@/hooks/i18n";
 import type { AdminTrialEventDetails } from "@beagle/contracts";
 import {
@@ -11,6 +10,7 @@ import {
   parseSklKoeIdDraft,
   toTrialEventDraft,
 } from "./admin-trial-event-edit-dialog-helpers";
+import { AdminTrialEventFormFields } from "./admin-trial-event-form-fields";
 
 export type UpdateAdminTrialEventPayload = {
   trialEventId: string;
@@ -197,135 +197,12 @@ function AdminTrialEventEditDialogContent({
           <p className="text-sm text-destructive">{errorText}</p>
         ) : null}
       </div>
-      <div className="grid gap-3 md:grid-cols-2">
-        <label className="space-y-1 text-sm">
-          <span>{t("admin.trials.manage.eventModal.fields.eventDate")}</span>
-          <Input
-            type="date"
-            value={draft.eventDate}
-            disabled={isPending}
-            onChange={(event) =>
-              setDraft((current) => ({
-                ...current,
-                eventDate: event.target.value,
-              }))
-            }
-          />
-        </label>
-        <label className="space-y-1 text-sm">
-          <span>{t("admin.trials.manage.eventModal.fields.eventPlace")}</span>
-          <Input
-            value={draft.eventPlace}
-            disabled={isPending}
-            onChange={(event) =>
-              setDraft((current) => ({
-                ...current,
-                eventPlace: event.target.value,
-              }))
-            }
-          />
-        </label>
-        <label className="space-y-1 text-sm">
-          <span>{t("admin.trials.manage.eventModal.fields.jarjestaja")}</span>
-          <Input
-            value={draft.jarjestaja}
-            disabled={isPending}
-            onChange={(event) =>
-              setDraft((current) => ({
-                ...current,
-                jarjestaja: event.target.value,
-              }))
-            }
-          />
-        </label>
-        <label className="space-y-1 text-sm">
-          <span>{t("admin.trials.manage.eventModal.fields.ylituomari")}</span>
-          <Input
-            value={draft.ylituomari}
-            disabled={isPending}
-            onChange={(event) =>
-              setDraft((current) => ({
-                ...current,
-                ylituomari: event.target.value,
-              }))
-            }
-          />
-          <span className="block text-xs text-muted-foreground">
-            {t("admin.trials.manage.eventModal.fields.ylituomariHelp")}
-          </span>
-        </label>
-        <label className="space-y-1 text-sm">
-          <span>
-            {t("admin.trials.manage.eventModal.fields.ylituomariNumero")}
-          </span>
-          <Input
-            value={draft.ylituomariNumero}
-            disabled={isPending}
-            onChange={(event) =>
-              setDraft((current) => ({
-                ...current,
-                ylituomariNumero: event.target.value,
-              }))
-            }
-          />
-        </label>
-        <label className="space-y-1 text-sm md:col-span-2">
-          <span>{t("admin.trials.manage.eventModal.fields.ytKertomus")}</span>
-          <textarea
-            value={draft.ytKertomus}
-            disabled={isPending}
-            onChange={(event) =>
-              setDraft((current) => ({
-                ...current,
-                ytKertomus: event.target.value,
-              }))
-            }
-            className="min-h-24 w-full rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-xs outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]"
-          />
-        </label>
-        <label className="space-y-1 text-sm">
-          <span>{t("admin.trials.manage.eventModal.fields.kennelpiiri")}</span>
-          <Input
-            value={draft.kennelpiiri}
-            disabled={isPending}
-            onChange={(event) =>
-              setDraft((current) => ({
-                ...current,
-                kennelpiiri: event.target.value,
-              }))
-            }
-          />
-        </label>
-        <label className="space-y-1 text-sm">
-          <span>
-            {t("admin.trials.manage.eventModal.fields.kennelpiirinro")}
-          </span>
-          <Input
-            value={draft.kennelpiirinro}
-            disabled={isPending}
-            onChange={(event) =>
-              setDraft((current) => ({
-                ...current,
-                kennelpiirinro: event.target.value,
-              }))
-            }
-          />
-        </label>
-        <label className="space-y-1 text-sm">
-          <span>{t("admin.trials.manage.eventModal.fields.sklKoeId")}</span>
-          <Input
-            inputMode="numeric"
-            value={draft.sklKoeId}
-            disabled={isPending}
-            onChange={(event) =>
-              setDraft((current) => ({
-                ...current,
-                sklKoeId: event.target.value,
-              }))
-            }
-          />
-        </label>
-      </div>
+      <AdminTrialEventFormFields
+        draft={draft}
+        disabled={isPending}
+        onChange={setDraft}
+        showJudgeUpdateHelp
+      />
     </AdminFormModalShell>
   );
 }
diff --git a/apps/web/components/admin/trials/admin-trial-event-form-fields.tsx b/apps/web/components/admin/trials/admin-trial-event-form-fields.tsx
new file mode 100644
index 00000000..b20cbdaa
--- /dev/null
+++ b/apps/web/components/admin/trials/admin-trial-event-form-fields.tsx
@@ -0,0 +1,120 @@
+"use client";
+
+import { Input } from "@/components/ui/input";
+import { useI18n } from "@/hooks/i18n";
+import type { TrialEventDraft } from "./admin-trial-event-edit-dialog-helpers";
+
+type AdminTrialEventFormFieldsProps = {
+  draft: TrialEventDraft;
+  disabled: boolean;
+  onChange: (draft: TrialEventDraft) => void;
+  showJudgeUpdateHelp?: boolean;
+  requireSklKoeId?: boolean;
+};
+
+export function AdminTrialEventFormFields({
+  draft,
+  disabled,
+  onChange,
+  showJudgeUpdateHelp = false,
+  requireSklKoeId = false,
+}: AdminTrialEventFormFieldsProps) {
+  const { t } = useI18n();
+
+  function setField<Field extends keyof TrialEventDraft>(
+    field: Field,
+    value: TrialEventDraft[Field],
+  ) {
+    onChange({ ...draft, [field]: value });
+  }
+
+  return (
+    <div className="grid gap-3 md:grid-cols-2">
+      <label className="space-y-1 text-sm">
+        <span>{t("admin.trials.manage.eventModal.fields.eventDate")}</span>
+        <Input
+          type="date"
+          value={draft.eventDate}
+          disabled={disabled}
+          required
+          onChange={(event) => setField("eventDate", event.target.value)}
+        />
+      </label>
+      <label className="space-y-1 text-sm">
+        <span>{t("admin.trials.manage.eventModal.fields.eventPlace")}</span>
+        <Input
+          value={draft.eventPlace}
+          disabled={disabled}
+          required
+          onChange={(event) => setField("eventPlace", event.target.value)}
+        />
+      </label>
+      <label className="space-y-1 text-sm">
+        <span>{t("admin.trials.manage.eventModal.fields.jarjestaja")}</span>
+        <Input
+          value={draft.jarjestaja}
+          disabled={disabled}
+          onChange={(event) => setField("jarjestaja", event.target.value)}
+        />
+      </label>
+      <label className="space-y-1 text-sm">
+        <span>{t("admin.trials.manage.eventModal.fields.ylituomari")}</span>
+        <Input
+          value={draft.ylituomari}
+          disabled={disabled}
+          onChange={(event) => setField("ylituomari", event.target.value)}
+        />
+        {showJudgeUpdateHelp ? (
+          <span className="block text-xs text-muted-foreground">
+            {t("admin.trials.manage.eventModal.fields.ylituomariHelp")}
+          </span>
+        ) : null}
+      </label>
+      <label className="space-y-1 text-sm">
+        <span>
+          {t("admin.trials.manage.eventModal.fields.ylituomariNumero")}
+        </span>
+        <Input
+          value={draft.ylituomariNumero}
+          disabled={disabled}
+          onChange={(event) => setField("ylituomariNumero", event.target.value)}
+        />
+      </label>
+      <label className="space-y-1 text-sm md:col-span-2">
+        <span>{t("admin.trials.manage.eventModal.fields.ytKertomus")}</span>
+        <textarea
+          value={draft.ytKertomus}
+          disabled={disabled}
+          onChange={(event) => setField("ytKertomus", event.target.value)}
+          className="min-h-24 w-full rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-xs outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]"
+        />
+      </label>
+      <label className="space-y-1 text-sm">
+        <span>{t("admin.trials.manage.eventModal.fields.kennelpiiri")}</span>
+        <Input
+          value={draft.kennelpiiri}
+          disabled={disabled}
+          onChange={(event) => setField("kennelpiiri", event.target.value)}
+        />
+      </label>
+      <label className="space-y-1 text-sm">
+        <span>{t("admin.trials.manage.eventModal.fields.kennelpiirinro")}</span>
+        <Input
+          value={draft.kennelpiirinro}
+          disabled={disabled}
+          onChange={(event) => setField("kennelpiirinro", event.target.value)}
+        />
+      </label>
+      <label className="space-y-1 text-sm">
+        <span>{t("admin.trials.manage.eventModal.fields.sklKoeId")}</span>
+        <Input
+          inputMode="numeric"
+          value={draft.sklKoeId}
+          disabled={disabled}
+          required={requireSklKoeId}
+          onChange={(event) => setField("sklKoeId", event.target.value)}
+        />
+      </label>
+    </div>
+  );
+}
diff --git a/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx b/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx
index 793fdaff..e049c019 100644
--- a/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx
+++ b/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx
@@ -60,6 +60,8 @@ export function AdminTrialEventWorkspacePageClient({
           isError={false}
           errorText={t("admin.trials.manage.workspace.error")}
           onDeletedTrialEvent={() => router.replace(getAdminTrialsHref())}
+          onTrialEventDeleteConflict={() => void eventQuery.refetch()}
+          allowEmptyEventDeletion
         />
       )}
     </div>
diff --git a/apps/web/components/admin/trials/admin-trial-selected-event-panel.tsx b/apps/web/components/admin/trials/admin-trial-selected-event-panel.tsx
index 5c6f3b8c..11dd63c0 100644
--- a/apps/web/components/admin/trials/admin-trial-selected-event-panel.tsx
+++ b/apps/web/components/admin/trials/admin-trial-selected-event-panel.tsx
@@ -27,6 +27,7 @@ import {
   type UpdateAdminTrialEventPayload,
 } from "./admin-trial-event-edit-dialog";
 import { AdminTrialEntryEditDialog } from "./admin-trial-entry-edit-dialog";
+import { AdminTrialEventDeleteAction } from "./admin-trial-event-delete-action";
 
 type AdminTrialSelectedEventPanelProps = {
   selectedEvent: AdminTrialEventDetails | null;
@@ -34,6 +35,8 @@ type AdminTrialSelectedEventPanelProps = {
   isError: boolean;
   errorText: string;
   onDeletedTrialEvent: (deletedTrialEventId: string) => void;
+  onTrialEventDeleteConflict?: () => void;
+  allowEmptyEventDeletion?: boolean;
   workspaceHref?: string;
 };
 
@@ -45,6 +48,8 @@ export function AdminTrialSelectedEventPanel({
   isError,
   errorText,
   onDeletedTrialEvent,
+  onTrialEventDeleteConflict,
+  allowEmptyEventDeletion = false,
   workspaceHref,
 }: AdminTrialSelectedEventPanelProps) {
   const { t } = useI18n();
@@ -186,6 +191,13 @@ export function AdminTrialSelectedEventPanel({
                   >
                     {t("admin.trials.manage.selected.actions.editEvent")}
                   </Button>
+                  {allowEmptyEventDeletion && selectedEntries.length === 0 ? (
+                    <AdminTrialEventDeleteAction
+                      trialEventId={selectedEvent.trialEventId}
+                      onDeleted={onDeletedTrialEvent}
+                      onNotEmpty={() => onTrialEventDeleteConflict?.()}
+                    />
+                  ) : null}
                 </div>
               </div>
             </div>
diff --git a/apps/web/components/admin/trials/admin-trials-page-client.tsx b/apps/web/components/admin/trials/admin-trials-page-client.tsx
index 3bbf235d..1c6c8384 100644
--- a/apps/web/components/admin/trials/admin-trials-page-client.tsx
+++ b/apps/web/components/admin/trials/admin-trials-page-client.tsx
@@ -1,9 +1,14 @@
 "use client";
 
 import React, { useState } from "react";
+import Link from "next/link";
 import type { AdminTrialEventSearchRequest } from "@beagle/contracts";
 import { useI18n } from "@/hooks/i18n";
-import { getAdminTrialEventHref } from "@/lib/admin/trials";
+import { Button } from "@/components/ui/button";
+import {
+  getAdminTrialEventCreateHref,
+  getAdminTrialEventHref,
+} from "@/lib/admin/trials";
 import { AdminTrialEventsFilters } from "./admin-trial-events-filters";
 import { AdminTrialEventsResults } from "./admin-trial-events-results";
 import { AdminTrialSelectedEventPanel } from "./admin-trial-selected-event-panel";
@@ -143,13 +148,20 @@ export function AdminTrialsPageClient() {
 
   return (
     <div className="space-y-4" suppressHydrationWarning>
-      <div className="space-y-2">
-        <h1 className="text-2xl font-semibold tracking-tight">
-          {t("admin.trials.title")}
-        </h1>
-        <p className="text-sm text-muted-foreground">
-          {t("admin.trials.description")}
-        </p>
+      <div className="flex flex-wrap items-start justify-between gap-3">
+        <div className="space-y-2">
+          <h1 className="text-2xl font-semibold tracking-tight">
+            {t("admin.trials.title")}
+          </h1>
+          <p className="text-sm text-muted-foreground">
+            {t("admin.trials.description")}
+          </p>
+        </div>
+        <Button asChild>
+          <Link href={getAdminTrialEventCreateHref()}>
+            {t("admin.trials.manage.create.action")}
+          </Link>
+        </Button>
       </div>
 
       <AdminTrialEventsFilters
diff --git a/apps/web/components/admin/trials/index.ts b/apps/web/components/admin/trials/index.ts
index f015b28d..36a63d92 100644
--- a/apps/web/components/admin/trials/index.ts
+++ b/apps/web/components/admin/trials/index.ts
@@ -1,2 +1,3 @@
+export { AdminTrialEventCreatePageClient } from "./admin-trial-event-create-page-client";
 export { AdminTrialEventWorkspacePageClient } from "./admin-trial-event-workspace-page-client";
 export { AdminTrialsPageClient } from "./admin-trials-page-client";
diff --git a/apps/web/lib/admin/trials/__tests__/trial-route.test.ts b/apps/web/lib/admin/trials/__tests__/trial-route.test.ts
index 31d1388b..4fd230b5 100644
--- a/apps/web/lib/admin/trials/__tests__/trial-route.test.ts
+++ b/apps/web/lib/admin/trials/__tests__/trial-route.test.ts
@@ -1,5 +1,9 @@
 import { describe, expect, it } from "vitest";
-import { getAdminTrialEventHref, getAdminTrialsHref } from "../trial-route";
+import {
+  getAdminTrialEventCreateHref,
+  getAdminTrialEventHref,
+  getAdminTrialsHref,
+} from "../trial-route";
 
 describe("admin trial route helpers", () => {
   it("returns the admin trials root", () => {
@@ -10,6 +14,10 @@ describe("admin trial route helpers", () => {
     expect(getAdminTrialEventHref("event-1")).toBe("/admin/trials/event-1");
   });
 
+  it("builds the event creation href", () => {
+    expect(getAdminTrialEventCreateHref()).toBe("/admin/trials/new");
+  });
+
   it("encodes the event id as one path segment", () => {
     expect(getAdminTrialEventHref("event/with spaces")).toBe(
       "/admin/trials/event%2Fwith%20spaces",
diff --git a/apps/web/lib/admin/trials/index.ts b/apps/web/lib/admin/trials/index.ts
index 2f3dfb12..6eb021d1 100644
--- a/apps/web/lib/admin/trials/index.ts
+++ b/apps/web/lib/admin/trials/index.ts
@@ -1 +1,2 @@
 export * from "./trial-route";
+export * from "./submit-admin-trial-event-creation";
diff --git a/apps/web/lib/admin/trials/submit-admin-trial-event-creation.ts b/apps/web/lib/admin/trials/submit-admin-trial-event-creation.ts
new file mode 100644
index 00000000..6e99cc7f
--- /dev/null
+++ b/apps/web/lib/admin/trials/submit-admin-trial-event-creation.ts
@@ -0,0 +1,106 @@
+import type {
+  CreateAdminTrialEventRequest,
+  CreateAdminTrialEventResponse,
+} from "@beagle/contracts";
+import { AdminMutationError } from "@/queries/admin/mutation-error";
+import { getAdminTrialEventHref } from "./trial-route";
+
+export type AdminTrialEventCreationDraft = {
+  eventDate: string;
+  eventPlace: string;
+  jarjestaja: string;
+  ylituomari: string;
+  ylituomariNumero: string;
+  ytKertomus: string;
+  kennelpiiri: string;
+  kennelpiirinro: string;
+  sklKoeId: string;
+};
+
+type CreationMessageKey =
+  | "admin.trials.manage.eventModal.validation.invalidDate"
+  | "admin.trials.manage.eventModal.validation.requiredPlace"
+  | "admin.trials.manage.eventModal.validation.invalidSklKoeId"
+  | "admin.trials.manage.create.conflict"
+  | "admin.trials.manage.create.error";
+
+type SubmitAdminTrialEventCreationOptions = {
+  draft: AdminTrialEventCreationDraft;
+  isPending: boolean;
+  mutateAsync: (
+    request: CreateAdminTrialEventRequest,
+  ) => Promise<CreateAdminTrialEventResponse>;
+  replace: (href: string) => void;
+  setErrorText: (errorText: string | null) => void;
+  t: (key: CreationMessageKey) => string;
+};
+
+const VALID_SKL_KOE_ID_PATTERN = /^[1-9]\d*$/;
+
+export function parseSklKoeIdDraft(value: string): number | null {
+  const normalized = value.trim();
+  if (!VALID_SKL_KOE_ID_PATTERN.test(normalized)) {
+    return null;
+  }
+
+  const parsed = Number(normalized);
+  return Number.isSafeInteger(parsed) ? parsed : null;
+}
+
+// Runs the create-form validation, mutation, error mapping, and continuation.
+export async function submitAdminTrialEventCreation({
+  draft,
+  isPending,
+  mutateAsync,
+  replace,
+  setErrorText,
+  t,
+}: SubmitAdminTrialEventCreationOptions): Promise<void> {
+  if (isPending) {
+    return;
+  }
+
+  setErrorText(null);
+  const eventDate = draft.eventDate.trim();
+  if (!eventDate) {
+    setErrorText(t("admin.trials.manage.eventModal.validation.invalidDate"));
+    return;
+  }
+
+  const eventPlace = draft.eventPlace.trim();
+  if (!eventPlace) {
+    setErrorText(t("admin.trials.manage.eventModal.validation.requiredPlace"));
+    return;
+  }
+
+  const sklKoeId = parseSklKoeIdDraft(draft.sklKoeId);
+  if (sklKoeId === null) {
+    setErrorText(
+      t("admin.trials.manage.eventModal.validation.invalidSklKoeId"),
+    );
+    return;
+  }
+
+  try {
+    const result = await mutateAsync({
+      eventDate,
+      eventPlace,
+      jarjestaja: draft.jarjestaja.trim() || null,
+      ylituomari: draft.ylituomari.trim() || null,
+      ylituomariNumero: draft.ylituomariNumero.trim() || null,
+      ytKertomus: draft.ytKertomus.trim() || null,
+      kennelpiiri: draft.kennelpiiri.trim() || null,
+      kennelpiirinro: draft.kennelpiirinro.trim() || null,
+      sklKoeId,
+    });
+    replace(getAdminTrialEventHref(result.trialEventId));
+  } catch (error) {
+    setErrorText(
+      error instanceof AdminMutationError
+        ? error.errorCode === "SKL_KOE_ID_CONFLICT"
+          ? t("admin.trials.manage.create.conflict")
+          : error.message
+        : t("admin.trials.manage.create.error"),
+    );
+  }
+}
diff --git a/apps/web/lib/admin/trials/trial-route.ts b/apps/web/lib/admin/trials/trial-route.ts
index fc4f9324..03871766 100644
--- a/apps/web/lib/admin/trials/trial-route.ts
+++ b/apps/web/lib/admin/trials/trial-route.ts
@@ -4,6 +4,10 @@ export function getAdminTrialsHref(): string {
   return ADMIN_TRIALS_ROUTE_ROOT;
 }
 
+export function getAdminTrialEventCreateHref(): string {
+  return `${ADMIN_TRIALS_ROUTE_ROOT}/new`;
+}
+
 export function getAdminTrialEventHref(trialEventId: string): string {
   return `${ADMIN_TRIALS_ROUTE_ROOT}/${encodeURIComponent(trialEventId)}`;
 }
diff --git a/apps/web/lib/i18n/messages/admin/trials/__tests__/index.test.ts b/apps/web/lib/i18n/messages/admin/trials/__tests__/index.test.ts
index 2861a72a..7b5d930f 100644
--- a/apps/web/lib/i18n/messages/admin/trials/__tests__/index.test.ts
+++ b/apps/web/lib/i18n/messages/admin/trials/__tests__/index.test.ts
@@ -23,6 +23,9 @@ describe("admin trial message index", () => {
         "admin.trials.manage.selected.actions.openWorkspace"
       ],
     ).toBe("Avaa tapahtuman sivu");
+    expect(fiAdminTrialsMessages["admin.trials.manage.create.action"]).toBe(
+      "Luo tapahtuma",
+    );
     expect(svAdminTrialsMessages["admin.trials.manage.events.title"]).toBe(
       "Evenemang",
     );
@@ -43,5 +46,8 @@ describe("admin trial message index", () => {
         "admin.trials.manage.selected.actions.openWorkspace"
       ],
     ).toBe("Öppna evenemangssidan");
+    expect(svAdminTrialsMessages["admin.trials.manage.create.action"]).toBe(
+      "Skapa evenemang",
+    );
   });
 });
diff --git a/apps/web/lib/i18n/messages/admin/trials/manage.ts b/apps/web/lib/i18n/messages/admin/trials/manage.ts
index c07f2248..ba6f8a6d 100644
--- a/apps/web/lib/i18n/messages/admin/trials/manage.ts
+++ b/apps/web/lib/i18n/messages/admin/trials/manage.ts
@@ -45,6 +45,28 @@ export const fiAdminTrialsManageMessages = {
   "admin.trials.manage.workspace.error":
     "Ajokoetapahtuman lataaminen epäonnistui.",
   "admin.trials.manage.workspace.retry": "Yritä uudelleen",
+  "admin.trials.manage.create.action": "Luo tapahtuma",
+  "admin.trials.manage.create.title": "Luo ajokoetapahtuma",
+  "admin.trials.manage.create.description":
+    "Tallenna tapahtuman perustiedot. Koirakohtaiset tulokset lisätään myöhemmin.",
+  "admin.trials.manage.create.save": "Luo tapahtuma",
+  "admin.trials.manage.create.saving": "Luodaan...",
+  "admin.trials.manage.create.cancel": "Peruuta",
+  "admin.trials.manage.create.error": "Tapahtuman luominen epäonnistui.",
+  "admin.trials.manage.create.conflict":
+    "Annettu SKL koe ID kuuluu jo toiselle tapahtumalle.",
+  "admin.trials.manage.deleteEvent.action": "Poista tapahtuma",
+  "admin.trials.manage.deleteEvent.confirmTitle": "Poistetaanko tapahtuma?",
+  "admin.trials.manage.deleteEvent.confirmBody":
+    "Tyhjä tapahtuma poistetaan pysyvästi. Tapahtumaa, jolla on tuloksia, ei voi poistaa.",
+  "admin.trials.manage.deleteEvent.confirm": "Poista tapahtuma",
+  "admin.trials.manage.deleteEvent.deleting": "Poistetaan...",
+  "admin.trials.manage.deleteEvent.cancel": "Peruuta",
+  "admin.trials.manage.deleteEvent.success": "Tapahtuma poistettiin.",
+  "admin.trials.manage.deleteEvent.error":
+    "Tapahtuman poistaminen epäonnistui.",
+  "admin.trials.manage.deleteEvent.notEmpty":
+    "Tapahtumaa ei voi poistaa, koska sillä on koetuloksia.",
   "admin.trials.manage.selected.title": "Valittu tapahtuma",
   "admin.trials.manage.selected.subtitle":
     "Tapahtuman koirarivit ja rivikohtaiset toiminnot.",
@@ -79,7 +101,7 @@ export const fiAdminTrialsManageMessages = {
   "admin.trials.manage.selected.actions.delete.confirmTitle":
     "Poistetaanko tämä koetulos?",
   "admin.trials.manage.selected.actions.delete.confirmBody":
-    "Tämä poistaa vain tämän koirakohtaisen koetuloksen.\nJos tämä oli tapahtuman viimeinen tulos, myös tyhjä koetapahtuma poistetaan.",
+    "Tämä poistaa vain tämän koirakohtaisen koetuloksen. Jos tämä oli tapahtuman viimeinen tulos, tyhjä koetapahtuma säilyy.",
   "admin.trials.manage.selected.actions.delete.confirmDog": "Koira",
   "admin.trials.manage.selected.actions.delete.confirmRegistration":
     "Rekisterinumero",
@@ -179,6 +201,28 @@ export const svAdminTrialsManageMessages = {
   "admin.trials.manage.workspace.error":
     "Det gick inte att ladda jaktprovsevenemanget.",
   "admin.trials.manage.workspace.retry": "Försök igen",
+  "admin.trials.manage.create.action": "Skapa evenemang",
+  "admin.trials.manage.create.title": "Skapa jaktprovsevenemang",
+  "admin.trials.manage.create.description":
+    "Spara evenemangets grunduppgifter. Hundspecifika resultat läggs till senare.",
+  "admin.trials.manage.create.save": "Skapa evenemang",
+  "admin.trials.manage.create.saving": "Skapar...",
+  "admin.trials.manage.create.cancel": "Avbryt",
+  "admin.trials.manage.create.error": "Det gick inte att skapa evenemanget.",
+  "admin.trials.manage.create.conflict":
+    "Det angivna SKL prov-ID:t används redan av ett annat evenemang.",
+  "admin.trials.manage.deleteEvent.action": "Ta bort evenemang",
+  "admin.trials.manage.deleteEvent.confirmTitle": "Ta bort evenemanget?",
+  "admin.trials.manage.deleteEvent.confirmBody":
+    "Det tomma evenemanget tas bort permanent. Ett evenemang med resultat kan inte tas bort.",
+  "admin.trials.manage.deleteEvent.confirm": "Ta bort evenemang",
+  "admin.trials.manage.deleteEvent.deleting": "Tar bort...",
+  "admin.trials.manage.deleteEvent.cancel": "Avbryt",
+  "admin.trials.manage.deleteEvent.success": "Evenemanget togs bort.",
+  "admin.trials.manage.deleteEvent.error":
+    "Det gick inte att ta bort evenemanget.",
+  "admin.trials.manage.deleteEvent.notEmpty":
+    "Evenemanget kan inte tas bort eftersom det har provresultat.",
   "admin.trials.manage.selected.title": "Valt evenemang",
   "admin.trials.manage.selected.subtitle":
     "Hundrader och radåtgärder för valt evenemang.",
@@ -212,7 +256,7 @@ export const svAdminTrialsManageMessages = {
   "admin.trials.manage.selected.actions.delete.confirmTitle":
     "Ta bort det här provresultatet?",
   "admin.trials.manage.selected.actions.delete.confirmBody":
-    "Det här tar bara bort det här hundspecifika provresultatet.\nOm detta var det sista resultatet i evenemanget tas även det tomma provevenemanget bort.",
+    "Det här tar bara bort det hundspecifika provresultatet. Om det var evenemangets sista resultat bevaras det tomma evenemanget.",
   "admin.trials.manage.selected.actions.delete.confirmDog": "Hund",
   "admin.trials.manage.selected.actions.delete.confirmRegistration":
     "Registrering",
diff --git a/apps/web/queries/admin/trials/manage/__tests__/use-create-admin-trial-event-mutation.test.ts b/apps/web/queries/admin/trials/manage/__tests__/use-create-admin-trial-event-mutation.test.ts
new file mode 100644
index 00000000..2bcce2b1
--- /dev/null
+++ b/apps/web/queries/admin/trials/manage/__tests__/use-create-admin-trial-event-mutation.test.ts
@@ -0,0 +1,66 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import {
+  adminTrialEventQueryKeyRoot,
+  adminTrialEventsQueryKeyRoot,
+} from "../query-keys";
+import { useCreateAdminTrialEventMutation } from "../use-create-admin-trial-event-mutation";
+
+const { useMutationMock, useQueryClientMock, invalidateMock, actionMock } =
+  vi.hoisted(() => ({
+    useMutationMock: vi.fn(),
+    useQueryClientMock: vi.fn(),
+    invalidateMock: vi.fn(),
+    actionMock: vi.fn(),
+  }));
+
+vi.mock("@tanstack/react-query", () => ({
+  useMutation: useMutationMock,
+  useQueryClient: useQueryClientMock,
+}));
+vi.mock("@/app/actions/admin/trials/manage/create-admin-trial-event", () => ({
+  createAdminTrialEventAction: actionMock,
+}));
+
+describe("useCreateAdminTrialEventMutation", () => {
+  beforeEach(() => {
+    useMutationMock.mockReset();
+    useQueryClientMock.mockReturnValue({ invalidateQueries: invalidateMock });
+    invalidateMock.mockReset();
+    actionMock.mockReset();
+    useMutationMock.mockImplementation((options) => options);
+  });
+
+  it("returns action data and invalidates admin event queries", async () => {
+    actionMock.mockResolvedValue({
+      hasError: false,
+      data: { trialEventId: "event-1" },
+    });
+    useCreateAdminTrialEventMutation();
+    const options = useMutationMock.mock.calls[0]?.[0];
+
+    await expect(options.mutationFn({})).resolves.toEqual({
+      trialEventId: "event-1",
+    });
+    await options.onSuccess();
+    expect(invalidateMock).toHaveBeenCalledWith({
+      queryKey: adminTrialEventsQueryKeyRoot,
+    });
+    expect(invalidateMock).toHaveBeenCalledWith({
+      queryKey: adminTrialEventQueryKeyRoot,
+    });
+  });
+
+  it("rejects action errors", async () => {
+    actionMock.mockResolvedValue({
+      hasError: true,
+      data: null,
+      errorCode: "SKL_KOE_ID_CONFLICT",
+      message: "Conflict",
+    });
+    useCreateAdminTrialEventMutation();
+
+    await expect(
+      useMutationMock.mock.calls[0]?.[0].mutationFn({}),
+    ).rejects.toMatchObject({ errorCode: "SKL_KOE_ID_CONFLICT" });
+  });
+});
diff --git a/apps/web/queries/admin/trials/manage/__tests__/use-delete-admin-trial-event-mutation.test.ts b/apps/web/queries/admin/trials/manage/__tests__/use-delete-admin-trial-event-mutation.test.ts
new file mode 100644
index 00000000..0a7fd416
--- /dev/null
+++ b/apps/web/queries/admin/trials/manage/__tests__/use-delete-admin-trial-event-mutation.test.ts
@@ -0,0 +1,52 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import {
+  adminTrialEventQueryKeyRoot,
+  adminTrialEventsQueryKeyRoot,
+} from "../query-keys";
+import { useDeleteAdminTrialEventMutation } from "../use-delete-admin-trial-event-mutation";
+
+const { useMutationMock, useQueryClientMock, invalidateMock, actionMock } =
+  vi.hoisted(() => ({
+    useMutationMock: vi.fn(),
+    useQueryClientMock: vi.fn(),
+    invalidateMock: vi.fn(),
+    actionMock: vi.fn(),
+  }));
+
+vi.mock("@tanstack/react-query", () => ({
+  useMutation: useMutationMock,
+  useQueryClient: useQueryClientMock,
+}));
+vi.mock("@/app/actions/admin/trials/manage/delete-admin-trial-event", () => ({
+  deleteAdminTrialEventAction: actionMock,
+}));
+
+describe("useDeleteAdminTrialEventMutation", () => {
+  beforeEach(() => {
+    useMutationMock.mockReset();
+    useQueryClientMock.mockReturnValue({ invalidateQueries: invalidateMock });
+    invalidateMock.mockReset();
+    actionMock.mockReset();
+    useMutationMock.mockImplementation((options) => options);
+  });
+
+  it("returns action data and invalidates admin event queries", async () => {
+    actionMock.mockResolvedValue({
+      hasError: false,
+      data: { deletedTrialEventId: "event-1" },
+    });
+    useDeleteAdminTrialEventMutation();
+    const options = useMutationMock.mock.calls[0]?.[0];
+
+    await expect(
+      options.mutationFn({ trialEventId: "event-1" }),
+    ).resolves.toEqual({ deletedTrialEventId: "event-1" });
+    await options.onSuccess();
+    expect(invalidateMock).toHaveBeenCalledWith({
+      queryKey: adminTrialEventsQueryKeyRoot,
+    });
+    expect(invalidateMock).toHaveBeenCalledWith({
+      queryKey: adminTrialEventQueryKeyRoot,
+    });
+  });
+});
diff --git a/apps/web/queries/admin/trials/manage/index.ts b/apps/web/queries/admin/trials/manage/index.ts
index 5f677796..f798a697 100644
--- a/apps/web/queries/admin/trials/manage/index.ts
+++ b/apps/web/queries/admin/trials/manage/index.ts
@@ -1,4 +1,6 @@
 export * from "./query-keys";
+export * from "./use-create-admin-trial-event-mutation";
+export * from "./use-delete-admin-trial-event-mutation";
 export * from "./use-admin-trial-event-query";
 export * from "./use-admin-trial-events-query";
 export * from "./use-delete-admin-trial-entry-mutation";
diff --git a/apps/web/queries/admin/trials/manage/use-create-admin-trial-event-mutation.ts b/apps/web/queries/admin/trials/manage/use-create-admin-trial-event-mutation.ts
new file mode 100644
index 00000000..354befe1
--- /dev/null
+++ b/apps/web/queries/admin/trials/manage/use-create-admin-trial-event-mutation.ts
@@ -0,0 +1,42 @@
+"use client";
+
+import type {
+  CreateAdminTrialEventRequest,
+  CreateAdminTrialEventResponse,
+} from "@beagle/contracts";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { createAdminTrialEventAction } from "@/app/actions/admin/trials/manage/create-admin-trial-event";
+import { AdminMutationError } from "@/queries/admin/mutation-error";
+import {
+  adminTrialEventQueryKeyRoot,
+  adminTrialEventsQueryKeyRoot,
+} from "./query-keys";
+
+export function useCreateAdminTrialEventMutation() {
+  const queryClient = useQueryClient();
+
+  return useMutation<
+    CreateAdminTrialEventResponse,
+    AdminMutationError,
+    CreateAdminTrialEventRequest
+  >({
+    mutationFn: async (input) => {
+      const result = await createAdminTrialEventAction(input);
+      if (result.hasError || !result.data) {
+        throw new AdminMutationError(
+          result.message ?? "Failed to create trial event.",
+          result.errorCode,
+        );
+      }
+      return result.data;
+    },
+    onSuccess: async () => {
+      await queryClient.invalidateQueries({
+        queryKey: adminTrialEventsQueryKeyRoot,
+      });
+      await queryClient.invalidateQueries({
+        queryKey: adminTrialEventQueryKeyRoot,
+      });
+    },
+  });
+}
diff --git a/apps/web/queries/admin/trials/manage/use-delete-admin-trial-event-mutation.ts b/apps/web/queries/admin/trials/manage/use-delete-admin-trial-event-mutation.ts
new file mode 100644
index 00000000..10c1e023
--- /dev/null
+++ b/apps/web/queries/admin/trials/manage/use-delete-admin-trial-event-mutation.ts
@@ -0,0 +1,42 @@
+"use client";
+
+import type {
+  DeleteAdminTrialEventRequest,
+  DeleteAdminTrialEventResponse,
+} from "@beagle/contracts";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { deleteAdminTrialEventAction } from "@/app/actions/admin/trials/manage/delete-admin-trial-event";
+import { AdminMutationError } from "@/queries/admin/mutation-error";
+import {
+  adminTrialEventQueryKeyRoot,
+  adminTrialEventsQueryKeyRoot,
+} from "./query-keys";
+
+export function useDeleteAdminTrialEventMutation() {
+  const queryClient = useQueryClient();
+
+  return useMutation<
+    DeleteAdminTrialEventResponse,
+    AdminMutationError,
+    DeleteAdminTrialEventRequest
+  >({
+    mutationFn: async (input) => {
+      const result = await deleteAdminTrialEventAction(input);
+      if (result.hasError || !result.data) {
+        throw new AdminMutationError(
+          result.message ?? "Failed to delete trial event.",
+          result.errorCode,
+        );
+      }
+      return result.data;
+    },
+    onSuccess: async () => {
+      await queryClient.invalidateQueries({
+        queryKey: adminTrialEventsQueryKeyRoot,
+      });
+      await queryClient.invalidateQueries({
+        queryKey: adminTrialEventQueryKeyRoot,
+      });
+    },
+  });
+}
diff --git a/docs/features/admin-trial-management.md b/docs/features/admin-trial-management.md
index 17c90851..bb4f006d 100644
--- a/docs/features/admin-trial-management.md
+++ b/docs/features/admin-trial-management.md
@@ -7,16 +7,20 @@ and follow-up admin flow redesign).
 
 - The admin list page is an event-first master-detail workflow for canonical
   AJOK `TrialEvent` + `TrialEntry` rows.
-- An admin can search events, select one event, inspect and edit its metadata
-  and dog rows, delete a result, or open the event at the stable
+- An admin can create and search events, select one event, inspect and edit its
+  metadata and dog rows, delete a result, or open the event at the stable
   `/admin/trials/[trialEventId]` workspace URL.
+- Empty events remain available to administrators. They can be deleted
+  explicitly from their workspace, but only while they have no result rows.
 - Per-dog inspection opens the generated trial PDF. Existing event and result
   editing remains modal-based.
 
 ## Main files
 
 - `apps/web/app/(admin)/admin/trials/page.tsx`: route entrypoint for event master-detail list
+- `apps/web/app/(admin)/admin/trials/new/page.tsx`: full-page event creation route
 - `apps/web/app/(admin)/admin/trials/[trialEventId]/page.tsx`: stable event workspace route
+- `apps/web/components/admin/trials/admin-trial-event-create-page-client.tsx`: event creation form and continuation
 - `apps/web/components/admin/trials/admin-trials-page-client.tsx`: event filters + event list + selected-event rows
 - `apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx`: one-event workspace states and navigation
 - `apps/web/components/admin/trials/admin-trial-selected-event-panel.tsx`: selected-event rows and row actions
@@ -37,8 +41,9 @@ and follow-up admin flow redesign).
 2. Event selection fetches selected event rows through `useAdminTrialEventQuery`.
 3. The selected-event panel links to the stable event workspace, which fetches
    only the `trialEventId` from its route.
-4. Event and result changes use the existing admin mutations; the PDF action
+4. Event and result changes use admin Server Action mutations; the PDF action
    opens `/api/trials/[trialEntryId]/pdf` in a new tab.
+5. Successful event creation opens the persisted empty event workspace.
 
 ## Contract rules
 
@@ -46,6 +51,10 @@ and follow-up admin flow redesign).
   `page`, `filters`, `availableYears`, `items[]`).
 - Event detail response: one event (`event`) with event header fields and
   selected dog rows (`entries[]`).
+- Event creation requires a positive `sklKoeId`, an ISO date, and a non-empty
+  place. Duplicate SKL IDs return `SKL_KOE_ID_CONFLICT`.
+- Empty event deletion returns `TRIAL_EVENT_NOT_EMPTY` if result rows are
+  present and `TRIAL_EVENT_NOT_FOUND` if the event no longer exists.
 - `TRIAL_EVENT_NOT_FOUND` is returned for missing event IDs.
 - After BEJ-81 switch, event/list identifiers are:
   - `sklKoeId` (preferred when available)
@@ -58,13 +67,17 @@ and follow-up admin flow redesign).
 - Selected dog rows have PDF, edit, and result-delete actions.
 - A missing workspace event is shown explicitly and never falls back to a
   different event.
-- Until BEJ-103 Gate E2 changes the lifecycle, deleting the final result also
-  deletes its event. The workspace then returns to `/admin/trials`; non-final
-  and failed deletions remain on the workspace.
+- Deleting the final result leaves its event persisted and displays the valid
+  empty-event state in the workspace.
+- Explicit event deletion is offered only for an empty event and is enforced
+  by both the server and database write. Successful deletion returns to
+  `/admin/trials`; failed deletion remains on the workspace.
 
 ## Tests
 
+- `apps/web/app/(admin)/admin/trials/new/__tests__/page.test.tsx`
 - `apps/web/app/(admin)/admin/trials/[trialEventId]/__tests__/page.test.tsx`
+- `apps/web/components/admin/trials/__tests__/admin-trial-event-create-page-client.test.tsx`
 - `apps/web/components/admin/trials/__tests__/admin-trial-event-workspace-page-client.test.tsx`
 - `apps/web/components/admin/trials/__tests__/admin-trials-page-client.test.tsx`
 - `apps/web/components/admin/trials/__tests__/admin-trial-entry-actions.test.tsx`
diff --git a/packages/contracts/admin/trials/manage/create-admin-trial-event.ts b/packages/contracts/admin/trials/manage/create-admin-trial-event.ts
new file mode 100644
index 00000000..4d5d89a8
--- /dev/null
+++ b/packages/contracts/admin/trials/manage/create-admin-trial-event.ts
@@ -0,0 +1,15 @@
+export type CreateAdminTrialEventRequest = {
+  eventDate: string;
+  eventPlace: string;
+  jarjestaja: string | null;
+  ylituomari: string | null;
+  ylituomariNumero: string | null;
+  ytKertomus: string | null;
+  kennelpiiri: string | null;
+  kennelpiirinro: string | null;
+  sklKoeId: number;
+};
+
+export type CreateAdminTrialEventResponse = {
+  trialEventId: string;
+};
diff --git a/packages/contracts/admin/trials/manage/delete-admin-trial-event.ts b/packages/contracts/admin/trials/manage/delete-admin-trial-event.ts
new file mode 100644
index 00000000..58b5fe72
--- /dev/null
+++ b/packages/contracts/admin/trials/manage/delete-admin-trial-event.ts
@@ -0,0 +1,7 @@
+export type DeleteAdminTrialEventRequest = {
+  trialEventId: string;
+};
+
+export type DeleteAdminTrialEventResponse = {
+  deletedTrialEventId: string;
+};
diff --git a/packages/contracts/admin/trials/manage/index.ts b/packages/contracts/admin/trials/manage/index.ts
index a7125112..b335d5b6 100644
--- a/packages/contracts/admin/trials/manage/index.ts
+++ b/packages/contracts/admin/trials/manage/index.ts
@@ -12,6 +12,14 @@ export type {
   AdminTrialEventDetailsResponse,
   AdminTrialEventEntry,
 } from "./admin-trial-event-details";
+export type {
+  CreateAdminTrialEventRequest,
+  CreateAdminTrialEventResponse,
+} from "./create-admin-trial-event";
+export type {
+  DeleteAdminTrialEventRequest,
+  DeleteAdminTrialEventResponse,
+} from "./delete-admin-trial-event";
 export type {
   DeleteAdminTrialEntryRequest,
   DeleteAdminTrialEntryResponse,
diff --git a/packages/contracts/index.ts b/packages/contracts/index.ts
index 97382686..2c61a7ef 100644
--- a/packages/contracts/index.ts
+++ b/packages/contracts/index.ts
@@ -292,6 +292,10 @@ export type {
   AdminTrialEventDetailsRequest,
   AdminTrialEventDetailsResponse,
   AdminTrialEventEntry,
+  CreateAdminTrialEventRequest,
+  CreateAdminTrialEventResponse,
+  DeleteAdminTrialEventRequest,
+  DeleteAdminTrialEventResponse,
   DeleteAdminTrialEntryRequest,
   DeleteAdminTrialEntryResponse,
   UpdateAdminTrialEventRequest,
diff --git a/packages/db/admin/trials/manage/__tests__/create-trial-event.test.ts b/packages/db/admin/trials/manage/__tests__/create-trial-event.test.ts
new file mode 100644
index 00000000..909d075a
--- /dev/null
+++ b/packages/db/admin/trials/manage/__tests__/create-trial-event.test.ts
@@ -0,0 +1,68 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createAdminTrialEventWriteDb } from "../create-trial-event";
+
+const { trialEventCreateMock } = vi.hoisted(() => ({
+  trialEventCreateMock: vi.fn(),
+}));
+
+vi.mock("@db/core/prisma", () => ({
+  prisma: { trialEvent: { create: trialEventCreateMock } },
+}));
+
+describe("createAdminTrialEventWriteDb", () => {
+  beforeEach(() => {
+    trialEventCreateMock.mockReset();
+  });
+
+  it("creates one empty event with the resolved rule window", async () => {
+    trialEventCreateMock.mockResolvedValue({ id: "event-1" });
+    const eventDate = new Date("2026-07-21T00:00:00.000Z");
+
+    await expect(
+      createAdminTrialEventWriteDb({
+        eventDate,
+        eventPlace: "Helsinki",
+        jarjestaja: "Club",
+        ylituomari: null,
+        ylituomariNumero: null,
+        ytKertomus: null,
+        kennelpiiri: null,
+        kennelpiirinro: null,
+        sklKoeId: 123,
+        trialRuleWindowId: "window-1",
+      }),
+    ).resolves.toEqual({ trialEventId: "event-1" });
+
+    expect(trialEventCreateMock).toHaveBeenCalledWith({
+      data: expect.objectContaining({
+        koepaiva: eventDate,
+        koekunta: "Helsinki",
+        sklKoeId: 123,
+        trialRuleWindowId: "window-1",
+      }),
+      select: { id: true },
+    });
+  });
+
+  it("propagates duplicate SKL id errors for the service to map", async () => {
+    const duplicateError = Object.assign(new Error("duplicate SKL id"), {
+      code: "P2002",
+    });
+    trialEventCreateMock.mockRejectedValue(duplicateError);
+
+    await expect(
+      createAdminTrialEventWriteDb({
+        eventDate: new Date("2026-07-21T00:00:00.000Z"),
+        eventPlace: "Helsinki",
+        jarjestaja: null,
+        ylituomari: null,
+        ylituomariNumero: null,
+        ytKertomus: null,
+        kennelpiiri: null,
+        kennelpiirinro: null,
+        sklKoeId: 123,
+        trialRuleWindowId: null,
+      }),
+    ).rejects.toBe(duplicateError);
+  });
+});
diff --git a/packages/db/admin/trials/manage/__tests__/delete-trial-entry.test.ts b/packages/db/admin/trials/manage/__tests__/delete-trial-entry.test.ts
index 15faef64..39f9a969 100644
--- a/packages/db/admin/trials/manage/__tests__/delete-trial-entry.test.ts
+++ b/packages/db/admin/trials/manage/__tests__/delete-trial-entry.test.ts
@@ -2,31 +2,18 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import { ADMIN_WRITE_TX_CONFIG } from "@db/core/interactive-write-transaction";
 import { deleteAdminTrialEntryWriteDb } from "../delete-trial-entry";
 
-const {
-  prismaTransactionMock,
-  trialEntryDeleteManyMock,
-  trialEntryCountMock,
-  trialEventDeleteMock,
-} = vi.hoisted(() => {
+const { prismaTransactionMock, trialEntryDeleteManyMock } = vi.hoisted(() => {
   const trialEntryDeleteMany = vi.fn();
-  const trialEntryCount = vi.fn();
-  const trialEventDelete = vi.fn();
 
   const tx = {
     trialEntry: {
       deleteMany: trialEntryDeleteMany,
-      count: trialEntryCount,
-    },
-    trialEvent: {
-      delete: trialEventDelete,
     },
   };
 
   return {
     prismaTransactionMock: vi.fn(async (callback) => callback(tx)),
     trialEntryDeleteManyMock: trialEntryDeleteMany,
-    trialEntryCountMock: trialEntryCount,
-    trialEventDeleteMock: trialEventDelete,
   };
 });
 
@@ -40,8 +27,6 @@ describe("deleteAdminTrialEntryWriteDb", () => {
   beforeEach(() => {
     prismaTransactionMock.mockClear();
     trialEntryDeleteManyMock.mockReset();
-    trialEntryCountMock.mockReset();
-    trialEventDeleteMock.mockReset();
   });
 
   it("returns not_found when no matching row is deleted", async () => {
@@ -53,14 +38,10 @@ describe("deleteAdminTrialEntryWriteDb", () => {
         trialEntryId: "entry-1",
       }),
     ).resolves.toEqual({ status: "not_found" });
-
-    expect(trialEntryCountMock).not.toHaveBeenCalled();
-    expect(trialEventDeleteMock).not.toHaveBeenCalled();
   });
 
-  it("keeps parent trial event when sibling entries remain", async () => {
+  it("deletes the entry while preserving its parent event", async () => {
     trialEntryDeleteManyMock.mockResolvedValue({ count: 1 });
-    trialEntryCountMock.mockResolvedValue(2);
 
     await expect(
       deleteAdminTrialEntryWriteDb({
@@ -73,36 +54,10 @@ describe("deleteAdminTrialEntryWriteDb", () => {
       trialEventId: "event-1",
       deletedTrialEvent: false,
     });
-
-    expect(trialEventDeleteMock).not.toHaveBeenCalled();
-  });
-
-  it("deletes parent trial event when last entry is removed", async () => {
-    trialEntryDeleteManyMock.mockResolvedValue({ count: 1 });
-    trialEntryCountMock.mockResolvedValue(0);
-
-    await expect(
-      deleteAdminTrialEntryWriteDb({
-        trialEventId: "event-1",
-        trialEntryId: "entry-1",
-      }),
-    ).resolves.toEqual({
-      status: "deleted",
-      deletedTrialEntryId: "entry-1",
-      trialEventId: "event-1",
-      deletedTrialEvent: true,
-    });
-
-    expect(trialEventDeleteMock).toHaveBeenCalledWith({
-      where: {
-        id: "event-1",
-      },
-    });
   });
 
   it("passes explicit transaction timeout options", async () => {
     trialEntryDeleteManyMock.mockResolvedValue({ count: 1 });
-    trialEntryCountMock.mockResolvedValue(1);
 
     await deleteAdminTrialEntryWriteDb({
       trialEventId: "event-1",
diff --git a/packages/db/admin/trials/manage/__tests__/delete-trial-event.test.ts b/packages/db/admin/trials/manage/__tests__/delete-trial-event.test.ts
new file mode 100644
index 00000000..c790af46
--- /dev/null
+++ b/packages/db/admin/trials/manage/__tests__/delete-trial-event.test.ts
@@ -0,0 +1,65 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { ADMIN_WRITE_TX_CONFIG } from "@db/core/interactive-write-transaction";
+import { deleteAdminTrialEventWriteDb } from "../delete-trial-event";
+
+const { transactionMock, deleteManyMock, findUniqueMock } = vi.hoisted(() => {
+  const deleteManyMock = vi.fn();
+  const findUniqueMock = vi.fn();
+  const tx = {
+    trialEvent: { deleteMany: deleteManyMock, findUnique: findUniqueMock },
+  };
+  return {
+    transactionMock: vi.fn(async (callback) => callback(tx)),
+    deleteManyMock,
+    findUniqueMock,
+  };
+});
+
+vi.mock("@db/core/prisma", () => ({
+  prisma: { $transaction: transactionMock },
+}));
+
+describe("deleteAdminTrialEventWriteDb", () => {
+  beforeEach(() => {
+    transactionMock.mockClear();
+    deleteManyMock.mockReset();
+    findUniqueMock.mockReset();
+  });
+
+  it("deletes only an event with no entries", async () => {
+    deleteManyMock.mockResolvedValue({ count: 1 });
+
+    await expect(
+      deleteAdminTrialEventWriteDb({ trialEventId: "event-1" }),
+    ).resolves.toEqual({
+      status: "deleted",
+      deletedTrialEventId: "event-1",
+    });
+    expect(deleteManyMock).toHaveBeenCalledWith({
+      where: { id: "event-1", entries: { none: {} } },
+    });
+    expect(findUniqueMock).not.toHaveBeenCalled();
+    expect(transactionMock).toHaveBeenCalledWith(
+      expect.any(Function),
+      ADMIN_WRITE_TX_CONFIG,
+    );
+  });
+
+  it("rejects an existing non-empty event", async () => {
+    deleteManyMock.mockResolvedValue({ count: 0 });
+    findUniqueMock.mockResolvedValue({ id: "event-1" });
+
+    await expect(
+      deleteAdminTrialEventWriteDb({ trialEventId: "event-1" }),
+    ).resolves.toEqual({ status: "not_empty" });
+  });
+
+  it("reports a missing event", async () => {
+    deleteManyMock.mockResolvedValue({ count: 0 });
+    findUniqueMock.mockResolvedValue(null);
+
+    await expect(
+      deleteAdminTrialEventWriteDb({ trialEventId: "missing" }),
+    ).resolves.toEqual({ status: "not_found" });
+  });
+});
diff --git a/packages/db/admin/trials/manage/create-trial-event.ts b/packages/db/admin/trials/manage/create-trial-event.ts
new file mode 100644
index 00000000..8fbdd4d7
--- /dev/null
+++ b/packages/db/admin/trials/manage/create-trial-event.ts
@@ -0,0 +1,43 @@
+import { prisma } from "@db/core/prisma";
+
+export type CreateAdminTrialEventWriteRequestDb = {
+  eventDate: Date;
+  eventPlace: string;
+  jarjestaja: string | null;
+  ylituomari: string | null;
+  ylituomariNumero: string | null;
+  ytKertomus: string | null;
+  kennelpiiri: string | null;
+  kennelpiirinro: string | null;
+  sklKoeId: number;
+  trialRuleWindowId: string | null;
+};
+
+export type CreateAdminTrialEventWriteResultDb = {
+  trialEventId: string;
+};
+
+// Creates one canonical event without child result rows.
+export async function createAdminTrialEventWriteDb(
+  input: CreateAdminTrialEventWriteRequestDb,
+): Promise<CreateAdminTrialEventWriteResultDb> {
+  const created = await prisma.trialEvent.create({
+    data: {
+      koepaiva: input.eventDate,
+      koekunta: input.eventPlace,
+      jarjestaja: input.jarjestaja,
+      ylituomariNimi: input.ylituomari,
+      ylituomariNumero: input.ylituomariNumero,
+      ytKertomus: input.ytKertomus,
+      kennelpiiri: input.kennelpiiri,
+      kennelpiirinro: input.kennelpiirinro,
+      sklKoeId: input.sklKoeId,
+      trialRuleWindowId: input.trialRuleWindowId,
+    },
+    select: {
+      id: true,
+    },
+  });
+
+  return { trialEventId: created.id };
+}
diff --git a/packages/db/admin/trials/manage/delete-trial-entry.ts b/packages/db/admin/trials/manage/delete-trial-entry.ts
index 57325543..de18733d 100644
--- a/packages/db/admin/trials/manage/delete-trial-entry.ts
+++ b/packages/db/admin/trials/manage/delete-trial-entry.ts
@@ -15,8 +15,8 @@ export type DeleteAdminTrialEntryWriteResultDb =
       deletedTrialEvent: boolean;
     };
 
-// modification: deleting TrialEntry cascades to TrialEra and TrialEraLisatieto.
-// If this was the last entry, remove the now-empty TrialEvent as cleanup.
+// Deleting TrialEntry cascades to TrialEra and TrialEraLisatieto.
+// The parent event intentionally remains persisted when the final entry is removed.
 export async function deleteAdminTrialEntryWriteDb(
   input: DeleteAdminTrialEntryWriteRequestDb,
 ): Promise<DeleteAdminTrialEntryWriteResultDb> {
@@ -32,27 +32,11 @@ export async function deleteAdminTrialEntryWriteDb(
       return { status: "not_found" };
     }
 
-    const remainingEntries = await tx.trialEntry.count({
-      where: {
-        trialEventId: input.trialEventId,
-      },
-    });
-
-    let deletedTrialEvent = false;
-    if (remainingEntries === 0) {
-      await tx.trialEvent.delete({
-        where: {
-          id: input.trialEventId,
-        },
-      });
-      deletedTrialEvent = true;
-    }
-
     return {
       status: "deleted",
       deletedTrialEntryId: input.trialEntryId,
       trialEventId: input.trialEventId,
-      deletedTrialEvent,
+      deletedTrialEvent: false,
     };
   }, ADMIN_WRITE_TX_CONFIG);
 }
diff --git a/packages/db/admin/trials/manage/delete-trial-event.ts b/packages/db/admin/trials/manage/delete-trial-event.ts
new file mode 100644
index 00000000..2598b5b2
--- /dev/null
+++ b/packages/db/admin/trials/manage/delete-trial-event.ts
@@ -0,0 +1,39 @@
+import { ADMIN_WRITE_TX_CONFIG } from "@db/core/interactive-write-transaction";
+import { prisma } from "@db/core/prisma";
+
+export type DeleteAdminTrialEventWriteRequestDb = {
+  trialEventId: string;
+};
+
+export type DeleteAdminTrialEventWriteResultDb =
+  | { status: "not_found" }
+  | { status: "not_empty" }
+  | { status: "deleted"; deletedTrialEventId: string };
+
+// Enforces the empty-only event deletion rule in the database write itself.
+export async function deleteAdminTrialEventWriteDb(
+  input: DeleteAdminTrialEventWriteRequestDb,
+): Promise<DeleteAdminTrialEventWriteResultDb> {
+  return prisma.$transaction(async (tx) => {
+    const deleted = await tx.trialEvent.deleteMany({
+      where: {
+        id: input.trialEventId,
+        entries: { none: {} },
+      },
+    });
+
+    if (deleted.count > 0) {
+      return {
+        status: "deleted",
+        deletedTrialEventId: input.trialEventId,
+      };
+    }
+
+    const existing = await tx.trialEvent.findUnique({
+      where: { id: input.trialEventId },
+      select: { id: true },
+    });
+
+    return existing ? { status: "not_empty" } : { status: "not_found" };
+  }, ADMIN_WRITE_TX_CONFIG);
+}
diff --git a/packages/db/admin/trials/manage/index.ts b/packages/db/admin/trials/manage/index.ts
index 96012a3f..0cfddbea 100644
--- a/packages/db/admin/trials/manage/index.ts
+++ b/packages/db/admin/trials/manage/index.ts
@@ -1,5 +1,15 @@
 export { getAdminTrialEventDetailsDb } from "./get-trial-event-details";
 export { searchAdminTrialsDb } from "./search-trials";
+export {
+  createAdminTrialEventWriteDb,
+  type CreateAdminTrialEventWriteRequestDb,
+  type CreateAdminTrialEventWriteResultDb,
+} from "./create-trial-event";
+export {
+  deleteAdminTrialEventWriteDb,
+  type DeleteAdminTrialEventWriteRequestDb,
+  type DeleteAdminTrialEventWriteResultDb,
+} from "./delete-trial-event";
 export {
   deleteAdminTrialEntryWriteDb,
   type DeleteAdminTrialEntryWriteRequestDb,
diff --git a/packages/db/index.ts b/packages/db/index.ts
index 37c0b180..779e44b0 100644
--- a/packages/db/index.ts
+++ b/packages/db/index.ts
@@ -153,6 +153,7 @@ export {
   getBeagleTrialDetailsDb,
   getBeagleTrialsForDogDb,
   getBeagleTrialSummarySourceForDogDb,
+  listActiveTrialRuleWindowsDb,
   searchBeagleTrialsDb,
   upsertKoiratietokantaAjokResultDb,
   type BeagleTrialDetailsRequestDb,
@@ -166,6 +167,7 @@ export {
   type BeagleTrialSearchResponseDb,
   type BeagleTrialSearchRowDb,
   type BeagleTrialSearchSortDb,
+  type ActiveTrialRuleWindowDb,
   type KoiratietokantaAjokEntryDbInput,
   type KoiratietokantaAjokEventDbInput,
   type KoiratietokantaAjokEraDbInput,
@@ -177,6 +179,8 @@ export {
 export {
   getAdminTrialEventDetailsDb,
   searchAdminTrialsDb,
+  createAdminTrialEventWriteDb,
+  deleteAdminTrialEventWriteDb,
   deleteAdminTrialEntryWriteDb,
   updateAdminTrialEventWriteDb,
   updateAdminTrialEntryWriteDb,
@@ -189,6 +193,10 @@ export {
   type AdminTrialEventSearchResponseDb,
   type AdminTrialEventSearchSortDb,
   type AdminTrialEventSummaryDb,
+  type CreateAdminTrialEventWriteRequestDb,
+  type CreateAdminTrialEventWriteResultDb,
+  type DeleteAdminTrialEventWriteRequestDb,
+  type DeleteAdminTrialEventWriteResultDb,
   type DeleteAdminTrialEntryWriteRequestDb,
   type DeleteAdminTrialEntryWriteResultDb,
   type UpdateAdminTrialEventWriteRequestDb,
diff --git a/packages/db/trials/__tests__/list-active-trial-rule-windows.test.ts b/packages/db/trials/__tests__/list-active-trial-rule-windows.test.ts
new file mode 100644
index 00000000..0d83109e
--- /dev/null
+++ b/packages/db/trials/__tests__/list-active-trial-rule-windows.test.ts
@@ -0,0 +1,32 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { listActiveTrialRuleWindowsDb } from "../list-active-trial-rule-windows";
+
+const { ruleWindowFindManyMock } = vi.hoisted(() => ({
+  ruleWindowFindManyMock: vi.fn(),
+}));
+
+vi.mock("@db/core/prisma", () => ({
+  prisma: { trialRuleWindow: { findMany: ruleWindowFindManyMock } },
+}));
+
+describe("listActiveTrialRuleWindowsDb", () => {
+  beforeEach(() => {
+    ruleWindowFindManyMock.mockReset();
+  });
+
+  it("loads the minimal active rule-window shape in resolution order", async () => {
+    const rows = [{ id: "window-1", fromYmd: 20200101, toYmd: null }];
+    ruleWindowFindManyMock.mockResolvedValue(rows);
+
+    await expect(listActiveTrialRuleWindowsDb()).resolves.toBe(rows);
+    expect(ruleWindowFindManyMock).toHaveBeenCalledWith({
+      where: { isActive: true },
+      orderBy: [{ sortOrder: "asc" }, { id: "asc" }],
+      select: {
+        id: true,
+        fromYmd: true,
+        toYmd: true,
+      },
+    });
+  });
+});
diff --git a/packages/db/trials/index.ts b/packages/db/trials/index.ts
index c1d8a519..0348bb80 100644
--- a/packages/db/trials/index.ts
+++ b/packages/db/trials/index.ts
@@ -2,6 +2,10 @@ export { getBeagleTrialDetailsDb } from "./get-beagle-trial-details";
 export { getBeagleTrialsForDogDb } from "./get-beagle-trials-for-dog";
 export { getBeagleTrialSummarySourceForDogDb } from "./get-beagle-trials-summary-for-dog";
 export { searchBeagleTrialsDb } from "./search-beagle-trials";
+export {
+  listActiveTrialRuleWindowsDb,
+  type ActiveTrialRuleWindowDb,
+} from "./list-active-trial-rule-windows";
 export type {
   BeagleTrialDetailsRequestDb,
   BeagleTrialDetailsResponseDb,
diff --git a/packages/db/trials/list-active-trial-rule-windows.ts b/packages/db/trials/list-active-trial-rule-windows.ts
new file mode 100644
index 00000000..e01ecf0a
--- /dev/null
+++ b/packages/db/trials/list-active-trial-rule-windows.ts
@@ -0,0 +1,22 @@
+import { prisma } from "@db/core/prisma";
+
+export type ActiveTrialRuleWindowDb = {
+  id: string;
+  fromYmd: number | null;
+  toYmd: number | null;
+};
+
+// Loads active rule windows in deterministic rule-resolution order.
+export async function listActiveTrialRuleWindowsDb(): Promise<
+  ActiveTrialRuleWindowDb[]
+> {
+  return prisma.trialRuleWindow.findMany({
+    where: { isActive: true },
+    orderBy: [{ sortOrder: "asc" }, { id: "asc" }],
+    select: {
+      id: true,
+      fromYmd: true,
+      toYmd: true,
+    },
+  });
+}
diff --git a/packages/server/admin/index.ts b/packages/server/admin/index.ts
index ec963078..92a08cf3 100644
--- a/packages/server/admin/index.ts
+++ b/packages/server/admin/index.ts
@@ -21,6 +21,8 @@ export { createAdminDogDisease } from "./dogs";
 export { deleteAdminDogDisease } from "./dogs";
 export { listAdminTrialEvents } from "./trials";
 export { getAdminTrialEvent } from "./trials";
+export { createAdminTrialEvent } from "./trials";
+export { deleteAdminTrialEvent } from "./trials";
 export { deleteAdminTrialEntry } from "./trials";
 export { updateAdminTrialEvent } from "./trials";
 export { updateAdminTrialEntry } from "./trials";
diff --git a/packages/server/admin/trials/manage/__tests__/create-trial-event.integration.test.ts b/packages/server/admin/trials/manage/__tests__/create-trial-event.integration.test.ts
new file mode 100644
index 00000000..a65d6e50
--- /dev/null
+++ b/packages/server/admin/trials/manage/__tests__/create-trial-event.integration.test.ts
@@ -0,0 +1,92 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createAdminTrialEvent } from "../create-trial-event";
+
+const { ruleWindowFindManyMock, trialEventCreateMock } = vi.hoisted(() => ({
+  ruleWindowFindManyMock: vi.fn(),
+  trialEventCreateMock: vi.fn(),
+}));
+
+vi.mock("@db/core/prisma", () => ({
+  prisma: {
+    trialRuleWindow: { findMany: ruleWindowFindManyMock },
+    trialEvent: { create: trialEventCreateMock },
+  },
+}));
+
+const admin = {
+  id: "u_1",
+  email: "admin@example.com",
+  username: null,
+  role: "ADMIN" as const,
+};
+
+const validInput = {
+  eventDate: "2026-07-21",
+  eventPlace: " Helsinki ",
+  jarjestaja: " Club ",
+  ylituomari: null,
+  ylituomariNumero: null,
+  ytKertomus: null,
+  kennelpiiri: null,
+  kennelpiirinro: null,
+  sklKoeId: 123,
+};
+
+describe("createAdminTrialEvent with the DB repository", () => {
+  beforeEach(() => {
+    ruleWindowFindManyMock.mockReset();
+    trialEventCreateMock.mockReset();
+    ruleWindowFindManyMock.mockResolvedValue([
+      { id: "window-old", fromYmd: 20200101, toYmd: 20251231 },
+      { id: "window-current", fromYmd: 20260101, toYmd: null },
+    ]);
+    trialEventCreateMock.mockResolvedValue({ id: "event-1" });
+  });
+
+  it("resolves the rule window and persists one empty event", async () => {
+    await expect(createAdminTrialEvent(validInput, admin)).resolves.toEqual({
+      status: 201,
+      body: { ok: true, data: { trialEventId: "event-1" } },
+    });
+
+    expect(ruleWindowFindManyMock).toHaveBeenCalledWith({
+      where: { isActive: true },
+      orderBy: [{ sortOrder: "asc" }, { id: "asc" }],
+      select: {
+        id: true,
+        fromYmd: true,
+        toYmd: true,
+      },
+    });
+    expect(trialEventCreateMock).toHaveBeenCalledWith({
+      data: {
+        koepaiva: new Date("2026-07-21T00:00:00.000Z"),
+        koekunta: "Helsinki",
+        jarjestaja: "Club",
+        ylituomariNimi: null,
+        ylituomariNumero: null,
+        ytKertomus: null,
+        kennelpiiri: null,
+        kennelpiirinro: null,
+        sklKoeId: 123,
+        trialRuleWindowId: "window-current",
+      },
+      select: { id: true },
+    });
+  });
+
+  it("maps a repository duplicate error to the stable conflict", async () => {
+    trialEventCreateMock.mockRejectedValue(
+      Object.assign(new Error("duplicate SKL id"), { code: "P2002" }),
+    );
+
+    await expect(createAdminTrialEvent(validInput, admin)).resolves.toEqual({
+      status: 409,
+      body: {
+        ok: false,
+        error: "An event already uses this SKL koe id.",
+        code: "SKL_KOE_ID_CONFLICT",
+      },
+    });
+  });
+});
diff --git a/packages/server/admin/trials/manage/__tests__/create-trial-event.test.ts b/packages/server/admin/trials/manage/__tests__/create-trial-event.test.ts
new file mode 100644
index 00000000..b9337aff
--- /dev/null
+++ b/packages/server/admin/trials/manage/__tests__/create-trial-event.test.ts
@@ -0,0 +1,109 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createAdminTrialEvent } from "../create-trial-event";
+
+const { createWriteMock, listActiveRuleWindowsMock } = vi.hoisted(() => ({
+  createWriteMock: vi.fn(),
+  listActiveRuleWindowsMock: vi.fn(),
+}));
+
+vi.mock("@beagle/db", () => ({
+  createAdminTrialEventWriteDb: createWriteMock,
+  listActiveTrialRuleWindowsDb: listActiveRuleWindowsMock,
+}));
+
+const admin = {
+  id: "u_1",
+  email: "admin@example.com",
+  username: null,
+  role: "ADMIN" as const,
+};
+
+const validInput = {
+  eventDate: "2026-07-21",
+  eventPlace: " Helsinki ",
+  jarjestaja: " Club ",
+  ylituomari: null,
+  ylituomariNumero: null,
+  ytKertomus: null,
+  kennelpiiri: null,
+  kennelpiirinro: null,
+  sklKoeId: 123,
+};
+
+describe("createAdminTrialEvent", () => {
+  beforeEach(() => {
+    createWriteMock.mockReset();
+    listActiveRuleWindowsMock.mockReset();
+    listActiveRuleWindowsMock.mockResolvedValue([
+      { id: "window-1", fromYmd: 20200101, toYmd: null },
+    ]);
+    createWriteMock.mockResolvedValue({ trialEventId: "event-1" });
+  });
+
+  it("requires admin authorization", async () => {
+    const result = await createAdminTrialEvent(validInput, {
+      ...admin,
+      role: "USER",
+    });
+
+    expect(result.status).toBe(403);
+    expect(createWriteMock).not.toHaveBeenCalled();
+  });
+
+  it.each([
+    ["event date", { eventDate: "2026-02-30" }, "INVALID_EVENT_DATE"],
+    ["event place", { eventPlace: " " }, "INVALID_EVENT_PLACE"],
+    ["SKL id", { sklKoeId: 0 }, "INVALID_SKL_KOE_ID"],
+  ])("rejects an invalid %s", async (_label, override, code) => {
+    const result = await createAdminTrialEvent(
+      { ...validInput, ...override },
+      admin,
+    );
+
+    expect(result.status).toBe(400);
+    expect(result.body).toMatchObject({ ok: false, code });
+    expect(createWriteMock).not.toHaveBeenCalled();
+  });
+
+  it("normalizes metadata and assigns the active rule window", async () => {
+    const result = await createAdminTrialEvent(validInput, admin);
+
+    expect(result).toEqual({
+      status: 201,
+      body: { ok: true, data: { trialEventId: "event-1" } },
+    });
+    expect(listActiveRuleWindowsMock).toHaveBeenCalledOnce();
+    expect(createWriteMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        eventDate: new Date("2026-07-21T00:00:00.000Z"),
+        eventPlace: "Helsinki",
+        jarjestaja: "Club",
+        sklKoeId: 123,
+        trialRuleWindowId: "window-1",
+      }),
+    );
+  });
+
+  it("allows no matching active rule window", async () => {
+    listActiveRuleWindowsMock.mockResolvedValue([]);
+
+    await createAdminTrialEvent(validInput, admin);
+
+    expect(createWriteMock).toHaveBeenCalledWith(
+      expect.objectContaining({ trialRuleWindowId: null }),
+    );
+  });
+
+  it("maps duplicate SKL ids to a stable conflict", async () => {
+    createWriteMock.mockRejectedValue({ code: "P2002" });
+
+    await expect(createAdminTrialEvent(validInput, admin)).resolves.toEqual({
+      status: 409,
+      body: {
+        ok: false,
+        error: "An event already uses this SKL koe id.",
+        code: "SKL_KOE_ID_CONFLICT",
+      },
+    });
+  });
+});
diff --git a/packages/server/admin/trials/manage/__tests__/delete-trial-entry.test.ts b/packages/server/admin/trials/manage/__tests__/delete-trial-entry.test.ts
index b77290d7..e8ab765d 100644
--- a/packages/server/admin/trials/manage/__tests__/delete-trial-entry.test.ts
+++ b/packages/server/admin/trials/manage/__tests__/delete-trial-entry.test.ts
@@ -117,7 +117,7 @@ describe("deleteAdminTrialEntry", () => {
       status: "deleted",
       deletedTrialEntryId: "entry-1",
       trialEventId: "event-1",
-      deletedTrialEvent: true,
+      deletedTrialEvent: false,
     });
 
     await expect(
@@ -140,7 +140,7 @@ describe("deleteAdminTrialEntry", () => {
         data: {
           deletedTrialEntryId: "entry-1",
           trialEventId: "event-1",
-          deletedTrialEvent: true,
+          deletedTrialEvent: false,
         },
       },
     });
diff --git a/packages/server/admin/trials/manage/__tests__/delete-trial-event.test.ts b/packages/server/admin/trials/manage/__tests__/delete-trial-event.test.ts
new file mode 100644
index 00000000..53d97c77
--- /dev/null
+++ b/packages/server/admin/trials/manage/__tests__/delete-trial-event.test.ts
@@ -0,0 +1,64 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { deleteAdminTrialEvent } from "../delete-trial-event";
+
+const { deleteWriteMock } = vi.hoisted(() => ({ deleteWriteMock: vi.fn() }));
+
+vi.mock("@beagle/db", () => ({
+  deleteAdminTrialEventWriteDb: deleteWriteMock,
+}));
+
+const admin = {
+  id: "u_1",
+  email: "admin@example.com",
+  username: null,
+  role: "ADMIN" as const,
+};
+
+describe("deleteAdminTrialEvent", () => {
+  beforeEach(() => deleteWriteMock.mockReset());
+
+  it("validates and authorizes the request", async () => {
+    expect(
+      (await deleteAdminTrialEvent({ trialEventId: " " }, admin)).status,
+    ).toBe(400);
+    expect(
+      (
+        await deleteAdminTrialEvent(
+          { trialEventId: "event-1" },
+          { ...admin, role: "USER" },
+        )
+      ).status,
+    ).toBe(403);
+    expect(deleteWriteMock).not.toHaveBeenCalled();
+  });
+
+  it.each([
+    ["not_found", 404, "TRIAL_EVENT_NOT_FOUND"],
+    ["not_empty", 409, "TRIAL_EVENT_NOT_EMPTY"],
+  ] as const)("maps %s", async (status, httpStatus, code) => {
+    deleteWriteMock.mockResolvedValue({ status });
+
+    const result = await deleteAdminTrialEvent(
+      { trialEventId: "event-1" },
+      admin,
+    );
+
+    expect(result.status).toBe(httpStatus);
+    expect(result.body).toMatchObject({ ok: false, code });
+  });
+
+  it("returns the deleted event id", async () => {
+    deleteWriteMock.mockResolvedValue({
+      status: "deleted",
+      deletedTrialEventId: "event-1",
+    });
+
+    await expect(
+      deleteAdminTrialEvent({ trialEventId: " event-1 " }, admin),
+    ).resolves.toEqual({
+      status: 200,
+      body: { ok: true, data: { deletedTrialEventId: "event-1" } },
+    });
+    expect(deleteWriteMock).toHaveBeenCalledWith({ trialEventId: "event-1" });
+  });
+});
diff --git a/packages/server/admin/trials/manage/create-trial-event.ts b/packages/server/admin/trials/manage/create-trial-event.ts
new file mode 100644
index 00000000..35f9c552
--- /dev/null
+++ b/packages/server/admin/trials/manage/create-trial-event.ts
@@ -0,0 +1,155 @@
+import type {
+  CreateAdminTrialEventRequest,
+  CreateAdminTrialEventResponse,
+  CurrentUserDto,
+} from "@beagle/contracts";
+import {
+  createAdminTrialEventWriteDb,
+  listActiveTrialRuleWindowsDb,
+} from "@beagle/db";
+import { requireAdmin } from "@server/admin/core/service";
+import { toErrorLog, withLogContext } from "@server/core/logger";
+import type { ServiceResult } from "@server/core/result";
+import { resolveTrialRuleWindowId } from "@server/trials/core";
+import { parseAdminTrialEventWriteInput } from "./internal/parse-admin-trial-event-write-input";
+
+type ServiceLogContext = {
+  requestId?: string;
+  actorUserId?: string;
+};
+
+function isUniqueConstraintError(error: unknown): boolean {
+  return Boolean(
+    error &&
+    typeof error === "object" &&
+    "code" in error &&
+    (error as { code?: string }).code === "P2002",
+  );
+}
+
+// Creates one empty canonical trial event for an authorized administrator.
+export async function createAdminTrialEvent(
+  input: CreateAdminTrialEventRequest,
+  currentUser: CurrentUserDto | null,
+  context?: ServiceLogContext,
+): Promise<ServiceResult<CreateAdminTrialEventResponse>> {
+  const startedAt = Date.now();
+  const log = withLogContext({
+    layer: "service",
+    useCase: "admin-trials.createAdminTrialEvent",
+    ...(context?.requestId ? { requestId: context.requestId } : {}),
+    ...(context?.actorUserId ? { actorUserId: context.actorUserId } : {}),
+  });
+
+  const authResult = requireAdmin(currentUser);
+  if (!authResult.body.ok) {
+    log.warn(
+      {
+        event: "forbidden",
+        status: authResult.status,
+        durationMs: Date.now() - startedAt,
+      },
+      "admin trial event creation rejected by authorization",
+    );
+    return { status: authResult.status, body: authResult.body };
+  }
+
+  const parsed = parseAdminTrialEventWriteInput(input, {
+    requireSklKoeId: true,
+  });
+  if (!parsed.ok) {
+    log.warn(
+      { event: parsed.issue.event, durationMs: Date.now() - startedAt },
+      "admin trial event creation rejected because event metadata is invalid",
+    );
+    return {
+      status: 400,
+      body: {
+        ok: false,
+        error: parsed.issue.error,
+        code: parsed.issue.code,
+      },
+    };
+  }
+
+  const event = parsed.data;
+  log.info(
+    {
+      event: "start",
+      eventDate: event.normalizedEventDate,
+      eventPlace: event.eventPlace,
+      sklKoeId: event.sklKoeId,
+    },
+    "admin trial event creation started",
+  );
+
+  try {
+    const activeRuleWindows = await listActiveTrialRuleWindowsDb();
+    const trialRuleWindowId = resolveTrialRuleWindowId(
+      activeRuleWindows,
+      event.eventDate,
+    );
+    const result = await createAdminTrialEventWriteDb({
+      eventDate: event.eventDate,
+      eventPlace: event.eventPlace,
+      jarjestaja: event.jarjestaja,
+      ylituomari: event.ylituomari,
+      ylituomariNumero: event.ylituomariNumero,
+      ytKertomus: event.ytKertomus,
+      kennelpiiri: event.kennelpiiri,
+      kennelpiirinro: event.kennelpiirinro,
+      sklKoeId: event.sklKoeId!,
+      trialRuleWindowId,
+    });
+
+    log.info(
+      {
+        event: "success",
+        trialEventId: result.trialEventId,
+        sklKoeId: event.sklKoeId,
+        durationMs: Date.now() - startedAt,
+      },
+      "admin trial event creation succeeded",
+    );
+    return {
+      status: 201,
+      body: { ok: true, data: { trialEventId: result.trialEventId } },
+    };
+  } catch (error) {
+    if (isUniqueConstraintError(error)) {
+      log.warn(
+        {
+          event: "skl_koe_id_conflict",
+          sklKoeId: event.sklKoeId,
+          durationMs: Date.now() - startedAt,
+        },
+        "admin trial event creation rejected because sklKoeId is already used",
+      );
+      return {
+        status: 409,
+        body: {
+          ok: false,
+          error: "An event already uses this SKL koe id.",
+          code: "SKL_KOE_ID_CONFLICT",
+        },
+      };
+    }
+
+    log.error(
+      {
+        event: "exception",
+        durationMs: Date.now() - startedAt,
+        ...toErrorLog(error),
+      },
+      "admin trial event creation failed",
+    );
+    return {
+      status: 500,
+      body: {
+        ok: false,
+        error: "Failed to create admin trial event.",
+        code: "INTERNAL_ERROR",
+      },
+    };
+  }
+}
diff --git a/packages/server/admin/trials/manage/delete-trial-event.ts b/packages/server/admin/trials/manage/delete-trial-event.ts
new file mode 100644
index 00000000..61233360
--- /dev/null
+++ b/packages/server/admin/trials/manage/delete-trial-event.ts
@@ -0,0 +1,124 @@
+import type {
+  CurrentUserDto,
+  DeleteAdminTrialEventRequest,
+  DeleteAdminTrialEventResponse,
+} from "@beagle/contracts";
+import { deleteAdminTrialEventWriteDb } from "@beagle/db";
+import { requireAdmin } from "@server/admin/core/service";
+import { toErrorLog, withLogContext } from "@server/core/logger";
+import type { ServiceResult } from "@server/core/result";
+
+type ServiceLogContext = {
+  requestId?: string;
+  actorUserId?: string;
+};
+
+// Deletes one canonical trial event only while it has no result rows.
+export async function deleteAdminTrialEvent(
+  input: DeleteAdminTrialEventRequest,
+  currentUser: CurrentUserDto | null,
+  context?: ServiceLogContext,
+): Promise<ServiceResult<DeleteAdminTrialEventResponse>> {
+  const startedAt = Date.now();
+  const trialEventId = input.trialEventId.trim();
+  const log = withLogContext({
+    layer: "service",
+    useCase: "admin-trials.deleteAdminTrialEvent",
+    ...(context?.requestId ? { requestId: context.requestId } : {}),
+    ...(context?.actorUserId ? { actorUserId: context.actorUserId } : {}),
+  });
+
+  if (!trialEventId) {
+    log.warn(
+      { event: "invalid_trial_event_id", durationMs: Date.now() - startedAt },
+      "admin trial event deletion rejected because trialEventId is invalid",
+    );
+    return {
+      status: 400,
+      body: {
+        ok: false,
+        error: "Trial event id is required.",
+        code: "INVALID_TRIAL_EVENT_ID",
+      },
+    };
+  }
+
+  const authResult = requireAdmin(currentUser);
+  if (!authResult.body.ok) {
+    log.warn(
+      {
+        event: "forbidden",
+        status: authResult.status,
+        durationMs: Date.now() - startedAt,
+      },
+      "admin trial event deletion rejected by authorization",
+    );
+    return { status: authResult.status, body: authResult.body };
+  }
+
+  log.info(
+    { event: "start", trialEventId },
+    "admin trial event deletion started",
+  );
+  try {
+    const result = await deleteAdminTrialEventWriteDb({ trialEventId });
+    if (result.status === "not_found") {
+      return {
+        status: 404,
+        body: {
+          ok: false,
+          error: "Trial event not found.",
+          code: "TRIAL_EVENT_NOT_FOUND",
+        },
+      };
+    }
+    if (result.status === "not_empty") {
+      log.warn(
+        {
+          event: "not_empty",
+          trialEventId,
+          durationMs: Date.now() - startedAt,
+        },
+        "admin trial event deletion rejected because the event has entries",
+      );
+      return {
+        status: 409,
+        body: {
+          ok: false,
+          error: "A trial event with results cannot be deleted.",
+          code: "TRIAL_EVENT_NOT_EMPTY",
+        },
+      };
+    }
+
+    log.info(
+      { event: "success", trialEventId, durationMs: Date.now() - startedAt },
+      "admin trial event deletion succeeded",
+    );
+    return {
+      status: 200,
+      body: {
+        ok: true,
+        data: { deletedTrialEventId: result.deletedTrialEventId },
+      },
+    };
+  } catch (error) {
+    log.error(
+      {
+        event: "exception",
+        trialEventId,
+        durationMs: Date.now() - startedAt,
+        ...toErrorLog(error),
+      },
+      "admin trial event deletion failed",
+    );
+    return {
+      status: 500,
+      body: {
+        ok: false,
+        error: "Failed to delete admin trial event.",
+        code: "INTERNAL_ERROR",
+      },
+    };
+  }
+}
diff --git a/packages/server/admin/trials/manage/index.ts b/packages/server/admin/trials/manage/index.ts
index 2e5bada5..606751fb 100644
--- a/packages/server/admin/trials/manage/index.ts
+++ b/packages/server/admin/trials/manage/index.ts
@@ -1,5 +1,7 @@
 export { getAdminTrialEvent } from "./get-trial-event";
 export { listAdminTrialEvents } from "./list-trials";
+export { createAdminTrialEvent } from "./create-trial-event";
+export { deleteAdminTrialEvent } from "./delete-trial-event";
 export { deleteAdminTrialEntry } from "./delete-trial-entry";
 export { updateAdminTrialEvent } from "./update-trial-event";
 export { updateAdminTrialEntry } from "./update-trial-entry";
diff --git a/packages/server/admin/trials/manage/internal/parse-admin-trial-event-write-input.ts b/packages/server/admin/trials/manage/internal/parse-admin-trial-event-write-input.ts
new file mode 100644
index 00000000..17408cf3
--- /dev/null
+++ b/packages/server/admin/trials/manage/internal/parse-admin-trial-event-write-input.ts
@@ -0,0 +1,108 @@
+import { parseIsoDateOnlyToUtcDate } from "@server/trials/internal/iso-date";
+
+type AdminTrialEventWriteInput = {
+  eventDate: string;
+  eventPlace: string;
+  jarjestaja: string | null;
+  ylituomari: string | null;
+  ylituomariNumero: string | null;
+  ytKertomus: string | null;
+  kennelpiiri: string | null;
+  kennelpiirinro: string | null;
+  sklKoeId: number | null;
+};
+
+type ParsedAdminTrialEventWriteInput = {
+  normalizedEventDate: string;
+  eventDate: Date;
+  eventPlace: string;
+  jarjestaja: string | null;
+  ylituomari: string | null;
+  ylituomariNumero: string | null;
+  ytKertomus: string | null;
+  kennelpiiri: string | null;
+  kennelpiirinro: string | null;
+  sklKoeId: number | null;
+};
+
+type AdminTrialEventWriteValidationIssue = {
+  event: "invalid_event_date" | "invalid_event_place" | "invalid_skl_koe_id";
+  code: "INVALID_EVENT_DATE" | "INVALID_EVENT_PLACE" | "INVALID_SKL_KOE_ID";
+  error: string;
+};
+
+function normalizeOptionalText(value: string | null): string | null {
+  if (value === null) {
+    return null;
+  }
+
+  const normalized = value.trim();
+  return normalized.length > 0 ? normalized : null;
+}
+
+// Normalizes the event metadata shared by admin event creation and editing.
+export function parseAdminTrialEventWriteInput(
+  input: AdminTrialEventWriteInput,
+  options: { requireSklKoeId: boolean },
+):
+  | { ok: true; data: ParsedAdminTrialEventWriteInput }
+  | { ok: false; issue: AdminTrialEventWriteValidationIssue } {
+  const normalizedEventDate = input.eventDate.trim();
+  const eventDate = parseIsoDateOnlyToUtcDate(normalizedEventDate);
+  if (!eventDate) {
+    return {
+      ok: false,
+      issue: {
+        event: "invalid_event_date",
+        code: "INVALID_EVENT_DATE",
+        error: "Event date must use YYYY-MM-DD format.",
+      },
+    };
+  }
+
+  const eventPlace = input.eventPlace.trim();
+  if (!eventPlace) {
+    return {
+      ok: false,
+      issue: {
+        event: "invalid_event_place",
+        code: "INVALID_EVENT_PLACE",
+        error: "Event place is required.",
+      },
+    };
+  }
+
+  const sklKoeId = input.sklKoeId;
+  if (
+    (options.requireSklKoeId && sklKoeId === null) ||
+    (sklKoeId !== null &&
+      (!Number.isInteger(sklKoeId) ||
+        !Number.isFinite(sklKoeId) ||
+        sklKoeId < 1))
+  ) {
+    return {
+      ok: false,
+      issue: {
+        event: "invalid_skl_koe_id",
+        code: "INVALID_SKL_KOE_ID",
+        error: "SKL koe id must be a positive integer.",
+      },
+    };
+  }
+
+  return {
+    ok: true,
+    data: {
+      normalizedEventDate,
+      eventDate,
+      eventPlace,
+      jarjestaja: normalizeOptionalText(input.jarjestaja),
+      ylituomari: normalizeOptionalText(input.ylituomari),
+      ylituomariNumero: normalizeOptionalText(input.ylituomariNumero),
+      ytKertomus: normalizeOptionalText(input.ytKertomus),
+      kennelpiiri: normalizeOptionalText(input.kennelpiiri),
+      kennelpiirinro: normalizeOptionalText(input.kennelpiirinro),
+      sklKoeId,
+    },
+  };
+}
diff --git a/packages/server/admin/trials/manage/update-trial-event.ts b/packages/server/admin/trials/manage/update-trial-event.ts
index 12c7b1de..1b4971f8 100644
--- a/packages/server/admin/trials/manage/update-trial-event.ts
+++ b/packages/server/admin/trials/manage/update-trial-event.ts
@@ -7,26 +7,13 @@ import { updateAdminTrialEventWriteDb } from "@beagle/db";
 import { requireAdmin } from "@server/admin/core/service";
 import { toErrorLog, withLogContext } from "@server/core/logger";
 import type { ServiceResult } from "@server/core/result";
-import { parseIsoDateOnlyToUtcDate } from "@server/trials/internal/iso-date";
+import { parseAdminTrialEventWriteInput } from "./internal/parse-admin-trial-event-write-input";
 
 type ServiceLogContext = {
   requestId?: string;
   actorUserId?: string;
 };
 
-function normalizeRequiredText(value: string): string {
-  return value.trim();
-}
-
-function normalizeOptionalText(value: string | null): string | null {
-  if (value === null) {
-    return null;
-  }
-
-  const normalized = value.trim();
-  return normalized.length > 0 ? normalized : null;
-}
-
 // Validates and updates canonical TrialEvent metadata for one admin-selected event.
 export async function updateAdminTrialEvent(
   input: UpdateAdminTrialEventRequest,
@@ -73,72 +60,39 @@ export async function updateAdminTrialEvent(
     };
   }
 
-  const normalizedEventDate = input.eventDate.trim();
-  const eventDate = parseIsoDateOnlyToUtcDate(normalizedEventDate);
-  if (!eventDate) {
+  const parsed = parseAdminTrialEventWriteInput(input, {
+    requireSklKoeId: false,
+  });
+  if (!parsed.ok) {
     log.warn(
       {
-        event: "invalid_event_date",
-        eventDate: input.eventDate,
+        event: parsed.issue.event,
         durationMs: Date.now() - startedAt,
       },
-      "admin trial event update rejected because eventDate is invalid",
-    );
-    return {
-      status: 400,
-      body: {
-        ok: false,
-        error: "Event date must use YYYY-MM-DD format.",
-        code: "INVALID_EVENT_DATE",
-      },
-    };
-  }
-
-  const eventPlace = normalizeRequiredText(input.eventPlace);
-  if (!eventPlace) {
-    log.warn(
-      { event: "invalid_event_place", durationMs: Date.now() - startedAt },
-      "admin trial event update rejected because eventPlace is invalid",
+      "admin trial event update rejected because event metadata is invalid",
     );
     return {
       status: 400,
       body: {
         ok: false,
-        error: "Event place is required.",
-        code: "INVALID_EVENT_PLACE",
+        error: parsed.issue.error,
+        code: parsed.issue.code,
       },
     };
   }
 
-  const jarjestaja = normalizeOptionalText(input.jarjestaja);
-  const ylituomari = normalizeOptionalText(input.ylituomari);
-  const ylituomariNumero = normalizeOptionalText(input.ylituomariNumero);
-  const ytKertomus = normalizeOptionalText(input.ytKertomus);
-  const kennelpiiri = normalizeOptionalText(input.kennelpiiri);
-  const kennelpiirinro = normalizeOptionalText(input.kennelpiirinro);
-
-  const sklKoeId = input.sklKoeId;
-  if (
-    sklKoeId !== null &&
-    (!Number.isInteger(sklKoeId) || !Number.isFinite(sklKoeId) || sklKoeId < 1)
-  ) {
-    log.warn(
-      {
-        event: "invalid_skl_koe_id",
-        sklKoeId: input.sklKoeId,
-        durationMs: Date.now() - startedAt,
-      },
-      "admin trial event update rejected because sklKoeId is invalid",
-    );
-    return {
-      status: 400,
-      body: {
-        ok: false,
-        error: "SKL koe id must be a positive integer.",
-        code: "INVALID_SKL_KOE_ID",
-      },
-    };
-  }
+  const {
+    normalizedEventDate,
+    eventDate,
+    eventPlace,
+    jarjestaja,
+    ylituomari,
+    ylituomariNumero,
+    ytKertomus,
+    kennelpiiri,
+    kennelpiirinro,
+    sklKoeId,
+  } = parsed.data;
 
   log.info(
     {
diff --git a/packages/server/index.ts b/packages/server/index.ts
index 681c80d7..9be0bf62 100644
--- a/packages/server/index.ts
+++ b/packages/server/index.ts
@@ -45,6 +45,8 @@ export { createTrialsService, trialsService } from "./trials";
 export { upsertKoiratietokantaAjokResultService } from "./trials";
 export { listAdminTrialEvents } from "./admin";
 export { getAdminTrialEvent } from "./admin";
+export { createAdminTrialEvent } from "./admin";
+export { deleteAdminTrialEvent } from "./admin";
 export { deleteAdminTrialEntry } from "./admin";
 export { updateAdminTrialEvent } from "./admin";
 export { updateAdminTrialEntry } from "./admin";
diff --git a/packages/server/trials/integrations/koiratietokanta/__tests__/upsert-ajok-result.test.ts b/packages/server/trials/integrations/koiratietokanta/__tests__/upsert-ajok-result.test.ts
index 09b0b33c..ce205de9 100644
--- a/packages/server/trials/integrations/koiratietokanta/__tests__/upsert-ajok-result.test.ts
+++ b/packages/server/trials/integrations/koiratietokanta/__tests__/upsert-ajok-result.test.ts
@@ -1,9 +1,9 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { upsertKoiratietokantaAjokResultService } from "../upsert-ajok-result";
 
-const { upsertDbMock, trialRuleWindowFindManyMock } = vi.hoisted(() => ({
+const { upsertDbMock, listActiveRuleWindowsMock } = vi.hoisted(() => ({
   upsertDbMock: vi.fn(),
-  trialRuleWindowFindManyMock: vi.fn(),
+  listActiveRuleWindowsMock: vi.fn(),
 }));
 
 vi.mock("@beagle/db", () => ({
@@ -22,19 +22,15 @@ vi.mock("@beagle/db", () => ({
     SULJETTU: "SULJETTU",
     KESKEYTETTY: "KESKEYTETTY",
   },
-  prisma: {
-    trialRuleWindow: {
-      findMany: trialRuleWindowFindManyMock,
-    },
-  },
+  listActiveTrialRuleWindowsDb: listActiveRuleWindowsMock,
   upsertKoiratietokantaAjokResultDb: upsertDbMock,
 }));
 
 describe("upsertKoiratietokantaAjokResultService", () => {
   beforeEach(() => {
     upsertDbMock.mockReset();
-    trialRuleWindowFindManyMock.mockReset();
-    trialRuleWindowFindManyMock.mockResolvedValue([
+    listActiveRuleWindowsMock.mockReset();
+    listActiveRuleWindowsMock.mockResolvedValue([
       {
         id: "window-1",
         fromYmd: 20200101,
diff --git a/packages/server/trials/integrations/koiratietokanta/upsert-ajok-result.ts b/packages/server/trials/integrations/koiratietokanta/upsert-ajok-result.ts
index f66bcf6f..193e9647 100644
--- a/packages/server/trials/integrations/koiratietokanta/upsert-ajok-result.ts
+++ b/packages/server/trials/integrations/koiratietokanta/upsert-ajok-result.ts
@@ -2,7 +2,10 @@ import {
   type KoiratietokantaAjokUpsertRequest,
   type KoiratietokantaAjokUpsertResponse,
 } from "@beagle/contracts";
-import { prisma, upsertKoiratietokantaAjokResultDb } from "@beagle/db";
+import {
+  listActiveTrialRuleWindowsDb,
+  upsertKoiratietokantaAjokResultDb,
+} from "@beagle/db";
 import { toErrorLog, withLogContext } from "@server/core/logger";
 import type { ServiceResult } from "@server/core/result";
 import { resolveTrialRuleWindowId } from "@server/trials/core";
@@ -35,10 +38,7 @@ export async function upsertKoiratietokantaAjokResultService(
   }
 
   try {
-    const activeRuleWindows = await prisma.trialRuleWindow.findMany({
-      where: { isActive: true },
-      orderBy: [{ sortOrder: "asc" }, { id: "asc" }],
-    });
+    const activeRuleWindows = await listActiveTrialRuleWindowsDb();
     const trialRuleWindowId = resolveTrialRuleWindowId(
       activeRuleWindows,
       mapped.event.koepaiva,

From 63c0e3b0c76bf9f6b42d7430b4691a02a8ce7fd6 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Wed, 22 Jul 2026 18:53:24 +0300
Subject: [PATCH 06/24] trial entry planning docs

ref bej-103
---
 docs/planning/trials/README.md             |  20 +-
 docs/planning/trials/result-creation-r2.md | 151 +++++++
 docs/planning/trials/result-creation.md    | 498 +++++++++++++--------
 3 files changed, 473 insertions(+), 196 deletions(-)
 create mode 100644 docs/planning/trials/result-creation-r2.md

diff --git a/docs/planning/trials/README.md b/docs/planning/trials/README.md
index 9180c064..0dc0ccb9 100644
--- a/docs/planning/trials/README.md
+++ b/docs/planning/trials/README.md
@@ -15,8 +15,10 @@ on the next gate.
 
 - [Event creation](./event-creation.md) defines the event workspace, manual
   event creation, and the persisted empty-event lifecycle.
-- [Result creation](./result-creation.md) defines the manual result write path
-  and the full-page result form.
+- [Result creation R1](./result-creation.md) defines the manual-result schema,
+  identity, transaction, error, date-only, and Server Action backend contract.
+- [Result creation R2](./result-creation-r2.md) defines the full-page result
+  form and admin UI workflow built on the approved R1 contract.
 - [Later UX](./later-ux.md) records deferred ideas only and does not authorize
   their implementation.
 
@@ -66,10 +68,20 @@ Repository guardrails and current feature documentation:
 
 Implement gates in this order:
 
+```text
+E1
+ ↓
+E2
+ ↓
+R1 (backend)
+ ↓
+R2 (UI)
+```
+
 1. `E1` - event workspace
 2. `E2` - event creation and empty-event lifecycle
-3. `R1` - manual result backend and schema foundation
-4. `R2` - full-page manual result form
+3. `R1` - manual result schema and backend
+4. `R2` - manual result UI and workflow
 
 For every gate:
 
diff --git a/docs/planning/trials/result-creation-r2.md b/docs/planning/trials/result-creation-r2.md
new file mode 100644
index 00000000..5d5ddfa0
--- /dev/null
+++ b/docs/planning/trials/result-creation-r2.md
@@ -0,0 +1,151 @@
+# BEJ-103 Gate R2 — Manual Result UI and Workflow
+
+## Purpose
+
+This plan adds the full-page admin workflow for creating one manual
+`TrialEntry` at a time after Gate R1 has been implemented, validated, reviewed,
+and approved. It preserves the existing result-edit modal and the trials
+master-detail page.
+
+Cross-slice decisions and review rules are defined in the
+[planning overview](./README.md). Event dependencies are defined in
+[Event creation](./event-creation.md), and the complete backend contract is
+owned by [Gate R1](./result-creation.md).
+
+## R1 contract assumed by R2
+
+R2 consumes, but does not redefine or weaken, the R1 decisions for:
+
+- Prisma schema and date-only storage;
+- manual-result request and response contracts;
+- backend service and DB transaction behavior;
+- admin Server Action transport;
+- canonical registration and identity;
+- duplicate protection and `DogRegistration` resolution;
+- stable backend error codes;
+- authoritative Koiratietokanta replacement; and
+- timezone-free `YYYY-MM-DD` event-date behavior.
+
+R2 maps stable `errorCode` values to localized presentation and never inspects
+backend message strings to determine behavior.
+
+## Scope
+
+- Add a dedicated full-page result-create route under one event workspace.
+- Keep the event identity visible while entering a dog result.
+- Add a required free-text registration field. Do not require selecting an
+  existing dog.
+- Reuse the existing result, era, lisatieto, judge, and note sections where
+  practical, with one initial era and the existing validation semantics.
+- Prefill each clean form with the event's chief-judge name and number. Keep
+  all dog/result-specific values empty and the initial trial type `NORMAL`.
+- Preserve entered values after server or validation failure and prevent
+  duplicate submissions while a save is pending.
+- Add a React Query mutation over the R1 Server Action. On success, invalidate
+  and refetch the admin event/list and affected public trial queries. Do not
+  optimistically insert a partial result into query caches.
+- Add two successful submission paths:
+  - **Save and add another** creates one result, shows localized success
+    feedback, and opens a clean form for the same event with event-level judge
+    defaults restored.
+  - **Save and finish** creates one result, shows localized success feedback,
+    and returns to the event workspace.
+- Change E2's temporary successful event-create continuation so the primary
+  action opens the first result form for the newly persisted event.
+- Define cancel and browser navigation:
+  - Cancel returns to the event workspace.
+  - Dirty cancel and browser-back navigation use a localized native
+    confirmation before discarding values.
+  - Refresh and tab/window close use browser-native unsaved-change protection.
+  - Clean browser back returns to the event workspace without confirmation.
+  - A failed or rejected save stays on the populated form.
+- Add Finnish and Swedish labels, helper text, validation messages, stable
+  backend-error mappings, and success/error feedback.
+- Add the user-visible result-creation change under `CHANGELOG.md` Unreleased
+  when R2 exposes the workflow.
+- Keep existing result editing in its current modal.
+
+## Error and validation presentation
+
+- Client validation provides immediate field feedback but does not replace R1
+  server validation or canonical normalization.
+- `INVALID_REGISTRATION_NUMBER`, `INVALID_TRIAL_ENTRY`,
+  `INVALID_TRIAL_ERAS`, and `INVALID_TRIAL_ADDITIONAL_INFO` keep the populated
+  form open and show actionable localized validation feedback.
+- `TRIAL_ENTRY_REGISTRATION_CONFLICT` explains that the canonical registration
+  already exists in the selected event and keeps the form populated.
+- `TRIAL_EVENT_NOT_FOUND` and `TRIAL_EVENT_MISSING_SKL_ID` show an event-level
+  state with navigation back to the workspace or trials list as appropriate.
+- `UNAUTHENTICATED` and `FORBIDDEN` continue through the existing admin access
+  behavior.
+- Unexpected failures keep the form populated and show localized generic error
+  feedback.
+
+## Exclusions
+
+- No migration of existing result editing to a page.
+- No searchable dog picker or inline dog creation.
+- No batch form, autosave, draft/publish state, or reconciliation UI.
+- No optimistic cache insertion.
+- No redesign of the existing trials master-detail list.
+- No public UI or trial-statistics changes.
+- No changes to R1 identity, transaction, error, date-only, or authoritative
+  upsert behavior.
+
+## Dependencies
+
+- E1 and E2 must be merged for the workspace and persisted event lifecycle.
+- R1 must be merged and separately approved for its schema, contracts, Server
+  Action, stable errors, and persistence behavior.
+- Existing entry form sections and form-model behavior are the reuse baseline;
+  any extraction must preserve the current edit-modal behavior.
+- Existing admin trial query keys and localized message infrastructure are the
+  integration points for invalidation and user feedback.
+
+## Acceptance criteria
+
+- Successful event creation continues to the first result form for that exact
+  event.
+- The event date is displayed from the R1 `YYYY-MM-DD` contract without client
+  timezone reinterpretation.
+- A clean form has one initial era, `NORMAL` trial type, and the event's
+  chief-judge defaults.
+- An admin can save a result for a known or unknown registration.
+- Stable R1 error codes produce localized UI behavior without inspecting
+  backend messages.
+- Save and add another clears dog/result-specific state, restores event-level
+  defaults, retains event context, and produces no duplicate submission.
+- Save and finish returns to the event workspace where the invalidated event
+  query reloads the new result.
+- No partial result is inserted optimistically into admin or public caches.
+- Cancel, browser back, refresh, and close protect dirty input using the
+  documented native browser behavior.
+- Validation and server errors preserve entered data and provide actionable
+  Finnish and Swedish feedback.
+- The existing result-edit modal behaves as before.
+- The user-visible change is recorded under `CHANGELOG.md` Unreleased.
+
+## Targeted validation
+
+- Component/form-model tests for initial event-level defaults, validation,
+  dirty state, reset, and Finnish/Swedish feedback.
+- Mutation tests for stable error-code mapping, success, failure, query
+  invalidation/refetch, absence of optimistic insertion, and duplicate-submit
+  protection.
+- Route/workflow tests for event-create continuation, add-another, finish,
+  missing-event and missing-SKL states, cancel, browser back, refresh/close
+  protection, and timezone-free event-date display.
+- Regression tests for the existing result-edit modal and selected-event panel.
+- Targeted web type checking and linting; do not run cycle lint in the agent
+  workflow.
+- Manual desktop and mobile checks for the long form and both continuation
+  paths when browser tooling is available.
+
+## Merge independence and review gate
+
+R2 is the final BEJ-103 creation gate and can merge safely only after E1, E2,
+and R1. It replaces E2's documented temporary redirect with the final
+continuation behavior and leaves no dependency on deferred UX work.
+
+Stop after validation and request final BEJ-103 review. Deferred items remain
+unauthorized unless they are moved into an approved planning gate.
diff --git a/docs/planning/trials/result-creation.md b/docs/planning/trials/result-creation.md
index 49802df2..44e30042 100644
--- a/docs/planning/trials/result-creation.md
+++ b/docs/planning/trials/result-creation.md
@@ -1,197 +1,311 @@
-# BEJ-103 Result Creation
+# BEJ-103 Gate R1 — Manual Result Schema and Backend
 
 ## Purpose
 
-This plan adds one-at-a-time manual `TrialEntry` creation after the event
-workspace and empty-event lifecycle are complete. It preserves the existing
-result-edit modal. Cross-slice decisions and review rules are defined in the
-[planning overview](./README.md), and event dependencies are defined in
-[Event creation](./event-creation.md).
-
-## Existing identity and upsert behavior
-
-The current Koiratietokanta write path:
-
-- resolves a `TrialEvent` through unique `TrialEvent.sklKoeId`;
-- resolves an entry inside that event through the existing
-  `TrialEvent` plus `TrialEntry.rekisterinumeroSnapshot` uniqueness;
-- writes `TrialEntry.yksilointiAvain` as
-  `SKL:<sklKoeId>|REG:<normalizedRegistration>`; and
-- upserts the entry in place before replacing its era and lisatieto rows.
-
-Manual result creation must use these existing identity semantics. This plan
-does not add another database uniqueness constraint.
-
-## Authoritative matching upsert
-
-When a later Koiratietokanta payload has the same `TrialEvent.sklKoeId` and
-normalized registration as a manually created result:
-
-- the existing manual `TrialEntry` is updated in place;
-- a duplicate result is not created;
-- incoming Koiratietokanta result, era, lisatieto, snapshot, and event data
-  become authoritative according to the existing ingestion mapper and upsert;
-- `TrialEntry.lahde` changes to `KOIRATIETOKANTA_API`; and
-- `dogId` is updated when the authoritative registration resolves through
-  `DogRegistration`. If it does not resolve, the current upsert behavior
-  preserves an existing dog link rather than clearing it.
-
-This is automatic matching, not a reconciliation UI or import redesign.
-
-## Gate R1: Manual result backend and schema foundation
-
-### Scope
-
-- Add `MANUAL_ADMIN` to the existing `TrialSourceTag` enum in an explicitly
-  approved Prisma migration.
-- Add admin manual-result request/response contracts, a server use-case, a
-  focused transactional DB write, and a Server Action mutation path.
-- Accept `trialEventId`, a registration number, and the existing entry, era,
-  and lisatieto write shape used by result editing.
-- Normalize and validate registration using existing server-side registration
-  rules.
-- Load the target event and require its `sklKoeId` for API-compatible manual
-  identity.
-- Reject a second result with the same normalized registration in the event.
-- Resolve `dogId` through `DogRegistration`; save an unlinked entry when no
-  local dog owns the normalized registration.
-- Store `lahde=MANUAL_ADMIN`, the normalized
-  `rekisterinumeroSnapshot`, and the API-compatible `yksilointiAvain`.
-- Create the entry, eras, and lisatiedot atomically.
-- Share validation and normalization with result update where doing so avoids
-  divergent business rules, while keeping create and update as separate
-  use-cases and DB writes.
-- Add a regression test for the authoritative matching upsert described above.
-
-### Exclusions
-
-- No result-create UI or navigation changes.
+This plan defines the independently mergeable schema and backend foundation
+for one-at-a-time manual `TrialEntry` creation. It is implemented from the
+BEJ-103 integration branch after the event workspace and empty-event lifecycle
+defined in [Event creation](./event-creation.md) are complete.
+
+This gate does not expose manual result creation in the admin UI. Cross-slice
+decisions and review rules remain in the [planning overview](./README.md).
+
+## Canonical registration and identity
+
+Manual creation and Koiratietokanta API ingestion must use the same shared
+registration normalization, validation, and trial-entry identity helpers.
+Registration is validated and normalized before it is logged, used for a
+database lookup, checked for duplicates, or included in an identity key. Raw
+registration input must not be logged or used for identity generation,
+duplicate detection, or registration lookup. Only the validated canonical
+value may be used in database operations.
+
+The canonical manual/API identity is:
+
+`SKL:<sklKoeId>|REG:<canonicalRegistration>`
+
+The following invariants apply:
+
+- Identity generation depends only on the event's `sklKoeId` and canonical
+  registration. It does not depend on whether `DogRegistration` resolves.
+- `TrialEntry.rekisterinumeroSnapshot` stores the canonical registration for
+  manual and Koiratietokanta API writes.
+- Linking an initially unlinked entry to a dog later changes `dogId`, not the
+  registration snapshot or identity key.
+- The same canonical identity is used whether the result was first created
+  manually or first received from the Koiratietokanta API.
+
+Source tags remain distinct:
+
+- the one-shot legacy bootstrap writes `LEGACY_AKOEALL`;
+- manual admin creation writes `MANUAL_ADMIN`; and
+- Koiratietokanta API ingestion writes `KOIRATIETOKANTA_API`.
+
+## Duplicate guarantee
+
+Creation must reject an entry when the selected event already contains the
+same canonical registration, regardless of input formatting, dog linkage, or
+whether the existing row is manual or from the Koiratietokanta API.
+
+The existing schema provides both required database guarantees:
+
+- `TrialEntry.yksilointiAvain` is globally unique; and
+- `(TrialEntry.trialEventId, TrialEntry.rekisterinumeroSnapshot)` is unique.
+
+No new uniqueness constraint is added in R1. The DB write may check both
+identities inside its transaction to return an intentional conflict early, but
+concurrent creation must also be protected by the existing constraints. A
+Prisma `P2002` targeting either trial-entry identity constraint maps to the
+stable `TRIAL_ENTRY_REGISTRATION_CONFLICT` result. Other uniqueness failures
+remain unexpected persistence errors.
+
+## DogRegistration resolution
+
+The DB lookup uses only the canonical registration. The current schema
+guarantees `DogRegistration.registrationNo @unique`, so at most one dog can
+match and the write must use `findUnique`; it must never select the first row
+from a non-unique result set.
+
+- One match links its `dogId` to the new entry.
+- No match creates a valid unlinked entry with `dogId=null`.
+- Multiple matches are not a runtime branch because the database constraint
+  prevents that state. A uniqueness failure while maintaining registrations
+  is an internal invariant failure, not a manual-result conflict.
+
+## Authoritative Koiratietokanta replacement
+
+When a later Koiratietokanta API upsert matches a manual entry by canonical
+identity, it updates the existing `TrialEntry` in place and does not create a
+second entry.
+
+The replacement boundary is:
+
+- Preserve the existing entry `id`, `trialEventId`, canonical registration
+  snapshot, `yksilointiAvain`, and database-row `createdAt`; `updatedAt`
+  changes normally. Incoming API creation or modification timestamps, when
+  available, belong only in their designated source metadata and must not
+  replace the row creation timestamp.
+- Replace all entry-level result, snapshot, judge, owner, status, score, and
+  other business fields with an explicit complete replacement object produced
+  from the Koiratietokanta mapper. Do not spread partial API values over the
+  existing row because absent properties could retain stale manual data.
+- Explicitly clear fields that can be entered manually but have no
+  Koiratietokanta entry-level value, rather than retaining stale manual data.
+  The current known case is `TrialEntry.tja`.
+- Set `lahde` from `MANUAL_ADMIN` to `KOIRATIETOKANTA_API` and replace
+  source-specific raw metadata with the incoming API payload.
+- Delete all existing eras and create the authoritative API eras. This also
+  removes manual-only era values, including `tja` and `pin` when the API mapper
+  has no corresponding era value.
+- Replace all lisatiedot through the recreated eras; no manual lisatieto row
+  survives unless it is also present in the API mapping.
+- If canonical registration resolves through `DogRegistration`, set `dogId`
+  to that dog. If it does not resolve, preserve an existing dog link rather
+  than clearing it; an already unlinked entry remains unlinked.
+- Keep the existing Koiratietokanta event upsert authoritative for its mapped
+  `TrialEvent` fields without changing the stable entry identity.
+
+The regression fixture must begin with values in every manually writable
+field. It must assert this complete boundary by proving that each value is
+replaced by the API mapping or explicitly cleared, including preserved
+technical identity, nullable snapshots, entry-level `tja`, era/lisatieto
+replacement, dog-link behavior, source tag, and raw metadata.
+
+## Shared validation boundary
+
+Create and update remain separate use-cases and separate DB writes. R1 may
+extract reusable validation and normalization primitives for their shared
+entry, era, and lisatieto shapes, but it must not introduce a generic “save
+result” orchestration function.
+
+The following remain owned separately by create and update:
+
+- authorization and request contracts;
+- event and entry lookup;
+- registration normalization and duplicate rules;
+- persistence orchestration and transaction ownership;
+- structured audit logging; and
+- response shape and service status mapping.
+
+Existing update behavior and its current error codes remain unchanged unless a
+shared primitive can be adopted without changing that use-case's contract.
+
+## Transaction ownership
+
+The focused manual-result DB creation operation owns the transaction. The same
+Prisma transaction client must perform, in order:
+
+1. load the selected `TrialEvent`;
+2. require its `sklKoeId`;
+3. generate and check the canonical identity from the already validated
+   canonical registration;
+4. resolve `DogRegistration` by canonical registration;
+5. create the `TrialEntry`;
+6. create validated continuous eras starting from 1;
+7. create each era's lisatiedot; and
+8. perform any explicit related persistence that must be atomic; existing
+   database audit triggers execute within the same transaction.
+
+Any failure rolls back the complete write. Existing database audit triggers run
+inside this transaction. Service-level `pino` logging remains outside the DB
+transaction and records normalized identifiers only.
+
+The DB layer returns typed outcomes such as created, event missing, event
+missing SKL ID, and registration conflict. It maps only relevant identity
+constraint violations to the conflict outcome so a concurrency race cannot
+leak as an unexpected error or create a duplicate.
+
+## Stable errors and layer ownership
+
+R1 defines stable codes for later R2 localization and mutation handling. R2
+must not inspect backend message strings.
+
+| Status | Code                                | Meaning                                                                  |
+| ------ | ----------------------------------- | ------------------------------------------------------------------------ |
+| 400    | `INVALID_TRIAL_EVENT_ID`            | The event identifier is empty or invalid.                                |
+| 400    | `INVALID_REGISTRATION_NUMBER`       | Registration is missing or fails canonical validation.                   |
+| 400    | `INVALID_TRIAL_ENTRY`               | Entry-level fields are invalid.                                          |
+| 400    | `INVALID_TRIAL_ERAS`                | Eras are missing, non-continuous, duplicated, or contain invalid values. |
+| 400    | `INVALID_TRIAL_ADDITIONAL_INFO`     | Lisatieto codes, era references, or values are invalid.                  |
+| 404    | `TRIAL_EVENT_NOT_FOUND`             | The selected event does not exist.                                       |
+| 409    | `TRIAL_EVENT_MISSING_SKL_ID`        | The event cannot produce API-compatible identity.                        |
+| 409    | `TRIAL_ENTRY_REGISTRATION_CONFLICT` | Canonical registration already exists in the event.                      |
+
+Existing `UNAUTHENTICATED` and `FORBIDDEN` authorization codes remain in use.
+
+- Shared validators return typed validation issue categories and normalized
+  values; they do not select HTTP statuses.
+- The create service selects the stable code and HTTP status, maps typed DB
+  outcomes, and owns structured success/failure logging.
+- The Server Action performs its existing admin/session guard and passes the
+  service code through as `errorCode` without interpreting message text.
+
+## Date-only invariant
+
+`TrialEvent.koepaiva` is a calendar date with no timezone or time-of-day
+semantics throughout contracts, services, database queries, filters, year
+derivation, and serialization.
+
+- Prisma declares it as `DateTime @db.Date`, and PostgreSQL stores it as
+  `DATE`.
+- Existing public and internal `YYYY-MM-DD` contracts remain unchanged.
+- Application code must use timezone-free date-only parsing and serialization;
+  it must not derive the event date through Helsinki or runtime timezone
+  conversion.
+- Year filters operate directly on `[YYYY-01-01, nextYear-01-01)` date-only
+  boundaries.
+- User-facing inclusive ranges operate directly on
+  `[dateFrom, dayAfter(dateTo))` date-only boundaries.
+- Rule-window resolution continues to use the date's UTC year/month/day carrier
+  solely as the Prisma representation of the calendar date.
+
+## Gate R1 scope
+
+- Add `MANUAL_ADMIN` to `TrialSourceTag`.
+- Change `TrialEvent.koepaiva` to PostgreSQL `DATE` and update all trial date
+  handling to the date-only invariant.
+- Add manual-result request/response contracts, a create service, the focused
+  transactional DB write, and the admin Server Action transport.
+- Accept `trialEventId`, registration, and the existing entry, era, and
+  lisatieto write shape used by result editing.
+- Store `lahde=MANUAL_ADMIN`, canonical `rekisterinumeroSnapshot`, and the
+  canonical API-compatible identity.
+- Add the full backend and authoritative-upsert regression coverage described
+  by this plan.
+- Update the nearest schema, integration, and admin-trial developer
+  documentation changed by R1.
+
+### Bootstrap migration rule
+
+The original canonical trial migration may be edited in place because these
+tables are still recreated through the documented one-shot bootstrap and
+forward migrations for this schema are not supported. The original migration
+must create `TrialSourceTag` with `MANUAL_ADMIN` and create `koepaiva` as
+`DATE`; no conversion or follow-up migration is added.
+
+Adding `MANUAL_ADMIN` here only declares an allowed enum value in fresh schema
+DDL. It does not assign that source to legacy rows: the one-shot legacy
+projection continues to write `LEGACY_AKOEALL` explicitly.
+
+No preserved environment may consume the edited migration incrementally.
+Implementation and validation must not:
+
+- run `prisma migrate reset`;
+- run any other Prisma migration, deploy, resolve, status, `db push`, or client
+  generation command;
+- reset, recreate, or modify any local or remote database automatically;
+- attempt to resolve migration checksum drift automatically; or
+- run a fresh bootstrap without separate explicit approval.
+
+The user owns all Prisma migration, database, bootstrap, and client-generation
+commands. If the unchanged generated client prevents a local type check, report
+that limitation instead of regenerating it.
+
+## Explicit exclusions
+
+- No result-creation page or route.
+- No React components or forms.
+- No React Query mutation hook.
+- No navigation or event-create continuation changes.
+- No dirty-state handling or UI localization.
+- No user-facing changelog entry.
+- No manual browser testing for an unavailable UI.
 - No existing result-editing redesign.
 - No batch creation, autosave, draft/publish state, or reconciliation UI.
-- No new ingestion endpoint or change to the external Koiratietokanta
-  contract.
-- No new database uniqueness constraint. The only planned schema change in
-  this gate is the new source enum value.
-
-### Dependencies
-
-- E2 must be approved and merged so the target event and empty-event lifecycle
-  exist.
-- The `MANUAL_ADMIN` migration requires explicit schema-change approval before
-  implementation.
-- Existing registration normalization, admin authorization, structured
-  logging, entry validation, and transaction conventions must be reused.
-
-### Acceptance criteria
-
-- An authorized call creates exactly one manual entry with its complete nested
-  writes or creates nothing if the transaction fails.
-- A matching local dog is linked; an unknown registration remains a valid
-  unlinked result.
-- Invalid registration, missing event, event without an SKL ID, duplicate
-  event registration, and invalid entry/era/lisatieto data return stable errors.
-- Manual source and identity fields match the documented API-compatible
-  semantics.
-- A later matching Koiratietokanta upsert updates the same entry without a
-  duplicate and makes the incoming data authoritative.
-
-### Targeted validation
-
-- Migration/schema checks for the new enum value and regenerated Prisma client.
-- DB tests for linked and unlinked creation, identity fields, duplicate
-  rejection, nested writes, and rollback.
-- Server tests for authorization, registration normalization, event
-  validation, entry/era/lisatieto validation, conflict mapping, and logging.
-- Server Action tests for authentication and service-result mapping.
-- Existing Koiratietokanta DB/service tests plus a manual-to-API replacement
-  regression case.
-- Targeted type checking and linting for contracts, server, DB, and web action
-  code; do not run cycle lint in the agent workflow.
-
-### Merge independence and review gate
-
-R1 can be merged safely after E2 without R2. The write path has no linked admin
-UI yet, so it does not expose an unfinished user workflow. Its migration and
-backend behavior must nevertheless be complete, documented, and validated.
-
-Stop after validation and request explicit review. Do not begin R2 without
-separate approval.
-
-## Gate R2: Full-page manual result form
-
-### Scope
-
-- Add a dedicated full-page result-create route under one event workspace.
-- Keep the event identity visible while entering a dog result.
-- Add a required free-text registration field. Do not require selecting an
-  existing dog.
-- Reuse the existing result, era, lisatieto, judge, and note sections where
-  practical, with one initial era and the existing validation semantics.
-- Preserve entered values after server or validation failure and prevent
-  duplicate submissions while a save is pending.
-- Add two successful submission paths:
-  - **Save and add another** creates one result, then opens a clean result form
-    for the same event.
-  - **Save and finish** creates one result, then returns to the event workspace.
-- Change E2's temporary successful event-create continuation so the primary
-  action opens the first result form for the newly persisted event.
-- Define cancel and browser navigation:
-  - Cancel returns to the event workspace.
-  - Cancel asks for confirmation before discarding a dirty form.
-  - Browser back follows the same dirty-form protection and otherwise returns
-    to the event workspace.
-  - A failed or rejected save stays on the populated form.
-- Add Finnish and Swedish labels, helper text, errors, and success feedback.
-- Keep existing result editing in its current modal.
-
-### Exclusions
-
-- No migration of existing result editing to a page.
-- No searchable dog picker or inline dog creation.
-- No batch form, autosave, draft/publish state, or reconciliation UI.
-- No redesign of the existing trials master-detail list.
-- No public UI or trial-statistics changes.
-
-### Dependencies
-
-- E1 and E2 must be merged for the workspace and persisted event lifecycle.
-- R1 must be merged for the manual-result action and persistence contract.
-- Existing entry form sections and form-model behavior are the reuse baseline;
-  any extraction must preserve the current edit-modal behavior.
-
-### Acceptance criteria
-
-- Successful event creation continues to the first result form for that exact
-  event.
-- An admin can save a result for a known or unknown registration.
-- Save and add another clears dog-specific state while retaining the event
-  context and produces no duplicate submission.
-- Save and finish returns to the event workspace where the new result appears.
-- Cancel and browser back protect dirty input and return to the correct event
-  when confirmed.
-- Validation and server errors preserve entered data and provide actionable
-  localized feedback.
-- The existing result-edit modal behaves as before.
-
-### Targeted validation
-
-- Component/form-model tests for initial state, validation, dirty state,
-  reset, and localized feedback.
-- Mutation tests for success, failure, query invalidation, and duplicate-submit
-  protection.
-- Route/workflow tests for event-create continuation, add-another, finish,
-  cancel, and browser-back handling.
-- Regression tests for the existing result-edit modal and selected-event panel.
-- Targeted web type checking and linting; do not run cycle lint in the agent
-  workflow.
-- Manual desktop and mobile checks for the long form and both continuation
-  paths when browser tooling is available.
-
-### Merge independence and review gate
-
-R2 is the final BEJ-103 creation gate and can merge safely after E1, E2, and R1.
-It replaces E2's documented temporary redirect with the final continuation
-behavior and leaves no dependency on deferred UX work.
-
-Stop after validation and request final BEJ-103 review. Deferred items remain
-unauthorized unless they are moved into an approved planning gate.
+- No new ingestion endpoint or external Koiratietokanta contract change.
+- No unrelated refactoring.
+
+The admin Server Action and its mapping tests are the only web-layer additions
+permitted in R1.
+
+## Acceptance criteria
+
+- An authorized call creates exactly one complete manual entry or creates
+  nothing when any nested write fails.
+- Canonically equivalent registration inputs conflict within the event for
+  linked, unlinked, manual, and Koiratietokanta API existing entries.
+- Existing database uniqueness protects concurrent creation, and relevant
+  constraint failures return `TRIAL_ENTRY_REGISTRATION_CONFLICT`.
+- A uniquely matching `DogRegistration` links the dog; no match creates an
+  unlinked entry without changing canonical identity.
+- Source, registration snapshot, and identity match the documented invariants.
+- All stable validation, not-found, missing-SKL, conflict, authorization, and
+  internal-error mappings are covered without relying on message strings.
+- A later matching Koiratietokanta upsert satisfies the complete authoritative
+  replacement boundary.
+- All trial event date behavior satisfies the date-only invariant without
+  changing existing `YYYY-MM-DD` contracts.
+
+## Targeted validation
+
+- Static Prisma-schema and SQL inspection for `MANUAL_ADMIN` and `@db.Date`,
+  proving the original bootstrap SQL creates the enum value and `DATE`
+  directly. Do not generate the Prisma client or apply the schema.
+- Date tests in non-UTC runtime timezones with positive and negative offsets,
+  values around midnight, inclusive start/end dates, December 31/January 1,
+  and year filters without timezone drift.
+- DB tests for linked and unlinked creation, identity fields, all duplicate
+  variants, nested writes, rollback, and typed transaction outcomes.
+- A database-constraint-level or concurrent-create test proving the existing
+  uniqueness constraints—not only a read-before-write check—prevent duplicate
+  creation. This test must use an explicitly prepared test database and must
+  not reset one automatically.
+- Server tests for authorization, canonical normalization, event validation,
+  stable error selection, entry/era/lisatieto validation, conflict mapping,
+  and normalized structured logging.
+- Server Action tests for authentication and transparent service-result/error
+  mapping.
+- Koiratietokanta DB/service regression tests for the complete manual-to-API
+  replacement boundary.
+- Targeted type checking and linting for contracts, DB, server, and the web
+  Server Action; do not run cycle lint in the agent workflow.
+
+## Merge independence and review gate
+
+R1 can merge independently from the BEJ-103 integration branch after E2. Its
+write path has no linked admin UI, and its schema, transaction, identity,
+errors, date-only behavior, and authoritative-upsert contract are complete
+without R2.
+
+Stop after validation and request explicit review. R2 must be planned and
+approved separately without reopening the backend decisions finalized here.

From 248cae88078953a1bcfef33cdbc52ec0290d91e6 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Wed, 22 Jul 2026 19:01:55 +0300
Subject: [PATCH 07/24] fix r1 and r2 planning

ref bej-103
---
 docs/planning/trials/result-creation-r2.md |  9 ++++++---
 docs/planning/trials/result-creation.md    | 10 +++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/docs/planning/trials/result-creation-r2.md b/docs/planning/trials/result-creation-r2.md
index 5d5ddfa0..eca74759 100644
--- a/docs/planning/trials/result-creation-r2.md
+++ b/docs/planning/trials/result-creation-r2.md
@@ -54,9 +54,12 @@ backend message strings to determine behavior.
   action opens the first result form for the newly persisted event.
 - Define cancel and browser navigation:
   - Cancel returns to the event workspace.
-  - Dirty cancel and browser-back navigation use a localized native
-    confirmation before discarding values.
-  - Refresh and tab/window close use browser-native unsaved-change protection.
+  - Dirty cancel uses a localized application confirmation dialog before
+    discarding values.
+  - Browser-back and internal navigation use a route-blocking application
+    confirmation where technically supported.
+  - Refresh and tab/window close use browser-native unsaved-change protection
+    with browser-controlled wording.
   - Clean browser back returns to the event workspace without confirmation.
   - A failed or rejected save stays on the populated form.
 - Add Finnish and Swedish labels, helper text, validation messages, stable
diff --git a/docs/planning/trials/result-creation.md b/docs/planning/trials/result-creation.md
index 44e30042..1e4ad78a 100644
--- a/docs/planning/trials/result-creation.md
+++ b/docs/planning/trials/result-creation.md
@@ -231,15 +231,15 @@ No preserved environment may consume the edited migration incrementally.
 Implementation and validation must not:
 
 - run `prisma migrate reset`;
-- run any other Prisma migration, deploy, resolve, status, `db push`, or client
-  generation command;
+- run any other Prisma migration, deploy, resolve, status, or `db push`
+  command;
 - reset, recreate, or modify any local or remote database automatically;
 - attempt to resolve migration checksum drift automatically; or
 - run a fresh bootstrap without separate explicit approval.
 
-The user owns all Prisma migration, database, bootstrap, and client-generation
-commands. If the unchanged generated client prevents a local type check, report
-that limitation instead of regenerating it.
+The user owns all Prisma migration, database, and bootstrap commands. Prisma
+client generation is allowed when required by the approved schema changes and
+must not connect to or modify a database.
 
 ## Explicit exclusions
 

From b4d8a63849cf7fa9b86f65e4155fabed7ff651a0 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Wed, 22 Jul 2026 20:28:44 +0300
Subject: [PATCH 08/24] feat(trials): add manual admin result creation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  - add contracts, server action, service, and atomic persistence for
    manual trial entries
  - share normalized entry validation between create and update flows
  - reject duplicate registrations, lisätieto rows, and per-era
    lisätieto values
  - link manually created results to known dog registrations
  - allow API upserts to replace matching manual results authoritatively
  - store trial event dates as PostgreSQL DATE values
  - add MANUAL_ADMIN trial source tagging and update trial documentation
  - cover creation, validation, identity, date-only, and API overwrite
    behavior

ref bej-103
---
 apps/web/app/actions/admin/trials/index.ts    |   1 +
 .../create-admin-trial-entry.test.ts          |  56 +++
 .../trials/manage/create-admin-trial-entry.ts |  53 +++
 .../app/actions/admin/trials/manage/index.ts  |   1 +
 docs/features/admin-trial-management.md       |  12 +
 docs/features/schema/schema.md                |   3 +-
 .../trials/koiratietokanta-api-ajok-upsert.md |   7 +
 .../trials/manage/admin-trial-entry-write.ts  |  55 +++
 .../trials/manage/create-admin-trial-entry.ts |  11 +
 .../contracts/admin/trials/manage/index.ts    |  10 +
 .../trials/manage/update-admin-trial-entry.ts |  55 +--
 packages/contracts/index.ts                   |   6 +
 .../__tests__/create-trial-entry.test.ts      | 160 ++++++++
 .../admin/trials/manage/create-trial-entry.ts | 160 ++++++++
 packages/db/admin/trials/manage/index.ts      |   6 +
 .../admin/trials/manage/trial-entry-write.ts  |  60 +++
 .../admin/trials/manage/update-trial-entry.ts |  61 +--
 packages/db/index.ts                          |   5 +
 .../migration.sql                             |   4 +-
 .../migration.sql                             |   4 +-
 packages/db/prisma/schema.prisma              |   7 +-
 .../db/trials/core/trial-entry-identity.ts    |   6 +
 packages/db/trials/index.ts                   |   1 +
 .../__tests__/upsert-ajok-result.test.ts      |  46 +++
 .../koiratietokanta/upsert-ajok-result.ts     |   3 +
 packages/server/admin/index.ts                |   1 +
 .../__tests__/create-trial-entry.test.ts      | 172 ++++++++
 .../manage/__tests__/list-trials.test.ts      |   4 +-
 ...rse-admin-trial-event-search-input.test.ts |   6 +-
 ...resolve-admin-trial-event-defaults.test.ts |   4 +-
 .../__tests__/update-trial-entry.test.ts      |  59 +++
 .../admin/trials/manage/create-trial-entry.ts | 174 ++++++++
 .../admin/trials/manage/get-trial-event.ts    |   4 +-
 packages/server/admin/trials/manage/index.ts  |   1 +
 ...arse-admin-trial-entry-write-input.test.ts | 170 ++++++++
 .../map-admin-trial-event-search-response.ts  |  10 +-
 .../parse-admin-trial-entry-write-input.ts    | 247 +++++++++++
 .../parse-admin-trial-event-search-input.ts   |   7 +-
 .../resolve-admin-trial-event-defaults.ts     |  12 +-
 .../admin/trials/manage/update-trial-entry.ts | 387 ++++--------------
 packages/server/index.ts                      |   1 +
 .../server/trials/__tests__/service.test.ts   |  10 +-
 .../__tests__/trial-entry-identity.test.ts    |  35 ++
 packages/server/trials/core/business-date.ts  | 164 --------
 packages/server/trials/core/date-only.ts      |  39 ++
 packages/server/trials/core/index.ts          |   6 +-
 .../trials/core/trial-entry-identity.ts       |  14 +
 .../server/trials/get-beagle-trial-details.ts |   4 +-
 .../__tests__/upsert-ajok-result.test.ts      |   2 +
 .../internal/map-ajok-payload.ts              |  24 +-
 .../internal/__tests__/business-date.test.ts  |  38 --
 .../internal/__tests__/date-only.test.ts      |  38 ++
 .../server/trials/search-beagle-trials.ts     |  23 +-
 53 files changed, 1774 insertions(+), 675 deletions(-)
 create mode 100644 apps/web/app/actions/admin/trials/manage/__tests__/create-admin-trial-entry.test.ts
 create mode 100644 apps/web/app/actions/admin/trials/manage/create-admin-trial-entry.ts
 create mode 100644 packages/contracts/admin/trials/manage/admin-trial-entry-write.ts
 create mode 100644 packages/contracts/admin/trials/manage/create-admin-trial-entry.ts
 create mode 100644 packages/db/admin/trials/manage/__tests__/create-trial-entry.test.ts
 create mode 100644 packages/db/admin/trials/manage/create-trial-entry.ts
 create mode 100644 packages/db/admin/trials/manage/trial-entry-write.ts
 create mode 100644 packages/db/trials/core/trial-entry-identity.ts
 create mode 100644 packages/server/admin/trials/manage/__tests__/create-trial-entry.test.ts
 create mode 100644 packages/server/admin/trials/manage/create-trial-entry.ts
 create mode 100644 packages/server/admin/trials/manage/internal/__tests__/parse-admin-trial-entry-write-input.test.ts
 create mode 100644 packages/server/admin/trials/manage/internal/parse-admin-trial-entry-write-input.ts
 create mode 100644 packages/server/trials/core/__tests__/trial-entry-identity.test.ts
 delete mode 100644 packages/server/trials/core/business-date.ts
 create mode 100644 packages/server/trials/core/date-only.ts
 create mode 100644 packages/server/trials/core/trial-entry-identity.ts
 delete mode 100644 packages/server/trials/internal/__tests__/business-date.test.ts
 create mode 100644 packages/server/trials/internal/__tests__/date-only.test.ts

diff --git a/apps/web/app/actions/admin/trials/index.ts b/apps/web/app/actions/admin/trials/index.ts
index f4a9801b..75427cf5 100644
--- a/apps/web/app/actions/admin/trials/index.ts
+++ b/apps/web/app/actions/admin/trials/index.ts
@@ -1,3 +1,4 @@
 export { deleteAdminTrialEntryAction } from "./manage";
 export { updateAdminTrialEventAction } from "./manage";
 export { updateAdminTrialEntryAction } from "./manage";
+export { createAdminTrialEntryAction } from "./manage";
diff --git a/apps/web/app/actions/admin/trials/manage/__tests__/create-admin-trial-entry.test.ts b/apps/web/app/actions/admin/trials/manage/__tests__/create-admin-trial-entry.test.ts
new file mode 100644
index 00000000..10c2d43e
--- /dev/null
+++ b/apps/web/app/actions/admin/trials/manage/__tests__/create-admin-trial-entry.test.ts
@@ -0,0 +1,56 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createAdminTrialEntryAction } from "../create-admin-trial-entry";
+
+const { guard, user, create } = vi.hoisted(() => ({
+  guard: vi.fn(),
+  user: vi.fn(),
+  create: vi.fn(),
+}));
+vi.mock("@/lib/server/admin-guard", () => ({
+  requireAdminLayoutAccess: guard,
+}));
+vi.mock("@/lib/server/current-user", () => ({ getSessionCurrentUser: user }));
+vi.mock("@beagle/server", () => ({ createAdminTrialEntry: create }));
+
+const input = {
+  trialEventId: "event-1",
+  registrationNo: "FI1/20",
+  entry: {} as never,
+  eras: [],
+  lisatiedotRows: [],
+};
+
+describe("createAdminTrialEntryAction", () => {
+  beforeEach(() => {
+    guard.mockReset();
+    user.mockReset();
+    create.mockReset();
+  });
+
+  it("rejects missing admin access", async () => {
+    guard.mockResolvedValue({ ok: false, status: 403 });
+    await expect(createAdminTrialEntryAction(input)).resolves.toMatchObject({
+      hasError: true,
+      errorCode: "FORBIDDEN",
+    });
+  });
+
+  it("passes through stable service errors", async () => {
+    guard.mockResolvedValue({ ok: true });
+    user.mockResolvedValue({ id: "u1", email: "a@example.com", role: "ADMIN" });
+    create.mockResolvedValue({
+      status: 409,
+      body: {
+        ok: false,
+        code: "TRIAL_ENTRY_REGISTRATION_CONFLICT",
+        error: "Conflict",
+      },
+    });
+    await expect(createAdminTrialEntryAction(input)).resolves.toEqual({
+      data: null,
+      hasError: true,
+      errorCode: "TRIAL_ENTRY_REGISTRATION_CONFLICT",
+      message: "Conflict",
+    });
+  });
+});
diff --git a/apps/web/app/actions/admin/trials/manage/create-admin-trial-entry.ts b/apps/web/app/actions/admin/trials/manage/create-admin-trial-entry.ts
new file mode 100644
index 00000000..2c46291a
--- /dev/null
+++ b/apps/web/app/actions/admin/trials/manage/create-admin-trial-entry.ts
@@ -0,0 +1,53 @@
+"use server";
+
+import type {
+  CreateAdminTrialEntryRequest,
+  CreateAdminTrialEntryResponse,
+} from "@beagle/contracts";
+import { createAdminTrialEntry } from "@beagle/server";
+import { requireAdminLayoutAccess } from "@/lib/server/admin-guard";
+import { getSessionCurrentUser } from "@/lib/server/current-user";
+
+export type CreateAdminTrialEntryActionResult = {
+  data: CreateAdminTrialEntryResponse | null;
+  hasError: boolean;
+  errorCode?: string;
+  message?: string;
+};
+
+export async function createAdminTrialEntryAction(
+  input: CreateAdminTrialEntryRequest,
+): Promise<CreateAdminTrialEntryActionResult> {
+  const access = await requireAdminLayoutAccess();
+  if (!access.ok) {
+    return {
+      data: null,
+      hasError: true,
+      errorCode: access.status === 401 ? "UNAUTHENTICATED" : "FORBIDDEN",
+      message: "Admin access required.",
+    };
+  }
+  const user = await getSessionCurrentUser();
+  if (!user) {
+    return {
+      data: null,
+      hasError: true,
+      errorCode: "UNAUTHENTICATED",
+      message: "Admin access required.",
+    };
+  }
+  const result = await createAdminTrialEntry(
+    input,
+    { id: user.id, email: user.email, username: null, role: user.role },
+    { actorUserId: user.id },
+  );
+  if (!result.body.ok) {
+    return {
+      data: null,
+      hasError: true,
+      errorCode: result.body.code,
+      message: result.body.error,
+    };
+  }
+  return { data: result.body.data, hasError: false };
+}
diff --git a/apps/web/app/actions/admin/trials/manage/index.ts b/apps/web/app/actions/admin/trials/manage/index.ts
index d31db353..7732dfce 100644
--- a/apps/web/app/actions/admin/trials/manage/index.ts
+++ b/apps/web/app/actions/admin/trials/manage/index.ts
@@ -1,4 +1,5 @@
 export { createAdminTrialEventAction } from "./create-admin-trial-event";
+export { createAdminTrialEntryAction } from "./create-admin-trial-entry";
 export { deleteAdminTrialEventAction } from "./delete-admin-trial-event";
 export { deleteAdminTrialEntryAction } from "./delete-admin-trial-entry";
 export { updateAdminTrialEventAction } from "./update-admin-trial-event";
diff --git a/docs/features/admin-trial-management.md b/docs/features/admin-trial-management.md
index bb4f006d..f2f0c831 100644
--- a/docs/features/admin-trial-management.md
+++ b/docs/features/admin-trial-management.md
@@ -14,6 +14,8 @@ and follow-up admin flow redesign).
   explicitly from their workspace, but only while they have no result rows.
 - Per-dog inspection opens the generated trial PDF. Existing event and result
   editing remains modal-based.
+- The R1 backend contract can create one manual result at a time through an
+  admin Server Action. It is intentionally not linked to a UI until R2.
 
 ## Main files
 
@@ -44,6 +46,9 @@ and follow-up admin flow redesign).
 4. Event and result changes use admin Server Action mutations; the PDF action
    opens `/api/trials/[trialEntryId]/pdf` in a new tab.
 5. Successful event creation opens the persisted empty event workspace.
+6. Manual result creation validates and canonicalizes the typed registration,
+   then atomically creates the entry, eras, and lisätiedot. A matching local
+   `DogRegistration` links the dog; an unknown registration remains unlinked.
 
 ## Contract rules
 
@@ -53,6 +58,13 @@ and follow-up admin flow redesign).
   selected dog rows (`entries[]`).
 - Event creation requires a positive `sklKoeId`, an ISO date, and a non-empty
   place. Duplicate SKL IDs return `SKL_KOE_ID_CONFLICT`.
+- Manual result identity is `SKL:<sklKoeId>|REG:<canonicalRegistration>` and
+  uses source `MANUAL_ADMIN`. Duplicate registration within an event returns
+  `TRIAL_ENTRY_REGISTRATION_CONFLICT`.
+- Manual result writes require each normalized lisätieto `(koodi, osa)` pair
+  to occur only once across the submitted matrix rows.
+- `TrialEvent.koepaiva` is a PostgreSQL `DATE`; all trial contracts serialize
+  it as timezone-free `YYYY-MM-DD`.
 - Empty event deletion returns `TRIAL_EVENT_NOT_EMPTY` if result rows are
   present and `TRIAL_EVENT_NOT_FOUND` if the event no longer exists.
 - `TRIAL_EVENT_NOT_FOUND` is returned for missing event IDs.
diff --git a/docs/features/schema/schema.md b/docs/features/schema/schema.md
index f1b0ff30..f3bd3eab 100644
--- a/docs/features/schema/schema.md
+++ b/docs/features/schema/schema.md
@@ -16,6 +16,7 @@ For show-domain deep details, see:
 - `ImportIssueSeverity`: `INFO`, `WARNING`, `ERROR`
 - `ShowSourceTag`: source tagging for legacy/workbook/manual show data
 - `TrialSourceTag`: source tagging for canonical trial entry writes
+  (`LEGACY_AKOEALL`, `MANUAL_ADMIN`, `KOIRATIETOKANTA_API`)
 - `ShowResultValueType`: `FLAG`, `CODE`, `TEXT`, `NUMERIC`, `DATE`
 - `AuditAction`: `INSERT`, `UPDATE`, `DELETE`
 - `AuditSource`: `WEB`, `SCRIPT`, `SYSTEM`
@@ -82,7 +83,7 @@ erDiagram
 ### Results
 
 - `TrialResult`: canonical trial rows keyed by unique `sourceKey`.
-- `TrialEvent`: canonical AJOK trial event (new schema event level).
+- `TrialEvent`: canonical AJOK trial event; `koepaiva` is PostgreSQL `DATE`.
 - `TrialEntry`: canonical AJOK trial dog entry (new schema entry level).
   - `TrialEntry` stores the direct summary/core fields for one dog in one event.
   - `TrialEntry.ke` stores the top-level weather/condition value from source
diff --git a/docs/features/trials/koiratietokanta-api-ajok-upsert.md b/docs/features/trials/koiratietokanta-api-ajok-upsert.md
index 34df5734..b0e6e80b 100644
--- a/docs/features/trials/koiratietokanta-api-ajok-upsert.md
+++ b/docs/features/trials/koiratietokanta-api-ajok-upsert.md
@@ -31,6 +31,13 @@ result upsert contract.
   - `KOEPAIKKA`
 - Unknown fields are ignored.
 - The raw payload is always preserved in `TrialEntry.raakadataJson`.
+- If the same canonical identity was first created manually, the API update is
+  authoritative: it keeps technical identity and row creation time, replaces
+  all mapped business fields and eras/lisätiedot, clears manual-only `tja`, and
+  changes the source to `KOIRATIETOKANTA_API`.
+- `tja` is the legacy-trial tie- ja estetyöskentely summary field. Current API
+  tie/obstacle values are stored as lisätiedot instead, so the API upsert does
+  not derive a new `tja` summary value.
 
 ## Main field mapping
 
diff --git a/packages/contracts/admin/trials/manage/admin-trial-entry-write.ts b/packages/contracts/admin/trials/manage/admin-trial-entry-write.ts
new file mode 100644
index 00000000..031d15f0
--- /dev/null
+++ b/packages/contracts/admin/trials/manage/admin-trial-entry-write.ts
@@ -0,0 +1,55 @@
+import type {
+  AdminTrialEntryEra,
+  AdminTrialEventEntry,
+} from "./admin-trial-event-details";
+
+export type AdminTrialEntryLisatietoWriteRow = {
+  koodi: string;
+  osa: string;
+  nimi: string | null;
+  jarjestys: number | null;
+  eraValues: Array<{
+    era: number;
+    arvo: string | null;
+  }>;
+};
+
+export type AdminTrialEntryWriteFields = Pick<
+  AdminTrialEventEntry,
+  | "koemaasto"
+  | "koemuoto"
+  | "koetyyppi"
+  | "ke"
+  | "lk"
+  | "award"
+  | "rank"
+  | "points"
+  | "koiriaLuokassa"
+  | "hyvaksytytAjominuutit"
+  | "ajoajanPisteet"
+  | "haku"
+  | "hauk"
+  | "yva"
+  | "hlo"
+  | "alo"
+  | "tja"
+  | "pin"
+  | "ansiopisteetYhteensa"
+  | "tappiopisteetYhteensa"
+  | "judge"
+  | "huomautus"
+  | "huomautusTeksti"
+  | "ylituomariNumeroSnapshot"
+  | "ryhmatuomariNimi"
+  | "palkintotuomariNimi"
+  | "omistajaSnapshot"
+  | "omistajanKotikuntaSnapshot"
+>;
+
+export type AdminTrialEntryEraWrite = Omit<AdminTrialEntryEra, "lisatiedot">;
+
+export type AdminTrialEntryWriteData = {
+  entry: AdminTrialEntryWriteFields;
+  eras: AdminTrialEntryEraWrite[];
+  lisatiedotRows: AdminTrialEntryLisatietoWriteRow[];
+};
diff --git a/packages/contracts/admin/trials/manage/create-admin-trial-entry.ts b/packages/contracts/admin/trials/manage/create-admin-trial-entry.ts
new file mode 100644
index 00000000..a527e907
--- /dev/null
+++ b/packages/contracts/admin/trials/manage/create-admin-trial-entry.ts
@@ -0,0 +1,11 @@
+import type { AdminTrialEntryWriteData } from "./admin-trial-entry-write";
+
+export type CreateAdminTrialEntryRequest = AdminTrialEntryWriteData & {
+  trialEventId: string;
+  registrationNo: string;
+};
+
+export type CreateAdminTrialEntryResponse = {
+  trialEventId: string;
+  trialEntryId: string;
+};
diff --git a/packages/contracts/admin/trials/manage/index.ts b/packages/contracts/admin/trials/manage/index.ts
index b335d5b6..75b239c3 100644
--- a/packages/contracts/admin/trials/manage/index.ts
+++ b/packages/contracts/admin/trials/manage/index.ts
@@ -1,3 +1,9 @@
+export type {
+  AdminTrialEntryEraWrite,
+  AdminTrialEntryLisatietoWriteRow,
+  AdminTrialEntryWriteData,
+  AdminTrialEntryWriteFields,
+} from "./admin-trial-entry-write";
 export type {
   AdminTrialEventSearchFilters,
   AdminTrialEventSearchMode,
@@ -16,6 +22,10 @@ export type {
   CreateAdminTrialEventRequest,
   CreateAdminTrialEventResponse,
 } from "./create-admin-trial-event";
+export type {
+  CreateAdminTrialEntryRequest,
+  CreateAdminTrialEntryResponse,
+} from "./create-admin-trial-entry";
 export type {
   DeleteAdminTrialEventRequest,
   DeleteAdminTrialEventResponse,
diff --git a/packages/contracts/admin/trials/manage/update-admin-trial-entry.ts b/packages/contracts/admin/trials/manage/update-admin-trial-entry.ts
index cb59b61e..838160f4 100644
--- a/packages/contracts/admin/trials/manage/update-admin-trial-entry.ts
+++ b/packages/contracts/admin/trials/manage/update-admin-trial-entry.ts
@@ -1,57 +1,14 @@
-import type {
-  AdminTrialEntryEra,
-  AdminTrialEventEntry,
-} from "./admin-trial-event-details";
+import type { AdminTrialEntryWriteData } from "./admin-trial-entry-write";
 
-export type UpdateAdminTrialEntryLisatietoRow = {
-  koodi: string;
-  osa: string;
-  nimi: string | null;
-  jarjestys: number | null;
-  eraValues: Array<{
-    era: number;
-    arvo: string | null;
-  }>;
-};
-
-export type UpdateAdminTrialEntryRequest = {
+export type UpdateAdminTrialEntryRequest = AdminTrialEntryWriteData & {
   trialEventId: string;
   trialEntryId: string;
-  entry: Pick<
-    AdminTrialEventEntry,
-    | "koemaasto"
-    | "koemuoto"
-    | "koetyyppi"
-    | "ke"
-    | "lk"
-    | "award"
-    | "rank"
-    | "points"
-    | "koiriaLuokassa"
-    | "hyvaksytytAjominuutit"
-    | "ajoajanPisteet"
-    | "haku"
-    | "hauk"
-    | "yva"
-    | "hlo"
-    | "alo"
-    | "tja"
-    | "pin"
-    | "ansiopisteetYhteensa"
-    | "tappiopisteetYhteensa"
-    | "judge"
-    | "huomautus"
-    | "huomautusTeksti"
-    | "ylituomariNumeroSnapshot"
-    | "ryhmatuomariNimi"
-    | "palkintotuomariNimi"
-    | "omistajaSnapshot"
-    | "omistajanKotikuntaSnapshot"
-  >;
-  eras: Array<Omit<AdminTrialEntryEra, "lisatiedot">>;
-  lisatiedotRows: UpdateAdminTrialEntryLisatietoRow[];
 };
 
+/** @deprecated Use AdminTrialEntryLisatietoWriteRow. */
+export type UpdateAdminTrialEntryLisatietoRow =
+  AdminTrialEntryWriteData["lisatiedotRows"][number];
+
 export type UpdateAdminTrialEntryResponse = {
   trialEventId: string;
   trialEntryId: string;
diff --git a/packages/contracts/index.ts b/packages/contracts/index.ts
index 2c61a7ef..01876e47 100644
--- a/packages/contracts/index.ts
+++ b/packages/contracts/index.ts
@@ -292,8 +292,14 @@ export type {
   AdminTrialEventDetailsRequest,
   AdminTrialEventDetailsResponse,
   AdminTrialEventEntry,
+  AdminTrialEntryEraWrite,
+  AdminTrialEntryLisatietoWriteRow,
+  AdminTrialEntryWriteData,
+  AdminTrialEntryWriteFields,
   CreateAdminTrialEventRequest,
   CreateAdminTrialEventResponse,
+  CreateAdminTrialEntryRequest,
+  CreateAdminTrialEntryResponse,
   DeleteAdminTrialEventRequest,
   DeleteAdminTrialEventResponse,
   DeleteAdminTrialEntryRequest,
diff --git a/packages/db/admin/trials/manage/__tests__/create-trial-entry.test.ts b/packages/db/admin/trials/manage/__tests__/create-trial-entry.test.ts
new file mode 100644
index 00000000..2aa021e8
--- /dev/null
+++ b/packages/db/admin/trials/manage/__tests__/create-trial-entry.test.ts
@@ -0,0 +1,160 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { Prisma } from "@prisma/client";
+import { createAdminTrialEntryWriteDb } from "../create-trial-entry";
+
+const { prismaTransaction, tx } = vi.hoisted(() => {
+  const transaction = {
+    trialEvent: { findUnique: vi.fn() },
+    trialEntry: { findFirst: vi.fn(), create: vi.fn() },
+    dogRegistration: { findUnique: vi.fn() },
+    trialEra: { create: vi.fn() },
+    trialEraLisatieto: { createMany: vi.fn() },
+  };
+  return {
+    tx: transaction,
+    prismaTransaction: vi.fn((callback) => callback(transaction)),
+  };
+});
+vi.mock("@db/core/prisma", () => ({
+  prisma: { $transaction: prismaTransaction },
+}));
+
+const entry = {
+  koemaasto: null,
+  koemuoto: "AJOK",
+  koetyyppi: "NORMAL" as const,
+  ke: null,
+  lk: null,
+  award: null,
+  rank: null,
+  points: null,
+  koiriaLuokassa: null,
+  hyvaksytytAjominuutit: null,
+  ajoajanPisteet: null,
+  haku: null,
+  hauk: null,
+  yva: null,
+  hlo: null,
+  alo: null,
+  tja: null,
+  pin: null,
+  ansiopisteetYhteensa: null,
+  tappiopisteetYhteensa: null,
+  judge: null,
+  huomautus: null,
+  huomautusTeksti: null,
+  ylituomariNumeroSnapshot: null,
+  ryhmatuomariNimi: null,
+  palkintotuomariNimi: null,
+  omistajaSnapshot: null,
+  omistajanKotikuntaSnapshot: null,
+};
+const input = {
+  trialEventId: "event-1",
+  canonicalRegistrationNo: "FI12345/21",
+  entry,
+  eras: [
+    {
+      era: 1,
+      alkoi: null,
+      hakumin: null,
+      ajomin: null,
+      haku: null,
+      hauk: null,
+      yva: null,
+      hlo: null,
+      alo: null,
+      tja: null,
+      pin: null,
+      huomautusTeksti: null,
+    },
+  ],
+  lisatiedotByEra: [
+    {
+      era: 1,
+      replaceKeys: [],
+      items: [
+        { koodi: "11", osa: "", arvo: "1", nimi: "Paljas maa", jarjestys: 1 },
+      ],
+    },
+  ],
+};
+
+describe("createAdminTrialEntryWriteDb", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    prismaTransaction.mockImplementation((callback) => callback(tx));
+    tx.trialEvent.findUnique.mockResolvedValue({
+      id: "event-1",
+      sklKoeId: 123,
+    });
+    tx.trialEntry.findFirst.mockResolvedValue(null);
+    tx.dogRegistration.findUnique.mockResolvedValue({ dogId: "dog-1" });
+    tx.trialEntry.create.mockResolvedValue({ id: "entry-1" });
+    tx.trialEra.create.mockResolvedValue({ id: "era-1", era: 1 });
+  });
+
+  it("creates a linked manual entry with canonical identity and nested rows", async () => {
+    await expect(createAdminTrialEntryWriteDb(input)).resolves.toEqual({
+      status: "created",
+      trialEventId: "event-1",
+      trialEntryId: "entry-1",
+    });
+    expect(tx.dogRegistration.findUnique).toHaveBeenCalledWith({
+      where: { registrationNo: "FI12345/21" },
+      select: { dogId: true },
+    });
+    expect(tx.trialEntry.create).toHaveBeenCalledWith(
+      expect.objectContaining({
+        data: expect.objectContaining({
+          dogId: "dog-1",
+          rekisterinumeroSnapshot: "FI12345/21",
+          yksilointiAvain: "SKL:123|REG:FI12345/21",
+          lahde: "MANUAL_ADMIN",
+        }),
+      }),
+    );
+    expect(tx.trialEraLisatieto.createMany).toHaveBeenCalledOnce();
+  });
+
+  it("permits an unlinked result", async () => {
+    tx.dogRegistration.findUnique.mockResolvedValue(null);
+    await createAdminTrialEntryWriteDb(input);
+    expect(tx.trialEntry.create).toHaveBeenCalledWith(
+      expect.objectContaining({
+        data: expect.objectContaining({ dogId: null }),
+      }),
+    );
+  });
+
+  it("returns typed event and duplicate outcomes before writing", async () => {
+    tx.trialEvent.findUnique.mockResolvedValueOnce(null);
+    await expect(createAdminTrialEntryWriteDb(input)).resolves.toEqual({
+      status: "event_not_found",
+    });
+    tx.trialEvent.findUnique.mockResolvedValueOnce({
+      id: "event-1",
+      sklKoeId: null,
+    });
+    await expect(createAdminTrialEntryWriteDb(input)).resolves.toEqual({
+      status: "event_missing_skl_id",
+    });
+    tx.trialEntry.findFirst.mockResolvedValueOnce({ id: "existing" });
+    await expect(createAdminTrialEntryWriteDb(input)).resolves.toEqual({
+      status: "registration_conflict",
+    });
+  });
+
+  it("maps a database identity constraint race to registration conflict", async () => {
+    prismaTransaction.mockRejectedValueOnce(
+      new Prisma.PrismaClientKnownRequestError("duplicate", {
+        code: "P2002",
+        clientVersion: "test",
+        meta: { target: ["trialEventId", "rekisterinumeroSnapshot"] },
+      }),
+    );
+    await expect(createAdminTrialEntryWriteDb(input)).resolves.toEqual({
+      status: "registration_conflict",
+    });
+  });
+});
diff --git a/packages/db/admin/trials/manage/create-trial-entry.ts b/packages/db/admin/trials/manage/create-trial-entry.ts
new file mode 100644
index 00000000..2b6180ed
--- /dev/null
+++ b/packages/db/admin/trials/manage/create-trial-entry.ts
@@ -0,0 +1,160 @@
+import { ADMIN_WRITE_TX_CONFIG } from "@db/core/interactive-write-transaction";
+import { prisma } from "@db/core/prisma";
+import { Prisma, type TrialSourceTag } from "@prisma/client";
+import { buildTrialEntryIdentity } from "@db/trials/core/trial-entry-identity";
+import type { AdminTrialEntryWriteDataDb } from "./trial-entry-write";
+
+export type CreateAdminTrialEntryWriteRequestDb = AdminTrialEntryWriteDataDb & {
+  trialEventId: string;
+  canonicalRegistrationNo: string;
+};
+
+export type CreateAdminTrialEntryWriteResultDb =
+  | { status: "event_not_found" }
+  | { status: "event_missing_skl_id" }
+  | { status: "registration_conflict" }
+  | { status: "created"; trialEventId: string; trialEntryId: string };
+
+function decimal(value: number | null): Prisma.Decimal | null {
+  return value === null ? null : new Prisma.Decimal(value);
+}
+
+function isEntryIdentityConflict(error: unknown): boolean {
+  if (
+    !(error instanceof Prisma.PrismaClientKnownRequestError) ||
+    error.code !== "P2002"
+  ) {
+    return false;
+  }
+  const target = error.meta?.target;
+  const fields = Array.isArray(target)
+    ? target.map(String)
+    : [String(target ?? "")];
+  return fields.some(
+    (field) =>
+      field.includes("yksilointiAvain") ||
+      field.includes("trialEventId_rekisterinumeroSnapshot") ||
+      field.includes("trialEventId") ||
+      field.includes("rekisterinumeroSnapshot"),
+  );
+}
+
+// Creates one complete manual result and all nested rows atomically.
+export async function createAdminTrialEntryWriteDb(
+  input: CreateAdminTrialEntryWriteRequestDb,
+): Promise<CreateAdminTrialEntryWriteResultDb> {
+  try {
+    return await prisma.$transaction(async (tx) => {
+      const event = await tx.trialEvent.findUnique({
+        where: { id: input.trialEventId },
+        select: { id: true, sklKoeId: true },
+      });
+      if (!event) return { status: "event_not_found" } as const;
+      if (event.sklKoeId === null)
+        return { status: "event_missing_skl_id" } as const;
+      const yksilointiAvain = buildTrialEntryIdentity(
+        event.sklKoeId,
+        input.canonicalRegistrationNo,
+      );
+
+      const duplicate = await tx.trialEntry.findFirst({
+        where: {
+          OR: [
+            { yksilointiAvain },
+            {
+              trialEventId: event.id,
+              rekisterinumeroSnapshot: input.canonicalRegistrationNo,
+            },
+          ],
+        },
+        select: { id: true },
+      });
+      if (duplicate) return { status: "registration_conflict" } as const;
+
+      const registration = await tx.dogRegistration.findUnique({
+        where: { registrationNo: input.canonicalRegistrationNo },
+        select: { dogId: true },
+      });
+      const entry = input.entry;
+      const created = await tx.trialEntry.create({
+        data: {
+          trialEventId: event.id,
+          dogId: registration?.dogId ?? null,
+          yksilointiAvain,
+          lahde: "MANUAL_ADMIN" as TrialSourceTag,
+          rekisterinumeroSnapshot: input.canonicalRegistrationNo,
+          raakadataJson: null,
+          koemaasto: entry.koemaasto,
+          koemuoto: entry.koemuoto,
+          koetyyppi: entry.koetyyppi,
+          ke: entry.ke,
+          lk: entry.lk,
+          pa: entry.award,
+          sija: entry.rank,
+          piste: decimal(entry.points),
+          koiriaLuokassa: entry.koiriaLuokassa,
+          hyvaksytytAjominuutit: entry.hyvaksytytAjominuutit,
+          ajoajanPisteet: decimal(entry.ajoajanPisteet),
+          haku: decimal(entry.haku),
+          hauk: decimal(entry.hauk),
+          yva: decimal(entry.yva),
+          hlo: decimal(entry.hlo),
+          alo: decimal(entry.alo),
+          tja: decimal(entry.tja),
+          pin: decimal(entry.pin),
+          ansiopisteetYhteensa: decimal(entry.ansiopisteetYhteensa),
+          tappiopisteetYhteensa: decimal(entry.tappiopisteetYhteensa),
+          tuom1: entry.judge,
+          huomautus: entry.huomautus,
+          huomautusTeksti: entry.huomautusTeksti,
+          ylituomariNumeroSnapshot: entry.ylituomariNumeroSnapshot,
+          ryhmatuomariNimi: entry.ryhmatuomariNimi,
+          palkintotuomariNimi: entry.palkintotuomariNimi,
+          omistajaSnapshot: entry.omistajaSnapshot,
+          omistajanKotikuntaSnapshot: entry.omistajanKotikuntaSnapshot,
+        },
+        select: { id: true },
+      });
+
+      for (const eraWrite of input.eras) {
+        const era = await tx.trialEra.create({
+          data: {
+            trialEntryId: created.id,
+            era: eraWrite.era,
+            alkoi: eraWrite.alkoi,
+            hakumin: eraWrite.hakumin,
+            ajomin: eraWrite.ajomin,
+            haku: decimal(eraWrite.haku),
+            hauk: decimal(eraWrite.hauk),
+            yva: decimal(eraWrite.yva),
+            hlo: decimal(eraWrite.hlo),
+            alo: decimal(eraWrite.alo),
+            tja: decimal(eraWrite.tja),
+            pin: decimal(eraWrite.pin),
+            huomautusTeksti: eraWrite.huomautusTeksti,
+            raakadataJson: null,
+          },
+          select: { id: true, era: true },
+        });
+        const items =
+          input.lisatiedotByEra.find((item) => item.era === era.era)?.items ??
+          [];
+        if (items.length) {
+          await tx.trialEraLisatieto.createMany({
+            data: items.map((item) => ({ trialEraId: era.id, ...item })),
+          });
+        }
+      }
+
+      return {
+        status: "created",
+        trialEventId: event.id,
+        trialEntryId: created.id,
+      } as const;
+    }, ADMIN_WRITE_TX_CONFIG);
+  } catch (error) {
+    if (isEntryIdentityConflict(error))
+      return { status: "registration_conflict" };
+    throw error;
+  }
+}
diff --git a/packages/db/admin/trials/manage/index.ts b/packages/db/admin/trials/manage/index.ts
index 0cfddbea..26983632 100644
--- a/packages/db/admin/trials/manage/index.ts
+++ b/packages/db/admin/trials/manage/index.ts
@@ -5,6 +5,11 @@ export {
   type CreateAdminTrialEventWriteRequestDb,
   type CreateAdminTrialEventWriteResultDb,
 } from "./create-trial-event";
+export {
+  createAdminTrialEntryWriteDb,
+  type CreateAdminTrialEntryWriteRequestDb,
+  type CreateAdminTrialEntryWriteResultDb,
+} from "./create-trial-entry";
 export {
   deleteAdminTrialEventWriteDb,
   type DeleteAdminTrialEventWriteRequestDb,
@@ -25,6 +30,7 @@ export {
   type UpdateAdminTrialEntryWriteRequestDb,
   type UpdateAdminTrialEntryWriteResultDb,
 } from "./update-trial-entry";
+export type { AdminTrialEntryWriteDataDb } from "./trial-entry-write";
 export type {
   AdminTrialEventDetailsDb,
   AdminTrialEventDetailsRequestDb,
diff --git a/packages/db/admin/trials/manage/trial-entry-write.ts b/packages/db/admin/trials/manage/trial-entry-write.ts
new file mode 100644
index 00000000..2de4c303
--- /dev/null
+++ b/packages/db/admin/trials/manage/trial-entry-write.ts
@@ -0,0 +1,60 @@
+export type AdminTrialEntryWriteDataDb = {
+  entry: {
+    koemaasto: string | null;
+    koemuoto: string | null;
+    koetyyppi: "NORMAL" | "KOKOKAUDENKOE" | "PITKAKOE";
+    ke: string | null;
+    lk: string | null;
+    award: string | null;
+    rank: string | null;
+    points: number | null;
+    koiriaLuokassa: number | null;
+    hyvaksytytAjominuutit: number | null;
+    ajoajanPisteet: number | null;
+    haku: number | null;
+    hauk: number | null;
+    yva: number | null;
+    hlo: number | null;
+    alo: number | null;
+    tja: number | null;
+    pin: number | null;
+    ansiopisteetYhteensa: number | null;
+    tappiopisteetYhteensa: number | null;
+    judge: string | null;
+    huomautus: "LUOPUI" | "SULJETTU" | "KESKEYTETTY" | null;
+    huomautusTeksti: string | null;
+    ylituomariNumeroSnapshot: string | null;
+    ryhmatuomariNimi: string | null;
+    palkintotuomariNimi: string | null;
+    omistajaSnapshot: string | null;
+    omistajanKotikuntaSnapshot: string | null;
+  };
+  eras: Array<{
+    era: number;
+    alkoi: string | null;
+    hakumin: number | null;
+    ajomin: number | null;
+    haku: number | null;
+    hauk: number | null;
+    yva: number | null;
+    hlo: number | null;
+    alo: number | null;
+    tja: number | null;
+    pin: number | null;
+    huomautusTeksti: string | null;
+  }>;
+  lisatiedotByEra: Array<{
+    era: number;
+    replaceKeys: Array<{
+      koodi: string;
+      osa: string;
+    }>;
+    items: Array<{
+      koodi: string;
+      osa: string;
+      arvo: string;
+      nimi: string | null;
+      jarjestys: number | null;
+    }>;
+  }>;
+};
diff --git a/packages/db/admin/trials/manage/update-trial-entry.ts b/packages/db/admin/trials/manage/update-trial-entry.ts
index 67ea7bcd..203c1469 100644
--- a/packages/db/admin/trials/manage/update-trial-entry.ts
+++ b/packages/db/admin/trials/manage/update-trial-entry.ts
@@ -1,68 +1,11 @@
 import { ADMIN_WRITE_TX_CONFIG } from "@db/core/interactive-write-transaction";
 import { prisma } from "@db/core/prisma";
 import { Prisma } from "@prisma/client";
+import type { AdminTrialEntryWriteDataDb } from "./trial-entry-write";
 
-export type UpdateAdminTrialEntryWriteRequestDb = {
+export type UpdateAdminTrialEntryWriteRequestDb = AdminTrialEntryWriteDataDb & {
   trialEventId: string;
   trialEntryId: string;
-  entry: {
-    koemaasto: string | null;
-    koemuoto: string | null;
-    koetyyppi: "NORMAL" | "KOKOKAUDENKOE" | "PITKAKOE";
-    ke: string | null;
-    lk: string | null;
-    award: string | null;
-    rank: string | null;
-    points: number | null;
-    koiriaLuokassa: number | null;
-    hyvaksytytAjominuutit: number | null;
-    ajoajanPisteet: number | null;
-    haku: number | null;
-    hauk: number | null;
-    yva: number | null;
-    hlo: number | null;
-    alo: number | null;
-    tja: number | null;
-    pin: number | null;
-    ansiopisteetYhteensa: number | null;
-    tappiopisteetYhteensa: number | null;
-    judge: string | null;
-    huomautus: "LUOPUI" | "SULJETTU" | "KESKEYTETTY" | null;
-    huomautusTeksti: string | null;
-    ylituomariNumeroSnapshot: string | null;
-    ryhmatuomariNimi: string | null;
-    palkintotuomariNimi: string | null;
-    omistajaSnapshot: string | null;
-    omistajanKotikuntaSnapshot: string | null;
-  };
-  eras: Array<{
-    era: number;
-    alkoi: string | null;
-    hakumin: number | null;
-    ajomin: number | null;
-    haku: number | null;
-    hauk: number | null;
-    yva: number | null;
-    hlo: number | null;
-    alo: number | null;
-    tja: number | null;
-    pin: number | null;
-    huomautusTeksti: string | null;
-  }>;
-  lisatiedotByEra: Array<{
-    era: number;
-    replaceKeys: Array<{
-      koodi: string;
-      osa: string;
-    }>;
-    items: Array<{
-      koodi: string;
-      osa: string;
-      arvo: string;
-      nimi: string | null;
-      jarjestys: number | null;
-    }>;
-  }>;
 };
 
 export type UpdateAdminTrialEntryWriteResultDb =
diff --git a/packages/db/index.ts b/packages/db/index.ts
index 779e44b0..a07c9e10 100644
--- a/packages/db/index.ts
+++ b/packages/db/index.ts
@@ -155,6 +155,7 @@ export {
   getBeagleTrialSummarySourceForDogDb,
   listActiveTrialRuleWindowsDb,
   searchBeagleTrialsDb,
+  buildTrialEntryIdentity,
   upsertKoiratietokantaAjokResultDb,
   type BeagleTrialDetailsRequestDb,
   type BeagleTrialDetailsResponseDb,
@@ -180,6 +181,7 @@ export {
   getAdminTrialEventDetailsDb,
   searchAdminTrialsDb,
   createAdminTrialEventWriteDb,
+  createAdminTrialEntryWriteDb,
   deleteAdminTrialEventWriteDb,
   deleteAdminTrialEntryWriteDb,
   updateAdminTrialEventWriteDb,
@@ -193,8 +195,11 @@ export {
   type AdminTrialEventSearchResponseDb,
   type AdminTrialEventSearchSortDb,
   type AdminTrialEventSummaryDb,
+  type AdminTrialEntryWriteDataDb,
   type CreateAdminTrialEventWriteRequestDb,
   type CreateAdminTrialEventWriteResultDb,
+  type CreateAdminTrialEntryWriteRequestDb,
+  type CreateAdminTrialEntryWriteResultDb,
   type DeleteAdminTrialEventWriteRequestDb,
   type DeleteAdminTrialEventWriteResultDb,
   type DeleteAdminTrialEntryWriteRequestDb,
diff --git a/packages/db/prisma/migrations/20260414161000_bej79_add_ajok_trial_event_entry/migration.sql b/packages/db/prisma/migrations/20260414161000_bej79_add_ajok_trial_event_entry/migration.sql
index 8aa7beeb..df76130d 100644
--- a/packages/db/prisma/migrations/20260414161000_bej79_add_ajok_trial_event_entry/migration.sql
+++ b/packages/db/prisma/migrations/20260414161000_bej79_add_ajok_trial_event_entry/migration.sql
@@ -4,14 +4,14 @@
 -- once this migration is treated as immutable in shared deployed environments.
 
 -- CreateEnum
-CREATE TYPE "TrialSourceTag" AS ENUM ('LEGACY_AKOEALL', 'KOIRATIETOKANTA_API');
+CREATE TYPE "TrialSourceTag" AS ENUM ('LEGACY_AKOEALL', 'MANUAL_ADMIN', 'KOIRATIETOKANTA_API');
 
 -- CreateTable
 CREATE TABLE "TrialEvent" (
     "id" TEXT NOT NULL,
     "sklKoeId" INTEGER,
     "legacyEventKey" TEXT,
-    "koepaiva" TIMESTAMP(3) NOT NULL,
+    "koepaiva" DATE NOT NULL,
     "koekunta" TEXT NOT NULL,
     "jarjestaja" TEXT,
     "kennelpiiri" TEXT,
diff --git a/packages/db/prisma/migrations/20260423130000_phase5_trial_runtime_projection/migration.sql b/packages/db/prisma/migrations/20260423130000_phase5_trial_runtime_projection/migration.sql
index 2ca0f0f5..7f290b5d 100644
--- a/packages/db/prisma/migrations/20260423130000_phase5_trial_runtime_projection/migration.sql
+++ b/packages/db/prisma/migrations/20260423130000_phase5_trial_runtime_projection/migration.sql
@@ -240,7 +240,7 @@ COMMENT ON COLUMN "TrialEntry"."hauk" IS 'Entry-level barking points from legacy
 COMMENT ON COLUMN "TrialEntry"."yva" IS 'Entry-level general impression points from legacy summary.';
 COMMENT ON COLUMN "TrialEntry"."hlo" IS 'Entry-level search looseness points/penalty value from legacy summary.';
 COMMENT ON COLUMN "TrialEntry"."alo" IS 'Entry-level driving-skill or driving looseness value from legacy summary.';
-COMMENT ON COLUMN "TrialEntry"."tja" IS 'Entry-level trail/backtrack work value from legacy summary.';
+COMMENT ON COLUMN "TrialEntry"."tja" IS 'Legacy-trial tie- ja estetyöskentely summary value; not a current Koiratietokanta API summary field.';
 COMMENT ON COLUMN "TrialEntry"."pin" IS 'Entry-level Metsastysinto or total merit value from legacy summary.';
 COMMENT ON COLUMN "TrialEntry"."tuom1" IS 'Primary/chief judge name snapshot from source.';
 COMMENT ON COLUMN "TrialEntry"."vara" IS 'Legacy reserved/flag field.';
@@ -262,7 +262,7 @@ COMMENT ON COLUMN "TrialEra"."hauk" IS 'Barking points for the era.';
 COMMENT ON COLUMN "TrialEra"."yva" IS 'entinen Yleisvaikutelma, nykyinen ajotaitokeskiarvo';
 COMMENT ON COLUMN "TrialEra"."hlo" IS 'Search looseness points/penalty value for the era.';
 COMMENT ON COLUMN "TrialEra"."alo" IS 'Ajolöysyys or driving looseness value for the era.';
-COMMENT ON COLUMN "TrialEra"."tja" IS 'Trail/backtrack work value for the era.';
+COMMENT ON COLUMN "TrialEra"."tja" IS 'Legacy-trial tie- ja estetyöskentely value for the era; not a current Koiratietokanta API era field.';
 COMMENT ON COLUMN "TrialEra"."pin" IS 'Metsästysinto or merit value for the era.';
 COMMENT ON COLUMN "TrialEra"."huomautusTeksti" IS 'Per-era free-text note rendered in the PDF huomautus section; sourced from API *_VIITE fields or legacy bealt*.VIITE.';
 COMMENT ON COLUMN "TrialEra"."raakadataJson" IS 'Raw source payload for this era/detail row.';
diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prisma
index c72938bc..03f7f28f 100644
--- a/packages/db/prisma/schema.prisma
+++ b/packages/db/prisma/schema.prisma
@@ -73,6 +73,7 @@ enum ShowSourceTag {
 
 enum TrialSourceTag {
   LEGACY_AKOEALL
+  MANUAL_ADMIN
   KOIRATIETOKANTA_API
 }
 
@@ -407,7 +408,7 @@ model TrialEvent {
   // 1) kokeen tiedot
   id             String   @id @default(cuid())
   sklKoeId       Int?     @unique
-  koepaiva       DateTime
+  koepaiva       DateTime @db.Date
   koekunta       String
   jarjestaja     String?
   kennelpiiri    String?
@@ -458,7 +459,7 @@ model TrialEntry {
   yva                        Decimal?             @db.Decimal(6, 2) // nykyinen ajotaito
   hlo                        Decimal?             @db.Decimal(6, 2)
   alo                        Decimal?             @db.Decimal(6, 2)
-  tja                        Decimal?             @db.Decimal(6, 2)
+  tja                        Decimal?             @db.Decimal(6, 2) // vanhojen kokeiden tie- ja estetyöskentely
   pin                        Decimal?             @db.Decimal(6, 2)
   ansiopisteetYhteensa       Decimal?             @db.Decimal(6, 2)
   tappiopisteetYhteensa      Decimal?             @db.Decimal(6, 2)
@@ -498,7 +499,7 @@ model TrialEra {
   yva             Decimal?            @db.Decimal(6, 2) // nykyinen ajotaito
   hlo             Decimal?            @db.Decimal(6, 2)
   alo             Decimal?            @db.Decimal(6, 2)
-  tja             Decimal?            @db.Decimal(6, 2)
+  tja             Decimal?            @db.Decimal(6, 2) // vanhojen kokeiden tie- ja estetyöskentely
   pin             Decimal?            @db.Decimal(6, 2)
   huomautusTeksti String?             @db.Text
   raakadataJson   String?             @db.Text
diff --git a/packages/db/trials/core/trial-entry-identity.ts b/packages/db/trials/core/trial-entry-identity.ts
new file mode 100644
index 00000000..9b30dd26
--- /dev/null
+++ b/packages/db/trials/core/trial-entry-identity.ts
@@ -0,0 +1,6 @@
+export function buildTrialEntryIdentity(
+  sklKoeId: number,
+  canonicalRegistrationNo: string,
+): string {
+  return `SKL:${sklKoeId}|REG:${canonicalRegistrationNo}`;
+}
diff --git a/packages/db/trials/index.ts b/packages/db/trials/index.ts
index 0348bb80..5c4917cd 100644
--- a/packages/db/trials/index.ts
+++ b/packages/db/trials/index.ts
@@ -31,3 +31,4 @@ export {
   type KoiratietokantaAjokUpsertDbInput,
   type KoiratietokantaAjokUpsertDbResult,
 } from "./integrations/koiratietokanta";
+export { buildTrialEntryIdentity } from "./core/trial-entry-identity";
diff --git a/packages/db/trials/integrations/koiratietokanta/__tests__/upsert-ajok-result.test.ts b/packages/db/trials/integrations/koiratietokanta/__tests__/upsert-ajok-result.test.ts
index 1b284f77..b71bcdf8 100644
--- a/packages/db/trials/integrations/koiratietokanta/__tests__/upsert-ajok-result.test.ts
+++ b/packages/db/trials/integrations/koiratietokanta/__tests__/upsert-ajok-result.test.ts
@@ -199,6 +199,7 @@ describe("upsertKoiratietokantaAjokResultDb", () => {
           yva: 9.25,
           hlo: null,
           alo: null,
+          tja: null,
           ansiopisteetYhteensa: null,
           tappiopisteetYhteensa: null,
           lk: null,
@@ -270,6 +271,51 @@ describe("upsertKoiratietokantaAjokResultDb", () => {
     expect(txMock.trialEraLisatieto.createMany).not.toHaveBeenCalled();
   });
 
+  it("authoritatively replaces a manual entry while preserving an unresolved dog link", async () => {
+    txMock.trialEntry.findUnique.mockResolvedValue({ id: "entry-1" });
+    txMock.dogRegistration.findUnique.mockResolvedValue(null);
+
+    const result = await upsertKoiratietokantaAjokResultDb({
+      event: {
+        sklKoeId: 431477,
+        koepaiva: new Date("2025-09-07T00:00:00.000Z"),
+        koekunta: "Ristijarvi",
+        jarjestaja: null,
+        kennelpiiri: null,
+        kennelpiirinro: null,
+        trialRuleWindowId: null,
+        ylituomariNimi: "API judge",
+        ylituomariNumero: null,
+        ytKertomus: null,
+      },
+      entry: { ...entryInput, raakadataJson: '{"source":"api"}', haku: 8.5 },
+      eras: eraInputs,
+    });
+
+    expect(result).toMatchObject({
+      created: false,
+      updated: true,
+      dogFound: false,
+    });
+    expect(txMock.trialEntry.upsert).toHaveBeenCalledWith(
+      expect.objectContaining({
+        update: expect.objectContaining({
+          lahde: "KOIRATIETOKANTA_API",
+          raakadataJson: '{"source":"api"}',
+          haku: 8.5,
+          tja: null,
+        }),
+      }),
+    );
+    const update = txMock.trialEntry.upsert.mock.calls.at(-1)?.[0].update;
+    expect(update).not.toHaveProperty("dogId");
+    expect(update).not.toHaveProperty("createdAt");
+    expect(txMock.trialEra.deleteMany).toHaveBeenCalledWith({
+      where: { trialEntryId: "entry-1" },
+    });
+    expect(txMock.trialEra.create).toHaveBeenCalledTimes(2);
+  });
+
   it("writes canonical huomautus status", async () => {
     await upsertKoiratietokantaAjokResultDb({
       event: {
diff --git a/packages/db/trials/integrations/koiratietokanta/upsert-ajok-result.ts b/packages/db/trials/integrations/koiratietokanta/upsert-ajok-result.ts
index d8f3c0d1..40cc9fb2 100644
--- a/packages/db/trials/integrations/koiratietokanta/upsert-ajok-result.ts
+++ b/packages/db/trials/integrations/koiratietokanta/upsert-ajok-result.ts
@@ -211,6 +211,9 @@ export async function upsertKoiratietokantaAjokResultDb(
       yva: input.entry.yva,
       hlo: input.entry.hlo,
       alo: input.entry.alo,
+      // Legacy trials stored tie- ja estetyöskentely in this summary field.
+      // Current API values live in lisatiedot, so authoritative upsert clears it.
+      tja: null,
       ansiopisteetYhteensa: input.entry.ansiopisteetYhteensa,
       tappiopisteetYhteensa: input.entry.tappiopisteetYhteensa,
       // Event-level chief judge is canonical for imported AJOK entries.
diff --git a/packages/server/admin/index.ts b/packages/server/admin/index.ts
index 92a08cf3..8dc4f334 100644
--- a/packages/server/admin/index.ts
+++ b/packages/server/admin/index.ts
@@ -22,6 +22,7 @@ export { deleteAdminDogDisease } from "./dogs";
 export { listAdminTrialEvents } from "./trials";
 export { getAdminTrialEvent } from "./trials";
 export { createAdminTrialEvent } from "./trials";
+export { createAdminTrialEntry } from "./trials";
 export { deleteAdminTrialEvent } from "./trials";
 export { deleteAdminTrialEntry } from "./trials";
 export { updateAdminTrialEvent } from "./trials";
diff --git a/packages/server/admin/trials/manage/__tests__/create-trial-entry.test.ts b/packages/server/admin/trials/manage/__tests__/create-trial-entry.test.ts
new file mode 100644
index 00000000..d3eb4ae5
--- /dev/null
+++ b/packages/server/admin/trials/manage/__tests__/create-trial-entry.test.ts
@@ -0,0 +1,172 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type {
+  CreateAdminTrialEntryRequest,
+  CurrentUserDto,
+} from "@beagle/contracts";
+import { createAdminTrialEntry } from "../create-trial-entry";
+
+const { writeMock } = vi.hoisted(() => ({ writeMock: vi.fn() }));
+vi.mock("@beagle/db", () => ({ createAdminTrialEntryWriteDb: writeMock }));
+
+const admin: CurrentUserDto = {
+  id: "u1",
+  email: "a@example.com",
+  username: null,
+  role: "ADMIN",
+};
+const input: CreateAdminTrialEntryRequest = {
+  trialEventId: "event-1",
+  registrationNo: " fi12345/21 ",
+  entry: {
+    koemaasto: null,
+    koemuoto: "AJOK",
+    koetyyppi: "NORMAL",
+    ke: null,
+    lk: null,
+    award: null,
+    rank: null,
+    points: null,
+    koiriaLuokassa: null,
+    hyvaksytytAjominuutit: null,
+    ajoajanPisteet: null,
+    haku: null,
+    hauk: null,
+    yva: null,
+    hlo: null,
+    alo: null,
+    tja: null,
+    pin: null,
+    ansiopisteetYhteensa: null,
+    tappiopisteetYhteensa: null,
+    judge: null,
+    huomautus: null,
+    huomautusTeksti: null,
+    ylituomariNumeroSnapshot: null,
+    ryhmatuomariNimi: null,
+    palkintotuomariNimi: null,
+    omistajaSnapshot: null,
+    omistajanKotikuntaSnapshot: null,
+  },
+  eras: [
+    {
+      era: 1,
+      alkoi: null,
+      hakumin: null,
+      ajomin: null,
+      haku: null,
+      hauk: null,
+      yva: null,
+      hlo: null,
+      alo: null,
+      tja: null,
+      pin: null,
+      huomautusTeksti: null,
+    },
+  ],
+  lisatiedotRows: [],
+};
+
+describe("createAdminTrialEntry", () => {
+  beforeEach(() => writeMock.mockReset());
+
+  it("requires admin authorization", async () => {
+    await expect(createAdminTrialEntry(input, null)).resolves.toMatchObject({
+      status: 401,
+      body: { ok: false, code: "UNAUTHENTICATED" },
+    });
+    expect(writeMock).not.toHaveBeenCalled();
+  });
+
+  it("normalizes registration before persistence", async () => {
+    writeMock.mockResolvedValue({
+      status: "created",
+      trialEventId: "event-1",
+      trialEntryId: "entry-1",
+    });
+    await expect(createAdminTrialEntry(input, admin)).resolves.toMatchObject({
+      status: 201,
+      body: { ok: true },
+    });
+    expect(writeMock).toHaveBeenCalledWith(
+      expect.objectContaining({ canonicalRegistrationNo: "FI12345/21" }),
+    );
+  });
+
+  it.each([
+    ["event_not_found", 404, "TRIAL_EVENT_NOT_FOUND"],
+    ["event_missing_skl_id", 409, "TRIAL_EVENT_MISSING_SKL_ID"],
+    ["registration_conflict", 409, "TRIAL_ENTRY_REGISTRATION_CONFLICT"],
+  ] as const)("maps %s", async (status, expectedStatus, code) => {
+    writeMock.mockResolvedValue({ status });
+    await expect(createAdminTrialEntry(input, admin)).resolves.toMatchObject({
+      status: expectedStatus,
+      body: { ok: false, code },
+    });
+  });
+
+  it("uses stable validation categories", async () => {
+    await expect(
+      createAdminTrialEntry({ ...input, eras: [] }, admin),
+    ).resolves.toMatchObject({
+      status: 400,
+      body: { ok: false, code: "INVALID_TRIAL_ERAS" },
+    });
+    await expect(
+      createAdminTrialEntry({ ...input, registrationNo: "bad value" }, admin),
+    ).resolves.toMatchObject({
+      status: 400,
+      body: { ok: false, code: "INVALID_REGISTRATION_NUMBER" },
+    });
+  });
+
+  it("rejects duplicate normalized lisatieto keys before persistence", async () => {
+    const row = {
+      koodi: "11",
+      osa: "",
+      nimi: null,
+      jarjestys: 1,
+      eraValues: [{ era: 1, arvo: "1" }],
+    };
+
+    await expect(
+      createAdminTrialEntry(
+        {
+          ...input,
+          lisatiedotRows: [row, { ...row, koodi: " 11 ", osa: " " }],
+        },
+        admin,
+      ),
+    ).resolves.toMatchObject({
+      status: 400,
+      body: { ok: false, code: "INVALID_TRIAL_ADDITIONAL_INFO" },
+    });
+    expect(writeMock).not.toHaveBeenCalled();
+  });
+
+  it("rejects duplicate lisatieto era values before persistence", async () => {
+    await expect(
+      createAdminTrialEntry(
+        {
+          ...input,
+          lisatiedotRows: [
+            {
+              koodi: "11",
+              osa: "",
+              nimi: null,
+              jarjestys: 1,
+              eraValues: [
+                { era: 1, arvo: "1" },
+                { era: 1, arvo: "2" },
+              ],
+            },
+          ],
+        },
+        admin,
+      ),
+    ).resolves.toMatchObject({
+      status: 400,
+      body: { ok: false, code: "INVALID_TRIAL_ADDITIONAL_INFO" },
+    });
+    expect(writeMock).not.toHaveBeenCalled();
+  });
+});
diff --git a/packages/server/admin/trials/manage/__tests__/list-trials.test.ts b/packages/server/admin/trials/manage/__tests__/list-trials.test.ts
index 8c7bf856..eebb0f16 100644
--- a/packages/server/admin/trials/manage/__tests__/list-trials.test.ts
+++ b/packages/server/admin/trials/manage/__tests__/list-trials.test.ts
@@ -94,8 +94,8 @@ describe("listAdminTrialEvents", () => {
 
     expect(searchAdminTrialsDbMock).toHaveBeenCalledWith({
       query: "helsinki",
-      dateFrom: new Date("2025-12-31T22:00:00.000Z"),
-      dateTo: new Date("2026-12-31T22:00:00.000Z"),
+      dateFrom: new Date("2026-01-01T00:00:00.000Z"),
+      dateTo: new Date("2027-01-01T00:00:00.000Z"),
       page: 2,
       pageSize: 100,
       sort: "date-asc",
diff --git a/packages/server/admin/trials/manage/__tests__/parse-admin-trial-event-search-input.test.ts b/packages/server/admin/trials/manage/__tests__/parse-admin-trial-event-search-input.test.ts
index f525519b..26780719 100644
--- a/packages/server/admin/trials/manage/__tests__/parse-admin-trial-event-search-input.test.ts
+++ b/packages/server/admin/trials/manage/__tests__/parse-admin-trial-event-search-input.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { getTrialBusinessDateStartUtc } from "@server/trials/core/business-date";
+import { getTrialDateOnlyStartUtc } from "@server/trials/core/date-only";
 import { parseAdminTrialEventSearchInput } from "../internal/parse-admin-trial-event-search-input";
 
 describe("parseAdminTrialEventSearchInput", () => {
@@ -46,8 +46,8 @@ describe("parseAdminTrialEventSearchInput", () => {
         year: null,
         dateFromIso: "2026-06-01",
         dateToIso: "2026-06-30",
-        rangeFromDate: getTrialBusinessDateStartUtc("2026-06-01"),
-        rangeToExclusive: getTrialBusinessDateStartUtc("2026-07-01"),
+        rangeFromDate: getTrialDateOnlyStartUtc("2026-06-01"),
+        rangeToExclusive: getTrialDateOnlyStartUtc("2026-07-01"),
       },
     });
   });
diff --git a/packages/server/admin/trials/manage/__tests__/resolve-admin-trial-event-defaults.test.ts b/packages/server/admin/trials/manage/__tests__/resolve-admin-trial-event-defaults.test.ts
index 51bcfdc0..417678dd 100644
--- a/packages/server/admin/trials/manage/__tests__/resolve-admin-trial-event-defaults.test.ts
+++ b/packages/server/admin/trials/manage/__tests__/resolve-admin-trial-event-defaults.test.ts
@@ -125,8 +125,8 @@ describe("resolveAdminTrialEventSearchResponseDb", () => {
     });
     expect(searchAdminTrialsDbMock).toHaveBeenNthCalledWith(2, {
       query: "",
-      dateFrom: new Date("2025-12-31T22:00:00.000Z"),
-      dateTo: new Date("2026-12-31T22:00:00.000Z"),
+      dateFrom: new Date("2026-01-01T00:00:00.000Z"),
+      dateTo: new Date("2027-01-01T00:00:00.000Z"),
       page: 1,
       pageSize: 20,
       sort: "date-desc",
diff --git a/packages/server/admin/trials/manage/__tests__/update-trial-entry.test.ts b/packages/server/admin/trials/manage/__tests__/update-trial-entry.test.ts
index 8776351c..5bded1cd 100644
--- a/packages/server/admin/trials/manage/__tests__/update-trial-entry.test.ts
+++ b/packages/server/admin/trials/manage/__tests__/update-trial-entry.test.ts
@@ -260,6 +260,65 @@ describe("updateAdminTrialEntry", () => {
     expect(updateAdminTrialEntryWriteDbMock).not.toHaveBeenCalled();
   });
 
+  it("rejects duplicate normalized lisatieto keys before persistence", async () => {
+    const row = {
+      koodi: "11",
+      osa: "",
+      nimi: null,
+      jarjestys: null,
+      eraValues: [{ era: 1, arvo: "1" }],
+    };
+
+    await expect(
+      updateAdminTrialEntry(
+        {
+          ...baseInput(),
+          lisatiedotRows: [row, { ...row, koodi: " 11 ", osa: " " }],
+        },
+        adminUser,
+      ),
+    ).resolves.toEqual({
+      status: 400,
+      body: {
+        ok: false,
+        error: "Duplicate lisatieto rows are not allowed.",
+        code: "INVALID_TRIAL_ADDITIONAL_INFO",
+      },
+    });
+    expect(updateAdminTrialEntryWriteDbMock).not.toHaveBeenCalled();
+  });
+
+  it("rejects duplicate lisatieto era values before persistence", async () => {
+    await expect(
+      updateAdminTrialEntry(
+        {
+          ...baseInput(),
+          lisatiedotRows: [
+            {
+              koodi: "11",
+              osa: "",
+              nimi: null,
+              jarjestys: null,
+              eraValues: [
+                { era: 1, arvo: "1" },
+                { era: 1, arvo: "2" },
+              ],
+            },
+          ],
+        },
+        adminUser,
+      ),
+    ).resolves.toEqual({
+      status: 400,
+      body: {
+        ok: false,
+        error: "Duplicate lisatieto era values are not allowed.",
+        code: "INVALID_TRIAL_ADDITIONAL_INFO",
+      },
+    });
+    expect(updateAdminTrialEntryWriteDbMock).not.toHaveBeenCalled();
+  });
+
   it("accepts canonical and existing numeric lisatieto codes by koodi and osa", async () => {
     updateAdminTrialEntryWriteDbMock.mockResolvedValue({
       status: "updated",
diff --git a/packages/server/admin/trials/manage/create-trial-entry.ts b/packages/server/admin/trials/manage/create-trial-entry.ts
new file mode 100644
index 00000000..2d963c06
--- /dev/null
+++ b/packages/server/admin/trials/manage/create-trial-entry.ts
@@ -0,0 +1,174 @@
+import type {
+  CreateAdminTrialEntryRequest,
+  CreateAdminTrialEntryResponse,
+  CurrentUserDto,
+} from "@beagle/contracts";
+import { createAdminTrialEntryWriteDb } from "@beagle/db";
+import { requireAdmin } from "@server/admin/core/service";
+import { toErrorLog, withLogContext } from "@server/core/logger";
+import type { ServiceResult } from "@server/core/result";
+import {
+  isValidTrialRegistrationNo,
+  normalizeTrialRegistrationNo,
+} from "@server/trials/core";
+import { parseAdminTrialEntryWriteInput } from "./internal/parse-admin-trial-entry-write-input";
+
+type ServiceLogContext = { requestId?: string; actorUserId?: string };
+
+const ISSUE_CODES = {
+  entry: "INVALID_TRIAL_ENTRY",
+  eras: "INVALID_TRIAL_ERAS",
+  additional_info: "INVALID_TRIAL_ADDITIONAL_INFO",
+} as const;
+
+// Creates one API-compatible manual trial result for an authorized administrator.
+export async function createAdminTrialEntry(
+  input: CreateAdminTrialEntryRequest,
+  currentUser: CurrentUserDto | null,
+  context?: ServiceLogContext,
+): Promise<ServiceResult<CreateAdminTrialEntryResponse>> {
+  const startedAt = Date.now();
+  const log = withLogContext({
+    layer: "service",
+    useCase: "admin-trials.createAdminTrialEntry",
+    ...(context?.requestId ? { requestId: context.requestId } : {}),
+    ...(context?.actorUserId ? { actorUserId: context.actorUserId } : {}),
+  });
+  const auth = requireAdmin(currentUser);
+  if (!auth.body.ok) {
+    log.warn(
+      { event: "forbidden", status: auth.status },
+      "admin trial entry creation rejected by authorization",
+    );
+    return { status: auth.status, body: auth.body };
+  }
+
+  const trialEventId = input.trialEventId.trim();
+  if (!trialEventId) {
+    log.warn(
+      { event: "invalid_trial_event_id" },
+      "admin trial entry creation rejected before persistence",
+    );
+    return {
+      status: 400,
+      body: {
+        ok: false,
+        error: "Trial event id is required.",
+        code: "INVALID_TRIAL_EVENT_ID",
+      },
+    };
+  }
+
+  const registrationNo = normalizeTrialRegistrationNo(input.registrationNo);
+  if (!registrationNo || !isValidTrialRegistrationNo(registrationNo)) {
+    log.warn(
+      { event: "invalid_registration_number", trialEventId },
+      "admin trial entry creation rejected before persistence",
+    );
+    return {
+      status: 400,
+      body: {
+        ok: false,
+        error: "Registration number is invalid.",
+        code: "INVALID_REGISTRATION_NUMBER",
+      },
+    };
+  }
+
+  const parsed = parseAdminTrialEntryWriteInput(input, { mode: "create" });
+  if (!parsed.ok) {
+    log.warn(
+      { event: parsed.issue.reason, trialEventId, registrationNo },
+      "admin trial entry creation rejected before persistence",
+    );
+    return {
+      status: 400,
+      body: {
+        ok: false,
+        error: "Trial result fields are invalid.",
+        code: ISSUE_CODES[parsed.issue.area],
+      },
+    };
+  }
+
+  log.info(
+    { event: "start", trialEventId, registrationNo },
+    "admin trial entry creation started",
+  );
+  try {
+    const result = await createAdminTrialEntryWriteDb({
+      trialEventId,
+      canonicalRegistrationNo: registrationNo,
+      ...parsed.data,
+    });
+    if (result.status === "event_not_found") {
+      return {
+        status: 404,
+        body: {
+          ok: false,
+          error: "Trial event was not found.",
+          code: "TRIAL_EVENT_NOT_FOUND",
+        },
+      };
+    }
+    if (result.status === "event_missing_skl_id") {
+      return {
+        status: 409,
+        body: {
+          ok: false,
+          error: "Trial event is missing its SKL id.",
+          code: "TRIAL_EVENT_MISSING_SKL_ID",
+        },
+      };
+    }
+    if (result.status === "registration_conflict") {
+      return {
+        status: 409,
+        body: {
+          ok: false,
+          error: "Registration already exists in this event.",
+          code: "TRIAL_ENTRY_REGISTRATION_CONFLICT",
+        },
+      };
+    }
+    log.info(
+      {
+        event: "success",
+        trialEventId,
+        trialEntryId: result.trialEntryId,
+        registrationNo,
+        durationMs: Date.now() - startedAt,
+      },
+      "admin trial entry creation succeeded",
+    );
+    return {
+      status: 201,
+      body: {
+        ok: true,
+        data: {
+          trialEventId: result.trialEventId,
+          trialEntryId: result.trialEntryId,
+        },
+      },
+    };
+  } catch (error) {
+    log.error(
+      {
+        event: "exception",
+        trialEventId,
+        registrationNo,
+        durationMs: Date.now() - startedAt,
+        ...toErrorLog(error),
+      },
+      "admin trial entry creation failed",
+    );
+    return {
+      status: 500,
+      body: {
+        ok: false,
+        error: "Failed to create admin trial entry.",
+        code: "INTERNAL_ERROR",
+      },
+    };
+  }
+}
diff --git a/packages/server/admin/trials/manage/get-trial-event.ts b/packages/server/admin/trials/manage/get-trial-event.ts
index 47310046..053e043b 100644
--- a/packages/server/admin/trials/manage/get-trial-event.ts
+++ b/packages/server/admin/trials/manage/get-trial-event.ts
@@ -4,7 +4,7 @@ import type {
   AdminTrialEventDetailsResponse,
   CurrentUserDto,
 } from "@beagle/contracts";
-import { toBusinessDateOnly } from "@server/core/date-only";
+import { formatTrialDateOnly } from "@server/trials/core/date-only";
 import { toErrorLog, withLogContext } from "@server/core/logger";
 import type { ServiceResult } from "@server/core/result";
 import { requireAdmin } from "@server/admin/core/service";
@@ -74,7 +74,7 @@ export async function getAdminTrialEvent(
         data: {
           event: {
             trialEventId: result.trialEventId,
-            eventDate: toBusinessDateOnly(result.eventDate),
+            eventDate: formatTrialDateOnly(result.eventDate),
             eventPlace: result.eventPlace,
             eventName: result.eventName,
             jarjestaja: result.jarjestaja,
diff --git a/packages/server/admin/trials/manage/index.ts b/packages/server/admin/trials/manage/index.ts
index 606751fb..b1256a0a 100644
--- a/packages/server/admin/trials/manage/index.ts
+++ b/packages/server/admin/trials/manage/index.ts
@@ -1,6 +1,7 @@
 export { getAdminTrialEvent } from "./get-trial-event";
 export { listAdminTrialEvents } from "./list-trials";
 export { createAdminTrialEvent } from "./create-trial-event";
+export { createAdminTrialEntry } from "./create-trial-entry";
 export { deleteAdminTrialEvent } from "./delete-trial-event";
 export { deleteAdminTrialEntry } from "./delete-trial-entry";
 export { updateAdminTrialEvent } from "./update-trial-event";
diff --git a/packages/server/admin/trials/manage/internal/__tests__/parse-admin-trial-entry-write-input.test.ts b/packages/server/admin/trials/manage/internal/__tests__/parse-admin-trial-entry-write-input.test.ts
new file mode 100644
index 00000000..c664256b
--- /dev/null
+++ b/packages/server/admin/trials/manage/internal/__tests__/parse-admin-trial-entry-write-input.test.ts
@@ -0,0 +1,170 @@
+import { describe, expect, it } from "vitest";
+import type { AdminTrialEntryWriteData } from "@beagle/contracts";
+import { parseAdminTrialEntryWriteInput } from "../parse-admin-trial-entry-write-input";
+
+function createInput(): AdminTrialEntryWriteData {
+  return {
+    entry: {
+      koemaasto: " Forest ",
+      koemuoto: " AJOK ",
+      koetyyppi: "NORMAL",
+      ke: null,
+      lk: null,
+      award: null,
+      rank: null,
+      points: null,
+      koiriaLuokassa: null,
+      hyvaksytytAjominuutit: null,
+      ajoajanPisteet: null,
+      haku: null,
+      hauk: null,
+      yva: null,
+      hlo: null,
+      alo: null,
+      tja: null,
+      pin: null,
+      ansiopisteetYhteensa: null,
+      tappiopisteetYhteensa: null,
+      judge: null,
+      huomautus: null,
+      huomautusTeksti: null,
+      ylituomariNumeroSnapshot: null,
+      ryhmatuomariNimi: null,
+      palkintotuomariNimi: null,
+      omistajaSnapshot: null,
+      omistajanKotikuntaSnapshot: null,
+    },
+    eras: [
+      {
+        era: 1,
+        alkoi: null,
+        hakumin: null,
+        ajomin: null,
+        haku: null,
+        hauk: null,
+        yva: null,
+        hlo: null,
+        alo: null,
+        tja: null,
+        pin: null,
+        huomautusTeksti: null,
+      },
+    ],
+    lisatiedotRows: [
+      {
+        koodi: " 11 ",
+        osa: " ",
+        nimi: " Paljas maa ",
+        jarjestys: 1,
+        eraValues: [{ era: 1, arvo: " 1 " }],
+      },
+    ],
+  };
+}
+
+describe("parseAdminTrialEntryWriteInput", () => {
+  it("normalizes the shared write shape", () => {
+    const result = parseAdminTrialEntryWriteInput(createInput(), {
+      mode: "create",
+    });
+
+    expect(result).toMatchObject({
+      ok: true,
+      data: {
+        entry: { koemaasto: "Forest", koemuoto: "AJOK" },
+        eras: [{ era: 1 }],
+        lisatiedotByEra: [
+          {
+            era: 1,
+            items: [
+              {
+                koodi: "11",
+                osa: "",
+                nimi: "Paljas maa",
+                arvo: "1",
+                jarjestys: 1,
+              },
+            ],
+          },
+        ],
+      },
+    });
+  });
+
+  it("returns detailed issue categories for service-specific mappings", () => {
+    expect(
+      parseAdminTrialEntryWriteInput(
+        { ...createInput(), eras: [] },
+        { mode: "create" },
+      ),
+    ).toEqual({
+      ok: false,
+      issue: { area: "eras", reason: "missing_eras" },
+    });
+  });
+
+  it.each([
+    { koodi: " 11 ", osa: " " },
+    { koodi: "11", osa: "" },
+  ])("rejects duplicate normalized lisatieto key %#", (duplicate) => {
+    const input = createInput();
+    input.lisatiedotRows.push({
+      ...input.lisatiedotRows[0],
+      ...duplicate,
+    });
+
+    expect(parseAdminTrialEntryWriteInput(input, { mode: "create" })).toEqual({
+      ok: false,
+      issue: {
+        area: "additional_info",
+        reason: "duplicate_lisatieto_key",
+      },
+    });
+  });
+
+  it("allows the same lisatieto code with different osa values", () => {
+    const input = createInput();
+    input.lisatiedotRows.push({
+      ...input.lisatiedotRows[0],
+      osa: "2",
+    });
+
+    expect(
+      parseAdminTrialEntryWriteInput(input, { mode: "create" }),
+    ).toMatchObject({ ok: true });
+  });
+
+  it("rejects duplicate era values within one lisatieto row", () => {
+    const input = createInput();
+    input.lisatiedotRows[0].eraValues.push({ era: 1, arvo: "2" });
+
+    expect(parseAdminTrialEntryWriteInput(input, { mode: "create" })).toEqual({
+      ok: false,
+      issue: {
+        area: "additional_info",
+        reason: "duplicate_lisatieto_era_value",
+      },
+    });
+  });
+
+  it("preserves update compatibility for invalid lisatieto ordering", () => {
+    const input = createInput();
+    input.lisatiedotRows[0].jarjestys = 1.5;
+
+    expect(parseAdminTrialEntryWriteInput(input, { mode: "create" })).toEqual({
+      ok: false,
+      issue: {
+        area: "additional_info",
+        reason: "invalid_lisatieto_order",
+      },
+    });
+    expect(
+      parseAdminTrialEntryWriteInput(input, { mode: "update" }),
+    ).toMatchObject({
+      ok: true,
+      data: {
+        lisatiedotByEra: [{ items: [{ jarjestys: null }] }],
+      },
+    });
+  });
+});
diff --git a/packages/server/admin/trials/manage/internal/map-admin-trial-event-search-response.ts b/packages/server/admin/trials/manage/internal/map-admin-trial-event-search-response.ts
index 194e0939..ea343c50 100644
--- a/packages/server/admin/trials/manage/internal/map-admin-trial-event-search-response.ts
+++ b/packages/server/admin/trials/manage/internal/map-admin-trial-event-search-response.ts
@@ -1,11 +1,13 @@
-import { toBusinessDateOnly } from "@server/core/date-only";
+import {
+  formatTrialDateOnly,
+  toTrialDateOnlyYear,
+} from "@server/trials/core/date-only";
 import type {
   AdminTrialEventSearchFilters,
   AdminTrialEventSearchResponse,
 } from "@beagle/contracts";
 import type { ParsedAdminTrialEventSearchInput } from "./parse-admin-trial-event-search-input";
 import type { ResolvedAdminTrialEventSearch } from "./resolve-admin-trial-event-defaults";
-import { toTrialBusinessYear } from "@server/trials/core/business-date";
 
 function resolveFilters(
   input: ParsedAdminTrialEventSearchInput,
@@ -46,7 +48,7 @@ export function mapAdminTrialEventSearchResponse(
   const result = resolved.result;
   const availableYears = Array.from(
     new Set(
-      result.availableEventDates.map((value) => toTrialBusinessYear(value)),
+      result.availableEventDates.map((value) => toTrialDateOnlyYear(value)),
     ),
   ).sort((left, right) => right - left);
 
@@ -58,7 +60,7 @@ export function mapAdminTrialEventSearchResponse(
     page: result.page,
     items: result.items.map((item) => ({
       trialEventId: item.trialEventId,
-      eventDate: toBusinessDateOnly(item.eventDate),
+      eventDate: formatTrialDateOnly(item.eventDate),
       eventPlace: item.eventPlace,
       eventName: item.eventName,
       jarjestaja: item.jarjestaja,
diff --git a/packages/server/admin/trials/manage/internal/parse-admin-trial-entry-write-input.ts b/packages/server/admin/trials/manage/internal/parse-admin-trial-entry-write-input.ts
new file mode 100644
index 00000000..c5ed8f64
--- /dev/null
+++ b/packages/server/admin/trials/manage/internal/parse-admin-trial-entry-write-input.ts
@@ -0,0 +1,247 @@
+import type { AdminTrialEntryWriteData } from "@beagle/contracts";
+import type { AdminTrialEntryWriteDataDb } from "@beagle/db";
+
+export type AdminTrialEntryWriteValidationReason =
+  | "invalid_koetyyppi"
+  | "invalid_huomautus"
+  | "invalid_entry_integer"
+  | "invalid_entry_number"
+  | "missing_eras"
+  | "invalid_era_number"
+  | "duplicate_eras"
+  | "non_continuous_eras"
+  | "invalid_era_integer"
+  | "invalid_era_number_field"
+  | "invalid_lisatieto_code"
+  | "duplicate_lisatieto_key"
+  | "invalid_lisatieto_era"
+  | "duplicate_lisatieto_era_value"
+  | "invalid_lisatieto_order";
+
+export type AdminTrialEntryWriteValidationIssue = {
+  area: "entry" | "eras" | "additional_info";
+  reason: AdminTrialEntryWriteValidationReason;
+  value?: string;
+};
+
+const VALID_KOETYYPIT = new Set(["NORMAL", "KOKOKAUDENKOE", "PITKAKOE"]);
+const VALID_HUOMAUTUKSET = new Set(["LUOPUI", "SULJETTU", "KESKEYTETTY"]);
+
+function normalizeNullableText(
+  value: string | null | undefined,
+): string | null {
+  const normalized = typeof value === "string" ? value.trim() : "";
+  return normalized || null;
+}
+
+function normalizeNullableInteger(
+  value: number | null | undefined,
+): number | null {
+  return value == null || !Number.isInteger(value) ? null : value;
+}
+
+function normalizeNullableNumber(
+  value: number | null | undefined,
+): number | null {
+  return value == null || !Number.isFinite(value) ? null : value;
+}
+
+function isNullableInteger(value: unknown): boolean {
+  return (
+    value == null || (typeof value === "number" && Number.isSafeInteger(value))
+  );
+}
+
+function isNullableNumber(value: unknown): boolean {
+  return value == null || (typeof value === "number" && Number.isFinite(value));
+}
+
+function failure(
+  area: AdminTrialEntryWriteValidationIssue["area"],
+  reason: AdminTrialEntryWriteValidationReason,
+  value?: string,
+): { ok: false; issue: AdminTrialEntryWriteValidationIssue } {
+  return { ok: false, issue: { area, reason, ...(value ? { value } : {}) } };
+}
+
+// Validates and normalizes the result shape shared by create and update writes.
+export function parseAdminTrialEntryWriteInput(
+  input: AdminTrialEntryWriteData,
+  options: { mode: "create" | "update" },
+):
+  | { ok: true; data: AdminTrialEntryWriteDataDb }
+  | { ok: false; issue: AdminTrialEntryWriteValidationIssue } {
+  if (!VALID_KOETYYPIT.has(input.entry.koetyyppi)) {
+    return failure("entry", "invalid_koetyyppi");
+  }
+  if (
+    input.entry.huomautus != null &&
+    !VALID_HUOMAUTUKSET.has(input.entry.huomautus)
+  ) {
+    return failure("entry", "invalid_huomautus");
+  }
+  if (
+    ![input.entry.koiriaLuokassa, input.entry.hyvaksytytAjominuutit].every(
+      isNullableInteger,
+    )
+  ) {
+    return failure("entry", "invalid_entry_integer");
+  }
+  if (
+    ![
+      input.entry.points,
+      input.entry.ajoajanPisteet,
+      input.entry.haku,
+      input.entry.hauk,
+      input.entry.yva,
+      input.entry.hlo,
+      input.entry.alo,
+      input.entry.tja,
+      input.entry.pin,
+      input.entry.ansiopisteetYhteensa,
+      input.entry.tappiopisteetYhteensa,
+    ].every(isNullableNumber)
+  ) {
+    return failure("entry", "invalid_entry_number");
+  }
+
+  if (input.eras.length === 0) {
+    return failure("eras", "missing_eras");
+  }
+  const eraNumbers = input.eras.map((era) => era.era);
+  if (
+    eraNumbers.some(
+      (era) => !Number.isSafeInteger(era) || !Number.isFinite(era) || era < 1,
+    )
+  ) {
+    return failure("eras", "invalid_era_number");
+  }
+  if (new Set(eraNumbers).size !== eraNumbers.length) {
+    return failure("eras", "duplicate_eras");
+  }
+  const sortedEras = [...eraNumbers].sort((left, right) => left - right);
+  if (sortedEras.some((era, index) => era !== index + 1)) {
+    return failure("eras", "non_continuous_eras");
+  }
+  for (const era of input.eras) {
+    if (![era.hakumin, era.ajomin].every(isNullableInteger)) {
+      return failure("eras", "invalid_era_integer");
+    }
+    if (
+      ![era.haku, era.hauk, era.yva, era.hlo, era.alo, era.tja, era.pin].every(
+        isNullableNumber,
+      )
+    ) {
+      return failure("eras", "invalid_era_number_field");
+    }
+  }
+
+  const lisatietoKeys = new Set<string>();
+  for (const row of input.lisatiedotRows) {
+    const koodi = normalizeNullableText(row.koodi);
+    if (!koodi || !/^[1-9]\d*$/u.test(koodi)) {
+      return failure("additional_info", "invalid_lisatieto_code", row.koodi);
+    }
+    const osa = normalizeNullableText(row.osa) ?? "";
+    const key = JSON.stringify([koodi, osa]);
+    if (lisatietoKeys.has(key)) {
+      return failure("additional_info", "duplicate_lisatieto_key");
+    }
+    lisatietoKeys.add(key);
+    if (options.mode === "create" && !isNullableInteger(row.jarjestys)) {
+      return failure("additional_info", "invalid_lisatieto_order");
+    }
+    if (row.eraValues.some((value) => !eraNumbers.includes(value.era))) {
+      return failure("additional_info", "invalid_lisatieto_era");
+    }
+    const lisatietoEraNumbers = row.eraValues.map((value) => value.era);
+    if (new Set(lisatietoEraNumbers).size !== lisatietoEraNumbers.length) {
+      return failure("additional_info", "duplicate_lisatieto_era_value");
+    }
+  }
+
+  return {
+    ok: true,
+    data: {
+      entry: {
+        koemaasto: normalizeNullableText(input.entry.koemaasto),
+        koemuoto: normalizeNullableText(input.entry.koemuoto),
+        koetyyppi: input.entry.koetyyppi,
+        ke: normalizeNullableText(input.entry.ke),
+        lk: normalizeNullableText(input.entry.lk),
+        award: normalizeNullableText(input.entry.award),
+        rank: normalizeNullableText(input.entry.rank),
+        points: normalizeNullableNumber(input.entry.points),
+        koiriaLuokassa: normalizeNullableInteger(input.entry.koiriaLuokassa),
+        hyvaksytytAjominuutit: normalizeNullableInteger(
+          input.entry.hyvaksytytAjominuutit,
+        ),
+        ajoajanPisteet: normalizeNullableNumber(input.entry.ajoajanPisteet),
+        haku: normalizeNullableNumber(input.entry.haku),
+        hauk: normalizeNullableNumber(input.entry.hauk),
+        yva: normalizeNullableNumber(input.entry.yva),
+        hlo: normalizeNullableNumber(input.entry.hlo),
+        alo: normalizeNullableNumber(input.entry.alo),
+        tja: normalizeNullableNumber(input.entry.tja),
+        pin: normalizeNullableNumber(input.entry.pin),
+        ansiopisteetYhteensa: normalizeNullableNumber(
+          input.entry.ansiopisteetYhteensa,
+        ),
+        tappiopisteetYhteensa: normalizeNullableNumber(
+          input.entry.tappiopisteetYhteensa,
+        ),
+        judge: normalizeNullableText(input.entry.judge),
+        huomautus: input.entry.huomautus ?? null,
+        huomautusTeksti: normalizeNullableText(input.entry.huomautusTeksti),
+        ylituomariNumeroSnapshot: normalizeNullableText(
+          input.entry.ylituomariNumeroSnapshot,
+        ),
+        ryhmatuomariNimi: normalizeNullableText(input.entry.ryhmatuomariNimi),
+        palkintotuomariNimi: normalizeNullableText(
+          input.entry.palkintotuomariNimi,
+        ),
+        omistajaSnapshot: normalizeNullableText(input.entry.omistajaSnapshot),
+        omistajanKotikuntaSnapshot: normalizeNullableText(
+          input.entry.omistajanKotikuntaSnapshot,
+        ),
+      },
+      eras: input.eras.map((era) => ({
+        era: era.era,
+        alkoi: normalizeNullableText(era.alkoi),
+        hakumin: normalizeNullableInteger(era.hakumin),
+        ajomin: normalizeNullableInteger(era.ajomin),
+        haku: normalizeNullableNumber(era.haku),
+        hauk: normalizeNullableNumber(era.hauk),
+        yva: normalizeNullableNumber(era.yva),
+        hlo: normalizeNullableNumber(era.hlo),
+        alo: normalizeNullableNumber(era.alo),
+        tja: normalizeNullableNumber(era.tja),
+        pin: normalizeNullableNumber(era.pin),
+        huomautusTeksti: normalizeNullableText(era.huomautusTeksti),
+      })),
+      lisatiedotByEra: eraNumbers.map((era) => ({
+        era,
+        replaceKeys: input.lisatiedotRows.map((row) => ({
+          koodi: normalizeNullableText(row.koodi) ?? row.koodi,
+          osa: normalizeNullableText(row.osa) ?? "",
+        })),
+        items: input.lisatiedotRows.flatMap((row) => {
+          const arvo = normalizeNullableText(
+            row.eraValues.find((value) => value.era === era)?.arvo,
+          );
+          return arvo
+            ? [
+                {
+                  koodi: normalizeNullableText(row.koodi) ?? row.koodi,
+                  osa: normalizeNullableText(row.osa) ?? "",
+                  arvo,
+                  nimi: normalizeNullableText(row.nimi),
+                  jarjestys: normalizeNullableInteger(row.jarjestys),
+                },
+              ]
+            : [];
+        }),
+      })),
+    },
+  };
+}
diff --git a/packages/server/admin/trials/manage/internal/parse-admin-trial-event-search-input.ts b/packages/server/admin/trials/manage/internal/parse-admin-trial-event-search-input.ts
index 6d5692bb..5508c809 100644
--- a/packages/server/admin/trials/manage/internal/parse-admin-trial-event-search-input.ts
+++ b/packages/server/admin/trials/manage/internal/parse-admin-trial-event-search-input.ts
@@ -3,7 +3,7 @@ import type {
   AdminTrialEventSearchSort,
 } from "@beagle/contracts";
 import type { AdminTrialEventSearchSortDb } from "@beagle/db";
-import { getTrialBusinessDateUtcRange } from "@server/trials/core/business-date";
+import { getTrialDateOnlyUtcRange } from "@server/trials/core/date-only";
 
 export type ParsedAdminTrialEventSearchInput = {
   query: string;
@@ -201,11 +201,10 @@ export function parseAdminTrialEventSearchInput(
   const query = normalizeQuery(input.query);
   const mode = year != null ? "year" : hasRangeInput ? "range" : null;
   const rangeFromDate = dateFromIso
-    ? getTrialBusinessDateUtcRange(new Date(`${dateFromIso}T00:00:00.000Z`))
-        .start
+    ? getTrialDateOnlyUtcRange(new Date(`${dateFromIso}T00:00:00.000Z`)).start
     : null;
   const rangeToExclusive = dateToIso
-    ? getTrialBusinessDateUtcRange(new Date(`${dateToIso}T00:00:00.000Z`))
+    ? getTrialDateOnlyUtcRange(new Date(`${dateToIso}T00:00:00.000Z`))
         .endExclusive
     : null;
 
diff --git a/packages/server/admin/trials/manage/internal/resolve-admin-trial-event-defaults.ts b/packages/server/admin/trials/manage/internal/resolve-admin-trial-event-defaults.ts
index a064b55d..999de75f 100644
--- a/packages/server/admin/trials/manage/internal/resolve-admin-trial-event-defaults.ts
+++ b/packages/server/admin/trials/manage/internal/resolve-admin-trial-event-defaults.ts
@@ -1,8 +1,8 @@
 import { searchAdminTrialsDb } from "@beagle/db";
 import {
-  getTrialBusinessYearUtcRange,
-  toTrialBusinessYear,
-} from "@server/trials/core/business-date";
+  getTrialDateOnlyYearUtcRange,
+  toTrialDateOnlyYear,
+} from "@server/trials/core/date-only";
 import type { ParsedAdminTrialEventSearchInput } from "./parse-admin-trial-event-search-input";
 
 export type ResolvedAdminTrialEventSearch = {
@@ -15,7 +15,7 @@ export type ResolvedAdminTrialEventSearch = {
 
 function collectAvailableYears(availableEventDates: Date[]): number[] {
   return Array.from(
-    new Set(availableEventDates.map((value) => toTrialBusinessYear(value))),
+    new Set(availableEventDates.map((value) => toTrialDateOnlyYear(value))),
   ).sort((left, right) => right - left);
 }
 
@@ -25,7 +25,7 @@ export async function resolveAdminTrialEventSearchResponseDb(
   const hasQuery = input.query.length > 0;
 
   if (input.mode === "year") {
-    const yearRange = getTrialBusinessYearUtcRange(input.year ?? 0);
+    const yearRange = getTrialDateOnlyYearUtcRange(input.year ?? 0);
     if (!yearRange) {
       throw new Error("Failed to build admin trial year range.");
     }
@@ -98,7 +98,7 @@ export async function resolveAdminTrialEventSearchResponseDb(
     };
   }
 
-  const yearRange = getTrialBusinessYearUtcRange(latestYear);
+  const yearRange = getTrialDateOnlyYearUtcRange(latestYear);
   if (!yearRange) {
     throw new Error("Failed to build admin trial year range.");
   }
diff --git a/packages/server/admin/trials/manage/update-trial-entry.ts b/packages/server/admin/trials/manage/update-trial-entry.ts
index cbfe5027..6fc7a48a 100644
--- a/packages/server/admin/trials/manage/update-trial-entry.ts
+++ b/packages/server/admin/trials/manage/update-trial-entry.ts
@@ -7,99 +7,94 @@ import { updateAdminTrialEntryWriteDb } from "@beagle/db";
 import { requireAdmin } from "@server/admin/core/service";
 import { toErrorLog, withLogContext } from "@server/core/logger";
 import type { ServiceResult } from "@server/core/result";
+import {
+  parseAdminTrialEntryWriteInput,
+  type AdminTrialEntryWriteValidationIssue,
+} from "./internal/parse-admin-trial-entry-write-input";
 
 type ServiceLogContext = {
   requestId?: string;
   actorUserId?: string;
 };
 
-const VALID_KOETYYPIT = new Set(["NORMAL", "KOKOKAUDENKOE", "PITKAKOE"]);
-const VALID_HUOMAUTUKSET = new Set(["LUOPUI", "SULJETTU", "KESKEYTETTY"]);
-
-function isValidLisatietoCode(value: string): boolean {
-  return /^[1-9]\d*$/.test(value.trim());
-}
-
-function normalizeRequiredId(value: string): string {
-  return value.trim();
-}
-
-function normalizeNullableText(
-  value: string | null | undefined,
-): string | null {
-  if (typeof value !== "string") {
-    return null;
-  }
-  const normalized = value.trim();
-  return normalized.length > 0 ? normalized : null;
-}
-
-function normalizeNullableInteger(
-  value: number | null | undefined,
-): number | null {
-  if (value === null || typeof value === "undefined") {
-    return null;
-  }
-  return Number.isInteger(value) ? value : null;
-}
-
-function isNullableInteger(value: unknown): value is number | null | undefined {
-  return (
-    value === null ||
-    typeof value === "undefined" ||
-    (typeof value === "number" &&
-      Number.isSafeInteger(value) &&
-      Number.isFinite(value))
-  );
-}
-
-function normalizeNullableNumber(
-  value: number | null | undefined,
-): number | null {
-  if (value === null || typeof value === "undefined") {
-    return null;
-  }
-  return Number.isFinite(value) ? value : null;
-}
-
-function isNullableFiniteNumber(
-  value: unknown,
-): value is number | null | undefined {
-  return (
-    value === null ||
-    typeof value === "undefined" ||
-    (typeof value === "number" && Number.isFinite(value))
-  );
-}
-
-function hasContinuousEras(eras: number[]): boolean {
-  if (eras.length === 0) {
-    return false;
-  }
-  const sorted = [...eras].sort((left, right) => left - right);
-  if (sorted[0] !== 1) {
-    return false;
-  }
-  for (let index = 1; index < sorted.length; index += 1) {
-    if (sorted[index] !== sorted[index - 1] + 1) {
-      return false;
-    }
+function validationFailure(
+  issue: AdminTrialEntryWriteValidationIssue,
+): ServiceResult<UpdateAdminTrialEntryResponse> {
+  switch (issue.reason) {
+    case "missing_eras":
+      return badRequest("At least one era is required.", "INVALID_ERAS");
+    case "invalid_era_number":
+      return badRequest(
+        "Era numbers must be positive safe integers.",
+        "INVALID_ERAS",
+      );
+    case "duplicate_eras":
+      return badRequest(
+        "Duplicate era numbers are not allowed.",
+        "DUPLICATE_ERAS",
+      );
+    case "non_continuous_eras":
+      return badRequest(
+        "Eras must be continuous starting from 1.",
+        "INVALID_ERAS",
+      );
+    case "invalid_koetyyppi":
+      return badRequest("Unsupported koetyyppi.", "INVALID_KOETYYPPI");
+    case "invalid_huomautus":
+      return badRequest("Unsupported huomautus.", "INVALID_HUOMAUTUS");
+    case "invalid_entry_integer":
+      return badRequest(
+        "Integer fields must be safe integers or null.",
+        "INVALID_INTEGER_FIELD",
+      );
+    case "invalid_entry_number":
+      return badRequest(
+        "Numeric fields must be finite numbers or null.",
+        "INVALID_NUMERIC_FIELD",
+      );
+    case "invalid_era_integer":
+      return badRequest(
+        "Era integer fields must be safe integers or null.",
+        "INVALID_ERA_INTEGER_FIELD",
+      );
+    case "invalid_era_number_field":
+      return badRequest(
+        "Era numeric fields must be finite numbers or null.",
+        "INVALID_ERA_NUMERIC_FIELD",
+      );
+    case "invalid_lisatieto_code":
+      return badRequest(
+        `Unsupported lisatieto code: ${issue.value ?? ""}`,
+        "INVALID_LISATIETO_CODE",
+      );
+    case "duplicate_lisatieto_key":
+      return badRequest(
+        "Duplicate lisatieto rows are not allowed.",
+        "INVALID_TRIAL_ADDITIONAL_INFO",
+      );
+    case "invalid_lisatieto_era":
+      return badRequest(
+        "Lisatiedot era value references unknown era.",
+        "INVALID_LISATIETO_ERA",
+      );
+    case "duplicate_lisatieto_era_value":
+      return badRequest(
+        "Duplicate lisatieto era values are not allowed.",
+        "INVALID_TRIAL_ADDITIONAL_INFO",
+      );
+    case "invalid_lisatieto_order":
+      return badRequest(
+        "Lisatieto order must be a safe integer or null.",
+        "INVALID_INTEGER_FIELD",
+      );
   }
-  return true;
 }
 
 function badRequest(
   error: string,
   code: string,
 ): ServiceResult<UpdateAdminTrialEntryResponse> {
-  return {
-    status: 400,
-    body: {
-      ok: false,
-      error,
-      code,
-    },
-  };
+  return { status: 400, body: { ok: false, error, code } };
 }
 
 export async function updateAdminTrialEntry(
@@ -108,8 +103,8 @@ export async function updateAdminTrialEntry(
   context?: ServiceLogContext,
 ): Promise<ServiceResult<UpdateAdminTrialEntryResponse>> {
   const startedAt = Date.now();
-  const trialEventId = normalizeRequiredId(input.trialEventId);
-  const trialEntryId = normalizeRequiredId(input.trialEntryId);
+  const trialEventId = input.trialEventId.trim();
+  const trialEntryId = input.trialEntryId.trim();
   const log = withLogContext({
     layer: "service",
     useCase: "admin-trials.updateAdminTrialEntry",
@@ -118,241 +113,28 @@ export async function updateAdminTrialEntry(
   });
 
   if (!trialEventId) {
-    return {
-      status: 400,
-      body: {
-        ok: false,
-        error: "Trial event id is required.",
-        code: "INVALID_TRIAL_EVENT_ID",
-      },
-    };
+    return badRequest("Trial event id is required.", "INVALID_TRIAL_EVENT_ID");
   }
-
   if (!trialEntryId) {
-    return {
-      status: 400,
-      body: {
-        ok: false,
-        error: "Trial entry id is required.",
-        code: "INVALID_TRIAL_ENTRY_ID",
-      },
-    };
+    return badRequest("Trial entry id is required.", "INVALID_TRIAL_ENTRY_ID");
   }
 
   const authResult = requireAdmin(currentUser);
   if (!authResult.body.ok) {
-    return {
-      status: authResult.status,
-      body: authResult.body,
-    };
-  }
-
-  if (!input.eras.length) {
-    return badRequest("At least one era is required.", "INVALID_ERAS");
-  }
-
-  const eraNumbers = input.eras.map((era) => era.era);
-  if (
-    eraNumbers.some(
-      (era) => !Number.isSafeInteger(era) || !Number.isFinite(era) || era < 1,
-    )
-  ) {
-    return badRequest(
-      "Era numbers must be positive safe integers.",
-      "INVALID_ERAS",
-    );
-  }
-
-  if (new Set(eraNumbers).size !== eraNumbers.length) {
-    return badRequest(
-      "Duplicate era numbers are not allowed.",
-      "DUPLICATE_ERAS",
-    );
-  }
-
-  if (!hasContinuousEras(eraNumbers)) {
-    return badRequest(
-      "Eras must be continuous starting from 1.",
-      "INVALID_ERAS",
-    );
-  }
-
-  if (!VALID_KOETYYPIT.has(input.entry.koetyyppi)) {
-    return badRequest("Unsupported koetyyppi.", "INVALID_KOETYYPPI");
-  }
-
-  if (
-    input.entry.huomautus !== null &&
-    typeof input.entry.huomautus !== "undefined" &&
-    !VALID_HUOMAUTUKSET.has(input.entry.huomautus)
-  ) {
-    return badRequest("Unsupported huomautus.", "INVALID_HUOMAUTUS");
-  }
-
-  const entryIntegerFields = [
-    input.entry.koiriaLuokassa,
-    input.entry.hyvaksytytAjominuutit,
-  ];
-  if (!entryIntegerFields.every(isNullableInteger)) {
-    return badRequest(
-      "Integer fields must be safe integers or null.",
-      "INVALID_INTEGER_FIELD",
-    );
+    return { status: authResult.status, body: authResult.body };
   }
 
-  const entryNumberFields = [
-    input.entry.points,
-    input.entry.ajoajanPisteet,
-    input.entry.haku,
-    input.entry.hauk,
-    input.entry.yva,
-    input.entry.hlo,
-    input.entry.alo,
-    input.entry.tja,
-    input.entry.pin,
-    input.entry.ansiopisteetYhteensa,
-    input.entry.tappiopisteetYhteensa,
-  ];
-  if (!entryNumberFields.every(isNullableFiniteNumber)) {
-    return badRequest(
-      "Numeric fields must be finite numbers or null.",
-      "INVALID_NUMERIC_FIELD",
-    );
-  }
-
-  for (const era of input.eras) {
-    if (![era.hakumin, era.ajomin].every(isNullableInteger)) {
-      return badRequest(
-        "Era integer fields must be safe integers or null.",
-        "INVALID_ERA_INTEGER_FIELD",
-      );
-    }
-    if (
-      ![era.haku, era.hauk, era.yva, era.hlo, era.alo, era.tja, era.pin].every(
-        isNullableFiniteNumber,
-      )
-    ) {
-      return badRequest(
-        "Era numeric fields must be finite numbers or null.",
-        "INVALID_ERA_NUMERIC_FIELD",
-      );
-    }
+  const parsed = parseAdminTrialEntryWriteInput(input, { mode: "update" });
+  if (!parsed.ok) {
+    return validationFailure(parsed.issue);
   }
 
-  for (const row of input.lisatiedotRows) {
-    const normalizedKoodi = normalizeNullableText(row.koodi);
-    if (!normalizedKoodi || !isValidLisatietoCode(normalizedKoodi)) {
-      return {
-        status: 400,
-        body: {
-          ok: false,
-          error: `Unsupported lisatieto code: ${row.koodi}`,
-          code: "INVALID_LISATIETO_CODE",
-        },
-      };
-    }
-
-    for (const value of row.eraValues) {
-      if (!eraNumbers.includes(value.era)) {
-        return {
-          status: 400,
-          body: {
-            ok: false,
-            error: "Lisatiedot era value references unknown era.",
-            code: "INVALID_LISATIETO_ERA",
-          },
-        };
-      }
-    }
-  }
-
-  const lisatiedotByEra = eraNumbers.map((era) => ({
-    era,
-    replaceKeys: input.lisatiedotRows.map((row) => ({
-      koodi: normalizeNullableText(row.koodi) ?? row.koodi,
-      osa: normalizeNullableText(row.osa) ?? "",
-    })),
-    items: input.lisatiedotRows
-      .map((row) => {
-        const eraValue = row.eraValues.find((value) => value.era === era);
-        const normalizedArvo = normalizeNullableText(eraValue?.arvo ?? null);
-        if (!normalizedArvo) {
-          return null;
-        }
-        return {
-          koodi: normalizeNullableText(row.koodi) ?? row.koodi,
-          osa: normalizeNullableText(row.osa) ?? "",
-          arvo: normalizedArvo,
-          nimi: normalizeNullableText(row.nimi),
-          jarjestys: normalizeNullableInteger(row.jarjestys),
-        };
-      })
-      .filter((item): item is NonNullable<typeof item> => item !== null),
-  }));
-
   try {
     const result = await updateAdminTrialEntryWriteDb({
       trialEventId,
       trialEntryId,
-      entry: {
-        koemaasto: normalizeNullableText(input.entry.koemaasto),
-        koemuoto: normalizeNullableText(input.entry.koemuoto),
-        koetyyppi: input.entry.koetyyppi,
-        ke: normalizeNullableText(input.entry.ke),
-        lk: normalizeNullableText(input.entry.lk),
-        award: normalizeNullableText(input.entry.award),
-        rank: normalizeNullableText(input.entry.rank),
-        points: normalizeNullableNumber(input.entry.points),
-        koiriaLuokassa: normalizeNullableInteger(input.entry.koiriaLuokassa),
-        hyvaksytytAjominuutit: normalizeNullableInteger(
-          input.entry.hyvaksytytAjominuutit,
-        ),
-        ajoajanPisteet: normalizeNullableNumber(input.entry.ajoajanPisteet),
-        haku: normalizeNullableNumber(input.entry.haku),
-        hauk: normalizeNullableNumber(input.entry.hauk),
-        yva: normalizeNullableNumber(input.entry.yva),
-        hlo: normalizeNullableNumber(input.entry.hlo),
-        alo: normalizeNullableNumber(input.entry.alo),
-        tja: normalizeNullableNumber(input.entry.tja),
-        pin: normalizeNullableNumber(input.entry.pin),
-        ansiopisteetYhteensa: normalizeNullableNumber(
-          input.entry.ansiopisteetYhteensa,
-        ),
-        tappiopisteetYhteensa: normalizeNullableNumber(
-          input.entry.tappiopisteetYhteensa,
-        ),
-        judge: normalizeNullableText(input.entry.judge),
-        huomautus: input.entry.huomautus ?? null,
-        huomautusTeksti: normalizeNullableText(input.entry.huomautusTeksti),
-        ylituomariNumeroSnapshot: normalizeNullableText(
-          input.entry.ylituomariNumeroSnapshot,
-        ),
-        ryhmatuomariNimi: normalizeNullableText(input.entry.ryhmatuomariNimi),
-        palkintotuomariNimi: normalizeNullableText(
-          input.entry.palkintotuomariNimi,
-        ),
-        omistajaSnapshot: normalizeNullableText(input.entry.omistajaSnapshot),
-        omistajanKotikuntaSnapshot: normalizeNullableText(
-          input.entry.omistajanKotikuntaSnapshot,
-        ),
-      },
-      eras: input.eras.map((era) => ({
-        era: era.era,
-        alkoi: normalizeNullableText(era.alkoi),
-        hakumin: normalizeNullableInteger(era.hakumin),
-        ajomin: normalizeNullableInteger(era.ajomin),
-        haku: normalizeNullableNumber(era.haku),
-        hauk: normalizeNullableNumber(era.hauk),
-        yva: normalizeNullableNumber(era.yva),
-        hlo: normalizeNullableNumber(era.hlo),
-        alo: normalizeNullableNumber(era.alo),
-        tja: normalizeNullableNumber(era.tja),
-        pin: normalizeNullableNumber(era.pin),
-        huomautusTeksti: normalizeNullableText(era.huomautusTeksti),
-      })),
-      lisatiedotByEra,
+      ...parsed.data,
     });
-
     if (result.status === "not_found") {
       return {
         status: 404,
@@ -363,7 +145,6 @@ export async function updateAdminTrialEntry(
         },
       };
     }
-
     return {
       status: 200,
       body: {
diff --git a/packages/server/index.ts b/packages/server/index.ts
index 9be0bf62..0d9de9c5 100644
--- a/packages/server/index.ts
+++ b/packages/server/index.ts
@@ -46,6 +46,7 @@ export { upsertKoiratietokantaAjokResultService } from "./trials";
 export { listAdminTrialEvents } from "./admin";
 export { getAdminTrialEvent } from "./admin";
 export { createAdminTrialEvent } from "./admin";
+export { createAdminTrialEntry } from "./admin";
 export { deleteAdminTrialEvent } from "./admin";
 export { deleteAdminTrialEntry } from "./admin";
 export { updateAdminTrialEvent } from "./admin";
diff --git a/packages/server/trials/__tests__/service.test.ts b/packages/server/trials/__tests__/service.test.ts
index 9dea6a4e..a8e65b01 100644
--- a/packages/server/trials/__tests__/service.test.ts
+++ b/packages/server/trials/__tests__/service.test.ts
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { createTrialsService } from "../service";
-import { getTrialBusinessDateStartUtc } from "../core/business-date";
+import { getTrialDateOnlyStartUtc } from "../core/date-only";
 
 const { searchBeagleTrialsDbMock, getBeagleTrialDetailsDbMock } = vi.hoisted(
   () => ({
@@ -97,8 +97,8 @@ describe("trials service", () => {
       sort: "date-desc",
     });
     expect(searchBeagleTrialsDbMock).toHaveBeenNthCalledWith(2, {
-      dateFrom: new Date("2024-12-31T22:00:00.000Z"),
-      dateTo: new Date("2025-12-31T22:00:00.000Z"),
+      dateFrom: new Date("2025-01-01T00:00:00.000Z"),
+      dateTo: new Date("2026-01-01T00:00:00.000Z"),
       page: 1,
       pageSize: 10,
       sort: "date-desc",
@@ -131,8 +131,8 @@ describe("trials service", () => {
       dateTo: "2026-06-30",
     });
     expect(searchBeagleTrialsDbMock).toHaveBeenCalledWith({
-      dateFrom: getTrialBusinessDateStartUtc("2026-06-01"),
-      dateTo: getTrialBusinessDateStartUtc("2026-07-01"),
+      dateFrom: getTrialDateOnlyStartUtc("2026-06-01"),
+      dateTo: getTrialDateOnlyStartUtc("2026-07-01"),
       page: 1,
       pageSize: 10,
       sort: "date-asc",
diff --git a/packages/server/trials/core/__tests__/trial-entry-identity.test.ts b/packages/server/trials/core/__tests__/trial-entry-identity.test.ts
new file mode 100644
index 00000000..06336517
--- /dev/null
+++ b/packages/server/trials/core/__tests__/trial-entry-identity.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, it } from "vitest";
+import {
+  isValidTrialRegistrationNo,
+  normalizeTrialRegistrationNo,
+} from "@server/trials/core/trial-entry-identity";
+
+describe("trial entry registration-number helpers", () => {
+  it.each([
+    "FI12345/21",
+    "FI12345A/21",
+    "EST.REG-12345",
+    "ABC/DEF/1234/20",
+    "ÅÄÖ123/24",
+    "FI١٢٣/٢٤",
+  ])("accepts supported international registration format %s", (value) => {
+    expect(isValidTrialRegistrationNo(value)).toBe(true);
+  });
+
+  it.each(["", "BAD VALUE", "FI_123/24", "FI:123/24", "FI@123/24"])(
+    "rejects unsupported registration format %s",
+    (value) => {
+      expect(isValidTrialRegistrationNo(value)).toBe(false);
+    },
+  );
+
+  it("trims and uppercases registration numbers", () => {
+    expect(normalizeTrialRegistrationNo("  fi.ab-123/24  ")).toBe(
+      "FI.AB-123/24",
+    );
+  });
+
+  it.each([null, "", "   "])("normalizes empty value %s to null", (value) => {
+    expect(normalizeTrialRegistrationNo(value)).toBeNull();
+  });
+});
diff --git a/packages/server/trials/core/business-date.ts b/packages/server/trials/core/business-date.ts
deleted file mode 100644
index 365b7d85..00000000
--- a/packages/server/trials/core/business-date.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import { BUSINESS_TIME_ZONE, toBusinessDateOnly } from "@server/core/date-only";
-
-function parseIsoDateOnlyParts(value: string): {
-  year: number;
-  month: number;
-  day: number;
-} | null {
-  const match = /^(\d{4})-(\d{2})-(\d{2})$/u.exec(value);
-  if (!match) {
-    return null;
-  }
-
-  const year = Number.parseInt(match[1], 10);
-  const month = Number.parseInt(match[2], 10);
-  const day = Number.parseInt(match[3], 10);
-  if (
-    !Number.isFinite(year) ||
-    !Number.isFinite(month) ||
-    !Number.isFinite(day)
-  ) {
-    return null;
-  }
-
-  const utcDate = new Date(Date.UTC(year, month - 1, day, 0, 0, 0, 0));
-  if (
-    utcDate.getUTCFullYear() !== year ||
-    utcDate.getUTCMonth() !== month - 1 ||
-    utcDate.getUTCDate() !== day
-  ) {
-    return null;
-  }
-
-  return { year, month, day };
-}
-
-function getTimeZoneOffsetMs(date: Date, timeZone: string): number {
-  const formatter = new Intl.DateTimeFormat("en-US", {
-    timeZone,
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-    hour: "2-digit",
-    minute: "2-digit",
-    second: "2-digit",
-    hourCycle: "h23",
-    hour12: false,
-  });
-  const parts = formatter.formatToParts(date);
-  const year = Number.parseInt(
-    parts.find((part) => part.type === "year")?.value ?? "0",
-    10,
-  );
-  const month = Number.parseInt(
-    parts.find((part) => part.type === "month")?.value ?? "0",
-    10,
-  );
-  const day = Number.parseInt(
-    parts.find((part) => part.type === "day")?.value ?? "0",
-    10,
-  );
-  const hour = Number.parseInt(
-    parts.find((part) => part.type === "hour")?.value ?? "0",
-    10,
-  );
-  const minute = Number.parseInt(
-    parts.find((part) => part.type === "minute")?.value ?? "0",
-    10,
-  );
-  const second = Number.parseInt(
-    parts.find((part) => part.type === "second")?.value ?? "0",
-    10,
-  );
-
-  const normalizedHour = hour === 24 ? 0 : hour;
-  const asUtc = Date.UTC(
-    year,
-    month - 1,
-    day,
-    normalizedHour,
-    minute,
-    second,
-    0,
-  );
-  return asUtc - date.getTime();
-}
-
-function toBusinessDateStartUtc(isoDate: string): Date | null {
-  const parsed = parseIsoDateOnlyParts(isoDate);
-  if (!parsed) {
-    return null;
-  }
-
-  const midnightAsUtcMs = Date.UTC(
-    parsed.year,
-    parsed.month - 1,
-    parsed.day,
-    0,
-    0,
-    0,
-    0,
-  );
-  let utcTimeMs = midnightAsUtcMs;
-
-  for (let index = 0; index < 3; index += 1) {
-    const offsetMs = getTimeZoneOffsetMs(
-      new Date(utcTimeMs),
-      BUSINESS_TIME_ZONE,
-    );
-    utcTimeMs = midnightAsUtcMs - offsetMs;
-  }
-
-  return new Date(utcTimeMs);
-}
-
-function addIsoDateDays(isoDate: string, days: number): string | null {
-  const parsed = parseIsoDateOnlyParts(isoDate);
-  if (!parsed) {
-    return null;
-  }
-  const base = new Date(
-    Date.UTC(parsed.year, parsed.month - 1, parsed.day, 0, 0, 0, 0),
-  );
-  base.setUTCDate(base.getUTCDate() + days);
-  return base.toISOString().slice(0, 10);
-}
-
-export function getTrialBusinessDateStartUtc(isoDate: string): Date | null {
-  return toBusinessDateStartUtc(isoDate);
-}
-
-export function getTrialBusinessYearUtcRange(year: number): {
-  start: Date;
-  endExclusive: Date;
-} | null {
-  const start = toBusinessDateStartUtc(`${year}-01-01`);
-  const endExclusive = toBusinessDateStartUtc(`${year + 1}-01-01`);
-  if (!start || !endExclusive) {
-    return null;
-  }
-
-  return { start, endExclusive };
-}
-
-export function getTrialBusinessDateUtcRange(value: Date): {
-  start: Date;
-  endExclusive: Date;
-} {
-  const isoDate = toBusinessDateOnly(value);
-  const start = toBusinessDateStartUtc(isoDate);
-  const nextIsoDate = addIsoDateDays(isoDate, 1);
-  const endExclusive = nextIsoDate ? toBusinessDateStartUtc(nextIsoDate) : null;
-
-  if (!start || !endExclusive) {
-    throw new Error("Failed to build business date UTC range.");
-  }
-
-  return { start, endExclusive };
-}
-
-export function toTrialBusinessYear(value: Date): number {
-  const year = toBusinessDateOnly(value).slice(0, 4);
-  const parsed = Number.parseInt(year, 10);
-  return Number.isFinite(parsed) ? parsed : value.getUTCFullYear();
-}
diff --git a/packages/server/trials/core/date-only.ts b/packages/server/trials/core/date-only.ts
new file mode 100644
index 00000000..5c71934f
--- /dev/null
+++ b/packages/server/trials/core/date-only.ts
@@ -0,0 +1,39 @@
+import { parseIsoDateOnlyToUtcDate } from "@server/trials/internal/iso-date";
+
+function addUtcDays(value: Date, days: number): Date {
+  const result = new Date(value.getTime());
+  result.setUTCDate(result.getUTCDate() + days);
+  return result;
+}
+
+// Trial dates are PostgreSQL DATE values represented by Prisma as UTC carriers.
+export function getTrialDateOnlyStartUtc(isoDate: string): Date | null {
+  return parseIsoDateOnlyToUtcDate(isoDate);
+}
+
+export function getTrialDateOnlyYearUtcRange(year: number): {
+  start: Date;
+  endExclusive: Date;
+} | null {
+  const start = parseIsoDateOnlyToUtcDate(`${year}-01-01`);
+  const endExclusive = parseIsoDateOnlyToUtcDate(`${year + 1}-01-01`);
+  return start && endExclusive ? { start, endExclusive } : null;
+}
+
+export function getTrialDateOnlyUtcRange(value: Date): {
+  start: Date;
+  endExclusive: Date;
+} {
+  const start = new Date(
+    Date.UTC(value.getUTCFullYear(), value.getUTCMonth(), value.getUTCDate()),
+  );
+  return { start, endExclusive: addUtcDays(start, 1) };
+}
+
+export function toTrialDateOnlyYear(value: Date): number {
+  return value.getUTCFullYear();
+}
+
+export function formatTrialDateOnly(value: Date): string {
+  return value.toISOString().slice(0, 10);
+}
diff --git a/packages/server/trials/core/index.ts b/packages/server/trials/core/index.ts
index 96c7bd52..3da7f9a2 100644
--- a/packages/server/trials/core/index.ts
+++ b/packages/server/trials/core/index.ts
@@ -1,3 +1,7 @@
 export { formatTrialAward } from "./format-trial-award";
-export { getTrialBusinessDateStartUtc } from "./business-date";
+export { getTrialDateOnlyStartUtc, formatTrialDateOnly } from "./date-only";
 export { resolveTrialRuleWindowId } from "./trial-rule-window";
+export {
+  isValidTrialRegistrationNo,
+  normalizeTrialRegistrationNo,
+} from "./trial-entry-identity";
diff --git a/packages/server/trials/core/trial-entry-identity.ts b/packages/server/trials/core/trial-entry-identity.ts
new file mode 100644
index 00000000..95400699
--- /dev/null
+++ b/packages/server/trials/core/trial-entry-identity.ts
@@ -0,0 +1,14 @@
+// Registration identifiers vary by country, so validate a safe character set
+// instead of enforcing a country-specific shape.
+const REGISTRATION_NO_PATTERN = /^[\p{L}\p{N}/.-]+$/u;
+
+export function normalizeTrialRegistrationNo(
+  value: string | null,
+): string | null {
+  const normalized = value?.trim().toUpperCase() ?? "";
+  return normalized.length > 0 ? normalized : null;
+}
+
+export function isValidTrialRegistrationNo(value: string): boolean {
+  return REGISTRATION_NO_PATTERN.test(value);
+}
diff --git a/packages/server/trials/get-beagle-trial-details.ts b/packages/server/trials/get-beagle-trial-details.ts
index f5be96ce..fc10ccab 100644
--- a/packages/server/trials/get-beagle-trial-details.ts
+++ b/packages/server/trials/get-beagle-trial-details.ts
@@ -1,6 +1,6 @@
 import { getBeagleTrialDetailsDb } from "@beagle/db";
 import type { BeagleTrialDetailsResponse } from "@beagle/contracts";
-import { toBusinessDateOnly } from "../core/date-only";
+import { formatTrialDateOnly } from "./core/date-only";
 import { toErrorLog, withLogContext } from "../core/logger";
 import type { ServiceResult } from "../core/result";
 import { formatTrialAward } from "./core";
@@ -60,7 +60,7 @@ export async function getBeagleTrialDetailsService(
     const data: BeagleTrialDetailsResponse = {
       trial: {
         trialId: result.trialEventId,
-        eventDate: toBusinessDateOnly(result.eventDate),
+        eventDate: formatTrialDateOnly(result.eventDate),
         eventPlace: result.eventPlace,
         judge: result.judge,
         dogCount: result.dogCount,
diff --git a/packages/server/trials/integrations/koiratietokanta/__tests__/upsert-ajok-result.test.ts b/packages/server/trials/integrations/koiratietokanta/__tests__/upsert-ajok-result.test.ts
index ce205de9..1f272e68 100644
--- a/packages/server/trials/integrations/koiratietokanta/__tests__/upsert-ajok-result.test.ts
+++ b/packages/server/trials/integrations/koiratietokanta/__tests__/upsert-ajok-result.test.ts
@@ -7,6 +7,8 @@ const { upsertDbMock, listActiveRuleWindowsMock } = vi.hoisted(() => ({
 }));
 
 vi.mock("@beagle/db", () => ({
+  buildTrialEntryIdentity: (sklKoeId: number, registrationNo: string) =>
+    `SKL:${sklKoeId}|REG:${registrationNo}`,
   DogSex: {
     MALE: "MALE",
     FEMALE: "FEMALE",
diff --git a/packages/server/trials/integrations/koiratietokanta/internal/map-ajok-payload.ts b/packages/server/trials/integrations/koiratietokanta/internal/map-ajok-payload.ts
index 32114061..2afb0de0 100644
--- a/packages/server/trials/integrations/koiratietokanta/internal/map-ajok-payload.ts
+++ b/packages/server/trials/integrations/koiratietokanta/internal/map-ajok-payload.ts
@@ -3,16 +3,18 @@ import {
   type KoiratietokantaAjokValidationIssue,
   type KoiratietokantaAjokWarning,
 } from "@beagle/contracts";
-import type {
-  KoiratietokantaAjokEntryDbInput,
-  KoiratietokantaAjokEraDbInput,
-  KoiratietokantaAjokEventDbInput,
+import {
+  buildTrialEntryIdentity,
+  type KoiratietokantaAjokEntryDbInput,
+  type KoiratietokantaAjokEraDbInput,
+  type KoiratietokantaAjokEventDbInput,
+  TrialEntryHuomautus,
+  TrialEntryKoetyyppi,
 } from "@beagle/db";
-import { TrialEntryHuomautus, TrialEntryKoetyyppi } from "@beagle/db";
 import {
-  isValidRegistrationNo,
-  normalizeRegistrationNo,
-} from "@server/imports/core";
+  isValidTrialRegistrationNo,
+  normalizeTrialRegistrationNo,
+} from "@server/trials/core";
 import { mapKoiratietokantaAjokEraWrites } from "./map-ajok-era-writes";
 import {
   isRecord,
@@ -83,10 +85,10 @@ export function mapKoiratietokantaAjokPayload(
     });
   }
 
-  const registrationNo = normalizeRegistrationNo(
+  const registrationNo = normalizeTrialRegistrationNo(
     normalizeText(payload.REKISTERINUMERO),
   );
-  if (!registrationNo || !isValidRegistrationNo(registrationNo)) {
+  if (!registrationNo || !isValidTrialRegistrationNo(registrationNo)) {
     issues.push({
       field: "REKISTERINUMERO",
       code: registrationNo ? "INVALID" : "REQUIRED",
@@ -185,7 +187,7 @@ export function mapKoiratietokantaAjokPayload(
   ]);
   const entry: KoiratietokantaAjokEntryDbInput = {
     rekisterinumeroSnapshot: registrationNo,
-    yksilointiAvain: `SKL:${sklKoeId}|REG:${registrationNo}`,
+    yksilointiAvain: buildTrialEntryIdentity(sklKoeId, registrationNo),
     raakadataJson: JSON.stringify(payload),
     luokka: normalizeText(payload.LUOKKA),
     omistajaSnapshot: normalizeText(payload.Omistaja),
diff --git a/packages/server/trials/internal/__tests__/business-date.test.ts b/packages/server/trials/internal/__tests__/business-date.test.ts
deleted file mode 100644
index 64fea4a8..00000000
--- a/packages/server/trials/internal/__tests__/business-date.test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-  getTrialBusinessDateStartUtc,
-  getTrialBusinessDateUtcRange,
-  getTrialBusinessYearUtcRange,
-  toTrialBusinessYear,
-} from "@server/trials/core/business-date";
-
-describe("business-date helpers", () => {
-  it("builds a business date start from an iso date", () => {
-    expect(getTrialBusinessDateStartUtc("2025-06-01")?.toISOString()).toBe(
-      "2025-05-31T21:00:00.000Z",
-    );
-  });
-
-  it("returns null for invalid iso dates", () => {
-    expect(getTrialBusinessDateStartUtc("2025-13-01")).toBeNull();
-  });
-
-  it("builds a business date utc range", () => {
-    const range = getTrialBusinessDateUtcRange(
-      new Date("2025-06-01T00:00:00.000Z"),
-    );
-
-    expect(range.start.toISOString()).toBe("2025-05-31T21:00:00.000Z");
-    expect(range.endExclusive.toISOString()).toBe("2025-06-01T21:00:00.000Z");
-  });
-
-  it("builds a business year utc range and year", () => {
-    const range = getTrialBusinessYearUtcRange(2025);
-
-    expect(range?.start.toISOString()).toBe("2024-12-31T22:00:00.000Z");
-    expect(range?.endExclusive.toISOString()).toBe("2025-12-31T22:00:00.000Z");
-    expect(toTrialBusinessYear(new Date("2025-06-01T00:00:00.000Z"))).toBe(
-      2025,
-    );
-  });
-});
diff --git a/packages/server/trials/internal/__tests__/date-only.test.ts b/packages/server/trials/internal/__tests__/date-only.test.ts
new file mode 100644
index 00000000..3674ef0d
--- /dev/null
+++ b/packages/server/trials/internal/__tests__/date-only.test.ts
@@ -0,0 +1,38 @@
+import { describe, expect, it } from "vitest";
+import {
+  getTrialDateOnlyStartUtc,
+  getTrialDateOnlyUtcRange,
+  getTrialDateOnlyYearUtcRange,
+  toTrialDateOnlyYear,
+} from "@server/trials/core/date-only";
+
+describe("trial date-only helpers", () => {
+  it("builds a date-only UTC carrier from an ISO date", () => {
+    expect(getTrialDateOnlyStartUtc("2025-06-01")?.toISOString()).toBe(
+      "2025-06-01T00:00:00.000Z",
+    );
+  });
+
+  it("returns null for invalid ISO dates", () => {
+    expect(getTrialDateOnlyStartUtc("2025-13-01")).toBeNull();
+  });
+
+  it("builds an inclusive day range with an exclusive next-day boundary", () => {
+    const range = getTrialDateOnlyUtcRange(
+      new Date("2025-06-01T00:00:00.000Z"),
+    );
+
+    expect(range.start.toISOString()).toBe("2025-06-01T00:00:00.000Z");
+    expect(range.endExclusive.toISOString()).toBe("2025-06-02T00:00:00.000Z");
+  });
+
+  it("builds a date-only year range and reads its UTC carrier year", () => {
+    const range = getTrialDateOnlyYearUtcRange(2025);
+
+    expect(range?.start.toISOString()).toBe("2025-01-01T00:00:00.000Z");
+    expect(range?.endExclusive.toISOString()).toBe("2026-01-01T00:00:00.000Z");
+    expect(toTrialDateOnlyYear(new Date("2025-06-01T00:00:00.000Z"))).toBe(
+      2025,
+    );
+  });
+});
diff --git a/packages/server/trials/search-beagle-trials.ts b/packages/server/trials/search-beagle-trials.ts
index 390e445b..a9247a18 100644
--- a/packages/server/trials/search-beagle-trials.ts
+++ b/packages/server/trials/search-beagle-trials.ts
@@ -4,14 +4,14 @@ import type {
   BeagleTrialSearchMode,
   BeagleTrialSearchResponse,
 } from "@beagle/contracts";
-import { toBusinessDateOnly } from "../core/date-only";
 import { toErrorLog, withLogContext } from "../core/logger";
 import type { ServiceResult } from "../core/result";
 import {
-  getTrialBusinessDateUtcRange,
-  getTrialBusinessYearUtcRange,
-  toTrialBusinessYear,
-} from "./core/business-date";
+  getTrialDateOnlyUtcRange,
+  getTrialDateOnlyYearUtcRange,
+  formatTrialDateOnly,
+  toTrialDateOnlyYear,
+} from "./core/date-only";
 import { parseIsoDateOnly } from "./internal/iso-date";
 import type { TrialsServiceLogContext } from "./types";
 
@@ -49,7 +49,7 @@ function parseYear(value: number | undefined): number | null {
 
 function collectAvailableYears(availableEventDates: Date[]): number[] {
   return Array.from(
-    new Set(availableEventDates.map((value) => toTrialBusinessYear(value))),
+    new Set(availableEventDates.map((value) => toTrialDateOnlyYear(value))),
   ).sort((left, right) => right - left);
 }
 
@@ -187,11 +187,10 @@ export async function searchBeagleTrialsService(
 
   try {
     const rangeFromDate = dateFromIso
-      ? getTrialBusinessDateUtcRange(new Date(`${dateFromIso}T00:00:00.000Z`))
-          .start
+      ? getTrialDateOnlyUtcRange(new Date(`${dateFromIso}T00:00:00.000Z`)).start
       : null;
     const rangeToExclusive = dateToIso
-      ? getTrialBusinessDateUtcRange(new Date(`${dateToIso}T00:00:00.000Z`))
+      ? getTrialDateOnlyUtcRange(new Date(`${dateToIso}T00:00:00.000Z`))
           .endExclusive
       : null;
 
@@ -204,7 +203,7 @@ export async function searchBeagleTrialsService(
     let result: Awaited<ReturnType<typeof searchBeagleTrialsDb>>;
 
     if (resolvedMode === "year") {
-      const yearRange = getTrialBusinessYearUtcRange(year ?? 0);
+      const yearRange = getTrialDateOnlyYearUtcRange(year ?? 0);
       if (!yearRange) {
         throw new Error("Failed to build trial year range.");
       }
@@ -240,7 +239,7 @@ export async function searchBeagleTrialsService(
       if (!latestYear) {
         result = available;
       } else {
-        const yearRange = getTrialBusinessYearUtcRange(latestYear);
+        const yearRange = getTrialDateOnlyYearUtcRange(latestYear);
         if (!yearRange) {
           throw new Error("Failed to build trial year range.");
         }
@@ -270,7 +269,7 @@ export async function searchBeagleTrialsService(
       page: result.page,
       items: result.items.map((item) => ({
         trialId: item.trialEventId,
-        eventDate: toBusinessDateOnly(item.eventDate),
+        eventDate: formatTrialDateOnly(item.eventDate),
         eventPlace: item.eventPlace,
         judge: item.judge,
         dogCount: item.dogCount,

From ef0d0b07de89676eaa1670190f528281a22c5705 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Wed, 22 Jul 2026 20:51:00 +0300
Subject: [PATCH 09/24] fix(trials): harden manual entry validation and
 conflict detection

ref bej-103
---
 .../__tests__/create-trial-entry.test.ts      | 49 ++++++++++++-----
 .../admin/trials/manage/create-trial-entry.ts | 26 +++++----
 .../__tests__/create-trial-entry.test.ts      | 16 ++++++
 .../admin/trials/manage/create-trial-entry.ts | 13 ++---
 ...arse-admin-trial-entry-write-input.test.ts | 51 ++++++++++++++++++
 .../parse-admin-trial-entry-write-input.ts    | 54 +++++++++++++++++--
 .../admin/trials/manage/update-trial-entry.ts | 11 +++-
 .../dogs/core/__tests__/registration.test.ts  | 36 +++++++++++++
 packages/server/dogs/core/index.ts            |  1 +
 packages/server/dogs/core/registration.ts     | 12 +++++
 .../__tests__/trial-entry-identity.test.ts    | 35 ------------
 packages/server/trials/core/index.ts          |  4 --
 .../internal/map-ajok-payload.ts              | 10 ++--
 13 files changed, 239 insertions(+), 79 deletions(-)
 create mode 100644 packages/server/dogs/core/__tests__/registration.test.ts
 create mode 100644 packages/server/dogs/core/registration.ts
 delete mode 100644 packages/server/trials/core/__tests__/trial-entry-identity.test.ts

diff --git a/packages/db/admin/trials/manage/__tests__/create-trial-entry.test.ts b/packages/db/admin/trials/manage/__tests__/create-trial-entry.test.ts
index 2aa021e8..efe48ba0 100644
--- a/packages/db/admin/trials/manage/__tests__/create-trial-entry.test.ts
+++ b/packages/db/admin/trials/manage/__tests__/create-trial-entry.test.ts
@@ -80,6 +80,14 @@ const input = {
   ],
 };
 
+function uniqueConstraintError(target: string | string[]) {
+  return new Prisma.PrismaClientKnownRequestError("duplicate", {
+    code: "P2002",
+    clientVersion: "test",
+    meta: { target },
+  });
+}
+
 describe("createAdminTrialEntryWriteDb", () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -145,16 +153,33 @@ describe("createAdminTrialEntryWriteDb", () => {
     });
   });
 
-  it("maps a database identity constraint race to registration conflict", async () => {
-    prismaTransaction.mockRejectedValueOnce(
-      new Prisma.PrismaClientKnownRequestError("duplicate", {
-        code: "P2002",
-        clientVersion: "test",
-        meta: { target: ["trialEventId", "rekisterinumeroSnapshot"] },
-      }),
-    );
-    await expect(createAdminTrialEntryWriteDb(input)).resolves.toEqual({
-      status: "registration_conflict",
-    });
-  });
+  it.each([
+    [["yksilointiAvain"]],
+    [["trialEventId", "rekisterinumeroSnapshot"]],
+    ["TrialEntry_yksilointiAvain_key"],
+    ["TrialEntry_trialEventId_rekisterinumeroSnapshot_key"],
+  ])(
+    "maps identity constraint target %j to registration conflict",
+    async (target) => {
+      prismaTransaction.mockRejectedValueOnce(uniqueConstraintError(target));
+      await expect(createAdminTrialEntryWriteDb(input)).resolves.toEqual({
+        status: "registration_conflict",
+      });
+    },
+  );
+
+  it.each([
+    [["trialEntryId", "era"]],
+    [["trialEraId", "koodi", "osa"]],
+    [["trialEventId", "futureIdentityField"]],
+    [["futureIdentityField", "rekisterinumeroSnapshot"]],
+    ["TrialEntry_trialEventId_futureIdentityField_key"],
+  ])(
+    "does not map unrelated constraint target %j to registration conflict",
+    async (target) => {
+      const error = uniqueConstraintError(target);
+      prismaTransaction.mockRejectedValueOnce(error);
+      await expect(createAdminTrialEntryWriteDb(input)).rejects.toBe(error);
+    },
+  );
 });
diff --git a/packages/db/admin/trials/manage/create-trial-entry.ts b/packages/db/admin/trials/manage/create-trial-entry.ts
index 2b6180ed..29b4350b 100644
--- a/packages/db/admin/trials/manage/create-trial-entry.ts
+++ b/packages/db/admin/trials/manage/create-trial-entry.ts
@@ -27,16 +27,22 @@ function isEntryIdentityConflict(error: unknown): boolean {
     return false;
   }
   const target = error.meta?.target;
-  const fields = Array.isArray(target)
-    ? target.map(String)
-    : [String(target ?? "")];
-  return fields.some(
-    (field) =>
-      field.includes("yksilointiAvain") ||
-      field.includes("trialEventId_rekisterinumeroSnapshot") ||
-      field.includes("trialEventId") ||
-      field.includes("rekisterinumeroSnapshot"),
-  );
+  if (Array.isArray(target)) {
+    const fields = target.map(String);
+    return (
+      (fields.length === 1 && fields[0] === "yksilointiAvain") ||
+      (fields.length === 2 &&
+        fields.includes("trialEventId") &&
+        fields.includes("rekisterinumeroSnapshot"))
+    );
+  }
+
+  return [
+    "yksilointiAvain",
+    "trialEventId_rekisterinumeroSnapshot",
+    "TrialEntry_yksilointiAvain_key",
+    "TrialEntry_trialEventId_rekisterinumeroSnapshot_key",
+  ].includes(String(target ?? ""));
 }
 
 // Creates one complete manual result and all nested rows atomically.
diff --git a/packages/server/admin/trials/manage/__tests__/create-trial-entry.test.ts b/packages/server/admin/trials/manage/__tests__/create-trial-entry.test.ts
index d3eb4ae5..b5b8d861 100644
--- a/packages/server/admin/trials/manage/__tests__/create-trial-entry.test.ts
+++ b/packages/server/admin/trials/manage/__tests__/create-trial-entry.test.ts
@@ -119,6 +119,22 @@ describe("createAdminTrialEntry", () => {
     });
   });
 
+  it("maps malformed runtime input to a stable validation error", async () => {
+    await expect(
+      createAdminTrialEntry(
+        {
+          ...input,
+          entry: null,
+        } as unknown as CreateAdminTrialEntryRequest,
+        admin,
+      ),
+    ).resolves.toMatchObject({
+      status: 400,
+      body: { ok: false, code: "INVALID_TRIAL_ENTRY" },
+    });
+    expect(writeMock).not.toHaveBeenCalled();
+  });
+
   it("rejects duplicate normalized lisatieto keys before persistence", async () => {
     const row = {
       koodi: "11",
diff --git a/packages/server/admin/trials/manage/create-trial-entry.ts b/packages/server/admin/trials/manage/create-trial-entry.ts
index 2d963c06..242c5ce8 100644
--- a/packages/server/admin/trials/manage/create-trial-entry.ts
+++ b/packages/server/admin/trials/manage/create-trial-entry.ts
@@ -8,9 +8,9 @@ import { requireAdmin } from "@server/admin/core/service";
 import { toErrorLog, withLogContext } from "@server/core/logger";
 import type { ServiceResult } from "@server/core/result";
 import {
-  isValidTrialRegistrationNo,
-  normalizeTrialRegistrationNo,
-} from "@server/trials/core";
+  isValidRegistrationNo,
+  normalizeRegistrationNo,
+} from "@server/dogs/core";
 import { parseAdminTrialEntryWriteInput } from "./internal/parse-admin-trial-entry-write-input";
 
 type ServiceLogContext = { requestId?: string; actorUserId?: string };
@@ -43,7 +43,8 @@ export async function createAdminTrialEntry(
     return { status: auth.status, body: auth.body };
   }
 
-  const trialEventId = input.trialEventId.trim();
+  const trialEventId =
+    typeof input?.trialEventId === "string" ? input.trialEventId.trim() : "";
   if (!trialEventId) {
     log.warn(
       { event: "invalid_trial_event_id" },
@@ -59,8 +60,8 @@ export async function createAdminTrialEntry(
     };
   }
 
-  const registrationNo = normalizeTrialRegistrationNo(input.registrationNo);
-  if (!registrationNo || !isValidTrialRegistrationNo(registrationNo)) {
+  const registrationNo = normalizeRegistrationNo(input?.registrationNo);
+  if (!registrationNo || !isValidRegistrationNo(registrationNo)) {
     log.warn(
       { event: "invalid_registration_number", trialEventId },
       "admin trial entry creation rejected before persistence",
diff --git a/packages/server/admin/trials/manage/internal/__tests__/parse-admin-trial-entry-write-input.test.ts b/packages/server/admin/trials/manage/internal/__tests__/parse-admin-trial-entry-write-input.test.ts
index c664256b..47c1760e 100644
--- a/packages/server/admin/trials/manage/internal/__tests__/parse-admin-trial-entry-write-input.test.ts
+++ b/packages/server/admin/trials/manage/internal/__tests__/parse-admin-trial-entry-write-input.test.ts
@@ -63,6 +63,23 @@ function createInput(): AdminTrialEntryWriteData {
 }
 
 describe("parseAdminTrialEntryWriteInput", () => {
+  it.each([
+    null,
+    {},
+    { entry: {}, eras: null, lisatiedotRows: [] },
+    { entry: {}, eras: [], lisatiedotRows: [{}] },
+  ])("rejects malformed write container %#", (input) => {
+    expect(
+      parseAdminTrialEntryWriteInput(
+        input as unknown as AdminTrialEntryWriteData,
+        { mode: "create" },
+      ),
+    ).toEqual({
+      ok: false,
+      issue: { area: "entry", reason: "invalid_write_shape" },
+    });
+  });
+
   it("normalizes the shared write shape", () => {
     const result = parseAdminTrialEntryWriteInput(createInput(), {
       mode: "create",
@@ -103,6 +120,26 @@ describe("parseAdminTrialEntryWriteInput", () => {
     });
   });
 
+  it("rejects integers outside the PostgreSQL Int range", () => {
+    const input = createInput();
+    input.entry.koiriaLuokassa = 2_147_483_648;
+
+    expect(parseAdminTrialEntryWriteInput(input, { mode: "create" })).toEqual({
+      ok: false,
+      issue: { area: "entry", reason: "invalid_entry_integer" },
+    });
+  });
+
+  it("rejects numbers outside the Decimal(6,2) range", () => {
+    const input = createInput();
+    input.entry.points = 10_000;
+
+    expect(parseAdminTrialEntryWriteInput(input, { mode: "create" })).toEqual({
+      ok: false,
+      issue: { area: "entry", reason: "invalid_entry_number" },
+    });
+  });
+
   it.each([
     { koodi: " 11 ", osa: " " },
     { koodi: "11", osa: "" },
@@ -167,4 +204,18 @@ describe("parseAdminTrialEntryWriteInput", () => {
       },
     });
   });
+
+  it("normalizes out-of-range update ordering to null", () => {
+    const input = createInput();
+    input.lisatiedotRows[0].jarjestys = 2_147_483_648;
+
+    expect(
+      parseAdminTrialEntryWriteInput(input, { mode: "update" }),
+    ).toMatchObject({
+      ok: true,
+      data: {
+        lisatiedotByEra: [{ items: [{ jarjestys: null }] }],
+      },
+    });
+  });
 });
diff --git a/packages/server/admin/trials/manage/internal/parse-admin-trial-entry-write-input.ts b/packages/server/admin/trials/manage/internal/parse-admin-trial-entry-write-input.ts
index c5ed8f64..ffedf754 100644
--- a/packages/server/admin/trials/manage/internal/parse-admin-trial-entry-write-input.ts
+++ b/packages/server/admin/trials/manage/internal/parse-admin-trial-entry-write-input.ts
@@ -2,6 +2,7 @@ import type { AdminTrialEntryWriteData } from "@beagle/contracts";
 import type { AdminTrialEntryWriteDataDb } from "@beagle/db";
 
 export type AdminTrialEntryWriteValidationReason =
+  | "invalid_write_shape"
   | "invalid_koetyyppi"
   | "invalid_huomautus"
   | "invalid_entry_integer"
@@ -26,6 +27,31 @@ export type AdminTrialEntryWriteValidationIssue = {
 
 const VALID_KOETYYPIT = new Set(["NORMAL", "KOKOKAUDENKOE", "PITKAKOE"]);
 const VALID_HUOMAUTUKSET = new Set(["LUOPUI", "SULJETTU", "KESKEYTETTY"]);
+const MAX_DB_INT = 2_147_483_647;
+const MIN_DB_INT = -2_147_483_648;
+const MAX_DECIMAL_6_2 = 9_999.99;
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+
+function hasWriteContainerShape(input: unknown): boolean {
+  if (!isRecord(input)) return false;
+  if (!isRecord(input.entry)) return false;
+  if (!Array.isArray(input.eras) || !input.eras.every(isRecord)) return false;
+  if (
+    !Array.isArray(input.lisatiedotRows) ||
+    !input.lisatiedotRows.every(
+      (row) =>
+        isRecord(row) &&
+        Array.isArray(row.eraValues) &&
+        row.eraValues.every(isRecord),
+    )
+  ) {
+    return false;
+  }
+  return true;
+}
 
 function normalizeNullableText(
   value: string | null | undefined,
@@ -37,23 +63,38 @@ function normalizeNullableText(
 function normalizeNullableInteger(
   value: number | null | undefined,
 ): number | null {
-  return value == null || !Number.isInteger(value) ? null : value;
+  return isDbInteger(value) ? value : null;
 }
 
 function normalizeNullableNumber(
   value: number | null | undefined,
 ): number | null {
-  return value == null || !Number.isFinite(value) ? null : value;
+  return isDbDecimal(value) ? value : null;
 }
 
-function isNullableInteger(value: unknown): boolean {
+function isDbInteger(value: unknown): value is number {
   return (
-    value == null || (typeof value === "number" && Number.isSafeInteger(value))
+    typeof value === "number" &&
+    Number.isSafeInteger(value) &&
+    value >= MIN_DB_INT &&
+    value <= MAX_DB_INT
   );
 }
 
+function isDbDecimal(value: unknown): value is number {
+  return (
+    typeof value === "number" &&
+    Number.isFinite(value) &&
+    Math.abs(value) <= MAX_DECIMAL_6_2
+  );
+}
+
+function isNullableInteger(value: unknown): boolean {
+  return value == null || isDbInteger(value);
+}
+
 function isNullableNumber(value: unknown): boolean {
-  return value == null || (typeof value === "number" && Number.isFinite(value));
+  return value == null || isDbDecimal(value);
 }
 
 function failure(
@@ -71,6 +112,9 @@ export function parseAdminTrialEntryWriteInput(
 ):
   | { ok: true; data: AdminTrialEntryWriteDataDb }
   | { ok: false; issue: AdminTrialEntryWriteValidationIssue } {
+  if (!hasWriteContainerShape(input)) {
+    return failure("entry", "invalid_write_shape");
+  }
   if (!VALID_KOETYYPIT.has(input.entry.koetyyppi)) {
     return failure("entry", "invalid_koetyyppi");
   }
diff --git a/packages/server/admin/trials/manage/update-trial-entry.ts b/packages/server/admin/trials/manage/update-trial-entry.ts
index 6fc7a48a..aae24921 100644
--- a/packages/server/admin/trials/manage/update-trial-entry.ts
+++ b/packages/server/admin/trials/manage/update-trial-entry.ts
@@ -21,6 +21,11 @@ function validationFailure(
   issue: AdminTrialEntryWriteValidationIssue,
 ): ServiceResult<UpdateAdminTrialEntryResponse> {
   switch (issue.reason) {
+    case "invalid_write_shape":
+      return badRequest(
+        "Trial result fields are invalid.",
+        "INVALID_TRIAL_ENTRY",
+      );
     case "missing_eras":
       return badRequest("At least one era is required.", "INVALID_ERAS");
     case "invalid_era_number":
@@ -103,8 +108,10 @@ export async function updateAdminTrialEntry(
   context?: ServiceLogContext,
 ): Promise<ServiceResult<UpdateAdminTrialEntryResponse>> {
   const startedAt = Date.now();
-  const trialEventId = input.trialEventId.trim();
-  const trialEntryId = input.trialEntryId.trim();
+  const trialEventId =
+    typeof input?.trialEventId === "string" ? input.trialEventId.trim() : "";
+  const trialEntryId =
+    typeof input?.trialEntryId === "string" ? input.trialEntryId.trim() : "";
   const log = withLogContext({
     layer: "service",
     useCase: "admin-trials.updateAdminTrialEntry",
diff --git a/packages/server/dogs/core/__tests__/registration.test.ts b/packages/server/dogs/core/__tests__/registration.test.ts
new file mode 100644
index 00000000..42d84bd2
--- /dev/null
+++ b/packages/server/dogs/core/__tests__/registration.test.ts
@@ -0,0 +1,36 @@
+import { describe, expect, it } from "vitest";
+import {
+  isValidRegistrationNo,
+  normalizeRegistrationNo,
+} from "@server/dogs/core/registration";
+
+describe("registration-number helpers", () => {
+  it.each([
+    "FI12345/21",
+    "FI12345A/21",
+    "EST.REG-12345",
+    "ABC/DEF/1234/20",
+    "ÅÄÖ123/24",
+    "FI١٢٣/٢٤",
+  ])("accepts supported international registration format %s", (value) => {
+    expect(isValidRegistrationNo(value)).toBe(true);
+  });
+
+  it.each(["", "BAD VALUE", "FI_123/24", "FI:123/24", "FI@123/24"])(
+    "rejects unsupported registration format %s",
+    (value) => {
+      expect(isValidRegistrationNo(value)).toBe(false);
+    },
+  );
+
+  it("trims and uppercases registration numbers", () => {
+    expect(normalizeRegistrationNo("  fi.ab-123/24  ")).toBe("FI.AB-123/24");
+  });
+
+  it.each([null, undefined, 123, "", "   "])(
+    "normalizes invalid or empty value %s to null",
+    (value) => {
+      expect(normalizeRegistrationNo(value)).toBeNull();
+    },
+  );
+});
diff --git a/packages/server/dogs/core/index.ts b/packages/server/dogs/core/index.ts
index 2125fcf8..9d6d8220 100644
--- a/packages/server/dogs/core/index.ts
+++ b/packages/server/dogs/core/index.ts
@@ -1,4 +1,5 @@
 export { parseDogId } from "./dog-id";
+export { isValidRegistrationNo, normalizeRegistrationNo } from "./registration";
 export {
   calculateInbreedingCoefficientBreakdownForParentsPct,
   calculateInbreedingCoefficientForParentsPct,
diff --git a/packages/server/dogs/core/registration.ts b/packages/server/dogs/core/registration.ts
new file mode 100644
index 00000000..495a7492
--- /dev/null
+++ b/packages/server/dogs/core/registration.ts
@@ -0,0 +1,12 @@
+// Normalizes and validates canonical dog registration identifiers shared across domains.
+const REGISTRATION_NO_PATTERN = /^[\p{L}\p{N}/.-]+$/u;
+
+export function normalizeRegistrationNo(value: unknown): string | null {
+  if (typeof value !== "string") return null;
+  const normalized = value.trim().toUpperCase();
+  return normalized.length > 0 ? normalized : null;
+}
+
+export function isValidRegistrationNo(value: string): boolean {
+  return REGISTRATION_NO_PATTERN.test(value);
+}
diff --git a/packages/server/trials/core/__tests__/trial-entry-identity.test.ts b/packages/server/trials/core/__tests__/trial-entry-identity.test.ts
deleted file mode 100644
index 06336517..00000000
--- a/packages/server/trials/core/__tests__/trial-entry-identity.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-  isValidTrialRegistrationNo,
-  normalizeTrialRegistrationNo,
-} from "@server/trials/core/trial-entry-identity";
-
-describe("trial entry registration-number helpers", () => {
-  it.each([
-    "FI12345/21",
-    "FI12345A/21",
-    "EST.REG-12345",
-    "ABC/DEF/1234/20",
-    "ÅÄÖ123/24",
-    "FI١٢٣/٢٤",
-  ])("accepts supported international registration format %s", (value) => {
-    expect(isValidTrialRegistrationNo(value)).toBe(true);
-  });
-
-  it.each(["", "BAD VALUE", "FI_123/24", "FI:123/24", "FI@123/24"])(
-    "rejects unsupported registration format %s",
-    (value) => {
-      expect(isValidTrialRegistrationNo(value)).toBe(false);
-    },
-  );
-
-  it("trims and uppercases registration numbers", () => {
-    expect(normalizeTrialRegistrationNo("  fi.ab-123/24  ")).toBe(
-      "FI.AB-123/24",
-    );
-  });
-
-  it.each([null, "", "   "])("normalizes empty value %s to null", (value) => {
-    expect(normalizeTrialRegistrationNo(value)).toBeNull();
-  });
-});
diff --git a/packages/server/trials/core/index.ts b/packages/server/trials/core/index.ts
index 3da7f9a2..40b26147 100644
--- a/packages/server/trials/core/index.ts
+++ b/packages/server/trials/core/index.ts
@@ -1,7 +1,3 @@
 export { formatTrialAward } from "./format-trial-award";
 export { getTrialDateOnlyStartUtc, formatTrialDateOnly } from "./date-only";
 export { resolveTrialRuleWindowId } from "./trial-rule-window";
-export {
-  isValidTrialRegistrationNo,
-  normalizeTrialRegistrationNo,
-} from "./trial-entry-identity";
diff --git a/packages/server/trials/integrations/koiratietokanta/internal/map-ajok-payload.ts b/packages/server/trials/integrations/koiratietokanta/internal/map-ajok-payload.ts
index 2afb0de0..428d9611 100644
--- a/packages/server/trials/integrations/koiratietokanta/internal/map-ajok-payload.ts
+++ b/packages/server/trials/integrations/koiratietokanta/internal/map-ajok-payload.ts
@@ -12,9 +12,9 @@ import {
   TrialEntryKoetyyppi,
 } from "@beagle/db";
 import {
-  isValidTrialRegistrationNo,
-  normalizeTrialRegistrationNo,
-} from "@server/trials/core";
+  isValidRegistrationNo,
+  normalizeRegistrationNo,
+} from "@server/dogs/core";
 import { mapKoiratietokantaAjokEraWrites } from "./map-ajok-era-writes";
 import {
   isRecord,
@@ -85,10 +85,10 @@ export function mapKoiratietokantaAjokPayload(
     });
   }
 
-  const registrationNo = normalizeTrialRegistrationNo(
+  const registrationNo = normalizeRegistrationNo(
     normalizeText(payload.REKISTERINUMERO),
   );
-  if (!registrationNo || !isValidTrialRegistrationNo(registrationNo)) {
+  if (!registrationNo || !isValidRegistrationNo(registrationNo)) {
     issues.push({
       field: "REKISTERINUMERO",
       code: registrationNo ? "INVALID" : "REQUIRED",

From eaef9121989d775e2eb731aff82a2e42b76a8665 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Wed, 22 Jul 2026 20:54:31 +0300
Subject: [PATCH 10/24] refactor(trials): remove obsolete registration helper

---
 .../server/trials/core/trial-entry-identity.ts     | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 packages/server/trials/core/trial-entry-identity.ts

diff --git a/packages/server/trials/core/trial-entry-identity.ts b/packages/server/trials/core/trial-entry-identity.ts
deleted file mode 100644
index 95400699..00000000
--- a/packages/server/trials/core/trial-entry-identity.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Registration identifiers vary by country, so validate a safe character set
-// instead of enforcing a country-specific shape.
-const REGISTRATION_NO_PATTERN = /^[\p{L}\p{N}/.-]+$/u;
-
-export function normalizeTrialRegistrationNo(
-  value: string | null,
-): string | null {
-  const normalized = value?.trim().toUpperCase() ?? "";
-  return normalized.length > 0 ? normalized : null;
-}
-
-export function isValidTrialRegistrationNo(value: string): boolean {
-  return REGISTRATION_NO_PATTERN.test(value);
-}

From 598871d81c8ec7f0475205293ea4ae120d74cc90 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Wed, 22 Jul 2026 22:47:27 +0300
Subject: [PATCH 11/24] feat(admin-trials): add event-scoped manual result
 entry workflow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Add the full-page result creation route with reusable entry, era, and
  lisätieto sections.

  Support saving another result or returning to the event workspace,
  prefill event judge details, and protect unsaved form changes during
  navigation and page unload.

  Route newly created events directly to their first result form and
  invalidate affected admin, trial, dog-profile, and statistics queries
  after successful creation.

  Return safe structured validation details, identify rejected lisätieto
  rows, persist integer row ordering, and omit unused rows from create
  requests.

  Add Finnish and Swedish messages, workflow tests, feature
  documentation,
  and the follow-up plan for rule-window-aware result fields.

  ref bej-103
---
 CHANGELOG.md                                  |   4 +
 .../results/new/__tests__/page.test.tsx       |  24 ++
 .../[trialEventId]/results/new/page.tsx       |  10 +
 .../create-admin-trial-entry.test.ts          |  26 ++
 .../trials/manage/create-admin-trial-entry.ts |  37 ++
 ...in-trial-event-create-page-client.test.tsx |   2 +-
 ...trial-event-workspace-page-client.test.tsx |   3 +
 .../admin-trial-entry-create-page-client.tsx  | 316 ++++++++++++++++++
 ...dmin-trial-event-workspace-page-client.tsx |   6 +-
 .../admin-trial-selected-event-panel.tsx      |   9 +
 apps/web/components/admin/trials/index.ts     |   1 +
 .../manage/use-unsaved-trial-entry-guard.ts   |  59 ++++
 .../__tests__/entry-create-model.test.ts      |  95 ++++++
 .../__tests__/entry-edit-dialog-model.test.ts |   1 +
 .../trials/__tests__/trial-route.test.ts      |   7 +
 .../lib/admin/trials/entry-create-model.ts    | 183 ++++++++++
 .../web/lib/admin/trials/entry-edit-config.ts |  16 +-
 .../admin/trials/entry-edit-dialog-model.ts   |   3 +-
 apps/web/lib/admin/trials/index.ts            |   5 +
 .../submit-admin-trial-event-creation.ts      |   4 +-
 apps/web/lib/admin/trials/trial-route.ts      |   4 +
 .../lib/i18n/messages/admin/trials/manage.ts  |  95 ++++++
 apps/web/queries/admin/mutation-error.ts      |   6 +-
 ...-create-admin-trial-entry-mutation.test.ts |  61 ++++
 apps/web/queries/admin/trials/manage/index.ts |   1 +
 .../use-create-admin-trial-entry-mutation.ts  |  62 ++++
 docs/features/admin-trial-management.md       |  16 +-
 docs/planning/trials/README.md                |   6 +
 docs/planning/trials/result-creation-r2.md    |   2 +
 docs/planning/trials/result-creation.md       |   3 +
 .../trials/result-fields-by-rule-window.md    | 108 ++++++
 .../trials/manage/create-admin-trial-entry.ts |  24 ++
 .../contracts/admin/trials/manage/index.ts    |   1 +
 packages/contracts/index.ts                   |   1 +
 .../__tests__/create-trial-entry.test.ts      |  31 ++
 .../admin/trials/manage/create-trial-entry.ts |   1 +
 ...arse-admin-trial-entry-write-input.test.ts |   4 +
 .../parse-admin-trial-entry-write-input.ts    |  35 +-
 38 files changed, 1250 insertions(+), 22 deletions(-)
 create mode 100644 apps/web/app/(admin)/admin/trials/[trialEventId]/results/new/__tests__/page.test.tsx
 create mode 100644 apps/web/app/(admin)/admin/trials/[trialEventId]/results/new/page.tsx
 create mode 100644 apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
 create mode 100644 apps/web/hooks/admin/trials/manage/use-unsaved-trial-entry-guard.ts
 create mode 100644 apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts
 create mode 100644 apps/web/lib/admin/trials/entry-create-model.ts
 create mode 100644 apps/web/queries/admin/trials/manage/__tests__/use-create-admin-trial-entry-mutation.test.ts
 create mode 100644 apps/web/queries/admin/trials/manage/use-create-admin-trial-entry-mutation.ts
 create mode 100644 docs/planning/trials/result-fields-by-rule-window.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3daad43..f0d6ffb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,13 +17,17 @@ This project uses a user-facing changelog format.
 - Ylläpitäjä voi avata ajokoetapahtuman omalle sivulleen tarkastelua ja nykyisiä muokkaustoimintoja varten.
 - Ylläpitäjä voi luoda ajokoetapahtuman perustietoineen ja avata sen omalle sivulleen ennen koetulosten lisäämistä.
 - Ylläpitäjä voi poistaa tyhjän ajokoetapahtuman sen omalta sivulta.
+- Ylläpitäjä voi lisätä ajokoetapahtumaan koirakohtaisia tuloksia yksi kerrallaan ja jatkaa seuraavaan tulokseen tai palata tapahtuman sivulle.
 
 ### Changed
 
 - Viimeisen koetuloksen poistaminen säilyttää ajokoetapahtuman tyhjänä, kunnes ylläpitäjä poistaa tapahtuman erikseen.
+- Uuden ajokoetapahtuman luomisen jälkeen siirrytään suoraan lisäämään tapahtuman ensimmäistä koetulosta.
 
 ### Fixed
 
+- Ajokoetuloksen lisätietorivit tallennetaan kelvollisessa kokonaislukujärjestyksessä, ja hylätty lisätietorivi näytetään aiempaa tarkemmin.
+
 ### Removed
 
 ## [0.19.0] - 2026-07-20
diff --git a/apps/web/app/(admin)/admin/trials/[trialEventId]/results/new/__tests__/page.test.tsx b/apps/web/app/(admin)/admin/trials/[trialEventId]/results/new/__tests__/page.test.tsx
new file mode 100644
index 00000000..24af523f
--- /dev/null
+++ b/apps/web/app/(admin)/admin/trials/[trialEventId]/results/new/__tests__/page.test.tsx
@@ -0,0 +1,24 @@
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it, vi } from "vitest";
+import Page from "../page";
+
+vi.mock(
+  "@/components/admin/trials/admin-trial-entry-create-page-client",
+  () => ({
+    AdminTrialEntryCreatePageClient: ({
+      trialEventId,
+    }: {
+      trialEventId: string;
+    }) => React.createElement("div", null, trialEventId),
+  }),
+);
+
+describe("manual trial result create page", () => {
+  it("passes the route event id to the client workflow", async () => {
+    const html = renderToStaticMarkup(
+      await Page({ params: Promise.resolve({ trialEventId: "event-1" }) }),
+    );
+    expect(html).toContain("event-1");
+  });
+});
diff --git a/apps/web/app/(admin)/admin/trials/[trialEventId]/results/new/page.tsx b/apps/web/app/(admin)/admin/trials/[trialEventId]/results/new/page.tsx
new file mode 100644
index 00000000..6a37c2c6
--- /dev/null
+++ b/apps/web/app/(admin)/admin/trials/[trialEventId]/results/new/page.tsx
@@ -0,0 +1,10 @@
+import { AdminTrialEntryCreatePageClient } from "@/components/admin/trials/admin-trial-entry-create-page-client";
+
+export default async function AdminTrialEntryCreatePage({
+  params,
+}: {
+  params: Promise<{ trialEventId: string }>;
+}) {
+  const { trialEventId } = await params;
+  return <AdminTrialEntryCreatePageClient trialEventId={trialEventId} />;
+}
diff --git a/apps/web/app/actions/admin/trials/manage/__tests__/create-admin-trial-entry.test.ts b/apps/web/app/actions/admin/trials/manage/__tests__/create-admin-trial-entry.test.ts
index 10c2d43e..a14b81f5 100644
--- a/apps/web/app/actions/admin/trials/manage/__tests__/create-admin-trial-entry.test.ts
+++ b/apps/web/app/actions/admin/trials/manage/__tests__/create-admin-trial-entry.test.ts
@@ -53,4 +53,30 @@ describe("createAdminTrialEntryAction", () => {
       message: "Conflict",
     });
   });
+
+  it("passes through safe validation details", async () => {
+    guard.mockResolvedValue({ ok: true });
+    user.mockResolvedValue({ id: "u1", email: "a@example.com", role: "ADMIN" });
+    create.mockResolvedValue({
+      status: 400,
+      body: {
+        ok: false,
+        code: "INVALID_TRIAL_ADDITIONAL_INFO",
+        error: "Invalid",
+        details: {
+          area: "additional_info",
+          reason: "invalid_lisatieto_order",
+          koodi: "25",
+          osa: "b",
+        },
+      },
+    });
+    await expect(createAdminTrialEntryAction(input)).resolves.toMatchObject({
+      validationIssue: {
+        reason: "invalid_lisatieto_order",
+        koodi: "25",
+        osa: "b",
+      },
+    });
+  });
 });
diff --git a/apps/web/app/actions/admin/trials/manage/create-admin-trial-entry.ts b/apps/web/app/actions/admin/trials/manage/create-admin-trial-entry.ts
index 2c46291a..34ac0bed 100644
--- a/apps/web/app/actions/admin/trials/manage/create-admin-trial-entry.ts
+++ b/apps/web/app/actions/admin/trials/manage/create-admin-trial-entry.ts
@@ -1,6 +1,7 @@
 "use server";
 
 import type {
+  AdminTrialEntryValidationIssue,
   CreateAdminTrialEntryRequest,
   CreateAdminTrialEntryResponse,
 } from "@beagle/contracts";
@@ -13,8 +14,42 @@ export type CreateAdminTrialEntryActionResult = {
   hasError: boolean;
   errorCode?: string;
   message?: string;
+  validationIssue?: AdminTrialEntryValidationIssue;
 };
 
+const VALIDATION_REASONS = new Set<AdminTrialEntryValidationIssue["reason"]>([
+  "invalid_write_shape",
+  "invalid_koetyyppi",
+  "invalid_huomautus",
+  "invalid_entry_integer",
+  "invalid_entry_number",
+  "missing_eras",
+  "invalid_era_number",
+  "duplicate_eras",
+  "non_continuous_eras",
+  "invalid_era_integer",
+  "invalid_era_number_field",
+  "invalid_lisatieto_code",
+  "duplicate_lisatieto_key",
+  "invalid_lisatieto_era",
+  "duplicate_lisatieto_era_value",
+  "invalid_lisatieto_order",
+]);
+
+function toValidationIssue(
+  value: unknown,
+): AdminTrialEntryValidationIssue | undefined {
+  if (!value || typeof value !== "object") return undefined;
+  const candidate = value as Partial<AdminTrialEntryValidationIssue>;
+  if (
+    !["entry", "eras", "additional_info"].includes(candidate.area ?? "") ||
+    !candidate.reason ||
+    !VALIDATION_REASONS.has(candidate.reason)
+  )
+    return undefined;
+  return candidate as AdminTrialEntryValidationIssue;
+}
+
 export async function createAdminTrialEntryAction(
   input: CreateAdminTrialEntryRequest,
 ): Promise<CreateAdminTrialEntryActionResult> {
@@ -42,11 +77,13 @@ export async function createAdminTrialEntryAction(
     { actorUserId: user.id },
   );
   if (!result.body.ok) {
+    const validationIssue = toValidationIssue(result.body.details);
     return {
       data: null,
       hasError: true,
       errorCode: result.body.code,
       message: result.body.error,
+      ...(validationIssue ? { validationIssue } : {}),
     };
   }
   return { data: result.body.data, hasError: false };
diff --git a/apps/web/components/admin/trials/__tests__/admin-trial-event-create-page-client.test.tsx b/apps/web/components/admin/trials/__tests__/admin-trial-event-create-page-client.test.tsx
index 9b492494..9cd7a967 100644
--- a/apps/web/components/admin/trials/__tests__/admin-trial-event-create-page-client.test.tsx
+++ b/apps/web/components/admin/trials/__tests__/admin-trial-event-create-page-client.test.tsx
@@ -143,7 +143,7 @@ describe("AdminTrialEventCreatePageClient", () => {
       sklKoeId: 456,
     });
     expect(replaceMock).toHaveBeenCalledWith(
-      "/admin/trials/event%2Fwith%20spaces",
+      "/admin/trials/event%2Fwith%20spaces/results/new",
     );
   });
 
diff --git a/apps/web/components/admin/trials/__tests__/admin-trial-event-workspace-page-client.test.tsx b/apps/web/components/admin/trials/__tests__/admin-trial-event-workspace-page-client.test.tsx
index 8fd60994..0bf569af 100644
--- a/apps/web/components/admin/trials/__tests__/admin-trial-event-workspace-page-client.test.tsx
+++ b/apps/web/components/admin/trials/__tests__/admin-trial-event-workspace-page-client.test.tsx
@@ -99,6 +99,9 @@ describe("AdminTrialEventWorkspacePageClient", () => {
     });
     expect(panelPropsRef.current?.workspaceHref).toBeUndefined();
     expect(panelPropsRef.current?.allowEmptyEventDeletion).toBe(true);
+    expect(panelPropsRef.current?.createEntryHref).toBe(
+      "/admin/trials/event-1/results/new",
+    );
   });
 
   it("passes loading state to the reused panel", () => {
diff --git a/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx b/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
new file mode 100644
index 00000000..8cf7f2ad
--- /dev/null
+++ b/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
@@ -0,0 +1,316 @@
+"use client";
+
+import React from "react";
+import type { AdminTrialEntryValidationIssue } from "@beagle/contracts";
+import { useRouter } from "next/navigation";
+import { AdminMutationError } from "@/queries/admin/mutation-error";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
+import { ConfirmModal } from "@/components/ui/confirm-modal";
+import { Input } from "@/components/ui/input";
+import { toast } from "@/components/ui/sonner";
+import { useI18n } from "@/hooks/i18n";
+import { useUnsavedTrialEntryGuard } from "@/hooks/admin/trials/manage/use-unsaved-trial-entry-guard";
+import { formatDateForFinland } from "@/lib/admin/core/date";
+import {
+  areAdminTrialEntryCreateDraftsEqual,
+  createAdminTrialEntryCreateDraft,
+  createEmptyEraDraft,
+  getAdminTrialEventHref,
+  getAdminTrialsHref,
+  getNextEraNumber,
+  toCreateAdminTrialEntryRequest,
+} from "@/lib/admin/trials";
+import {
+  useAdminTrialEventQuery,
+  useCreateAdminTrialEntryMutation,
+} from "@/queries/admin/trials";
+import { EntryMetaSection } from "./internal/entry-meta-section";
+import { EraSection } from "./internal/era-section";
+import { LisatiedotMatrix } from "./internal/lisatiedot-matrix";
+
+type SaveIntent = "another" | "finish";
+
+export function AdminTrialEntryCreatePageClient({
+  trialEventId,
+}: {
+  trialEventId: string;
+}) {
+  const { t } = useI18n();
+  const router = useRouter();
+  const eventQuery = useAdminTrialEventQuery({ trialEventId });
+  const event = eventQuery.data?.event;
+
+  if (eventQuery.isLoading)
+    return <p>{t("admin.trials.manage.resultCreate.loading")}</p>;
+  if (eventQuery.isError || !event) {
+    const missing = eventQuery.error?.errorCode === "TRIAL_EVENT_NOT_FOUND";
+    return (
+      <StateCard
+        message={t(
+          missing
+            ? "admin.trials.manage.resultCreate.eventNotFound"
+            : "admin.trials.manage.resultCreate.loadError",
+        )}
+        action={
+          missing
+            ? () => router.replace(getAdminTrialsHref())
+            : () => void eventQuery.refetch()
+        }
+        actionLabel={t(
+          missing
+            ? "admin.trials.manage.resultCreate.backToList"
+            : "admin.trials.manage.workspace.retry",
+        )}
+      />
+    );
+  }
+  if (event.sklKoeId === null) {
+    return (
+      <StateCard
+        message={t("admin.trials.manage.resultCreate.missingSklId")}
+        action={() => router.replace(getAdminTrialEventHref(trialEventId))}
+        actionLabel={t("admin.trials.manage.resultCreate.backToWorkspace")}
+      />
+    );
+  }
+  return (
+    <ResultCreateForm
+      key={`${event.trialEventId}:${event.ylituomari ?? ""}:${event.ylituomariNumero ?? ""}`}
+      event={event}
+    />
+  );
+}
+
+function StateCard({
+  message,
+  action,
+  actionLabel,
+}: {
+  message: string;
+  action: () => void;
+  actionLabel: string;
+}) {
+  return (
+    <Card>
+      <CardContent className="space-y-4 p-5">
+        <p className="text-sm text-muted-foreground">{message}</p>
+        <Button variant="outline" onClick={action}>
+          {actionLabel}
+        </Button>
+      </CardContent>
+    </Card>
+  );
+}
+
+function ResultCreateForm({
+  event,
+}: {
+  event: NonNullable<
+    ReturnType<typeof useAdminTrialEventQuery>["data"]
+  >["event"];
+}) {
+  const { t } = useI18n();
+  const router = useRouter();
+  const mutation = useCreateAdminTrialEntryMutation();
+  const initial = React.useMemo(
+    () => createAdminTrialEntryCreateDraft(event),
+    [event],
+  );
+  const [draft, setDraft] = React.useState(initial);
+  const [errorText, setErrorText] = React.useState<string | null>(null);
+  const submittingRef = React.useRef(false);
+  const dirty = !areAdminTrialEntryCreateDraftsEqual(initial, draft);
+  const guard = useUnsavedTrialEntryGuard(dirty);
+  const workspaceHref = getAdminTrialEventHref(event.trialEventId);
+
+  function addEra() {
+    const era = getNextEraNumber(draft.eras);
+    setDraft((current) => ({
+      ...current,
+      eras: [...current.eras, createEmptyEraDraft(era)],
+      lisatiedotRows: current.lisatiedotRows.map((row) => ({
+        ...row,
+        eraValues: { ...row.eraValues, [era]: "" },
+      })),
+    }));
+  }
+  function removeEra(era: number) {
+    if (era === 1) return;
+    setDraft((current) => ({
+      ...current,
+      eras: current.eras.filter((item) => item.era !== era),
+      lisatiedotRows: current.lisatiedotRows.map((row) => {
+        const values = { ...row.eraValues };
+        delete values[era];
+        return { ...row, eraValues: values };
+      }),
+    }));
+  }
+  async function submit(intent: SaveIntent) {
+    if (submittingRef.current || mutation.isPending) return;
+    setErrorText(null);
+    const parsed = toCreateAdminTrialEntryRequest(event.trialEventId, draft);
+    if (!parsed.ok) {
+      setErrorText(
+        t(
+          `admin.trials.manage.resultCreate.validation.${parsed.section}` as never,
+        ),
+      );
+      return;
+    }
+    submittingRef.current = true;
+    try {
+      await mutation.mutateAsync(parsed.request);
+      toast.success(t("admin.trials.manage.resultCreate.success"));
+      if (intent === "another")
+        setDraft(createAdminTrialEntryCreateDraft(event));
+      else router.replace(workspaceHref);
+    } catch (error) {
+      const code =
+        error instanceof AdminMutationError ? error.errorCode : undefined;
+      if (code === "UNAUTHENTICATED" || code === "FORBIDDEN") {
+        router.refresh();
+        return;
+      }
+      const map: Record<string, string> = {
+        INVALID_REGISTRATION_NUMBER: "registration",
+        TRIAL_ENTRY_REGISTRATION_CONFLICT: "conflict",
+        INVALID_TRIAL_ENTRY: "entry",
+        INVALID_TRIAL_ERAS: "eras",
+        INVALID_TRIAL_ADDITIONAL_INFO: "additionalInfo",
+        TRIAL_EVENT_NOT_FOUND: "eventNotFound",
+        TRIAL_EVENT_MISSING_SKL_ID: "missingSklId",
+      };
+      const issue =
+        error instanceof AdminMutationError
+          ? (error.details as AdminTrialEntryValidationIssue | undefined)
+          : undefined;
+      if (issue?.area === "additional_info" && issue.koodi) {
+        const row = `${issue.koodi}${issue.osa ? issue.osa : ""}`;
+        const issueKey =
+          issue.reason === "invalid_lisatieto_order"
+            ? "admin.trials.manage.resultCreate.error.additionalInfoOrder"
+            : "admin.trials.manage.resultCreate.error.additionalInfoRow";
+        setErrorText(`${t(issueKey)}: ${row}.`);
+      } else {
+        setErrorText(
+          t(
+            `admin.trials.manage.resultCreate.error.${map[code ?? ""] ?? "generic"}` as never,
+          ),
+        );
+      }
+    } finally {
+      submittingRef.current = false;
+    }
+  }
+
+  return (
+    <div className="space-y-4">
+      <div>
+        <h1 className="text-2xl font-semibold">
+          {t("admin.trials.manage.resultCreate.title")}
+        </h1>
+        <p className="text-sm text-muted-foreground">
+          {formatDateForFinland(event.eventDate)} • {event.eventPlace} • SKL{" "}
+          {event.sklKoeId}
+        </p>
+      </div>
+      <Card>
+        <CardContent className="space-y-5 p-5">
+          {errorText ? (
+            <p className="text-sm text-destructive" role="alert">
+              {errorText}
+            </p>
+          ) : null}
+          <label className="block space-y-1 text-sm">
+            <span>{t("admin.trials.manage.resultCreate.registration")}</span>
+            <Input
+              value={draft.registrationNo}
+              disabled={mutation.isPending}
+              onChange={(e) =>
+                setDraft((current) => ({
+                  ...current,
+                  registrationNo: e.target.value,
+                }))
+              }
+            />
+          </label>
+          <EntryMetaSection
+            entryDraft={draft.entry}
+            isPending={mutation.isPending}
+            onChange={(update) =>
+              setDraft((current) => ({
+                ...current,
+                entry: update(current.entry),
+              }))
+            }
+          />
+          <EraSection
+            eras={draft.eras}
+            isPending={mutation.isPending}
+            onAddEra={addEra}
+            onRemoveEra={removeEra}
+            onChangeEraField={(era, field, value) =>
+              setDraft((current) => ({
+                ...current,
+                eras: current.eras.map((item) =>
+                  item.era === era ? { ...item, [field]: value } : item,
+                ),
+              }))
+            }
+          />
+          <LisatiedotMatrix
+            eras={draft.eras}
+            rows={draft.lisatiedotRows}
+            isPending={mutation.isPending}
+            onChangeCell={(koodi, osa, era, value) =>
+              setDraft((current) => ({
+                ...current,
+                lisatiedotRows: current.lisatiedotRows.map((row) =>
+                  row.koodi === koodi && row.osa === osa
+                    ? { ...row, eraValues: { ...row.eraValues, [era]: value } }
+                    : row,
+                ),
+              }))
+            }
+          />
+          <div className="flex flex-wrap gap-2">
+            <Button
+              disabled={mutation.isPending}
+              onClick={() => void submit("another")}
+            >
+              {t("admin.trials.manage.resultCreate.saveAnother")}
+            </Button>
+            <Button
+              variant="outline"
+              disabled={mutation.isPending}
+              onClick={() => void submit("finish")}
+            >
+              {t("admin.trials.manage.resultCreate.saveFinish")}
+            </Button>
+            <Button
+              variant="ghost"
+              disabled={mutation.isPending}
+              onClick={() =>
+                guard.requestLeave(() => router.replace(workspaceHref))
+              }
+            >
+              {t("admin.trials.manage.resultCreate.cancel")}
+            </Button>
+          </div>
+        </CardContent>
+      </Card>
+      <ConfirmModal
+        open={guard.isConfirmingLeave}
+        title={t("admin.trials.manage.resultCreate.unsaved.title")}
+        description={t("admin.trials.manage.resultCreate.unsaved.body")}
+        confirmLabel={t("admin.trials.manage.resultCreate.unsaved.confirm")}
+        cancelLabel={t("admin.trials.manage.resultCreate.unsaved.cancel")}
+        confirmVariant="default"
+        onConfirm={guard.confirmLeave}
+        onCancel={guard.cancelLeave}
+      />
+    </div>
+  );
+}
diff --git a/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx b/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx
index e049c019..ad60d85c 100644
--- a/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx
+++ b/apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx
@@ -4,7 +4,10 @@ import { useRouter } from "next/navigation";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
 import { useI18n } from "@/hooks/i18n";
-import { getAdminTrialsHref } from "@/lib/admin/trials";
+import {
+  getAdminTrialEntryCreateHref,
+  getAdminTrialsHref,
+} from "@/lib/admin/trials";
 import { useAdminTrialEventQuery } from "@/queries/admin/trials";
 import { AdminTrialSelectedEventPanel } from "./admin-trial-selected-event-panel";
 
@@ -62,6 +65,7 @@ export function AdminTrialEventWorkspacePageClient({
           onDeletedTrialEvent={() => router.replace(getAdminTrialsHref())}
           onTrialEventDeleteConflict={() => void eventQuery.refetch()}
           allowEmptyEventDeletion
+          createEntryHref={getAdminTrialEntryCreateHref(trialEventId)}
         />
       )}
     </div>
diff --git a/apps/web/components/admin/trials/admin-trial-selected-event-panel.tsx b/apps/web/components/admin/trials/admin-trial-selected-event-panel.tsx
index 11dd63c0..486c389b 100644
--- a/apps/web/components/admin/trials/admin-trial-selected-event-panel.tsx
+++ b/apps/web/components/admin/trials/admin-trial-selected-event-panel.tsx
@@ -38,6 +38,7 @@ type AdminTrialSelectedEventPanelProps = {
   onTrialEventDeleteConflict?: () => void;
   allowEmptyEventDeletion?: boolean;
   workspaceHref?: string;
+  createEntryHref?: string;
 };
 
 const EMPTY_ENTRIES: AdminTrialEventEntry[] = [];
@@ -51,6 +52,7 @@ export function AdminTrialSelectedEventPanel({
   onTrialEventDeleteConflict,
   allowEmptyEventDeletion = false,
   workspaceHref,
+  createEntryHref,
 }: AdminTrialSelectedEventPanelProps) {
   const { t } = useI18n();
   const [isEditOpen, setIsEditOpen] = React.useState(false);
@@ -172,6 +174,13 @@ export function AdminTrialSelectedEventPanel({
                   </div>
                 </div>
                 <div className="flex flex-wrap gap-2">
+                  {createEntryHref ? (
+                    <Button asChild>
+                      <Link href={createEntryHref}>
+                        {t("admin.trials.manage.resultCreate.action")}
+                      </Link>
+                    </Button>
+                  ) : null}
                   {workspaceHref ? (
                     <Button asChild variant="outline">
                       <Link href={workspaceHref}>
diff --git a/apps/web/components/admin/trials/index.ts b/apps/web/components/admin/trials/index.ts
index 36a63d92..3acd71eb 100644
--- a/apps/web/components/admin/trials/index.ts
+++ b/apps/web/components/admin/trials/index.ts
@@ -1,3 +1,4 @@
 export { AdminTrialEventCreatePageClient } from "./admin-trial-event-create-page-client";
+export { AdminTrialEntryCreatePageClient } from "./admin-trial-entry-create-page-client";
 export { AdminTrialEventWorkspacePageClient } from "./admin-trial-event-workspace-page-client";
 export { AdminTrialsPageClient } from "./admin-trials-page-client";
diff --git a/apps/web/hooks/admin/trials/manage/use-unsaved-trial-entry-guard.ts b/apps/web/hooks/admin/trials/manage/use-unsaved-trial-entry-guard.ts
new file mode 100644
index 00000000..b0549df2
--- /dev/null
+++ b/apps/web/hooks/admin/trials/manage/use-unsaved-trial-entry-guard.ts
@@ -0,0 +1,59 @@
+"use client";
+
+import { useEffect, useRef, useState } from "react";
+
+export function useUnsavedTrialEntryGuard(isDirty: boolean) {
+  const [pendingLeave, setPendingLeave] = useState<(() => void) | null>(null);
+  const allowLeaveRef = useRef(false);
+
+  useEffect(() => {
+    if (!isDirty) return;
+    const handleBeforeUnload = (event: BeforeUnloadEvent) => {
+      if (!allowLeaveRef.current) event.preventDefault();
+    };
+    const handleClick = (event: MouseEvent) => {
+      if (allowLeaveRef.current || event.defaultPrevented || event.button !== 0)
+        return;
+      const anchor = (event.target as Element | null)?.closest("a");
+      if (!anchor || anchor.target || anchor.hasAttribute("download")) return;
+      const target = new URL(anchor.href, window.location.href);
+      if (
+        target.origin !== window.location.origin ||
+        target.href === window.location.href
+      )
+        return;
+      event.preventDefault();
+      setPendingLeave(() => () => window.location.assign(target.href));
+    };
+    const handlePopState = () => {
+      if (allowLeaveRef.current) return;
+      window.history.forward();
+      setPendingLeave(() => () => window.history.back());
+    };
+    window.addEventListener("beforeunload", handleBeforeUnload);
+    document.addEventListener("click", handleClick, true);
+    window.addEventListener("popstate", handlePopState);
+    return () => {
+      window.removeEventListener("beforeunload", handleBeforeUnload);
+      document.removeEventListener("click", handleClick, true);
+      window.removeEventListener("popstate", handlePopState);
+    };
+  }, [isDirty]);
+
+  function requestLeave(action: () => void) {
+    if (!isDirty) action();
+    else setPendingLeave(() => action);
+  }
+
+  return {
+    isConfirmingLeave: pendingLeave !== null,
+    requestLeave,
+    cancelLeave: () => setPendingLeave(null),
+    confirmLeave: () => {
+      const action = pendingLeave;
+      allowLeaveRef.current = true;
+      setPendingLeave(null);
+      action?.();
+    },
+  };
+}
diff --git a/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts b/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts
new file mode 100644
index 00000000..52a5cbdd
--- /dev/null
+++ b/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts
@@ -0,0 +1,95 @@
+import { describe, expect, it } from "vitest";
+import type { AdminTrialEventDetails } from "@beagle/contracts";
+import {
+  createAdminTrialEntryCreateDraft,
+  toCreateAdminTrialEntryRequest,
+} from "../entry-create-model";
+
+const event: AdminTrialEventDetails = {
+  trialEventId: "event-1",
+  eventDate: "2026-07-21",
+  eventPlace: "Helsinki",
+  eventName: null,
+  jarjestaja: null,
+  ylituomari: "Judge",
+  ylituomariNumero: "123",
+  ytKertomus: null,
+  kennelpiiri: null,
+  kennelpiirinro: null,
+  sklKoeId: 456,
+  dogCount: 0,
+  entries: [],
+};
+
+describe("manual trial entry create model", () => {
+  it("starts clean with event judge defaults, NORMAL and one era", () => {
+    const draft = createAdminTrialEntryCreateDraft(event);
+    expect(draft.registrationNo).toBe("");
+    expect(draft.entry).toMatchObject({
+      koetyyppi: "NORMAL",
+      judge: "Judge",
+      ylituomariNumeroSnapshot: "123",
+    });
+    expect(draft.eras.map((era) => era.era)).toEqual([1]);
+  });
+
+  it("serializes the R1 request and keeps registration server normalization authoritative", () => {
+    const draft = createAdminTrialEntryCreateDraft(event);
+    draft.registrationNo = " FI 12345/21 ";
+    const result = toCreateAdminTrialEntryRequest(event.trialEventId, draft);
+    expect(result).toMatchObject({
+      ok: true,
+      request: {
+        trialEventId: "event-1",
+        registrationNo: "FI 12345/21",
+        entry: { judge: "Judge" },
+        eras: [{ era: 1 }],
+      },
+    });
+  });
+
+  it("rejects missing registration and malformed numeric input", () => {
+    const draft = createAdminTrialEntryCreateDraft(event);
+    expect(toCreateAdminTrialEntryRequest("event-1", draft)).toEqual({
+      ok: false,
+      section: "registration",
+    });
+    draft.registrationNo = "FI123";
+    draft.entry.points = "bad";
+    expect(toCreateAdminTrialEntryRequest("event-1", draft)).toEqual({
+      ok: false,
+      section: "entry",
+    });
+  });
+
+  it("uses integer persistence order and omits empty lisatieto rows", () => {
+    const draft = createAdminTrialEntryCreateDraft(event);
+    draft.registrationNo = "FI43560/18";
+    const row25b = draft.lisatiedotRows.find(
+      (row) => row.koodi === "25" && row.osa === "b",
+    );
+    expect(row25b?.sortOrder).toBe(25.1);
+    expect(Number.isInteger(row25b?.jarjestys)).toBe(true);
+    if (row25b) row25b.eraValues[1] = "1";
+
+    const result = toCreateAdminTrialEntryRequest("event-1", draft);
+    expect(result).toMatchObject({
+      ok: true,
+      request: {
+        lisatiedotRows: [
+          expect.objectContaining({
+            koodi: "25",
+            osa: "b",
+            jarjestys: expect.any(Number),
+          }),
+        ],
+      },
+    });
+    if (result.ok) {
+      expect(result.request.lisatiedotRows).toHaveLength(1);
+      expect(Number.isInteger(result.request.lisatiedotRows[0].jarjestys)).toBe(
+        true,
+      );
+    }
+  });
+});
diff --git a/apps/web/lib/admin/trials/__tests__/entry-edit-dialog-model.test.ts b/apps/web/lib/admin/trials/__tests__/entry-edit-dialog-model.test.ts
index d68f9aca..9ee6a313 100644
--- a/apps/web/lib/admin/trials/__tests__/entry-edit-dialog-model.test.ts
+++ b/apps/web/lib/admin/trials/__tests__/entry-edit-dialog-model.test.ts
@@ -209,6 +209,7 @@ describe("entry edit lisatiedot model", () => {
     expect(
       rows.find((row) => row.koodi === "25" && row.osa === "b"),
     ).toMatchObject({
+      jarjestys: 26,
       eraValues: { 1: "0", 2: "" },
     });
     expect(
diff --git a/apps/web/lib/admin/trials/__tests__/trial-route.test.ts b/apps/web/lib/admin/trials/__tests__/trial-route.test.ts
index 4fd230b5..fc745cb4 100644
--- a/apps/web/lib/admin/trials/__tests__/trial-route.test.ts
+++ b/apps/web/lib/admin/trials/__tests__/trial-route.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import {
   getAdminTrialEventCreateHref,
+  getAdminTrialEntryCreateHref,
   getAdminTrialEventHref,
   getAdminTrialsHref,
 } from "../trial-route";
@@ -23,4 +24,10 @@ describe("admin trial route helpers", () => {
       "/admin/trials/event%2Fwith%20spaces",
     );
   });
+
+  it("builds a result creation href under the workspace", () => {
+    expect(getAdminTrialEntryCreateHref("event-1")).toBe(
+      "/admin/trials/event-1/results/new",
+    );
+  });
 });
diff --git a/apps/web/lib/admin/trials/entry-create-model.ts b/apps/web/lib/admin/trials/entry-create-model.ts
new file mode 100644
index 00000000..6bc6fa36
--- /dev/null
+++ b/apps/web/lib/admin/trials/entry-create-model.ts
@@ -0,0 +1,183 @@
+import type {
+  AdminTrialEventDetails,
+  AdminTrialEventEntry,
+  CreateAdminTrialEntryRequest,
+} from "@beagle/contracts";
+import {
+  createEmptyEraDraft,
+  isValidOptionalDecimal,
+  isValidOptionalInteger,
+  parseDecimal,
+  parseInteger,
+  parseNullableString,
+  toEntryDraft,
+  toLisatietoRows,
+  type EntryDraft,
+  type EraDraft,
+  type LisatietoRowDraft,
+} from "./entry-edit-dialog-model";
+
+export type AdminTrialEntryCreateDraft = {
+  registrationNo: string;
+  entry: EntryDraft;
+  eras: EraDraft[];
+  lisatiedotRows: LisatietoRowDraft[];
+};
+
+export type AdminTrialEntryCreateValidation =
+  | { ok: true; request: CreateAdminTrialEntryRequest }
+  | { ok: false; section: "registration" | "entry" | "eras" };
+
+function emptyEntry(event: AdminTrialEventDetails): AdminTrialEventEntry {
+  return {
+    trialId: "",
+    dogId: null,
+    dogName: "",
+    registrationNo: null,
+    entryKey: "",
+    koemuoto: null,
+    koetyyppi: "NORMAL",
+    rank: null,
+    award: null,
+    points: null,
+    judge: event.ylituomari,
+    ylituomariNumeroSnapshot: event.ylituomariNumero,
+    eras: [],
+  };
+}
+
+export function createAdminTrialEntryCreateDraft(
+  event: AdminTrialEventDetails,
+): AdminTrialEntryCreateDraft {
+  const entry = emptyEntry(event);
+  const eras = [createEmptyEraDraft(1)];
+  return {
+    registrationNo: "",
+    entry: toEntryDraft(entry),
+    eras,
+    lisatiedotRows: toLisatietoRows(entry, eras),
+  };
+}
+
+export function areAdminTrialEntryCreateDraftsEqual(
+  left: AdminTrialEntryCreateDraft,
+  right: AdminTrialEntryCreateDraft,
+): boolean {
+  return JSON.stringify(left) === JSON.stringify(right);
+}
+
+export function toCreateAdminTrialEntryRequest(
+  trialEventId: string,
+  draft: AdminTrialEntryCreateDraft,
+): AdminTrialEntryCreateValidation {
+  if (!draft.registrationNo.trim())
+    return { ok: false, section: "registration" };
+  const integerValues = [
+    draft.entry.koiriaLuokassa,
+    draft.entry.hyvaksytytAjominuutit,
+  ];
+  const decimalValues = [
+    draft.entry.points,
+    draft.entry.ajoajanPisteet,
+    draft.entry.haku,
+    draft.entry.hauk,
+    draft.entry.yva,
+    draft.entry.hlo,
+    draft.entry.alo,
+    draft.entry.tja,
+    draft.entry.pin,
+    draft.entry.ansiopisteetYhteensa,
+    draft.entry.tappiopisteetYhteensa,
+  ];
+  if (
+    integerValues.some((value) => !isValidOptionalInteger(value)) ||
+    decimalValues.some((value) => !isValidOptionalDecimal(value))
+  ) {
+    return { ok: false, section: "entry" };
+  }
+  const eras = [...draft.eras].sort((a, b) => a.era - b.era);
+  if (
+    !eras.length ||
+    eras.some(
+      (era, index) =>
+        era.era !== index + 1 ||
+        !isValidOptionalInteger(era.hakumin) ||
+        !isValidOptionalInteger(era.ajomin) ||
+        [era.haku, era.hauk, era.yva, era.hlo, era.alo, era.tja, era.pin].some(
+          (value) => !isValidOptionalDecimal(value),
+        ),
+    )
+  ) {
+    return { ok: false, section: "eras" };
+  }
+  const entry = draft.entry;
+  return {
+    ok: true,
+    request: {
+      trialEventId,
+      registrationNo: draft.registrationNo.trim(),
+      entry: {
+        koemaasto: parseNullableString(entry.koemaasto),
+        koemuoto: parseNullableString(entry.koemuoto),
+        koetyyppi: entry.koetyyppi,
+        ke: parseNullableString(entry.ke),
+        lk: parseNullableString(entry.lk),
+        award: parseNullableString(entry.award),
+        rank: parseNullableString(entry.rank),
+        points: parseDecimal(entry.points),
+        koiriaLuokassa: parseInteger(entry.koiriaLuokassa),
+        hyvaksytytAjominuutit: parseInteger(entry.hyvaksytytAjominuutit),
+        ajoajanPisteet: parseDecimal(entry.ajoajanPisteet),
+        haku: parseDecimal(entry.haku),
+        hauk: parseDecimal(entry.hauk),
+        yva: parseDecimal(entry.yva),
+        hlo: parseDecimal(entry.hlo),
+        alo: parseDecimal(entry.alo),
+        tja: parseDecimal(entry.tja),
+        pin: parseDecimal(entry.pin),
+        ansiopisteetYhteensa: parseDecimal(entry.ansiopisteetYhteensa),
+        tappiopisteetYhteensa: parseDecimal(entry.tappiopisteetYhteensa),
+        judge: parseNullableString(entry.judge),
+        huomautus: entry.huomautus || null,
+        huomautusTeksti: parseNullableString(entry.huomautusTeksti),
+        ylituomariNumeroSnapshot: parseNullableString(
+          entry.ylituomariNumeroSnapshot,
+        ),
+        ryhmatuomariNimi: parseNullableString(entry.ryhmatuomariNimi),
+        palkintotuomariNimi: parseNullableString(entry.palkintotuomariNimi),
+        omistajaSnapshot: parseNullableString(entry.omistajaSnapshot),
+        omistajanKotikuntaSnapshot: parseNullableString(
+          entry.omistajanKotikuntaSnapshot,
+        ),
+      },
+      eras: eras.map((era) => ({
+        era: era.era,
+        alkoi: parseNullableString(era.alkoi),
+        hakumin: parseInteger(era.hakumin),
+        ajomin: parseInteger(era.ajomin),
+        haku: parseDecimal(era.haku),
+        hauk: parseDecimal(era.hauk),
+        yva: parseDecimal(era.yva),
+        hlo: parseDecimal(era.hlo),
+        alo: parseDecimal(era.alo),
+        tja: parseDecimal(era.tja),
+        pin: parseDecimal(era.pin),
+        huomautusTeksti: parseNullableString(era.huomautusTeksti),
+      })),
+      lisatiedotRows: draft.lisatiedotRows
+        .filter((row) =>
+          eras.some((era) => (row.eraValues[era.era] ?? "").trim().length > 0),
+        )
+        .map((row) => ({
+          koodi: row.koodi,
+          osa: row.osa,
+          nimi: row.nimi,
+          jarjestys: row.jarjestys,
+          eraValues: eras.map((era) => ({
+            era: era.era,
+            arvo: parseNullableString(row.eraValues[era.era] ?? ""),
+          })),
+        })),
+    },
+  };
+}
diff --git a/apps/web/lib/admin/trials/entry-edit-config.ts b/apps/web/lib/admin/trials/entry-edit-config.ts
index 43b65f22..115ba8ea 100644
--- a/apps/web/lib/admin/trials/entry-edit-config.ts
+++ b/apps/web/lib/admin/trials/entry-edit-config.ts
@@ -33,6 +33,7 @@ export type AdminTrialLisatietoConfig = {
   label: string;
   inputKind: AdminTrialLisatietoInputKind;
   sortOrder: number;
+  persistenceOrder: number;
 };
 
 function defineLisatieto(
@@ -42,7 +43,7 @@ function defineLisatieto(
   inputKind: AdminTrialLisatietoInputKind,
   sortOrder: number,
   osa = "",
-): AdminTrialLisatietoConfig {
+): Omit<AdminTrialLisatietoConfig, "persistenceOrder"> {
   return { koodi, osa, group, label, inputKind, sortOrder };
 }
 
@@ -59,7 +60,7 @@ export const ADMIN_TRIAL_LISATIETO_GROUP_LABELS: Record<
   unknown: "Muut / tuntemattomat",
 };
 
-export const ADMIN_TRIAL_LISATIETO_CONFIG = [
+const ADMIN_TRIAL_LISATIETO_CONFIG_SOURCE = [
   defineLisatieto("10", "olosuhteet", "Vaativat olosuhteet", "marker", 10),
   defineLisatieto("11", "olosuhteet", "Paljas maa", "marker", 11),
   defineLisatieto("12", "olosuhteet", "Lumikeli", "integer", 12),
@@ -142,7 +143,16 @@ export const ADMIN_TRIAL_LISATIETO_CONFIG = [
   ),
   defineLisatieto("61", "muut_ominaisuudet", "Hallittavuus", "decimal", 61),
   defineLisatieto("62", "muut_ominaisuudet", "Matka ajoerässä", "decimal", 62),
-] as const satisfies readonly AdminTrialLisatietoConfig[];
+] as const satisfies readonly Omit<
+  AdminTrialLisatietoConfig,
+  "persistenceOrder"
+>[];
+
+export const ADMIN_TRIAL_LISATIETO_CONFIG: readonly AdminTrialLisatietoConfig[] =
+  ADMIN_TRIAL_LISATIETO_CONFIG_SOURCE.map((item, index) => ({
+    ...item,
+    persistenceOrder: index + 1,
+  }));
 
 export const ADMIN_TRIAL_LISATIETO_KOODIT = Array.from(
   new Set(ADMIN_TRIAL_LISATIETO_CONFIG.map((item) => item.koodi)),
diff --git a/apps/web/lib/admin/trials/entry-edit-dialog-model.ts b/apps/web/lib/admin/trials/entry-edit-dialog-model.ts
index 0264c68c..ab538cc6 100644
--- a/apps/web/lib/admin/trials/entry-edit-dialog-model.ts
+++ b/apps/web/lib/admin/trials/entry-edit-dialog-model.ts
@@ -199,7 +199,7 @@ export function toLisatietoRows(
       koodi: config.koodi,
       osa: config.osa,
       nimi: config.label,
-      jarjestys: config.sortOrder,
+      jarjestys: config.persistenceOrder,
     });
   }
 
@@ -211,6 +211,7 @@ export function toLisatietoRows(
         nimi: item.nimi,
         jarjestys: item.jarjestys,
       });
+      row.jarjestys = item.jarjestys;
       row.eraValues[era.era] = item.arvo;
     }
   }
diff --git a/apps/web/lib/admin/trials/index.ts b/apps/web/lib/admin/trials/index.ts
index 6eb021d1..02c2b754 100644
--- a/apps/web/lib/admin/trials/index.ts
+++ b/apps/web/lib/admin/trials/index.ts
@@ -1,2 +1,7 @@
 export * from "./trial-route";
 export * from "./submit-admin-trial-event-creation";
+export * from "./entry-create-model";
+export {
+  createEmptyEraDraft,
+  getNextEraNumber,
+} from "./entry-edit-dialog-model";
diff --git a/apps/web/lib/admin/trials/submit-admin-trial-event-creation.ts b/apps/web/lib/admin/trials/submit-admin-trial-event-creation.ts
index 6e99cc7f..1b8ff22a 100644
--- a/apps/web/lib/admin/trials/submit-admin-trial-event-creation.ts
+++ b/apps/web/lib/admin/trials/submit-admin-trial-event-creation.ts
@@ -3,7 +3,7 @@ import type {
   CreateAdminTrialEventResponse,
 } from "@beagle/contracts";
 import { AdminMutationError } from "@/queries/admin/mutation-error";
-import { getAdminTrialEventHref } from "./trial-route";
+import { getAdminTrialEntryCreateHref } from "./trial-route";
 
 export type AdminTrialEventCreationDraft = {
   eventDate: string;
@@ -93,7 +93,7 @@ export async function submitAdminTrialEventCreation({
       kennelpiirinro: draft.kennelpiirinro.trim() || null,
       sklKoeId,
     });
-    replace(getAdminTrialEventHref(result.trialEventId));
+    replace(getAdminTrialEntryCreateHref(result.trialEventId));
   } catch (error) {
     setErrorText(
       error instanceof AdminMutationError
diff --git a/apps/web/lib/admin/trials/trial-route.ts b/apps/web/lib/admin/trials/trial-route.ts
index 03871766..f88d338d 100644
--- a/apps/web/lib/admin/trials/trial-route.ts
+++ b/apps/web/lib/admin/trials/trial-route.ts
@@ -11,3 +11,7 @@ export function getAdminTrialEventCreateHref(): string {
 export function getAdminTrialEventHref(trialEventId: string): string {
   return `${ADMIN_TRIALS_ROUTE_ROOT}/${encodeURIComponent(trialEventId)}`;
 }
+
+export function getAdminTrialEntryCreateHref(trialEventId: string): string {
+  return `${getAdminTrialEventHref(trialEventId)}/results/new`;
+}
diff --git a/apps/web/lib/i18n/messages/admin/trials/manage.ts b/apps/web/lib/i18n/messages/admin/trials/manage.ts
index ba6f8a6d..82e3ad82 100644
--- a/apps/web/lib/i18n/messages/admin/trials/manage.ts
+++ b/apps/web/lib/i18n/messages/admin/trials/manage.ts
@@ -55,6 +55,53 @@ export const fiAdminTrialsManageMessages = {
   "admin.trials.manage.create.error": "Tapahtuman luominen epäonnistui.",
   "admin.trials.manage.create.conflict":
     "Annettu SKL koe ID kuuluu jo toiselle tapahtumalle.",
+  "admin.trials.manage.resultCreate.action": "Lisää tulos",
+  "admin.trials.manage.resultCreate.title": "Lisää koetulos",
+  "admin.trials.manage.resultCreate.loading": "Ladataan tapahtumaa...",
+  "admin.trials.manage.resultCreate.loadError":
+    "Tapahtuman lataaminen epäonnistui.",
+  "admin.trials.manage.resultCreate.eventNotFound":
+    "Ajokoetapahtumaa ei löytynyt.",
+  "admin.trials.manage.resultCreate.missingSklId":
+    "Tulosta ei voi lisätä, koska tapahtumalta puuttuu SKL koe ID.",
+  "admin.trials.manage.resultCreate.backToList": "Takaisin tapahtumiin",
+  "admin.trials.manage.resultCreate.backToWorkspace":
+    "Takaisin tapahtuman sivulle",
+  "admin.trials.manage.resultCreate.registration": "Rekisterinumero",
+  "admin.trials.manage.resultCreate.saveAnother": "Tallenna ja lisää seuraava",
+  "admin.trials.manage.resultCreate.saveFinish": "Tallenna ja lopeta",
+  "admin.trials.manage.resultCreate.cancel": "Peruuta",
+  "admin.trials.manage.resultCreate.success": "Koetulos tallennettiin.",
+  "admin.trials.manage.resultCreate.validation.registration":
+    "Anna rekisterinumero.",
+  "admin.trials.manage.resultCreate.validation.entry":
+    "Tarkista tuloksen numeeriset kentät.",
+  "admin.trials.manage.resultCreate.validation.eras":
+    "Tarkista erien numerointi ja numeeriset kentät.",
+  "admin.trials.manage.resultCreate.error.registration":
+    "Rekisterinumero ei ole kelvollinen.",
+  "admin.trials.manage.resultCreate.error.conflict":
+    "Tällä rekisterinumerolla on jo tulos tapahtumassa.",
+  "admin.trials.manage.resultCreate.error.entry":
+    "Tarkista tuloksen perustiedot.",
+  "admin.trials.manage.resultCreate.error.eras": "Tarkista erien tiedot.",
+  "admin.trials.manage.resultCreate.error.additionalInfo":
+    "Tarkista lisätietojen arvot.",
+  "admin.trials.manage.resultCreate.error.additionalInfoOrder":
+    "Lomake muodosti virheellisen järjestyksen lisätiedolle",
+  "admin.trials.manage.resultCreate.error.additionalInfoRow":
+    "Palvelin hylkäsi lisätiedon",
+  "admin.trials.manage.resultCreate.error.eventNotFound":
+    "Ajokoetapahtumaa ei enää löytynyt.",
+  "admin.trials.manage.resultCreate.error.missingSklId":
+    "Tapahtumalta puuttuu SKL koe ID.",
+  "admin.trials.manage.resultCreate.error.generic":
+    "Koetuloksen tallentaminen epäonnistui.",
+  "admin.trials.manage.resultCreate.unsaved.title": "Hylätäänkö muutokset?",
+  "admin.trials.manage.resultCreate.unsaved.body":
+    "Tallentamattomat tiedot menetetään.",
+  "admin.trials.manage.resultCreate.unsaved.confirm": "Hylkää muutokset",
+  "admin.trials.manage.resultCreate.unsaved.cancel": "Jatka muokkaamista",
   "admin.trials.manage.deleteEvent.action": "Poista tapahtuma",
   "admin.trials.manage.deleteEvent.confirmTitle": "Poistetaanko tapahtuma?",
   "admin.trials.manage.deleteEvent.confirmBody":
@@ -211,6 +258,54 @@ export const svAdminTrialsManageMessages = {
   "admin.trials.manage.create.error": "Det gick inte att skapa evenemanget.",
   "admin.trials.manage.create.conflict":
     "Det angivna SKL prov-ID:t används redan av ett annat evenemang.",
+  "admin.trials.manage.resultCreate.action": "Lägg till resultat",
+  "admin.trials.manage.resultCreate.title": "Lägg till provresultat",
+  "admin.trials.manage.resultCreate.loading": "Laddar evenemanget...",
+  "admin.trials.manage.resultCreate.loadError":
+    "Det gick inte att ladda evenemanget.",
+  "admin.trials.manage.resultCreate.eventNotFound":
+    "Jaktprovsevenemanget hittades inte.",
+  "admin.trials.manage.resultCreate.missingSklId":
+    "Resultatet kan inte läggas till eftersom evenemanget saknar SKL prov-ID.",
+  "admin.trials.manage.resultCreate.backToList": "Tillbaka till evenemangen",
+  "admin.trials.manage.resultCreate.backToWorkspace":
+    "Tillbaka till evenemangssidan",
+  "admin.trials.manage.resultCreate.registration": "Registreringsnummer",
+  "admin.trials.manage.resultCreate.saveAnother": "Spara och lägg till nästa",
+  "admin.trials.manage.resultCreate.saveFinish": "Spara och avsluta",
+  "admin.trials.manage.resultCreate.cancel": "Avbryt",
+  "admin.trials.manage.resultCreate.success": "Provresultatet sparades.",
+  "admin.trials.manage.resultCreate.validation.registration":
+    "Ange registreringsnummer.",
+  "admin.trials.manage.resultCreate.validation.entry":
+    "Kontrollera resultatets numeriska fält.",
+  "admin.trials.manage.resultCreate.validation.eras":
+    "Kontrollera omgångarnas numrering och numeriska fält.",
+  "admin.trials.manage.resultCreate.error.registration":
+    "Registreringsnumret är ogiltigt.",
+  "admin.trials.manage.resultCreate.error.conflict":
+    "Registreringsnumret har redan ett resultat i evenemanget.",
+  "admin.trials.manage.resultCreate.error.entry":
+    "Kontrollera resultatets grunduppgifter.",
+  "admin.trials.manage.resultCreate.error.eras":
+    "Kontrollera omgångarnas uppgifter.",
+  "admin.trials.manage.resultCreate.error.additionalInfo":
+    "Kontrollera tilläggsuppgifternas värden.",
+  "admin.trials.manage.resultCreate.error.additionalInfoOrder":
+    "Formuläret skapade en ogiltig ordning för tilläggsuppgiften",
+  "admin.trials.manage.resultCreate.error.additionalInfoRow":
+    "Servern avvisade tilläggsuppgiften",
+  "admin.trials.manage.resultCreate.error.eventNotFound":
+    "Jaktprovsevenemanget finns inte längre.",
+  "admin.trials.manage.resultCreate.error.missingSklId":
+    "Evenemanget saknar SKL prov-ID.",
+  "admin.trials.manage.resultCreate.error.generic":
+    "Det gick inte att spara provresultatet.",
+  "admin.trials.manage.resultCreate.unsaved.title": "Kassera ändringarna?",
+  "admin.trials.manage.resultCreate.unsaved.body":
+    "Uppgifter som inte sparats går förlorade.",
+  "admin.trials.manage.resultCreate.unsaved.confirm": "Kassera ändringarna",
+  "admin.trials.manage.resultCreate.unsaved.cancel": "Fortsätt redigera",
   "admin.trials.manage.deleteEvent.action": "Ta bort evenemang",
   "admin.trials.manage.deleteEvent.confirmTitle": "Ta bort evenemanget?",
   "admin.trials.manage.deleteEvent.confirmBody":
diff --git a/apps/web/queries/admin/mutation-error.ts b/apps/web/queries/admin/mutation-error.ts
index bd4cb7c1..9bec0c2a 100644
--- a/apps/web/queries/admin/mutation-error.ts
+++ b/apps/web/queries/admin/mutation-error.ts
@@ -1,7 +1,11 @@
 export class AdminMutationError extends Error {
   readonly errorCode?: string;
 
-  constructor(message: string, errorCode?: string) {
+  constructor(
+    message: string,
+    errorCode?: string,
+    readonly details?: unknown,
+  ) {
     super(message);
     this.name = "AdminMutationError";
     this.errorCode = errorCode;
diff --git a/apps/web/queries/admin/trials/manage/__tests__/use-create-admin-trial-entry-mutation.test.ts b/apps/web/queries/admin/trials/manage/__tests__/use-create-admin-trial-entry-mutation.test.ts
new file mode 100644
index 00000000..f5a08f26
--- /dev/null
+++ b/apps/web/queries/admin/trials/manage/__tests__/use-create-admin-trial-entry-mutation.test.ts
@@ -0,0 +1,61 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { useCreateAdminTrialEntryMutation } from "../use-create-admin-trial-entry-mutation";
+
+const { useMutation, invalidateQueries, action } = vi.hoisted(() => ({
+  useMutation: vi.fn(),
+  invalidateQueries: vi.fn(),
+  action: vi.fn(),
+}));
+vi.mock("@tanstack/react-query", () => ({
+  useMutation,
+  useQueryClient: () => ({ invalidateQueries }),
+}));
+vi.mock("@/app/actions/admin/trials/manage/create-admin-trial-entry", () => ({
+  createAdminTrialEntryAction: action,
+}));
+
+describe("useCreateAdminTrialEntryMutation", () => {
+  beforeEach(() => {
+    useMutation.mockReset();
+    invalidateQueries.mockReset();
+    action.mockReset();
+    useMutation.mockImplementation((options) => options);
+  });
+  it("calls the R1 action and refetches all affected query roots", async () => {
+    action.mockResolvedValue({
+      hasError: false,
+      data: { trialEventId: "event-1", trialEntryId: "entry-1" },
+    });
+    useCreateAdminTrialEntryMutation();
+    const options = useMutation.mock.calls[0][0];
+    await expect(
+      options.mutationFn({ trialEventId: "event-1" }),
+    ).resolves.toEqual({ trialEventId: "event-1", trialEntryId: "entry-1" });
+    await options.onSuccess();
+    expect(invalidateQueries).toHaveBeenCalledTimes(5);
+    expect(invalidateQueries).toHaveBeenCalledWith(
+      expect.objectContaining({ refetchType: "all" }),
+    );
+  });
+  it("surfaces the stable action error code", async () => {
+    action.mockResolvedValue({
+      hasError: true,
+      data: null,
+      errorCode: "INVALID_TRIAL_ADDITIONAL_INFO",
+      message: "Invalid",
+      validationIssue: {
+        area: "additional_info",
+        reason: "invalid_lisatieto_order",
+        koodi: "25",
+        osa: "b",
+      },
+    });
+    useCreateAdminTrialEntryMutation();
+    await expect(
+      useMutation.mock.calls[0][0].mutationFn({}),
+    ).rejects.toMatchObject({
+      errorCode: "INVALID_TRIAL_ADDITIONAL_INFO",
+      details: { koodi: "25", osa: "b" },
+    });
+  });
+});
diff --git a/apps/web/queries/admin/trials/manage/index.ts b/apps/web/queries/admin/trials/manage/index.ts
index f798a697..f468da92 100644
--- a/apps/web/queries/admin/trials/manage/index.ts
+++ b/apps/web/queries/admin/trials/manage/index.ts
@@ -1,5 +1,6 @@
 export * from "./query-keys";
 export * from "./use-create-admin-trial-event-mutation";
+export * from "./use-create-admin-trial-entry-mutation";
 export * from "./use-delete-admin-trial-event-mutation";
 export * from "./use-admin-trial-event-query";
 export * from "./use-admin-trial-events-query";
diff --git a/apps/web/queries/admin/trials/manage/use-create-admin-trial-entry-mutation.ts b/apps/web/queries/admin/trials/manage/use-create-admin-trial-entry-mutation.ts
new file mode 100644
index 00000000..077c51e2
--- /dev/null
+++ b/apps/web/queries/admin/trials/manage/use-create-admin-trial-entry-mutation.ts
@@ -0,0 +1,62 @@
+"use client";
+
+import type {
+  CreateAdminTrialEntryRequest,
+  CreateAdminTrialEntryResponse,
+} from "@beagle/contracts";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { createAdminTrialEntryAction } from "@/app/actions/admin/trials/manage/create-admin-trial-entry";
+import { AdminMutationError } from "@/queries/admin/mutation-error";
+import { beagleDogsQueryKeyRoot } from "@/queries/public/beagle/dogs/profile/query-keys";
+import { beagleTrialsQueryKeyRoot } from "@/queries/public/beagle/trials/query-keys";
+import { homeStatisticsQueryKey } from "@/queries/public/home/statistics/query-keys";
+import {
+  adminTrialEventQueryKeyRoot,
+  adminTrialEventsQueryKeyRoot,
+} from "./query-keys";
+
+export function useCreateAdminTrialEntryMutation() {
+  const queryClient = useQueryClient();
+
+  return useMutation<
+    CreateAdminTrialEntryResponse,
+    AdminMutationError,
+    CreateAdminTrialEntryRequest
+  >({
+    mutationFn: async (input) => {
+      const result = await createAdminTrialEntryAction(input);
+      if (result.hasError || !result.data) {
+        throw new AdminMutationError(
+          result.message ?? "Failed to create trial entry.",
+          result.errorCode,
+          result.validationIssue,
+        );
+      }
+      return result.data;
+    },
+    onSuccess: async () => {
+      await Promise.all([
+        queryClient.invalidateQueries({
+          queryKey: adminTrialEventsQueryKeyRoot,
+          refetchType: "all",
+        }),
+        queryClient.invalidateQueries({
+          queryKey: adminTrialEventQueryKeyRoot,
+          refetchType: "all",
+        }),
+        queryClient.invalidateQueries({
+          queryKey: beagleTrialsQueryKeyRoot,
+          refetchType: "all",
+        }),
+        queryClient.invalidateQueries({
+          queryKey: beagleDogsQueryKeyRoot,
+          refetchType: "all",
+        }),
+        queryClient.invalidateQueries({
+          queryKey: homeStatisticsQueryKey,
+          refetchType: "all",
+        }),
+      ]);
+    },
+  });
+}
diff --git a/docs/features/admin-trial-management.md b/docs/features/admin-trial-management.md
index f2f0c831..e52d4d91 100644
--- a/docs/features/admin-trial-management.md
+++ b/docs/features/admin-trial-management.md
@@ -14,14 +14,16 @@ and follow-up admin flow redesign).
   explicitly from their workspace, but only while they have no result rows.
 - Per-dog inspection opens the generated trial PDF. Existing event and result
   editing remains modal-based.
-- The R1 backend contract can create one manual result at a time through an
-  admin Server Action. It is intentionally not linked to a UI until R2.
+- An admin can create one manual result at a time from an event workspace.
+  The full-page form supports saving another result for the same event or
+  finishing back at the workspace.
 
 ## Main files
 
 - `apps/web/app/(admin)/admin/trials/page.tsx`: route entrypoint for event master-detail list
 - `apps/web/app/(admin)/admin/trials/new/page.tsx`: full-page event creation route
 - `apps/web/app/(admin)/admin/trials/[trialEventId]/page.tsx`: stable event workspace route
+- `apps/web/app/(admin)/admin/trials/[trialEventId]/results/new/page.tsx`: manual result creation route
 - `apps/web/components/admin/trials/admin-trial-event-create-page-client.tsx`: event creation form and continuation
 - `apps/web/components/admin/trials/admin-trials-page-client.tsx`: event filters + event list + selected-event rows
 - `apps/web/components/admin/trials/admin-trial-event-workspace-page-client.tsx`: one-event workspace states and navigation
@@ -45,10 +47,12 @@ and follow-up admin flow redesign).
    only the `trialEventId` from its route.
 4. Event and result changes use admin Server Action mutations; the PDF action
    opens `/api/trials/[trialEntryId]/pdf` in a new tab.
-5. Successful event creation opens the persisted empty event workspace.
+5. Successful event creation opens the first manual result form for the new event.
 6. Manual result creation validates and canonicalizes the typed registration,
    then atomically creates the entry, eras, and lisätiedot. A matching local
    `DogRegistration` links the dog; an unknown registration remains unlinked.
+7. Successful result creation refetches admin event data and affected public
+   trial, dog-profile trial, and home-statistics queries without optimistic rows.
 
 ## Contract rules
 
@@ -63,6 +67,10 @@ and follow-up admin flow redesign).
   `TRIAL_ENTRY_REGISTRATION_CONFLICT`.
 - Manual result writes require each normalized lisätieto `(koodi, osa)` pair
   to occur only once across the submitted matrix rows.
+- Lisätieto UI sorting is separate from its integer persisted `jarjestys`;
+  unused create-form rows are omitted from the write payload.
+- Manual-result validation errors may carry safe structured field context for
+  localized feedback without exposing raw user-entered values.
 - `TrialEvent.koepaiva` is a PostgreSQL `DATE`; all trial contracts serialize
   it as timezone-free `YYYY-MM-DD`.
 - Empty event deletion returns `TRIAL_EVENT_NOT_EMPTY` if result rows are
@@ -76,6 +84,8 @@ and follow-up admin flow redesign).
 
 - Event rows/cards are the interaction target for choosing a selected event.
 - The selected-event header has event edit and workspace navigation actions.
+- The event workspace links to the full-page result form. Dirty result forms
+  confirm internal navigation and use native unload protection for refresh or close.
 - Selected dog rows have PDF, edit, and result-delete actions.
 - A missing workspace event is shown explicitly and never falls back to a
   different event.
diff --git a/docs/planning/trials/README.md b/docs/planning/trials/README.md
index 0dc0ccb9..19878253 100644
--- a/docs/planning/trials/README.md
+++ b/docs/planning/trials/README.md
@@ -19,6 +19,9 @@ on the next gate.
   identity, transaction, error, date-only, and Server Action backend contract.
 - [Result creation R2](./result-creation-r2.md) defines the full-page result
   form and admin UI workflow built on the approved R1 contract.
+- [Rule-window-aware result fields](./result-fields-by-rule-window.md) defines
+  the second result-creation follow-up after R2: introduce field-set selection
+  for every rule window and verify the 2023+ set first.
 - [Later UX](./later-ux.md) records deferred ideas only and does not authorize
   their implementation.
 
@@ -76,12 +79,15 @@ E2
 R1 (backend)
  ↓
 R2 (UI)
+ ↓
+R3 (rule-window field sets)
 ```
 
 1. `E1` - event workspace
 2. `E2` - event creation and empty-event lifecycle
 3. `R1` - manual result schema and backend
 4. `R2` - manual result UI and workflow
+5. `R3` - rule-window-aware result fields, after R2 review
 
 For every gate:
 
diff --git a/docs/planning/trials/result-creation-r2.md b/docs/planning/trials/result-creation-r2.md
index eca74759..e2c19694 100644
--- a/docs/planning/trials/result-creation-r2.md
+++ b/docs/planning/trials/result-creation-r2.md
@@ -28,6 +28,8 @@ R2 consumes, but does not redefine or weaken, the R1 decisions for:
 
 R2 maps stable `errorCode` values to localized presentation and never inspects
 backend message strings to determine behavior.
+When R1 supplies typed validation details, R2 uses their stable reason and safe
+field context to identify the rejected section or lisätieto row.
 
 ## Scope
 
diff --git a/docs/planning/trials/result-creation.md b/docs/planning/trials/result-creation.md
index 1e4ad78a..3b04b02d 100644
--- a/docs/planning/trials/result-creation.md
+++ b/docs/planning/trials/result-creation.md
@@ -179,6 +179,9 @@ Existing `UNAUTHENTICATED` and `FORBIDDEN` authorization codes remain in use.
   outcomes, and owns structured success/failure logging.
 - The Server Action performs its existing admin/session guard and passes the
   service code through as `errorCode` without interpreting message text.
+- Validation failures may also include a typed, safe `details` issue with the
+  validation area/reason and affected lisätieto code/part. Raw entered values
+  are not exposed through validation details.
 
 ## Date-only invariant
 
diff --git a/docs/planning/trials/result-fields-by-rule-window.md b/docs/planning/trials/result-fields-by-rule-window.md
new file mode 100644
index 00000000..937e7e33
--- /dev/null
+++ b/docs/planning/trials/result-fields-by-rule-window.md
@@ -0,0 +1,108 @@
+# Follow-up R3 — Rule-window-aware Result Fields
+
+## Status and sequencing
+
+This is the second result-creation follow-up after the current R2 implementation
+and validation work. It is planning only and does not authorize implementation.
+
+R2 must be completed and reviewed before this work begins. The initial R3
+change introduces the rule-window structure and verifies only the current
+2023+ field set. Exact historical field-set audits remain separate follow-up
+work.
+
+## Purpose
+
+Make manual trial result creation and editing choose their visible score, era,
+and lisätieto fields from the event's persisted `trialRuleWindowId`. This keeps
+the current form aligned with the corresponding dog-trial PDF without coupling
+form behavior to PDF coordinates.
+
+The current mismatch is structural:
+
+- PDF rendering already selects a renderer by rule window, while the admin form
+  uses one global field list.
+- The 2023+ renderer does not print the current form's `tja` and `pin` score
+  fields.
+- The current PDF consumes only part `a` for lisätieto codes `25` and `27`,
+  while the form exposes parts `a`, `b`, and `c`.
+- Lisätieto input types differ for codes `19`, `23`, `26`, and `59`.
+- Historical templates contain different score and lisätieto sets.
+
+## Scope
+
+- Add `trialRuleWindowId` to the admin event-detail contract and propagate the
+  stored value through the DB and service mappings.
+- Add a semantic admin result field-set registry covering every seeded rule
+  window ID.
+- Keep PDF coordinates and drawing logic inside the PDF rule-set modules. The
+  shared semantic configuration defines field availability and value kinds,
+  not layout.
+- Configure `trw_post_20230801` as the first verified field set:
+  - drive visible entry score fields, era fields, and lisätieto rows from the
+    configuration;
+  - omit current-window score fields not consumed by the 2023+ PDF;
+  - represent codes `25` and `27` with the PDF-consumed `a` part without showing
+    the implementation suffix to the administrator;
+  - correct lisätieto value kinds to match the current renderer; and
+  - retain shared registration, owner, judge, result-status, trial-type, and
+    other metadata required by persistence or PDF generation.
+- Register other known, null, and unknown rule windows through one explicitly
+  unverified fallback matching the current form behavior. Show a localized
+  warning instead of presenting the fallback as template-verified.
+- Apply the selected field set to both the full-page create form and the
+  existing edit modal.
+- Preserve hidden values when editing an existing result. Selecting a narrower
+  field set must not silently clear compatibility data or source-projected
+  lisätieto rows.
+- Keep backend write shapes and their existing validation semantics unchanged.
+  This gate controls admin presentation and does not add rule-window-specific
+  server rejection.
+- Update the durable admin-trial documentation and add a user-visible
+  `CHANGELOG.md` entry when the behavior is implemented.
+
+## Exclusions
+
+- No Prisma schema or migration changes.
+- No new production dependency.
+- No PDF coordinate or template changes.
+- No claim that 2005–2011 or 2011–2023 admin field sets are exact.
+- No removal or migration of stored compatibility fields.
+- No rule-window-specific validation in Koiratietokanta ingestion.
+- No redesign of result creation or the existing edit modal.
+
+## Acceptance criteria
+
+- Admin event details return the event's persisted `trialRuleWindowId`.
+- Create and edit resolve their field set from that stored ID rather than from
+  the browser date.
+- A 2023+ event displays the verified score, era, and lisätieto configuration.
+- Codes `25` and `27` persist with part `a`, appear as single rows, and reach
+  the existing PDF pivot correctly.
+- Current-window lisätieto value kinds match the 2023+ renderer.
+- Other known, null, and unknown windows retain the existing generic editing
+  capability and display an unverified-field-set warning.
+- Editing through a narrower field set preserves hidden existing values.
+- Existing create/update request contracts and server validation behavior do
+  not change.
+
+## Targeted validation
+
+- Contract, DB-mapping, and service tests for `trialRuleWindowId` in admin event
+  details.
+- Field-registry tests covering every seeded rule-window ID and fallback
+  behavior.
+- 2023+ parity tests for visible score fields, era fields, lisätieto codes,
+  parts, ordering, and input kinds.
+- Create-form and edit-modal tests for rule selection, the fallback warning,
+  and hidden-value preservation.
+- Regression tests for request serialization, current validation feedback, and
+  PDF part-`a` mapping.
+- Targeted web, contracts, server, and DB type checks and tests, plus targeted
+  lint without cycle lint.
+
+## Later historical audit
+
+After R3 is reviewed, separately compare the 2005–2011 and 2011–2023 PDF
+templates and renderers with stored legacy/API data. Replace the unverified
+fallback for each window only after its score fields, supported era behavior,
+lisätieto rows, value kinds, and preservation behavior have dedicated tests.
diff --git a/packages/contracts/admin/trials/manage/create-admin-trial-entry.ts b/packages/contracts/admin/trials/manage/create-admin-trial-entry.ts
index a527e907..de7d9e46 100644
--- a/packages/contracts/admin/trials/manage/create-admin-trial-entry.ts
+++ b/packages/contracts/admin/trials/manage/create-admin-trial-entry.ts
@@ -9,3 +9,27 @@ export type CreateAdminTrialEntryResponse = {
   trialEventId: string;
   trialEntryId: string;
 };
+
+export type AdminTrialEntryValidationIssue = {
+  area: "entry" | "eras" | "additional_info";
+  reason:
+    | "invalid_write_shape"
+    | "invalid_koetyyppi"
+    | "invalid_huomautus"
+    | "invalid_entry_integer"
+    | "invalid_entry_number"
+    | "missing_eras"
+    | "invalid_era_number"
+    | "duplicate_eras"
+    | "non_continuous_eras"
+    | "invalid_era_integer"
+    | "invalid_era_number_field"
+    | "invalid_lisatieto_code"
+    | "duplicate_lisatieto_key"
+    | "invalid_lisatieto_era"
+    | "duplicate_lisatieto_era_value"
+    | "invalid_lisatieto_order";
+  value?: string;
+  koodi?: string;
+  osa?: string;
+};
diff --git a/packages/contracts/admin/trials/manage/index.ts b/packages/contracts/admin/trials/manage/index.ts
index 75b239c3..be292274 100644
--- a/packages/contracts/admin/trials/manage/index.ts
+++ b/packages/contracts/admin/trials/manage/index.ts
@@ -25,6 +25,7 @@ export type {
 export type {
   CreateAdminTrialEntryRequest,
   CreateAdminTrialEntryResponse,
+  AdminTrialEntryValidationIssue,
 } from "./create-admin-trial-entry";
 export type {
   DeleteAdminTrialEventRequest,
diff --git a/packages/contracts/index.ts b/packages/contracts/index.ts
index 01876e47..337c668f 100644
--- a/packages/contracts/index.ts
+++ b/packages/contracts/index.ts
@@ -300,6 +300,7 @@ export type {
   CreateAdminTrialEventResponse,
   CreateAdminTrialEntryRequest,
   CreateAdminTrialEntryResponse,
+  AdminTrialEntryValidationIssue,
   DeleteAdminTrialEventRequest,
   DeleteAdminTrialEventResponse,
   DeleteAdminTrialEntryRequest,
diff --git a/packages/server/admin/trials/manage/__tests__/create-trial-entry.test.ts b/packages/server/admin/trials/manage/__tests__/create-trial-entry.test.ts
index b5b8d861..d35ed830 100644
--- a/packages/server/admin/trials/manage/__tests__/create-trial-entry.test.ts
+++ b/packages/server/admin/trials/manage/__tests__/create-trial-entry.test.ts
@@ -185,4 +185,35 @@ describe("createAdminTrialEntry", () => {
     });
     expect(writeMock).not.toHaveBeenCalled();
   });
+
+  it("returns safe row context for invalid lisatieto ordering", async () => {
+    await expect(
+      createAdminTrialEntry(
+        {
+          ...input,
+          lisatiedotRows: [
+            {
+              koodi: "25",
+              osa: "b",
+              nimi: null,
+              jarjestys: 25.1,
+              eraValues: [{ era: 1, arvo: "1" }],
+            },
+          ],
+        },
+        admin,
+      ),
+    ).resolves.toMatchObject({
+      status: 400,
+      body: {
+        code: "INVALID_TRIAL_ADDITIONAL_INFO",
+        details: {
+          area: "additional_info",
+          reason: "invalid_lisatieto_order",
+          koodi: "25",
+          osa: "b",
+        },
+      },
+    });
+  });
 });
diff --git a/packages/server/admin/trials/manage/create-trial-entry.ts b/packages/server/admin/trials/manage/create-trial-entry.ts
index 242c5ce8..a8aca584 100644
--- a/packages/server/admin/trials/manage/create-trial-entry.ts
+++ b/packages/server/admin/trials/manage/create-trial-entry.ts
@@ -88,6 +88,7 @@ export async function createAdminTrialEntry(
         ok: false,
         error: "Trial result fields are invalid.",
         code: ISSUE_CODES[parsed.issue.area],
+        details: parsed.issue,
       },
     };
   }
diff --git a/packages/server/admin/trials/manage/internal/__tests__/parse-admin-trial-entry-write-input.test.ts b/packages/server/admin/trials/manage/internal/__tests__/parse-admin-trial-entry-write-input.test.ts
index 47c1760e..e172d611 100644
--- a/packages/server/admin/trials/manage/internal/__tests__/parse-admin-trial-entry-write-input.test.ts
+++ b/packages/server/admin/trials/manage/internal/__tests__/parse-admin-trial-entry-write-input.test.ts
@@ -180,6 +180,8 @@ describe("parseAdminTrialEntryWriteInput", () => {
       issue: {
         area: "additional_info",
         reason: "duplicate_lisatieto_era_value",
+        koodi: "11",
+        osa: "",
       },
     });
   });
@@ -193,6 +195,8 @@ describe("parseAdminTrialEntryWriteInput", () => {
       issue: {
         area: "additional_info",
         reason: "invalid_lisatieto_order",
+        koodi: "11",
+        osa: "",
       },
     });
     expect(
diff --git a/packages/server/admin/trials/manage/internal/parse-admin-trial-entry-write-input.ts b/packages/server/admin/trials/manage/internal/parse-admin-trial-entry-write-input.ts
index ffedf754..4bdea3bb 100644
--- a/packages/server/admin/trials/manage/internal/parse-admin-trial-entry-write-input.ts
+++ b/packages/server/admin/trials/manage/internal/parse-admin-trial-entry-write-input.ts
@@ -1,4 +1,7 @@
-import type { AdminTrialEntryWriteData } from "@beagle/contracts";
+import type {
+  AdminTrialEntryValidationIssue,
+  AdminTrialEntryWriteData,
+} from "@beagle/contracts";
 import type { AdminTrialEntryWriteDataDb } from "@beagle/db";
 
 export type AdminTrialEntryWriteValidationReason =
@@ -19,11 +22,8 @@ export type AdminTrialEntryWriteValidationReason =
   | "duplicate_lisatieto_era_value"
   | "invalid_lisatieto_order";
 
-export type AdminTrialEntryWriteValidationIssue = {
-  area: "entry" | "eras" | "additional_info";
-  reason: AdminTrialEntryWriteValidationReason;
-  value?: string;
-};
+export type AdminTrialEntryWriteValidationIssue =
+  AdminTrialEntryValidationIssue;
 
 const VALID_KOETYYPIT = new Set(["NORMAL", "KOKOKAUDENKOE", "PITKAKOE"]);
 const VALID_HUOMAUTUKSET = new Set(["LUOPUI", "SULJETTU", "KESKEYTETTY"]);
@@ -101,8 +101,12 @@ function failure(
   area: AdminTrialEntryWriteValidationIssue["area"],
   reason: AdminTrialEntryWriteValidationReason,
   value?: string,
+  context?: Pick<AdminTrialEntryValidationIssue, "koodi" | "osa">,
 ): { ok: false; issue: AdminTrialEntryWriteValidationIssue } {
-  return { ok: false, issue: { area, reason, ...(value ? { value } : {}) } };
+  return {
+    ok: false,
+    issue: { area, reason, ...(value ? { value } : {}), ...context },
+  };
 }
 
 // Validates and normalizes the result shape shared by create and update writes.
@@ -193,14 +197,25 @@ export function parseAdminTrialEntryWriteInput(
     }
     lisatietoKeys.add(key);
     if (options.mode === "create" && !isNullableInteger(row.jarjestys)) {
-      return failure("additional_info", "invalid_lisatieto_order");
+      return failure("additional_info", "invalid_lisatieto_order", undefined, {
+        koodi,
+        osa,
+      });
     }
     if (row.eraValues.some((value) => !eraNumbers.includes(value.era))) {
-      return failure("additional_info", "invalid_lisatieto_era");
+      return failure("additional_info", "invalid_lisatieto_era", undefined, {
+        koodi,
+        osa,
+      });
     }
     const lisatietoEraNumbers = row.eraValues.map((value) => value.era);
     if (new Set(lisatietoEraNumbers).size !== lisatietoEraNumbers.length) {
-      return failure("additional_info", "duplicate_lisatieto_era_value");
+      return failure(
+        "additional_info",
+        "duplicate_lisatieto_era_value",
+        undefined,
+        { koodi, osa },
+      );
     }
   }
 

From 1242ca0474f8ace470e7014ee259505842f9346b Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Thu, 23 Jul 2026 10:07:31 +0300
Subject: [PATCH 12/24] fix(admin-trials): simplify unsaved navigation guard

  Remove the unreliable browser Back recovery based on asynchronous
  history.forward() and history.back() calls.

  Keep confirmation for explicit internal navigation and native unload
  protection for refresh or tab close. Ignore modified and new-tab link
  clicks, ensure confirmed actions run only once, and add focused tests
  and documentation for the intentionally unguarded browser Back
  behavior.

  ref BEJ-103
---
 CHANGELOG.md                                  |   1 +
 .../use-unsaved-trial-entry-guard.test.ts     | 298 ++++++++++++++++++
 .../manage/use-unsaved-trial-entry-guard.ts   |  56 ++--
 docs/features/admin-trial-management.md       |   4 +-
 docs/planning/trials/result-creation-r2.md    |   6 +-
 docs/tech-debt.md                             |   9 +
 6 files changed, 353 insertions(+), 21 deletions(-)
 create mode 100644 apps/web/hooks/admin/trials/manage/__tests__/use-unsaved-trial-entry-guard.test.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0d6ffb5..873400e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ This project uses a user-facing changelog format.
 ### Fixed
 
 - Ajokoetuloksen lisätietorivit tallennetaan kelvollisessa kokonaislukujärjestyksessä, ja hylätty lisätietorivi näytetään aiempaa tarkemmin.
+- Ajokoetuloksen lisäyslomakkeen selaimen Takaisin-toiminto ei enää yritä perua navigointia epäluotettavalla edestakaisella sivuhistorian käsittelyllä.
 
 ### Removed
 
diff --git a/apps/web/hooks/admin/trials/manage/__tests__/use-unsaved-trial-entry-guard.test.ts b/apps/web/hooks/admin/trials/manage/__tests__/use-unsaved-trial-entry-guard.test.ts
new file mode 100644
index 00000000..6a515755
--- /dev/null
+++ b/apps/web/hooks/admin/trials/manage/__tests__/use-unsaved-trial-entry-guard.test.ts
@@ -0,0 +1,298 @@
+import { useEffect } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { useUnsavedTrialEntryGuard } from "../use-unsaved-trial-entry-guard";
+
+const { hookState } = vi.hoisted(() => ({
+  hookState: {
+    index: 0,
+    stateSlots: [] as unknown[],
+    refSlots: [] as Array<{ current: unknown }>,
+    effectSlots: [] as Array<{
+      cleanup?: () => void;
+      dependencies?: readonly unknown[];
+    }>,
+  },
+}));
+
+vi.mock("react", async () => {
+  const actual = await vi.importActual<typeof import("react")>("react");
+  const nextHookIndex = () => hookState.index++;
+
+  function mockUseEffect(
+    effect: () => void | (() => void),
+    dependencies?: readonly unknown[],
+  ) {
+    const index = nextHookIndex();
+    const previous = hookState.effectSlots[index];
+    const unchanged =
+      dependencies &&
+      previous?.dependencies &&
+      dependencies.length === previous.dependencies.length &&
+      dependencies.every((value, position) =>
+        Object.is(value, previous.dependencies?.[position]),
+      );
+    if (unchanged) return;
+
+    previous?.cleanup?.();
+    const cleanup = effect();
+    hookState.effectSlots[index] = {
+      cleanup: cleanup ?? undefined,
+      dependencies,
+    };
+  }
+
+  function mockUseRef<T>(initialValue: T) {
+    const index = nextHookIndex();
+    if (!(index in hookState.refSlots))
+      hookState.refSlots[index] = { current: initialValue };
+    return hookState.refSlots[index] as { current: T };
+  }
+
+  function mockUseState<T>(initialValue: T) {
+    const index = nextHookIndex();
+    if (!(index in hookState.stateSlots))
+      hookState.stateSlots[index] = initialValue;
+    const setState = (value: T | ((current: T) => T)) => {
+      hookState.stateSlots[index] =
+        typeof value === "function"
+          ? (value as (current: T) => T)(hookState.stateSlots[index] as T)
+          : value;
+    };
+    return [hookState.stateSlots[index] as T, setState] as const;
+  }
+
+  return {
+    ...actual,
+    useEffect: mockUseEffect,
+    useRef: mockUseRef,
+    useState: mockUseState,
+  };
+});
+
+type BrowserListeners = {
+  beforeunload?: (event: BeforeUnloadEvent) => void;
+  click?: (event: MouseEvent) => void;
+};
+
+type Guard = ReturnType<typeof useUnsavedTrialEntryGuard>;
+
+const listeners: BrowserListeners = {};
+const assignMock = vi.fn();
+const historyBackMock = vi.fn();
+const historyForwardMock = vi.fn();
+const windowAddEventListenerMock = vi.fn(
+  (type: string, listener: EventListenerOrEventListenerObject) => {
+    if (type === "beforeunload")
+      listeners.beforeunload = listener as BrowserListeners["beforeunload"];
+  },
+);
+const windowRemoveEventListenerMock = vi.fn();
+const documentAddEventListenerMock = vi.fn(
+  (type: string, listener: EventListenerOrEventListenerObject) => {
+    if (type === "click")
+      listeners.click = listener as BrowserListeners["click"];
+  },
+);
+const documentRemoveEventListenerMock = vi.fn();
+
+let latestGuard: Guard | null = null;
+
+function GuardHarness({ isDirty }: { isDirty: boolean }) {
+  const guard = useUnsavedTrialEntryGuard(isDirty);
+  useEffect(() => {
+    latestGuard = guard;
+  }, [guard]);
+  return null;
+}
+
+function renderGuard(isDirty: boolean): Guard {
+  hookState.index = 0;
+  GuardHarness({ isDirty });
+  return latestGuard!;
+}
+
+function createClick({
+  href = "http://localhost/admin/trials/event-1",
+  target = "",
+  download = false,
+  metaKey = false,
+  ctrlKey = false,
+  shiftKey = false,
+  altKey = false,
+}: {
+  href?: string;
+  target?: string;
+  download?: boolean;
+  metaKey?: boolean;
+  ctrlKey?: boolean;
+  shiftKey?: boolean;
+  altKey?: boolean;
+} = {}) {
+  const preventDefault = vi.fn();
+  const anchor = {
+    href,
+    target,
+    hasAttribute: (name: string) => name === "download" && download,
+  };
+  const event = {
+    altKey,
+    button: 0,
+    ctrlKey,
+    defaultPrevented: false,
+    metaKey,
+    preventDefault,
+    shiftKey,
+    target: { closest: () => anchor },
+  } as unknown as MouseEvent;
+  return { event, preventDefault };
+}
+
+describe("useUnsavedTrialEntryGuard", () => {
+  beforeEach(() => {
+    hookState.index = 0;
+    hookState.stateSlots = [];
+    hookState.refSlots = [];
+    hookState.effectSlots = [];
+    latestGuard = null;
+    Object.keys(listeners).forEach(
+      (key) => delete listeners[key as keyof BrowserListeners],
+    );
+    assignMock.mockReset();
+    historyBackMock.mockReset();
+    historyForwardMock.mockReset();
+    windowAddEventListenerMock.mockClear();
+    windowRemoveEventListenerMock.mockClear();
+    documentAddEventListenerMock.mockClear();
+    documentRemoveEventListenerMock.mockClear();
+    vi.stubGlobal("window", {
+      addEventListener: windowAddEventListenerMock,
+      removeEventListener: windowRemoveEventListenerMock,
+      history: {
+        back: historyBackMock,
+        forward: historyForwardMock,
+      },
+      location: {
+        assign: assignMock,
+        href: "http://localhost/admin/trials/event-1/results/new",
+        origin: "http://localhost",
+      },
+    });
+    vi.stubGlobal("document", {
+      addEventListener: documentAddEventListenerMock,
+      removeEventListener: documentRemoveEventListenerMock,
+    });
+  });
+
+  afterEach(() => {
+    for (const effect of hookState.effectSlots) effect?.cleanup?.();
+    vi.unstubAllGlobals();
+  });
+
+  it("runs clean leave requests immediately", () => {
+    const action = vi.fn();
+
+    const guard = renderGuard(false);
+    guard.requestLeave(action);
+
+    expect(action).toHaveBeenCalledOnce();
+    expect(guard.isConfirmingLeave).toBe(false);
+  });
+
+  it("keeps dirty requests pending until confirmed and runs them once", () => {
+    const action = vi.fn();
+
+    renderGuard(true).requestLeave(action);
+    const pendingGuard = renderGuard(true);
+
+    expect(pendingGuard.isConfirmingLeave).toBe(true);
+    expect(action).not.toHaveBeenCalled();
+
+    pendingGuard.confirmLeave();
+    pendingGuard.confirmLeave();
+
+    expect(action).toHaveBeenCalledOnce();
+    expect(renderGuard(true).isConfirmingLeave).toBe(false);
+  });
+
+  it("cancels a dirty leave without running its action", () => {
+    const action = vi.fn();
+
+    renderGuard(true).requestLeave(action);
+    const pendingGuard = renderGuard(true);
+    pendingGuard.cancelLeave();
+
+    expect(action).not.toHaveBeenCalled();
+    expect(renderGuard(true).isConfirmingLeave).toBe(false);
+  });
+
+  it("blocks unload while dirty without installing popstate handling", () => {
+    renderGuard(true);
+    const event = {
+      preventDefault: vi.fn(),
+      returnValue: false,
+    } as unknown as BeforeUnloadEvent;
+
+    listeners.beforeunload?.(event);
+
+    expect(event.preventDefault).toHaveBeenCalledOnce();
+    expect(event.returnValue).toBe(true);
+    expect(windowAddEventListenerMock).not.toHaveBeenCalledWith(
+      "popstate",
+      expect.anything(),
+    );
+    expect(historyBackMock).not.toHaveBeenCalled();
+    expect(historyForwardMock).not.toHaveBeenCalled();
+  });
+
+  it("does not install browser guards while clean", () => {
+    renderGuard(false);
+
+    expect(windowAddEventListenerMock).not.toHaveBeenCalled();
+    expect(documentAddEventListenerMock).not.toHaveBeenCalled();
+  });
+
+  it("confirms an intercepted same-tab link and opens the intended URL", () => {
+    renderGuard(true);
+    const { event, preventDefault } = createClick({ target: "_self" });
+
+    listeners.click?.(event);
+    const pendingGuard = renderGuard(true);
+
+    expect(preventDefault).toHaveBeenCalledOnce();
+    expect(pendingGuard.isConfirmingLeave).toBe(true);
+
+    pendingGuard.confirmLeave();
+
+    expect(assignMock).toHaveBeenCalledOnce();
+    expect(assignMock).toHaveBeenCalledWith(
+      "http://localhost/admin/trials/event-1",
+    );
+  });
+
+  it.each([
+    { name: "Cmd-click", options: { metaKey: true } },
+    { name: "Ctrl-click", options: { ctrlKey: true } },
+    { name: "Shift-click", options: { shiftKey: true } },
+    { name: "Alt-click", options: { altKey: true } },
+    { name: "new-tab target", options: { target: "_blank" } },
+    { name: "download", options: { download: true } },
+    {
+      name: "external URL",
+      options: { href: "https://example.com/somewhere" },
+    },
+    {
+      name: "current URL",
+      options: {
+        href: "http://localhost/admin/trials/event-1/results/new",
+      },
+    },
+  ])("does not intercept $name", ({ options }) => {
+    renderGuard(true);
+    const { event, preventDefault } = createClick(options);
+
+    listeners.click?.(event);
+
+    expect(preventDefault).not.toHaveBeenCalled();
+    expect(renderGuard(true).isConfirmingLeave).toBe(false);
+  });
+});
diff --git a/apps/web/hooks/admin/trials/manage/use-unsaved-trial-entry-guard.ts b/apps/web/hooks/admin/trials/manage/use-unsaved-trial-entry-guard.ts
index b0549df2..9f9b27de 100644
--- a/apps/web/hooks/admin/trials/manage/use-unsaved-trial-entry-guard.ts
+++ b/apps/web/hooks/admin/trials/manage/use-unsaved-trial-entry-guard.ts
@@ -3,19 +3,40 @@
 import { useEffect, useRef, useState } from "react";
 
 export function useUnsavedTrialEntryGuard(isDirty: boolean) {
-  const [pendingLeave, setPendingLeave] = useState<(() => void) | null>(null);
+  const [isConfirmingLeave, setIsConfirmingLeave] = useState(false);
+  const pendingLeaveRef = useRef<(() => void) | null>(null);
   const allowLeaveRef = useRef(false);
 
+  function queueLeave(action: () => void) {
+    pendingLeaveRef.current = action;
+    setIsConfirmingLeave(true);
+  }
+
   useEffect(() => {
     if (!isDirty) return;
     const handleBeforeUnload = (event: BeforeUnloadEvent) => {
-      if (!allowLeaveRef.current) event.preventDefault();
+      if (allowLeaveRef.current) return;
+      event.preventDefault();
+      event.returnValue = true;
     };
     const handleClick = (event: MouseEvent) => {
-      if (allowLeaveRef.current || event.defaultPrevented || event.button !== 0)
+      if (
+        allowLeaveRef.current ||
+        event.defaultPrevented ||
+        event.button !== 0 ||
+        event.metaKey ||
+        event.ctrlKey ||
+        event.shiftKey ||
+        event.altKey
+      )
         return;
       const anchor = (event.target as Element | null)?.closest("a");
-      if (!anchor || anchor.target || anchor.hasAttribute("download")) return;
+      if (
+        !anchor ||
+        (anchor.target && anchor.target !== "_self") ||
+        anchor.hasAttribute("download")
+      )
+        return;
       const target = new URL(anchor.href, window.location.href);
       if (
         target.origin !== window.location.origin ||
@@ -23,37 +44,36 @@ export function useUnsavedTrialEntryGuard(isDirty: boolean) {
       )
         return;
       event.preventDefault();
-      setPendingLeave(() => () => window.location.assign(target.href));
-    };
-    const handlePopState = () => {
-      if (allowLeaveRef.current) return;
-      window.history.forward();
-      setPendingLeave(() => () => window.history.back());
+      pendingLeaveRef.current = () => window.location.assign(target.href);
+      setIsConfirmingLeave(true);
     };
     window.addEventListener("beforeunload", handleBeforeUnload);
     document.addEventListener("click", handleClick, true);
-    window.addEventListener("popstate", handlePopState);
     return () => {
       window.removeEventListener("beforeunload", handleBeforeUnload);
       document.removeEventListener("click", handleClick, true);
-      window.removeEventListener("popstate", handlePopState);
     };
   }, [isDirty]);
 
   function requestLeave(action: () => void) {
     if (!isDirty) action();
-    else setPendingLeave(() => action);
+    else queueLeave(action);
   }
 
   return {
-    isConfirmingLeave: pendingLeave !== null,
+    isConfirmingLeave,
     requestLeave,
-    cancelLeave: () => setPendingLeave(null),
+    cancelLeave: () => {
+      pendingLeaveRef.current = null;
+      setIsConfirmingLeave(false);
+    },
     confirmLeave: () => {
-      const action = pendingLeave;
+      const action = pendingLeaveRef.current;
+      pendingLeaveRef.current = null;
+      if (!action) return;
       allowLeaveRef.current = true;
-      setPendingLeave(null);
-      action?.();
+      setIsConfirmingLeave(false);
+      action();
     },
   };
 }
diff --git a/docs/features/admin-trial-management.md b/docs/features/admin-trial-management.md
index e52d4d91..25c88de6 100644
--- a/docs/features/admin-trial-management.md
+++ b/docs/features/admin-trial-management.md
@@ -85,7 +85,9 @@ and follow-up admin flow redesign).
 - Event rows/cards are the interaction target for choosing a selected event.
 - The selected-event header has event edit and workspace navigation actions.
 - The event workspace links to the full-page result form. Dirty result forms
-  confirm internal navigation and use native unload protection for refresh or close.
+  confirm internal navigation and use native unload protection for refresh or
+  close. Browser Back leaves the form without application confirmation because
+  the App Router has no reliable asynchronous route-blocking hook.
 - Selected dog rows have PDF, edit, and result-delete actions.
 - A missing workspace event is shown explicitly and never falls back to a
   different event.
diff --git a/docs/planning/trials/result-creation-r2.md b/docs/planning/trials/result-creation-r2.md
index e2c19694..e0efcb80 100644
--- a/docs/planning/trials/result-creation-r2.md
+++ b/docs/planning/trials/result-creation-r2.md
@@ -58,8 +58,10 @@ field context to identify the rejected section or lisätieto row.
   - Cancel returns to the event workspace.
   - Dirty cancel uses a localized application confirmation dialog before
     discarding values.
-  - Browser-back and internal navigation use a route-blocking application
-    confirmation where technically supported.
+  - Internal navigation uses a route-blocking application confirmation.
+  - Browser Back leaves the form without application confirmation; robust Back
+    interception is deferred until it can use a deterministic history-state
+    design with browser-level tests.
   - Refresh and tab/window close use browser-native unsaved-change protection
     with browser-controlled wording.
   - Clean browser back returns to the event workspace without confirmation.
diff --git a/docs/tech-debt.md b/docs/tech-debt.md
index b5258ee4..fefe4a57 100644
--- a/docs/tech-debt.md
+++ b/docs/tech-debt.md
@@ -26,6 +26,15 @@ Use this format for new entries:
 
 ## Entries
 
+## 2026-07-23 - Add deterministic dirty-form browser Back interception
+
+- Area: Admin AJOK manual-result navigation guard.
+- Issue: Dirty result forms guard explicit internal navigation and full-page unloads, but browser Back intentionally remains unguarded because asynchronous `popstate` recovery can race App Router navigation.
+- Impact: Browser Back can discard an unsaved manual result without application confirmation.
+- Suggested fix: Design a deliberate history-state guard that preserves Next.js history state, handles repeated traversal, and removes its sentinel cleanly before every confirmed navigation.
+- Trigger to revisit: When browser Back confirmation becomes a required result-entry acceptance criterion and can be covered in a real browser.
+- Ticket: BEJ-103 follow-up.
+
 ## 2026-07-20 - Audit date and time field semantics
 
 - Area: Prisma schema, PostgreSQL storage, imports, and API contracts.

From ba92e86b3a4e3a730863a370ac64386f0fb2049a Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Thu, 23 Jul 2026 10:25:59 +0300
Subject: [PATCH 13/24] fix(admin-trials): reject oversized integer input

  Validate trial entry integer fields against PostgreSQL Int bounds
  before
  payload construction so oversized values cannot be silently saved as
  null.

  Cover create and edit flows with boundary, overflow, and long-input
  tests.

  ref BEJ-103
---
 CHANGELOG.md                                  |  1 +
 .../__tests__/entry-create-model.test.ts      | 28 +++++++++++++++++++
 .../__tests__/entry-edit-dialog-model.test.ts | 13 +++++++++
 .../admin/trials/entry-edit-dialog-model.ts   | 11 ++++++--
 4 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 873400e8..0c8e92c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ This project uses a user-facing changelog format.
 
 - Ajokoetuloksen lisätietorivit tallennetaan kelvollisessa kokonaislukujärjestyksessä, ja hylätty lisätietorivi näytetään aiempaa tarkemmin.
 - Ajokoetuloksen lisäyslomakkeen selaimen Takaisin-toiminto ei enää yritä perua navigointia epäluotettavalla edestakaisella sivuhistorian käsittelyllä.
+- Ylisuuria kokonaislukuarvoja ei enää tallenneta tyhjinä ajokoetuloksen luonnissa tai muokkauksessa.
 
 ### Removed
 
diff --git a/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts b/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts
index 52a5cbdd..3553c35f 100644
--- a/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts
+++ b/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts
@@ -62,6 +62,34 @@ describe("manual trial entry create model", () => {
     });
   });
 
+  it.each(["koiriaLuokassa", "hyvaksytytAjominuutit"] as const)(
+    "rejects oversized entry integer input in %s",
+    (field) => {
+      const draft = createAdminTrialEntryCreateDraft(event);
+      draft.registrationNo = "FI123";
+      draft.entry[field] = "9".repeat(400);
+
+      expect(toCreateAdminTrialEntryRequest("event-1", draft)).toEqual({
+        ok: false,
+        section: "entry",
+      });
+    },
+  );
+
+  it.each(["hakumin", "ajomin"] as const)(
+    "rejects oversized era integer input in %s",
+    (field) => {
+      const draft = createAdminTrialEntryCreateDraft(event);
+      draft.registrationNo = "FI123";
+      draft.eras[0][field] = "9".repeat(400);
+
+      expect(toCreateAdminTrialEntryRequest("event-1", draft)).toEqual({
+        ok: false,
+        section: "eras",
+      });
+    },
+  );
+
   it("uses integer persistence order and omits empty lisatieto rows", () => {
     const draft = createAdminTrialEntryCreateDraft(event);
     draft.registrationNo = "FI43560/18";
diff --git a/apps/web/lib/admin/trials/__tests__/entry-edit-dialog-model.test.ts b/apps/web/lib/admin/trials/__tests__/entry-edit-dialog-model.test.ts
index 9ee6a313..e756df55 100644
--- a/apps/web/lib/admin/trials/__tests__/entry-edit-dialog-model.test.ts
+++ b/apps/web/lib/admin/trials/__tests__/entry-edit-dialog-model.test.ts
@@ -54,11 +54,24 @@ describe("entry edit lisatiedot model", () => {
     expect(parseInteger(" 42 ")).toBe(42);
   });
 
+  it("parses only integers representable by PostgreSQL Int", () => {
+    expect(parseInteger("-2147483648")).toBe(-2_147_483_648);
+    expect(parseInteger("2147483647")).toBe(2_147_483_647);
+    expect(parseInteger("-2147483649")).toBeNull();
+    expect(parseInteger("2147483648")).toBeNull();
+    expect(parseInteger("9".repeat(400))).toBeNull();
+  });
+
   it("validates optional numeric input before payload conversion", () => {
     expect(isValidOptionalInteger("")).toBe(true);
     expect(isValidOptionalInteger(" 42 ")).toBe(true);
+    expect(isValidOptionalInteger("-2147483648")).toBe(true);
+    expect(isValidOptionalInteger("2147483647")).toBe(true);
     expect(isValidOptionalInteger("12abc")).toBe(false);
     expect(isValidOptionalInteger("1-2")).toBe(false);
+    expect(isValidOptionalInteger("-2147483649")).toBe(false);
+    expect(isValidOptionalInteger("2147483648")).toBe(false);
+    expect(isValidOptionalInteger("9".repeat(400))).toBe(false);
 
     expect(isValidOptionalDecimal("")).toBe(true);
     expect(isValidOptionalDecimal(" 4,25 ")).toBe(true);
diff --git a/apps/web/lib/admin/trials/entry-edit-dialog-model.ts b/apps/web/lib/admin/trials/entry-edit-dialog-model.ts
index ab538cc6..7a0af752 100644
--- a/apps/web/lib/admin/trials/entry-edit-dialog-model.ts
+++ b/apps/web/lib/admin/trials/entry-edit-dialog-model.ts
@@ -239,12 +239,19 @@ export function toLisatietoRows(
   });
 }
 
+const MIN_DB_INTEGER = -2_147_483_648;
+const MAX_DB_INTEGER = 2_147_483_647;
+
 export function parseInteger(value: string): number | null {
   const trimmed = value.trim();
   if (!trimmed) return null;
   if (!/^-?\d+$/.test(trimmed)) return null;
   const parsed = Number.parseInt(trimmed, 10);
-  return Number.isInteger(parsed) ? parsed : null;
+  return Number.isSafeInteger(parsed) &&
+    parsed >= MIN_DB_INTEGER &&
+    parsed <= MAX_DB_INTEGER
+    ? parsed
+    : null;
 }
 
 export function parseDecimal(value: string): number | null {
@@ -256,7 +263,7 @@ export function parseDecimal(value: string): number | null {
 
 export function isValidOptionalInteger(value: string): boolean {
   const trimmed = value.trim();
-  return trimmed.length === 0 || /^-?\d+$/.test(trimmed);
+  return trimmed.length === 0 || parseInteger(trimmed) !== null;
 }
 
 export function isValidOptionalDecimal(value: string): boolean {

From d68b6c5ffd74488c58d6c996232432f8a800c5c6 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Thu, 23 Jul 2026 10:56:32 +0300
Subject: [PATCH 14/24] docs/bej-103-creation-planning

ref bej-103
---
 docs/planning/trials/README.md                |  21 ++-
 docs/planning/trials/later-ux.md              |  10 +-
 .../trials/result-creation-guided-ux.md       | 145 +++++++++++++++++
 .../trials/result-fields-by-rule-window.md    | 153 ++++++++++--------
 4 files changed, 258 insertions(+), 71 deletions(-)
 create mode 100644 docs/planning/trials/result-creation-guided-ux.md

diff --git a/docs/planning/trials/README.md b/docs/planning/trials/README.md
index 19878253..bb3e6cc8 100644
--- a/docs/planning/trials/README.md
+++ b/docs/planning/trials/README.md
@@ -19,9 +19,13 @@ on the next gate.
   identity, transaction, error, date-only, and Server Action backend contract.
 - [Result creation R2](./result-creation-r2.md) defines the full-page result
   form and admin UI workflow built on the approved R1 contract.
-- [Rule-window-aware result fields](./result-fields-by-rule-window.md) defines
-  the second result-creation follow-up after R2: introduce field-set selection
-  for every rule window and verify the 2023+ set first.
+- [Rule-window-aware result creation](./result-fields-by-rule-window.md)
+  defines R3A: make the existing result-create form use the event's persisted
+  rule window, verify the 2023+ field set, and retain a warned show-all
+  fallback for other windows.
+- [Guided result-creation UX](./result-creation-guided-ux.md) defines R3B:
+  replace only the full-page result-create form with a four-step workflow
+  after R3A has been reviewed.
 - [Later UX](./later-ux.md) records deferred ideas only and does not authorize
   their implementation.
 
@@ -66,6 +70,9 @@ Repository guardrails and current feature documentation:
   adding another result to the same event and finishing at the event workspace.
 - The existing trials master-detail list and existing result-edit modal remain
   in place for BEJ-103.
+- Rule-window-aware presentation is introduced for result creation before any
+  result-editing redesign. Existing result editing remains unchanged through
+  R3A and R3B.
 
 ## Implementation order and review rules
 
@@ -80,14 +87,17 @@ R1 (backend)
  ↓
 R2 (UI)
  ↓
-R3 (rule-window field sets)
+R3A (rule-window-aware creation)
+ ↓
+R3B (guided creation UX)
 ```
 
 1. `E1` - event workspace
 2. `E2` - event creation and empty-event lifecycle
 3. `R1` - manual result schema and backend
 4. `R2` - manual result UI and workflow
-5. `R3` - rule-window-aware result fields, after R2 review
+5. `R3A` - rule-window-aware result creation, after R2 review
+6. `R3B` - guided result-creation UX, after R3A review
 
 For every gate:
 
@@ -108,6 +118,7 @@ BEJ-103 does not authorize:
 - changes to trial statistics or their calculation;
 - redesign of legacy import or Koiratietokanta ingestion;
 - redesign of existing result editing;
+- rule-window-aware result editing;
 - batch entry of several unsaved dog results;
 - a draft/publish workflow;
 - autosave;
diff --git a/docs/planning/trials/later-ux.md b/docs/planning/trials/later-ux.md
index 76170f9a..74f4e884 100644
--- a/docs/planning/trials/later-ux.md
+++ b/docs/planning/trials/later-ux.md
@@ -16,6 +16,10 @@ the review rules in the [BEJ-103 planning overview](./README.md).
   index.
 - Move editing of existing results from the modal to the reusable full-page
   result form.
+- Make existing result editing rule-window-aware, including preservation of
+  stored fields hidden by a narrower verified field set.
+- Redesign result editing only after the R3A and R3B creation gates have been
+  implemented, validated, and reviewed.
 - Add searchable dog selection to manual result creation.
 - Allow inline dog creation from the result flow.
 - Add an explicit draft/publish state for trial events or results.
@@ -27,8 +31,10 @@ the review rules in the [BEJ-103 planning overview](./README.md).
 
 - E1 and E2 retain the existing trials master-detail list.
 - R1 and R2 retain the existing result-edit modal.
-- R2 uses a free-text registration field and saves one complete result at a
-  time.
+- R2, R3A, and R3B use a free-text registration field and save one complete
+  result at a time.
+- R3A and R3B do not change result editing. Older, null, and unknown rule
+  windows use the warned show-all fallback only in result creation.
 - Matching Koiratietokanta upserts are resolved by the authoritative backend
   behavior documented in [Result creation](./result-creation.md), without a
   manual reconciliation screen.
diff --git a/docs/planning/trials/result-creation-guided-ux.md b/docs/planning/trials/result-creation-guided-ux.md
new file mode 100644
index 00000000..41f36eab
--- /dev/null
+++ b/docs/planning/trials/result-creation-guided-ux.md
@@ -0,0 +1,145 @@
+# Follow-up R3B — Guided Result-Creation UX
+
+## Status and sequencing
+
+This is the second creation follow-up after R2. It is planning only and does
+not authorize implementation.
+
+R3A must be implemented, validated, reviewed, and approved before R3B begins.
+R3B consumes the R3A field-set registry and changes only the full-page
+result-create experience. Existing result editing remains unchanged.
+
+## Purpose
+
+Replace the long result-create form with a guided, mobile-capable workflow
+that keeps event context visible, presents only the selected rule window's
+fields, and provides a clear review step before the one atomic save.
+
+## Four-step creation flow
+
+The create route keeps one in-memory draft across four steps:
+
+1. **Perustiedot**
+   - Show read-only event date, place, SKL ID, and rule-window information.
+   - Enter registration, trial/dog metadata, owner snapshots, and
+     judge/signature fields.
+2. **Tulos ja pisteet**
+   - Enter result, status, score, total, note, and era fields allowed by the
+     R3A field set.
+3. **Lisätiedot**
+   - Select and enter the rule-window-specific per-era lisätiedot.
+4. **Yhteenveto**
+   - Review a structured, print-friendly representation of the unsaved
+     request before submission.
+
+No database write occurs when changing steps. The create mutation is called
+only from the summary step.
+
+Backward navigation is always allowed and retains the draft. Moving forward
+validates the current step. Completed steps may be reopened directly; future
+steps cannot be skipped.
+
+## Lisätiedot interaction
+
+- Group rows by the real PDF domains:
+  - Olosuhteet
+  - Haku
+  - Haukku
+  - Metsästysinto
+  - Ajo
+  - Muut ominaisuudet
+- Support search by localized name or code, domain filtering, group
+  expand/collapse, expand all, selected-row chips, and clearing selections.
+- Show the lisätieto code before its localized name.
+- Use localized value-kind or unit guidance. Do not invent descriptive
+  business text that has no authoritative repository source.
+- Selecting a row reveals one control per current era:
+  - marker fields use checkbox-style controls;
+  - integer and decimal fields use matching numeric input modes; and
+  - the unverified fallback can continue to expose text inputs where its
+    generic configuration requires them.
+- Removing a selected row clears its unsaved era values and excludes it from
+  the request.
+- On desktop, keep the selected-row summary visible beside the groups when
+  space permits. On mobile, render the same information above the stacked
+  group cards.
+- Show the current rule-window label and technical ID as read-only context.
+  Show the R3A unverified warning for fallback field sets.
+
+## Review, save, and errors
+
+- The summary displays event identity, registration/basic data, result and
+  era values, and selected non-empty lisätiedot.
+- Do not add an unsaved official-PDF preview contract. The existing official
+  PDF remains available only after a saved entry has an ID.
+- Preserve the existing two successful submission paths:
+  - **Save and add another** creates one result, then resets to step 1 with
+    event-level judge defaults restored.
+  - **Save and finish** creates one result and returns to the event workspace.
+- Preserve duplicate-submit protection, Server Action mutation behavior,
+  query invalidation/refetch, and the rule against optimistic partial cache
+  insertion.
+- Stable backend validation errors return to the populated relevant step:
+  registration/basic errors to step 1, entry/era errors to step 2, and
+  lisätieto errors to step 3.
+- Event-not-found and missing-SKL errors retain their event-level states.
+  Authentication and authorization retain the existing admin behavior.
+- Preserve the existing dirty internal-navigation confirmation and native
+  refresh/tab-close protection across every step. Browser Back retains the R2
+  behavior.
+- Add Finnish and Swedish labels, value hints, validation messages, success
+  feedback, and error feedback for the redesigned creation flow.
+- Add a user-visible `CHANGELOG.md` entry and update durable admin-trial
+  documentation when implemented.
+
+## Exclusions
+
+- No result-edit UI or rule-window-aware editing.
+- No migration of the edit modal to the guided flow.
+- No unsaved PDF generation or new PDF preview endpoint.
+- No searchable dog picker, inline dog creation, batch creation, autosave,
+  draft/publish state, or reconciliation UI.
+- No Prisma schema, backend write-contract, server-validation, PDF renderer,
+  or Koiratietokanta ingestion changes.
+- No new production dependency.
+- No redesign of the trials index or event workspace.
+
+## Acceptance criteria
+
+- Creation uses the R3A field set for the event's persisted rule window.
+- The four steps retain one draft and enforce forward validation without
+  writing before the summary.
+- Search, filtering, grouping, selection chips, and per-era inputs work with
+  both the verified current field set and the warned fallback.
+- The summary represents the final create request without offering an unsaved
+  official PDF.
+- Stable errors return to the correct populated step without losing values.
+- Save-and-add-another and save-and-finish retain their existing persistence,
+  reset, navigation, and cache behavior.
+- Dirty navigation protection works throughout the flow.
+- The workflow is usable at desktop and mobile widths in Finnish and Swedish.
+- The existing result-edit modal behaves exactly as before.
+
+## Targeted validation
+
+- Form-model tests for step ownership, forward validation, backward
+  navigation, completed-step navigation, reset, and draft retention.
+- Lisätieto tests for search, filtering, grouping, selection/removal,
+  per-era controls, corrected input kinds, and mobile/desktop summaries.
+- Summary tests proving parity with the serialized create request.
+- Mutation tests for stable error-to-step mapping, success continuations,
+  duplicate-submit protection, invalidation/refetch, and no optimistic row.
+- Navigation tests for dirty cancel, internal links, browser Back, and native
+  refresh/close protection.
+- Regression tests for event-level missing/error states, the event workspace,
+  selected-event panel, and existing result-edit modal.
+- Targeted web type checking, unit/component tests, and lint without cycle
+  lint.
+- Manual desktop and mobile browser checks for all four steps and both
+  successful continuations when browser tooling is available.
+
+## Merge independence and review gate
+
+R3B can merge after R3A without any result-editing work. Stop after validation
+and request creation-flow review. Editing remains a separately planned and
+approved follow-up.
diff --git a/docs/planning/trials/result-fields-by-rule-window.md b/docs/planning/trials/result-fields-by-rule-window.md
index 937e7e33..b3306d98 100644
--- a/docs/planning/trials/result-fields-by-rule-window.md
+++ b/docs/planning/trials/result-fields-by-rule-window.md
@@ -1,108 +1,133 @@
-# Follow-up R3 — Rule-window-aware Result Fields
+# Follow-up R3A — Rule-Window-Aware Result Creation
 
 ## Status and sequencing
 
-This is the second result-creation follow-up after the current R2 implementation
-and validation work. It is planning only and does not authorize implementation.
+This is the first creation follow-up after R2. It is planning only and does
+not authorize implementation.
 
-R2 must be completed and reviewed before this work begins. The initial R3
-change introduces the rule-window structure and verifies only the current
-2023+ field set. Exact historical field-set audits remain separate follow-up
-work.
+R2 must be completed and reviewed before this work begins. R3A introduces the
+rule-window field-set structure only for the existing full-page result-create
+form and verifies the current 2023+ field set. R3B may redesign result
+creation only after R3A has been implemented, validated, and reviewed.
+
+Existing result editing remains unchanged. Rule-window-aware editing and edit
+UX are deferred work recorded in [Later UX](./later-ux.md).
 
 ## Purpose
 
-Make manual trial result creation and editing choose their visible score, era,
-and lisätieto fields from the event's persisted `trialRuleWindowId`. This keeps
-the current form aligned with the corresponding dog-trial PDF without coupling
-form behavior to PDF coordinates.
+Make manual trial result creation choose its visible score, era, and
+lisätieto fields from the event's persisted `trialRuleWindowId`. This aligns
+new 2023+ results with the corresponding dog-trial PDF before changing the
+creation UI.
 
 The current mismatch is structural:
 
-- PDF rendering already selects a renderer by rule window, while the admin form
-  uses one global field list.
-- The 2023+ renderer does not print the current form's `tja` and `pin` score
+- PDF rendering already selects a renderer by rule window, while the admin
+  create form uses one global field list.
+- The 2023+ renderer does not print the create form's `tja` and `pin` score
   fields.
 - The current PDF consumes only part `a` for lisätieto codes `25` and `27`,
   while the form exposes parts `a`, `b`, and `c`.
-- Lisätieto input types differ for codes `19`, `23`, `26`, and `59`.
-- Historical templates contain different score and lisätieto sets.
+- Create-form lisätieto input kinds differ from the renderer for codes `19`,
+  `23`, `26`, and `59`.
+- Historical templates contain different score and lisätieto sets, but their
+  exact create-form configurations have not been audited.
 
 ## Scope
 
 - Add `trialRuleWindowId` to the admin event-detail contract and propagate the
   stored value through the DB and service mappings.
-- Add a semantic admin result field-set registry covering every seeded rule
+- Add a semantic result-create field-set registry covering every seeded rule
   window ID.
+- Resolve the create field set from the event's persisted
+  `trialRuleWindowId`, never from the browser or by recalculating from the
+  event date.
 - Keep PDF coordinates and drawing logic inside the PDF rule-set modules. The
-  shared semantic configuration defines field availability and value kinds,
-  not layout.
+  create registry defines field availability and value kinds, not layout.
 - Configure `trw_post_20230801` as the first verified field set:
-  - drive visible entry score fields, era fields, and lisätieto rows from the
-    configuration;
-  - omit current-window score fields not consumed by the 2023+ PDF;
-  - represent codes `25` and `27` with the PDF-consumed `a` part without showing
-    the implementation suffix to the administrator;
-  - correct lisätieto value kinds to match the current renderer; and
-  - retain shared registration, owner, judge, result-status, trial-type, and
-    other metadata required by persistence or PDF generation.
-- Register other known, null, and unknown rule windows through one explicitly
-  unverified fallback matching the current form behavior. Show a localized
-  warning instead of presenting the fallback as template-verified.
-- Apply the selected field set to both the full-page create form and the
-  existing edit modal.
-- Preserve hidden values when editing an existing result. Selecting a narrower
-  field set must not silently clear compatibility data or source-projected
-  lisätieto rows.
+  - retain the existing registration, event/result metadata, owner, judge,
+    status, note, total, and other persistence fields required by creation and
+    PDF generation;
+  - omit entry- and era-level `tja` and `pin` score fields;
+  - expose lisätieto codes `10`–`27`, `30`–`42`, and `50`–`62`;
+  - represent codes `25` and `27` with only their PDF-consumed `a` part,
+    displayed as a single row without an implementation suffix;
+  - use integer input for code `19`, decimal input for codes `23`, `26`, and
+    `59`, and retain the renderer-compatible kinds for all other rows; and
+  - keep the existing continuous-era behavior: start with one era and permit
+    additional eras without a create-form maximum, even though the current
+    PDF renders only eras 1 and 2.
+- Register older known, null, and unknown rule windows through one explicitly
+  unverified fallback matching the current show-all create-form behavior.
+- Show a localized warning whenever the unverified fallback is active.
+- Pass field-set configuration only into the result-create flow. Shared
+  components must keep their current default behavior so the existing edit
+  modal is unaffected.
 - Keep backend write shapes and their existing validation semantics unchanged.
-  This gate controls admin presentation and does not add rule-window-specific
+  R3A controls create-form presentation and does not add rule-window-specific
   server rejection.
-- Update the durable admin-trial documentation and add a user-visible
-  `CHANGELOG.md` entry when the behavior is implemented.
+- Update durable admin-trial documentation and add a user-visible
+  `CHANGELOG.md` entry when implemented.
 
 ## Exclusions
 
+- No result-create layout or navigation redesign.
+- No changes to the existing result-edit modal, its visible fields, or its
+  serialization behavior.
+- No rule-window-aware result editing or hidden-value preservation work.
 - No Prisma schema or migration changes.
 - No new production dependency.
-- No PDF coordinate or template changes.
-- No claim that 2005–2011 or 2011–2023 admin field sets are exact.
+- No PDF coordinate, mapper, template, or rendering changes.
+- No exact 2005–2011, 2011–2023, pre-2002, or 2002–2005 field-set claim.
 - No removal or migration of stored compatibility fields.
-- No rule-window-specific validation in Koiratietokanta ingestion.
-- No redesign of result creation or the existing edit modal.
+- No rule-window-specific backend validation or Koiratietokanta ingestion
+  changes.
 
 ## Acceptance criteria
 
 - Admin event details return the event's persisted `trialRuleWindowId`.
-- Create and edit resolve their field set from that stored ID rather than from
-  the browser date.
-- A 2023+ event displays the verified score, era, and lisätieto configuration.
+- Result creation resolves its field set from that stored ID.
+- A 2023+ create form displays the verified score, era, and lisätieto
+  configuration.
 - Codes `25` and `27` persist with part `a`, appear as single rows, and reach
   the existing PDF pivot correctly.
-- Current-window lisätieto value kinds match the 2023+ renderer.
-- Other known, null, and unknown windows retain the existing generic editing
+- Current-window lisätieto input kinds match the 2023+ renderer.
+- Additional continuous eras remain available in the create form.
+- Older known, null, and unknown windows retain the existing generic creation
   capability and display an unverified-field-set warning.
-- Editing through a narrower field set preserves hidden existing values.
-- Existing create/update request contracts and server validation behavior do
-  not change.
+- Existing create request contracts and server validation behavior do not
+  change.
+- The existing edit modal renders and submits exactly as before.
 
 ## Targeted validation
 
-- Contract, DB-mapping, and service tests for `trialRuleWindowId` in admin event
-  details.
-- Field-registry tests covering every seeded rule-window ID and fallback
-  behavior.
-- 2023+ parity tests for visible score fields, era fields, lisätieto codes,
+- Contract, DB-mapping, and service tests for `trialRuleWindowId` in admin
+  event details.
+- Field-registry tests covering every seeded rule-window ID and null/unknown
+  fallback behavior.
+- 2023+ parity tests for visible entry fields, era fields, lisätieto codes,
   parts, ordering, and input kinds.
-- Create-form and edit-modal tests for rule selection, the fallback warning,
-  and hidden-value preservation.
-- Regression tests for request serialization, current validation feedback, and
-  PDF part-`a` mapping.
+- Create-form tests for persisted-rule selection, fallback warning, unlimited
+  continuous eras, and request serialization.
+- Regression tests proving the edit modal retains its current complete field
+  set and request serialization.
+- PDF pivot regression tests for part `a` of codes `25` and `27`.
 - Targeted web, contracts, server, and DB type checks and tests, plus targeted
   lint without cycle lint.
 
-## Later historical audit
+## Merge independence and review gate
+
+R3A can merge independently after R2. It changes only the semantic
+presentation of result creation and leaves result editing unchanged.
+
+Stop after validation and request explicit review. Do not begin the guided
+creation UX in R3B without separate approval.
+
+## Later historical and edit work
+
+After the creation gates are reviewed, plan result editing separately. That
+work must define rule-window selection, hidden stored-value preservation, and
+the edit interaction before changing the existing modal.
 
-After R3 is reviewed, separately compare the 2005–2011 and 2011–2023 PDF
-templates and renderers with stored legacy/API data. Replace the unverified
-fallback for each window only after its score fields, supported era behavior,
-lisätieto rows, value kinds, and preservation behavior have dedicated tests.
+Historical create/edit field sets also require separate audits against the
+2005–2011, 2011–2023, pre-2002, and 2002–2005 templates and source data.

From 873c294d3e99caeb43defd3e953fee5112c7b73f Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Thu, 23 Jul 2026 11:14:18 +0300
Subject: [PATCH 15/24] docs(trials): refine rule-window creation UX plans

ref bej-103
---
 docs/planning/trials/README.md                |  10 +-
 docs/planning/trials/later-ux.md              |   5 +
 .../trials/result-creation-guided-ux.md       | 145 -----------
 docs/planning/trials/result-creation-ux.md    | 235 ++++++++++++++++++
 .../trials/result-fields-by-rule-window.md    |  39 ++-
 5 files changed, 280 insertions(+), 154 deletions(-)
 delete mode 100644 docs/planning/trials/result-creation-guided-ux.md
 create mode 100644 docs/planning/trials/result-creation-ux.md

diff --git a/docs/planning/trials/README.md b/docs/planning/trials/README.md
index bb3e6cc8..79db8678 100644
--- a/docs/planning/trials/README.md
+++ b/docs/planning/trials/README.md
@@ -23,9 +23,9 @@ on the next gate.
   defines R3A: make the existing result-create form use the event's persisted
   rule window, verify the 2023+ field set, and retain a warned show-all
   fallback for other windows.
-- [Guided result-creation UX](./result-creation-guided-ux.md) defines R3B:
-  replace only the full-page result-create form with a four-step workflow
-  after R3A has been reviewed.
+- [Result-creation UX](./result-creation-ux.md) defines R3B: evolve the
+  existing full-page create form into a clearer card-based single-page
+  experience after R3A has been reviewed.
 - [Later UX](./later-ux.md) records deferred ideas only and does not authorize
   their implementation.
 
@@ -89,7 +89,7 @@ R2 (UI)
  ↓
 R3A (rule-window-aware creation)
  ↓
-R3B (guided creation UX)
+R3B (result-creation UX)
 ```
 
 1. `E1` - event workspace
@@ -97,7 +97,7 @@ R3B (guided creation UX)
 3. `R1` - manual result schema and backend
 4. `R2` - manual result UI and workflow
 5. `R3A` - rule-window-aware result creation, after R2 review
-6. `R3B` - guided result-creation UX, after R3A review
+6. `R3B` - card-based result-creation UX, after R3A review
 
 For every gate:
 
diff --git a/docs/planning/trials/later-ux.md b/docs/planning/trials/later-ux.md
index 74f4e884..9f3db1c4 100644
--- a/docs/planning/trials/later-ux.md
+++ b/docs/planning/trials/later-ux.md
@@ -20,6 +20,9 @@ the review rules in the [BEJ-103 planning overview](./README.md).
   stored fields hidden by a narrower verified field set.
 - Redesign result editing only after the R3A and R3B creation gates have been
   implemented, validated, and reviewed.
+- If a guided or multi-step result flow is adopted later, implement it as a
+  coordinator that controls visibility of the reusable R3B cards rather than
+  rewriting their field presentation.
 - Add searchable dog selection to manual result creation.
 - Allow inline dog creation from the result flow.
 - Add an explicit draft/publish state for trial events or results.
@@ -35,6 +38,8 @@ the review rules in the [BEJ-103 planning overview](./README.md).
   result at a time.
 - R3A and R3B do not change result editing. Older, null, and unknown rule
   windows use the warned show-all fallback only in result creation.
+- R3B keeps result creation on one page; a wizard or mandatory multi-step
+  coordinator is not part of the current gates.
 - Matching Koiratietokanta upserts are resolved by the authoritative backend
   behavior documented in [Result creation](./result-creation.md), without a
   manual reconciliation screen.
diff --git a/docs/planning/trials/result-creation-guided-ux.md b/docs/planning/trials/result-creation-guided-ux.md
deleted file mode 100644
index 41f36eab..00000000
--- a/docs/planning/trials/result-creation-guided-ux.md
+++ /dev/null
@@ -1,145 +0,0 @@
-# Follow-up R3B — Guided Result-Creation UX
-
-## Status and sequencing
-
-This is the second creation follow-up after R2. It is planning only and does
-not authorize implementation.
-
-R3A must be implemented, validated, reviewed, and approved before R3B begins.
-R3B consumes the R3A field-set registry and changes only the full-page
-result-create experience. Existing result editing remains unchanged.
-
-## Purpose
-
-Replace the long result-create form with a guided, mobile-capable workflow
-that keeps event context visible, presents only the selected rule window's
-fields, and provides a clear review step before the one atomic save.
-
-## Four-step creation flow
-
-The create route keeps one in-memory draft across four steps:
-
-1. **Perustiedot**
-   - Show read-only event date, place, SKL ID, and rule-window information.
-   - Enter registration, trial/dog metadata, owner snapshots, and
-     judge/signature fields.
-2. **Tulos ja pisteet**
-   - Enter result, status, score, total, note, and era fields allowed by the
-     R3A field set.
-3. **Lisätiedot**
-   - Select and enter the rule-window-specific per-era lisätiedot.
-4. **Yhteenveto**
-   - Review a structured, print-friendly representation of the unsaved
-     request before submission.
-
-No database write occurs when changing steps. The create mutation is called
-only from the summary step.
-
-Backward navigation is always allowed and retains the draft. Moving forward
-validates the current step. Completed steps may be reopened directly; future
-steps cannot be skipped.
-
-## Lisätiedot interaction
-
-- Group rows by the real PDF domains:
-  - Olosuhteet
-  - Haku
-  - Haukku
-  - Metsästysinto
-  - Ajo
-  - Muut ominaisuudet
-- Support search by localized name or code, domain filtering, group
-  expand/collapse, expand all, selected-row chips, and clearing selections.
-- Show the lisätieto code before its localized name.
-- Use localized value-kind or unit guidance. Do not invent descriptive
-  business text that has no authoritative repository source.
-- Selecting a row reveals one control per current era:
-  - marker fields use checkbox-style controls;
-  - integer and decimal fields use matching numeric input modes; and
-  - the unverified fallback can continue to expose text inputs where its
-    generic configuration requires them.
-- Removing a selected row clears its unsaved era values and excludes it from
-  the request.
-- On desktop, keep the selected-row summary visible beside the groups when
-  space permits. On mobile, render the same information above the stacked
-  group cards.
-- Show the current rule-window label and technical ID as read-only context.
-  Show the R3A unverified warning for fallback field sets.
-
-## Review, save, and errors
-
-- The summary displays event identity, registration/basic data, result and
-  era values, and selected non-empty lisätiedot.
-- Do not add an unsaved official-PDF preview contract. The existing official
-  PDF remains available only after a saved entry has an ID.
-- Preserve the existing two successful submission paths:
-  - **Save and add another** creates one result, then resets to step 1 with
-    event-level judge defaults restored.
-  - **Save and finish** creates one result and returns to the event workspace.
-- Preserve duplicate-submit protection, Server Action mutation behavior,
-  query invalidation/refetch, and the rule against optimistic partial cache
-  insertion.
-- Stable backend validation errors return to the populated relevant step:
-  registration/basic errors to step 1, entry/era errors to step 2, and
-  lisätieto errors to step 3.
-- Event-not-found and missing-SKL errors retain their event-level states.
-  Authentication and authorization retain the existing admin behavior.
-- Preserve the existing dirty internal-navigation confirmation and native
-  refresh/tab-close protection across every step. Browser Back retains the R2
-  behavior.
-- Add Finnish and Swedish labels, value hints, validation messages, success
-  feedback, and error feedback for the redesigned creation flow.
-- Add a user-visible `CHANGELOG.md` entry and update durable admin-trial
-  documentation when implemented.
-
-## Exclusions
-
-- No result-edit UI or rule-window-aware editing.
-- No migration of the edit modal to the guided flow.
-- No unsaved PDF generation or new PDF preview endpoint.
-- No searchable dog picker, inline dog creation, batch creation, autosave,
-  draft/publish state, or reconciliation UI.
-- No Prisma schema, backend write-contract, server-validation, PDF renderer,
-  or Koiratietokanta ingestion changes.
-- No new production dependency.
-- No redesign of the trials index or event workspace.
-
-## Acceptance criteria
-
-- Creation uses the R3A field set for the event's persisted rule window.
-- The four steps retain one draft and enforce forward validation without
-  writing before the summary.
-- Search, filtering, grouping, selection chips, and per-era inputs work with
-  both the verified current field set and the warned fallback.
-- The summary represents the final create request without offering an unsaved
-  official PDF.
-- Stable errors return to the correct populated step without losing values.
-- Save-and-add-another and save-and-finish retain their existing persistence,
-  reset, navigation, and cache behavior.
-- Dirty navigation protection works throughout the flow.
-- The workflow is usable at desktop and mobile widths in Finnish and Swedish.
-- The existing result-edit modal behaves exactly as before.
-
-## Targeted validation
-
-- Form-model tests for step ownership, forward validation, backward
-  navigation, completed-step navigation, reset, and draft retention.
-- Lisätieto tests for search, filtering, grouping, selection/removal,
-  per-era controls, corrected input kinds, and mobile/desktop summaries.
-- Summary tests proving parity with the serialized create request.
-- Mutation tests for stable error-to-step mapping, success continuations,
-  duplicate-submit protection, invalidation/refetch, and no optimistic row.
-- Navigation tests for dirty cancel, internal links, browser Back, and native
-  refresh/close protection.
-- Regression tests for event-level missing/error states, the event workspace,
-  selected-event panel, and existing result-edit modal.
-- Targeted web type checking, unit/component tests, and lint without cycle
-  lint.
-- Manual desktop and mobile browser checks for all four steps and both
-  successful continuations when browser tooling is available.
-
-## Merge independence and review gate
-
-R3B can merge after R3A without any result-editing work. Stop after validation
-and request creation-flow review. Editing remains a separately planned and
-approved follow-up.
diff --git a/docs/planning/trials/result-creation-ux.md b/docs/planning/trials/result-creation-ux.md
new file mode 100644
index 00000000..5fd8ca89
--- /dev/null
+++ b/docs/planning/trials/result-creation-ux.md
@@ -0,0 +1,235 @@
+# Follow-up R3B — Result-Creation UX
+
+## Status and sequencing
+
+This is the second creation follow-up after R2. It is planning only and does
+not authorize implementation.
+
+R3A must be implemented, validated, reviewed, and approved before R3B begins.
+R3B consumes the R3A field-set registry and changes only the presentation of
+the existing full-page result-create experience. Existing result editing
+remains unchanged.
+
+The referenced UX screenshots are concepts for hierarchy, cards, and
+lisätieto interaction. They do not specify exact geometry, field counts,
+placement, wording, or a mandatory navigation model.
+
+## Purpose
+
+Evolve the current single-page result-create form into a clearer,
+mobile-capable set of reusable cards. Preserve the familiar save flow and
+overall navigation while improving hierarchy, spacing, descriptions, and
+grouping.
+
+R3B owns presentation only. Field correctness, availability, ordering,
+business grouping, semantic input kinds, and persistence mapping remain owned
+by the R3A registry.
+
+## Single-page card composition
+
+Keep one full-page form and one in-memory draft. Do not require a wizard or
+mandatory multi-step navigation.
+
+Compose the page from independently reusable cards such as:
+
+- event context;
+- Perustiedot;
+- Tulos ja huomautus;
+- Ansiopisteet;
+- Haku, Haukku ja muut;
+- Tuomarit;
+- Erät;
+- Lisätiedot; and
+- an optional informational Yhteenveto.
+
+The exact card boundaries may combine closely related fields when needed for
+responsive layout, but must preserve the current form organization and
+backend request ownership. Other than Lisätiedot, R3B changes spacing,
+descriptions, visual hierarchy, and grouping rather than introducing a new
+workflow.
+
+Cards must not own page navigation or rule-window resolution. They receive
+draft values, callbacks, validation state, and resolved field configuration
+through their interfaces. This keeps them reusable for future editing or for
+a later optional coordinator that controls card visibility without rewriting
+the cards.
+
+## Rule-window presentation
+
+- The event already owns the rule window; the administrator never selects it.
+- Show only minimal localized read-only context, for example
+  `Säännöt: 1.8.2023 →`.
+- Do not expose `trialRuleWindowId` as a normal field. The technical ID may
+  appear only in a tooltip, expandable debug information, or developer
+  diagnostics.
+- For an unverified fallback, show the R3A localized warning without asking
+  the administrator to choose another rule window.
+- Presentation components consume the R3A field set and contain no
+  rule-window-specific branching.
+
+## Lisätiedot workspace
+
+Lisätiedot is the primary R3B UX improvement. Replace the extremely long
+scrolling matrix with a dedicated workspace inside its own card.
+
+The workspace supports:
+
+- search by code;
+- search by localized name;
+- filtering by business/PDF domain;
+- collapsible domain groups;
+- expand all and collapse all;
+- a selected-row summary above the groups;
+- semantic per-era controls; and
+- responsive desktop and mobile layouts.
+
+Use the real business/PDF domains as the primary groups:
+
+- Olosuhteet;
+- Haku;
+- Haukku;
+- Metsästysinto;
+- Ajo; and
+- Muut ominaisuudet.
+
+Numeric ranges may appear as secondary information but never define the
+primary grouping.
+
+Each row presents its code, localized name, optional authoritative
+description, and semantic control together. Do not invent descriptions when
+no authoritative source exists; use localized value-kind or unit guidance
+instead.
+
+Controls come from the R3A semantic input kind:
+
+- `marker` renders as a checkbox or equivalent boolean control;
+- `integer` renders as an integer input;
+- `decimal` renders as a decimal input;
+- `text` renders as a text input; and
+- `tri-state` is allowed only when persistence explicitly distinguishes empty,
+  `0`, and `1`, and renders as meaningful localized choices rather than raw
+  persistence values.
+
+Administrators must not normally enter raw persistence values such as `0` or
+`1`. The UI translates semantic control state through registry persistence
+mapping.
+
+Selected rows remain visible in the summary above the groups. Removing a
+selected row clears all of its unsaved era values. Rows with no values are
+omitted from the create request, preserving the existing request behavior.
+
+On desktop, the workspace may use adjacent filter, group, selected-row, and
+editor regions when space permits. On mobile, it uses stacked groups or an
+overlay/sheet while preserving the same selection and semantic controls.
+These are responsive implementation choices, not separate workflows.
+
+## Erät and other sections
+
+- Keep each era visually independent in the existing card direction.
+- Preserve adding and removing continuous eras and the R3A-configured visible
+  fields.
+- Retain the current organization and validation semantics for all other
+  sections.
+- Improve only spacing, localized descriptions, hierarchy, and grouping
+  outside the Lisätiedot workspace.
+
+## Optional summary
+
+A lightweight informational summary card may appear near the bottom of the
+same page. It may summarize:
+
+- event context;
+- dog/registration data;
+- eras; and
+- selected non-empty lisätiedot.
+
+The summary is not a required confirmation step and does not add an official
+PDF preview. The existing official PDF remains available only after a saved
+entry has an ID.
+
+## Save, errors, and navigation
+
+- Preserve the existing two successful submission paths:
+  - **Save and add another** creates one result, then resets the same page with
+    event-level judge defaults restored.
+  - **Save and finish** creates one result and returns to the event workspace.
+- Preserve existing client/server validation, stable error mapping,
+  duplicate-submit protection, Server Action mutation behavior, query
+  invalidation/refetch, and the rule against optimistic partial cache
+  insertion.
+- Validation and server failures keep the populated single-page form visible
+  and identify the relevant card or field without changing navigation.
+- Preserve the existing dirty internal-navigation confirmation and native
+  refresh/tab-close protection. Browser Back retains the R2 behavior.
+- Add Finnish and Swedish labels, value hints, validation messages, success
+  feedback, and error feedback for the evolved presentation.
+- Add a user-visible `CHANGELOG.md` entry and update durable admin-trial
+  documentation when implemented.
+
+## Exclusions
+
+- No wizard or mandatory multi-step flow.
+- No result-edit UI or rule-window-aware editing.
+- No migration of the edit modal to the card-based create page.
+- No unsaved PDF generation or new PDF preview endpoint.
+- No searchable dog picker, inline dog creation, batch creation, autosave,
+  draft/publish state, or reconciliation UI.
+- No Prisma schema, backend write-contract, server-validation, PDF renderer,
+  or Koiratietokanta ingestion changes.
+- No new production dependency.
+- No redesign of the trials index or event workspace.
+
+## Acceptance criteria
+
+- R3A remains the owner of business correctness and R3B changes presentation
+  only.
+- The existing result-create route remains a familiar single-page form with
+  the same save and navigation behavior.
+- Reusable cards render from the resolved R3A field set and contain no
+  rule-window-specific branching.
+- Rule windows remain mostly invisible: administrators cannot select one,
+  normally see only a localized period label, and do not see the technical ID
+  as a standard field.
+- Lisätiedot provides search, domain filtering, collapsible groups,
+  expand/collapse all, selected-row summary, and semantic per-era controls.
+- Business/PDF domains are the primary lisätieto grouping; numeric ranges are
+  secondary only.
+- Removing a selected lisätieto clears its unsaved values, and empty rows are
+  omitted from the create request.
+- Erät and other sections preserve their current behavior while gaining
+  clearer card hierarchy and responsive presentation.
+- The optional summary is informational and does not create a new confirmation
+  or PDF-preview step.
+- Save-and-add-another, save-and-finish, validation, dirty navigation,
+  mutation, and cache behavior remain unchanged.
+- Cards are independently reusable by future editing without implementing or
+  redesigning editing in R3B.
+- The page is usable at desktop and mobile widths in Finnish and Swedish.
+- The existing result-edit modal behaves exactly as before.
+
+## Targeted validation
+
+- Card tests for independent rendering, field-set-driven visibility,
+  validation presentation, and draft callbacks.
+- Lisätieto tests for code/name search, domain filtering, group
+  expand/collapse, selected-row summary, selection removal, semantic controls,
+  per-era values, and omission of empty rows.
+- Tests proving semantic marker and tri-state controls serialize through the
+  registry without exposing raw persistence values.
+- Responsive component tests for desktop and mobile workspace variants.
+- Regression tests for create request serialization, both success
+  continuations, stable errors, duplicate-submit protection,
+  invalidation/refetch, dirty navigation, and no optimistic row.
+- Regression tests for event-level missing/error states, the event workspace,
+  selected-event panel, and existing result-edit modal.
+- Targeted web type checking, unit/component tests, and lint without cycle
+  lint.
+- Manual desktop and mobile browser checks for the card hierarchy,
+  Lisätiedot workspace, and both successful continuations when browser tooling
+  is available.
+
+## Merge independence and review gate
+
+R3B can merge after R3A without any result-editing work. Stop after validation
+and request creation-flow review. Editing remains a separately planned and
+approved follow-up.
diff --git a/docs/planning/trials/result-fields-by-rule-window.md b/docs/planning/trials/result-fields-by-rule-window.md
index b3306d98..386b133c 100644
--- a/docs/planning/trials/result-fields-by-rule-window.md
+++ b/docs/planning/trials/result-fields-by-rule-window.md
@@ -20,6 +20,12 @@ lisätieto fields from the event's persisted `trialRuleWindowId`. This aligns
 new 2023+ results with the corresponding dog-trial PDF before changing the
 creation UI.
 
+R3A owns field correctness, not layout. Its registry is the single source of
+truth for visible fields, ordering, business/PDF grouping, semantic input
+kinds, and the persistence metadata needed to serialize a selected field.
+Presentation components consume the resolved field set and must not branch on
+specific rule-window IDs.
+
 The current mismatch is structural:
 
 - PDF rendering already selects a renderer by rule window, while the admin
@@ -38,7 +44,13 @@ The current mismatch is structural:
 - Add `trialRuleWindowId` to the admin event-detail contract and propagate the
   stored value through the DB and service mappings.
 - Add a semantic result-create field-set registry covering every seeded rule
-  window ID.
+  window ID. The registry defines field visibility, ordering, grouping,
+  semantic input kinds, and persistence mapping.
+- Define semantic input kinds independently from stored values:
+  `marker`, `integer`, `decimal`, and `text`, plus `tri-state` only for a field
+  whose persistence explicitly distinguishes empty, `0`, and `1`. The
+  registry owns the mapping between semantic control state and persisted
+  values.
 - Resolve the create field set from the event's persisted
   `trialRuleWindowId`, never from the browser or by recalculating from the
   event date.
@@ -60,6 +72,12 @@ The current mismatch is structural:
 - Register older known, null, and unknown rule windows through one explicitly
   unverified fallback matching the current show-all create-form behavior.
 - Show a localized warning whenever the unverified fallback is active.
+- Treat rule-window selection as event-owned context. The administrator never
+  chooses or changes it from the result-create form.
+- Show only a minimal localized read-only rule-period label, for example
+  `Säännöt: 1.8.2023 →`. The technical `trialRuleWindowId` may appear only in
+  a tooltip, expandable diagnostics, or developer output, never as a normal
+  user-facing form field.
 - Pass field-set configuration only into the result-create flow. Shared
   components must keep their current default behavior so the existing edit
   modal is unaffected.
@@ -87,6 +105,14 @@ The current mismatch is structural:
 
 - Admin event details return the event's persisted `trialRuleWindowId`.
 - Result creation resolves its field set from that stored ID.
+- The field registry is the single source of truth for create-form visibility,
+  ordering, grouping, semantic controls, and persistence mapping; UI
+  components contain no rule-window-ID branches.
+- Semantic control state maps to persistence values through the registry,
+  including tri-state only where empty, `0`, and `1` are distinct domain
+  values.
+- Administrators cannot select a rule window and normally see only its
+  localized period label.
 - A 2023+ create form displays the verified score, era, and lisätieto
   configuration.
 - Codes `25` and `27` persist with part `a`, appear as single rows, and reach
@@ -105,10 +131,15 @@ The current mismatch is structural:
   event details.
 - Field-registry tests covering every seeded rule-window ID and null/unknown
   fallback behavior.
+- Registry tests for semantic input kinds and control-state-to-persistence
+  mapping, including any explicitly configured tri-state field.
 - 2023+ parity tests for visible entry fields, era fields, lisätieto codes,
   parts, ordering, and input kinds.
 - Create-form tests for persisted-rule selection, fallback warning, unlimited
-  continuous eras, and request serialization.
+  continuous eras, minimal rule-period presentation, and request
+  serialization.
+- Presentation tests proving the resolved registry configuration drives
+  rendering without rule-window-specific component branches.
 - Regression tests proving the edit modal retains its current complete field
   set and request serialization.
 - PDF pivot regression tests for part `a` of codes `25` and `27`.
@@ -120,8 +151,8 @@ The current mismatch is structural:
 R3A can merge independently after R2. It changes only the semantic
 presentation of result creation and leaves result editing unchanged.
 
-Stop after validation and request explicit review. Do not begin the guided
-creation UX in R3B without separate approval.
+Stop after validation and request explicit review. Do not begin the
+card-based creation UX in R3B without separate approval.
 
 ## Later historical and edit work
 

From 6298f1fa73d5edd2a6ad109fd37840a5e30f554d Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Thu, 23 Jul 2026 11:53:55 +0300
Subject: [PATCH 16/24] docs(trials): clarify reusable creation UX scope

---
 docs/planning/trials/later-ux.md                  |  8 +++-----
 docs/planning/trials/result-creation-ux.md        | 14 ++++++++++++--
 .../trials/result-fields-by-rule-window.md        | 15 ++++++++-------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/docs/planning/trials/later-ux.md b/docs/planning/trials/later-ux.md
index 9f3db1c4..9161af6b 100644
--- a/docs/planning/trials/later-ux.md
+++ b/docs/planning/trials/later-ux.md
@@ -20,9 +20,6 @@ the review rules in the [BEJ-103 planning overview](./README.md).
   stored fields hidden by a narrower verified field set.
 - Redesign result editing only after the R3A and R3B creation gates have been
   implemented, validated, and reviewed.
-- If a guided or multi-step result flow is adopted later, implement it as a
-  coordinator that controls visibility of the reusable R3B cards rather than
-  rewriting their field presentation.
 - Add searchable dog selection to manual result creation.
 - Allow inline dog creation from the result flow.
 - Add an explicit draft/publish state for trial events or results.
@@ -38,8 +35,9 @@ the review rules in the [BEJ-103 planning overview](./README.md).
   result at a time.
 - R3A and R3B do not change result editing. Older, null, and unknown rule
   windows use the warned show-all fallback only in result creation.
-- R3B keeps result creation on one page; a wizard or mandatory multi-step
-  coordinator is not part of the current gates.
+- R3B does not require a wizard. If a guided presentation is adopted during
+  R3B, it must be a thin coordinator over the same reusable cards and preserve
+  the existing save and navigation behavior.
 - Matching Koiratietokanta upserts are resolved by the authoritative backend
   behavior documented in [Result creation](./result-creation.md), without a
   manual reconciliation screen.
diff --git a/docs/planning/trials/result-creation-ux.md b/docs/planning/trials/result-creation-ux.md
index 5fd8ca89..1f2009cd 100644
--- a/docs/planning/trials/result-creation-ux.md
+++ b/docs/planning/trials/result-creation-ux.md
@@ -30,6 +30,12 @@ by the R3A registry.
 Keep one full-page form and one in-memory draft. Do not require a wizard or
 mandatory multi-step navigation.
 
+A guided or multi-step presentation is permitted, but it is not an R3B
+requirement. If implementation review shows that guidance is useful, add it as
+a thin coordinator that controls which reusable cards are visible. It must not
+duplicate card content, create separate field models, or change the existing
+save and navigation contract.
+
 Compose the page from independently reusable cards such as:
 
 - event context;
@@ -51,7 +57,7 @@ workflow.
 Cards must not own page navigation or rule-window resolution. They receive
 draft values, callbacks, validation state, and resolved field configuration
 through their interfaces. This keeps them reusable for future editing or for
-a later optional coordinator that controls card visibility without rewriting
+an optional R3B coordinator that controls card visibility without rewriting
 the cards.
 
 ## Rule-window presentation
@@ -168,7 +174,9 @@ entry has an ID.
 
 ## Exclusions
 
-- No wizard or mandatory multi-step flow.
+- No requirement to implement a wizard or mandatory multi-step flow. Any
+  guided presentation must remain a thin coordinator over the same reusable
+  cards.
 - No result-edit UI or rule-window-aware editing.
 - No migration of the edit modal to the card-based create page.
 - No unsaved PDF generation or new PDF preview endpoint.
@@ -185,6 +193,8 @@ entry has an ID.
   only.
 - The existing result-create route remains a familiar single-page form with
   the same save and navigation behavior.
+- A guided presentation, if adopted, reuses the same cards and field model and
+  does not change persistence, save, or navigation behavior.
 - Reusable cards render from the resolved R3A field set and contain no
   rule-window-specific branching.
 - Rule windows remain mostly invisible: administrators cannot select one,
diff --git a/docs/planning/trials/result-fields-by-rule-window.md b/docs/planning/trials/result-fields-by-rule-window.md
index 386b133c..d7ca795c 100644
--- a/docs/planning/trials/result-fields-by-rule-window.md
+++ b/docs/planning/trials/result-fields-by-rule-window.md
@@ -22,9 +22,9 @@ creation UI.
 
 R3A owns field correctness, not layout. Its registry is the single source of
 truth for visible fields, ordering, business/PDF grouping, semantic input
-kinds, and the persistence metadata needed to serialize a selected field.
-Presentation components consume the resolved field set and must not branch on
-specific rule-window IDs.
+kinds, localized value hints, and the persistence metadata needed to serialize
+a selected field. Presentation components consume the resolved field set and
+must not branch on specific rule-window IDs.
 
 The current mismatch is structural:
 
@@ -45,7 +45,7 @@ The current mismatch is structural:
   stored value through the DB and service mappings.
 - Add a semantic result-create field-set registry covering every seeded rule
   window ID. The registry defines field visibility, ordering, grouping,
-  semantic input kinds, and persistence mapping.
+  semantic input kinds, localized value hints, and persistence mapping.
 - Define semantic input kinds independently from stored values:
   `marker`, `integer`, `decimal`, and `text`, plus `tri-state` only for a field
   whose persistence explicitly distinguishes empty, `0`, and `1`. The
@@ -106,8 +106,8 @@ The current mismatch is structural:
 - Admin event details return the event's persisted `trialRuleWindowId`.
 - Result creation resolves its field set from that stored ID.
 - The field registry is the single source of truth for create-form visibility,
-  ordering, grouping, semantic controls, and persistence mapping; UI
-  components contain no rule-window-ID branches.
+  ordering, grouping, semantic controls, localized value hints, and
+  persistence mapping; UI components contain no rule-window-ID branches.
 - Semantic control state maps to persistence values through the registry,
   including tri-state only where empty, `0`, and `1` are distinct domain
   values.
@@ -132,7 +132,8 @@ The current mismatch is structural:
 - Field-registry tests covering every seeded rule-window ID and null/unknown
   fallback behavior.
 - Registry tests for semantic input kinds and control-state-to-persistence
-  mapping, including any explicitly configured tri-state field.
+  mapping, including localized value hints and any explicitly configured
+  tri-state field.
 - 2023+ parity tests for visible entry fields, era fields, lisätieto codes,
   parts, ordering, and input kinds.
 - Create-form tests for persisted-rule selection, fallback warning, unlimited

From ae771ccbbc7afdb4ca920c9d9660eef316e7d599 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Thu, 23 Jul 2026 12:57:11 +0300
Subject: [PATCH 17/24] feat(trials): make result creation rule-window aware
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Resolve the manual result-create field set from the trial event’s
  persisted
  rule window.

  - add trialRuleWindowId to admin event details
  - configure and verify the current 2023+ score, era, and lisätieto
    fields
  - hide obsolete tja and pin score fields for current rules
  - use Ajotaito for the current rule period
  - align lisätieto codes, parts, input types, and marker persistence
    with the PDF
  - retain a warned legacy fallback for older and unknown rule windows
  - preserve existing result-edit behavior

  ref bej-103
---
 CHANGELOG.md                                  |   1 +
 .../admin-trial-event-edit-dialog.test.tsx    |   1 +
 .../admin-trial-selected-event-panel.test.tsx |   3 +
 .../admin-trial-entry-create-page-client.tsx  |  21 ++-
 .../__tests__/entry-meta-section.test.tsx     |  20 +++
 .../internal/__tests__/era-section.test.tsx   |  33 ++++
 .../trials/internal/entry-meta-section.tsx    | 141 +++++++++++----
 .../admin/trials/internal/era-section.tsx     |  50 +++---
 .../trials/internal/lisatiedot-matrix.tsx     |  52 +++++-
 .../__tests__/entry-create-model.test.ts      |  22 +++
 .../result-create-field-registry.test.ts      |  80 +++++++++
 .../lib/admin/trials/entry-create-model.ts    |  17 +-
 .../web/lib/admin/trials/entry-edit-config.ts |   7 +-
 .../admin/trials/entry-edit-dialog-model.ts   |  21 ++-
 apps/web/lib/admin/trials/index.ts            |   1 +
 .../trials/result-create-field-registry.ts    | 165 ++++++++++++++++++
 .../lib/i18n/messages/admin/trials/manage.ts  |  22 +++
 docs/features/admin-trial-management.md       |  16 +-
 .../manage/admin-trial-event-details.ts       |   1 +
 .../get-trial-event-details.parity.test.ts    |   2 +
 .../trials/manage/get-trial-event-details.ts  |   2 +
 packages/db/admin/trials/manage/types.ts      |   1 +
 .../manage/__tests__/get-trial-event.test.ts  |   2 +
 .../admin/trials/manage/get-trial-event.ts    |   1 +
 .../__tests__/get-trial-dog-pdf-data.test.ts  |  35 ++++
 25 files changed, 650 insertions(+), 67 deletions(-)
 create mode 100644 apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx
 create mode 100644 apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts
 create mode 100644 apps/web/lib/admin/trials/result-create-field-registry.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c8e92c6..191007c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ This project uses a user-facing changelog format.
 
 - Viimeisen koetuloksen poistaminen säilyttää ajokoetapahtuman tyhjänä, kunnes ylläpitäjä poistaa tapahtuman erikseen.
 - Uuden ajokoetapahtuman luomisen jälkeen siirrytään suoraan lisäämään tapahtuman ensimmäistä koetulosta.
+- Ajokoetuloksen lisäyslomake näyttää 1.8.2023 alkaen käytössä olevan sääntökauden mukaiset kentät. Vanhemmilla tai tunnistamattomilla sääntökausilla kaikki yhteensopivuuskentät säilyvät näkyvissä varoituksen kanssa.
 
 ### Fixed
 
diff --git a/apps/web/components/admin/trials/__tests__/admin-trial-event-edit-dialog.test.tsx b/apps/web/components/admin/trials/__tests__/admin-trial-event-edit-dialog.test.tsx
index c532fe21..6dc0f26f 100644
--- a/apps/web/components/admin/trials/__tests__/admin-trial-event-edit-dialog.test.tsx
+++ b/apps/web/components/admin/trials/__tests__/admin-trial-event-edit-dialog.test.tsx
@@ -51,6 +51,7 @@ vi.mock("@/components/ui/input", () => ({
 
 const event1 = {
   trialEventId: "event-1",
+  trialRuleWindowId: "trw_post_20230801",
   eventDate: "2026-04-14",
   eventPlace: "Helsinki",
   eventName: "Kevatkoe",
diff --git a/apps/web/components/admin/trials/__tests__/admin-trial-selected-event-panel.test.tsx b/apps/web/components/admin/trials/__tests__/admin-trial-selected-event-panel.test.tsx
index 41dd1c23..f1edacaf 100644
--- a/apps/web/components/admin/trials/__tests__/admin-trial-selected-event-panel.test.tsx
+++ b/apps/web/components/admin/trials/__tests__/admin-trial-selected-event-panel.test.tsx
@@ -94,6 +94,7 @@ describe("AdminTrialSelectedEventPanel", () => {
       React.createElement(AdminTrialSelectedEventPanel, {
         selectedEvent: {
           trialEventId: "event-1",
+          trialRuleWindowId: "trw_post_20230801",
           eventDate: "2026-04-14",
           eventPlace: "Helsinki",
           eventName: "Kevatkoe",
@@ -143,6 +144,7 @@ describe("AdminTrialSelectedEventPanel", () => {
       React.createElement(AdminTrialSelectedEventPanel, {
         selectedEvent: {
           trialEventId: "event-1",
+          trialRuleWindowId: null,
           eventDate: "2026-04-14",
           eventPlace: "Helsinki",
           eventName: null,
@@ -175,6 +177,7 @@ describe("AdminTrialSelectedEventPanel", () => {
       React.createElement(AdminTrialSelectedEventPanel, {
         selectedEvent: {
           trialEventId: "event-1",
+          trialRuleWindowId: null,
           eventDate: "2026-04-14",
           eventPlace: "Helsinki",
           eventName: null,
diff --git a/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx b/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
index 8cf7f2ad..77af1c1d 100644
--- a/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
+++ b/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
@@ -19,6 +19,7 @@ import {
   getAdminTrialEventHref,
   getAdminTrialsHref,
   getNextEraNumber,
+  resolveResultCreateFieldSet,
   toCreateAdminTrialEntryRequest,
 } from "@/lib/admin/trials";
 import {
@@ -113,9 +114,13 @@ function ResultCreateForm({
   const { t } = useI18n();
   const router = useRouter();
   const mutation = useCreateAdminTrialEntryMutation();
+  const fieldSet = React.useMemo(
+    () => resolveResultCreateFieldSet(event.trialRuleWindowId),
+    [event.trialRuleWindowId],
+  );
   const initial = React.useMemo(
-    () => createAdminTrialEntryCreateDraft(event),
-    [event],
+    () => createAdminTrialEntryCreateDraft(event, fieldSet),
+    [event, fieldSet],
   );
   const [draft, setDraft] = React.useState(initial);
   const [errorText, setErrorText] = React.useState<string | null>(null);
@@ -164,7 +169,7 @@ function ResultCreateForm({
       await mutation.mutateAsync(parsed.request);
       toast.success(t("admin.trials.manage.resultCreate.success"));
       if (intent === "another")
-        setDraft(createAdminTrialEntryCreateDraft(event));
+        setDraft(createAdminTrialEntryCreateDraft(event, fieldSet));
       else router.replace(workspaceHref);
     } catch (error) {
       const code =
@@ -215,6 +220,14 @@ function ResultCreateForm({
           {formatDateForFinland(event.eventDate)} • {event.eventPlace} • SKL{" "}
           {event.sklKoeId}
         </p>
+        <p className="text-sm text-muted-foreground">
+          {t(fieldSet.rulePeriodMessageKey)}
+        </p>
+        {!fieldSet.verified ? (
+          <p className="text-sm text-amber-700" role="alert">
+            {t("admin.trials.manage.resultCreate.ruleWindowWarning")}
+          </p>
+        ) : null}
       </div>
       <Card>
         <CardContent className="space-y-5 p-5">
@@ -245,6 +258,7 @@ function ResultCreateForm({
                 entry: update(current.entry),
               }))
             }
+            visibleFields={fieldSet.entryFields}
           />
           <EraSection
             eras={draft.eras}
@@ -259,6 +273,7 @@ function ResultCreateForm({
                 ),
               }))
             }
+            visibleFields={fieldSet.eraFields}
           />
           <LisatiedotMatrix
             eras={draft.eras}
diff --git a/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx b/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
index edc02b56..89698d53 100644
--- a/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
+++ b/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { renderToStaticMarkup } from "react-dom/server";
 import { describe, expect, it, vi } from "vitest";
 import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { resolveResultCreateFieldSet } from "@/lib/admin/trials/result-create-field-registry";
 import { EntryMetaSection } from "../entry-meta-section";
 
 const entryDraft: EntryDraft = {
@@ -72,4 +73,23 @@ describe("EntryMetaSection", () => {
     expect(html).toContain("Ryhmätuomari");
     expect(html).toContain("Palkintotuomari");
   });
+
+  it("uses create-only field visibility without changing the default edit view", () => {
+    const html = renderToStaticMarkup(
+      React.createElement(EntryMetaSection, {
+        entryDraft,
+        isPending: false,
+        onChange: vi.fn(),
+        visibleFields:
+          resolveResultCreateFieldSet("trw_post_20230801").entryFields,
+      }),
+    );
+
+    expect(html).not.toContain("Tie ja estetyöskentely");
+    expect(html).not.toContain("Metsästysinto");
+    expect(html).not.toContain("Ajotaito / yleisvaikutelma");
+    expect(html).not.toContain("<h5");
+    expect(html).toContain("Ajotaito");
+    expect(html).toContain("Ansiopisteet yhteensä");
+  });
 });
diff --git a/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx b/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx
new file mode 100644
index 00000000..30c182a0
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx
@@ -0,0 +1,33 @@
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it, vi } from "vitest";
+import { createEmptyEraDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { resolveResultCreateFieldSet } from "@/lib/admin/trials/result-create-field-registry";
+import { EraSection } from "../era-section";
+
+describe("EraSection", () => {
+  it("uses the current-era Ajotaito label only in configured creation", () => {
+    const props = {
+      eras: [createEmptyEraDraft(1)],
+      isPending: false,
+      onAddEra: vi.fn(),
+      onRemoveEra: vi.fn(),
+      onChangeEraField: vi.fn(),
+    };
+
+    const createHtml = renderToStaticMarkup(
+      React.createElement(EraSection, {
+        ...props,
+        visibleFields:
+          resolveResultCreateFieldSet("trw_post_20230801").eraFields,
+      }),
+    );
+    const editHtml = renderToStaticMarkup(
+      React.createElement(EraSection, props),
+    );
+
+    expect(createHtml).toContain("ajotaito");
+    expect(createHtml).not.toContain("ajotaito / yleisvaikutelma");
+    expect(editHtml).toContain("ajotaito / yleisvaikutelma");
+  });
+});
diff --git a/apps/web/components/admin/trials/internal/entry-meta-section.tsx b/apps/web/components/admin/trials/internal/entry-meta-section.tsx
index d9172d19..711725cb 100644
--- a/apps/web/components/admin/trials/internal/entry-meta-section.tsx
+++ b/apps/web/components/admin/trials/internal/entry-meta-section.tsx
@@ -6,15 +6,23 @@ type Props = {
   entryDraft: EntryDraft;
   isPending: boolean;
   onChange: (updater: (current: EntryDraft) => EntryDraft) => void;
+  visibleFields?: ReadonlySet<keyof EntryDraft>;
 };
 
-export function EntryMetaSection({ entryDraft, isPending, onChange }: Props) {
+export function EntryMetaSection({
+  entryDraft,
+  isPending,
+  onChange,
+  visibleFields,
+}: Props) {
   function updateField(field: keyof EntryDraft, value: string) {
     onChange((current) => ({
       ...current,
       [field]: value,
     }));
   }
+  const visible = (field: keyof EntryDraft) =>
+    !visibleFields || visibleFields.has(field);
 
   return (
     <div className="space-y-4">
@@ -158,8 +166,8 @@ export function EntryMetaSection({ entryDraft, isPending, onChange }: Props) {
         <h4 className="text-xs font-semibold uppercase text-muted-foreground">
           Ansiopisteet
         </h4>
-        <div className="space-y-4">
-          <ScoreSubsection title="Ajo">
+        {visibleFields ? (
+          <div className="grid gap-3 md:grid-cols-4">
             <TextField
               label="Hyväksytyt ajominuutit"
               value={entryDraft.hyvaksytytAjominuutit}
@@ -174,15 +182,6 @@ export function EntryMetaSection({ entryDraft, isPending, onChange }: Props) {
               disabled={isPending}
               onChange={(value) => updateField("ajoajanPisteet", value)}
             />
-            <TextField
-              label="Ajotaito / yleisvaikutelma"
-              value={entryDraft.yva}
-              inputMode="decimal"
-              disabled={isPending}
-              onChange={(value) => updateField("yva", value)}
-            />
-          </ScoreSubsection>
-          <ScoreSubsection title="Haku">
             <TextField
               label="Haku"
               value={entryDraft.haku}
@@ -190,8 +189,6 @@ export function EntryMetaSection({ entryDraft, isPending, onChange }: Props) {
               disabled={isPending}
               onChange={(value) => updateField("haku", value)}
             />
-          </ScoreSubsection>
-          <ScoreSubsection title="Haukku">
             <TextField
               label="Haukku"
               value={entryDraft.hauk}
@@ -199,31 +196,113 @@ export function EntryMetaSection({ entryDraft, isPending, onChange }: Props) {
               disabled={isPending}
               onChange={(value) => updateField("hauk", value)}
             />
-          </ScoreSubsection>
-          <ScoreSubsection title="Muut">
-            <TextField
-              label="Ansiopisteet yhteensä"
-              value={entryDraft.ansiopisteetYhteensa}
-              inputMode="decimal"
-              disabled={isPending}
-              onChange={(value) => updateField("ansiopisteetYhteensa", value)}
-            />
             <TextField
-              label="Tie ja estetyöskentely"
-              value={entryDraft.tja}
+              label="Ajotaito"
+              value={entryDraft.yva}
               inputMode="decimal"
               disabled={isPending}
-              onChange={(value) => updateField("tja", value)}
+              onChange={(value) => updateField("yva", value)}
             />
+            {visible("tja") ? (
+              <TextField
+                label="Tie ja estetyöskentely"
+                value={entryDraft.tja}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("tja", value)}
+              />
+            ) : null}
+            {visible("pin") ? (
+              <TextField
+                label="Metsästysinto"
+                value={entryDraft.pin}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("pin", value)}
+              />
+            ) : null}
             <TextField
-              label="Metsästysinto"
-              value={entryDraft.pin}
+              label="Ansiopisteet yhteensä"
+              value={entryDraft.ansiopisteetYhteensa}
               inputMode="decimal"
               disabled={isPending}
-              onChange={(value) => updateField("pin", value)}
+              onChange={(value) => updateField("ansiopisteetYhteensa", value)}
             />
-          </ScoreSubsection>
-        </div>
+          </div>
+        ) : (
+          <div className="space-y-4">
+            <ScoreSubsection title="Ajo">
+              <TextField
+                label="Hyväksytyt ajominuutit"
+                value={entryDraft.hyvaksytytAjominuutit}
+                inputMode="numeric"
+                disabled={isPending}
+                onChange={(value) =>
+                  updateField("hyvaksytytAjominuutit", value)
+                }
+              />
+              <TextField
+                label="Ajoajan pisteet"
+                value={entryDraft.ajoajanPisteet}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("ajoajanPisteet", value)}
+              />
+              <TextField
+                label="Ajotaito / yleisvaikutelma"
+                value={entryDraft.yva}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("yva", value)}
+              />
+            </ScoreSubsection>
+            <ScoreSubsection title="Haku">
+              <TextField
+                label="Haku"
+                value={entryDraft.haku}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("haku", value)}
+              />
+            </ScoreSubsection>
+            <ScoreSubsection title="Haukku">
+              <TextField
+                label="Haukku"
+                value={entryDraft.hauk}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("hauk", value)}
+              />
+            </ScoreSubsection>
+            <ScoreSubsection title="Muut">
+              <TextField
+                label="Ansiopisteet yhteensä"
+                value={entryDraft.ansiopisteetYhteensa}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("ansiopisteetYhteensa", value)}
+              />
+              {visible("tja") ? (
+                <TextField
+                  label="Tie ja estetyöskentely"
+                  value={entryDraft.tja}
+                  inputMode="decimal"
+                  disabled={isPending}
+                  onChange={(value) => updateField("tja", value)}
+                />
+              ) : null}
+              {visible("pin") ? (
+                <TextField
+                  label="Metsästysinto"
+                  value={entryDraft.pin}
+                  inputMode="decimal"
+                  disabled={isPending}
+                  onChange={(value) => updateField("pin", value)}
+                />
+              ) : null}
+            </ScoreSubsection>
+          </div>
+        )}
       </section>
 
       <section className="space-y-2">
diff --git a/apps/web/components/admin/trials/internal/era-section.tsx b/apps/web/components/admin/trials/internal/era-section.tsx
index a7821a47..f1f597b6 100644
--- a/apps/web/components/admin/trials/internal/era-section.tsx
+++ b/apps/web/components/admin/trials/internal/era-section.tsx
@@ -14,6 +14,7 @@ type Props = {
     field: Exclude<keyof EraDraft, "era">,
     value: string,
   ) => void;
+  visibleFields?: ReadonlySet<Exclude<keyof EraDraft, "era">>;
 };
 
 export function EraSection({
@@ -22,6 +23,7 @@ export function EraSection({
   onAddEra,
   onRemoveEra,
   onChangeEraField,
+  visibleFields,
 }: Props) {
   return (
     <>
@@ -64,32 +66,40 @@ export function EraSection({
                     "tja",
                     "pin",
                   ] as const
-                ).map((field) => (
-                  <label key={field} className="space-y-1 text-xs">
-                    <span>{ADMIN_TRIAL_ERA_FIELD_LABELS[field]}</span>
+                ).map((field) =>
+                  visibleFields && !visibleFields.has(field) ? null : (
+                    <label key={field} className="space-y-1 text-xs">
+                      <span>
+                        {visibleFields && field === "yva"
+                          ? "ajotaito"
+                          : ADMIN_TRIAL_ERA_FIELD_LABELS[field]}
+                      </span>
+                      <Input
+                        value={era[field]}
+                        disabled={isPending}
+                        onChange={(event) =>
+                          onChangeEraField(era.era, field, event.target.value)
+                        }
+                      />
+                    </label>
+                  ),
+                )}
+                {!visibleFields || visibleFields.has("huomautusTeksti") ? (
+                  <label className="space-y-1 text-xs md:col-span-4">
+                    <span>Huomautusteksti</span>
                     <Input
-                      value={era[field]}
+                      value={era.huomautusTeksti}
                       disabled={isPending}
                       onChange={(event) =>
-                        onChangeEraField(era.era, field, event.target.value)
+                        onChangeEraField(
+                          era.era,
+                          "huomautusTeksti",
+                          event.target.value,
+                        )
                       }
                     />
                   </label>
-                ))}
-                <label className="space-y-1 text-xs md:col-span-4">
-                  <span>Huomautusteksti</span>
-                  <Input
-                    value={era.huomautusTeksti}
-                    disabled={isPending}
-                    onChange={(event) =>
-                      onChangeEraField(
-                        era.era,
-                        "huomautusTeksti",
-                        event.target.value,
-                      )
-                    }
-                  />
-                </label>
+                ) : null}
               </div>
             </div>
           ))}
diff --git a/apps/web/components/admin/trials/internal/lisatiedot-matrix.tsx b/apps/web/components/admin/trials/internal/lisatiedot-matrix.tsx
index f977ee7e..11cba671 100644
--- a/apps/web/components/admin/trials/internal/lisatiedot-matrix.tsx
+++ b/apps/web/components/admin/trials/internal/lisatiedot-matrix.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useI18n } from "@/hooks/i18n";
 import {
   ADMIN_TRIAL_LISATIETO_GROUP_LABELS,
   type AdminTrialLisatietoInputKind,
@@ -26,11 +27,12 @@ export function LisatiedotMatrix({
   isPending,
   onChangeCell,
 }: Props) {
+  const { t } = useI18n();
   function sanitizeValue(
     kind: AdminTrialLisatietoInputKind,
     rawValue: string,
   ): string {
-    if (kind === "marker") {
+    if (kind === "marker" || kind === "tri-state") {
       if (rawValue === "1" || rawValue === "0" || rawValue === "") {
         return rawValue;
       }
@@ -98,7 +100,9 @@ export function LisatiedotMatrix({
                     <td className="sticky left-0 z-10 w-56 min-w-56 bg-background px-2 py-1">
                       <div className="flex items-baseline gap-1.5">
                         <span className="font-semibold">
-                          {row.osa ? `${row.koodi} ${row.osa}` : row.koodi}
+                          {row.osa && !row.hideOsaSuffix
+                            ? `${row.koodi} ${row.osa}`
+                            : row.koodi}
                         </span>
                         <span className="truncate text-muted-foreground">
                           {row.label}
@@ -107,7 +111,24 @@ export function LisatiedotMatrix({
                     </td>
                     {sortedEras.map((era) => (
                       <td key={era.era} className="w-16 min-w-16 px-0.5 py-0.5">
-                        {row.inputKind === "marker" ? (
+                        {row.inputKind === "marker" &&
+                        row.useSemanticControl ? (
+                          <input
+                            type="checkbox"
+                            aria-label={`${row.koodi} ${row.label}, ${t("admin.trials.manage.resultCreate.valueHint.marker")}, erä ${era.era}`}
+                            checked={(row.eraValues[era.era] ?? "") === "1"}
+                            disabled={isPending}
+                            onChange={(event) =>
+                              onChangeCell(
+                                row.koodi,
+                                row.osa,
+                                era.era,
+                                event.target.checked ? "1" : "",
+                              )
+                            }
+                          />
+                        ) : row.inputKind === "marker" ||
+                          row.inputKind === "tri-state" ? (
                           <select
                             className="h-5 w-full rounded-sm border border-input bg-background px-0.5 text-center text-[10px] leading-none"
                             value={row.eraValues[era.era] ?? ""}
@@ -122,15 +143,34 @@ export function LisatiedotMatrix({
                             }
                           >
                             <option value="">-</option>
-                            <option value="0">0</option>
-                            <option value="1">1</option>
+                            <option value="0">
+                              {row.inputKind === "tri-state"
+                                ? t(
+                                    "admin.trials.manage.resultCreate.triState.no",
+                                  )
+                                : "0"}
+                            </option>
+                            <option value="1">
+                              {row.inputKind === "tri-state"
+                                ? t(
+                                    "admin.trials.manage.resultCreate.triState.yes",
+                                  )
+                                : "1"}
+                            </option>
                           </select>
                         ) : (
                           <input
                             className="h-5 w-full rounded-sm border border-input bg-background px-1 text-center text-[10px] leading-none"
                             inputMode={
-                              row.inputKind === "text" ? "text" : "decimal"
+                              row.inputKind === "text"
+                                ? "text"
+                                : row.inputKind === "integer"
+                                  ? "numeric"
+                                  : "decimal"
                             }
+                            title={t(
+                              `admin.trials.manage.resultCreate.valueHint.${row.valueHint ?? row.inputKind}` as never,
+                            )}
                             value={row.eraValues[era.era] ?? ""}
                             disabled={isPending}
                             onChange={(event) =>
diff --git a/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts b/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts
index 3553c35f..602fa3c1 100644
--- a/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts
+++ b/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts
@@ -4,9 +4,11 @@ import {
   createAdminTrialEntryCreateDraft,
   toCreateAdminTrialEntryRequest,
 } from "../entry-create-model";
+import { resolveResultCreateFieldSet } from "../result-create-field-registry";
 
 const event: AdminTrialEventDetails = {
   trialEventId: "event-1",
+  trialRuleWindowId: "trw_post_20230801",
   eventDate: "2026-07-21",
   eventPlace: "Helsinki",
   eventName: null,
@@ -120,4 +122,24 @@ describe("manual trial entry create model", () => {
       );
     }
   });
+
+  it("serializes only the resolved 2023+ rows through registry persistence mapping", () => {
+    const fieldSet = resolveResultCreateFieldSet(event.trialRuleWindowId);
+    const draft = createAdminTrialEntryCreateDraft(event, fieldSet);
+    draft.registrationNo = "FI43560/18";
+
+    expect(
+      draft.lisatiedotRows.some((row) => row.koodi === "25" && row.osa === "b"),
+    ).toBe(false);
+    const marker = draft.lisatiedotRows.find((row) => row.koodi === "10");
+    if (marker) marker.eraValues[1] = "0";
+
+    const result = toCreateAdminTrialEntryRequest("event-1", draft);
+    expect(result).toMatchObject({
+      ok: true,
+      request: {
+        lisatiedotRows: [],
+      },
+    });
+  });
 });
diff --git a/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts b/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts
new file mode 100644
index 00000000..fef710ab
--- /dev/null
+++ b/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts
@@ -0,0 +1,80 @@
+import { describe, expect, it } from "vitest";
+import {
+  resolveResultCreateFieldSet,
+  SEEDED_TRIAL_RULE_WINDOW_IDS,
+} from "../result-create-field-registry";
+
+describe("result create field registry", () => {
+  it("registers the verified 2023+ field set from the persisted rule window", () => {
+    const fieldSet = resolveResultCreateFieldSet("trw_post_20230801");
+
+    expect(fieldSet.id).toBe("post-2023");
+    expect(fieldSet.verified).toBe(true);
+    expect(fieldSet.entryFields.has("tja")).toBe(false);
+    expect(fieldSet.entryFields.has("pin")).toBe(false);
+    expect(fieldSet.eraFields.has("tja")).toBe(false);
+    expect(fieldSet.eraFields.has("pin")).toBe(false);
+  });
+
+  it("matches the verified 2023+ lisatieto codes, parts, order and kinds", () => {
+    const rows = resolveResultCreateFieldSet("trw_post_20230801").lisatiedot;
+    const keys = rows.map((row) => `${row.koodi}:${row.osa}`);
+
+    expect(keys).toEqual([
+      ...Array.from({ length: 15 }, (_, index) => `${index + 10}:`).slice(
+        0,
+        15,
+      ),
+      "25:a",
+      "26:",
+      "27:a",
+      ...Array.from({ length: 8 }, (_, index) => `${index + 30}:`),
+      ...Array.from({ length: 3 }, (_, index) => `${index + 40}:`),
+      ...Array.from({ length: 13 }, (_, index) => `${index + 50}:`),
+    ]);
+    expect(
+      Object.fromEntries(
+        rows
+          .filter((row) => ["19", "23", "26", "59"].includes(row.koodi))
+          .map((row) => [row.koodi, row.inputKind]),
+      ),
+    ).toEqual({
+      "19": "integer",
+      "23": "decimal",
+      "26": "decimal",
+      "59": "decimal",
+    });
+    expect(rows.map((row) => row.persistenceOrder)).toEqual(
+      [...rows]
+        .map((row) => row.persistenceOrder)
+        .sort((left, right) => left - right),
+    );
+  });
+
+  it("maps semantic marker state to persistence without exposing raw values", () => {
+    const marker = resolveResultCreateFieldSet(
+      "trw_post_20230801",
+    ).lisatiedot.find((row) => row.koodi === "10");
+
+    expect(marker?.inputKind).toBe("marker");
+    expect(marker?.toPersistedValue("1")).toBe("1");
+    expect(marker?.toPersistedValue("0")).toBe("");
+    expect(marker?.toPersistedValue("")).toBe("");
+  });
+
+  it.each([
+    ...SEEDED_TRIAL_RULE_WINDOW_IDS.filter((id) => id !== "trw_post_20230801"),
+    null,
+    "unknown-window",
+  ])("uses the warned show-all fallback for %s", (trialRuleWindowId) => {
+    const fieldSet = resolveResultCreateFieldSet(trialRuleWindowId);
+
+    expect(fieldSet.id).toBe("unverified-fallback");
+    expect(fieldSet.verified).toBe(false);
+    expect(fieldSet.entryFields.has("tja")).toBe(true);
+    expect(fieldSet.eraFields.has("pin")).toBe(true);
+    expect(
+      fieldSet.lisatiedot.some((row) => row.koodi === "25" && row.osa === "b"),
+    ).toBe(true);
+  });
+});
diff --git a/apps/web/lib/admin/trials/entry-create-model.ts b/apps/web/lib/admin/trials/entry-create-model.ts
index 6bc6fa36..d81ee93c 100644
--- a/apps/web/lib/admin/trials/entry-create-model.ts
+++ b/apps/web/lib/admin/trials/entry-create-model.ts
@@ -16,6 +16,7 @@ import {
   type EraDraft,
   type LisatietoRowDraft,
 } from "./entry-edit-dialog-model";
+import type { ResultCreateFieldSet } from "./result-create-field-registry";
 
 export type AdminTrialEntryCreateDraft = {
   registrationNo: string;
@@ -48,6 +49,7 @@ function emptyEntry(event: AdminTrialEventDetails): AdminTrialEventEntry {
 
 export function createAdminTrialEntryCreateDraft(
   event: AdminTrialEventDetails,
+  fieldSet?: ResultCreateFieldSet,
 ): AdminTrialEntryCreateDraft {
   const entry = emptyEntry(event);
   const eras = [createEmptyEraDraft(1)];
@@ -55,7 +57,7 @@ export function createAdminTrialEntryCreateDraft(
     registrationNo: "",
     entry: toEntryDraft(entry),
     eras,
-    lisatiedotRows: toLisatietoRows(entry, eras),
+    lisatiedotRows: toLisatietoRows(entry, eras, fieldSet?.lisatiedot),
   };
 }
 
@@ -166,7 +168,12 @@ export function toCreateAdminTrialEntryRequest(
       })),
       lisatiedotRows: draft.lisatiedotRows
         .filter((row) =>
-          eras.some((era) => (row.eraValues[era.era] ?? "").trim().length > 0),
+          eras.some((era) => {
+            const controlValue = row.eraValues[era.era] ?? "";
+            const persistedValue =
+              row.toPersistedValue?.(controlValue) ?? controlValue;
+            return persistedValue.trim().length > 0;
+          }),
         )
         .map((row) => ({
           koodi: row.koodi,
@@ -175,7 +182,11 @@ export function toCreateAdminTrialEntryRequest(
           jarjestys: row.jarjestys,
           eraValues: eras.map((era) => ({
             era: era.era,
-            arvo: parseNullableString(row.eraValues[era.era] ?? ""),
+            arvo: parseNullableString(
+              row.toPersistedValue?.(row.eraValues[era.era] ?? "") ??
+                row.eraValues[era.era] ??
+                "",
+            ),
           })),
         })),
     },
diff --git a/apps/web/lib/admin/trials/entry-edit-config.ts b/apps/web/lib/admin/trials/entry-edit-config.ts
index 115ba8ea..d8dd3cfa 100644
--- a/apps/web/lib/admin/trials/entry-edit-config.ts
+++ b/apps/web/lib/admin/trials/entry-edit-config.ts
@@ -24,7 +24,8 @@ export type AdminTrialLisatietoInputKind =
   | "marker"
   | "integer"
   | "decimal"
-  | "text";
+  | "text"
+  | "tri-state";
 
 export type AdminTrialLisatietoConfig = {
   koodi: string;
@@ -34,6 +35,10 @@ export type AdminTrialLisatietoConfig = {
   inputKind: AdminTrialLisatietoInputKind;
   sortOrder: number;
   persistenceOrder: number;
+  valueHint?: "marker" | "integer" | "decimal" | "text";
+  toPersistedValue?: (controlValue: string) => string;
+  hideOsaSuffix?: boolean;
+  useSemanticControl?: boolean;
 };
 
 function defineLisatieto(
diff --git a/apps/web/lib/admin/trials/entry-edit-dialog-model.ts b/apps/web/lib/admin/trials/entry-edit-dialog-model.ts
index 7a0af752..ca664719 100644
--- a/apps/web/lib/admin/trials/entry-edit-dialog-model.ts
+++ b/apps/web/lib/admin/trials/entry-edit-dialog-model.ts
@@ -4,6 +4,7 @@ import {
   getAdminTrialLisatietoConfig,
   type AdminTrialLisatietoGroup,
   type AdminTrialLisatietoInputKind,
+  type AdminTrialLisatietoConfig,
 } from "./entry-edit-config";
 
 export type LisatietoRowDraft = {
@@ -14,6 +15,10 @@ export type LisatietoRowDraft = {
   group: AdminTrialLisatietoGroup;
   label: string;
   inputKind: AdminTrialLisatietoInputKind;
+  valueHint?: "marker" | "integer" | "decimal" | "text";
+  toPersistedValue?: (controlValue: string) => string;
+  hideOsaSuffix?: boolean;
+  useSemanticControl?: boolean;
   sortOrder: number;
   eraValues: Record<number, string>;
 };
@@ -147,6 +152,7 @@ export function toEraDrafts(entry: AdminTrialEventEntry): EraDraft[] {
 export function toLisatietoRows(
   entry: AdminTrialEventEntry,
   eras: EraDraft[],
+  configs: readonly AdminTrialLisatietoConfig[] = ADMIN_TRIAL_LISATIETO_CONFIG,
 ): LisatietoRowDraft[] {
   const eraNumbers = eras.map((era) => era.era);
   const values = new Map<string, LisatietoRowDraft>();
@@ -175,7 +181,10 @@ export function toLisatietoRows(
       return existing;
     }
 
-    const config = getAdminTrialLisatietoConfig(input.koodi, input.osa);
+    const config =
+      configs.find(
+        (item) => item.koodi === input.koodi && item.osa === input.osa,
+      ) ?? getAdminTrialLisatietoConfig(input.koodi, input.osa);
     const parsedCode = Number.parseInt(input.koodi, 10);
     const row: LisatietoRowDraft = {
       koodi: input.koodi,
@@ -185,6 +194,14 @@ export function toLisatietoRows(
       group: config?.group ?? "unknown",
       label: config?.label ?? input.nimi ?? "Tuntematon lisätieto",
       inputKind: config?.inputKind ?? "text",
+      valueHint:
+        config?.valueHint ??
+        (config?.inputKind === "tri-state"
+          ? "marker"
+          : (config?.inputKind ?? "text")),
+      toPersistedValue: config?.toPersistedValue ?? ((value) => value),
+      hideOsaSuffix: config?.hideOsaSuffix,
+      useSemanticControl: config?.useSemanticControl,
       sortOrder:
         config?.sortOrder ??
         (Number.isInteger(parsedCode) ? parsedCode : Number.MAX_SAFE_INTEGER),
@@ -194,7 +211,7 @@ export function toLisatietoRows(
     return row;
   }
 
-  for (const config of ADMIN_TRIAL_LISATIETO_CONFIG) {
+  for (const config of configs) {
     ensureRow({
       koodi: config.koodi,
       osa: config.osa,
diff --git a/apps/web/lib/admin/trials/index.ts b/apps/web/lib/admin/trials/index.ts
index 02c2b754..9ed98e13 100644
--- a/apps/web/lib/admin/trials/index.ts
+++ b/apps/web/lib/admin/trials/index.ts
@@ -1,6 +1,7 @@
 export * from "./trial-route";
 export * from "./submit-admin-trial-event-creation";
 export * from "./entry-create-model";
+export * from "./result-create-field-registry";
 export {
   createEmptyEraDraft,
   getNextEraNumber,
diff --git a/apps/web/lib/admin/trials/result-create-field-registry.ts b/apps/web/lib/admin/trials/result-create-field-registry.ts
new file mode 100644
index 00000000..8cdb1220
--- /dev/null
+++ b/apps/web/lib/admin/trials/result-create-field-registry.ts
@@ -0,0 +1,165 @@
+import {
+  ADMIN_TRIAL_LISATIETO_CONFIG,
+  type AdminTrialLisatietoConfig,
+  type AdminTrialLisatietoInputKind,
+} from "./entry-edit-config";
+import type { EntryDraft, EraDraft } from "./entry-edit-dialog-model";
+
+export type ResultCreateSemanticInputKind =
+  | AdminTrialLisatietoInputKind
+  | "tri-state";
+
+export type ResultCreateValueHint = "marker" | "integer" | "decimal" | "text";
+
+export type ResultCreateLisatietoField = AdminTrialLisatietoConfig & {
+  inputKind: ResultCreateSemanticInputKind;
+  valueHint: ResultCreateValueHint;
+  toPersistedValue: (controlValue: string) => string;
+};
+
+export type ResultCreateFieldSet = {
+  id: "post-2023" | "unverified-fallback";
+  verified: boolean;
+  rulePeriodMessageKey:
+    | "admin.trials.manage.resultCreate.rulePeriod.post2023"
+    | "admin.trials.manage.resultCreate.rulePeriod.unverified";
+  entryFields: ReadonlySet<keyof EntryDraft>;
+  eraFields: ReadonlySet<Exclude<keyof EraDraft, "era">>;
+  lisatiedot: readonly ResultCreateLisatietoField[];
+};
+
+export const SEEDED_TRIAL_RULE_WINDOW_IDS = [
+  "trw_pre_20020801",
+  "trw_range_2002_2005",
+  "trw_range_2005_2011",
+  "trw_post_20110801",
+  "trw_post_20230801",
+] as const;
+
+const ALL_ENTRY_FIELDS = new Set<keyof EntryDraft>([
+  "koemaasto",
+  "koemuoto",
+  "koetyyppi",
+  "ke",
+  "lk",
+  "award",
+  "rank",
+  "points",
+  "koiriaLuokassa",
+  "hyvaksytytAjominuutit",
+  "ajoajanPisteet",
+  "haku",
+  "hauk",
+  "yva",
+  "hlo",
+  "alo",
+  "tja",
+  "pin",
+  "ansiopisteetYhteensa",
+  "tappiopisteetYhteensa",
+  "judge",
+  "huomautus",
+  "huomautusTeksti",
+  "ylituomariNumeroSnapshot",
+  "ryhmatuomariNimi",
+  "palkintotuomariNimi",
+  "omistajaSnapshot",
+  "omistajanKotikuntaSnapshot",
+]);
+
+const ALL_ERA_FIELDS = new Set<Exclude<keyof EraDraft, "era">>([
+  "alkoi",
+  "hakumin",
+  "ajomin",
+  "haku",
+  "hauk",
+  "yva",
+  "hlo",
+  "alo",
+  "tja",
+  "pin",
+  "huomautusTeksti",
+]);
+
+function identity(value: string): string {
+  return value;
+}
+
+function toMarkerPersistence(value: string): string {
+  return value === "1" ? "1" : "";
+}
+
+function withSemantics(
+  config: AdminTrialLisatietoConfig,
+  inputKind: ResultCreateSemanticInputKind = config.inputKind,
+): ResultCreateLisatietoField {
+  return {
+    ...config,
+    inputKind,
+    valueHint:
+      inputKind === "tri-state"
+        ? "marker"
+        : (inputKind as ResultCreateValueHint),
+    toPersistedValue: inputKind === "marker" ? toMarkerPersistence : identity,
+    useSemanticControl: true,
+  };
+}
+
+const FALLBACK_LISATIEDOT = ADMIN_TRIAL_LISATIETO_CONFIG.map((config) =>
+  withSemantics(config),
+);
+
+const POST_2023_INPUT_OVERRIDES: Readonly<
+  Record<string, ResultCreateSemanticInputKind>
+> = {
+  "19": "integer",
+  "23": "decimal",
+  "26": "decimal",
+  "59": "decimal",
+};
+
+const POST_2023_LISATIETO_CODES = new Set([
+  ...Array.from({ length: 18 }, (_, index) => String(index + 10)),
+  ...Array.from({ length: 13 }, (_, index) => String(index + 30)),
+  ...Array.from({ length: 13 }, (_, index) => String(index + 50)),
+]);
+
+const POST_2023_LISATIEDOT = ADMIN_TRIAL_LISATIETO_CONFIG.filter(
+  (config) =>
+    POST_2023_LISATIETO_CODES.has(config.koodi) &&
+    (!(config.koodi === "25" || config.koodi === "27") || config.osa === "a"),
+).map((config) => ({
+  ...withSemantics(config, POST_2023_INPUT_OVERRIDES[config.koodi]),
+  hideOsaSuffix: config.koodi === "25" || config.koodi === "27",
+}));
+
+const POST_2023_FIELD_SET: ResultCreateFieldSet = {
+  id: "post-2023",
+  verified: true,
+  rulePeriodMessageKey: "admin.trials.manage.resultCreate.rulePeriod.post2023",
+  entryFields: new Set(
+    [...ALL_ENTRY_FIELDS].filter((field) => field !== "tja" && field !== "pin"),
+  ),
+  eraFields: new Set(
+    [...ALL_ERA_FIELDS].filter((field) => field !== "tja" && field !== "pin"),
+  ),
+  lisatiedot: POST_2023_LISATIEDOT,
+};
+
+const UNVERIFIED_FALLBACK_FIELD_SET: ResultCreateFieldSet = {
+  id: "unverified-fallback",
+  verified: false,
+  rulePeriodMessageKey:
+    "admin.trials.manage.resultCreate.rulePeriod.unverified",
+  entryFields: ALL_ENTRY_FIELDS,
+  eraFields: ALL_ERA_FIELDS,
+  lisatiedot: FALLBACK_LISATIEDOT,
+};
+
+export function resolveResultCreateFieldSet(
+  trialRuleWindowId: string | null,
+): ResultCreateFieldSet {
+  return trialRuleWindowId === "trw_post_20230801"
+    ? POST_2023_FIELD_SET
+    : UNVERIFIED_FALLBACK_FIELD_SET;
+}
diff --git a/apps/web/lib/i18n/messages/admin/trials/manage.ts b/apps/web/lib/i18n/messages/admin/trials/manage.ts
index 82e3ad82..8cde11ac 100644
--- a/apps/web/lib/i18n/messages/admin/trials/manage.ts
+++ b/apps/web/lib/i18n/messages/admin/trials/manage.ts
@@ -68,6 +68,17 @@ export const fiAdminTrialsManageMessages = {
   "admin.trials.manage.resultCreate.backToWorkspace":
     "Takaisin tapahtuman sivulle",
   "admin.trials.manage.resultCreate.registration": "Rekisterinumero",
+  "admin.trials.manage.resultCreate.rulePeriod.post2023": "Säännöt: 1.8.2023 →",
+  "admin.trials.manage.resultCreate.rulePeriod.unverified":
+    "Säännöt: historiallinen tai määrittämätön sääntökausi",
+  "admin.trials.manage.resultCreate.ruleWindowWarning":
+    "Tämän sääntökauden kenttiä ei ole vielä tarkistettu pöytäkirjaa vasten. Lomake näyttää yhteensopivuuden vuoksi kaikki nykyiset kentät.",
+  "admin.trials.manage.resultCreate.valueHint.marker": "Valinta",
+  "admin.trials.manage.resultCreate.valueHint.integer": "Kokonaisluku",
+  "admin.trials.manage.resultCreate.valueHint.decimal": "Desimaaliluku",
+  "admin.trials.manage.resultCreate.valueHint.text": "Teksti",
+  "admin.trials.manage.resultCreate.triState.no": "Ei",
+  "admin.trials.manage.resultCreate.triState.yes": "Kyllä",
   "admin.trials.manage.resultCreate.saveAnother": "Tallenna ja lisää seuraava",
   "admin.trials.manage.resultCreate.saveFinish": "Tallenna ja lopeta",
   "admin.trials.manage.resultCreate.cancel": "Peruuta",
@@ -271,6 +282,17 @@ export const svAdminTrialsManageMessages = {
   "admin.trials.manage.resultCreate.backToWorkspace":
     "Tillbaka till evenemangssidan",
   "admin.trials.manage.resultCreate.registration": "Registreringsnummer",
+  "admin.trials.manage.resultCreate.rulePeriod.post2023": "Regler: 1.8.2023 →",
+  "admin.trials.manage.resultCreate.rulePeriod.unverified":
+    "Regler: historisk eller obestämd regelperiod",
+  "admin.trials.manage.resultCreate.ruleWindowWarning":
+    "Fälten för den här regelperioden har ännu inte verifierats mot protokollet. Formuläret visar därför alla nuvarande fält för kompatibilitet.",
+  "admin.trials.manage.resultCreate.valueHint.marker": "Val",
+  "admin.trials.manage.resultCreate.valueHint.integer": "Heltal",
+  "admin.trials.manage.resultCreate.valueHint.decimal": "Decimaltal",
+  "admin.trials.manage.resultCreate.valueHint.text": "Text",
+  "admin.trials.manage.resultCreate.triState.no": "Nej",
+  "admin.trials.manage.resultCreate.triState.yes": "Ja",
   "admin.trials.manage.resultCreate.saveAnother": "Spara och lägg till nästa",
   "admin.trials.manage.resultCreate.saveFinish": "Spara och avsluta",
   "admin.trials.manage.resultCreate.cancel": "Avbryt",
diff --git a/docs/features/admin-trial-management.md b/docs/features/admin-trial-management.md
index 25c88de6..b8cbc8aa 100644
--- a/docs/features/admin-trial-management.md
+++ b/docs/features/admin-trial-management.md
@@ -17,6 +17,10 @@ and follow-up admin flow redesign).
 - An admin can create one manual result at a time from an event workspace.
   The full-page form supports saving another result for the same event or
   finishing back at the workspace.
+- Manual result creation resolves its visible score, era, and lisätieto fields
+  from the event's persisted `trialRuleWindowId`. The 2023+ window is verified
+  against its PDF field set; older, null, and unknown windows retain the
+  complete compatibility form with a warning.
 
 ## Main files
 
@@ -59,7 +63,8 @@ and follow-up admin flow redesign).
 - Event list response: paginated event summaries (`total`, `totalPages`,
   `page`, `filters`, `availableYears`, `items[]`).
 - Event detail response: one event (`event`) with event header fields and
-  selected dog rows (`entries[]`).
+  selected dog rows (`entries[]`). It includes the event-owned
+  `trialRuleWindowId`; clients must not recalculate the window from the date.
 - Event creation requires a positive `sklKoeId`, an ISO date, and a non-empty
   place. Duplicate SKL IDs return `SKL_KOE_ID_CONFLICT`.
 - Manual result identity is `SKL:<sklKoeId>|REG:<canonicalRegistration>` and
@@ -69,6 +74,10 @@ and follow-up admin flow redesign).
   to occur only once across the submitted matrix rows.
 - Lisätieto UI sorting is separate from its integer persisted `jarjestys`;
   unused create-form rows are omitted from the write payload.
+- The result-create field registry owns create-only visibility, ordering,
+  business grouping, semantic input kinds, localized value-hint categories,
+  and control-to-persistence mapping. Shared edit components use their default
+  complete field set and do not consume create-only configuration.
 - Manual-result validation errors may carry safe structured field context for
   localized feedback without exposing raw user-entered values.
 - `TrialEvent.koepaiva` is a PostgreSQL `DATE`; all trial contracts serialize
@@ -88,6 +97,11 @@ and follow-up admin flow redesign).
   confirm internal navigation and use native unload protection for refresh or
   close. Browser Back leaves the form without application confirmation because
   the App Router has no reliable asynchronous route-blocking hook.
+- The result form shows only a localized rule-period label. For
+  `trw_post_20230801`, entry- and era-level `tja`/`pin` are hidden, lisätieto
+  codes 25 and 27 expose only part `a`, and codes 19, 23, 26, and 59 use their
+  verified semantic input kinds. Other rule windows show the full compatibility
+  set and an unverified-field warning.
 - Selected dog rows have PDF, edit, and result-delete actions.
 - A missing workspace event is shown explicitly and never falls back to a
   different event.
diff --git a/packages/contracts/admin/trials/manage/admin-trial-event-details.ts b/packages/contracts/admin/trials/manage/admin-trial-event-details.ts
index f0380fa2..5a5a463d 100644
--- a/packages/contracts/admin/trials/manage/admin-trial-event-details.ts
+++ b/packages/contracts/admin/trials/manage/admin-trial-event-details.ts
@@ -66,6 +66,7 @@ export type AdminTrialEntryEraLisatieto = {
 };
 
 export type AdminTrialEventDetails = AdminTrialEventSummary & {
+  trialRuleWindowId: string | null;
   entries: AdminTrialEventEntry[];
 };
 
diff --git a/packages/db/admin/trials/manage/__tests__/get-trial-event-details.parity.test.ts b/packages/db/admin/trials/manage/__tests__/get-trial-event-details.parity.test.ts
index 728dcf2e..db95aafb 100644
--- a/packages/db/admin/trials/manage/__tests__/get-trial-event-details.parity.test.ts
+++ b/packages/db/admin/trials/manage/__tests__/get-trial-event-details.parity.test.ts
@@ -37,6 +37,7 @@ describe("getAdminTrialEventDetailsDb parity", () => {
   it("maps event entries and decimal points", async () => {
     trialEventFindUniqueMock.mockResolvedValue({
       id: "event-1",
+      trialRuleWindowId: "trw_post_20230801",
       sklKoeId: 1001,
       koepaiva: new Date("2026-03-01T00:00:00.000Z"),
       koekunta: "Helsinki",
@@ -95,6 +96,7 @@ describe("getAdminTrialEventDetailsDb parity", () => {
 
     expect(result).toEqual({
       trialEventId: "event-1",
+      trialRuleWindowId: "trw_post_20230801",
       eventDate: new Date("2026-03-01T00:00:00.000Z"),
       eventPlace: "Helsinki",
       eventName: "Talvikoe",
diff --git a/packages/db/admin/trials/manage/get-trial-event-details.ts b/packages/db/admin/trials/manage/get-trial-event-details.ts
index 6b113c76..fda1062c 100644
--- a/packages/db/admin/trials/manage/get-trial-event-details.ts
+++ b/packages/db/admin/trials/manage/get-trial-event-details.ts
@@ -23,6 +23,7 @@ export async function getAdminTrialEventDetailsDb(
     },
     select: {
       id: true,
+      trialRuleWindowId: true,
       sklKoeId: true,
       koepaiva: true,
       koekunta: true,
@@ -117,6 +118,7 @@ export async function getAdminTrialEventDetailsDb(
 
   return {
     trialEventId: row.id,
+    trialRuleWindowId: row.trialRuleWindowId,
     eventDate: row.koepaiva,
     eventPlace: row.koekunta,
     eventName: row.jarjestaja,
diff --git a/packages/db/admin/trials/manage/types.ts b/packages/db/admin/trials/manage/types.ts
index e86675a2..079d2d1b 100644
--- a/packages/db/admin/trials/manage/types.ts
+++ b/packages/db/admin/trials/manage/types.ts
@@ -99,6 +99,7 @@ export type AdminTrialEntryEraLisatietoDb = {
 
 export type AdminTrialEventDetailsDb = {
   trialEventId: string;
+  trialRuleWindowId: string | null;
   eventDate: Date;
   eventPlace: string;
   eventName: string | null;
diff --git a/packages/server/admin/trials/manage/__tests__/get-trial-event.test.ts b/packages/server/admin/trials/manage/__tests__/get-trial-event.test.ts
index 2bd98309..2f1f6b13 100644
--- a/packages/server/admin/trials/manage/__tests__/get-trial-event.test.ts
+++ b/packages/server/admin/trials/manage/__tests__/get-trial-event.test.ts
@@ -55,6 +55,7 @@ describe("getAdminTrialEvent", () => {
   it("maps event and entries from db", async () => {
     getAdminTrialEventDetailsDbMock.mockResolvedValue({
       trialEventId: "event-1",
+      trialRuleWindowId: "trw_post_20230801",
       eventDate: new Date("2026-04-14T00:00:00.000Z"),
       eventPlace: "Helsinki",
       eventName: "Talvikoe",
@@ -99,6 +100,7 @@ describe("getAdminTrialEvent", () => {
         data: {
           event: {
             trialEventId: "event-1",
+            trialRuleWindowId: "trw_post_20230801",
             eventDate: "2026-04-14",
             eventPlace: "Helsinki",
             eventName: "Talvikoe",
diff --git a/packages/server/admin/trials/manage/get-trial-event.ts b/packages/server/admin/trials/manage/get-trial-event.ts
index 053e043b..2c498b95 100644
--- a/packages/server/admin/trials/manage/get-trial-event.ts
+++ b/packages/server/admin/trials/manage/get-trial-event.ts
@@ -74,6 +74,7 @@ export async function getAdminTrialEvent(
         data: {
           event: {
             trialEventId: result.trialEventId,
+            trialRuleWindowId: result.trialRuleWindowId,
             eventDate: formatTrialDateOnly(result.eventDate),
             eventPlace: result.eventPlace,
             eventName: result.eventName,
diff --git a/packages/server/trials/pdf/__tests__/get-trial-dog-pdf-data.test.ts b/packages/server/trials/pdf/__tests__/get-trial-dog-pdf-data.test.ts
index 6cbe5d4b..6424e64d 100644
--- a/packages/server/trials/pdf/__tests__/get-trial-dog-pdf-data.test.ts
+++ b/packages/server/trials/pdf/__tests__/get-trial-dog-pdf-data.test.ts
@@ -131,6 +131,41 @@ describe("getTrialDogPdfDataService", () => {
     expect(result.body.data.trialRuleWindowId).toBe("trw_range_2005_2011");
   });
 
+  it("pivots only PDF-consumed part a for lisatieto codes 25 and 27", async () => {
+    const base = dbRow();
+    getTrialDogPdfDataDbMock.mockResolvedValue(
+      dbRow({
+        eras: [
+          {
+            ...base.eras[0],
+            lisatiedot: [
+              { koodi: "25", osa: "a", arvo: "2.5" },
+              { koodi: "25", osa: "b", arvo: "99" },
+              { koodi: "27", osa: "a", arvo: "18" },
+              { koodi: "27", osa: "c", arvo: "88" },
+            ],
+          },
+          {
+            ...base.eras[1],
+            lisatiedot: [
+              { koodi: "25", osa: "a", arvo: "3.5" },
+              { koodi: "27", osa: "a", arvo: "20" },
+            ],
+          },
+        ],
+      }),
+    );
+
+    const result = await getTrialDogPdfDataService("entry-1");
+
+    expect(result.status).toBe(200);
+    if (!result.body.ok) throw new Error("Expected ok=true");
+    expect(result.body.data.lisatiedotRows).toEqual([
+      { koodi: "25", era1: "2.5", era2: "3.5" },
+      { koodi: "27", era1: "18", era2: "20" },
+    ]);
+  });
+
   it("derives accepted driving minutes and driving time points for legacy rows", async () => {
     getTrialDogPdfDataDbMock.mockResolvedValue(dbRow());
 

From e343831955439a952cf408382a41ff2ab76797b3 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Thu, 23 Jul 2026 13:21:04 +0300
Subject: [PATCH 18/24] fix(trials): preserve score subsections in result
 creation

---
 .../__tests__/entry-meta-section.test.tsx     |   7 +-
 .../trials/internal/entry-meta-section.tsx    | 137 ++++++------------
 2 files changed, 49 insertions(+), 95 deletions(-)

diff --git a/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx b/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
index 89698d53..6c99436b 100644
--- a/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
+++ b/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
@@ -63,6 +63,7 @@ describe("EntryMetaSection", () => {
     expect(html).toContain("Haukku");
     expect(html).toContain("Ajotaito / yleisvaikutelma");
     expect(html).toContain("Muut");
+    expect(html.match(/<h5/g)).toHaveLength(4);
     expect(html).toContain("Ansiopisteet yhteensä");
     expect(html).toContain("Metsästysinto");
     expect(html).toContain("Tie ja estetyöskentely");
@@ -88,7 +89,11 @@ describe("EntryMetaSection", () => {
     expect(html).not.toContain("Tie ja estetyöskentely");
     expect(html).not.toContain("Metsästysinto");
     expect(html).not.toContain("Ajotaito / yleisvaikutelma");
-    expect(html).not.toContain("<h5");
+    expect(html.match(/<h5/g)).toHaveLength(4);
+    expect(html).toContain(">Ajo</h5>");
+    expect(html).toContain(">Haku</h5>");
+    expect(html).toContain(">Haukku</h5>");
+    expect(html).toContain(">Muut</h5>");
     expect(html).toContain("Ajotaito");
     expect(html).toContain("Ansiopisteet yhteensä");
   });
diff --git a/apps/web/components/admin/trials/internal/entry-meta-section.tsx b/apps/web/components/admin/trials/internal/entry-meta-section.tsx
index 711725cb..b30696b0 100644
--- a/apps/web/components/admin/trials/internal/entry-meta-section.tsx
+++ b/apps/web/components/admin/trials/internal/entry-meta-section.tsx
@@ -166,72 +166,9 @@ export function EntryMetaSection({
         <h4 className="text-xs font-semibold uppercase text-muted-foreground">
           Ansiopisteet
         </h4>
-        {visibleFields ? (
-          <div className="grid gap-3 md:grid-cols-4">
-            <TextField
-              label="Hyväksytyt ajominuutit"
-              value={entryDraft.hyvaksytytAjominuutit}
-              inputMode="numeric"
-              disabled={isPending}
-              onChange={(value) => updateField("hyvaksytytAjominuutit", value)}
-            />
-            <TextField
-              label="Ajoajan pisteet"
-              value={entryDraft.ajoajanPisteet}
-              inputMode="decimal"
-              disabled={isPending}
-              onChange={(value) => updateField("ajoajanPisteet", value)}
-            />
-            <TextField
-              label="Haku"
-              value={entryDraft.haku}
-              inputMode="decimal"
-              disabled={isPending}
-              onChange={(value) => updateField("haku", value)}
-            />
-            <TextField
-              label="Haukku"
-              value={entryDraft.hauk}
-              inputMode="decimal"
-              disabled={isPending}
-              onChange={(value) => updateField("hauk", value)}
-            />
-            <TextField
-              label="Ajotaito"
-              value={entryDraft.yva}
-              inputMode="decimal"
-              disabled={isPending}
-              onChange={(value) => updateField("yva", value)}
-            />
-            {visible("tja") ? (
-              <TextField
-                label="Tie ja estetyöskentely"
-                value={entryDraft.tja}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("tja", value)}
-              />
-            ) : null}
-            {visible("pin") ? (
-              <TextField
-                label="Metsästysinto"
-                value={entryDraft.pin}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("pin", value)}
-              />
-            ) : null}
-            <TextField
-              label="Ansiopisteet yhteensä"
-              value={entryDraft.ansiopisteetYhteensa}
-              inputMode="decimal"
-              disabled={isPending}
-              onChange={(value) => updateField("ansiopisteetYhteensa", value)}
-            />
-          </div>
-        ) : (
-          <div className="space-y-4">
-            <ScoreSubsection title="Ajo">
+        <div className="space-y-4">
+          <ScoreSubsection title="Ajo">
+            {visible("hyvaksytytAjominuutit") ? (
               <TextField
                 label="Hyväksytyt ajominuutit"
                 value={entryDraft.hyvaksytytAjominuutit}
@@ -241,6 +178,8 @@ export function EntryMetaSection({
                   updateField("hyvaksytytAjominuutit", value)
                 }
               />
+            ) : null}
+            {visible("ajoajanPisteet") ? (
               <TextField
                 label="Ajoajan pisteet"
                 value={entryDraft.ajoajanPisteet}
@@ -248,15 +187,21 @@ export function EntryMetaSection({
                 disabled={isPending}
                 onChange={(value) => updateField("ajoajanPisteet", value)}
               />
+            ) : null}
+            {visible("yva") ? (
               <TextField
-                label="Ajotaito / yleisvaikutelma"
+                label={
+                  visibleFields ? "Ajotaito" : "Ajotaito / yleisvaikutelma"
+                }
                 value={entryDraft.yva}
                 inputMode="decimal"
                 disabled={isPending}
                 onChange={(value) => updateField("yva", value)}
               />
-            </ScoreSubsection>
-            <ScoreSubsection title="Haku">
+            ) : null}
+          </ScoreSubsection>
+          <ScoreSubsection title="Haku">
+            {visible("haku") ? (
               <TextField
                 label="Haku"
                 value={entryDraft.haku}
@@ -264,8 +209,10 @@ export function EntryMetaSection({
                 disabled={isPending}
                 onChange={(value) => updateField("haku", value)}
               />
-            </ScoreSubsection>
-            <ScoreSubsection title="Haukku">
+            ) : null}
+          </ScoreSubsection>
+          <ScoreSubsection title="Haukku">
+            {visible("hauk") ? (
               <TextField
                 label="Haukku"
                 value={entryDraft.hauk}
@@ -273,8 +220,10 @@ export function EntryMetaSection({
                 disabled={isPending}
                 onChange={(value) => updateField("hauk", value)}
               />
-            </ScoreSubsection>
-            <ScoreSubsection title="Muut">
+            ) : null}
+          </ScoreSubsection>
+          <ScoreSubsection title="Muut">
+            {visible("ansiopisteetYhteensa") ? (
               <TextField
                 label="Ansiopisteet yhteensä"
                 value={entryDraft.ansiopisteetYhteensa}
@@ -282,27 +231,27 @@ export function EntryMetaSection({
                 disabled={isPending}
                 onChange={(value) => updateField("ansiopisteetYhteensa", value)}
               />
-              {visible("tja") ? (
-                <TextField
-                  label="Tie ja estetyöskentely"
-                  value={entryDraft.tja}
-                  inputMode="decimal"
-                  disabled={isPending}
-                  onChange={(value) => updateField("tja", value)}
-                />
-              ) : null}
-              {visible("pin") ? (
-                <TextField
-                  label="Metsästysinto"
-                  value={entryDraft.pin}
-                  inputMode="decimal"
-                  disabled={isPending}
-                  onChange={(value) => updateField("pin", value)}
-                />
-              ) : null}
-            </ScoreSubsection>
-          </div>
-        )}
+            ) : null}
+            {visible("tja") ? (
+              <TextField
+                label="Tie ja estetyöskentely"
+                value={entryDraft.tja}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("tja", value)}
+              />
+            ) : null}
+            {visible("pin") ? (
+              <TextField
+                label="Metsästysinto"
+                value={entryDraft.pin}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("pin", value)}
+              />
+            ) : null}
+          </ScoreSubsection>
+        </div>
       </section>
 
       <section className="space-y-2">

From a9b5e721022644b4da4ea604a8afc3cdd489fbd0 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Thu, 23 Jul 2026 13:41:37 +0300
Subject: [PATCH 19/24] fix(trials): preserve compatibility fallback behavior

---
 .../admin-trial-entry-create-page-client.tsx  |  2 +
 .../__tests__/entry-meta-section.test.tsx     | 19 ++++++
 .../internal/__tests__/era-section.test.tsx   | 18 +++++-
 .../__tests__/lisatiedot-matrix.test.tsx      | 58 +++++++++++++++++++
 .../trials/internal/entry-meta-section.tsx    |  6 +-
 .../admin/trials/internal/era-section.tsx     |  6 +-
 .../trials/internal/lisatiedot-matrix.tsx     | 22 ++++---
 .../__tests__/entry-create-model.test.ts      | 22 +++++++
 .../result-create-field-registry.test.ts      | 22 ++++++-
 .../admin/trials/entry-edit-dialog-model.ts   |  8 +--
 .../trials/result-create-field-registry.ts    | 16 +++--
 11 files changed, 171 insertions(+), 28 deletions(-)

diff --git a/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx b/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
index 77af1c1d..e9876c1a 100644
--- a/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
+++ b/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
@@ -259,6 +259,7 @@ function ResultCreateForm({
               }))
             }
             visibleFields={fieldSet.entryFields}
+            yvaLabel={fieldSet.yvaLabels?.entry}
           />
           <EraSection
             eras={draft.eras}
@@ -274,6 +275,7 @@ function ResultCreateForm({
               }))
             }
             visibleFields={fieldSet.eraFields}
+            yvaLabel={fieldSet.yvaLabels?.era}
           />
           <LisatiedotMatrix
             eras={draft.eras}
diff --git a/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx b/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
index 6c99436b..3e0d38d7 100644
--- a/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
+++ b/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
@@ -83,6 +83,8 @@ describe("EntryMetaSection", () => {
         onChange: vi.fn(),
         visibleFields:
           resolveResultCreateFieldSet("trw_post_20230801").entryFields,
+        yvaLabel:
+          resolveResultCreateFieldSet("trw_post_20230801").yvaLabels?.entry,
       }),
     );
 
@@ -97,4 +99,21 @@ describe("EntryMetaSection", () => {
     expect(html).toContain("Ajotaito");
     expect(html).toContain("Ansiopisteet yhteensä");
   });
+
+  it("keeps the generic label and all fields in compatibility fallback", () => {
+    const fieldSet = resolveResultCreateFieldSet(null);
+    const html = renderToStaticMarkup(
+      React.createElement(EntryMetaSection, {
+        entryDraft,
+        isPending: false,
+        onChange: vi.fn(),
+        visibleFields: fieldSet.entryFields,
+        yvaLabel: fieldSet.yvaLabels?.entry,
+      }),
+    );
+
+    expect(html).toContain("Ajotaito / yleisvaikutelma");
+    expect(html).toContain("Tie ja estetyöskentely");
+    expect(html).toContain("Metsästysinto");
+  });
 });
diff --git a/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx b/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx
index 30c182a0..d2367c5d 100644
--- a/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx
+++ b/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx
@@ -6,7 +6,7 @@ import { resolveResultCreateFieldSet } from "@/lib/admin/trials/result-create-fi
 import { EraSection } from "../era-section";
 
 describe("EraSection", () => {
-  it("uses the current-era Ajotaito label only in configured creation", () => {
+  it("uses the current-era Ajotaito label only in verified creation", () => {
     const props = {
       eras: [createEmptyEraDraft(1)],
       isPending: false,
@@ -14,20 +14,32 @@ describe("EraSection", () => {
       onRemoveEra: vi.fn(),
       onChangeEraField: vi.fn(),
     };
+    const verifiedFieldSet = resolveResultCreateFieldSet("trw_post_20230801");
 
     const createHtml = renderToStaticMarkup(
       React.createElement(EraSection, {
         ...props,
-        visibleFields:
-          resolveResultCreateFieldSet("trw_post_20230801").eraFields,
+        visibleFields: verifiedFieldSet.eraFields,
+        yvaLabel: verifiedFieldSet.yvaLabels?.era,
       }),
     );
     const editHtml = renderToStaticMarkup(
       React.createElement(EraSection, props),
     );
+    const fallbackFieldSet = resolveResultCreateFieldSet(null);
+    const fallbackHtml = renderToStaticMarkup(
+      React.createElement(EraSection, {
+        ...props,
+        visibleFields: fallbackFieldSet.eraFields,
+        yvaLabel: fallbackFieldSet.yvaLabels?.era,
+      }),
+    );
 
     expect(createHtml).toContain("ajotaito");
     expect(createHtml).not.toContain("ajotaito / yleisvaikutelma");
     expect(editHtml).toContain("ajotaito / yleisvaikutelma");
+    expect(fallbackHtml).toContain("ajotaito / yleisvaikutelma");
+    expect(fallbackHtml).toContain("tie ja estetyöskentely");
+    expect(fallbackHtml).toContain("metsästysinto");
   });
 });
diff --git a/apps/web/components/admin/trials/internal/__tests__/lisatiedot-matrix.test.tsx b/apps/web/components/admin/trials/internal/__tests__/lisatiedot-matrix.test.tsx
index 7ddff2ff..47ecc692 100644
--- a/apps/web/components/admin/trials/internal/__tests__/lisatiedot-matrix.test.tsx
+++ b/apps/web/components/admin/trials/internal/__tests__/lisatiedot-matrix.test.tsx
@@ -21,6 +21,17 @@ describe("LisatiedotMatrix", () => {
         sortOrder: 10,
         eraValues: { 1: "1", 2: "" },
       },
+      {
+        koodi: "17",
+        osa: "",
+        nimi: "Lämpötila °C",
+        jarjestys: 17,
+        group: "olosuhteet",
+        label: "Lämpötila °C",
+        inputKind: "integer",
+        sortOrder: 17,
+        eraValues: { 1: "5", 2: "" },
+      },
       {
         koodi: "19",
         osa: "",
@@ -73,5 +84,52 @@ describe("LisatiedotMatrix", () => {
     expect(html).toContain("90 legacy");
     expect(html).toContain("Legacy field");
     expect(html).toContain('inputMode="text"');
+    expect(html).toContain("<select");
+    expect(html).not.toContain('type="checkbox"');
+    expect(html).not.toContain('inputMode="numeric"');
+  });
+
+  it("uses semantic controls only for explicitly configured rows", () => {
+    const rows: LisatietoRowDraft[] = [
+      {
+        koodi: "10",
+        osa: "",
+        nimi: "Vaativat olosuhteet",
+        jarjestys: 10,
+        group: "olosuhteet",
+        label: "Vaativat olosuhteet",
+        inputKind: "marker",
+        valueHint: "marker",
+        useSemanticControl: true,
+        sortOrder: 10,
+        eraValues: { 1: "" },
+      },
+      {
+        koodi: "17",
+        osa: "",
+        nimi: "Lämpötila °C",
+        jarjestys: 17,
+        group: "olosuhteet",
+        label: "Lämpötila °C",
+        inputKind: "integer",
+        valueHint: "integer",
+        useSemanticControl: true,
+        sortOrder: 17,
+        eraValues: { 1: "" },
+      },
+    ];
+
+    const html = renderToStaticMarkup(
+      React.createElement(LisatiedotMatrix, {
+        eras: [createEmptyEraDraft(1)],
+        rows,
+        isPending: false,
+        onChangeCell: vi.fn(),
+      }),
+    );
+
+    expect(html).toContain('type="checkbox"');
+    expect(html).not.toContain("<select");
+    expect(html).toContain('inputMode="numeric"');
   });
 });
diff --git a/apps/web/components/admin/trials/internal/entry-meta-section.tsx b/apps/web/components/admin/trials/internal/entry-meta-section.tsx
index b30696b0..7904f2ba 100644
--- a/apps/web/components/admin/trials/internal/entry-meta-section.tsx
+++ b/apps/web/components/admin/trials/internal/entry-meta-section.tsx
@@ -7,6 +7,7 @@ type Props = {
   isPending: boolean;
   onChange: (updater: (current: EntryDraft) => EntryDraft) => void;
   visibleFields?: ReadonlySet<keyof EntryDraft>;
+  yvaLabel?: string;
 };
 
 export function EntryMetaSection({
@@ -14,6 +15,7 @@ export function EntryMetaSection({
   isPending,
   onChange,
   visibleFields,
+  yvaLabel,
 }: Props) {
   function updateField(field: keyof EntryDraft, value: string) {
     onChange((current) => ({
@@ -190,9 +192,7 @@ export function EntryMetaSection({
             ) : null}
             {visible("yva") ? (
               <TextField
-                label={
-                  visibleFields ? "Ajotaito" : "Ajotaito / yleisvaikutelma"
-                }
+                label={yvaLabel ?? "Ajotaito / yleisvaikutelma"}
                 value={entryDraft.yva}
                 inputMode="decimal"
                 disabled={isPending}
diff --git a/apps/web/components/admin/trials/internal/era-section.tsx b/apps/web/components/admin/trials/internal/era-section.tsx
index f1f597b6..210ec447 100644
--- a/apps/web/components/admin/trials/internal/era-section.tsx
+++ b/apps/web/components/admin/trials/internal/era-section.tsx
@@ -15,6 +15,7 @@ type Props = {
     value: string,
   ) => void;
   visibleFields?: ReadonlySet<Exclude<keyof EraDraft, "era">>;
+  yvaLabel?: string;
 };
 
 export function EraSection({
@@ -24,6 +25,7 @@ export function EraSection({
   onRemoveEra,
   onChangeEraField,
   visibleFields,
+  yvaLabel,
 }: Props) {
   return (
     <>
@@ -70,8 +72,8 @@ export function EraSection({
                   visibleFields && !visibleFields.has(field) ? null : (
                     <label key={field} className="space-y-1 text-xs">
                       <span>
-                        {visibleFields && field === "yva"
-                          ? "ajotaito"
+                        {field === "yva"
+                          ? (yvaLabel ?? ADMIN_TRIAL_ERA_FIELD_LABELS[field])
                           : ADMIN_TRIAL_ERA_FIELD_LABELS[field]}
                       </span>
                       <Input
diff --git a/apps/web/components/admin/trials/internal/lisatiedot-matrix.tsx b/apps/web/components/admin/trials/internal/lisatiedot-matrix.tsx
index 11cba671..f0902485 100644
--- a/apps/web/components/admin/trials/internal/lisatiedot-matrix.tsx
+++ b/apps/web/components/admin/trials/internal/lisatiedot-matrix.tsx
@@ -162,15 +162,23 @@ export function LisatiedotMatrix({
                           <input
                             className="h-5 w-full rounded-sm border border-input bg-background px-1 text-center text-[10px] leading-none"
                             inputMode={
-                              row.inputKind === "text"
-                                ? "text"
-                                : row.inputKind === "integer"
-                                  ? "numeric"
+                              row.useSemanticControl
+                                ? row.inputKind === "text"
+                                  ? "text"
+                                  : row.inputKind === "integer"
+                                    ? "numeric"
+                                    : "decimal"
+                                : row.inputKind === "text"
+                                  ? "text"
                                   : "decimal"
                             }
-                            title={t(
-                              `admin.trials.manage.resultCreate.valueHint.${row.valueHint ?? row.inputKind}` as never,
-                            )}
+                            title={
+                              row.useSemanticControl
+                                ? t(
+                                    `admin.trials.manage.resultCreate.valueHint.${row.valueHint ?? row.inputKind}` as never,
+                                  )
+                                : undefined
+                            }
                             value={row.eraValues[era.era] ?? ""}
                             disabled={isPending}
                             onChange={(event) =>
diff --git a/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts b/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts
index 602fa3c1..0ee911dd 100644
--- a/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts
+++ b/apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts
@@ -142,4 +142,26 @@ describe("manual trial entry create model", () => {
       },
     });
   });
+
+  it("preserves generic marker values in compatibility fallback", () => {
+    const fieldSet = resolveResultCreateFieldSet(null);
+    const draft = createAdminTrialEntryCreateDraft(event, fieldSet);
+    draft.registrationNo = "FI43560/18";
+    const marker = draft.lisatiedotRows.find((row) => row.koodi === "10");
+    if (marker) marker.eraValues[1] = "0";
+
+    const result = toCreateAdminTrialEntryRequest("event-1", draft);
+
+    expect(result).toMatchObject({
+      ok: true,
+      request: {
+        lisatiedotRows: [
+          expect.objectContaining({
+            koodi: "10",
+            eraValues: [{ era: 1, arvo: "0" }],
+          }),
+        ],
+      },
+    });
+  });
 });
diff --git a/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts b/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts
index fef710ab..e97f7e6d 100644
--- a/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts
+++ b/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts
@@ -14,6 +14,10 @@ describe("result create field registry", () => {
     expect(fieldSet.entryFields.has("pin")).toBe(false);
     expect(fieldSet.eraFields.has("tja")).toBe(false);
     expect(fieldSet.eraFields.has("pin")).toBe(false);
+    expect(fieldSet.yvaLabels).toEqual({
+      entry: "Ajotaito",
+      era: "ajotaito",
+    });
   });
 
   it("matches the verified 2023+ lisatieto codes, parts, order and kinds", () => {
@@ -55,11 +59,14 @@ describe("result create field registry", () => {
     const marker = resolveResultCreateFieldSet(
       "trw_post_20230801",
     ).lisatiedot.find((row) => row.koodi === "10");
+    const toPersistedValue = marker?.toPersistedValue;
 
     expect(marker?.inputKind).toBe("marker");
-    expect(marker?.toPersistedValue("1")).toBe("1");
-    expect(marker?.toPersistedValue("0")).toBe("");
-    expect(marker?.toPersistedValue("")).toBe("");
+    expect(toPersistedValue).toBeTypeOf("function");
+    if (!toPersistedValue) throw new Error("Marker persistence mapper missing");
+    expect(toPersistedValue("1")).toBe("1");
+    expect(toPersistedValue("0")).toBe("");
+    expect(toPersistedValue("")).toBe("");
   });
 
   it.each([
@@ -71,10 +78,19 @@ describe("result create field registry", () => {
 
     expect(fieldSet.id).toBe("unverified-fallback");
     expect(fieldSet.verified).toBe(false);
+    expect(fieldSet.yvaLabels).toBeUndefined();
     expect(fieldSet.entryFields.has("tja")).toBe(true);
     expect(fieldSet.eraFields.has("pin")).toBe(true);
     expect(
       fieldSet.lisatiedot.some((row) => row.koodi === "25" && row.osa === "b"),
     ).toBe(true);
+    expect(
+      fieldSet.lisatiedot.every(
+        (row) =>
+          row.useSemanticControl === undefined &&
+          row.toPersistedValue === undefined &&
+          row.valueHint === undefined,
+      ),
+    ).toBe(true);
   });
 });
diff --git a/apps/web/lib/admin/trials/entry-edit-dialog-model.ts b/apps/web/lib/admin/trials/entry-edit-dialog-model.ts
index ca664719..132807a1 100644
--- a/apps/web/lib/admin/trials/entry-edit-dialog-model.ts
+++ b/apps/web/lib/admin/trials/entry-edit-dialog-model.ts
@@ -194,12 +194,8 @@ export function toLisatietoRows(
       group: config?.group ?? "unknown",
       label: config?.label ?? input.nimi ?? "Tuntematon lisätieto",
       inputKind: config?.inputKind ?? "text",
-      valueHint:
-        config?.valueHint ??
-        (config?.inputKind === "tri-state"
-          ? "marker"
-          : (config?.inputKind ?? "text")),
-      toPersistedValue: config?.toPersistedValue ?? ((value) => value),
+      valueHint: config?.valueHint,
+      toPersistedValue: config?.toPersistedValue,
       hideOsaSuffix: config?.hideOsaSuffix,
       useSemanticControl: config?.useSemanticControl,
       sortOrder:
diff --git a/apps/web/lib/admin/trials/result-create-field-registry.ts b/apps/web/lib/admin/trials/result-create-field-registry.ts
index 8cdb1220..654f458e 100644
--- a/apps/web/lib/admin/trials/result-create-field-registry.ts
+++ b/apps/web/lib/admin/trials/result-create-field-registry.ts
@@ -25,7 +25,11 @@ export type ResultCreateFieldSet = {
     | "admin.trials.manage.resultCreate.rulePeriod.unverified";
   entryFields: ReadonlySet<keyof EntryDraft>;
   eraFields: ReadonlySet<Exclude<keyof EraDraft, "era">>;
-  lisatiedot: readonly ResultCreateLisatietoField[];
+  yvaLabels?: {
+    entry: string;
+    era: string;
+  };
+  lisatiedot: readonly AdminTrialLisatietoConfig[];
 };
 
 export const SEEDED_TRIAL_RULE_WINDOW_IDS = [
@@ -105,9 +109,9 @@ function withSemantics(
   };
 }
 
-const FALLBACK_LISATIEDOT = ADMIN_TRIAL_LISATIETO_CONFIG.map((config) =>
-  withSemantics(config),
-);
+const FALLBACK_LISATIEDOT = ADMIN_TRIAL_LISATIETO_CONFIG.map((config) => ({
+  ...config,
+}));
 
 const POST_2023_INPUT_OVERRIDES: Readonly<
   Record<string, ResultCreateSemanticInputKind>
@@ -143,6 +147,10 @@ const POST_2023_FIELD_SET: ResultCreateFieldSet = {
   eraFields: new Set(
     [...ALL_ERA_FIELDS].filter((field) => field !== "tja" && field !== "pin"),
   ),
+  yvaLabels: {
+    entry: "Ajotaito",
+    era: "ajotaito",
+  },
   lisatiedot: POST_2023_LISATIEDOT,
 };
 

From 7d8c20bb613abdd08ec377d3e24fc279ccdaaabc Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Thu, 23 Jul 2026 13:48:47 +0300
Subject: [PATCH 20/24]  docs(trials): document rule-window behavior

---
 docs/features/admin-trial-management.md       |   8 +-
 .../trials/ajokoe-pdf-rule-periods.md         |   5 +
 docs/features/trials/rule-windows.md          | 204 ++++++++++++++++++
 .../phase5-trial-runtime-projection.md        |  15 +-
 docs/planning/trials/README.md                |   1 +
 .../trials/result-fields-by-rule-window.md    |   5 +-
 6 files changed, 224 insertions(+), 14 deletions(-)
 create mode 100644 docs/features/trials/rule-windows.md

diff --git a/docs/features/admin-trial-management.md b/docs/features/admin-trial-management.md
index b8cbc8aa..0be1545b 100644
--- a/docs/features/admin-trial-management.md
+++ b/docs/features/admin-trial-management.md
@@ -20,7 +20,9 @@ and follow-up admin flow redesign).
 - Manual result creation resolves its visible score, era, and lisätieto fields
   from the event's persisted `trialRuleWindowId`. The 2023+ window is verified
   against its PDF field set; older, null, and unknown windows retain the
-  complete compatibility form with a warning.
+  complete compatibility form with a warning. The canonical timeline, field
+  sets, and fallback semantics are documented in
+  [Trial rule windows](./trials/rule-windows.md).
 
 ## Main files
 
@@ -101,7 +103,9 @@ and follow-up admin flow redesign).
   `trw_post_20230801`, entry- and era-level `tja`/`pin` are hidden, lisätieto
   codes 25 and 27 expose only part `a`, and codes 19, 23, 26, and 59 use their
   verified semantic input kinds. Other rule windows show the full compatibility
-  set and an unverified-field warning.
+  set and an unverified-field warning. See
+  [Trial rule windows](./trials/rule-windows.md) for the complete verified
+  configuration and compatibility boundary.
 - Selected dog rows have PDF, edit, and result-delete actions.
 - A missing workspace event is shown explicitly and never falls back to a
   different event.
diff --git a/docs/features/trials/ajokoe-pdf-rule-periods.md b/docs/features/trials/ajokoe-pdf-rule-periods.md
index 77e8b76c..0d7e33d4 100644
--- a/docs/features/trials/ajokoe-pdf-rule-periods.md
+++ b/docs/features/trials/ajokoe-pdf-rule-periods.md
@@ -3,6 +3,11 @@
 This document tracks AJOK PDF availability by rule period. It intentionally
 does not define field mapping for any single pöytäkirja renderer.
 
+Persisted rule-window identity and manual result-creation verification are
+documented separately in [Trial rule windows](./rule-windows.md). An
+implemented PDF renderer does not by itself make a rule window verified for
+manual creation.
+
 The web app exposes the PDFs through two entrypoints:
 
 - Public stacked view: `/beagle/trials/pdf?trialEntryId=...`
diff --git a/docs/features/trials/rule-windows.md b/docs/features/trials/rule-windows.md
new file mode 100644
index 00000000..4ab4e291
--- /dev/null
+++ b/docs/features/trials/rule-windows.md
@@ -0,0 +1,204 @@
+# Trial rule windows
+
+## Purpose
+
+Trial rule windows give AJOK events a persisted rule-period identity. This
+document is the source of truth for the seeded timeline and for the verification
+status of manual result creation.
+
+Verification in this document is scoped to the manual create form. It is
+separate from PDF renderer availability, which is documented in
+[AJOK PDF rule periods](./ajokoe-pdf-rule-periods.md).
+
+## Runtime resolution
+
+Rule windows are inclusive date ranges stored in `trial_rule_window`. Event
+creation and trial imports resolve an event date against the active ranges and
+persist the selected ID in `TrialEvent.trialRuleWindowId`. The ID may be `null`
+when no active range matches.
+
+Consumers use the persisted event-owned ID. In particular, the manual result
+form must not recalculate a window from the event date in the browser.
+
+The result-create registry uses the ID to select field visibility, terminology,
+Lisätiedot controls, and control-to-persistence conversion. This changes the
+creation UI and how its values are expressed in the existing write format; it
+does not change the backend write contract or database schema and does not add
+rule-window-specific server validation.
+
+## Verification statuses
+
+| Rule-window ID        | Effective period   | Manual result creation                      |
+| --------------------- | ------------------ | ------------------------------------------- |
+| `trw_pre_20020801`    | Before 1.8.2002    | Unverified; show-all compatibility fallback |
+| `trw_range_2002_2005` | 1.8.2002–31.7.2005 | Unverified; show-all compatibility fallback |
+| `trw_range_2005_2011` | 1.8.2005–31.7.2011 | Unverified; show-all compatibility fallback |
+| `trw_post_20110801`   | 1.8.2011–31.7.2023 | Unverified; show-all compatibility fallback |
+| `trw_post_20230801`   | From 1.8.2023      | Verified for manual result creation         |
+
+`null` and unknown IDs also use the unverified compatibility fallback.
+
+A rule window may have an implemented PDF renderer without having a verified
+manual-create field set. Do not infer one status from the other.
+
+## `trw_post_20230801`
+
+### Effective period
+
+`trw_post_20230801` applies from 1 August 2023 onward. Manual result creation
+selects this configuration only when the trial event's persisted
+`trialRuleWindowId` has that exact value.
+
+### Verification status
+
+This is the only rule window currently verified for manual result creation.
+The field set has been checked against the current 2023+ dog-trial PDF behavior.
+
+### Entry fields
+
+The verified score fields are:
+
+- Hyväksytyt ajominuutit
+- Ajoajan pisteet
+- Haku
+- Haukku
+- Ajotaito
+- Ansiopisteet yhteensä
+
+These compatibility score fields are hidden:
+
+- Tie ja estetyöskentely (`tja`)
+- Metsästysinto (`pin`)
+
+The existing grouped layout remains unchanged:
+
+- Ajo
+- Haku
+- Haukku
+- Muut
+
+Other retained create fields—event/result metadata, loss points, status, notes,
+owner snapshots, and judges—remain available. Rule-window selection does not
+redesign the form.
+
+The verified `yva` term is **Ajotaito**. Default editing and compatibility
+fallback continue using **Ajotaito / yleisvaikutelma**.
+
+### Era fields
+
+The verified era-level fields are:
+
+| Field             | Current create label |
+| ----------------- | -------------------- |
+| `alkoi`           | `alkoi`              |
+| `hakumin`         | `hakumin`            |
+| `ajomin`          | `ajomin`             |
+| `haku`            | `haku`               |
+| `hauk`            | `haukku`             |
+| `yva`             | `ajotaito`           |
+| `hlo`             | `hakulöysyys`        |
+| `alo`             | `ajolöysyys`         |
+| `huomautusTeksti` | `Huomautusteksti`    |
+
+Era-level `tja` and `pin` are hidden. The current-rule term is Ajotaito; the
+generic edit and fallback term remains Ajotaito / yleisvaikutelma.
+
+### Lisätiedot
+
+The verified rows, in registry order, are:
+
+- codes `10`–`24`
+- code `25`, part `a`
+- code `26`
+- code `27`, part `a`
+- codes `30`–`37`
+- codes `40`–`42`
+- codes `50`–`62`
+
+Parts `25:b`, `25:c`, `27:b`, and `27:c` are not included. The retained `a`
+rows are displayed without a part suffix.
+
+Input kinds are:
+
+| Input kind | Codes and parts                                                           |
+| ---------- | ------------------------------------------------------------------------- |
+| Marker     | `10`, `11`, `13`–`16`                                                     |
+| Integer    | `12`, `17`–`20`, `27:a`, `36`, `58`                                       |
+| Decimal    | `21`–`24`, `25:a`, `26`, `30`–`35`, `37`, `40`–`42`, `50`–`57`, `59`–`62` |
+| Text       | None currently configured                                                 |
+| Tri-state  | None currently configured                                                 |
+
+The UI groups rows as Olosuhteet, Haku, Haukku, Metsästysinto, Ajo, and Muut
+ominaisuudet. Rows use the registry's `sortOrder` within those groups.
+Persisted integer `jarjestys` comes from the canonical base configuration's
+`persistenceOrder`; filtering parts out of the verified set does not renumber
+the remaining rows.
+
+### Persistence behavior
+
+The registry owns create-form semantics and conversion to the existing
+Lisätiedot persistence format:
+
+- A selected verified marker persists as `"1"`.
+- An unchecked verified marker maps to empty and is omitted from the write.
+- Integer, decimal, and text controls use their configured input semantics and
+  map to the existing string `arvo` values.
+- Tri-state is available only for an explicitly configured field whose domain
+  distinguishes empty, `"0"`, and `"1"`; no 2023+ row currently uses it.
+- Empty Lisätiedot rows are omitted from the request.
+
+Entry, era, and Lisätiedot request shapes remain the existing backend contract.
+
+## Historical and unknown windows
+
+### Compatibility fallback
+
+Every seeded historical ID, `null`, and unknown ID currently uses one
+unverified show-all compatibility fallback:
+
+- all compatibility entry and era fields remain visible;
+- generic labels remain in use, including Ajotaito / yleisvaikutelma;
+- Lisätiedot rows are built from `ADMIN_TRIAL_LISATIETO_CONFIG`;
+- original generic marker selects and generic inputs remain in use;
+- raw values such as an explicit `"0"` are preserved;
+- no current-rule semantic conversion is applied; and
+- the result-create UI displays an unverified-field-set warning.
+
+Show-all compatibility does **not** mean that a historical rule window has
+been implemented correctly. It is a safe generic data-entry fallback until
+authoritative historical field sets are verified.
+
+### Verification requirements
+
+Before marking a historical window verified, contributors must establish:
+
+- an authoritative rule source;
+- the exact entry fields;
+- the exact era fields;
+- period-correct terminology;
+- exact Lisätiedot codes and parts;
+- input and control semantics;
+- control-to-persistence mapping; and
+- focused registry, presentation, and serialization tests.
+
+Do not infer historical fields from another period, from the compatibility
+fallback, or solely from PDF renderer availability.
+
+## Contributor guidance
+
+- Treat `TrialEvent.trialRuleWindowId` as persisted event context.
+- Keep rule-ID branching inside the result-create registry, not presentation
+  components.
+- Keep the fallback generic until a historical window completes the
+  verification requirements above.
+- Update this document with any verified field-set change.
+- Keep import-specific projection behavior in
+  [Legacy Import Phase 5](../../legacy-import/phase5-trial-runtime-projection.md)
+  and PDF-specific behavior in
+  [AJOK PDF rule periods](./ajokoe-pdf-rule-periods.md).
+
+Implementation source:
+
+- `apps/web/lib/admin/trials/result-create-field-registry.ts`
+- `apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts`
+- `apps/web/lib/admin/trials/__tests__/entry-create-model.test.ts`
diff --git a/docs/legacy-import/phase5-trial-runtime-projection.md b/docs/legacy-import/phase5-trial-runtime-projection.md
index 69dc91d1..4c96bbdd 100644
--- a/docs/legacy-import/phase5-trial-runtime-projection.md
+++ b/docs/legacy-import/phase5-trial-runtime-projection.md
@@ -98,16 +98,11 @@ Keep `legacy_akoeall` summary values on `TrialEntry`:
 Trial rule timeline:
 
 - Rule windows are seeded by migration before phase 5 runs.
-- `trw_pre_20020801`: `AJOKOKEEN SÄÄNNÖT JA OHJEET (AJOK ja BEAJ), voimassa ennen 1.8.2002`
-- `trw_range_2002_2005`: `AJOKOKEEN SÄÄNNÖT JA OHJEET (AJOK ja BEAJ), voimassa 1.8.2002-31.7.2005`
-- `trw_range_2005_2011`: `AJOKOKEEN SÄÄNNÖT JA OHJEET (AJOK ja BEAJ), voimassa 1.8.2005-31.7.2011`
-- `trw_post_20110801`: `AJOKOKEEN SÄÄNNÖT JA OHJEET (AJOK ja BEAJ), voimassa 1.8.2011-31.7.2023`
-- Current rule window:
-  - `id = trw_post_20230801`
-  - `fromYmd = 20230801`
-  - `toYmd = null`
-  - `sortOrder = 50`
-  - `label = AJOKOKEEN SÄÄNNÖT JA OHJEET (AJOK ja BEAJ), voimassa 1.8.2023 alkaen`
+- Phase 5 resolves the imported event date against the active inclusive
+  windows and persists the selected ID on `TrialEvent`.
+- The canonical seeded timeline and its manual-creation verification statuses
+  are documented in
+  [Trial rule windows](../features/trials/rule-windows.md).
 
 Map selected `bealt*` era fields to `TrialEra`:
 
diff --git a/docs/planning/trials/README.md b/docs/planning/trials/README.md
index 79db8678..06b43ba7 100644
--- a/docs/planning/trials/README.md
+++ b/docs/planning/trials/README.md
@@ -34,6 +34,7 @@ Repository guardrails and current feature documentation:
 - [Architecture guardrails](../../../ARCHITECTURE.md)
 - [Documentation rules](../../documentation-rules.md)
 - [Current admin trial management](../../features/admin-trial-management.md)
+- [Canonical trial rule windows](../../features/trials/rule-windows.md)
 - [Koiratietokanta AJOK upsert](../../features/trials/koiratietokanta-api-ajok-upsert.md)
 
 ## Grounded current state
diff --git a/docs/planning/trials/result-fields-by-rule-window.md b/docs/planning/trials/result-fields-by-rule-window.md
index d7ca795c..60c3eb5c 100644
--- a/docs/planning/trials/result-fields-by-rule-window.md
+++ b/docs/planning/trials/result-fields-by-rule-window.md
@@ -2,8 +2,9 @@
 
 ## Status and sequencing
 
-This is the first creation follow-up after R2. It is planning only and does
-not authorize implementation.
+R3A was implemented by PR #344. This file remains the planning and review
+record; current durable behavior is documented in
+[Trial rule windows](../../features/trials/rule-windows.md).
 
 R2 must be completed and reviewed before this work begins. R3A introduces the
 rule-window field-set structure only for the existing full-page result-create

From ce713bcd94e68fac05dbdd2322d712ef06d10032 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Thu, 23 Jul 2026 13:50:55 +0300
Subject: [PATCH 21/24] fic docs

---
 docs/planning/trials/result-fields-by-rule-window.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/planning/trials/result-fields-by-rule-window.md b/docs/planning/trials/result-fields-by-rule-window.md
index 60c3eb5c..0a650371 100644
--- a/docs/planning/trials/result-fields-by-rule-window.md
+++ b/docs/planning/trials/result-fields-by-rule-window.md
@@ -2,7 +2,7 @@
 
 ## Status and sequencing
 
-R3A was implemented by PR #344. This file remains the planning and review
+R3A is implemented in PR #344. This file remains the planning and review
 record; current durable behavior is documented in
 [Trial rule windows](../../features/trials/rule-windows.md).
 

From ed484380ac8ba0cb6d20dc93719fb7de5f226dd6 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Thu, 23 Jul 2026 15:54:50 +0300
Subject: [PATCH 22/24] feat(trials): redesign result creation workspace
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Organize manual result creation into collapsible cards following the
  official trial PDF domain structure without copying its matrix layout.

  Add a searchable, grouped Lisätiedot workspace with responsive desktop
  and mobile editors, accessible focus handling, localized controls, and
  stable reset behavior. Keep R3A field visibility, draft ownership,
  serialization, validation, mutations, navigation protection, and
  editing
  behavior unchanged.

  Files:
  - CHANGELOG.md
  -
    apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
  -
    apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
  -
    apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx
  -
    apps/web/components/admin/trials/internal/__tests__/result-create-card.test.tsx
  -
    apps/web/components/admin/trials/internal/entry-meta-basic-fields.tsx
  - apps/web/components/admin/trials/internal/entry-meta-field.tsx
  -
    apps/web/components/admin/trials/internal/entry-meta-judge-fields.tsx
  - apps/web/components/admin/trials/internal/entry-meta-loss-fields.tsx
  -
    apps/web/components/admin/trials/internal/entry-meta-result-fields.tsx
  -
    apps/web/components/admin/trials/internal/entry-meta-score-fields.tsx
  - apps/web/components/admin/trials/internal/entry-meta-section.tsx
  - apps/web/components/admin/trials/internal/era-section.tsx
  - apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx
  - apps/web/components/admin/trials/internal/result-create-card.tsx
  - apps/web/components/ui/sheet.tsx
  -
    apps/web/hooks/admin/trials/manage/__tests__/use-result-create-workspace-mobile.test.ts
  -
    apps/web/hooks/admin/trials/manage/use-result-create-workspace-mobile.ts
  -
    apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
  -
    apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts
  - apps/web/lib/admin/trials/entry-edit-config.ts
  - apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
  - apps/web/lib/admin/trials/result-create-field-registry.ts
  - apps/web/lib/i18n/messages/admin/trials/manage.ts
  - docs/features/admin-trial-management.md

  Ref BEJ-103
---
 CHANGELOG.md                                  |   1 +
 .../admin-trial-entry-create-page-client.tsx  | 331 ++++++++++++--
 .../__tests__/entry-meta-section.test.tsx     |  51 +++
 .../internal/__tests__/era-section.test.tsx   |  41 ++
 .../__tests__/result-create-card.test.tsx     |  37 ++
 .../internal/entry-meta-basic-fields.tsx      | 104 +++++
 .../trials/internal/entry-meta-field.tsx      |  39 ++
 .../internal/entry-meta-judge-fields.tsx      |  58 +++
 .../internal/entry-meta-loss-fields.tsx       |  53 +++
 .../internal/entry-meta-result-fields.tsx     | 114 +++++
 .../internal/entry-meta-score-fields.tsx      | 147 +++++++
 .../trials/internal/entry-meta-section.tsx    | 391 +++--------------
 .../admin/trials/internal/era-section.tsx     |  27 +-
 .../trials/internal/lisatiedot-workspace.tsx  | 407 ++++++++++++++++++
 .../trials/internal/result-create-card.tsx    |  53 +++
 apps/web/components/ui/sheet.tsx              |   4 +-
 ...use-result-create-workspace-mobile.test.ts | 108 +++++
 .../use-result-create-workspace-mobile.ts     |  20 +
 .../lisatiedot-workspace-state.test.ts        | 127 ++++++
 .../result-create-field-registry.test.ts      | 104 +++++
 .../web/lib/admin/trials/entry-edit-config.ts |  10 +
 .../trials/lisatiedot-workspace-state.ts      | 116 +++++
 .../trials/result-create-field-registry.ts    |  89 ++++
 .../lib/i18n/messages/admin/trials/manage.ts  |  52 +++
 docs/features/admin-trial-management.md       |  15 +
 25 files changed, 2118 insertions(+), 381 deletions(-)
 create mode 100644 apps/web/components/admin/trials/internal/__tests__/result-create-card.test.tsx
 create mode 100644 apps/web/components/admin/trials/internal/entry-meta-basic-fields.tsx
 create mode 100644 apps/web/components/admin/trials/internal/entry-meta-field.tsx
 create mode 100644 apps/web/components/admin/trials/internal/entry-meta-judge-fields.tsx
 create mode 100644 apps/web/components/admin/trials/internal/entry-meta-loss-fields.tsx
 create mode 100644 apps/web/components/admin/trials/internal/entry-meta-result-fields.tsx
 create mode 100644 apps/web/components/admin/trials/internal/entry-meta-score-fields.tsx
 create mode 100644 apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx
 create mode 100644 apps/web/components/admin/trials/internal/result-create-card.tsx
 create mode 100644 apps/web/hooks/admin/trials/manage/__tests__/use-result-create-workspace-mobile.test.ts
 create mode 100644 apps/web/hooks/admin/trials/manage/use-result-create-workspace-mobile.ts
 create mode 100644 apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
 create mode 100644 apps/web/lib/admin/trials/lisatiedot-workspace-state.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 191007c0..56fc2658 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ This project uses a user-facing changelog format.
 
 ### Changed
 
+- Ajokoetuloksen lisäyslomakkeen avattavat kortit noudattavat virallisen pöytäkirjan aihealueita ilman pöytäkirjan taulukkoasettelun kopiointia. Lisätietoja voi hakea ja muokata pöytäkirjan mukaisessa ryhmäjärjestyksessä myös mobiilissa.
 - Viimeisen koetuloksen poistaminen säilyttää ajokoetapahtuman tyhjänä, kunnes ylläpitäjä poistaa tapahtuman erikseen.
 - Uuden ajokoetapahtuman luomisen jälkeen siirrytään suoraan lisäämään tapahtuman ensimmäistä koetulosta.
 - Ajokoetuloksen lisäyslomake näyttää 1.8.2023 alkaen käytössä olevan sääntökauden mukaiset kentät. Vanhemmilla tai tunnistamattomilla sääntökausilla kaikki yhteensopivuuskentät säilyvät näkyvissä varoituksen kanssa.
diff --git a/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx b/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
index e9876c1a..8c46ddbb 100644
--- a/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
+++ b/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
@@ -28,9 +28,18 @@ import {
 } from "@/queries/admin/trials";
 import { EntryMetaSection } from "./internal/entry-meta-section";
 import { EraSection } from "./internal/era-section";
-import { LisatiedotMatrix } from "./internal/lisatiedot-matrix";
+import { LisatiedotWorkspace } from "./internal/lisatiedot-workspace";
+import { ResultCreateCard } from "./internal/result-create-card";
 
 type SaveIntent = "another" | "finish";
+type CardId =
+  | "basic"
+  | "time"
+  | "merit"
+  | "loss"
+  | "result"
+  | "judges"
+  | "additional";
 
 export function AdminTrialEntryCreatePageClient({
   trialEventId,
@@ -123,6 +132,10 @@ function ResultCreateForm({
     [event, fieldSet],
   );
   const [draft, setDraft] = React.useState(initial);
+  const [openCards, setOpenCards] = React.useState<ReadonlySet<CardId>>(
+    new Set(["basic"]),
+  );
+  const [workspaceResetKey, setWorkspaceResetKey] = React.useState(0);
   const [errorText, setErrorText] = React.useState<string | null>(null);
   const submittingRef = React.useRef(false);
   const dirty = !areAdminTrialEntryCreateDraftsEqual(initial, draft);
@@ -157,6 +170,17 @@ function ResultCreateForm({
     setErrorText(null);
     const parsed = toCreateAdminTrialEntryRequest(event.trialEventId, draft);
     if (!parsed.ok) {
+      setOpenCards(
+        (current) =>
+          new Set([
+            ...current,
+            parsed.section === "registration"
+              ? "basic"
+              : parsed.section === "eras"
+                ? "time"
+                : "result",
+          ]),
+      );
       setErrorText(
         t(
           `admin.trials.manage.resultCreate.validation.${parsed.section}` as never,
@@ -168,9 +192,11 @@ function ResultCreateForm({
     try {
       await mutation.mutateAsync(parsed.request);
       toast.success(t("admin.trials.manage.resultCreate.success"));
-      if (intent === "another")
+      if (intent === "another") {
         setDraft(createAdminTrialEntryCreateDraft(event, fieldSet));
-      else router.replace(workspaceHref);
+        setOpenCards(new Set(["basic"]));
+        setWorkspaceResetKey((current) => current + 1);
+      } else router.replace(workspaceHref);
     } catch (error) {
       const code =
         error instanceof AdminMutationError ? error.errorCode : undefined;
@@ -192,6 +218,7 @@ function ResultCreateForm({
           ? (error.details as AdminTrialEntryValidationIssue | undefined)
           : undefined;
       if (issue?.area === "additional_info" && issue.koodi) {
+        setOpenCards((current) => new Set([...current, "additional"]));
         const row = `${issue.koodi}${issue.osa ? issue.osa : ""}`;
         const issueKey =
           issue.reason === "invalid_lisatieto_order"
@@ -199,6 +226,18 @@ function ResultCreateForm({
             : "admin.trials.manage.resultCreate.error.additionalInfoRow";
         setErrorText(`${t(issueKey)}: ${row}.`);
       } else {
+        const errorCard: Partial<Record<string, CardId>> = {
+          INVALID_REGISTRATION_NUMBER: "basic",
+          TRIAL_ENTRY_REGISTRATION_CONFLICT: "basic",
+          INVALID_TRIAL_ENTRY: "result",
+          INVALID_TRIAL_ERAS: "time",
+          INVALID_TRIAL_ADDITIONAL_INFO: "additional",
+        };
+        if (code && errorCard[code]) {
+          setOpenCards(
+            (current) => new Set([...current, errorCard[code] as CardId]),
+          );
+        }
         setErrorText(
           t(
             `admin.trials.manage.resultCreate.error.${map[code ?? ""] ?? "generic"}` as never,
@@ -210,6 +249,50 @@ function ResultCreateForm({
     }
   }
 
+  function toggleCard(id: CardId) {
+    setOpenCards((current) => {
+      const next = new Set(current);
+      if (next.has(id)) next.delete(id);
+      else next.add(id);
+      return next;
+    });
+  }
+  const displaySummary = (...values: string[]) =>
+    values
+      .filter((value) => value.trim())
+      .slice(0, 3)
+      .join(" • ") || t("admin.trials.manage.resultCreate.summary.empty");
+  const entryGroups = Object.fromEntries(
+    fieldSet.presentationGroups.map((group) => [
+      group.id,
+      new Set(group.entryFields),
+    ]),
+  );
+  const eraGroups = Object.fromEntries(
+    fieldSet.presentationGroups.map((group) => [
+      group.id,
+      new Set(group.eraFields),
+    ]),
+  );
+  const changeEntry = (
+    update: (current: typeof draft.entry) => typeof draft.entry,
+  ) =>
+    setDraft((current) => ({
+      ...current,
+      entry: update(current.entry),
+    }));
+  const changeEra = (
+    era: number,
+    field: Exclude<keyof (typeof draft.eras)[number], "era">,
+    value: string,
+  ) =>
+    setDraft((current) => ({
+      ...current,
+      eras: current.eras.map((item) =>
+        item.era === era ? { ...item, [field]: value } : item,
+      ),
+    }));
+
   return (
     <div className="space-y-4">
       <div>
@@ -229,13 +312,27 @@ function ResultCreateForm({
           </p>
         ) : null}
       </div>
-      <Card>
-        <CardContent className="space-y-5 p-5">
-          {errorText ? (
-            <p className="text-sm text-destructive" role="alert">
-              {errorText}
-            </p>
-          ) : null}
+      {errorText ? (
+        <p
+          className="text-sm text-destructive"
+          role="alert"
+          aria-live="assertive"
+        >
+          {errorText}
+        </p>
+      ) : null}
+      <ResultCreateCard
+        id="result-create-basic"
+        title={t("admin.trials.manage.resultCreate.card.basic")}
+        summary={displaySummary(
+          draft.registrationNo,
+          draft.entry.koemaasto,
+          draft.entry.omistajaSnapshot,
+        )}
+        open={openCards.has("basic")}
+        onToggle={() => toggleCard("basic")}
+      >
+        <div className="space-y-5">
           <label className="block space-y-1 text-sm">
             <span>{t("admin.trials.manage.resultCreate.registration")}</span>
             <Input
@@ -252,46 +349,204 @@ function ResultCreateForm({
           <EntryMetaSection
             entryDraft={draft.entry}
             isPending={mutation.isPending}
-            onChange={(update) =>
-              setDraft((current) => ({
-                ...current,
-                entry: update(current.entry),
-              }))
-            }
-            visibleFields={fieldSet.entryFields}
+            onChange={changeEntry}
+            visibleFields={entryGroups.basic}
             yvaLabel={fieldSet.yvaLabels?.entry}
+            groups={["basic"]}
+            showHeadings={false}
           />
+        </div>
+      </ResultCreateCard>
+      <ResultCreateCard
+        id="result-create-time"
+        title={t("admin.trials.manage.resultCreate.card.time")}
+        summary={displaySummary(
+          draft.entry.hyvaksytytAjominuutit,
+          draft.entry.ajoajanPisteet,
+          `${draft.eras.length} ${t("admin.trials.manage.resultCreate.summary.eras")}`,
+        )}
+        open={openCards.has("time")}
+        onToggle={() => toggleCard("time")}
+      >
+        <div className="space-y-5">
           <EraSection
             eras={draft.eras}
             isPending={mutation.isPending}
             onAddEra={addEra}
             onRemoveEra={removeEra}
-            onChangeEraField={(era, field, value) =>
-              setDraft((current) => ({
-                ...current,
-                eras: current.eras.map((item) =>
-                  item.era === era ? { ...item, [field]: value } : item,
-                ),
-              }))
-            }
-            visibleFields={fieldSet.eraFields}
+            onChangeEraField={changeEra}
+            visibleFields={eraGroups.time}
             yvaLabel={fieldSet.yvaLabels?.era}
           />
-          <LisatiedotMatrix
+          <EntryMetaSection
+            entryDraft={draft.entry}
+            isPending={mutation.isPending}
+            onChange={changeEntry}
+            visibleFields={entryGroups.time}
+            yvaLabel={fieldSet.yvaLabels?.entry}
+            groups={["merit"]}
+            showHeadings={false}
+          />
+        </div>
+      </ResultCreateCard>
+      <ResultCreateCard
+        id="result-create-merit"
+        title={t("admin.trials.manage.resultCreate.card.merit")}
+        summary={displaySummary(
+          draft.entry.haku,
+          draft.entry.hauk,
+          draft.entry.ansiopisteetYhteensa,
+        )}
+        open={openCards.has("merit")}
+        onToggle={() => toggleCard("merit")}
+      >
+        <div className="space-y-5">
+          <EraSection
             eras={draft.eras}
-            rows={draft.lisatiedotRows}
             isPending={mutation.isPending}
-            onChangeCell={(koodi, osa, era, value) =>
-              setDraft((current) => ({
-                ...current,
-                lisatiedotRows: current.lisatiedotRows.map((row) =>
-                  row.koodi === koodi && row.osa === osa
-                    ? { ...row, eraValues: { ...row.eraValues, [era]: value } }
-                    : row,
-                ),
-              }))
-            }
+            onAddEra={addEra}
+            onRemoveEra={removeEra}
+            onChangeEraField={changeEra}
+            visibleFields={eraGroups.merit}
+            yvaLabel={fieldSet.yvaLabels?.era}
+            showControls={false}
+          />
+          <EntryMetaSection
+            entryDraft={draft.entry}
+            isPending={mutation.isPending}
+            onChange={changeEntry}
+            visibleFields={entryGroups.merit}
+            yvaLabel={fieldSet.yvaLabels?.entry}
+            groups={["merit", "other"]}
+            showHeadings={false}
+          />
+        </div>
+      </ResultCreateCard>
+      <ResultCreateCard
+        id="result-create-loss"
+        title={t("admin.trials.manage.resultCreate.card.loss")}
+        summary={displaySummary(
+          draft.entry.hlo,
+          draft.entry.alo,
+          draft.entry.tappiopisteetYhteensa,
+        )}
+        open={openCards.has("loss")}
+        onToggle={() => toggleCard("loss")}
+      >
+        <div className="space-y-5">
+          <EraSection
+            eras={draft.eras}
+            isPending={mutation.isPending}
+            onAddEra={addEra}
+            onRemoveEra={removeEra}
+            onChangeEraField={changeEra}
+            visibleFields={eraGroups.loss}
+            showControls={false}
           />
+          <EntryMetaSection
+            entryDraft={draft.entry}
+            isPending={mutation.isPending}
+            onChange={changeEntry}
+            visibleFields={entryGroups.loss}
+            groups={["other"]}
+            showHeadings={false}
+          />
+        </div>
+      </ResultCreateCard>
+      <ResultCreateCard
+        id="result-create-result"
+        title={t("admin.trials.manage.resultCreate.card.result")}
+        summary={displaySummary(
+          draft.entry.award,
+          draft.entry.points,
+          draft.entry.rank,
+        )}
+        open={openCards.has("result")}
+        onToggle={() => toggleCard("result")}
+      >
+        <div className="space-y-5">
+          <EntryMetaSection
+            entryDraft={draft.entry}
+            isPending={mutation.isPending}
+            onChange={changeEntry}
+            visibleFields={entryGroups.result}
+            groups={["result"]}
+            showHeadings={false}
+          />
+          {eraGroups.result.size ? (
+            <EraSection
+              eras={draft.eras}
+              isPending={mutation.isPending}
+              onAddEra={addEra}
+              onRemoveEra={removeEra}
+              onChangeEraField={changeEra}
+              visibleFields={eraGroups.result}
+              showControls={false}
+            />
+          ) : null}
+        </div>
+      </ResultCreateCard>
+      <ResultCreateCard
+        id="result-create-judges"
+        title={t("admin.trials.manage.resultCreate.card.judges")}
+        summary={displaySummary(
+          draft.entry.ryhmatuomariNimi,
+          draft.entry.palkintotuomariNimi,
+          draft.entry.judge,
+        )}
+        open={openCards.has("judges")}
+        onToggle={() => toggleCard("judges")}
+      >
+        <EntryMetaSection
+          entryDraft={draft.entry}
+          isPending={mutation.isPending}
+          onChange={changeEntry}
+          visibleFields={entryGroups.judges}
+          groups={["judges"]}
+          showHeadings={false}
+        />
+      </ResultCreateCard>
+      <ResultCreateCard
+        id="result-create-additional"
+        title={t("admin.trials.manage.resultCreate.card.additional")}
+        summary={`${draft.lisatiedotRows.filter((row) => Object.values(row.eraValues).some(Boolean)).length} ${t("admin.trials.manage.resultCreate.summary.selected")}`}
+        open={openCards.has("additional")}
+        onToggle={() => toggleCard("additional")}
+      >
+        <LisatiedotWorkspace
+          key={workspaceResetKey}
+          eras={draft.eras}
+          rows={draft.lisatiedotRows}
+          isPending={mutation.isPending}
+          onChangeCell={(koodi, osa, era, value) =>
+            setDraft((current) => ({
+              ...current,
+              lisatiedotRows: current.lisatiedotRows.map((row) =>
+                row.koodi === koodi && row.osa === osa
+                  ? { ...row, eraValues: { ...row.eraValues, [era]: value } }
+                  : row,
+              ),
+            }))
+          }
+          onRemoveRow={(koodi, osa) =>
+            setDraft((current) => ({
+              ...current,
+              lisatiedotRows: current.lisatiedotRows.map((row) =>
+                row.koodi === koodi && row.osa === osa
+                  ? {
+                      ...row,
+                      eraValues: Object.fromEntries(
+                        Object.keys(row.eraValues).map((era) => [era, ""]),
+                      ),
+                    }
+                  : row,
+              ),
+            }))
+          }
+        />
+      </ResultCreateCard>
+      <Card>
+        <CardContent className="p-5">
           <div className="flex flex-wrap gap-2">
             <Button
               disabled={mutation.isPending}
diff --git a/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx b/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
index 3e0d38d7..5a661d4f 100644
--- a/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
+++ b/apps/web/components/admin/trials/internal/__tests__/entry-meta-section.test.tsx
@@ -100,6 +100,57 @@ describe("EntryMetaSection", () => {
     expect(html).toContain("Ansiopisteet yhteensä");
   });
 
+  it("renders only the requested presentation groups", () => {
+    const html = renderToStaticMarkup(
+      React.createElement(EntryMetaSection, {
+        entryDraft,
+        isPending: false,
+        onChange: vi.fn(),
+        groups: ["result", "judges"],
+      }),
+    );
+
+    expect(html).toContain("Tulos ja huomautus");
+    expect(html).toContain("Tuomarit ja allekirjoitukset");
+    expect(html).not.toContain("Kokeen ja koiran tiedot");
+    expect(html).not.toContain("Ansiopisteet");
+    expect(html).not.toContain("Tappiopisteet");
+  });
+
+  it("moves weather into the create result group without changing edit defaults", () => {
+    const fieldSet = resolveResultCreateFieldSet("trw_post_20230801");
+    const groups = Object.fromEntries(
+      fieldSet.presentationGroups.map((group) => [
+        group.id,
+        new Set(group.entryFields),
+      ]),
+    );
+    const props = {
+      entryDraft,
+      isPending: false,
+      onChange: vi.fn(),
+      showHeadings: false,
+    };
+    const basicHtml = renderToStaticMarkup(
+      React.createElement(EntryMetaSection, {
+        ...props,
+        groups: ["basic"],
+        visibleFields: groups.basic,
+      }),
+    );
+    const resultHtml = renderToStaticMarkup(
+      React.createElement(EntryMetaSection, {
+        ...props,
+        groups: ["result"],
+        visibleFields: groups.result,
+      }),
+    );
+
+    expect(basicHtml).not.toContain("Keli");
+    expect(resultHtml).toContain("Keli");
+    expect(resultHtml).toContain("Huomautusteksti");
+  });
+
   it("keeps the generic label and all fields in compatibility fallback", () => {
     const fieldSet = resolveResultCreateFieldSet(null);
     const html = renderToStaticMarkup(
diff --git a/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx b/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx
index d2367c5d..8ca370d5 100644
--- a/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx
+++ b/apps/web/components/admin/trials/internal/__tests__/era-section.test.tsx
@@ -42,4 +42,45 @@ describe("EraSection", () => {
     expect(fallbackHtml).toContain("tie ja estetyöskentely");
     expect(fallbackHtml).toContain("metsästysinto");
   });
+
+  it("renders only the era fields resolved for a presentation domain", () => {
+    const props = {
+      eras: [createEmptyEraDraft(1)],
+      isPending: false,
+      onAddEra: vi.fn(),
+      onRemoveEra: vi.fn(),
+      onChangeEraField: vi.fn(),
+      showControls: false,
+      showHeading: false,
+    };
+    const fieldSet = resolveResultCreateFieldSet("trw_post_20230801");
+    const groups = Object.fromEntries(
+      fieldSet.presentationGroups.map((group) => [
+        group.id,
+        new Set(group.eraFields),
+      ]),
+    );
+    const timeHtml = renderToStaticMarkup(
+      React.createElement(EraSection, {
+        ...props,
+        visibleFields: groups.time,
+      }),
+    );
+    const meritHtml = renderToStaticMarkup(
+      React.createElement(EraSection, {
+        ...props,
+        visibleFields: groups.merit,
+        yvaLabel: fieldSet.yvaLabels?.era,
+      }),
+    );
+
+    expect(timeHtml).toContain("alkoi");
+    expect(timeHtml).toContain("hakumin");
+    expect(timeHtml).toContain("ajomin");
+    expect(timeHtml).not.toContain("haukku");
+    expect(meritHtml).toContain("haku");
+    expect(meritHtml).toContain("haukku");
+    expect(meritHtml).toContain("ajotaito");
+    expect(meritHtml).not.toContain("hakumin");
+  });
 });
diff --git a/apps/web/components/admin/trials/internal/__tests__/result-create-card.test.tsx b/apps/web/components/admin/trials/internal/__tests__/result-create-card.test.tsx
new file mode 100644
index 00000000..ba0d33ae
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/__tests__/result-create-card.test.tsx
@@ -0,0 +1,37 @@
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it, vi } from "vitest";
+import { ResultCreateCard } from "../result-create-card";
+
+describe("ResultCreateCard", () => {
+  it("uses an accessible button header and hides collapsed content", () => {
+    const html = renderToStaticMarkup(
+      <ResultCreateCard
+        id="basic"
+        title="Perustiedot"
+        summary="FI123"
+        open={false}
+        onToggle={vi.fn()}
+      >
+        <p>fields</p>
+      </ResultCreateCard>,
+    );
+
+    expect(html).toContain('aria-expanded="false"');
+    expect(html).toContain('aria-controls="basic-content"');
+    expect(html).toContain("FI123");
+    expect(html).not.toContain("fields");
+  });
+
+  it("renders independently controlled expanded content", () => {
+    const html = renderToStaticMarkup(
+      <ResultCreateCard id="eras" title="Erät" open onToggle={vi.fn()}>
+        <p>fields</p>
+      </ResultCreateCard>,
+    );
+
+    expect(html).toContain('aria-expanded="true"');
+    expect(html).toContain('id="eras-content"');
+    expect(html).toContain("fields");
+  });
+});
diff --git a/apps/web/components/admin/trials/internal/entry-meta-basic-fields.tsx b/apps/web/components/admin/trials/internal/entry-meta-basic-fields.tsx
new file mode 100644
index 00000000..3c88146f
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/entry-meta-basic-fields.tsx
@@ -0,0 +1,104 @@
+import React from "react";
+import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { TextField, type EntryMetaFieldGroupProps } from "./entry-meta-field";
+
+export function EntryMetaBasicFields({
+  entryDraft,
+  isPending,
+  updateField,
+  visibleFields,
+  showHeading = true,
+}: EntryMetaFieldGroupProps) {
+  const visible = (field: keyof EntryDraft) =>
+    !visibleFields || visibleFields.has(field);
+
+  return (
+    <section className="space-y-2">
+      {showHeading ? (
+        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
+          Kokeen ja koiran tiedot
+        </h4>
+      ) : null}
+      <div className="grid gap-3 md:grid-cols-4">
+        {visible("koemaasto") ? (
+          <TextField
+            label="Koemaasto"
+            value={entryDraft.koemaasto}
+            disabled={isPending}
+            onChange={(value) => updateField("koemaasto", value)}
+          />
+        ) : null}
+        {visible("koemuoto") ? (
+          <TextField
+            label="Koemuoto"
+            value={entryDraft.koemuoto}
+            disabled={isPending}
+            onChange={(value) => updateField("koemuoto", value)}
+          />
+        ) : null}
+        {visible("koetyyppi") ? (
+          <label className="space-y-1 text-sm">
+            <span>Koetyyppi</span>
+            <select
+              className="h-10 w-full rounded-md border border-input bg-transparent px-3 text-sm"
+              value={entryDraft.koetyyppi}
+              disabled={isPending}
+              onChange={(event) =>
+                updateField(
+                  "koetyyppi",
+                  event.target.value as EntryDraft["koetyyppi"],
+                )
+              }
+            >
+              <option value="NORMAL">Normaali</option>
+              <option value="KOKOKAUDENKOE">Koko kauden koe</option>
+              <option value="PITKAKOE">Pitkä koe</option>
+            </select>
+          </label>
+        ) : null}
+        {visible("ke") ? (
+          <label className="space-y-1 text-sm">
+            <span>Keli</span>
+            <select
+              className="h-10 w-full rounded-md border border-input bg-transparent px-3 text-sm"
+              value={entryDraft.ke}
+              disabled={isPending}
+              onChange={(event) => updateField("ke", event.target.value)}
+            >
+              <option value="">-</option>
+              <option value="P">Paljas maa</option>
+              <option value="L">Lumikeli</option>
+            </select>
+          </label>
+        ) : null}
+        {visible("lk") ? (
+          <TextField
+            label="Luokka"
+            value={entryDraft.lk}
+            disabled={isPending}
+            onChange={(value) => updateField("lk", value)}
+          />
+        ) : null}
+        {visible("omistajaSnapshot") ? (
+          <TextField
+            label="Omistaja"
+            value={entryDraft.omistajaSnapshot}
+            disabled={isPending}
+            className="md:col-span-2"
+            onChange={(value) => updateField("omistajaSnapshot", value)}
+          />
+        ) : null}
+        {visible("omistajanKotikuntaSnapshot") ? (
+          <TextField
+            label="Omistajan kotikunta"
+            value={entryDraft.omistajanKotikuntaSnapshot}
+            disabled={isPending}
+            onChange={(value) =>
+              updateField("omistajanKotikuntaSnapshot", value)
+            }
+          />
+        ) : null}
+      </div>
+    </section>
+  );
+}
diff --git a/apps/web/components/admin/trials/internal/entry-meta-field.tsx b/apps/web/components/admin/trials/internal/entry-meta-field.tsx
new file mode 100644
index 00000000..4a0b1b13
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/entry-meta-field.tsx
@@ -0,0 +1,39 @@
+import React from "react";
+import { Input } from "@/components/ui/input";
+import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+
+export type EntryMetaFieldGroupProps = {
+  entryDraft: EntryDraft;
+  isPending: boolean;
+  updateField: (field: keyof EntryDraft, value: string) => void;
+  visibleFields?: ReadonlySet<keyof EntryDraft>;
+  showHeading?: boolean;
+};
+
+export function TextField({
+  label,
+  value,
+  disabled,
+  inputMode,
+  className,
+  onChange,
+}: {
+  label: string;
+  value: string;
+  disabled: boolean;
+  inputMode?: React.HTMLAttributes<HTMLInputElement>["inputMode"];
+  className?: string;
+  onChange: (value: string) => void;
+}) {
+  return (
+    <label className={`space-y-1 text-sm ${className ?? ""}`}>
+      <span>{label}</span>
+      <Input
+        value={value}
+        inputMode={inputMode}
+        disabled={disabled}
+        onChange={(event) => onChange(event.target.value)}
+      />
+    </label>
+  );
+}
diff --git a/apps/web/components/admin/trials/internal/entry-meta-judge-fields.tsx b/apps/web/components/admin/trials/internal/entry-meta-judge-fields.tsx
new file mode 100644
index 00000000..b64082e7
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/entry-meta-judge-fields.tsx
@@ -0,0 +1,58 @@
+import React from "react";
+import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { TextField, type EntryMetaFieldGroupProps } from "./entry-meta-field";
+
+export function EntryMetaJudgeFields({
+  entryDraft,
+  isPending,
+  updateField,
+  visibleFields,
+  showHeading = true,
+}: EntryMetaFieldGroupProps) {
+  const visible = (field: keyof EntryDraft) =>
+    !visibleFields || visibleFields.has(field);
+
+  return (
+    <section className="space-y-2">
+      {showHeading ? (
+        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
+          Tuomarit ja allekirjoitukset
+        </h4>
+      ) : null}
+      <div className="grid gap-3 md:grid-cols-4">
+        {visible("ryhmatuomariNimi") ? (
+          <TextField
+            label="Ryhmätuomari"
+            value={entryDraft.ryhmatuomariNimi}
+            disabled={isPending}
+            onChange={(value) => updateField("ryhmatuomariNimi", value)}
+          />
+        ) : null}
+        {visible("palkintotuomariNimi") ? (
+          <TextField
+            label="Palkintotuomari"
+            value={entryDraft.palkintotuomariNimi}
+            disabled={isPending}
+            onChange={(value) => updateField("palkintotuomariNimi", value)}
+          />
+        ) : null}
+        {visible("judge") ? (
+          <TextField
+            label="Ylituomari"
+            value={entryDraft.judge}
+            disabled={isPending}
+            onChange={(value) => updateField("judge", value)}
+          />
+        ) : null}
+        {visible("ylituomariNumeroSnapshot") ? (
+          <TextField
+            label="Ylituomarin numero"
+            value={entryDraft.ylituomariNumeroSnapshot}
+            disabled={isPending}
+            onChange={(value) => updateField("ylituomariNumeroSnapshot", value)}
+          />
+        ) : null}
+      </div>
+    </section>
+  );
+}
diff --git a/apps/web/components/admin/trials/internal/entry-meta-loss-fields.tsx b/apps/web/components/admin/trials/internal/entry-meta-loss-fields.tsx
new file mode 100644
index 00000000..2e6aff98
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/entry-meta-loss-fields.tsx
@@ -0,0 +1,53 @@
+import React from "react";
+import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { TextField, type EntryMetaFieldGroupProps } from "./entry-meta-field";
+
+export function EntryMetaLossFields({
+  entryDraft,
+  isPending,
+  updateField,
+  visibleFields,
+  showHeading = true,
+}: EntryMetaFieldGroupProps) {
+  const visible = (field: keyof EntryDraft) =>
+    !visibleFields || visibleFields.has(field);
+
+  return (
+    <section className="space-y-2">
+      {showHeading ? (
+        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
+          Tappiopisteet
+        </h4>
+      ) : null}
+      <div className="grid gap-3 md:grid-cols-4">
+        {visible("hlo") ? (
+          <TextField
+            label="Hakulöysyys"
+            value={entryDraft.hlo}
+            inputMode="decimal"
+            disabled={isPending}
+            onChange={(value) => updateField("hlo", value)}
+          />
+        ) : null}
+        {visible("alo") ? (
+          <TextField
+            label="Ajolöysyys"
+            value={entryDraft.alo}
+            inputMode="decimal"
+            disabled={isPending}
+            onChange={(value) => updateField("alo", value)}
+          />
+        ) : null}
+        {visible("tappiopisteetYhteensa") ? (
+          <TextField
+            label="Tappiopisteet yhteensä"
+            value={entryDraft.tappiopisteetYhteensa}
+            inputMode="decimal"
+            disabled={isPending}
+            onChange={(value) => updateField("tappiopisteetYhteensa", value)}
+          />
+        ) : null}
+      </div>
+    </section>
+  );
+}
diff --git a/apps/web/components/admin/trials/internal/entry-meta-result-fields.tsx b/apps/web/components/admin/trials/internal/entry-meta-result-fields.tsx
new file mode 100644
index 00000000..32e6fec5
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/entry-meta-result-fields.tsx
@@ -0,0 +1,114 @@
+import React from "react";
+import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { TextField, type EntryMetaFieldGroupProps } from "./entry-meta-field";
+
+type Props = EntryMetaFieldGroupProps & {
+  showWeather?: boolean;
+};
+
+export function EntryMetaResultFields({
+  entryDraft,
+  isPending,
+  updateField,
+  visibleFields,
+  showHeading = true,
+  showWeather = false,
+}: Props) {
+  const visible = (field: keyof EntryDraft) =>
+    !visibleFields || visibleFields.has(field);
+
+  return (
+    <section className="space-y-2">
+      {showHeading ? (
+        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
+          Tulos ja huomautus
+        </h4>
+      ) : null}
+      <div className="grid gap-3 md:grid-cols-4">
+        {showWeather && visible("ke") ? (
+          <label className="space-y-1 text-sm">
+            <span>Keli</span>
+            <select
+              className="h-10 w-full rounded-md border border-input bg-transparent px-3 text-sm"
+              value={entryDraft.ke}
+              disabled={isPending}
+              onChange={(event) => updateField("ke", event.target.value)}
+            >
+              <option value="">-</option>
+              <option value="P">Paljas maa</option>
+              <option value="L">Lumikeli</option>
+            </select>
+          </label>
+        ) : null}
+        {visible("award") ? (
+          <TextField
+            label="Palkinto"
+            value={entryDraft.award}
+            disabled={isPending}
+            onChange={(value) => updateField("award", value)}
+          />
+        ) : null}
+        {visible("rank") ? (
+          <TextField
+            label="Sijoitus"
+            value={entryDraft.rank}
+            disabled={isPending}
+            onChange={(value) => updateField("rank", value)}
+          />
+        ) : null}
+        {visible("points") ? (
+          <TextField
+            label="Loppupisteet"
+            value={entryDraft.points}
+            inputMode="decimal"
+            disabled={isPending}
+            onChange={(value) => updateField("points", value)}
+          />
+        ) : null}
+        {visible("koiriaLuokassa") ? (
+          <TextField
+            label="Koiria luokassa"
+            value={entryDraft.koiriaLuokassa}
+            inputMode="numeric"
+            disabled={isPending}
+            onChange={(value) => updateField("koiriaLuokassa", value)}
+          />
+        ) : null}
+        {visible("huomautus") ? (
+          <label className="space-y-1 text-sm">
+            <span>Huomautus</span>
+            <select
+              className="h-10 w-full rounded-md border border-input bg-transparent px-3 text-sm"
+              value={entryDraft.huomautus}
+              disabled={isPending}
+              onChange={(event) =>
+                updateField(
+                  "huomautus",
+                  event.target.value as EntryDraft["huomautus"],
+                )
+              }
+            >
+              <option value="">-</option>
+              <option value="LUOPUI">Luopui</option>
+              <option value="SULJETTU">Suljettu</option>
+              <option value="KESKEYTETTY">Keskeytetty</option>
+            </select>
+          </label>
+        ) : null}
+        {visible("huomautusTeksti") ? (
+          <label className="space-y-1 text-sm md:col-span-3">
+            <span>Huomautusteksti</span>
+            <textarea
+              className="min-h-20 w-full rounded-md border border-input bg-transparent px-3 py-2 text-sm"
+              value={entryDraft.huomautusTeksti}
+              disabled={isPending}
+              onChange={(event) =>
+                updateField("huomautusTeksti", event.target.value)
+              }
+            />
+          </label>
+        ) : null}
+      </div>
+    </section>
+  );
+}
diff --git a/apps/web/components/admin/trials/internal/entry-meta-score-fields.tsx b/apps/web/components/admin/trials/internal/entry-meta-score-fields.tsx
new file mode 100644
index 00000000..1a3c1b5e
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/entry-meta-score-fields.tsx
@@ -0,0 +1,147 @@
+import React from "react";
+import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { TextField, type EntryMetaFieldGroupProps } from "./entry-meta-field";
+
+type Props = EntryMetaFieldGroupProps & {
+  showMerit: boolean;
+  showOther: boolean;
+  visibleFields?: ReadonlySet<keyof EntryDraft>;
+  yvaLabel?: string;
+};
+
+export function EntryMetaScoreFields({
+  entryDraft,
+  isPending,
+  updateField,
+  showMerit,
+  showOther,
+  visibleFields,
+  yvaLabel,
+  showHeading = true,
+}: Props) {
+  const visible = (field: keyof EntryDraft) =>
+    !visibleFields || visibleFields.has(field);
+  const showDrive =
+    showMerit &&
+    (visible("hyvaksytytAjominuutit") ||
+      visible("ajoajanPisteet") ||
+      visible("yva"));
+  const showMisc =
+    (showMerit && visible("ansiopisteetYhteensa")) ||
+    (showOther && (visible("tja") || visible("pin")));
+
+  return (
+    <section className="space-y-2">
+      {showHeading ? (
+        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
+          Ansiopisteet
+        </h4>
+      ) : null}
+      <div className="space-y-4">
+        {showDrive ? (
+          <ScoreSubsection title="Ajo">
+            {visible("hyvaksytytAjominuutit") ? (
+              <TextField
+                label="Hyväksytyt ajominuutit"
+                value={entryDraft.hyvaksytytAjominuutit}
+                inputMode="numeric"
+                disabled={isPending}
+                onChange={(value) =>
+                  updateField("hyvaksytytAjominuutit", value)
+                }
+              />
+            ) : null}
+            {visible("ajoajanPisteet") ? (
+              <TextField
+                label="Ajoajan pisteet"
+                value={entryDraft.ajoajanPisteet}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("ajoajanPisteet", value)}
+              />
+            ) : null}
+            {visible("yva") ? (
+              <TextField
+                label={yvaLabel ?? "Ajotaito / yleisvaikutelma"}
+                value={entryDraft.yva}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("yva", value)}
+              />
+            ) : null}
+          </ScoreSubsection>
+        ) : null}
+        {showOther && visible("haku") ? (
+          <ScoreSubsection title="Haku">
+            <TextField
+              label="Haku"
+              value={entryDraft.haku}
+              inputMode="decimal"
+              disabled={isPending}
+              onChange={(value) => updateField("haku", value)}
+            />
+          </ScoreSubsection>
+        ) : null}
+        {showOther && visible("hauk") ? (
+          <ScoreSubsection title="Haukku">
+            <TextField
+              label="Haukku"
+              value={entryDraft.hauk}
+              inputMode="decimal"
+              disabled={isPending}
+              onChange={(value) => updateField("hauk", value)}
+            />
+          </ScoreSubsection>
+        ) : null}
+        {showMisc ? (
+          <ScoreSubsection title="Muut">
+            {showMerit && visible("ansiopisteetYhteensa") ? (
+              <TextField
+                label="Ansiopisteet yhteensä"
+                value={entryDraft.ansiopisteetYhteensa}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("ansiopisteetYhteensa", value)}
+              />
+            ) : null}
+            {showOther && visible("tja") ? (
+              <TextField
+                label="Tie ja estetyöskentely"
+                value={entryDraft.tja}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("tja", value)}
+              />
+            ) : null}
+            {showOther && visible("pin") ? (
+              <TextField
+                label="Metsästysinto"
+                value={entryDraft.pin}
+                inputMode="decimal"
+                disabled={isPending}
+                onChange={(value) => updateField("pin", value)}
+              />
+            ) : null}
+          </ScoreSubsection>
+        ) : null}
+      </div>
+    </section>
+  );
+}
+
+function ScoreSubsection({
+  title,
+  children,
+}: {
+  title: string;
+  children: React.ReactNode;
+}) {
+  return (
+    <section className="space-y-2 rounded-md border border-dashed border-muted-foreground/40 p-3">
+      <h5 className="text-[11px] font-semibold uppercase tracking-wide text-muted-foreground">
+        {title}
+      </h5>
+      <div className="grid gap-3 md:grid-cols-2">{children}</div>
+    </section>
+  );
+}
diff --git a/apps/web/components/admin/trials/internal/entry-meta-section.tsx b/apps/web/components/admin/trials/internal/entry-meta-section.tsx
index 7904f2ba..e8a05687 100644
--- a/apps/web/components/admin/trials/internal/entry-meta-section.tsx
+++ b/apps/web/components/admin/trials/internal/entry-meta-section.tsx
@@ -1,6 +1,12 @@
 import React from "react";
-import { Input } from "@/components/ui/input";
 import type { EntryDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import { EntryMetaBasicFields } from "./entry-meta-basic-fields";
+import { EntryMetaJudgeFields } from "./entry-meta-judge-fields";
+import { EntryMetaLossFields } from "./entry-meta-loss-fields";
+import { EntryMetaResultFields } from "./entry-meta-result-fields";
+import { EntryMetaScoreFields } from "./entry-meta-score-fields";
+
+type EntryMetaGroup = "basic" | "result" | "merit" | "other" | "judges";
 
 type Props = {
   entryDraft: EntryDraft;
@@ -8,6 +14,8 @@ type Props = {
   onChange: (updater: (current: EntryDraft) => EntryDraft) => void;
   visibleFields?: ReadonlySet<keyof EntryDraft>;
   yvaLabel?: string;
+  groups?: readonly EntryMetaGroup[];
+  showHeadings?: boolean;
 };
 
 export function EntryMetaSection({
@@ -16,348 +24,61 @@ export function EntryMetaSection({
   onChange,
   visibleFields,
   yvaLabel,
+  groups,
+  showHeadings = true,
 }: Props) {
-  function updateField(field: keyof EntryDraft, value: string) {
+  const updateField = (field: keyof EntryDraft, value: string) => {
     onChange((current) => ({
       ...current,
       [field]: value,
     }));
-  }
-  const visible = (field: keyof EntryDraft) =>
-    !visibleFields || visibleFields.has(field);
+  };
+  const show = (group: EntryMetaGroup) => !groups || groups.includes(group);
+  const fieldGroupProps = {
+    entryDraft,
+    isPending,
+    updateField,
+    visibleFields,
+    showHeading: showHeadings,
+  };
+  const showMerit = show("merit");
+  const showOther = show("other");
+  const hasVisible = (fields: readonly (keyof EntryDraft)[]) =>
+    !visibleFields || fields.some((field) => visibleFields.has(field));
+  const showScoreFields =
+    (showMerit || showOther) &&
+    hasVisible([
+      "hyvaksytytAjominuutit",
+      "ajoajanPisteet",
+      "haku",
+      "hauk",
+      "yva",
+      "ansiopisteetYhteensa",
+      "tja",
+      "pin",
+    ]);
+  const showLossFields =
+    showOther && hasVisible(["hlo", "alo", "tappiopisteetYhteensa"]);
 
   return (
     <div className="space-y-4">
-      <section className="space-y-2">
-        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
-          Kokeen ja koiran tiedot
-        </h4>
-        <div className="grid gap-3 md:grid-cols-4">
-          <TextField
-            label="Koemaasto"
-            value={entryDraft.koemaasto}
-            disabled={isPending}
-            onChange={(value) => updateField("koemaasto", value)}
-          />
-          <TextField
-            label="Koemuoto"
-            value={entryDraft.koemuoto}
-            disabled={isPending}
-            onChange={(value) => updateField("koemuoto", value)}
-          />
-          <label className="space-y-1 text-sm">
-            <span>Koetyyppi</span>
-            <select
-              className="h-10 w-full rounded-md border border-input bg-transparent px-3 text-sm"
-              value={entryDraft.koetyyppi}
-              disabled={isPending}
-              onChange={(event) =>
-                updateField(
-                  "koetyyppi",
-                  event.target.value as EntryDraft["koetyyppi"],
-                )
-              }
-            >
-              <option value="NORMAL">Normaali</option>
-              <option value="KOKOKAUDENKOE">Koko kauden koe</option>
-              <option value="PITKAKOE">Pitkä koe</option>
-            </select>
-          </label>
-          <label className="space-y-1 text-sm">
-            <span>Keli</span>
-            <select
-              className="h-10 w-full rounded-md border border-input bg-transparent px-3 text-sm"
-              value={entryDraft.ke}
-              disabled={isPending}
-              onChange={(event) => updateField("ke", event.target.value)}
-            >
-              <option value="">-</option>
-              <option value="P">Paljas maa</option>
-              <option value="L">Lumikeli</option>
-            </select>
-          </label>
-          <TextField
-            label="Luokka"
-            value={entryDraft.lk}
-            disabled={isPending}
-            onChange={(value) => updateField("lk", value)}
-          />
-          <TextField
-            label="Omistaja"
-            value={entryDraft.omistajaSnapshot}
-            disabled={isPending}
-            className="md:col-span-2"
-            onChange={(value) => updateField("omistajaSnapshot", value)}
-          />
-          <TextField
-            label="Omistajan kotikunta"
-            value={entryDraft.omistajanKotikuntaSnapshot}
-            disabled={isPending}
-            onChange={(value) =>
-              updateField("omistajanKotikuntaSnapshot", value)
-            }
-          />
-        </div>
-      </section>
-
-      <section className="space-y-2">
-        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
-          Tulos ja huomautus
-        </h4>
-        <div className="grid gap-3 md:grid-cols-4">
-          <TextField
-            label="Palkinto"
-            value={entryDraft.award}
-            disabled={isPending}
-            onChange={(value) => updateField("award", value)}
-          />
-          <TextField
-            label="Sijoitus"
-            value={entryDraft.rank}
-            disabled={isPending}
-            onChange={(value) => updateField("rank", value)}
-          />
-          <TextField
-            label="Loppupisteet"
-            value={entryDraft.points}
-            inputMode="decimal"
-            disabled={isPending}
-            onChange={(value) => updateField("points", value)}
-          />
-          <TextField
-            label="Koiria luokassa"
-            value={entryDraft.koiriaLuokassa}
-            inputMode="numeric"
-            disabled={isPending}
-            onChange={(value) => updateField("koiriaLuokassa", value)}
-          />
-          <label className="space-y-1 text-sm">
-            <span>Huomautus</span>
-            <select
-              className="h-10 w-full rounded-md border border-input bg-transparent px-3 text-sm"
-              value={entryDraft.huomautus}
-              disabled={isPending}
-              onChange={(event) =>
-                updateField(
-                  "huomautus",
-                  event.target.value as EntryDraft["huomautus"],
-                )
-              }
-            >
-              <option value="">-</option>
-              <option value="LUOPUI">Luopui</option>
-              <option value="SULJETTU">Suljettu</option>
-              <option value="KESKEYTETTY">Keskeytetty</option>
-            </select>
-          </label>
-          <label className="space-y-1 text-sm md:col-span-3">
-            <span>Huomautusteksti</span>
-            <textarea
-              className="min-h-20 w-full rounded-md border border-input bg-transparent px-3 py-2 text-sm"
-              value={entryDraft.huomautusTeksti}
-              disabled={isPending}
-              onChange={(event) =>
-                updateField("huomautusTeksti", event.target.value)
-              }
-            />
-          </label>
-        </div>
-      </section>
-
-      <section className="space-y-2">
-        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
-          Ansiopisteet
-        </h4>
-        <div className="space-y-4">
-          <ScoreSubsection title="Ajo">
-            {visible("hyvaksytytAjominuutit") ? (
-              <TextField
-                label="Hyväksytyt ajominuutit"
-                value={entryDraft.hyvaksytytAjominuutit}
-                inputMode="numeric"
-                disabled={isPending}
-                onChange={(value) =>
-                  updateField("hyvaksytytAjominuutit", value)
-                }
-              />
-            ) : null}
-            {visible("ajoajanPisteet") ? (
-              <TextField
-                label="Ajoajan pisteet"
-                value={entryDraft.ajoajanPisteet}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("ajoajanPisteet", value)}
-              />
-            ) : null}
-            {visible("yva") ? (
-              <TextField
-                label={yvaLabel ?? "Ajotaito / yleisvaikutelma"}
-                value={entryDraft.yva}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("yva", value)}
-              />
-            ) : null}
-          </ScoreSubsection>
-          <ScoreSubsection title="Haku">
-            {visible("haku") ? (
-              <TextField
-                label="Haku"
-                value={entryDraft.haku}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("haku", value)}
-              />
-            ) : null}
-          </ScoreSubsection>
-          <ScoreSubsection title="Haukku">
-            {visible("hauk") ? (
-              <TextField
-                label="Haukku"
-                value={entryDraft.hauk}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("hauk", value)}
-              />
-            ) : null}
-          </ScoreSubsection>
-          <ScoreSubsection title="Muut">
-            {visible("ansiopisteetYhteensa") ? (
-              <TextField
-                label="Ansiopisteet yhteensä"
-                value={entryDraft.ansiopisteetYhteensa}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("ansiopisteetYhteensa", value)}
-              />
-            ) : null}
-            {visible("tja") ? (
-              <TextField
-                label="Tie ja estetyöskentely"
-                value={entryDraft.tja}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("tja", value)}
-              />
-            ) : null}
-            {visible("pin") ? (
-              <TextField
-                label="Metsästysinto"
-                value={entryDraft.pin}
-                inputMode="decimal"
-                disabled={isPending}
-                onChange={(value) => updateField("pin", value)}
-              />
-            ) : null}
-          </ScoreSubsection>
-        </div>
-      </section>
-
-      <section className="space-y-2">
-        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
-          Tappiopisteet
-        </h4>
-        <div className="grid gap-3 md:grid-cols-4">
-          <TextField
-            label="Hakulöysyys"
-            value={entryDraft.hlo}
-            inputMode="decimal"
-            disabled={isPending}
-            onChange={(value) => updateField("hlo", value)}
-          />
-          <TextField
-            label="Ajolöysyys"
-            value={entryDraft.alo}
-            inputMode="decimal"
-            disabled={isPending}
-            onChange={(value) => updateField("alo", value)}
-          />
-          <TextField
-            label="Tappiopisteet yhteensä"
-            value={entryDraft.tappiopisteetYhteensa}
-            inputMode="decimal"
-            disabled={isPending}
-            onChange={(value) => updateField("tappiopisteetYhteensa", value)}
-          />
-        </div>
-      </section>
-
-      <section className="space-y-2">
-        <h4 className="text-xs font-semibold uppercase text-muted-foreground">
-          Tuomarit ja allekirjoitukset
-        </h4>
-        <div className="grid gap-3 md:grid-cols-4">
-          <TextField
-            label="Ylituomari"
-            value={entryDraft.judge}
-            disabled={isPending}
-            onChange={(value) => updateField("judge", value)}
-          />
-          <TextField
-            label="Ylituomarin numero"
-            value={entryDraft.ylituomariNumeroSnapshot}
-            disabled={isPending}
-            onChange={(value) => updateField("ylituomariNumeroSnapshot", value)}
-          />
-          <TextField
-            label="Ryhmätuomari"
-            value={entryDraft.ryhmatuomariNimi}
-            disabled={isPending}
-            onChange={(value) => updateField("ryhmatuomariNimi", value)}
-          />
-          <TextField
-            label="Palkintotuomari"
-            value={entryDraft.palkintotuomariNimi}
-            disabled={isPending}
-            onChange={(value) => updateField("palkintotuomariNimi", value)}
-          />
-        </div>
-      </section>
+      {show("basic") ? <EntryMetaBasicFields {...fieldGroupProps} /> : null}
+      {show("result") ? (
+        <EntryMetaResultFields
+          {...fieldGroupProps}
+          showWeather={Boolean(groups && !groups.includes("basic"))}
+        />
+      ) : null}
+      {showScoreFields ? (
+        <EntryMetaScoreFields
+          {...fieldGroupProps}
+          showMerit={showMerit}
+          showOther={showOther}
+          yvaLabel={yvaLabel}
+        />
+      ) : null}
+      {showLossFields ? <EntryMetaLossFields {...fieldGroupProps} /> : null}
+      {show("judges") ? <EntryMetaJudgeFields {...fieldGroupProps} /> : null}
     </div>
   );
 }
-
-type ScoreSubsectionProps = {
-  title: string;
-  children: React.ReactNode;
-};
-
-function ScoreSubsection({ title, children }: ScoreSubsectionProps) {
-  return (
-    <section className="space-y-2 rounded-md border border-dashed border-muted-foreground/40 p-3">
-      <h5 className="text-[11px] font-semibold uppercase tracking-wide text-muted-foreground">
-        {title}
-      </h5>
-      <div className="grid gap-3 md:grid-cols-2">{children}</div>
-    </section>
-  );
-}
-
-function TextField({
-  label,
-  value,
-  disabled,
-  inputMode,
-  className,
-  onChange,
-}: {
-  label: string;
-  value: string;
-  disabled: boolean;
-  inputMode?: React.HTMLAttributes<HTMLInputElement>["inputMode"];
-  className?: string;
-  onChange: (value: string) => void;
-}) {
-  return (
-    <label className={`space-y-1 text-sm ${className ?? ""}`}>
-      <span>{label}</span>
-      <Input
-        value={value}
-        inputMode={inputMode}
-        disabled={disabled}
-        onChange={(event) => onChange(event.target.value)}
-      />
-    </label>
-  );
-}
diff --git a/apps/web/components/admin/trials/internal/era-section.tsx b/apps/web/components/admin/trials/internal/era-section.tsx
index 210ec447..9f5e51a1 100644
--- a/apps/web/components/admin/trials/internal/era-section.tsx
+++ b/apps/web/components/admin/trials/internal/era-section.tsx
@@ -16,6 +16,8 @@ type Props = {
   ) => void;
   visibleFields?: ReadonlySet<Exclude<keyof EraDraft, "era">>;
   yvaLabel?: string;
+  showControls?: boolean;
+  showHeading?: boolean;
 };
 
 export function EraSection({
@@ -26,15 +28,26 @@ export function EraSection({
   onChangeEraField,
   visibleFields,
   yvaLabel,
+  showControls = true,
+  showHeading = true,
 }: Props) {
   return (
     <>
-      <div className="flex items-center justify-between">
-        <h3 className="text-sm font-semibold">Erät</h3>
-        <Button type="button" variant="outline" size="sm" onClick={onAddEra}>
-          Lisää erä
-        </Button>
-      </div>
+      {showHeading || showControls ? (
+        <div className="flex items-center justify-between">
+          {showHeading ? <h3 className="text-sm font-semibold">Erät</h3> : null}
+          {showControls ? (
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              onClick={onAddEra}
+            >
+              Lisää erä
+            </Button>
+          ) : null}
+        </div>
+      ) : null}
       <div className="space-y-3">
         {eras
           .slice()
@@ -43,7 +56,7 @@ export function EraSection({
             <div key={era.era} className="rounded-md border p-3">
               <div className="mb-2 flex items-center justify-between">
                 <p className="text-sm font-medium">Erä {era.era}</p>
-                {era.era !== 1 ? (
+                {showControls && era.era !== 1 ? (
                   <Button
                     type="button"
                     variant="outline"
diff --git a/apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx b/apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx
new file mode 100644
index 00000000..199109c4
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx
@@ -0,0 +1,407 @@
+"use client";
+
+import React from "react";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import {
+  Sheet,
+  SheetContent,
+  SheetDescription,
+  SheetHeader,
+  SheetTitle,
+} from "@/components/ui/sheet";
+import { useResultCreateWorkspaceMobile } from "@/hooks/admin/trials/manage/use-result-create-workspace-mobile";
+import { useI18n } from "@/hooks/i18n";
+import {
+  ADMIN_TRIAL_LISATIETO_GROUP_ORDER,
+  ADMIN_TRIAL_LISATIETO_GROUP_LABELS,
+  type AdminTrialLisatietoInputKind,
+} from "@/lib/admin/trials/entry-edit-config";
+import type {
+  EraDraft,
+  LisatietoRowDraft,
+} from "@/lib/admin/trials/entry-edit-dialog-model";
+import {
+  createLisatiedotWorkspaceState,
+  filterLisatietoRows,
+  lisatietoRowKey,
+  lisatiedotWorkspaceReducer,
+} from "@/lib/admin/trials/lisatiedot-workspace-state";
+
+type Props = {
+  eras: EraDraft[];
+  rows: LisatietoRowDraft[];
+  isPending: boolean;
+  onChangeCell: (
+    koodi: string,
+    osa: string,
+    era: number,
+    value: string,
+  ) => void;
+  onRemoveRow: (koodi: string, osa: string) => void;
+};
+
+const groupLabel = (group: string) =>
+  ADMIN_TRIAL_LISATIETO_GROUP_LABELS[
+    group as keyof typeof ADMIN_TRIAL_LISATIETO_GROUP_LABELS
+  ] ?? group;
+
+export function LisatiedotWorkspace({
+  eras,
+  rows,
+  isPending,
+  onChangeCell,
+  onRemoveRow,
+}: Props) {
+  const { t } = useI18n();
+  const [state, dispatch] = React.useReducer(
+    lisatiedotWorkspaceReducer,
+    rows,
+    createLisatiedotWorkspaceState,
+  );
+  const isMobileWorkspace = useResultCreateWorkspaceMobile();
+  const mobileControlRef = React.useRef<HTMLElement | null>(null);
+  const rowTriggerRef = React.useRef<HTMLButtonElement | null>(null);
+  const setMobileControlRef = React.useCallback(
+    (element: HTMLElement | null) => {
+      mobileControlRef.current = element;
+    },
+    [],
+  );
+  const groups = React.useMemo(
+    () =>
+      [...new Set(rows.map((row) => row.group))].sort(
+        (left, right) =>
+          ADMIN_TRIAL_LISATIETO_GROUP_ORDER.indexOf(
+            left as (typeof ADMIN_TRIAL_LISATIETO_GROUP_ORDER)[number],
+          ) -
+          ADMIN_TRIAL_LISATIETO_GROUP_ORDER.indexOf(
+            right as (typeof ADMIN_TRIAL_LISATIETO_GROUP_ORDER)[number],
+          ),
+      ),
+    [rows],
+  );
+  const visibleRows = filterLisatietoRows(rows, state.query, state.activeGroup);
+  const selectedRows = rows.filter((row) =>
+    state.selectedRows.has(lisatietoRowKey(row)),
+  );
+  const activeRow =
+    rows.find((row) => lisatietoRowKey(row) === state.activeRow) ?? null;
+
+  React.useEffect(() => {
+    if (!isMobileWorkspace && state.mobileSheetOpen) {
+      dispatch({ type: "sheet", value: false });
+    }
+  }, [isMobileWorkspace, state.mobileSheetOpen]);
+
+  function select(
+    row: LisatietoRowDraft,
+    mobile: boolean,
+    trigger: HTMLButtonElement,
+  ) {
+    const key = lisatietoRowKey(row);
+    rowTriggerRef.current = trigger;
+    dispatch({ type: "select", value: key });
+    dispatch({ type: "active", value: key, mobile });
+  }
+  function remove(row: LisatietoRowDraft) {
+    onRemoveRow(row.koodi, row.osa);
+    dispatch({ type: "remove", value: lisatietoRowKey(row) });
+  }
+
+  return (
+    <div className="space-y-4">
+      <div className="grid gap-3 lg:grid-cols-[minmax(0,1fr)_auto]">
+        <label className="space-y-1 text-sm">
+          <span>{t("admin.trials.manage.resultCreate.additional.search")}</span>
+          <Input
+            value={state.query}
+            placeholder={t(
+              "admin.trials.manage.resultCreate.additional.searchPlaceholder",
+            )}
+            onChange={(event) =>
+              dispatch({ type: "query", value: event.target.value })
+            }
+          />
+        </label>
+        <div className="flex flex-wrap items-end gap-2">
+          <Button
+            type="button"
+            size="sm"
+            variant="outline"
+            onClick={() => dispatch({ type: "expand", values: groups })}
+          >
+            {t("admin.trials.manage.resultCreate.additional.expandAll")}
+          </Button>
+          <Button
+            type="button"
+            size="sm"
+            variant="outline"
+            onClick={() => dispatch({ type: "collapse" })}
+          >
+            {t("admin.trials.manage.resultCreate.additional.collapseAll")}
+          </Button>
+        </div>
+      </div>
+      <div
+        className="flex flex-wrap gap-2"
+        aria-label={t("admin.trials.manage.resultCreate.additional.groups")}
+      >
+        <Button
+          type="button"
+          size="sm"
+          variant={state.activeGroup === null ? "default" : "outline"}
+          onClick={() => dispatch({ type: "group", value: null })}
+        >
+          {t("admin.trials.manage.resultCreate.additional.allGroups")}
+        </Button>
+        {groups.map((group) => (
+          <Button
+            key={group}
+            type="button"
+            size="sm"
+            variant={state.activeGroup === group ? "default" : "outline"}
+            onClick={() => dispatch({ type: "group", value: group })}
+          >
+            {groupLabel(group)}
+          </Button>
+        ))}
+      </div>
+      {selectedRows.length ? (
+        <div
+          className="flex flex-wrap gap-2"
+          aria-label={t("admin.trials.manage.resultCreate.additional.selected")}
+        >
+          {selectedRows.map((row) => (
+            <span
+              key={lisatietoRowKey(row)}
+              className="inline-flex items-center gap-1 rounded-full bg-muted px-3 py-1 text-sm"
+            >
+              {row.koodi} {row.label}
+              <button
+                type="button"
+                className="rounded px-1"
+                aria-label={`${t("admin.trials.manage.resultCreate.additional.remove")} ${row.koodi} ${row.label}`}
+                onClick={() => remove(row)}
+              >
+                ×
+              </button>
+            </span>
+          ))}
+        </div>
+      ) : null}
+      <div className="grid gap-4 lg:grid-cols-[minmax(260px,0.8fr)_minmax(0,1.2fr)]">
+        <div className="space-y-2">
+          {groups.map((group) => {
+            const groupRows = visibleRows.filter((row) => row.group === group);
+            if (!groupRows.length) return null;
+            const expanded = state.expandedGroups.has(group);
+            return (
+              <div key={group} className="rounded-md border">
+                <button
+                  type="button"
+                  className="flex w-full justify-between p-3 text-left font-medium"
+                  aria-expanded={expanded}
+                  onClick={() =>
+                    dispatch({ type: "toggleGroup", value: group })
+                  }
+                >
+                  {groupLabel(group)} <span>{groupRows.length}</span>
+                </button>
+                {expanded ? (
+                  <div className="border-t p-2">
+                    {groupRows.map((row) => (
+                      <button
+                        key={lisatietoRowKey(row)}
+                        type="button"
+                        className="block w-full rounded p-2 text-left hover:bg-muted"
+                        onClick={(event) =>
+                          select(row, isMobileWorkspace, event.currentTarget)
+                        }
+                      >
+                        <span className="font-medium">{row.koodi}</span>{" "}
+                        {row.label}
+                      </button>
+                    ))}
+                  </div>
+                ) : null}
+              </div>
+            );
+          })}
+        </div>
+        <div className="hidden rounded-md border p-4 lg:block">
+          {activeRow ? (
+            <RowEditor
+              row={activeRow}
+              eras={eras}
+              isPending={isPending}
+              onChangeCell={onChangeCell}
+              onRemove={() => remove(activeRow)}
+            />
+          ) : (
+            <p className="text-sm text-muted-foreground">
+              {t("admin.trials.manage.resultCreate.additional.chooseRow")}
+            </p>
+          )}
+        </div>
+      </div>
+      <Sheet
+        open={isMobileWorkspace && state.mobileSheetOpen}
+        onOpenChange={(value) => dispatch({ type: "sheet", value })}
+      >
+        <SheetContent
+          className="overflow-y-auto lg:hidden"
+          closeLabel={t("admin.trials.manage.resultCreate.additional.close")}
+          onOpenAutoFocus={(event) => {
+            event.preventDefault();
+            mobileControlRef.current?.focus();
+          }}
+          onCloseAutoFocus={(event) => {
+            event.preventDefault();
+            rowTriggerRef.current?.focus();
+          }}
+        >
+          <SheetHeader>
+            <SheetTitle>
+              {activeRow ? `${activeRow.koodi} ${activeRow.label}` : ""}
+            </SheetTitle>
+            <SheetDescription>
+              {t("admin.trials.manage.resultCreate.additional.editorHelp")}
+            </SheetDescription>
+          </SheetHeader>
+          {activeRow ? (
+            <div className="p-4">
+              <RowEditor
+                row={activeRow}
+                eras={eras}
+                isPending={isPending}
+                onChangeCell={onChangeCell}
+                onRemove={() => remove(activeRow)}
+                setInitialControlRef={setMobileControlRef}
+              />
+            </div>
+          ) : null}
+        </SheetContent>
+      </Sheet>
+    </div>
+  );
+}
+
+function sanitize(kind: AdminTrialLisatietoInputKind, value: string) {
+  if (kind === "marker" || kind === "tri-state")
+    return value === "0" || value === "1" ? value : "";
+  if (kind === "text") return value;
+  const normalized = value.replace(",", ".");
+  return kind === "integer"
+    ? normalized.replace(/[^\d-]/g, "")
+    : normalized.replace(/[^\d.-]/g, "");
+}
+
+function RowEditor({
+  row,
+  eras,
+  isPending,
+  onChangeCell,
+  onRemove,
+  setInitialControlRef,
+}: {
+  row: LisatietoRowDraft;
+  eras: EraDraft[];
+  isPending: boolean;
+  onChangeCell: Props["onChangeCell"];
+  onRemove: () => void;
+  setInitialControlRef?: (element: HTMLElement | null) => void;
+}) {
+  const { t } = useI18n();
+  return (
+    <div className="space-y-4">
+      <div className="flex items-start justify-between gap-3">
+        <div>
+          <p className="font-semibold">
+            {row.koodi} {row.label}
+          </p>
+          <p className="text-sm text-muted-foreground">
+            {t(
+              `admin.trials.manage.resultCreate.valueHint.${row.valueHint ?? row.inputKind}` as never,
+            )}
+          </p>
+        </div>
+        <Button type="button" size="sm" variant="outline" onClick={onRemove}>
+          {t("admin.trials.manage.resultCreate.additional.remove")}
+        </Button>
+      </div>
+      {eras.map((era, index) => {
+        const value = row.eraValues[era.era] ?? "";
+        const label = `${t("admin.trials.manage.resultCreate.additional.era")} ${era.era}`;
+        const controlRef = index === 0 ? setInitialControlRef : undefined;
+        return (
+          <label key={era.era} className="block space-y-1 text-sm">
+            <span>{label}</span>
+            {row.inputKind === "marker" && row.useSemanticControl ? (
+              <input
+                ref={controlRef}
+                type="checkbox"
+                aria-label={`${row.koodi} ${row.label}, ${label}`}
+                checked={value === "1"}
+                disabled={isPending}
+                onChange={(event) =>
+                  onChangeCell(
+                    row.koodi,
+                    row.osa,
+                    era.era,
+                    event.target.checked ? "1" : "",
+                  )
+                }
+              />
+            ) : row.inputKind === "marker" || row.inputKind === "tri-state" ? (
+              <select
+                ref={controlRef}
+                className="h-10 w-full rounded-md border bg-background px-3"
+                aria-label={`${row.koodi} ${row.label}, ${label}`}
+                value={value}
+                disabled={isPending}
+                onChange={(event) =>
+                  onChangeCell(row.koodi, row.osa, era.era, event.target.value)
+                }
+              >
+                <option value="">-</option>
+                <option value="0">
+                  {row.inputKind === "tri-state"
+                    ? t("admin.trials.manage.resultCreate.triState.no")
+                    : "0"}
+                </option>
+                <option value="1">
+                  {row.inputKind === "tri-state"
+                    ? t("admin.trials.manage.resultCreate.triState.yes")
+                    : "1"}
+                </option>
+              </select>
+            ) : (
+              <Input
+                ref={controlRef}
+                aria-label={`${row.koodi} ${row.label}, ${label}`}
+                inputMode={
+                  row.inputKind === "text"
+                    ? "text"
+                    : row.inputKind === "integer"
+                      ? "numeric"
+                      : "decimal"
+                }
+                value={value}
+                disabled={isPending}
+                onChange={(event) =>
+                  onChangeCell(
+                    row.koodi,
+                    row.osa,
+                    era.era,
+                    sanitize(row.inputKind, event.target.value),
+                  )
+                }
+              />
+            )}
+          </label>
+        );
+      })}
+    </div>
+  );
+}
diff --git a/apps/web/components/admin/trials/internal/result-create-card.tsx b/apps/web/components/admin/trials/internal/result-create-card.tsx
new file mode 100644
index 00000000..d75e07d3
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/result-create-card.tsx
@@ -0,0 +1,53 @@
+import React from "react";
+import { ChevronDown } from "lucide-react";
+import { Card, CardContent } from "@/components/ui/card";
+import { cn } from "@/lib/utils";
+
+type Props = {
+  id: string;
+  title: string;
+  summary?: string;
+  open: boolean;
+  onToggle: () => void;
+  children: React.ReactNode;
+};
+
+export function ResultCreateCard({
+  id,
+  title,
+  summary,
+  open,
+  onToggle,
+  children,
+}: Props) {
+  const contentId = `${id}-content`;
+  return (
+    <Card>
+      <button
+        type="button"
+        className="flex w-full items-center justify-between gap-4 p-5 text-left"
+        aria-expanded={open}
+        aria-controls={contentId}
+        onClick={onToggle}
+      >
+        <span>
+          <span className="block font-semibold">{title}</span>
+          {!open && summary ? (
+            <span className="mt-1 block text-sm text-muted-foreground">
+              {summary}
+            </span>
+          ) : null}
+        </span>
+        <ChevronDown
+          aria-hidden="true"
+          className={cn("size-4 transition-transform", open && "rotate-180")}
+        />
+      </button>
+      {open ? (
+        <CardContent id={contentId} className="border-t p-5">
+          {children}
+        </CardContent>
+      ) : null}
+    </Card>
+  );
+}
diff --git a/apps/web/components/ui/sheet.tsx b/apps/web/components/ui/sheet.tsx
index d6a4c237..48d91143 100644
--- a/apps/web/components/ui/sheet.tsx
+++ b/apps/web/components/ui/sheet.tsx
@@ -47,10 +47,12 @@ function SheetOverlay({
 function SheetContent({
   className,
   children,
+  closeLabel = "Close",
   side = "right",
   showCloseButton = true,
   ...props
 }: React.ComponentProps<typeof SheetPrimitive.Content> & {
+  closeLabel?: string;
   side?: "top" | "right" | "bottom" | "left";
   showCloseButton?: boolean;
 }) {
@@ -77,7 +79,7 @@ function SheetContent({
         {showCloseButton && (
           <SheetPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-secondary absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none">
             <XIcon className="size-4" />
-            <span className="sr-only">Close</span>
+            <span className="sr-only">{closeLabel}</span>
           </SheetPrimitive.Close>
         )}
       </SheetPrimitive.Content>
diff --git a/apps/web/hooks/admin/trials/manage/__tests__/use-result-create-workspace-mobile.test.ts b/apps/web/hooks/admin/trials/manage/__tests__/use-result-create-workspace-mobile.test.ts
new file mode 100644
index 00000000..bc53f08f
--- /dev/null
+++ b/apps/web/hooks/admin/trials/manage/__tests__/use-result-create-workspace-mobile.test.ts
@@ -0,0 +1,108 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { useResultCreateWorkspaceMobile } from "../use-result-create-workspace-mobile";
+
+const { hookState } = vi.hoisted(() => ({
+  hookState: {
+    index: 0,
+    stateSlots: [] as unknown[],
+    effectSlots: [] as Array<{ dependencies?: readonly unknown[] }>,
+    cleanups: [] as Array<() => void>,
+  },
+}));
+
+vi.mock("react", async () => {
+  const actual = await vi.importActual<typeof import("react")>("react");
+  const nextHookIndex = () => hookState.index++;
+
+  function mockUseEffect(
+    effect: () => void | (() => void),
+    dependencies?: readonly unknown[],
+  ) {
+    const index = nextHookIndex();
+    const previous = hookState.effectSlots[index];
+    const unchanged =
+      dependencies &&
+      previous?.dependencies &&
+      dependencies.length === previous.dependencies.length &&
+      dependencies.every((value, position) =>
+        Object.is(value, previous.dependencies?.[position]),
+      );
+    if (unchanged) return;
+
+    const cleanup = effect();
+    if (cleanup) hookState.cleanups.push(cleanup);
+    hookState.effectSlots[index] = { dependencies };
+  }
+
+  function mockUseState<T>(initialValue: T) {
+    const index = nextHookIndex();
+    if (!(index in hookState.stateSlots))
+      hookState.stateSlots[index] = initialValue;
+    const setState = (value: T) => {
+      hookState.stateSlots[index] = value;
+    };
+    return [hookState.stateSlots[index] as T, setState] as const;
+  }
+
+  return {
+    ...actual,
+    useEffect: mockUseEffect,
+    useState: mockUseState,
+  };
+});
+
+let matches = false;
+let changeListener: (() => void) | undefined;
+
+function HookHarness() {
+  return useResultCreateWorkspaceMobile();
+}
+
+function renderHook() {
+  hookState.index = 0;
+  return HookHarness();
+}
+
+describe("useResultCreateWorkspaceMobile", () => {
+  beforeEach(() => {
+    matches = false;
+    changeListener = undefined;
+    hookState.index = 0;
+    hookState.stateSlots = [];
+    hookState.effectSlots = [];
+    hookState.cleanups = [];
+    vi.stubGlobal("window", {
+      matchMedia: vi.fn(() => ({
+        get matches() {
+          return matches;
+        },
+        addEventListener: (_type: string, listener: () => void) => {
+          changeListener = listener;
+        },
+        removeEventListener: vi.fn(),
+      })),
+    });
+  });
+
+  afterEach(() => {
+    hookState.cleanups.forEach((cleanup) => cleanup());
+    vi.unstubAllGlobals();
+  });
+
+  it("matches the 1024px workspace breakpoint and updates on changes", () => {
+    matches = true;
+
+    renderHook();
+    expect(renderHook()).toBe(true);
+    expect(window.matchMedia).toHaveBeenCalledWith("(max-width: 1023px)");
+
+    matches = false;
+    changeListener?.();
+
+    expect(renderHook()).toBe(false);
+  });
+
+  it("starts in desktop mode", () => {
+    expect(renderHook()).toBe(false);
+  });
+});
diff --git a/apps/web/hooks/admin/trials/manage/use-result-create-workspace-mobile.ts b/apps/web/hooks/admin/trials/manage/use-result-create-workspace-mobile.ts
new file mode 100644
index 00000000..ddc3c9c1
--- /dev/null
+++ b/apps/web/hooks/admin/trials/manage/use-result-create-workspace-mobile.ts
@@ -0,0 +1,20 @@
+import * as React from "react";
+
+const RESULT_CREATE_WORKSPACE_BREAKPOINT = 1024;
+
+export function useResultCreateWorkspaceMobile() {
+  const [isMobile, setIsMobile] = React.useState(false);
+
+  React.useEffect(() => {
+    const query = window.matchMedia(
+      `(max-width: ${RESULT_CREATE_WORKSPACE_BREAKPOINT - 1}px)`,
+    );
+    const update = () => setIsMobile(query.matches);
+
+    query.addEventListener("change", update);
+    update();
+    return () => query.removeEventListener("change", update);
+  }, []);
+
+  return isMobile;
+}
diff --git a/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts b/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
new file mode 100644
index 00000000..1e319489
--- /dev/null
+++ b/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
@@ -0,0 +1,127 @@
+import { describe, expect, it } from "vitest";
+import type { LisatietoRowDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import {
+  createLisatiedotWorkspaceState,
+  filterLisatietoRows,
+  lisatiedotWorkspaceReducer,
+} from "../lisatiedot-workspace-state";
+
+const rows: LisatietoRowDraft[] = [
+  {
+    koodi: "10",
+    osa: "",
+    nimi: "Vaativat olosuhteet",
+    jarjestys: 10,
+    group: "olosuhteet",
+    label: "Vaativat olosuhteet",
+    inputKind: "marker",
+    sortOrder: 10,
+    eraValues: { 1: "1" },
+  },
+  {
+    koodi: "20",
+    osa: "",
+    nimi: "Haku",
+    jarjestys: 20,
+    group: "haku",
+    label: "Haku",
+    inputKind: "integer",
+    sortOrder: 20,
+    eraValues: { 1: "" },
+  },
+];
+
+describe("lisatiedot workspace reducer", () => {
+  it("rebuilds selection from draft values and resets all transient state", () => {
+    let state = createLisatiedotWorkspaceState(rows);
+    expect([...state.selectedRows]).toEqual(["10:"]);
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "query",
+      value: "haku",
+    });
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "active",
+      value: "20:",
+      mobile: true,
+    });
+
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "reset",
+      rows: [rows[1]!],
+    });
+
+    expect(state).toEqual(createLisatiedotWorkspaceState([rows[1]!]));
+  });
+
+  it("keeps selection when only values are cleared and removes it explicitly", () => {
+    let state = createLisatiedotWorkspaceState(rows);
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "select",
+      value: "20:",
+    });
+    expect(state.selectedRows.has("20:")).toBe(true);
+
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "remove",
+      value: "20:",
+    });
+    expect(state.selectedRows.has("20:")).toBe(false);
+    expect(state.activeRow).toBeNull();
+  });
+
+  it("opens the same active row only when selection comes from mobile", () => {
+    let state = createLisatiedotWorkspaceState(rows);
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "active",
+      value: "20:",
+      mobile: false,
+    });
+    expect(state.activeRow).toBe("20:");
+    expect(state.mobileSheetOpen).toBe(false);
+
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "active",
+      value: "20:",
+      mobile: true,
+    });
+    expect(state.activeRow).toBe("20:");
+    expect(state.mobileSheetOpen).toBe(true);
+
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "sheet",
+      value: false,
+    });
+    expect(state.mobileSheetOpen).toBe(false);
+  });
+
+  it("supports independent group expansion and expand/collapse all", () => {
+    let state = createLisatiedotWorkspaceState(rows);
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "expand",
+      values: ["olosuhteet", "haku"],
+    });
+    expect([...state.expandedGroups]).toEqual(["olosuhteet", "haku"]);
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "toggleGroup",
+      value: "haku",
+    });
+    expect([...state.expandedGroups]).toEqual(["olosuhteet"]);
+    state = lisatiedotWorkspaceReducer(state, { type: "collapse" });
+    expect(state.expandedGroups.size).toBe(0);
+  });
+
+  it("searches localized names and codes within a business group", () => {
+    expect(
+      filterLisatietoRows(rows, "haku", "haku").map((row) => row.koodi),
+    ).toEqual(["10", "20"]);
+    expect(
+      filterLisatietoRows(rows, "20", "haku").map((row) => row.koodi),
+    ).toEqual(["10", "20"]);
+  });
+
+  it("keeps valued rows visible through search and group filters", () => {
+    expect(
+      filterLisatietoRows(rows, "not-found", "haku").map((row) => row.koodi),
+    ).toEqual(["10"]);
+  });
+});
diff --git a/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts b/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts
index e97f7e6d..e2fe228f 100644
--- a/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts
+++ b/apps/web/lib/admin/trials/__tests__/result-create-field-registry.test.ts
@@ -1,10 +1,23 @@
 import { describe, expect, it } from "vitest";
+import { ADMIN_TRIAL_LISATIETO_GROUP_ORDER } from "../entry-edit-config";
 import {
   resolveResultCreateFieldSet,
   SEEDED_TRIAL_RULE_WINDOW_IDS,
 } from "../result-create-field-registry";
 
 describe("result create field registry", () => {
+  it("uses the official PDF domain order for lisatieto groups", () => {
+    expect(ADMIN_TRIAL_LISATIETO_GROUP_ORDER).toEqual([
+      "olosuhteet",
+      "haku",
+      "haukku",
+      "metsastysinto",
+      "ajo",
+      "muut_ominaisuudet",
+      "unknown",
+    ]);
+  });
+
   it("registers the verified 2023+ field set from the persisted rule window", () => {
     const fieldSet = resolveResultCreateFieldSet("trw_post_20230801");
 
@@ -18,6 +31,97 @@ describe("result create field registry", () => {
       entry: "Ajotaito",
       era: "ajotaito",
     });
+    expect(fieldSet.presentationGroups.map((group) => group.id)).toEqual([
+      "basic",
+      "time",
+      "merit",
+      "loss",
+      "result",
+      "judges",
+    ]);
+    expect(
+      fieldSet.presentationGroups.flatMap((group) => group.entryFields),
+    ).not.toContain("tja");
+    expect(
+      fieldSet.presentationGroups.find((group) => group.id === "time"),
+    ).toEqual({
+      id: "time",
+      entryFields: ["hyvaksytytAjominuutit", "ajoajanPisteet"],
+      eraFields: ["alkoi", "hakumin", "ajomin"],
+    });
+    expect(
+      Object.fromEntries(
+        fieldSet.presentationGroups.map((group) => [
+          group.id,
+          {
+            entry: group.entryFields,
+            era: group.eraFields,
+          },
+        ]),
+      ),
+    ).toEqual({
+      basic: {
+        entry: [
+          "koemaasto",
+          "koemuoto",
+          "koetyyppi",
+          "lk",
+          "omistajaSnapshot",
+          "omistajanKotikuntaSnapshot",
+        ],
+        era: [],
+      },
+      time: {
+        entry: ["hyvaksytytAjominuutit", "ajoajanPisteet"],
+        era: ["alkoi", "hakumin", "ajomin"],
+      },
+      merit: {
+        entry: ["haku", "hauk", "yva", "ansiopisteetYhteensa"],
+        era: ["haku", "hauk", "yva"],
+      },
+      loss: {
+        entry: ["hlo", "alo", "tappiopisteetYhteensa"],
+        era: ["hlo", "alo"],
+      },
+      result: {
+        entry: [
+          "ke",
+          "award",
+          "points",
+          "rank",
+          "koiriaLuokassa",
+          "huomautus",
+          "huomautusTeksti",
+        ],
+        era: ["huomautusTeksti"],
+      },
+      judges: {
+        entry: [
+          "ryhmatuomariNimi",
+          "palkintotuomariNimi",
+          "judge",
+          "ylituomariNumeroSnapshot",
+        ],
+        era: [],
+      },
+    });
+  });
+
+  it("presentation grouping neither adds nor removes visible fields", () => {
+    for (const id of ["trw_post_20230801", null] as const) {
+      const fieldSet = resolveResultCreateFieldSet(id);
+      const groupedEntryFields = fieldSet.presentationGroups.flatMap(
+        (group) => group.entryFields,
+      );
+      const groupedEraFields = fieldSet.presentationGroups.flatMap(
+        (group) => group.eraFields,
+      );
+
+      expect(new Set(groupedEntryFields)).toEqual(fieldSet.entryFields);
+      expect(groupedEntryFields).toHaveLength(new Set(groupedEntryFields).size);
+      expect(new Set(groupedEraFields)).toEqual(fieldSet.eraFields);
+      expect(groupedEraFields).toHaveLength(new Set(groupedEraFields).size);
+    }
   });
 
   it("matches the verified 2023+ lisatieto codes, parts, order and kinds", () => {
diff --git a/apps/web/lib/admin/trials/entry-edit-config.ts b/apps/web/lib/admin/trials/entry-edit-config.ts
index d8dd3cfa..f38b27e6 100644
--- a/apps/web/lib/admin/trials/entry-edit-config.ts
+++ b/apps/web/lib/admin/trials/entry-edit-config.ts
@@ -41,6 +41,16 @@ export type AdminTrialLisatietoConfig = {
   useSemanticControl?: boolean;
 };
 
+export const ADMIN_TRIAL_LISATIETO_GROUP_ORDER = [
+  "olosuhteet",
+  "haku",
+  "haukku",
+  "metsastysinto",
+  "ajo",
+  "muut_ominaisuudet",
+  "unknown",
+] as const satisfies readonly AdminTrialLisatietoGroup[];
+
 function defineLisatieto(
   koodi: string,
   group: AdminTrialLisatietoGroup,
diff --git a/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts b/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
new file mode 100644
index 00000000..06faf1eb
--- /dev/null
+++ b/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
@@ -0,0 +1,116 @@
+import type { LisatietoRowDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+
+export type LisatiedotWorkspaceState = {
+  query: string;
+  activeGroup: string | null;
+  expandedGroups: ReadonlySet<string>;
+  selectedRows: ReadonlySet<string>;
+  activeRow: string | null;
+  mobileSheetOpen: boolean;
+};
+
+export type LisatiedotWorkspaceAction =
+  | { type: "query"; value: string }
+  | { type: "group"; value: string | null }
+  | { type: "toggleGroup"; value: string }
+  | { type: "expand"; values: string[] }
+  | { type: "collapse" }
+  | { type: "select"; value: string }
+  | { type: "remove"; value: string }
+  | { type: "active"; value: string | null; mobile?: boolean }
+  | { type: "sheet"; value: boolean }
+  | { type: "reset"; rows: LisatietoRowDraft[] };
+
+export const lisatietoRowKey = (
+  row: Pick<LisatietoRowDraft, "koodi" | "osa">,
+) => `${row.koodi}:${row.osa}`;
+
+export function selectedLisatietoKeys(rows: LisatietoRowDraft[]) {
+  return new Set(
+    rows
+      .filter((row) =>
+        Object.values(row.eraValues).some((value) => value !== ""),
+      )
+      .map(lisatietoRowKey),
+  );
+}
+
+export function filterLisatietoRows(
+  rows: LisatietoRowDraft[],
+  query: string,
+  activeGroup: string | null,
+) {
+  const normalizedQuery = query.trim().toLocaleLowerCase();
+  return rows.filter((row) => {
+    const hasValue = Object.values(row.eraValues).some((value) => value !== "");
+    const matchesGroup = !activeGroup || row.group === activeGroup;
+    const matchesQuery =
+      !normalizedQuery ||
+      `${row.koodi} ${row.osa} ${row.label}`
+        .toLocaleLowerCase()
+        .includes(normalizedQuery);
+    return hasValue || (matchesGroup && matchesQuery);
+  });
+}
+
+export function createLisatiedotWorkspaceState(
+  rows: LisatietoRowDraft[],
+): LisatiedotWorkspaceState {
+  return {
+    query: "",
+    activeGroup: null,
+    expandedGroups: new Set(),
+    selectedRows: selectedLisatietoKeys(rows),
+    activeRow: null,
+    mobileSheetOpen: false,
+  };
+}
+
+export function lisatiedotWorkspaceReducer(
+  state: LisatiedotWorkspaceState,
+  action: LisatiedotWorkspaceAction,
+): LisatiedotWorkspaceState {
+  switch (action.type) {
+    case "query":
+      return { ...state, query: action.value };
+    case "group":
+      return { ...state, activeGroup: action.value };
+    case "toggleGroup": {
+      const expandedGroups = new Set(state.expandedGroups);
+      if (expandedGroups.has(action.value)) expandedGroups.delete(action.value);
+      else expandedGroups.add(action.value);
+      return { ...state, expandedGroups };
+    }
+    case "expand":
+      return { ...state, expandedGroups: new Set(action.values) };
+    case "collapse":
+      return { ...state, expandedGroups: new Set() };
+    case "select":
+      return {
+        ...state,
+        selectedRows: new Set([...state.selectedRows, action.value]),
+        activeRow: action.value,
+      };
+    case "remove": {
+      const selectedRows = new Set(state.selectedRows);
+      selectedRows.delete(action.value);
+      return {
+        ...state,
+        selectedRows,
+        activeRow: state.activeRow === action.value ? null : state.activeRow,
+        mobileSheetOpen:
+          state.activeRow === action.value ? false : state.mobileSheetOpen,
+      };
+    }
+    case "active":
+      return {
+        ...state,
+        activeRow: action.value,
+        mobileSheetOpen: action.mobile ?? state.mobileSheetOpen,
+      };
+    case "sheet":
+      return { ...state, mobileSheetOpen: action.value };
+    case "reset":
+      return createLisatiedotWorkspaceState(action.rows);
+  }
+}
diff --git a/apps/web/lib/admin/trials/result-create-field-registry.ts b/apps/web/lib/admin/trials/result-create-field-registry.ts
index 654f458e..7b6cab4d 100644
--- a/apps/web/lib/admin/trials/result-create-field-registry.ts
+++ b/apps/web/lib/admin/trials/result-create-field-registry.ts
@@ -10,6 +10,13 @@ export type ResultCreateSemanticInputKind =
   | "tri-state";
 
 export type ResultCreateValueHint = "marker" | "integer" | "decimal" | "text";
+export type ResultCreatePresentationGroup =
+  | "basic"
+  | "time"
+  | "merit"
+  | "loss"
+  | "result"
+  | "judges";
 
 export type ResultCreateLisatietoField = AdminTrialLisatietoConfig & {
   inputKind: ResultCreateSemanticInputKind;
@@ -25,6 +32,11 @@ export type ResultCreateFieldSet = {
     | "admin.trials.manage.resultCreate.rulePeriod.unverified";
   entryFields: ReadonlySet<keyof EntryDraft>;
   eraFields: ReadonlySet<Exclude<keyof EraDraft, "era">>;
+  presentationGroups: readonly {
+    id: ResultCreatePresentationGroup;
+    entryFields: readonly (keyof EntryDraft)[];
+    eraFields: readonly Exclude<keyof EraDraft, "era">[];
+  }[];
   yvaLabels?: {
     entry: string;
     era: string;
@@ -137,6 +149,69 @@ const POST_2023_LISATIEDOT = ADMIN_TRIAL_LISATIETO_CONFIG.filter(
   hideOsaSuffix: config.koodi === "25" || config.koodi === "27",
 }));
 
+const PRESENTATION_GROUP_ENTRY_FIELDS: Record<
+  ResultCreatePresentationGroup,
+  readonly (keyof EntryDraft)[]
+> = {
+  basic: [
+    "koemaasto",
+    "koemuoto",
+    "koetyyppi",
+    "lk",
+    "omistajaSnapshot",
+    "omistajanKotikuntaSnapshot",
+  ],
+  time: ["hyvaksytytAjominuutit", "ajoajanPisteet"],
+  merit: ["haku", "hauk", "yva", "ansiopisteetYhteensa", "tja", "pin"],
+  loss: ["hlo", "alo", "tappiopisteetYhteensa"],
+  result: [
+    "ke",
+    "award",
+    "points",
+    "rank",
+    "koiriaLuokassa",
+    "huomautus",
+    "huomautusTeksti",
+  ],
+  judges: [
+    "ryhmatuomariNimi",
+    "palkintotuomariNimi",
+    "judge",
+    "ylituomariNumeroSnapshot",
+  ],
+};
+
+const PRESENTATION_GROUP_ERA_FIELDS: Record<
+  ResultCreatePresentationGroup,
+  readonly Exclude<keyof EraDraft, "era">[]
+> = {
+  basic: [],
+  time: ["alkoi", "hakumin", "ajomin"],
+  merit: ["haku", "hauk", "yva", "tja", "pin"],
+  loss: ["hlo", "alo"],
+  result: ["huomautusTeksti"],
+  judges: [],
+};
+
+function createPresentationGroups(
+  visibleEntryFields: ReadonlySet<keyof EntryDraft>,
+  visibleEraFields: ReadonlySet<Exclude<keyof EraDraft, "era">>,
+) {
+  return (
+    Object.keys(
+      PRESENTATION_GROUP_ENTRY_FIELDS,
+    ) as ResultCreatePresentationGroup[]
+  ).map((id) => ({
+    id,
+    entryFields: PRESENTATION_GROUP_ENTRY_FIELDS[id].filter((field) =>
+      visibleEntryFields.has(field),
+    ),
+    eraFields: PRESENTATION_GROUP_ERA_FIELDS[id].filter((field) =>
+      visibleEraFields.has(field),
+    ),
+  }));
+}
+
 const POST_2023_FIELD_SET: ResultCreateFieldSet = {
   id: "post-2023",
   verified: true,
@@ -147,6 +222,16 @@ const POST_2023_FIELD_SET: ResultCreateFieldSet = {
   eraFields: new Set(
     [...ALL_ERA_FIELDS].filter((field) => field !== "tja" && field !== "pin"),
   ),
+  presentationGroups: createPresentationGroups(
+    new Set(
+      [...ALL_ENTRY_FIELDS].filter(
+        (field) => field !== "tja" && field !== "pin",
+      ),
+    ),
+    new Set(
+      [...ALL_ERA_FIELDS].filter((field) => field !== "tja" && field !== "pin"),
+    ),
+  ),
   yvaLabels: {
     entry: "Ajotaito",
     era: "ajotaito",
@@ -161,6 +246,10 @@ const UNVERIFIED_FALLBACK_FIELD_SET: ResultCreateFieldSet = {
     "admin.trials.manage.resultCreate.rulePeriod.unverified",
   entryFields: ALL_ENTRY_FIELDS,
   eraFields: ALL_ERA_FIELDS,
+  presentationGroups: createPresentationGroups(
+    ALL_ENTRY_FIELDS,
+    ALL_ERA_FIELDS,
+  ),
   lisatiedot: FALLBACK_LISATIEDOT,
 };
 
diff --git a/apps/web/lib/i18n/messages/admin/trials/manage.ts b/apps/web/lib/i18n/messages/admin/trials/manage.ts
index 8cde11ac..09549415 100644
--- a/apps/web/lib/i18n/messages/admin/trials/manage.ts
+++ b/apps/web/lib/i18n/messages/admin/trials/manage.ts
@@ -68,6 +68,31 @@ export const fiAdminTrialsManageMessages = {
   "admin.trials.manage.resultCreate.backToWorkspace":
     "Takaisin tapahtuman sivulle",
   "admin.trials.manage.resultCreate.registration": "Rekisterinumero",
+  "admin.trials.manage.resultCreate.card.basic": "Koiran ja kokeen tiedot",
+  "admin.trials.manage.resultCreate.card.time": "Koe-erät ja ajoaika",
+  "admin.trials.manage.resultCreate.card.merit": "Ansiopisteet",
+  "admin.trials.manage.resultCreate.card.loss": "Tappiopisteet",
+  "admin.trials.manage.resultCreate.card.result": "Tulos ja huomautukset",
+  "admin.trials.manage.resultCreate.card.judges": "Tuomarit",
+  "admin.trials.manage.resultCreate.card.additional": "Lisätiedot",
+  "admin.trials.manage.resultCreate.summary.empty": "Ei tietoja",
+  "admin.trials.manage.resultCreate.summary.eras": "erää",
+  "admin.trials.manage.resultCreate.summary.selected": "valittua",
+  "admin.trials.manage.resultCreate.additional.search": "Hae lisätietoa",
+  "admin.trials.manage.resultCreate.additional.searchPlaceholder":
+    "Hae koodilla tai nimellä",
+  "admin.trials.manage.resultCreate.additional.expandAll": "Laajenna kaikki",
+  "admin.trials.manage.resultCreate.additional.collapseAll": "Supista kaikki",
+  "admin.trials.manage.resultCreate.additional.groups": "Lisätietoryhmät",
+  "admin.trials.manage.resultCreate.additional.allGroups": "Kaikki",
+  "admin.trials.manage.resultCreate.additional.selected": "Valitut lisätiedot",
+  "admin.trials.manage.resultCreate.additional.remove": "Poista",
+  "admin.trials.manage.resultCreate.additional.close": "Sulje",
+  "admin.trials.manage.resultCreate.additional.chooseRow":
+    "Valitse lisätieto muokattavaksi.",
+  "admin.trials.manage.resultCreate.additional.editorHelp":
+    "Anna arvot eräkohtaisesti.",
+  "admin.trials.manage.resultCreate.additional.era": "Erä",
   "admin.trials.manage.resultCreate.rulePeriod.post2023": "Säännöt: 1.8.2023 →",
   "admin.trials.manage.resultCreate.rulePeriod.unverified":
     "Säännöt: historiallinen tai määrittämätön sääntökausi",
@@ -282,6 +307,33 @@ export const svAdminTrialsManageMessages = {
   "admin.trials.manage.resultCreate.backToWorkspace":
     "Tillbaka till evenemangssidan",
   "admin.trials.manage.resultCreate.registration": "Registreringsnummer",
+  "admin.trials.manage.resultCreate.card.basic":
+    "Hundens och provets uppgifter",
+  "admin.trials.manage.resultCreate.card.time": "Provomgångar och drevtid",
+  "admin.trials.manage.resultCreate.card.merit": "Förtjänstpoäng",
+  "admin.trials.manage.resultCreate.card.loss": "Minuspoäng",
+  "admin.trials.manage.resultCreate.card.result": "Resultat och anmärkningar",
+  "admin.trials.manage.resultCreate.card.judges": "Domare",
+  "admin.trials.manage.resultCreate.card.additional": "Tilläggsuppgifter",
+  "admin.trials.manage.resultCreate.summary.empty": "Inga uppgifter",
+  "admin.trials.manage.resultCreate.summary.eras": "omgångar",
+  "admin.trials.manage.resultCreate.summary.selected": "valda",
+  "admin.trials.manage.resultCreate.additional.search": "Sök tilläggsuppgift",
+  "admin.trials.manage.resultCreate.additional.searchPlaceholder":
+    "Sök med kod eller namn",
+  "admin.trials.manage.resultCreate.additional.expandAll": "Expandera alla",
+  "admin.trials.manage.resultCreate.additional.collapseAll": "Fäll ihop alla",
+  "admin.trials.manage.resultCreate.additional.groups": "Tilläggsgrupper",
+  "admin.trials.manage.resultCreate.additional.allGroups": "Alla",
+  "admin.trials.manage.resultCreate.additional.selected":
+    "Valda tilläggsuppgifter",
+  "admin.trials.manage.resultCreate.additional.remove": "Ta bort",
+  "admin.trials.manage.resultCreate.additional.close": "Stäng",
+  "admin.trials.manage.resultCreate.additional.chooseRow":
+    "Välj en tilläggsuppgift att redigera.",
+  "admin.trials.manage.resultCreate.additional.editorHelp":
+    "Ange värden per omgång.",
+  "admin.trials.manage.resultCreate.additional.era": "Omgång",
   "admin.trials.manage.resultCreate.rulePeriod.post2023": "Regler: 1.8.2023 →",
   "admin.trials.manage.resultCreate.rulePeriod.unverified":
     "Regler: historisk eller obestämd regelperiod",
diff --git a/docs/features/admin-trial-management.md b/docs/features/admin-trial-management.md
index 0be1545b..e21c1d9e 100644
--- a/docs/features/admin-trial-management.md
+++ b/docs/features/admin-trial-management.md
@@ -23,6 +23,12 @@ and follow-up admin flow redesign).
   complete compatibility form with a warning. The canonical timeline, field
   sets, and fallback semantics are documented in
   [Trial rule windows](./trials/rule-windows.md).
+- Manual result creation presents the unchanged single draft in independently
+  collapsible cards grouped by the official PDF's domain structure without
+  copying its matrix geometry. Era- and entry-level values remain separate
+  controlled draft fields inside their shared domain card. Lisätiedot uses a
+  searchable, business-domain-grouped workspace with one controlled row
+  editor; removing a selected row clears its unsaved era values.
 
 ## Main files
 
@@ -106,6 +112,15 @@ and follow-up admin flow redesign).
   set and an unverified-field warning. See
   [Trial rule windows](./trials/rule-windows.md) for the complete verified
   configuration and compatibility boundary.
+- Result-create cards may be expanded independently. Koiran ja kokeen tiedot is
+  initially open, followed by Koe-erät ja ajoaika, Ansiopisteet,
+  Tappiopisteet, Tulos ja huomautukset, Tuomarit, and Lisätiedot. Saving while
+  continuing with another dog resets both the draft and presentation state
+  back to Koiran ja kokeen tiedot. Card summaries only repeat entered display
+  values and do not calculate result data.
+- Lisätiedot groups follow the PDF domain order: Olosuhteet, Haku, Haukku,
+  Metsästysinto, Ajo, and Muut ominaisuudet. The workspace does not reproduce
+  the PDF matrix.
 - Selected dog rows have PDF, edit, and result-delete actions.
 - A missing workspace event is shown explicitly and never falls back to a
   different event.

From 4bb2992ad5fd3555ebd105386072624cc880d4e1 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Sun, 2 Aug 2026 19:29:38 +0300
Subject: [PATCH 23/24] =?UTF-8?q?fix(trials):=20simplify=20Lis=C3=A4tiedot?=
 =?UTF-8?q?=20workspace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Remove unfinished Lisätiedot search, filtering, bulk expansion
  controls,
  and selected-row chips. Keep PDF-domain groups individually
  collapsible
  with shared desktop/mobile row activation and draft ownership.

  Update reducer tests, accessibility labels, translations, and admin
  trial
  documentation to reflect the simpler workflow.

  Validation already run successfully: focused tests, web typecheck,
  targeted ESLint, and git diff --check.
---
 .../admin-trial-entry-create-page-client.tsx  |   1 -
 .../trials/internal/lisatiedot-workspace.tsx  | 104 ++----------------
 .../lisatiedot-workspace-state.test.ts        | 103 +++++------------
 .../trials/lisatiedot-workspace-state.ts      |  64 +----------
 .../lib/i18n/messages/admin/trials/manage.ts  |  19 ----
 docs/features/admin-trial-management.md       |   4 +-
 6 files changed, 43 insertions(+), 252 deletions(-)

diff --git a/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx b/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
index 8c46ddbb..0ddcf530 100644
--- a/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
+++ b/apps/web/components/admin/trials/admin-trial-entry-create-page-client.tsx
@@ -509,7 +509,6 @@ function ResultCreateForm({
       <ResultCreateCard
         id="result-create-additional"
         title={t("admin.trials.manage.resultCreate.card.additional")}
-        summary={`${draft.lisatiedotRows.filter((row) => Object.values(row.eraValues).some(Boolean)).length} ${t("admin.trials.manage.resultCreate.summary.selected")}`}
         open={openCards.has("additional")}
         onToggle={() => toggleCard("additional")}
       >
diff --git a/apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx b/apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx
index 199109c4..312e395e 100644
--- a/apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx
+++ b/apps/web/components/admin/trials/internal/lisatiedot-workspace.tsx
@@ -23,7 +23,6 @@ import type {
 } from "@/lib/admin/trials/entry-edit-dialog-model";
 import {
   createLisatiedotWorkspaceState,
-  filterLisatietoRows,
   lisatietoRowKey,
   lisatiedotWorkspaceReducer,
 } from "@/lib/admin/trials/lisatiedot-workspace-state";
@@ -56,8 +55,8 @@ export function LisatiedotWorkspace({
   const { t } = useI18n();
   const [state, dispatch] = React.useReducer(
     lisatiedotWorkspaceReducer,
-    rows,
-    createLisatiedotWorkspaceState,
+    undefined,
+    () => createLisatiedotWorkspaceState(),
   );
   const isMobileWorkspace = useResultCreateWorkspaceMobile();
   const mobileControlRef = React.useRef<HTMLElement | null>(null);
@@ -81,10 +80,6 @@ export function LisatiedotWorkspace({
       ),
     [rows],
   );
-  const visibleRows = filterLisatietoRows(rows, state.query, state.activeGroup);
-  const selectedRows = rows.filter((row) =>
-    state.selectedRows.has(lisatietoRowKey(row)),
-  );
   const activeRow =
     rows.find((row) => lisatietoRowKey(row) === state.activeRow) ?? null;
 
@@ -94,14 +89,13 @@ export function LisatiedotWorkspace({
     }
   }, [isMobileWorkspace, state.mobileSheetOpen]);
 
-  function select(
+  function activate(
     row: LisatietoRowDraft,
     mobile: boolean,
     trigger: HTMLButtonElement,
   ) {
     const key = lisatietoRowKey(row);
     rowTriggerRef.current = trigger;
-    dispatch({ type: "select", value: key });
     dispatch({ type: "active", value: key, mobile });
   }
   function remove(row: LisatietoRowDraft) {
@@ -111,90 +105,10 @@ export function LisatiedotWorkspace({
 
   return (
     <div className="space-y-4">
-      <div className="grid gap-3 lg:grid-cols-[minmax(0,1fr)_auto]">
-        <label className="space-y-1 text-sm">
-          <span>{t("admin.trials.manage.resultCreate.additional.search")}</span>
-          <Input
-            value={state.query}
-            placeholder={t(
-              "admin.trials.manage.resultCreate.additional.searchPlaceholder",
-            )}
-            onChange={(event) =>
-              dispatch({ type: "query", value: event.target.value })
-            }
-          />
-        </label>
-        <div className="flex flex-wrap items-end gap-2">
-          <Button
-            type="button"
-            size="sm"
-            variant="outline"
-            onClick={() => dispatch({ type: "expand", values: groups })}
-          >
-            {t("admin.trials.manage.resultCreate.additional.expandAll")}
-          </Button>
-          <Button
-            type="button"
-            size="sm"
-            variant="outline"
-            onClick={() => dispatch({ type: "collapse" })}
-          >
-            {t("admin.trials.manage.resultCreate.additional.collapseAll")}
-          </Button>
-        </div>
-      </div>
-      <div
-        className="flex flex-wrap gap-2"
-        aria-label={t("admin.trials.manage.resultCreate.additional.groups")}
-      >
-        <Button
-          type="button"
-          size="sm"
-          variant={state.activeGroup === null ? "default" : "outline"}
-          onClick={() => dispatch({ type: "group", value: null })}
-        >
-          {t("admin.trials.manage.resultCreate.additional.allGroups")}
-        </Button>
-        {groups.map((group) => (
-          <Button
-            key={group}
-            type="button"
-            size="sm"
-            variant={state.activeGroup === group ? "default" : "outline"}
-            onClick={() => dispatch({ type: "group", value: group })}
-          >
-            {groupLabel(group)}
-          </Button>
-        ))}
-      </div>
-      {selectedRows.length ? (
-        <div
-          className="flex flex-wrap gap-2"
-          aria-label={t("admin.trials.manage.resultCreate.additional.selected")}
-        >
-          {selectedRows.map((row) => (
-            <span
-              key={lisatietoRowKey(row)}
-              className="inline-flex items-center gap-1 rounded-full bg-muted px-3 py-1 text-sm"
-            >
-              {row.koodi} {row.label}
-              <button
-                type="button"
-                className="rounded px-1"
-                aria-label={`${t("admin.trials.manage.resultCreate.additional.remove")} ${row.koodi} ${row.label}`}
-                onClick={() => remove(row)}
-              >
-                ×
-              </button>
-            </span>
-          ))}
-        </div>
-      ) : null}
       <div className="grid gap-4 lg:grid-cols-[minmax(260px,0.8fr)_minmax(0,1.2fr)]">
         <div className="space-y-2">
           {groups.map((group) => {
-            const groupRows = visibleRows.filter((row) => row.group === group);
-            if (!groupRows.length) return null;
+            const groupRows = rows.filter((row) => row.group === group);
             const expanded = state.expandedGroups.has(group);
             return (
               <div key={group} className="rounded-md border">
@@ -216,7 +130,7 @@ export function LisatiedotWorkspace({
                         type="button"
                         className="block w-full rounded p-2 text-left hover:bg-muted"
                         onClick={(event) =>
-                          select(row, isMobileWorkspace, event.currentTarget)
+                          activate(row, isMobileWorkspace, event.currentTarget)
                         }
                       >
                         <span className="font-medium">{row.koodi}</span>{" "}
@@ -326,7 +240,13 @@ function RowEditor({
             )}
           </p>
         </div>
-        <Button type="button" size="sm" variant="outline" onClick={onRemove}>
+        <Button
+          type="button"
+          size="sm"
+          variant="outline"
+          aria-label={`${t("admin.trials.manage.resultCreate.additional.remove")} ${row.koodi} ${row.label}`}
+          onClick={onRemove}
+        >
           {t("admin.trials.manage.resultCreate.additional.remove")}
         </Button>
       </div>
diff --git a/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts b/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
index 1e319489..7bf063d0 100644
--- a/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
+++ b/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
@@ -1,42 +1,13 @@
 import { describe, expect, it } from "vitest";
-import type { LisatietoRowDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
 import {
   createLisatiedotWorkspaceState,
-  filterLisatietoRows,
   lisatiedotWorkspaceReducer,
 } from "../lisatiedot-workspace-state";
 
-const rows: LisatietoRowDraft[] = [
-  {
-    koodi: "10",
-    osa: "",
-    nimi: "Vaativat olosuhteet",
-    jarjestys: 10,
-    group: "olosuhteet",
-    label: "Vaativat olosuhteet",
-    inputKind: "marker",
-    sortOrder: 10,
-    eraValues: { 1: "1" },
-  },
-  {
-    koodi: "20",
-    osa: "",
-    nimi: "Haku",
-    jarjestys: 20,
-    group: "haku",
-    label: "Haku",
-    inputKind: "integer",
-    sortOrder: 20,
-    eraValues: { 1: "" },
-  },
-];
-
 describe("lisatiedot workspace reducer", () => {
-  it("rebuilds selection from draft values and resets all transient state", () => {
-    let state = createLisatiedotWorkspaceState(rows);
-    expect([...state.selectedRows]).toEqual(["10:"]);
-    state = lisatiedotWorkspaceReducer(state, {
-      type: "query",
+  it("resets all transient workspace state", () => {
+    let state = lisatiedotWorkspaceReducer(createLisatiedotWorkspaceState(), {
+      type: "toggleGroup",
       value: "haku",
     });
     state = lisatiedotWorkspaceReducer(state, {
@@ -45,33 +16,42 @@ describe("lisatiedot workspace reducer", () => {
       mobile: true,
     });
 
-    state = lisatiedotWorkspaceReducer(state, {
-      type: "reset",
-      rows: [rows[1]!],
-    });
+    state = lisatiedotWorkspaceReducer(state, { type: "reset" });
 
-    expect(state).toEqual(createLisatiedotWorkspaceState([rows[1]!]));
+    expect(state).toEqual(createLisatiedotWorkspaceState());
   });
 
-  it("keeps selection when only values are cleared and removes it explicitly", () => {
-    let state = createLisatiedotWorkspaceState(rows);
-    state = lisatiedotWorkspaceReducer(state, {
-      type: "select",
+  it("clears the active row when it is removed", () => {
+    let state = lisatiedotWorkspaceReducer(createLisatiedotWorkspaceState(), {
+      type: "active",
       value: "20:",
+      mobile: true,
     });
-    expect(state.selectedRows.has("20:")).toBe(true);
-
     state = lisatiedotWorkspaceReducer(state, {
       type: "remove",
       value: "20:",
     });
-    expect(state.selectedRows.has("20:")).toBe(false);
+
     expect(state.activeRow).toBeNull();
+    expect(state.mobileSheetOpen).toBe(false);
   });
 
-  it("opens the same active row only when selection comes from mobile", () => {
-    let state = createLisatiedotWorkspaceState(rows);
+  it("supports independent group expansion", () => {
+    let state = createLisatiedotWorkspaceState();
+    state = lisatiedotWorkspaceReducer(state, {
+      type: "toggleGroup",
+      value: "olosuhteet",
+    });
     state = lisatiedotWorkspaceReducer(state, {
+      type: "toggleGroup",
+      value: "haku",
+    });
+
+    expect([...state.expandedGroups]).toEqual(["olosuhteet", "haku"]);
+  });
+
+  it("shares row activation behavior between desktop and mobile", () => {
+    let state = lisatiedotWorkspaceReducer(createLisatiedotWorkspaceState(), {
       type: "active",
       value: "20:",
       mobile: false,
@@ -93,35 +73,4 @@ describe("lisatiedot workspace reducer", () => {
     });
     expect(state.mobileSheetOpen).toBe(false);
   });
-
-  it("supports independent group expansion and expand/collapse all", () => {
-    let state = createLisatiedotWorkspaceState(rows);
-    state = lisatiedotWorkspaceReducer(state, {
-      type: "expand",
-      values: ["olosuhteet", "haku"],
-    });
-    expect([...state.expandedGroups]).toEqual(["olosuhteet", "haku"]);
-    state = lisatiedotWorkspaceReducer(state, {
-      type: "toggleGroup",
-      value: "haku",
-    });
-    expect([...state.expandedGroups]).toEqual(["olosuhteet"]);
-    state = lisatiedotWorkspaceReducer(state, { type: "collapse" });
-    expect(state.expandedGroups.size).toBe(0);
-  });
-
-  it("searches localized names and codes within a business group", () => {
-    expect(
-      filterLisatietoRows(rows, "haku", "haku").map((row) => row.koodi),
-    ).toEqual(["10", "20"]);
-    expect(
-      filterLisatietoRows(rows, "20", "haku").map((row) => row.koodi),
-    ).toEqual(["10", "20"]);
-  });
-
-  it("keeps valued rows visible through search and group filters", () => {
-    expect(
-      filterLisatietoRows(rows, "not-found", "haku").map((row) => row.koodi),
-    ).toEqual(["10"]);
-  });
 });
diff --git a/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts b/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
index 06faf1eb..0d92deeb 100644
--- a/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
+++ b/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
@@ -1,66 +1,25 @@
 import type { LisatietoRowDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
 
 export type LisatiedotWorkspaceState = {
-  query: string;
-  activeGroup: string | null;
   expandedGroups: ReadonlySet<string>;
-  selectedRows: ReadonlySet<string>;
   activeRow: string | null;
   mobileSheetOpen: boolean;
 };
 
 export type LisatiedotWorkspaceAction =
-  | { type: "query"; value: string }
-  | { type: "group"; value: string | null }
   | { type: "toggleGroup"; value: string }
-  | { type: "expand"; values: string[] }
-  | { type: "collapse" }
-  | { type: "select"; value: string }
   | { type: "remove"; value: string }
   | { type: "active"; value: string | null; mobile?: boolean }
   | { type: "sheet"; value: boolean }
-  | { type: "reset"; rows: LisatietoRowDraft[] };
+  | { type: "reset" };
 
 export const lisatietoRowKey = (
   row: Pick<LisatietoRowDraft, "koodi" | "osa">,
 ) => `${row.koodi}:${row.osa}`;
 
-export function selectedLisatietoKeys(rows: LisatietoRowDraft[]) {
-  return new Set(
-    rows
-      .filter((row) =>
-        Object.values(row.eraValues).some((value) => value !== ""),
-      )
-      .map(lisatietoRowKey),
-  );
-}
-
-export function filterLisatietoRows(
-  rows: LisatietoRowDraft[],
-  query: string,
-  activeGroup: string | null,
-) {
-  const normalizedQuery = query.trim().toLocaleLowerCase();
-  return rows.filter((row) => {
-    const hasValue = Object.values(row.eraValues).some((value) => value !== "");
-    const matchesGroup = !activeGroup || row.group === activeGroup;
-    const matchesQuery =
-      !normalizedQuery ||
-      `${row.koodi} ${row.osa} ${row.label}`
-        .toLocaleLowerCase()
-        .includes(normalizedQuery);
-    return hasValue || (matchesGroup && matchesQuery);
-  });
-}
-
-export function createLisatiedotWorkspaceState(
-  rows: LisatietoRowDraft[],
-): LisatiedotWorkspaceState {
+export function createLisatiedotWorkspaceState(): LisatiedotWorkspaceState {
   return {
-    query: "",
-    activeGroup: null,
     expandedGroups: new Set(),
-    selectedRows: selectedLisatietoKeys(rows),
     activeRow: null,
     mobileSheetOpen: false,
   };
@@ -71,32 +30,15 @@ export function lisatiedotWorkspaceReducer(
   action: LisatiedotWorkspaceAction,
 ): LisatiedotWorkspaceState {
   switch (action.type) {
-    case "query":
-      return { ...state, query: action.value };
-    case "group":
-      return { ...state, activeGroup: action.value };
     case "toggleGroup": {
       const expandedGroups = new Set(state.expandedGroups);
       if (expandedGroups.has(action.value)) expandedGroups.delete(action.value);
       else expandedGroups.add(action.value);
       return { ...state, expandedGroups };
     }
-    case "expand":
-      return { ...state, expandedGroups: new Set(action.values) };
-    case "collapse":
-      return { ...state, expandedGroups: new Set() };
-    case "select":
-      return {
-        ...state,
-        selectedRows: new Set([...state.selectedRows, action.value]),
-        activeRow: action.value,
-      };
     case "remove": {
-      const selectedRows = new Set(state.selectedRows);
-      selectedRows.delete(action.value);
       return {
         ...state,
-        selectedRows,
         activeRow: state.activeRow === action.value ? null : state.activeRow,
         mobileSheetOpen:
           state.activeRow === action.value ? false : state.mobileSheetOpen,
@@ -111,6 +53,6 @@ export function lisatiedotWorkspaceReducer(
     case "sheet":
       return { ...state, mobileSheetOpen: action.value };
     case "reset":
-      return createLisatiedotWorkspaceState(action.rows);
+      return createLisatiedotWorkspaceState();
   }
 }
diff --git a/apps/web/lib/i18n/messages/admin/trials/manage.ts b/apps/web/lib/i18n/messages/admin/trials/manage.ts
index 09549415..2aee3ad5 100644
--- a/apps/web/lib/i18n/messages/admin/trials/manage.ts
+++ b/apps/web/lib/i18n/messages/admin/trials/manage.ts
@@ -77,15 +77,6 @@ export const fiAdminTrialsManageMessages = {
   "admin.trials.manage.resultCreate.card.additional": "Lisätiedot",
   "admin.trials.manage.resultCreate.summary.empty": "Ei tietoja",
   "admin.trials.manage.resultCreate.summary.eras": "erää",
-  "admin.trials.manage.resultCreate.summary.selected": "valittua",
-  "admin.trials.manage.resultCreate.additional.search": "Hae lisätietoa",
-  "admin.trials.manage.resultCreate.additional.searchPlaceholder":
-    "Hae koodilla tai nimellä",
-  "admin.trials.manage.resultCreate.additional.expandAll": "Laajenna kaikki",
-  "admin.trials.manage.resultCreate.additional.collapseAll": "Supista kaikki",
-  "admin.trials.manage.resultCreate.additional.groups": "Lisätietoryhmät",
-  "admin.trials.manage.resultCreate.additional.allGroups": "Kaikki",
-  "admin.trials.manage.resultCreate.additional.selected": "Valitut lisätiedot",
   "admin.trials.manage.resultCreate.additional.remove": "Poista",
   "admin.trials.manage.resultCreate.additional.close": "Sulje",
   "admin.trials.manage.resultCreate.additional.chooseRow":
@@ -317,16 +308,6 @@ export const svAdminTrialsManageMessages = {
   "admin.trials.manage.resultCreate.card.additional": "Tilläggsuppgifter",
   "admin.trials.manage.resultCreate.summary.empty": "Inga uppgifter",
   "admin.trials.manage.resultCreate.summary.eras": "omgångar",
-  "admin.trials.manage.resultCreate.summary.selected": "valda",
-  "admin.trials.manage.resultCreate.additional.search": "Sök tilläggsuppgift",
-  "admin.trials.manage.resultCreate.additional.searchPlaceholder":
-    "Sök med kod eller namn",
-  "admin.trials.manage.resultCreate.additional.expandAll": "Expandera alla",
-  "admin.trials.manage.resultCreate.additional.collapseAll": "Fäll ihop alla",
-  "admin.trials.manage.resultCreate.additional.groups": "Tilläggsgrupper",
-  "admin.trials.manage.resultCreate.additional.allGroups": "Alla",
-  "admin.trials.manage.resultCreate.additional.selected":
-    "Valda tilläggsuppgifter",
   "admin.trials.manage.resultCreate.additional.remove": "Ta bort",
   "admin.trials.manage.resultCreate.additional.close": "Stäng",
   "admin.trials.manage.resultCreate.additional.chooseRow":
diff --git a/docs/features/admin-trial-management.md b/docs/features/admin-trial-management.md
index e21c1d9e..b359a8ee 100644
--- a/docs/features/admin-trial-management.md
+++ b/docs/features/admin-trial-management.md
@@ -27,8 +27,8 @@ and follow-up admin flow redesign).
   collapsible cards grouped by the official PDF's domain structure without
   copying its matrix geometry. Era- and entry-level values remain separate
   controlled draft fields inside their shared domain card. Lisätiedot uses a
-  searchable, business-domain-grouped workspace with one controlled row
-  editor; removing a selected row clears its unsaved era values.
+  business-domain-grouped workspace with individually collapsible groups and
+  one controlled row editor; removing a row clears its unsaved era values.
 
 ## Main files
 

From b2529cec0f67949d4528ed97c932d38a9b350bc4 Mon Sep 17 00:00:00 2001
From: Aki Kuivas <91662678+asku1990@users.noreply.github.com>
Date: Sun, 2 Aug 2026 19:55:13 +0300
Subject: [PATCH 24/24] =?UTF-8?q?test(trials):=20cover=20simplified=20Lis?=
 =?UTF-8?q?=C3=A4tiedot=20workspace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Remove the unreachable reducer reset action and its test. Add rendered
  workspace coverage for PDF-domain ordering, collapsible groups,
  active-row
  editor rendering, and accessible remove labels.

  Align the changelog, UX planning documentation, and PR description
  with the
  simplified Lisätiedot workflow.

  ref bej-103
---
 CHANGELOG.md                                  |  2 +-
 .../__tests__/lisatiedot-workspace.test.tsx   | 93 +++++++++++++++++++
 .../lisatiedot-workspace-state.test.ts        | 16 ----
 .../trials/lisatiedot-workspace-state.ts      |  5 +-
 docs/planning/trials/result-creation-ux.md    | 33 +++----
 5 files changed, 110 insertions(+), 39 deletions(-)
 create mode 100644 apps/web/components/admin/trials/internal/__tests__/lisatiedot-workspace.test.tsx

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56fc2658..6ff85a31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@ This project uses a user-facing changelog format.
 
 ### Changed
 
-- Ajokoetuloksen lisäyslomakkeen avattavat kortit noudattavat virallisen pöytäkirjan aihealueita ilman pöytäkirjan taulukkoasettelun kopiointia. Lisätietoja voi hakea ja muokata pöytäkirjan mukaisessa ryhmäjärjestyksessä myös mobiilissa.
+- Ajokoetuloksen lisäyslomakkeen avattavat kortit noudattavat virallisen pöytäkirjan aihealueita ilman pöytäkirjan taulukkoasettelun kopiointia. Lisätietoja muokataan pöytäkirjan mukaisissa yksittäin avattavissa ryhmissä myös mobiilissa.
 - Viimeisen koetuloksen poistaminen säilyttää ajokoetapahtuman tyhjänä, kunnes ylläpitäjä poistaa tapahtuman erikseen.
 - Uuden ajokoetapahtuman luomisen jälkeen siirrytään suoraan lisäämään tapahtuman ensimmäistä koetulosta.
 - Ajokoetuloksen lisäyslomake näyttää 1.8.2023 alkaen käytössä olevan sääntökauden mukaiset kentät. Vanhemmilla tai tunnistamattomilla sääntökausilla kaikki yhteensopivuuskentät säilyvät näkyvissä varoituksen kanssa.
diff --git a/apps/web/components/admin/trials/internal/__tests__/lisatiedot-workspace.test.tsx b/apps/web/components/admin/trials/internal/__tests__/lisatiedot-workspace.test.tsx
new file mode 100644
index 00000000..1d9e5c16
--- /dev/null
+++ b/apps/web/components/admin/trials/internal/__tests__/lisatiedot-workspace.test.tsx
@@ -0,0 +1,93 @@
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it, vi } from "vitest";
+import { createEmptyEraDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import type { LisatietoRowDraft } from "@/lib/admin/trials/entry-edit-dialog-model";
+import type { LisatiedotWorkspaceState } from "@/lib/admin/trials/lisatiedot-workspace-state";
+import { LisatiedotWorkspace } from "../lisatiedot-workspace";
+
+const groups = [
+  "olosuhteet",
+  "haku",
+  "haukku",
+  "metsastysinto",
+  "ajo",
+  "muut_ominaisuudet",
+  "unknown",
+] as const;
+
+function row(group: LisatietoRowDraft["group"], code: string) {
+  return {
+    koodi: code,
+    osa: "",
+    nimi: code,
+    jarjestys: Number(code),
+    group,
+    label: `${group} ${code}`,
+    inputKind: "text" as const,
+    sortOrder: Number(code),
+    eraValues: { 1: "" },
+  } satisfies LisatietoRowDraft;
+}
+
+describe("LisatiedotWorkspace", () => {
+  it("renders PDF-domain groups in order as individually collapsible sections", () => {
+    const rows = groups
+      .slice()
+      .reverse()
+      .map((group, index) => row(group, String(index + 10)));
+    const html = renderToStaticMarkup(
+      <LisatiedotWorkspace
+        eras={[createEmptyEraDraft(1)]}
+        rows={rows}
+        isPending={false}
+        onChangeCell={vi.fn()}
+        onRemoveRow={vi.fn()}
+      />,
+    );
+
+    const labels = [
+      "Olosuhteet",
+      "Haku",
+      "Haukku",
+      "Metsästysinto",
+      "Ajo",
+      "Muut ominaisuudet",
+      "Muut / tuntemattomat",
+    ];
+    const positions = labels.map((label) => html.indexOf(label));
+
+    expect(positions.every((position) => position >= 0)).toBe(true);
+    expect(positions).toEqual(
+      [...positions].sort((left, right) => left - right),
+    );
+    expect(html.match(/aria-expanded="false"/g) ?? []).toHaveLength(7);
+  });
+
+  it("renders the active row editor with an accessible remove label", () => {
+    const state: LisatiedotWorkspaceState = {
+      expandedGroups: new Set(["haku"]),
+      activeRow: "20:",
+      mobileSheetOpen: false,
+    };
+    const reducerSpy = vi
+      .spyOn(React, "useReducer")
+      .mockReturnValue([state, vi.fn()] as never);
+
+    try {
+      const html = renderToStaticMarkup(
+        <LisatiedotWorkspace
+          eras={[createEmptyEraDraft(1)]}
+          rows={[row("haku", "20")]}
+          isPending={false}
+          onChangeCell={vi.fn()}
+          onRemoveRow={vi.fn()}
+        />,
+      );
+
+      expect(html).toContain('aria-label="Poista 20 haku 20"');
+    } finally {
+      reducerSpy.mockRestore();
+    }
+  });
+});
diff --git a/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts b/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
index 7bf063d0..5cd196ec 100644
--- a/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
+++ b/apps/web/lib/admin/trials/__tests__/lisatiedot-workspace-state.test.ts
@@ -5,22 +5,6 @@ import {
 } from "../lisatiedot-workspace-state";
 
 describe("lisatiedot workspace reducer", () => {
-  it("resets all transient workspace state", () => {
-    let state = lisatiedotWorkspaceReducer(createLisatiedotWorkspaceState(), {
-      type: "toggleGroup",
-      value: "haku",
-    });
-    state = lisatiedotWorkspaceReducer(state, {
-      type: "active",
-      value: "20:",
-      mobile: true,
-    });
-
-    state = lisatiedotWorkspaceReducer(state, { type: "reset" });
-
-    expect(state).toEqual(createLisatiedotWorkspaceState());
-  });
-
   it("clears the active row when it is removed", () => {
     let state = lisatiedotWorkspaceReducer(createLisatiedotWorkspaceState(), {
       type: "active",
diff --git a/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts b/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
index 0d92deeb..23d467da 100644
--- a/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
+++ b/apps/web/lib/admin/trials/lisatiedot-workspace-state.ts
@@ -10,8 +10,7 @@ export type LisatiedotWorkspaceAction =
   | { type: "toggleGroup"; value: string }
   | { type: "remove"; value: string }
   | { type: "active"; value: string | null; mobile?: boolean }
-  | { type: "sheet"; value: boolean }
-  | { type: "reset" };
+  | { type: "sheet"; value: boolean };
 
 export const lisatietoRowKey = (
   row: Pick<LisatietoRowDraft, "koodi" | "osa">,
@@ -52,7 +51,5 @@ export function lisatiedotWorkspaceReducer(
       };
     case "sheet":
       return { ...state, mobileSheetOpen: action.value };
-    case "reset":
-      return createLisatiedotWorkspaceState();
   }
 }
diff --git a/docs/planning/trials/result-creation-ux.md b/docs/planning/trials/result-creation-ux.md
index 1f2009cd..1e196de8 100644
--- a/docs/planning/trials/result-creation-ux.md
+++ b/docs/planning/trials/result-creation-ux.md
@@ -80,12 +80,9 @@ scrolling matrix with a dedicated workspace inside its own card.
 
 The workspace supports:
 
-- search by code;
-- search by localized name;
-- filtering by business/PDF domain;
-- collapsible domain groups;
-- expand all and collapse all;
-- a selected-row summary above the groups;
+- PDF/business domain groups in the documented order;
+- individually collapsible domain groups;
+- a single active row editor;
 - semantic per-era controls; and
 - responsive desktop and mobile layouts.
 
@@ -120,14 +117,14 @@ Administrators must not normally enter raw persistence values such as `0` or
 `1`. The UI translates semantic control state through registry persistence
 mapping.
 
-Selected rows remain visible in the summary above the groups. Removing a
-selected row clears all of its unsaved era values. Rows with no values are
-omitted from the create request, preserving the existing request behavior.
+Clicking a row activates its single editor. Removing a row clears all of its
+unsaved era values. Rows with no values are omitted from the create request,
+preserving the existing request behavior.
 
-On desktop, the workspace may use adjacent filter, group, selected-row, and
-editor regions when space permits. On mobile, it uses stacked groups or an
-overlay/sheet while preserving the same selection and semantic controls.
-These are responsive implementation choices, not separate workflows.
+On desktop, the workspace uses the groups beside the active row editor. On
+mobile, the active row editor opens in a Sheet while preserving the same draft
+ownership and semantic controls. These are responsive implementation choices,
+not separate workflows.
 
 ## Erät and other sections
 
@@ -200,8 +197,8 @@ entry has an ID.
 - Rule windows remain mostly invisible: administrators cannot select one,
   normally see only a localized period label, and do not see the technical ID
   as a standard field.
-- Lisätiedot provides search, domain filtering, collapsible groups,
-  expand/collapse all, selected-row summary, and semantic per-era controls.
+- Lisätiedot provides PDF-domain grouping, individually collapsible groups, a
+  single row editor, and semantic per-era controls.
 - Business/PDF domains are the primary lisätieto grouping; numeric ranges are
   secondary only.
 - Removing a selected lisätieto clears its unsaved values, and empty rows are
@@ -221,9 +218,9 @@ entry has an ID.
 
 - Card tests for independent rendering, field-set-driven visibility,
   validation presentation, and draft callbacks.
-- Lisätieto tests for code/name search, domain filtering, group
-  expand/collapse, selected-row summary, selection removal, semantic controls,
-  per-era values, and omission of empty rows.
+- Lisätieto tests for PDF-domain ordering, independent group expansion, row
+  activation, removal, semantic controls, per-era values, and omission of
+  empty rows.
 - Tests proving semantic marker and tri-state controls serialize through the
   registry without exposing raw persistence values.
 - Responsive component tests for desktop and mobile workspace variants.