feat(app): application on the canonical sheet — report v3 store with v2 draft migration, bundled SheetProvider (SHEET_BUNDLE), annotation layer rendered from the document, zone interaction service, pickers and cards on the sheet index, PDF v3 export with v2 archive import; legacy registry, matchers, editors and assets removed

This commit is contained in:
bchanot committed 2026-10-10 11:36:14 +02:00
1 parent 0a17e390cf
commit ce2ec26112
114 files changed
+3560 -14637

No files matched your search

+97
View File
@@ -0,0 +1,97 @@
import {
createLayerElement,
renderAnnotationLayer,
viewBoxOf,
} from '@faunosteo/anatomy/render'
import type { SheetView } from '@faunosteo/domain'
import type { SheetIndex } from '@/services/sheetIndex'
/**
* Builds the inline SVG of one view: the sheet's drawing (sanitised asset
* text) framed on the view's box, plus the annotation layer generated from
* the document. The drawing is parsed once per asset and cloned per view.
*/
const SVG_NS = 'http://www.w3.org/2000/svg'
const FORBIDDEN_TAGS = ['script', 'foreignObject', 'iframe', 'object', 'embed']
export type ViewStates = ReadonlyMap<string, 'current'>
/** Drops scripts, embedded documents, event handlers and script URLs (LRN-025). */
export function sanitizeSvg(root: Element): void {
for (const tag of FORBIDDEN_TAGS) {
for (const el of Array.from(root.getElementsByTagName(tag))) el.remove()
}
for (const el of Array.from(root.querySelectorAll('*'))) {
for (const attr of Array.from(el.attributes)) {
const name = attr.name.toLowerCase()
const value = attr.value.trim().toLowerCase()
if (name.startsWith('on') || value.startsWith('javascript:')) {
el.removeAttribute(attr.name)
}
}
}
}
export function parseDrawing(svgText: string): SVGSVGElement {
const doc = new DOMParser().parseFromString(svgText, 'image/svg+xml')
if (doc.querySelector('parsererror')) throw new Error('invalid SVG asset')
const root = doc.documentElement
if (root.tagName.toLowerCase() !== 'svg')
throw new Error('asset root is not <svg>')
sanitizeSvg(root)
return root as unknown as SVGSVGElement
}
const parsed = new Map<string, SVGSVGElement>()
function drawingOf(index: SheetIndex, assetId: string): SVGSVGElement {
const key = `${index.sheet.ref.documentSha256}:${assetId}`
let root = parsed.get(key)
if (!root) {
const text = index.sheet.assets[assetId]
if (text === undefined) throw new Error(`asset ${assetId} not bundled`)
root = parseDrawing(text)
parsed.set(key, root)
}
return root
}
/** The asset a view draws: its own, else its parent's (a crop). */
export function assetOfView(index: SheetIndex, view: SheetView): string {
if (view.svg_asset_id) return view.svg_asset_id
if (view.kind === 'detail') {
const parent = index.view(view.parent_view_id)
if (parent) return assetOfView(index, parent)
}
throw new Error(`view ${view.id} has no asset`)
}
export function buildViewSvg(
index: SheetIndex,
viewId: string,
states: ViewStates,
): SVGSVGElement {
const view = index.view(viewId)
if (!view) throw new Error(`unknown view ${viewId}`)
const source = drawingOf(index, assetOfView(index, view))
const svg = document.createElementNS(SVG_NS, 'svg')
for (const attr of Array.from(source.attributes)) {
if (attr.name === 'width' || attr.name === 'height') continue
svg.setAttribute(attr.name, attr.value)
}
svg.setAttribute(
'viewBox',
viewBoxOf(view) ?? source.getAttribute('viewBox') ?? '0 0 100 100',
)
for (const child of Array.from(source.childNodes)) {
svg.appendChild(document.importNode(child, true))
}
const layer = renderAnnotationLayer({
document: index.sheet.document,
viewId,
states,
})
svg.appendChild(createLayerElement(document, layer) as unknown as Node)
return svg
}
-19
View File
@@ -1,19 +0,0 @@
import type { Locale } from '@/i18n/types'
import { pickLocaleLabel } from '@/i18n/pickLocaleLabel'
import type { Bone } from './types'
/**
* Resolves the user-facing label for an anatomical zone given the active
* locale. Falls back to the opposite language when the requested one is
* missing (some SVG hitboxes carry only `data-anno-name-fr`), then to the
* provided fallback (typically the raw boneId) so the UI never renders
* an empty label.
*/
export function boneLabel(
bone: Bone | undefined,
locale: Locale,
fallback: string,
): string {
if (!bone) return fallback
return pickLocaleLabel(bone.fr, bone.en, locale, fallback)
}
-107
View File
@@ -1,107 +0,0 @@
import { SvgConventionError } from './types'
import type { Bone, BoneCategory } from './types'
/**
* Validates that an annotated SVG element carries the two attributes the
* application needs to wire it up: a stable id (`data-anno-id`) and a
* category bucket (`data-anno-category`). Labels (`data-anno-name-fr/en`)
* and the popup trigger (`data-anno-opens-detail`) are optional and
* checked only at use-site.
*
* The category value itself is opaque to the application — any non-empty
* string is accepted. New SVGs are free to introduce new categories
* without touching this parser.
*/
function validateBoneElement(el: Element): void {
const boneId = el.getAttribute('data-anno-id') ?? ''
if (!boneId) {
throw new SvgConventionError(
'Element with missing data-anno-id',
boneId,
'data-anno-id',
)
}
const cat = el.getAttribute('data-anno-category') ?? ''
if (!cat) {
throw new SvgConventionError(
`Element data-anno-id="${boneId}" missing attribute data-anno-category`,
boneId,
'data-anno-category',
)
}
}
/**
* Parses an SVG document and returns a map of `data-anno-id` → Bone.
*
* Every element carrying `data-anno-id` is collected. Multiple elements
* may share the same id (e.g. hitbox + visible layer); they all end up
* grouped under the same Bone with all elements in `els`.
*
* Throws `SvgConventionError` only on the two required attributes
* (`data-anno-id`, `data-anno-category`). Labels are optional.
*/
export function parseSvgBones(svgRoot: SVGSVGElement): Map<string, Bone> {
const map = new Map<string, Bone>()
const all = svgRoot.querySelectorAll<Element>('[data-anno-id]')
all.forEach((el) => {
validateBoneElement(el)
const id = el.getAttribute('data-anno-id') as string
const fr = el.getAttribute('data-anno-name-fr') ?? ''
const en = el.getAttribute('data-anno-name-en') ?? ''
const category = el.getAttribute('data-anno-category') as BoneCategory
const opensDetail =
el.getAttribute('data-anno-opens-detail') ?? undefined
const special = el.getAttribute('data-anno-special') ?? undefined
const lateral = (el.getAttribute('data-anno-lateral') ?? undefined) as
| 'bilateral'
| 'unpaired'
| undefined
const existing = map.get(id)
if (existing) {
existing.els.push(el)
if (opensDetail && !existing.opensDetail) {
existing.opensDetail = opensDetail
}
if (special && !existing.special) {
existing.special = special
}
if (lateral && !existing.lateral) {
existing.lateral = lateral
}
if (!existing.fr && fr) existing.fr = fr
if (!existing.en && en) existing.en = en
} else {
map.set(id, {
id,
fr,
en,
category,
opensDetail,
special,
lateral,
els: [el],
})
}
})
return map
}
/**
* Walks up from `event.target` to find the nearest element carrying
* `data-anno-id`. Returns null when the click did not land on an
* annotated element.
*/
export function getBoneIdFromEvent(event: Event): string | null {
return getAnnotatedElement(event)?.getAttribute('data-anno-id') || null
}
export function getAnnotatedElement(event: Event): Element | null {
let node = event.target as Element | null
while (node && node.nodeType === 1) {
if (node.hasAttribute('data-anno-id')) return node
node = node.parentElement
}
return null
}
-17
View File
@@ -1,17 +0,0 @@
export async function loadSvg(publicPath: string): Promise<SVGSVGElement> {
const resp = await fetch(publicPath)
if (!resp.ok) {
throw new Error(`Failed to load SVG ${publicPath}: HTTP ${resp.status}`)
}
const text = await resp.text()
const doc = new DOMParser().parseFromString(text, 'image/svg+xml')
const parseErr = doc.querySelector('parsererror')
if (parseErr) {
throw new Error(`Invalid SVG at ${publicPath}: ${parseErr.textContent}`)
}
const root = doc.documentElement
if (root.tagName.toLowerCase() !== 'svg') {
throw new Error(`Root element of ${publicPath} is not <svg>`)
}
return root as unknown as SVGSVGElement
}
-55
View File
@@ -1,55 +0,0 @@
/**
* `data-anno-category` is a free-form string supplied by the SVG.
*
* The application never branches on category values — it treats every
* annotation the same way. Categories are kept around because they're
* useful for grouping and future filtering, but no code path here may
* rely on a closed set.
*/
export type BoneCategory = string
/**
* Logical annotation as parsed from an SVG. All DOM elements sharing the
* same `data-anno-id` are grouped into one Bone. `id` is the persisted
* identifier surfaced in the report JSON contract
* (`ObservationZone.boneId`); keep it stable across SVG renames.
*/
export interface Bone {
id: string
/** French label from data-anno-name-fr — may be empty for opens-detail-only triggers */
fr: string
/** English label from data-anno-name-en — may be empty */
en: string
/** Raw value from data-anno-category — opaque to the application */
category: BoneCategory
/** Detail popup id from data-anno-opens-detail, if present */
opensDetail?: string
/**
* Free-form behavior hint from `data-anno-special`.
*
* Known values consumed by the application:
* - `vertebral-precision`: clicking the zone opens VertebraPicker.
*
* Opaque to the parser; new values are accepted without code changes.
*/
special?: string
/** Laterality hint from data-anno-lateral — bilateral or unpaired */
lateral?: 'bilateral' | 'unpaired'
/** All DOM elements carrying this annotation (used for colorization) */
els: Element[]
}
/** Visual state applied to SVG elements (active-observation highlight). */
export type BoneState = 'current' | 'default'
/** Error thrown when SVG violates the convention. */
export class SvgConventionError extends Error {
constructor(
message: string,
public readonly boneId: string,
public readonly missingAttribute: string,
) {
super(message)
this.name = 'SvgConventionError'
}
}
+2 -7
View File
@@ -1,15 +1,12 @@
import { BrowserRouter, Routes, Route, useLocation } from 'react-router-dom'
import { BrowserRouter, Routes, Route } from 'react-router-dom'
import { ConfigProvider } from './providers/ConfigProvider'
import Footer from '@/components/brand/Footer'
import HomeRoute from './routes/HomeRoute'
import NewReportRoute from './routes/NewReportRoute'
import EditorRoute from './routes/EditorRoute'
import SvgEditorRoute from './routes/SvgEditorRoute'
import EditorsRoute from './routes/EditorsRoute'
import NotFoundRoute from './routes/NotFoundRoute'
function AppShell() {
const hideFooter = useLocation().pathname === '/svg-editor'
return (
<div className="flex min-h-screen flex-col">
<main className="flex-1 flex flex-col">
@@ -17,12 +14,10 @@ function AppShell() {
<Route path="/" element={<HomeRoute />} />
<Route path="/new" element={<NewReportRoute />} />
<Route path="/editor" element={<EditorRoute />} />
<Route path="/svg-editor" element={<SvgEditorRoute />} />
<Route path="/editors" element={<EditorsRoute />} />
<Route path="*" element={<NotFoundRoute />} />
</Routes>
</main>
{!hideFooter && <Footer />}
<Footer />
</div>
)
}
+218 -372
View File
@@ -1,12 +1,16 @@
import { useEffect, useMemo, useState } from 'react'
import { useCallback, useEffect, useMemo, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import type {
Animal,
LateralSide,
Owner,
Practitioner,
} from '@faunosteo/domain'
import AnatomyCanvas from '@/components/canvas/AnatomyCanvas'
import DetailModal from '@/components/canvas/DetailModal'
import ObservationList from '@/components/observation/ObservationList'
import VertebraPicker from '@/components/observation/VertebraPicker'
import { regionFromLabel } from '@/lib/spineZones'
import LateralityPicker from '@/components/observation/LateralityPicker'
import type { LateralSide } from '@/domain/schema/observation'
import ConclusionPanel from '@/components/report/ConclusionPanel'
import ReportHeader from '@/components/report/ReportHeader'
import PractitionerForm from '@/components/report/PractitionerForm'
@@ -15,315 +19,155 @@ import Button from '@/components/ui/Button'
import Dialog from '@/components/ui/Dialog'
import { useReportStore } from '@/state/reportStore'
import { writeCachedPractitioner } from '@/state/practitionerCache'
import { getSpecies } from '@/domain/species/registry'
import { loadSvg } from '@/anatomy/svgLoader'
import { parseSvgBones } from '@/anatomy/svgConvention'
import { collectSpineVertebrae, syncSpineZones } from '@/lib/spineZones'
import type { Bone, BoneState } from '@/anatomy/types'
import type { Observation, ObservationZone } from '@/domain/schema/observation'
import type { Report } from '@/domain/schema/report'
import type { SpeciesFindings } from '@/domain/schema/findings'
import type { Practitioner } from '@/domain/schema/practitioner'
import type { Animal, Owner } from '@/domain/schema/animal'
import { useLocaleStore } from '@/state/localeStore'
import { useSheet } from '@/sheets/useSheet'
import { isObservable, pickLabel, type SheetIndex } from '@/services/sheetIndex'
import {
addSides,
collectVertebrae,
decideZoneClick,
ensureZone,
refOf,
removeAllSides,
removeZoneAt,
sidesPresent,
syncVertebrae,
toggleZone,
type ZoneRef,
} from '@/services/zoneInteraction'
import type { ViewStates } from '@/anatomy/drawing'
import { exportReportToPdf } from '@/pdf/export'
import { useT } from '@/i18n/useT'
import { useLocaleStore } from '@/state/localeStore'
import { boneLabel } from '@/anatomy/labels'
import { DEFAULT_SPECIES_ID } from './NewReportRoute'
const DISCLAIMER_FLAG = 'osteo:disclaimer-shown'
/** Merges newly parsed bones into the accumulated map without overwriting. */
function mergeBones(prev: Map<string, Bone>, parsed: Map<string, Bone>) {
const merged = new Map(prev)
parsed.forEach((b, id) => {
if (!merged.has(id)) merged.set(id, b)
})
return merged
interface Identity {
practitioner: Practitioner
animal: Animal
owner: Owner
}
/** Editor on the reference sheet: wires the canvas, the pickers and the store. */
export default function EditorRoute() {
const navigate = useNavigate()
const t = useT()
const locale = useLocaleStore((s) => s.locale)
const report = useReportStore((s) => s.report)
const activeIndex = useReportStore((s) => s.activeObservationIndex)
const addObservation = useReportStore((s) => s.addObservation)
const updateObservation = useReportStore((s) => s.updateObservation)
const removeObservation = useReportStore((s) => s.removeObservation)
const moveObservationUp = useReportStore((s) => s.moveObservationUp)
const moveObservationDown = useReportStore((s) => s.moveObservationDown)
const setActiveObservation = useReportStore((s) => s.setActiveObservation)
const setConclusion = useReportStore((s) => s.setConclusion)
const setRecommendations = useReportStore((s) => s.setRecommendations)
const setNextAppointment = useReportStore((s) => s.setNextAppointment)
const setPractitioner = useReportStore((s) => s.setPractitioner)
const setAnimal = useReportStore((s) => s.setAnimal)
const setOwner = useReportStore((s) => s.setOwner)
const store = useReportStore()
const { report, activeObservationIndex: activeIndex } = store
// Without a report yet (draft restore), the default species' sheet carries the migration map.
const sheet = useSheet(report?.animal.speciesId ?? DEFAULT_SPECIES_ID)
const [bones, setBones] = useState<Map<string, Bone>>(new Map())
const [detailBones, setDetailBones] = useState<Map<string, Bone>>(new Map())
const [findings, setFindings] = useState<SpeciesFindings | null>(null)
const [disclaimer, setDisclaimer] = useState<string | null>(null)
const [detail, setDetail] = useState<{
id: string
src: string
title: string
} | null>(null)
const [detailViewId, setDetailViewId] = useState<string | null>(null)
const [vertebraTarget, setVertebraTarget] = useState<number | null>(null)
const [lateralTarget, setLateralTarget] = useState<{
boneId: string
detailSourceId?: string
} | null>(null)
const [lateralTarget, setLateralTarget] = useState<ZoneRef | null>(null)
const [disclaimer, setDisclaimer] = useState<string | null>(null)
const [exporting, setExporting] = useState(false)
const [editOpen, setEditOpen] = useState(false)
const [editDraft, setEditDraft] = useState<{
practitioner: Practitioner
animal: Animal
owner: Owner
} | null>(null)
function openEditInfos() {
if (!report) return
setEditDraft({
practitioner: report.practitioner,
animal: report.animal,
owner: report.owner,
})
setEditOpen(true)
}
function closeEditInfos() {
setEditOpen(false)
setEditDraft(null)
}
function saveEditInfos() {
if (!editDraft) return closeEditInfos()
const name = editDraft.practitioner.name.trim()
const animalName = editDraft.animal.name.trim()
const ownerName = editDraft.owner.name.trim()
if (!name || !animalName || !ownerName) return
setPractitioner(editDraft.practitioner)
setAnimal(editDraft.animal)
setOwner(editDraft.owner)
writeCachedPractitioner(editDraft.practitioner)
closeEditInfos()
}
function acknowledgeDisclaimer() {
if (typeof sessionStorage !== 'undefined') {
sessionStorage.setItem(DISCLAIMER_FLAG, '1')
}
setDisclaimer(null)
}
useEffect(() => {
if (!report) navigate('/')
}, [report, navigate])
const [editDraft, setEditDraft] = useState<Identity | null>(null)
useEffect(() => {
window.scrollTo({ top: 0, left: 0, behavior: 'auto' })
}, [])
const species = useMemo(
() => (report ? getSpecies(report.animal.speciesId) : undefined),
[report],
)
// No report in memory: restore the per-tab draft once the sheet is known.
useEffect(() => {
if (report) return
if (sheet.status === 'ready')
store.restoreDraft(sheet.index.sheet.migrationMap)
if (sheet.status !== 'loading' && !useReportStore.getState().report)
navigate('/')
}, [report, sheet, store, navigate])
useEffect(() => {
if (!species) return
loadSvg(species.mainSvg).then((root) => setBones(parseSvgBones(root)))
species.findings().then((m) => setFindings(m.default))
// Eagerly preload every detail SVG so observation zones imported
// from a PDF (which can carry detail-popup boneIds without the user
// ever re-opening the popup) resolve their labels and findings
// pickers immediately on mount. Each fetch is independent — a 404
// on one detail asset must not prevent the others from loading.
Object.values(species.details).forEach((path) => {
loadSvg(path)
.then((root) => {
const parsed = parseSvgBones(root)
setDetailBones((prev) => mergeBones(prev, parsed))
})
.catch((err) => {
console.warn(`EditorRoute: failed to preload detail SVG ${path}`, err)
})
})
}, [species])
useEffect(() => {
if (!findings) return
if (typeof sessionStorage === 'undefined') return
if (sheet.status !== 'ready' || typeof sessionStorage === 'undefined')
return
if (sessionStorage.getItem(DISCLAIMER_FLAG)) return
setDisclaimer(findings.scope_disclaimer)
}, [findings])
useEffect(() => {
if (!detail) return
let cancelled = false
loadSvg(detail.src).then((root) => {
if (cancelled) return
const parsed = parseSvgBones(root)
setDetailBones((prev) => mergeBones(prev, parsed))
})
return () => {
cancelled = true
}
}, [detail])
const allBones = useMemo(() => {
const m = new Map(bones)
detailBones.forEach((b, id) => {
if (!m.has(id)) m.set(id, b)
})
return m
}, [bones, detailBones])
const text = sheet.index.sheet.document.scope_disclaimer
setDisclaimer(
pickLabel({ fr: text.fr ?? '', en: text.en ?? '' }, locale) || null,
)
}, [sheet, locale])
const activeObs =
activeIndex >= 0 ? report?.observations[activeIndex] : undefined
const boneStates = useMemo<Map<string, BoneState>>(() => {
const map = new Map<string, BoneState>()
if (!report || activeIndex < 0) return map
const active = report.observations[activeIndex]
if (!active) return map
active.zones.forEach((z) => {
map.set(z.boneId, 'current')
})
const states = useMemo<ViewStates>(() => {
const map = new Map<string, 'current'>()
activeObs?.zones.forEach((z) => map.set(z.annotationId, 'current'))
return map
}, [report, activeIndex])
}, [activeObs])
function onToggleCard(index: number) {
setActiveObservation(activeIndex === index ? -1 : index)
}
/** Opens the detail-popup modal for a bone that carries data-anno-opens-detail. */
function handleDetailOpen(bone: Bone, detailId: string, detailSrc: string) {
setDetail({
id: detailId,
src: detailSrc,
title: boneLabel(bone, locale, detailId),
})
}
/**
* No expanded observation — auto-expand the most recent one (or the
* first if no rows yet) so the click lands somewhere. Defers the actual
* zone add to the next render where activeObs is set.
*/
function activateFallbackObservation(report: Report) {
const fallbackIndex =
report.observations.length > 0 ? report.observations.length - 1 : -1
if (fallbackIndex < 0) return
setActiveObservation(fallbackIndex)
}
/**
* Spine-zone behavior: always open VertebraPicker on click. Adds the
* zone if missing; never toggles it off here (use the ✕ button).
*/
function handleSpineZone(
activeObs: Observation,
boneId: string,
detailSourceId: string | undefined,
existingIndex: number,
) {
let targetIndex = existingIndex
if (existingIndex < 0) {
const newZone: ObservationZone = {
boneId,
...(detailSourceId ? { detailSourceId } : {}),
const onZoneClick = useCallback(
(annotationId: string) => {
// Fresh state: two clicks may land before React re-renders the handler.
const { report, activeObservationIndex: activeIndex } =
useReportStore.getState()
if (sheet.status !== 'ready' || !report) return
const activeObs =
activeIndex >= 0 ? report.observations[activeIndex] : undefined
const index = sheet.index
const annotation = index.annotation(annotationId)
const decision = decideZoneClick(annotation, activeObs)
if (!annotation) return
switch (decision.kind) {
case 'ignore':
return
case 'open_view':
return setDetailViewId(decision.viewId)
case 'activate_fallback':
return store.setActiveObservation(report.observations.length - 1)
case 'open_vertebra_picker': {
const { observation, index: zoneIndex } = ensureZone(
activeObs!,
annotation,
)
store.updateObservation(activeIndex, observation)
return setVertebraTarget(zoneIndex)
}
case 'open_laterality_picker':
return setLateralTarget(refOf(annotation))
case 'remove_both_sides':
return store.updateObservation(
activeIndex,
removeAllSides(activeObs!, refOf(annotation)),
)
case 'toggle':
return store.updateObservation(
activeIndex,
toggleZone(activeObs!, annotation),
)
}
const nextZones = [...activeObs.zones, newZone]
targetIndex = nextZones.length - 1
updateObservation(activeIndex, { ...activeObs, zones: nextZones })
}
setVertebraTarget(targetIndex)
},
[sheet, store],
)
function acknowledgeDisclaimer() {
sessionStorage?.setItem(DISCLAIMER_FLAG, '1')
setDisclaimer(null)
}
/** Bilateral zone: adding a side, or clearing both once left+right are set. */
function handleBilateralZone(
activeObs: Observation,
boneId: string,
detailSourceId: string | undefined,
) {
const sidesPresent = activeObs.zones
.filter(
(z) => z.boneId === boneId && z.detailSourceId === detailSourceId,
)
.map((z) => z.side)
.filter(Boolean) as LateralSide[]
if (sidesPresent.includes('left') && sidesPresent.includes('right')) {
const nextZones = activeObs.zones.filter(
(z) => !(z.boneId === boneId && z.detailSourceId === detailSourceId),
)
updateObservation(activeIndex, { ...activeObs, zones: nextZones })
function saveEditInfos() {
if (!editDraft) return
if (
![
editDraft.practitioner.name,
editDraft.animal.name,
editDraft.owner.name,
].every((v) => v.trim())
)
return
}
setLateralTarget({
boneId,
...(detailSourceId ? { detailSourceId } : {}),
})
store.setPractitioner(editDraft.practitioner)
store.setAnimal(editDraft.animal)
store.setOwner(editDraft.owner)
writeCachedPractitioner(editDraft.practitioner)
setEditDraft(null)
}
/** Plain zone: toggles it on the active observation. */
function toggleZone(
activeObs: Observation,
boneId: string,
detailSourceId: string | undefined,
existingIndex: number,
) {
const newZone: ObservationZone = {
boneId,
...(detailSourceId ? { detailSourceId } : {}),
}
const nextZones =
existingIndex >= 0
? activeObs.zones.filter((_, k) => k !== existingIndex)
: [...activeObs.zones, newZone]
updateObservation(activeIndex, { ...activeObs, zones: nextZones })
}
function onZoneClick(boneId: string, detailSourceId?: string) {
if (!report) return
const bone = bones.get(boneId) ?? detailBones.get(boneId)
if (!bone) return
if (bone.opensDetail && species?.details[bone.opensDetail]) {
handleDetailOpen(bone, bone.opensDetail, species.details[bone.opensDetail])
return
}
if (!activeObs || activeIndex < 0) {
activateFallbackObservation(report)
return
}
const matches = (z: ObservationZone) =>
z.boneId === boneId && z.detailSourceId === detailSourceId
const existingIndex = activeObs.zones.findIndex(matches)
if (bone.special === 'vertebral-precision') {
handleSpineZone(activeObs, boneId, detailSourceId, existingIndex)
return
}
if (bone.lateral === 'bilateral') {
handleBilateralZone(activeObs, boneId, detailSourceId)
return
}
toggleZone(activeObs, boneId, detailSourceId, existingIndex)
}
async function onExport() {
async function onExport(index: SheetIndex) {
if (!report) return
setExporting(true)
try {
const bytes = await exportReportToPdf(report, { locale })
const bytes = await exportReportToPdf(report, index, { locale })
const blob = new Blob([bytes as BlobPart], { type: 'application/pdf' })
const url = URL.createObjectURL(blob)
const a = document.createElement('a')
@@ -339,73 +183,109 @@ export default function EditorRoute() {
}
}
if (!report || !species) return null
if (!report) return null
if (sheet.status === 'loading') {
return (
<p className="p-6 text-sm text-[var(--color-ink-muted)]">
{t('sheet.loading')}
</p>
)
}
if (sheet.status === 'none') return null
const index = sheet.index
const vertebraZone =
vertebraTarget !== null ? activeObs?.zones[vertebraTarget] : undefined
const vertebraAnnotation =
vertebraZone && index.annotation(vertebraZone.annotationId)
const lateralAnnotation =
lateralTarget && index.annotation(lateralTarget.annotationId)
const detailView = detailViewId ? index.view(detailViewId) : undefined
return (
<main className="min-h-screen flex flex-col">
<ReportHeader report={report} onEditInfos={openEditInfos} />
<ReportHeader
report={report}
onEditInfos={() =>
setEditDraft({
practitioner: report.practitioner,
animal: report.animal,
owner: report.owner,
})
}
/>
<div className="flex-1 grid grid-cols-1 lg:grid-cols-[2fr_3fr] gap-4 sm:gap-6 p-4 sm:p-6">
<section className="border border-[var(--color-border)] rounded-2xl bg-[var(--color-surface)] overflow-hidden max-h-[55vh] lg:max-h-none">
<section className="border border-[var(--color-border)] rounded-2xl bg-[var(--color-surface)] overflow-hidden max-h-[55vh] lg:max-h-none flex flex-col">
<AnatomyCanvas
src={species.mainSvg}
boneStates={boneStates}
onZoneClick={(id) => onZoneClick(id)}
index={index}
viewId={index.mainView.id}
states={states}
onZoneClick={onZoneClick}
className="flex-1"
/>
<p
className="px-3 py-1.5 text-xs text-[var(--color-ink-muted)] border-t border-[var(--color-border)]"
data-testid="sheet-status"
>
{t(
index.sheet.status === 'draft'
? 'sheet.status.draft'
: 'sheet.status.published',
)}
</p>
</section>
<section className="space-y-4 sm:space-y-6">
<ObservationList
observations={report.observations}
activeIndex={activeIndex}
onToggle={onToggleCard}
onAdd={addObservation}
onDelete={removeObservation}
onMoveUp={moveObservationUp}
onMoveDown={moveObservationDown}
bones={allBones}
findings={findings}
onChange={(i, next: Observation) => updateObservation(i, next)}
onToggle={(i) =>
store.setActiveObservation(activeIndex === i ? -1 : i)
}
onAdd={store.addObservation}
onDelete={store.removeObservation}
onMoveUp={store.moveObservationUp}
onMoveDown={store.moveObservationDown}
sheet={index}
onChange={store.updateObservation}
onOpenVertebraPicker={(_i, zoneIndex) =>
setVertebraTarget(zoneIndex)
}
onRemoveZone={(i, zoneIndex) => {
const obs = report.observations[i]
if (!obs) return
const zones = obs.zones.filter((_, k) => k !== zoneIndex)
updateObservation(i, { ...obs, zones })
if (obs) store.updateObservation(i, removeZoneAt(obs, zoneIndex))
}}
/>
<ConclusionPanel
conclusion={report.conclusion}
recommendations={report.recommendations}
nextAppointment={report.nextAppointment}
onChangeConclusion={setConclusion}
onChangeRecommendations={setRecommendations}
onChangeNextAppointment={setNextAppointment}
onChangeConclusion={store.setConclusion}
onChangeRecommendations={store.setRecommendations}
onChangeNextAppointment={store.setNextAppointment}
/>
<div className="flex justify-end">
<Button onClick={onExport} disabled={exporting}>
<Button onClick={() => onExport(index)} disabled={exporting}>
{exporting ? t('editor.exporting') : t('editor.export')}
</Button>
</div>
</section>
</div>
{detail && (
{detailView && (
<DetailModal
open
onClose={() => setDetail(null)}
detailSrc={detail.src}
detailId={detail.id}
title={`${t('editor.detail_title_prefix')}${detail.title}`}
boneStates={boneStates}
onZoneClick={(id, did) => onZoneClick(id, did)}
onClose={() => setDetailViewId(null)}
index={index}
viewId={detailView.id}
title={pickLabel(detailView.name, locale)}
states={states}
onZoneClick={onZoneClick}
/>
)}
{editDraft && (
<Dialog
open={editOpen}
onClose={closeEditInfos}
open
onClose={() => setEditDraft(null)}
title={t('editor.edit_dialog_title')}
size="lg"
>
@@ -419,6 +299,9 @@ export default function EditorRoute() {
<AnimalForm
animal={editDraft.animal}
owner={editDraft.owner}
species={[
{ id: index.sheet.speciesId, name: index.sheet.document.name },
]}
onChangeAnimal={(next) =>
setEditDraft((d) => (d ? { ...d, animal: next } : d))
}
@@ -427,15 +310,17 @@ export default function EditorRoute() {
}
/>
<div className="flex gap-3 justify-end pt-2 border-t border-[var(--color-border)]">
<Button variant="ghost" onClick={closeEditInfos}>
<Button variant="ghost" onClick={() => setEditDraft(null)}>
{t('common.cancel')}
</Button>
<Button
onClick={saveEditInfos}
disabled={
!editDraft.practitioner.name.trim() ||
!editDraft.animal.name.trim() ||
!editDraft.owner.name.trim()
![
editDraft.practitioner.name,
editDraft.animal.name,
editDraft.owner.name,
].every((v) => v.trim())
}
>
{t('common.save')}
@@ -455,7 +340,9 @@ export default function EditorRoute() {
<div className="space-y-4">
<p className="text-sm text-[var(--color-ink)]">{disclaimer}</p>
<div className="flex justify-end">
<Button onClick={acknowledgeDisclaimer}>{t('common.understood')}</Button>
<Button onClick={acknowledgeDisclaimer}>
{t('common.understood')}
</Button>
</div>
</div>
</Dialog>
@@ -463,86 +350,45 @@ export default function EditorRoute() {
{vertebraTarget !== null &&
activeObs &&
activeObs.zones[vertebraTarget] && (
vertebraZone &&
isObservable(vertebraAnnotation) && (
<VertebraPicker
open
onClose={() => setVertebraTarget(null)}
onConfirm={(vertebrae) => {
const fresh =
useReportStore.getState().report?.observations[activeIndex]
if (!fresh?.zones[vertebraTarget]) {
setVertebraTarget(null)
return
if (fresh) {
store.updateObservation(
activeIndex,
syncVertebrae(fresh, vertebrae, index, vertebraZone.viewId),
)
}
// Picker edits every region at once: reconcile all spine zones —
// spawn newly picked regions, prune emptied ones, keep the rest.
const next = syncSpineZones(fresh.zones, vertebrae, bones)
updateObservation(activeIndex, { ...fresh, zones: next })
setVertebraTarget(null)
}}
initial={collectSpineVertebrae(
activeObs.zones,
bones,
activeObs.zones[vertebraTarget].boneId,
)}
formula={species.vertebralFormula}
title={`${t('vertebra.title_prefix')}${boneLabel(
bones.get(activeObs.zones[vertebraTarget].boneId),
locale,
'',
)}`}
initialRegion={(() => {
const b = bones.get(activeObs.zones[vertebraTarget].boneId)
return regionFromLabel(b?.fr ?? '') ?? regionFromLabel(b?.en ?? '')
})()}
initial={collectVertebrae(activeObs, index, vertebraTarget)}
regions={index.regions()}
title={`${t('vertebra.title_prefix')}${pickLabel(vertebraAnnotation.name, locale)}`}
initialRegion={
vertebraAnnotation.vertebral_region_code ?? undefined
}
/>
)}
{lateralTarget && activeObs && (
{lateralTarget && activeObs && lateralAnnotation && (
<LateralityPicker
open
onClose={() => setLateralTarget(null)}
title={boneLabel(
allBones.get(lateralTarget.boneId),
locale,
lateralTarget.boneId,
)}
existingSides={
activeObs.zones
.filter(
(z) =>
z.boneId === lateralTarget.boneId &&
z.detailSourceId === lateralTarget.detailSourceId &&
z.side,
)
.map((z) => z.side!) as LateralSide[]
}
onSelect={(sides) => {
title={pickLabel(index.name(lateralAnnotation), locale)}
existingSides={sidesPresent(activeObs, lateralTarget)}
onSelect={(sides: LateralSide[]) => {
const fresh =
useReportStore.getState().report?.observations[activeIndex]
if (!fresh) {
setLateralTarget(null)
return
}
const newSideZones = sides
.filter(
(side) =>
!fresh.zones.some(
(z) =>
z.boneId === lateralTarget.boneId &&
z.detailSourceId === lateralTarget.detailSourceId &&
z.side === side,
),
if (fresh)
store.updateObservation(
activeIndex,
addSides(fresh, lateralAnnotation, sides),
)
.map((side) => ({
boneId: lateralTarget.boneId,
...(lateralTarget.detailSourceId
? { detailSourceId: lateralTarget.detailSourceId }
: {}),
side,
}))
const nextZones = [...fresh.zones, ...newSideZones]
updateObservation(activeIndex, { ...fresh, zones: nextZones })
setLateralTarget(null)
}}
/>
-42
View File
@@ -1,42 +0,0 @@
import { Link } from 'react-router-dom'
import AppHeader from '@/components/brand/AppHeader'
import Card from '@/components/ui/Card'
import { useT } from '@/i18n/useT'
export default function EditorsRoute() {
const t = useT()
return (
<main className="flex-1 flex flex-col">
<AppHeader />
<section className="flex-1 grid place-items-center px-4 sm:px-6">
<div className="grid gap-4 md:grid-cols-2 max-w-3xl w-full">
<Card className="p-4 sm:p-6 space-y-3 sm:space-y-4">
<h2 className="font-serif text-xl sm:text-2xl">{t('editors.svg.title')}</h2>
<p className="text-sm text-[var(--color-ink-muted)]">
{t('editors.svg.description')}
</p>
<Link
to="/svg-editor"
className="inline-block rounded-lg bg-[var(--color-accent)] px-5 py-2 text-sm font-medium text-white hover:bg-[var(--color-accent-strong)] transition-colors"
>
{t('editors.svg.cta')}
</Link>
</Card>
<Card className="p-4 sm:p-6 space-y-3 sm:space-y-4">
<h2 className="font-serif text-xl sm:text-2xl">{t('editors.pathology.title')}</h2>
<p className="text-sm text-[var(--color-ink-muted)]">
{t('editors.pathology.description')}
</p>
<a
href="/pathology-editor.html"
className="inline-block rounded-lg bg-[var(--color-accent)] px-5 py-2 text-sm font-medium text-white hover:bg-[var(--color-accent-strong)] transition-colors"
>
{t('editors.pathology.cta')}
</a>
</Card>
</div>
</section>
</main>
)
}
+64 -10
View File
@@ -5,25 +5,42 @@ import Button from '@/components/ui/Button'
import Card from '@/components/ui/Card'
import { importReportFromPdf, ImportError } from '@/pdf/import'
import { useReportStore } from '@/state/reportStore'
import { useSheet } from '@/sheets/useSheet'
import { DEFAULT_SPECIES_ID } from './NewReportRoute'
import { useT } from '@/i18n/useT'
export default function HomeRoute() {
const navigate = useNavigate()
const fileRef = useRef<HTMLInputElement | null>(null)
const hydrate = useReportStore((s) => s.hydrateReport)
const sheet = useSheet(DEFAULT_SPECIES_ID)
const [error, setError] = useState<string | null>(null)
const [busy, setBusy] = useState(false)
const t = useT()
async function onPickFile(e: React.ChangeEvent<HTMLInputElement>) {
const file = e.target.files?.[0]
if (!file) return
if (!file || sheet.status !== 'ready') return
setBusy(true)
setError(null)
try {
const bytes = new Uint8Array(await file.arrayBuffer())
const report = await importReportFromPdf(bytes)
hydrate(report)
const outcome = await importReportFromPdf(
bytes,
sheet.index.sheet.migrationMap,
)
if (
outcome.migrated &&
outcome.unresolvedFindings + outcome.unresolvedZones > 0
) {
window.alert(
t('home.import.migrated').replace(
'{count}',
String(outcome.unresolvedFindings + outcome.unresolvedZones),
),
)
}
hydrate(outcome.report)
navigate('/editor')
} catch (err) {
if (err instanceof ImportError) {
@@ -48,21 +65,58 @@ export default function HomeRoute() {
}
}
const noSheet = sheet.status === 'none'
return (
<main className="flex-1 flex flex-col">
<AppHeader />
<section className="flex-1 grid place-items-center px-4 sm:px-6">
<div className="grid gap-4 md:grid-cols-2 max-w-3xl w-full">
{noSheet && (
<Card className="p-4 sm:p-6 space-y-2 md:col-span-2">
<h2 className="font-serif text-xl sm:text-2xl">
{t('home.no_sheet.title')}
</h2>
<p className="text-sm text-red-700">
{t('home.no_sheet.description')}
</p>
</Card>
)}
<Card className="p-4 sm:p-6 space-y-3 sm:space-y-4">
<h2 className="font-serif text-xl sm:text-2xl">{t('home.new_report.title')}</h2>
<p className="text-sm text-[var(--color-ink-muted)]">{t('home.new_report.description')}</p>
<Button onClick={() => navigate('/new')} size="lg">{t('home.new_report.cta')}</Button>
<h2 className="font-serif text-xl sm:text-2xl">
{t('home.new_report.title')}
</h2>
<p className="text-sm text-[var(--color-ink-muted)]">
{t('home.new_report.description')}
</p>
<Button
onClick={() => navigate('/new')}
size="lg"
disabled={noSheet}
>
{t('home.new_report.cta')}
</Button>
</Card>
<Card className="p-4 sm:p-6 space-y-3 sm:space-y-4">
<h2 className="font-serif text-xl sm:text-2xl">{t('home.import.title')}</h2>
<p className="text-sm text-[var(--color-ink-muted)]">{t('home.import.description')}</p>
<input ref={fileRef} type="file" accept="application/pdf,.pdf" className="hidden" onChange={onPickFile} />
<Button variant="secondary" size="lg" onClick={() => fileRef.current?.click()} disabled={busy}>
<h2 className="font-serif text-xl sm:text-2xl">
{t('home.import.title')}
</h2>
<p className="text-sm text-[var(--color-ink-muted)]">
{t('home.import.description')}
</p>
<input
ref={fileRef}
type="file"
accept="application/pdf,.pdf"
className="hidden"
onChange={onPickFile}
/>
<Button
variant="secondary"
size="lg"
onClick={() => fileRef.current?.click()}
disabled={busy || sheet.status !== 'ready'}
>
{busy ? t('home.import.loading') : t('home.import.cta')}
</Button>
{error && <p className="text-sm text-red-700">{error}</p>}
+75 -20
View File
@@ -1,5 +1,6 @@
import { useEffect, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import type { Animal, Owner, Practitioner } from '@faunosteo/domain'
import PractitionerForm from '@/components/report/PractitionerForm'
import AnimalForm from '@/components/report/AnimalForm'
import AppHeader from '@/components/brand/AppHeader'
@@ -7,18 +8,29 @@ import Button from '@/components/ui/Button'
import Input from '@/components/ui/Input'
import Label from '@/components/ui/Label'
import { todayIso } from '@/lib/dates'
import { readCachedPractitioner, writeCachedPractitioner } from '@/state/practitionerCache'
import {
readCachedPractitioner,
writeCachedPractitioner,
} from '@/state/practitionerCache'
import { useReportStore } from '@/state/reportStore'
import { useSheet } from '@/sheets/useSheet'
import { useT } from '@/i18n/useT'
/** The one species this build ships a sheet for. */
export const DEFAULT_SPECIES_ID = 'equine'
export default function NewReportRoute() {
const navigate = useNavigate()
const initReport = useReportStore((s) => s.initReport)
const t = useT()
const sheet = useSheet(DEFAULT_SPECIES_ID)
const [practitioner, setPractitioner] = useState({ name: '' })
const [animal, setAnimal] = useState({ speciesId: 'equine', name: '' })
const [owner, setOwner] = useState({ name: '' })
const [practitioner, setPractitioner] = useState<Practitioner>({ name: '' })
const [animal, setAnimal] = useState<Animal>({
speciesId: DEFAULT_SPECIES_ID,
name: '',
})
const [owner, setOwner] = useState<Owner>({ name: '' })
const [date, setDate] = useState(todayIso())
useEffect(() => {
@@ -26,20 +38,27 @@ export default function NewReportRoute() {
if (cached) setPractitioner(cached)
}, [])
const canSubmit = practitioner.name.trim() && animal.name.trim() && owner.name.trim()
const canSubmit =
practitioner.name.trim() &&
animal.name.trim() &&
owner.name.trim() &&
sheet.status === 'ready'
function submit() {
if (!canSubmit) return
if (!canSubmit || sheet.status !== 'ready') return
writeCachedPractitioner(practitioner)
initReport({
date,
practitioner,
animal,
owner,
observations: [],
conclusion: '',
recommendations: '',
})
initReport(
{
date,
practitioner,
animal,
owner,
observations: [],
conclusion: '',
recommendations: '',
},
sheet.index.sheet.ref,
)
navigate('/editor')
}
@@ -47,16 +66,52 @@ export default function NewReportRoute() {
<main className="min-h-screen">
<AppHeader />
<div className="max-w-3xl mx-auto px-4 sm:px-6 py-6 sm:py-8 space-y-6 sm:space-y-8">
<h1 className="font-serif text-2xl sm:text-3xl">{t('new_report.title')}</h1>
<h1 className="font-serif text-2xl sm:text-3xl">
{t('new_report.title')}
</h1>
{sheet.status === 'none' && (
<p className="text-sm text-red-700">
{t('home.no_sheet.description')}
</p>
)}
<div>
<Label htmlFor="date">{t('new_report.date_label')}</Label>
<Input id="date" type="date" value={date} onChange={(e) => setDate(e.target.value)} />
<Input
id="date"
type="date"
value={date}
onChange={(e) => setDate(e.target.value)}
/>
</div>
<PractitionerForm value={practitioner} onChange={setPractitioner} />
<AnimalForm animal={animal} owner={owner} onChangeAnimal={setAnimal} onChangeOwner={setOwner} />
<AnimalForm
animal={animal}
owner={owner}
species={
sheet.status === 'ready'
? [
{
id: sheet.index.sheet.speciesId,
name: sheet.index.sheet.document.name,
},
]
: [
{
id: DEFAULT_SPECIES_ID,
name: { fr: 'Cheval', en: 'Horse' },
},
]
}
onChangeAnimal={setAnimal}
onChangeOwner={setOwner}
/>
<div className="flex gap-3 justify-end">
<Button variant="ghost" onClick={() => navigate('/')}>{t('common.cancel')}</Button>
<Button disabled={!canSubmit} onClick={submit}>{t('new_report.submit')}</Button>
<Button variant="ghost" onClick={() => navigate('/')}>
{t('common.cancel')}
</Button>
<Button disabled={!canSubmit} onClick={submit}>
{t('new_report.submit')}
</Button>
</div>
</div>
</main>
+6 -2
View File
@@ -9,8 +9,12 @@ export default function NotFoundRoute() {
<main className="min-h-screen grid place-items-center">
<div className="text-center space-y-4">
<h1 className="font-serif text-4xl">{t('not_found.title')}</h1>
<p className="text-[var(--color-ink-muted)]">{t('not_found.description')}</p>
<Button onClick={() => navigate('/')}>{t('common.back_to_home')}</Button>
<p className="text-[var(--color-ink-muted)]">
{t('not_found.description')}
</p>
<Button onClick={() => navigate('/')}>
{t('common.back_to_home')}
</Button>
</div>
</main>
)
File diff suppressed because it is too large. Load diff
+1 -9
View File
@@ -1,4 +1,3 @@
import { Link } from 'react-router-dom'
import { useConfig } from '@/app/providers/ConfigProvider'
import { useT } from '@/i18n/useT'
@@ -9,14 +8,7 @@ export default function Footer() {
return (
<footer className="mt-8 sm:mt-12 border-t border-neutral-200 bg-neutral-50 py-4 sm:py-6 text-center text-xs sm:text-sm text-neutral-600">
<p className="mb-3">
© {year} {cfg.footerName}. {t('footer.all_rights_reserved')}{' '}
<span className="text-neutral-300">·</span>{' '}
<Link
to="/editors"
className="text-[var(--color-accent)] hover:text-[var(--color-accent-strong)] transition-colors"
>
{t('footer.editors')}
</Link>
© {year} {cfg.footerName}. {t('footer.all_rights_reserved')}
</p>
<div className="flex flex-wrap items-center justify-center gap-2 sm:gap-4">
<span className="flex items-center gap-2">
@@ -1,77 +1,83 @@
import { useCallback, useEffect, useRef, useState } from 'react'
import { loadSvg } from '@/anatomy/svgLoader'
import {
getBoneIdFromEvent,
getAnnotatedElement,
} from '@/anatomy/svgConvention'
import type { BoneState } from '@/anatomy/types'
import { useCallback, useEffect, useRef } from 'react'
import { buildViewSvg, type ViewStates } from '@/anatomy/drawing'
import type { SheetIndex } from '@/services/sheetIndex'
import { useLocaleStore } from '@/state/localeStore'
import { pickLocaleLabel } from '@/i18n/pickLocaleLabel'
export interface AnatomyCanvasProps {
src: string
boneStates: Map<string, BoneState>
onZoneClick: (boneId: string) => void
index: SheetIndex
viewId: string
states: ViewStates
onZoneClick: (annotationId: string, viewId: string) => void
className?: string
}
const ANNOTATED = '[data-anno-id]'
function annotatedTarget(event: Event): Element | null {
const target = event.target
return target instanceof Element ? target.closest(ANNOTATED) : null
}
/**
* One view of the sheet: the drawing plus the annotation layer generated
* from the document, rebuilt when the view changes and restyled in place
* when the selection changes. Clicks are delegated on `data-anno-id`.
*/
export default function AnatomyCanvas({
src,
boneStates,
index,
viewId,
states,
onZoneClick,
className = '',
}: AnatomyCanvasProps) {
const wrapperRef = useRef<HTMLDivElement | null>(null)
const svgRef = useRef<HTMLDivElement | null>(null)
const tooltipRef = useRef<HTMLDivElement | null>(null)
const [loadedSrc, setLoadedSrc] = useState<string | null>(null)
const locale = useLocaleStore((s) => s.locale)
useEffect(() => {
let cancelled = false
const c = svgRef.current
if (!c) return
c.replaceChildren()
setLoadedSrc(null)
loadSvg(src).then((root) => {
if (cancelled || !c) return
c.appendChild(root)
setLoadedSrc(src)
})
return () => { cancelled = true }
}, [src])
const host = svgRef.current
if (!host) return
host.replaceChildren(buildViewSvg(index, viewId, states))
// States are applied by the effect below; the build only needs the view.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [index, viewId])
useEffect(() => {
const c = svgRef.current
if (!c) return
const onClick = (e: Event) => {
const id = getBoneIdFromEvent(e)
if (id) onZoneClick(id)
}
c.addEventListener('click', onClick)
return () => c.removeEventListener('click', onClick)
}, [onZoneClick])
useEffect(() => {
const c = svgRef.current
if (!c || loadedSrc !== src) return
const all = c.querySelectorAll<Element>('[data-anno-id]')
all.forEach((el) => {
const id = el.getAttribute('data-anno-id') as string
const state = boneStates.get(id)
if (state && state !== 'default') el.setAttribute('data-state', state)
const host = svgRef.current
if (!host) return
host.querySelectorAll<Element>(ANNOTATED).forEach((el) => {
const state = states.get(el.getAttribute('data-anno-id') ?? '')
if (state) el.setAttribute('data-state', state)
else el.removeAttribute('data-state')
})
}, [boneStates, loadedSrc, src])
}, [states, index, viewId])
useEffect(() => {
const host = svgRef.current
if (!host) return
const onClick = (e: Event) => {
const id = annotatedTarget(e)?.getAttribute('data-anno-id')
if (id) onZoneClick(id, viewId)
}
host.addEventListener('click', onClick)
return () => host.removeEventListener('click', onClick)
}, [onZoneClick, viewId])
const showTooltip = useCallback(
(el: Element, x: number, y: number) => {
const tip = tooltipRef.current
if (!tip) return
const fr = el.getAttribute('data-anno-name-fr') ?? ''
const en = el.getAttribute('data-anno-name-en') ?? ''
const label = pickLocaleLabel(fr, en, locale)
if (!label) { tip.style.opacity = '0'; return }
const label = pickLocaleLabel(
el.getAttribute('data-anno-name-fr') ?? '',
el.getAttribute('data-anno-name-en') ?? '',
locale,
)
if (!label) {
tip.style.opacity = '0'
return
}
tip.textContent = label
tip.style.opacity = '1'
tip.style.left = `${x + 12}px`
@@ -80,46 +86,40 @@ export default function AnatomyCanvas({
[locale],
)
const hideTooltip = useCallback(() => {
const tip = tooltipRef.current
if (tip) tip.style.opacity = '0'
}, [])
useEffect(() => {
const c = svgRef.current
if (!c || loadedSrc !== src) return
const host = svgRef.current
if (!host) return
const hide = () => {
if (tooltipRef.current) tooltipRef.current.style.opacity = '0'
}
const onMove = (e: MouseEvent) => {
const el = getAnnotatedElement(e)
if (el && !el.hasAttribute('data-anno-opens-detail')) {
const w = wrapperRef.current
if (!w) return
const rect = w.getBoundingClientRect()
showTooltip(el, e.clientX - rect.left, e.clientY - rect.top)
} else {
hideTooltip()
}
const el = annotatedTarget(e)
const wrapper = wrapperRef.current
if (!el || !wrapper || el.hasAttribute('data-anno-opens-view'))
return hide()
const rect = wrapper.getBoundingClientRect()
showTooltip(el, e.clientX - rect.left, e.clientY - rect.top)
}
const onLeave = () => hideTooltip()
c.addEventListener('mousemove', onMove)
c.addEventListener('mouseleave', onLeave)
host.addEventListener('mousemove', onMove)
host.addEventListener('mouseleave', hide)
return () => {
c.removeEventListener('mousemove', onMove)
c.removeEventListener('mouseleave', onLeave)
host.removeEventListener('mousemove', onMove)
host.removeEventListener('mouseleave', hide)
}
}, [loadedSrc, src, showTooltip, hideTooltip])
}, [showTooltip])
return (
<div
data-testid="anatomy-canvas"
data-view-id={viewId}
ref={wrapperRef}
className={`svg-canvas relative w-full h-full ${className}`}
>
<div ref={svgRef} className="w-full h-full [&>svg]:max-w-full [&>svg]:max-h-full [&>svg]:mx-auto" />
<div
ref={tooltipRef}
className="zone-tooltip"
style={{ opacity: 0 }}
ref={svgRef}
className="w-full h-full [&>svg]:max-w-full [&>svg]:max-h-full [&>svg]:mx-auto"
/>
<div ref={tooltipRef} className="zone-tooltip" style={{ opacity: 0 }} />
</div>
)
}
+14 -11
View File
@@ -1,25 +1,27 @@
import Dialog from '@/components/ui/Dialog'
import AnatomyCanvas from './AnatomyCanvas'
import type { BoneState } from '@/anatomy/types'
import type { ViewStates } from '@/anatomy/drawing'
import type { SheetIndex } from '@/services/sheetIndex'
import { useT } from '@/i18n/useT'
export interface DetailModalProps {
open: boolean
onClose: () => void
detailSrc: string
detailId: string
index: SheetIndex
viewId: string
title: string
boneStates: Map<string, BoneState>
onZoneClick: (boneId: string, detailId: string) => void
states: ViewStates
onZoneClick: (annotationId: string, viewId: string) => void
}
/** A detail view of the sheet (a crop or its own drawing) in a dialog. */
export default function DetailModal({
open,
onClose,
detailSrc,
detailId,
index,
viewId,
title,
boneStates,
states,
onZoneClick,
}: DetailModalProps) {
const t = useT()
@@ -27,9 +29,10 @@ export default function DetailModal({
<Dialog open={open} onClose={onClose} title={title} size="xl">
<div className="aspect-[4/3] w-full">
<AnatomyCanvas
src={detailSrc}
boneStates={boneStates}
onZoneClick={(id) => onZoneClick(id, detailId)}
index={index}
viewId={viewId}
states={states}
onZoneClick={onZoneClick}
/>
</div>
<p className="mt-4 text-sm text-[var(--color-ink-muted)]">
@@ -1,75 +1,84 @@
import { useMemo, useState } from 'react'
import { motion } from 'motion/react'
import type {
Finding,
FindingCategory,
FindingNode,
ZoneFindings,
} from '@/domain/schema/findings'
import type { Finding, LateralSide } from '@/domain/schema/observation'
FindingZone,
LateralSide,
LocalizedOptionalText,
} from '@faunosteo/domain'
import Button from '@/components/ui/Button'
import { pickLabel } from '@/services/sheetIndex'
import { useT } from '@/i18n/useT'
import { useLocaleStore } from '@/state/localeStore'
import type { Locale } from '@/i18n/types'
const levelVariants = {
enter: (dir: 1 | -1) => ({ opacity: 0, x: dir * 32 }),
center: { opacity: 1, x: 0 },
}
type TreeNode = FindingCategory | FindingNode
export interface FindingsTreePickerProps {
zoneId: string
tree: ZoneFindings
zone: FindingZone
side?: LateralSide
selected: Finding[]
onChange: (next: Finding[]) => void
}
function isLeaf(node: FindingNode): boolean {
return !node.children || node.children.length === 0
function isLeaf(node: TreeNode): boolean {
return node.children.length === 0
}
function samePath(a: string[], b: string[]): boolean {
if (a.length !== b.length) return false
for (let i = 0; i < a.length; i += 1) {
if (a[i] !== b[i]) return false
}
return true
function samePath(a: readonly string[], b: readonly string[]): boolean {
return a.length === b.length && a.every((seg, i) => seg === b[i])
}
function pathStartsWith(full: string[], prefix: string[]): boolean {
if (full.length < prefix.length) return false
for (let i = 0; i < prefix.length; i += 1) {
if (full[i] !== prefix[i]) return false
}
return true
function pathStartsWith(
full: readonly string[],
prefix: readonly string[],
): boolean {
return (
full.length >= prefix.length && prefix.every((seg, i) => full[i] === seg)
)
}
function findNode(
categories: FindingNode[],
path: string[],
): FindingNode | undefined {
let nodes: FindingNode[] = categories
let node: FindingNode | undefined
categories: readonly FindingCategory[],
path: readonly string[],
): TreeNode | undefined {
let nodes: readonly TreeNode[] = categories
let node: TreeNode | undefined
for (const segment of path) {
node = nodes.find((n) => n.id === segment)
if (!node) return undefined
nodes = node.children ?? []
nodes = node.children
}
return node
}
function descriptionOf(node: TreeNode, locale: Locale): string | undefined {
const text: LocalizedOptionalText | undefined = node.description
if (!text) return undefined
return (
(locale === 'en' ? text.en || text.fr : text.fr || text.en) || undefined
)
}
/**
* Drill-down picker over one finding zone of the sheet. A finding is keyed
* by `(findingZoneId, path, side)`; labels are snapshotted at selection.
*/
export default function FindingsTreePicker({
zoneId,
tree,
zone,
side,
selected,
onChange,
}: FindingsTreePickerProps) {
const t = useT()
const locale = useLocaleStore((s) => s.locale)
const nameOf = (node: { name_fr: string; name_en: string }) =>
locale === 'en' ? node.name_en : node.name_fr
const descOf = (node: { description_fr?: string; description_en?: string }) =>
locale === 'en' ? node.description_en : node.description_fr
const [path, setPath] = useState<string[]>([])
const [direction, setDirection] = useState<1 | -1>(1)
@@ -86,74 +95,57 @@ export default function FindingsTreePicker({
setPath(path.slice(0, depth))
}
const currentNodes = useMemo<FindingNode[]>(() => {
if (path.length === 0) return tree.categories
const node = findNode(tree.categories, path)
return node?.children ?? []
}, [tree, path])
const currentNodes = useMemo<readonly TreeNode[]>(() => {
if (path.length === 0) return zone.categories
return findNode(zone.categories, path)?.children ?? []
}, [zone, path])
const focusedNode = useMemo(
() => (path.length === 0 ? undefined : findNode(tree.categories, path)),
[tree, path],
() => (path.length === 0 ? undefined : findNode(zone.categories, path)),
[zone, path],
)
const breadcrumb = useMemo<{ label: string; depth: number }[]>(() => {
const pick = (z: { name_fr: string; name_en: string }) =>
locale === 'en' ? z.name_en : z.name_fr
const crumbs: { label: string; depth: number }[] = [
{ label: pick(tree), depth: 0 },
]
let nodes: FindingNode[] = tree.categories
const crumbs = [{ label: pickLabel(zone.name, locale), depth: 0 }]
let nodes: readonly TreeNode[] = zone.categories
path.forEach((seg, i) => {
const n = nodes.find((x) => x.id === seg)
if (n) {
crumbs.push({ label: pick(n), depth: i + 1 })
nodes = n.children ?? []
crumbs.push({ label: pickLabel(n.name, locale), depth: i + 1 })
nodes = n.children
}
})
return crumbs
}, [tree, path, locale])
}, [zone, path, locale])
function matchesSide(f: Finding): boolean {
return f.zoneId === zoneId && f.side === side
}
const matches = (f: Finding) => f.findingZoneId === zone.id && f.side === side
const isLeafSelected = (leafPath: string[]) =>
selected.some((f) => matches(f) && samePath(f.path, leafPath))
const countSelectedUnder = (nodePath: string[]) =>
selected.filter((f) => matches(f) && pathStartsWith(f.path, nodePath))
.length
function isLeafSelected(leafPath: string[]): boolean {
return selected.some(
(f) => matchesSide(f) && samePath(f.path, leafPath),
)
}
function countSelectedUnder(nodePath: string[]): number {
let n = 0
for (const f of selected) {
if (!matchesSide(f)) continue
if (!pathStartsWith(f.path, nodePath)) continue
n += 1
}
return n
}
function toggleLeaf(leafPath: string[], leaf: FindingNode) {
function toggleLeaf(leafPath: string[], leaf: TreeNode) {
if (isLeafSelected(leafPath)) {
onChange(
selected.filter(
(f) => !(matchesSide(f) && samePath(f.path, leafPath)),
),
selected.filter((f) => !(matches(f) && samePath(f.path, leafPath))),
)
return
}
const next: Finding = {
zoneId,
findingZoneId: zone.id,
path: leafPath,
labelFrSnapshot: leaf.name_fr,
labelEnSnapshot: leaf.name_en,
labelFrSnapshot: leaf.name.fr,
labelEnSnapshot: leaf.name.en,
}
if (leaf.requires_vet_referral) next.requiresVetReferral = true
if ('requires_vet_referral' in leaf && leaf.requires_vet_referral)
next.requiresVetReferral = true
if (side) next.side = side
onChange([...selected, next])
}
const focusedDescription = focusedNode && descriptionOf(focusedNode, locale)
return (
<div className="space-y-2">
<div className="flex flex-wrap items-center gap-1 text-xs text-[var(--color-ink-muted)]">
@@ -179,9 +171,9 @@ export default function FindingsTreePicker({
})}
</div>
{focusedNode && descOf(focusedNode) && (
{focusedDescription && (
<p className="text-xs italic text-[var(--color-ink-muted)]">
{descOf(focusedNode)}
{focusedDescription}
</p>
)}
@@ -196,16 +188,16 @@ export default function FindingsTreePicker({
</Button>
)}
<motion.ul
key={path.join('/') || '__root__'}
custom={direction}
variants={levelVariants}
initial="enter"
animate="center"
transition={{ duration: 0.22, ease: 'easeOut' }}
style={{ willChange: 'transform, opacity' }}
className="space-y-1.5 max-h-64 overflow-auto pr-1"
>
<motion.ul
key={path.join('/') || '__root__'}
custom={direction}
variants={levelVariants}
initial="enter"
animate="center"
transition={{ duration: 0.22, ease: 'easeOut' }}
style={{ willChange: 'transform, opacity' }}
className="space-y-1.5 max-h-64 overflow-auto pr-1"
>
{currentNodes.length === 0 ? (
<li className="text-sm text-[var(--color-ink-muted)]">
{t('findings.no_options')}
@@ -213,16 +205,17 @@ export default function FindingsTreePicker({
) : (
currentNodes.map((node) => {
const nodePath = [...path, node.id]
const nodeLabel = pickLabel(node.name, locale)
const nodeDesc = descriptionOf(node, locale)
if (isLeaf(node)) {
const checked = isLeafSelected(nodePath)
const nodeLabel = nameOf(node)
const nodeDesc = descOf(node)
const vet =
'requires_vet_referral' in node && node.requires_vet_referral
return (
<li key={node.id}>
<label className="flex items-start gap-2 cursor-pointer">
<input
type="checkbox"
checked={checked}
checked={isLeafSelected(nodePath)}
onChange={() => toggleLeaf(nodePath, node)}
className="mt-1 accent-[var(--color-accent)]"
aria-label={nodeLabel}
@@ -232,7 +225,7 @@ export default function FindingsTreePicker({
<span className="text-sm font-medium text-[var(--color-ink)]">
{nodeLabel}
</span>
{node.requires_vet_referral && (
{vet && (
<span
title={t('findings.vet_referral')}
aria-label={t('findings.vet_referral')}
@@ -253,7 +246,6 @@ export default function FindingsTreePicker({
)
}
const selectedCount = countSelectedUnder(nodePath)
const nodeLabel = nameOf(node)
const selectedAria = `${selectedCount} ${
selectedCount > 1
? t('findings.selected_plural')
@@ -278,7 +270,10 @@ export default function FindingsTreePicker({
</span>
)}
</span>
<span aria-hidden="true" className="text-[var(--color-ink-muted)]">
<span
aria-hidden="true"
className="text-[var(--color-ink-muted)]"
>
›
</span>
</button>
@@ -286,7 +281,7 @@ export default function FindingsTreePicker({
)
})
)}
</motion.ul>
</motion.ul>
</div>
)
}
@@ -1,6 +1,6 @@
import Dialog from '@/components/ui/Dialog'
import Button from '@/components/ui/Button'
import type { LateralSide } from '@/domain/schema/observation'
import type { LateralSide } from '@faunosteo/domain'
import { useT } from '@/i18n/useT'
export interface LateralityPickerProps {
@@ -1,16 +1,11 @@
import { useMemo, useState } from 'react'
import type {
Observation,
ObservationZone,
Vertebra,
Finding,
FindingZone,
LateralSide,
} from '@/domain/schema/observation'
import type {
SpeciesFindings,
ZoneFindings,
} from '@/domain/schema/findings'
import type { Bone } from '@/anatomy/types'
import { matchZoneFindings } from '@/lib/zoneMatch'
Observation,
ReportZone,
} from '@faunosteo/domain'
import { AnimatePresence, motion } from 'motion/react'
import Card from '@/components/ui/Card'
import Badge from '@/components/ui/Badge'
@@ -20,9 +15,9 @@ import Textarea from '@/components/ui/Textarea'
import FindingsTreePicker from './FindingsTreePicker'
import FreeTextFindingInput from './FreeTextFindingInput'
import SeveritySelector from './SeveritySelector'
import { isObservable, pickLabel, type SheetIndex } from '@/services/sheetIndex'
import { useT } from '@/i18n/useT'
import { useLocaleStore } from '@/state/localeStore'
import { boneLabel } from '@/anatomy/labels'
import type { Locale } from '@/i18n/types'
export interface ObservationCardProps {
@@ -36,35 +31,75 @@ export interface ObservationCardProps {
canMoveUp: boolean
canMoveDown: boolean
// Editor body props (used only when expanded)
bones: Map<string, Bone>
findings: SpeciesFindings | null
sheet: SheetIndex
onChange: (next: Observation) => void
onOpenVertebraPicker: (zoneIndex: number) => void
onRemoveZone: (zoneIndex: number) => void
}
/** Zone label: the sheet's current name, else the snapshot, else the id. */
export function zoneLabel(
z: ReportZone,
sheet: SheetIndex,
locale: Locale,
): string {
const annotation = sheet.annotation(z.annotationId)
if (annotation) return pickLabel(sheet.name(annotation), locale)
const snapshot =
locale === 'en'
? z.labelEnSnapshot || z.labelFrSnapshot
: z.labelFrSnapshot || z.labelEnSnapshot
return snapshot || z.annotationId
}
function describeZone(
z: ObservationZone,
bones: Map<string, Bone>,
z: ReportZone,
sheet: SheetIndex,
locale: Locale,
t: (key: string) => string,
): string {
const label = boneLabel(bones.get(z.boneId), locale, z.boneId)
const label = zoneLabel(z, sheet, locale)
if (z.vertebrae?.length) {
const vs = z.vertebrae
.map((v: Vertebra) => `${v.region}${v.index}`)
.join(', ')
return `${label} (${vs})`
return `${label} (${z.vertebrae.map((v) => `${v.region}${v.index}`).join(', ')})`
}
if (z.side) {
const sideLabel = t(
z.side === 'left' ? 'lateral.left_short' : 'lateral.right_short',
)
return `${label} (${sideLabel})`
return `${label} (${t(z.side === 'left' ? 'lateral.left_short' : 'lateral.right_short')})`
}
return label
}
interface ZoneTree {
zone: FindingZone
side?: LateralSide
}
/** One picker per (finding zone, side) the observation's zones resolve to. */
function zoneTrees(observation: Observation, sheet: SheetIndex): ZoneTree[] {
const seen = new Set<string>()
const out: ZoneTree[] = []
for (const z of observation.zones) {
const annotation = sheet.annotation(z.annotationId)
if (!isObservable(annotation) || !annotation.finding_zone_id) continue
const zone = sheet.findingZone(annotation.finding_zone_id)
if (!zone) continue
const key = z.side ? `${zone.id}:${z.side}` : zone.id
if (seen.has(key)) continue
seen.add(key)
out.push({ zone, side: z.side })
}
return out
}
/** Findings the sheet no longer holds at their path (migrated data, kept verbatim). */
function unresolvedFindings(
observation: Observation,
sheet: SheetIndex,
): Finding[] {
return observation.findings.filter(
(f) => !sheet.nodeAt(f.findingZoneId, f.path),
)
}
export default function ObservationCard({
observation,
index,
@@ -75,34 +110,37 @@ export default function ObservationCard({
onMoveDown,
canMoveUp,
canMoveDown,
bones,
findings,
sheet,
onChange,
onOpenVertebraPicker,
onRemoveZone,
}: ObservationCardProps) {
const t = useT()
const locale = useLocaleStore((s) => s.locale)
const nameOf = (z: { name_fr: string; name_en: string }) =>
locale === 'en' ? z.name_en : z.name_fr
// Per-zone picker accordion — only one tree picker open at a time,
// matching the observation-card accordion semantics. Closed by default
// so the card stays compact when first expanded.
const [expandedZoneId, setExpandedZoneId] = useState<string | null>(null)
const zoneCount = observation.zones.length
const findingCount =
observation.findings.length + observation.freeTextFindings.length
const zoneCountLabel =
const zoneCountLabel = t(
zoneCount > 1
? t('observation.zone_label_plural')
: t('observation.zone_label_singular')
const findingCountLabel =
? 'observation.zone_label_plural'
: 'observation.zone_label_singular',
)
const findingCountLabel = t(
findingCount > 1
? t('observation.finding_label_plural')
: t('observation.finding_label_singular')
? 'observation.finding_label_plural'
: 'observation.finding_label_singular',
)
const trees = useMemo(
() => zoneTrees(observation, sheet),
[observation, sheet],
)
const unresolved = useMemo(
() => unresolvedFindings(observation, sheet),
[observation, sheet],
)
function onHeaderKey(event: React.KeyboardEvent<HTMLDivElement>) {
if (event.key === 'Enter' || event.key === ' ') {
@@ -110,39 +148,15 @@ export default function ObservationCard({
onToggle()
}
}
function stop(fn: () => void) {
return (event: React.MouseEvent) => {
event.stopPropagation()
fn()
}
const stop = (fn: () => void) => (event: React.MouseEvent) => {
event.stopPropagation()
fn()
}
const zonesArray = useMemo(
() => (findings ? Object.values(findings.zones) : []),
[findings],
)
const zonesWithTree = useMemo(() => {
if (zonesArray.length === 0)
return [] as { tree: ZoneFindings; side?: LateralSide }[]
const seen = new Set<string>()
const out: { tree: ZoneFindings; side?: LateralSide }[] = []
for (const z of observation.zones) {
const bone = bones.get(z.boneId)
if (!bone) continue
const tree = matchZoneFindings(
{ fr: bone.fr, en: bone.en },
zonesArray,
)
if (!tree) continue
const key = z.side ? `${tree.id}:${z.side}` : tree.id
if (seen.has(key)) continue
seen.add(key)
out.push({ tree, side: z.side })
}
return out
}, [observation.zones, bones, zonesArray])
const removeFinding = (target: Finding) =>
onChange({
...observation,
findings: observation.findings.filter((f) => f !== target),
})
return (
<Card
@@ -164,13 +178,16 @@ export default function ObservationCard({
>
<div className="flex-1 min-h-[60px] text-left">
<div className="flex items-center gap-2 mb-2">
<Badge tone="neutral">{t('observation.badge_n')}{index + 1}</Badge>
<Badge tone="neutral">
{t('observation.badge_n')}
{index + 1}
</Badge>
{observation.severity && (
<Badge
tone={
observation.severity === 'sévère'
observation.severity === 'severe'
? 'danger'
: observation.severity === 'modérée'
: observation.severity === 'moderate'
? 'warn'
: 'neutral'
}
@@ -248,43 +265,49 @@ export default function ObservationCard({
</p>
) : (
<ul className="flex flex-wrap gap-2">
{observation.zones.map((z, i) => {
const b = bones.get(z.boneId)
const supportsVertebrae =
b?.special === 'vertebral-precision'
return (
<li key={`${z.boneId}-${i}`}>
<Badge tone="accent" className="gap-2">
{describeZone(z, bones, locale, t)}
{supportsVertebrae && (
<button
type="button"
onClick={() => onOpenVertebraPicker(i)}
className="underline text-xs text-[var(--color-accent-strong)]"
title={t('observation.vertebrae_button_title')}
{observation.zones.map((z, i) => (
<li
key={`${z.annotationId}-${z.viewId}-${z.side ?? ''}-${i}`}
>
<Badge tone="accent" className="gap-2">
{describeZone(z, sheet, locale, t)}
{z.unresolved &&
!sheet.annotation(z.annotationId) && (
<span
className="text-xs italic"
title={t('observation.zone_unresolved')}
>
{t('observation.vertebrae_button')}
</button>
{t('observation.unresolved_short')}
</span>
)}
{sheet.isSpine(z.annotationId) && (
<button
type="button"
aria-label={`${t('observation.remove_zone')} ${boneLabel(b, locale, z.boneId)}`}
onClick={() => onRemoveZone(i)}
className="ml-1 text-[var(--color-accent-strong)]"
onClick={() => onOpenVertebraPicker(i)}
className="underline text-xs text-[var(--color-accent-strong)]"
title={t('observation.vertebrae_button_title')}
>
✕
{t('observation.vertebrae_button')}
</button>
</Badge>
</li>
)
})}
)}
<button
type="button"
aria-label={`${t('observation.remove_zone')} ${zoneLabel(z, sheet, locale)}`}
onClick={() => onRemoveZone(i)}
className="ml-1 text-[var(--color-accent-strong)]"
>
✕
</button>
</Badge>
</li>
))}
</ul>
)}
</section>
<section>
<Label>{t('observation.findings_catalog_label')}</Label>
{zonesWithTree.length === 0 ? (
{trees.length === 0 ? (
<p className="text-sm text-[var(--color-ink-muted)]">
{observation.zones.length === 0
? t('observation.findings_pick_zone_first')
@@ -292,26 +315,19 @@ export default function ObservationCard({
</p>
) : (
<ul className="space-y-2">
{zonesWithTree.map(({ tree, side }) => {
const pickerKey = side
? `${tree.id}:${side}`
: tree.id
const expanded = expandedZoneId === pickerKey
{trees.map(({ zone, side }) => {
const pickerKey = side ? `${zone.id}:${side}` : zone.id
const open = expandedZoneId === pickerKey
const selectedCount = observation.findings.filter(
(f) =>
f.zoneId === tree.id && f.side === side,
(f) => f.findingZoneId === zone.id && f.side === side,
).length
const selectedAria = `${selectedCount} ${
selectedCount > 1
? t('findings.selected_plural')
: t('findings.selected_singular')
}`
const selectedAria = `${selectedCount} ${selectedCount > 1 ? t('findings.selected_plural') : t('findings.selected_singular')}`
return (
<li
key={pickerKey}
className={[
'rounded-xl border bg-[var(--color-surface)] transition',
expanded
open
? 'border-[var(--color-accent)] ring-1 ring-[var(--color-accent)]'
: 'border-[var(--color-border)]',
].join(' ')}
@@ -319,16 +335,17 @@ export default function ObservationCard({
<button
type="button"
onClick={() =>
setExpandedZoneId(expanded ? null : pickerKey)
setExpandedZoneId(open ? null : pickerKey)
}
aria-expanded={expanded}
aria-expanded={open}
aria-controls={`findings-zone-${pickerKey}`}
className="w-full flex items-center justify-between gap-2 px-3 py-2 text-left rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)]/40"
>
<span className="flex items-center gap-2">
<span className="text-sm font-medium text-[var(--color-ink)]">
{nameOf(tree)}
{side && ` (${t(side === 'left' ? 'lateral.left' : 'lateral.right')})`}
{pickLabel(zone.name, locale)}
{side &&
` (${t(side === 'left' ? 'lateral.left' : 'lateral.right')})`}
</span>
{selectedCount > 0 && (
<span
@@ -343,11 +360,11 @@ export default function ObservationCard({
aria-hidden="true"
className="text-[var(--color-ink-muted)]"
>
{expanded ? '▲' : '▼'}
{open ? '▲' : '▼'}
</span>
</button>
<AnimatePresence initial={false}>
{expanded && (
{open && (
<motion.div
key="picker-body"
id={`findings-zone-${pickerKey}`}
@@ -359,12 +376,14 @@ export default function ObservationCard({
>
<div className="px-3 pb-3 pt-1 border-t border-[var(--color-border)]">
<FindingsTreePicker
zoneId={tree.id}
tree={tree}
zone={zone}
side={side}
selected={observation.findings}
onChange={(next) =>
onChange({ ...observation, findings: next })
onChange({
...observation,
findings: next,
})
}
/>
</div>
@@ -378,6 +397,40 @@ export default function ObservationCard({
)}
</section>
{unresolved.length > 0 && (
<section>
<Label>{t('observation.findings_unresolved_label')}</Label>
<p className="text-xs text-[var(--color-ink-muted)] mb-2">
{t('observation.findings_unresolved_help')}
</p>
<ul className="space-y-1">
{unresolved.map((f, i) => (
<li
key={`${f.findingZoneId}-${f.path.join('/')}-${f.side ?? ''}-${i}`}
className="flex items-center gap-2 text-sm"
>
<span className="text-[var(--color-ink)]">
{f.requiresVetReferral ? '⚠ ' : ''}
{locale === 'en'
? f.labelEnSnapshot
: f.labelFrSnapshot}
{f.side &&
` (${t(f.side === 'left' ? 'lateral.left_short' : 'lateral.right_short')})`}
</span>
<button
type="button"
aria-label={`${t('common.delete')} ${locale === 'en' ? f.labelEnSnapshot : f.labelFrSnapshot}`}
onClick={() => removeFinding(f)}
className="text-[var(--color-accent-strong)]"
>
✕
</button>
</li>
))}
</ul>
</section>
)}
<section>
<Label>{t('observation.findings_free_label')}</Label>
<FreeTextFindingInput
@@ -1,8 +1,7 @@
import type { Observation } from '@/domain/schema/observation'
import type { SpeciesFindings } from '@/domain/schema/findings'
import type { Bone } from '@/anatomy/types'
import type { Observation } from '@faunosteo/domain'
import ObservationCard from './ObservationCard'
import Button from '@/components/ui/Button'
import type { SheetIndex } from '@/services/sheetIndex'
import { useT } from '@/i18n/useT'
export interface ObservationListProps {
@@ -14,8 +13,7 @@ export interface ObservationListProps {
onMoveUp: (i: number) => void
onMoveDown: (i: number) => void
// Editor body props forwarded to each card
bones: Map<string, Bone>
findings: SpeciesFindings | null
sheet: SheetIndex
onChange: (i: number, next: Observation) => void
onOpenVertebraPicker: (i: number, zoneIndex: number) => void
onRemoveZone: (i: number, zoneIndex: number) => void
@@ -29,8 +27,7 @@ export default function ObservationList({
onDelete,
onMoveUp,
onMoveDown,
bones,
findings,
sheet,
onChange,
onOpenVertebraPicker,
onRemoveZone,
@@ -64,8 +61,7 @@ export default function ObservationList({
onMoveDown={() => onMoveDown(i)}
canMoveUp={i > 0}
canMoveDown={i < observations.length - 1}
bones={bones}
findings={findings}
sheet={sheet}
onChange={(next) => onChange(i, next)}
onOpenVertebraPicker={(zoneIndex) =>
onOpenVertebraPicker(i, zoneIndex)
@@ -1,4 +1,4 @@
import type { Severity } from '@/domain/schema/observation'
import type { Severity } from '@faunosteo/domain'
import { useT } from '@/i18n/useT'
export interface SeveritySelectorProps {
@@ -6,17 +6,25 @@ export interface SeveritySelectorProps {
onChange: (s: Severity | undefined) => void
}
const SEVERITIES: Severity[] = ['légère', 'modérée', 'sévère']
export const SEVERITIES: Severity[] = ['mild', 'moderate', 'severe']
const COLORS: Record<Severity, string> = {
'légère': 'border-[var(--severity-mild)] text-[var(--severity-mild)]',
'modérée': 'border-[var(--severity-moderate)] text-[var(--severity-moderate)]',
'sévère': 'border-[var(--severity-severe)] text-[var(--severity-severe)]',
mild: 'border-[var(--severity-mild)] text-[var(--severity-mild)]',
moderate: 'border-[var(--severity-moderate)] text-[var(--severity-moderate)]',
severe: 'border-[var(--severity-severe)] text-[var(--severity-severe)]',
}
export default function SeveritySelector({ value, onChange }: SeveritySelectorProps) {
/** Severity codes are persisted; labels come from the dictionary (D8). */
export default function SeveritySelector({
value,
onChange,
}: SeveritySelectorProps) {
const t = useT()
return (
<div role="radiogroup" aria-label={t('severity.aria')} className="flex gap-2">
<div
role="radiogroup"
aria-label={t('severity.aria')}
className="flex gap-2"
>
{SEVERITIES.map((s) => (
<button
key={s}
@@ -1,86 +1,93 @@
import { useState } from 'react'
import type { Vertebra, VertebralRegion } from '@faunosteo/domain'
import Dialog from '@/components/ui/Dialog'
import Button from '@/components/ui/Button'
import Chip from '@/components/ui/Chip'
import type { Vertebra, VertebralRegion } from '@/domain/schema/observation'
import type { VertebralFormula } from '@/domain/species/types'
import { pickLabel } from '@/services/sheetIndex'
import { useT } from '@/i18n/useT'
const REGIONS: VertebralRegion[] = ['C', 'T', 'L', 'S', 'Cd']
const REGION_KEY: Record<VertebralRegion, string> = {
C: 'vertebra.region.C',
T: 'vertebra.region.T',
L: 'vertebra.region.L',
S: 'vertebra.region.S',
Cd: 'vertebra.region.Cd',
}
import { useLocaleStore } from '@/state/localeStore'
export interface VertebraPickerProps {
open: boolean
onClose: () => void
onConfirm: (vertebrae: Vertebra[]) => void
initial: Vertebra[]
formula: VertebralFormula
/** Ordered regions of the sheet (`vertebral_config.regions`). */
regions: readonly VertebralRegion[]
title: string
/** Tab to open on. Takes priority so a click always lands on its own zone. */
initialRegion?: VertebralRegion
initialRegion?: string
}
const sameVertebra = (a: Vertebra, r: string, i: number) =>
a.region === r && a.index === i
/**
* Picks vertebrae across every region of the sheet. A region shows its
* usual count; when the sheet documents a wider range (D6), one control
* extends the grid to the documented maximum. Nothing horse-specific here.
*/
export default function VertebraPicker({
open,
onClose,
onConfirm,
initial,
formula,
regions,
title,
initialRegion,
}: VertebraPickerProps) {
const t = useT()
const locale = useLocaleStore((s) => s.locale)
const [selected, setSelected] = useState<Vertebra[]>(initial)
const [activeRegion, setActiveRegion] = useState<VertebralRegion>(
() => initialRegion ?? initial[0]?.region ?? 'C',
const [activeCode, setActiveCode] = useState<string>(
() => initialRegion ?? initial[0]?.region ?? regions[0]?.code ?? '',
)
const [extended, setExtended] = useState<Set<string>>(() => new Set())
const has = (r: VertebralRegion, i: number) =>
selected.some((v) => v.region === r && v.index === i)
const active = regions.find((r) => r.code === activeCode) ?? regions[0]
if (!active) return null
const maxCount = active.count_range?.max ?? active.count
const highestPicked = Math.max(
0,
...selected.filter((v) => v.region === active.code).map((v) => v.index),
)
const canExtend = maxCount > active.count
const showExtended = extended.has(active.code) || highestPicked > active.count
const count = showExtended ? maxCount : active.count
const toggle = (r: VertebralRegion, i: number) => {
const has = (r: string, i: number) =>
selected.some((v) => sameVertebra(v, r, i))
const toggle = (r: string, i: number) =>
setSelected((cur) =>
has(r, i)
? cur.filter((v) => !(v.region === r && v.index === i))
? cur.filter((v) => !sameVertebra(v, r, i))
: [...cur, { region: r, index: i }],
)
}
const all = (r: VertebralRegion, count: number) => {
setSelected((cur) => {
const rest = cur.filter((v) => v.region !== r)
return [...rest, ...Array.from({ length: count }, (_, k) => ({ region: r, index: k + 1 }))]
})
}
const none = (r: VertebralRegion) =>
const all = (r: string, n: number) =>
setSelected((cur) => [
...cur.filter((v) => v.region !== r),
...Array.from({ length: n }, (_, k) => ({ region: r, index: k + 1 })),
])
const none = (r: string) =>
setSelected((cur) => cur.filter((v) => v.region !== r))
const count = formula[activeRegion]
return (
<Dialog open={open} onClose={onClose} title={title} size="lg">
<div role="tablist" className="flex flex-wrap gap-2 mb-4">
{REGIONS.map((r) => (
{regions.map((r) => (
<button
key={r}
key={r.code}
role="tab"
aria-selected={activeRegion === r}
onClick={() => setActiveRegion(r)}
aria-selected={active.code === r.code}
onClick={() => setActiveCode(r.code)}
className={[
'rounded-full px-4 py-2.5 sm:py-1.5 text-sm font-medium border min-h-[2.75rem]',
activeRegion === r
active.code === r.code
? 'bg-[var(--color-accent)] text-white border-[var(--color-accent)]'
: 'bg-white text-[var(--color-ink)] border-[var(--color-border)]',
].join(' ')}
>
{t(REGION_KEY[r])}
{pickLabel(r.name, locale)}
</button>
))}
</div>
@@ -89,26 +96,52 @@ export default function VertebraPicker({
{Array.from({ length: count }, (_, k) => k + 1).map((i) => (
<Chip
key={i}
active={has(activeRegion, i)}
onClick={() => toggle(activeRegion, i)}
active={has(active.code, i)}
onClick={() => toggle(active.code, i)}
>
{activeRegion}{i}
{active.code}
{i}
</Chip>
))}
</div>
<div className="flex flex-wrap items-center gap-2 mb-6">
<Button variant="ghost" size="sm" onClick={() => all(activeRegion, count)}>
<Button
variant="ghost"
size="sm"
onClick={() => all(active.code, active.count)}
>
{t('vertebra.check_all')}
</Button>
<Button variant="ghost" size="sm" onClick={() => none(activeRegion)}>
<Button variant="ghost" size="sm" onClick={() => none(active.code)}>
{t('vertebra.uncheck_all')}
</Button>
{canExtend && !showExtended && (
<Button
variant="ghost"
size="sm"
onClick={() => setExtended((cur) => new Set(cur).add(active.code))}
>
{t('vertebra.extend_to').replace('{max}', String(maxCount))}
</Button>
)}
{canExtend && showExtended && (
<span className="text-xs text-[var(--color-ink-muted)]">
{t('vertebra.range_note')
.replace('{usual}', String(active.count))
.replace('{min}', String(active.count_range?.min ?? active.count))
.replace('{max}', String(maxCount))}
</span>
)}
</div>
<div className="flex justify-end gap-2">
<Button variant="ghost" onClick={onClose}>{t('common.cancel')}</Button>
<Button onClick={() => onConfirm(selected)}>{t('common.confirm')}</Button>
<Button variant="ghost" onClick={onClose}>
{t('common.cancel')}
</Button>
<Button onClick={() => onConfirm(selected)}>
{t('common.confirm')}
</Button>
</div>
</Dialog>
)
+43 -10
View File
@@ -1,23 +1,36 @@
import type { Animal, Owner } from '@/domain/schema/animal'
import type { Animal, LocalizedText, Owner } from '@faunosteo/domain'
import Label from '@/components/ui/Label'
import Input from '@/components/ui/Input'
import Select from '@/components/ui/Select'
import { getAllSpecies, speciesLabel } from '@/domain/species/registry'
import { pickLabel } from '@/services/sheetIndex'
import { useT } from '@/i18n/useT'
import { useLocaleStore } from '@/state/localeStore'
export interface SpeciesOption {
id: string
name: LocalizedText
}
export interface AnimalFormProps {
animal: Animal
owner: Owner
/** Species that have a sheet in this build (one today). */
species: readonly SpeciesOption[]
onChangeAnimal: (next: Animal) => void
onChangeOwner: (next: Owner) => void
}
export default function AnimalForm({ animal, owner, onChangeAnimal, onChangeOwner }: AnimalFormProps) {
export default function AnimalForm({
animal,
owner,
species,
onChangeAnimal,
onChangeOwner,
}: AnimalFormProps) {
const t = useT()
const locale = useLocaleStore((s) => s.locale)
const species = getAllSpecies()
const setA = (patch: Partial<Animal>) => onChangeAnimal({ ...animal, ...patch })
const setA = (patch: Partial<Animal>) =>
onChangeAnimal({ ...animal, ...patch })
return (
<fieldset className="space-y-3">
<legend className="font-serif text-xl mb-2 text-[var(--color-ink)]">
@@ -31,25 +44,45 @@ export default function AnimalForm({ animal, owner, onChangeAnimal, onChangeOwne
onChange={(e) => setA({ speciesId: e.target.value })}
>
{species.map((s) => (
<option key={s.id} value={s.id}>{speciesLabel(s, locale)}</option>
<option key={s.id} value={s.id}>
{pickLabel(s.name, locale)}
</option>
))}
</Select>
</div>
<div>
<Label htmlFor="an-name">{t('form.animal.name')}</Label>
<Input id="an-name" required value={animal.name} onChange={(e) => setA({ name: e.target.value })} />
<Input
id="an-name"
required
value={animal.name}
onChange={(e) => setA({ name: e.target.value })}
/>
</div>
<div>
<Label htmlFor="an-breed">{t('form.animal.breed')}</Label>
<Input id="an-breed" value={animal.breed ?? ''} onChange={(e) => setA({ breed: e.target.value || undefined })} />
<Input
id="an-breed"
value={animal.breed ?? ''}
onChange={(e) => setA({ breed: e.target.value || undefined })}
/>
</div>
<div>
<Label htmlFor="an-age">{t('form.animal.age')}</Label>
<Input id="an-age" value={animal.age ?? ''} onChange={(e) => setA({ age: e.target.value || undefined })} />
<Input
id="an-age"
value={animal.age ?? ''}
onChange={(e) => setA({ age: e.target.value || undefined })}
/>
</div>
<div>
<Label htmlFor="own-name">{t('form.owner.name')}</Label>
<Input id="own-name" required value={owner.name} onChange={(e) => onChangeOwner({ name: e.target.value })} />
<Input
id="own-name"
required
value={owner.name}
onChange={(e) => onChangeOwner({ name: e.target.value })}
/>
</div>
</fieldset>
)
@@ -1,4 +1,4 @@
import type { Report } from '@/domain/schema/report'
import type { Report } from '@faunosteo/domain'
import Label from '@/components/ui/Label'
import Textarea from '@/components/ui/Textarea'
import NextAppointmentPicker from './NextAppointmentPicker'
@@ -29,13 +29,26 @@ export default function ConclusionPanel({
</h2>
<div>
<Label htmlFor="conclusion">{t('conclusion.conclusion')}</Label>
<Textarea id="conclusion" value={conclusion} onChange={(e) => onChangeConclusion(e.target.value)} />
<Textarea
id="conclusion"
value={conclusion}
onChange={(e) => onChangeConclusion(e.target.value)}
/>
</div>
<div>
<Label htmlFor="recommendations">{t('conclusion.recommendations')}</Label>
<Textarea id="recommendations" value={recommendations} onChange={(e) => onChangeRecommendations(e.target.value)} />
<Label htmlFor="recommendations">
{t('conclusion.recommendations')}
</Label>
<Textarea
id="recommendations"
value={recommendations}
onChange={(e) => onChangeRecommendations(e.target.value)}
/>
</div>
<NextAppointmentPicker value={nextAppointment} onChange={onChangeNextAppointment} />
<NextAppointmentPicker
value={nextAppointment}
onChange={onChangeNextAppointment}
/>
</section>
)
}
@@ -1,4 +1,4 @@
import type { Report } from '@/domain/schema/report'
import type { Report } from '@faunosteo/domain'
import Input from '@/components/ui/Input'
import Label from '@/components/ui/Label'
import { useT } from '@/i18n/useT'
@@ -1,4 +1,4 @@
import type { Practitioner } from '@/domain/schema/practitioner'
import type { Practitioner } from '@faunosteo/domain'
import Label from '@/components/ui/Label'
import Input from '@/components/ui/Input'
import { useT } from '@/i18n/useT'
@@ -8,7 +8,10 @@ export interface PractitionerFormProps {
onChange: (next: Practitioner) => void
}
export default function PractitionerForm({ value, onChange }: PractitionerFormProps) {
export default function PractitionerForm({
value,
onChange,
}: PractitionerFormProps) {
const t = useT()
const set = (patch: Partial<Practitioner>) => onChange({ ...value, ...patch })
return (
@@ -18,19 +21,36 @@ export default function PractitionerForm({ value, onChange }: PractitionerFormPr
</legend>
<div>
<Label htmlFor="prac-name">{t('form.practitioner.name')}</Label>
<Input id="prac-name" required value={value.name} onChange={(e) => set({ name: e.target.value })} />
<Input
id="prac-name"
required
value={value.name}
onChange={(e) => set({ name: e.target.value })}
/>
</div>
<div>
<Label htmlFor="prac-cabinet">{t('form.practitioner.cabinet')}</Label>
<Input id="prac-cabinet" value={value.cabinet ?? ''} onChange={(e) => set({ cabinet: e.target.value || undefined })} />
<Input
id="prac-cabinet"
value={value.cabinet ?? ''}
onChange={(e) => set({ cabinet: e.target.value || undefined })}
/>
</div>
<div>
<Label htmlFor="prac-contact">{t('form.practitioner.contact')}</Label>
<Input id="prac-contact" value={value.contact ?? ''} onChange={(e) => set({ contact: e.target.value || undefined })} />
<Input
id="prac-contact"
value={value.contact ?? ''}
onChange={(e) => set({ contact: e.target.value || undefined })}
/>
</div>
<div>
<Label htmlFor="prac-siret">{t('form.practitioner.siret')}</Label>
<Input id="prac-siret" value={value.siret ?? ''} onChange={(e) => set({ siret: e.target.value || undefined })} />
<Input
id="prac-siret"
value={value.siret ?? ''}
onChange={(e) => set({ siret: e.target.value || undefined })}
/>
</div>
</fieldset>
)
@@ -1,4 +1,4 @@
import type { Report } from '@/domain/schema/report'
import type { Report } from '@faunosteo/domain'
import AppHeader from '@/components/brand/AppHeader'
import Button from '@/components/ui/Button'
import { formatDate } from '@/lib/dates'
@@ -10,7 +10,10 @@ export interface ReportHeaderProps {
onEditInfos?: () => void
}
export default function ReportHeader({ report, onEditInfos }: ReportHeaderProps) {
export default function ReportHeader({
report,
onEditInfos,
}: ReportHeaderProps) {
const t = useT()
const locale = useLocaleStore((s) => s.locale)
return (
+5 -1
View File
@@ -6,7 +6,11 @@ export interface CardProps {
as?: 'div' | 'section' | 'article'
}
export default function Card({ children, className = '', as: Tag = 'div' }: CardProps) {
export default function Card({
children,
className = '',
as: Tag = 'div',
}: CardProps) {
return (
<Tag
className={[
+4 -1
View File
@@ -5,7 +5,10 @@ export default function Chip({
children,
className = '',
...rest
}: ButtonHTMLAttributes<HTMLButtonElement> & { active?: boolean; children: ReactNode }) {
}: ButtonHTMLAttributes<HTMLButtonElement> & {
active?: boolean
children: ReactNode
}) {
return (
<button
type="button"
+10 -2
View File
@@ -17,7 +17,13 @@ const SIZE: Record<NonNullable<DialogProps['size']>, string> = {
xl: 'max-w-4xl',
}
export default function Dialog({ open, onClose, title, children, size = 'md' }: DialogProps) {
export default function Dialog({
open,
onClose,
title,
children,
size = 'md',
}: DialogProps) {
const t = useT()
useEffect(() => {
if (!open) return
@@ -50,7 +56,9 @@ export default function Dialog({ open, onClose, title, children, size = 'md' }:
className={`relative w-full ${SIZE[size]} max-h-[85vh] overflow-y-auto rounded-2xl bg-[var(--color-surface)] shadow-xl`}
>
<header className="flex items-center justify-between px-4 sm:px-6 py-3 sm:py-4 border-b border-[var(--color-border)]">
<h2 className="text-lg font-semibold text-[var(--color-ink)]">{title}</h2>
<h2 className="text-lg font-semibold text-[var(--color-ink)]">
{title}
</h2>
<button
type="button"
aria-label={t('common.close')}
+13 -12
View File
@@ -1,16 +1,17 @@
import { forwardRef, type InputHTMLAttributes } from 'react'
const Input = forwardRef<HTMLInputElement, InputHTMLAttributes<HTMLInputElement>>(
({ className = '', ...rest }, ref) => (
<input
ref={ref}
className={[
'h-10 w-full rounded-lg border border-[var(--color-border)] bg-white px-3 text-base text-[var(--color-ink)] placeholder:text-[var(--color-ink-muted)] focus-visible:border-[var(--color-accent)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)]/30',
className,
].join(' ')}
{...rest}
/>
),
)
const Input = forwardRef<
HTMLInputElement,
InputHTMLAttributes<HTMLInputElement>
>(({ className = '', ...rest }, ref) => (
<input
ref={ref}
className={[
'h-10 w-full rounded-lg border border-[var(--color-border)] bg-white px-3 text-base text-[var(--color-ink)] placeholder:text-[var(--color-ink-muted)] focus-visible:border-[var(--color-accent)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)]/30',
className,
].join(' ')}
{...rest}
/>
))
Input.displayName = 'Input'
export default Input
+15 -14
View File
@@ -1,18 +1,19 @@
import { forwardRef, type SelectHTMLAttributes } from 'react'
const Select = forwardRef<HTMLSelectElement, SelectHTMLAttributes<HTMLSelectElement>>(
({ className = '', children, ...rest }, ref) => (
<select
ref={ref}
className={[
'h-10 w-full rounded-lg border border-[var(--color-border)] bg-white px-3 text-base text-[var(--color-ink)] focus-visible:border-[var(--color-accent)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)]/30',
className,
].join(' ')}
{...rest}
>
{children}
</select>
),
)
const Select = forwardRef<
HTMLSelectElement,
SelectHTMLAttributes<HTMLSelectElement>
>(({ className = '', children, ...rest }, ref) => (
<select
ref={ref}
className={[
'h-10 w-full rounded-lg border border-[var(--color-border)] bg-white px-3 text-base text-[var(--color-ink)] focus-visible:border-[var(--color-accent)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)]/30',
className,
].join(' ')}
{...rest}
>
{children}
</select>
))
Select.displayName = 'Select'
export default Select
+13 -12
View File
@@ -1,16 +1,17 @@
import { forwardRef, type TextareaHTMLAttributes } from 'react'
const Textarea = forwardRef<HTMLTextAreaElement, TextareaHTMLAttributes<HTMLTextAreaElement>>(
({ className = '', ...rest }, ref) => (
<textarea
ref={ref}
className={[
'w-full min-h-[96px] rounded-lg border border-[var(--color-border)] bg-white p-3 text-base text-[var(--color-ink)] placeholder:text-[var(--color-ink-muted)] focus-visible:border-[var(--color-accent)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)]/30',
className,
].join(' ')}
{...rest}
/>
),
)
const Textarea = forwardRef<
HTMLTextAreaElement,
TextareaHTMLAttributes<HTMLTextAreaElement>
>(({ className = '', ...rest }, ref) => (
<textarea
ref={ref}
className={[
'w-full min-h-[96px] rounded-lg border border-[var(--color-border)] bg-white p-3 text-base text-[var(--color-ink)] placeholder:text-[var(--color-ink-muted)] focus-visible:border-[var(--color-accent)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)]/30',
className,
].join(' ')}
{...rest}
/>
))
Textarea.displayName = 'Textarea'
export default Textarea
-17
View File
@@ -1,17 +0,0 @@
import { z } from 'zod'
export const AnimalSchema = z.object({
/** Must match a registered species id (e.g. 'equine') */
speciesId: z.string().min(1),
name: z.string().min(1),
breed: z.string().optional(),
age: z.string().optional(),
})
export type Animal = z.infer<typeof AnimalSchema>
export const OwnerSchema = z.object({
name: z.string().min(1),
})
export type Owner = z.infer<typeof OwnerSchema>
-67
View File
@@ -1,67 +0,0 @@
import { z } from 'zod'
/**
* Schema for the species findings tree.
*
* Source of truth for what a practitioner can attach to an observation:
* a hierarchical tree of dysfunctions/observations per anatomical zone,
* authored by the domain expert in JSON and parsed at boot.
*
* Field names match the JSON authoring contract (snake_case).
* Recursive children are typed via z.lazy + an explicit ZodType annotation
* so TS can resolve the self-reference.
*/
export const SourceRefSchema = z.object({
type: z.enum(['manual', 'journal', 'database', 'web']),
citation: z.string().min(1),
url: z.string().url().optional(),
})
export type SourceRef = z.infer<typeof SourceRefSchema>
export interface FindingNode {
id: string
name_fr: string
name_en: string
description_fr?: string
description_en?: string
requires_vet_referral?: boolean
sources?: SourceRef[]
children?: FindingNode[]
}
export const FindingNodeSchema: z.ZodType<FindingNode> = z.lazy(() =>
z.object({
id: z.string().min(1),
name_fr: z.string().min(1),
name_en: z.string().min(1),
description_fr: z.string().optional(),
description_en: z.string().optional(),
requires_vet_referral: z.boolean().optional(),
sources: z.array(SourceRefSchema).optional(),
children: z.array(FindingNodeSchema).optional(),
}),
)
export const ZoneFindingsSchema = z.object({
id: z.string().min(1),
name_fr: z.string().min(1),
name_en: z.string().min(1),
categories: z.array(FindingNodeSchema),
})
export type ZoneFindings = z.infer<typeof ZoneFindingsSchema>
export const SpeciesFindingsSchema = z.object({
schema_version: z.string().min(1),
scope_disclaimer: z.string().min(1),
species: z.object({
id: z.string().min(1),
name_fr: z.string().min(1),
name_en: z.string().min(1),
}),
zones: z.record(z.string(), ZoneFindingsSchema),
})
export type SpeciesFindings = z.infer<typeof SpeciesFindingsSchema>
-61
View File
@@ -1,61 +0,0 @@
import { z } from 'zod'
export const SeveritySchema = z.enum(['légère', 'modérée', 'sévère'])
export type Severity = z.infer<typeof SeveritySchema>
export const VertebralRegionSchema = z.enum(['C', 'T', 'L', 'S', 'Cd'])
export type VertebralRegion = z.infer<typeof VertebralRegionSchema>
export const VertebraSchema = z.object({
region: VertebralRegionSchema,
index: z.number().int().positive(),
})
export type Vertebra = z.infer<typeof VertebraSchema>
export const LateralSideSchema = z.enum(['left', 'right'])
export type LateralSide = z.infer<typeof LateralSideSchema>
export const ObservationZoneSchema = z.object({
/** Must match data-anno-id attribute on the SVG element */
boneId: z.string().min(1),
/** Set when zone originates from a detail popup SVG */
detailSourceId: z.string().optional(),
/** Set when boneId is a spine-zone; replaces the block semantically */
vertebrae: z.array(VertebraSchema).optional(),
/** Set for bilateral zones to distinguish left from right */
side: LateralSideSchema.optional(),
})
export type ObservationZone = z.infer<typeof ObservationZoneSchema>
/**
* A selected leaf from the species findings tree. The path is anchored at the
* zone root (categories array), e.g. ['sphenoid-dysfunctions', 'physiological',
* 'flexion']. Labels are snapshotted at selection time so previously exported
* reports remain readable if the catalog is later edited.
*/
export const FindingSchema = z.object({
zoneId: z.string().min(1),
path: z.array(z.string().min(1)).min(1),
labelFrSnapshot: z.string().min(1),
labelEnSnapshot: z.string().min(1),
requiresVetReferral: z.boolean().optional(),
side: LateralSideSchema.optional(),
})
export type Finding = z.infer<typeof FindingSchema>
export const ObservationSchema = z.object({
id: z.string().min(1),
zones: z.array(ObservationZoneSchema),
findings: z.array(FindingSchema),
/** Free-text additions when the tree does not cover a finding */
freeTextFindings: z.array(z.string()),
severity: SeveritySchema.optional(),
comment: z.string(),
})
export type Observation = z.infer<typeof ObservationSchema>
@@ -1,11 +0,0 @@
import { z } from 'zod'
export const PractitionerSchema = z.object({
name: z.string().min(1),
cabinet: z.string().optional(),
contact: z.string().optional(),
/** SIRET — 14-digit French business identifier */
siret: z.string().optional(),
})
export type Practitioner = z.infer<typeof PractitionerSchema>
-33
View File
@@ -1,33 +0,0 @@
import { z } from 'zod'
import { PractitionerSchema } from './practitioner'
import { AnimalSchema, OwnerSchema } from './animal'
import { ObservationSchema } from './observation'
const NextAppointmentSchema = z.discriminatedUnion('kind', [
z.object({ kind: z.literal('date'), date: z.string() }),
z.object({ kind: z.literal('period'), text: z.string() }),
])
export type NextAppointment = z.infer<typeof NextAppointmentSchema>
export const ReportSchema = z.object({
/**
* Schema version. v2 introduced the hierarchical findings tree
* (replacing the flat pathology list). Bump on breaking changes.
*/
version: z.literal(2),
id: z.string().min(1),
/** ISO timestamp of report creation */
createdAt: z.string(),
/** ISO date of clinical encounter */
date: z.string(),
practitioner: PractitionerSchema,
animal: AnimalSchema,
owner: OwnerSchema,
observations: z.array(ObservationSchema),
conclusion: z.string(),
recommendations: z.string(),
nextAppointment: NextAppointmentSchema.optional(),
})
export type Report = z.infer<typeof ReportSchema>
@@ -1,18 +0,0 @@
import type { SpeciesManifest } from '@/domain/species/types'
import { EQUINE_VERTEBRAL_FORMULA } from './vertebrae'
const equine: SpeciesManifest = {
id: 'equine',
labelFr: 'Cheval',
labelEn: 'Horse',
mainSvg: '/species/equine/Horse.svg',
details: {
head: '/species/equine/Horse_head.svg',
},
vertebralFormula: EQUINE_VERTEBRAL_FORMULA,
findings: () => import('./pathologies'),
}
// Default export is the convention picked up by the registry's
// import.meta.glob() auto-discovery.
export default equine
File diff suppressed because it is too large. Load diff
@@ -1,13 +0,0 @@
import {
SpeciesFindingsSchema,
type SpeciesFindings,
} from '@/domain/schema/findings'
import data from './pathologies.json'
/**
* Equine findings tree. Authored as JSON, parsed via Zod at boot so any
* malformed data crashes loudly instead of corrupting an observation later.
*/
const EQUINE_FINDINGS: SpeciesFindings = SpeciesFindingsSchema.parse(data)
export default EQUINE_FINDINGS
@@ -1,13 +0,0 @@
import type { VertebralFormula } from '@/domain/species/types'
/**
* Vertebral formula for the horse (Equus caballus).
* Cd count capped at 18 for the picker — actual count varies 15–21.
*/
export const EQUINE_VERTEBRAL_FORMULA: VertebralFormula = {
C: 7,
T: 18,
L: 6,
S: 5,
Cd: 18,
}
-57
View File
@@ -1,57 +0,0 @@
import type { SpeciesManifest } from './types'
import type { Locale } from '@/i18n/types'
/**
* Auto-discovers every species manifest in `src/domain/species/*\/index.ts`
* via Vite's `import.meta.glob`. Each manifest module must default-export
* its `SpeciesManifest`. Drop a new folder with a conforming `index.ts`
* (and its `vertebrae.ts` + `pathologies.ts` siblings) and the species
* shows up everywhere — the AnimalForm dropdown, the editor canvas,
* the PDF export — without any registry edit.
*
* `eager: true` resolves modules synchronously at build time so the
* registry is a plain object literal in the bundled output (no async
* loading required to enumerate species).
*/
const modules = import.meta.glob<{ default: SpeciesManifest }>(
'./*/index.ts',
{ eager: true },
)
function buildRegistry(): Record<string, SpeciesManifest> {
const reg: Record<string, SpeciesManifest> = {}
for (const [path, mod] of Object.entries(modules)) {
const manifest = mod.default
if (!manifest || typeof manifest.id !== 'string' || !manifest.id) {
console.warn(`Species manifest at ${path} has no valid default export — skipping.`)
continue
}
if (reg[manifest.id]) {
console.warn(
`Duplicate species id "${manifest.id}" — keeping the first one (from ${path} ignored).`,
)
continue
}
reg[manifest.id] = manifest
}
return reg
}
const SPECIES_REGISTRY: Record<string, SpeciesManifest> = buildRegistry()
/** Returns a species manifest by id, or undefined if not registered. */
export function getSpecies(id: string): SpeciesManifest | undefined {
return SPECIES_REGISTRY[id]
}
/** Returns all registered species manifests, sorted alphabetically by labelFr. */
export function getAllSpecies(): SpeciesManifest[] {
return Object.values(SPECIES_REGISTRY).sort((a, b) =>
a.labelFr.localeCompare(b.labelFr, 'fr'),
)
}
/** Display label of a species for the given locale. */
export function speciesLabel(s: SpeciesManifest, locale: Locale): string {
return locale === 'en' ? s.labelEn : s.labelFr
}
-32
View File
@@ -1,32 +0,0 @@
import type { SpeciesFindings } from '@/domain/schema/findings'
/** Vertebral formula defines segment counts for a species. */
export interface VertebralFormula {
C: number
T: number
L: number
S: number
Cd: number
}
/** Lazy import returning a module with a default export of SpeciesFindings. */
export type FindingsLoader = () => Promise<{ default: SpeciesFindings }>
/** Species manifest — one per registered species. */
export interface SpeciesManifest {
id: string
/** Display name in French */
labelFr: string
/** Display name in English */
labelEn: string
/** Absolute public path to the main anatomy SVG */
mainSvg: string
/**
* Map of detail popup id → absolute public path to detail SVG.
* Keys match data-anno-opens-detail attribute values in the main SVG.
*/
details: Record<string, string>
vertebralFormula: VertebralFormula
/** Lazy-loaded findings tree (zones + categories + leaves) for this species */
findings: FindingsLoader
}
+37 -99
View File
@@ -16,10 +16,12 @@ export const en: Dict = {
'common.back_to_home': 'Back to home',
'home.new_report.title': 'New report',
'home.new_report.description': 'Start a new osteopathic report for an animal.',
'home.new_report.description':
'Start a new osteopathic report for an animal.',
'home.new_report.cta': 'Start',
'home.import.title': 'Import a PDF',
'home.import.description': 'Reopen a previous report generated by this app to follow up.',
'home.import.description':
'Reopen a previous report generated by this app to follow up.',
'home.import.cta': 'Choose a PDF',
'home.import.loading': 'Reading…',
'home.import.error_generic': 'Failed to read the PDF.',
@@ -27,24 +29,18 @@ export const en: Dict = {
'home.import.error_no_attachment':
'This PDF was not generated by Faunosteo (no data detected).',
'home.import.error_incompatible_version':
'This PDF uses format v{version}, incompatible with the current version (v2). Re-export the report from a recent version of the app.',
'This PDF uses format v{version}, which this version of the application cannot read (accepted formats: v2 and v3).',
'home.import.migrated':
'Report imported from an older format. Findings not found in the current sheet: {count} (kept with their labels).',
'home.no_sheet.title': 'No anatomical sheet',
'home.no_sheet.description':
'This build of the application carries no anatomical sheet: no report can be created or imported.',
// footer
'footer.all_rights_reserved': 'All rights reserved.',
'footer.powered_by': 'Powered by',
'footer.editors': 'Editors',
'footer.in_partnership': 'In partnership with',
// editors page
'editors.svg.title': 'SVG Editor',
'editors.svg.description':
'Annotate an anatomical SVG file: add clickable zones, categories, and FR/EN labels.',
'editors.svg.cta': 'Open',
'editors.pathology.title': 'Pathology Editor',
'editors.pathology.description':
'Create and edit the pathology catalog (JSON tree) for a species.',
'editors.pathology.cta': 'Open',
'not_found.title': 'Page not found',
'not_found.description': 'The requested path does not exist.',
@@ -58,20 +54,22 @@ export const en: Dict = {
'editor.edit_infos': 'Edit info',
'editor.edit_dialog_title': 'Edit information',
'editor.disclaimer_title': 'Legal scope of animal osteopathy',
'editor.detail_title_prefix': 'Detail — ',
'detail.click_to_add': 'Click the zones to add them to the current observation.',
'detail.click_to_add':
'Click the zones to add them to the current observation.',
'observation.section_title': 'Observations',
'observation.add': '+ New observation',
'observation.empty': 'No observation. Click "+ New observation" then on the zones in the diagram.',
'observation.empty':
'No observation. Click "+ New observation" then on the zones in the diagram.',
'observation.badge_n': 'Observation #',
'observation.zone_label_singular': 'zone',
'observation.zone_label_plural': 'zones',
'observation.finding_label_singular': 'finding',
'observation.finding_label_plural': 'findings',
'observation.zones_label': 'Selected zones',
'observation.zones_empty': 'Click on the zones in the diagram to add them to this observation.',
'observation.zones_empty':
'Click on the zones in the diagram to add them to this observation.',
'observation.findings_catalog_label': 'Findings (catalog)',
'observation.findings_pick_zone_first': 'Pick a zone to access the catalog.',
'observation.findings_no_catalog':
@@ -118,13 +116,26 @@ export const en: Dict = {
'conclusion.next_period_placeholder': 'e.g. in 3 weeks',
'vertebra.title_prefix': 'Specify vertebrae — ',
'vertebra.region.C': 'Cervical',
'vertebra.region.T': 'Thoracic',
'vertebra.region.L': 'Lumbar',
'vertebra.region.S': 'Sacral',
'vertebra.region.Cd': 'Caudal',
'vertebra.check_all': 'Select all',
'vertebra.uncheck_all': 'Clear all',
'vertebra.extend_to': 'Show up to {max}',
'vertebra.range_note':
'Usual count: {usual}; documented variation: {min} to {max}.',
// sheet
'sheet.status.draft':
'Anatomical sheet: reference draft, not medically validated',
'sheet.status.published': 'Official anatomical sheet',
'sheet.loading': 'Loading the anatomical sheet…',
// unresolved (migrated) data
'observation.unresolved_short': 'inherited',
'observation.zone_unresolved':
'Zone inherited from an older report, absent from the current sheet',
'observation.findings_unresolved_label':
'Inherited findings (outside the current catalog)',
'observation.findings_unresolved_help':
'Findings imported from an older report whose path no longer exists in the sheet: kept with their original labels.',
// laterality
'lateral.which_side': 'Which side?',
@@ -135,9 +146,9 @@ export const en: Dict = {
'lateral.right_short': 'R',
'severity.aria': 'Severity',
'severity.légère': 'mild',
'severity.modérée': 'moderate',
'severity.sévère': 'severe',
'severity.mild': 'mild',
'severity.moderate': 'moderate',
'severity.severe': 'severe',
'pdf.eyebrow.observation': 'OBSERVATION',
'pdf.eyebrow.synthesis': 'SYNTHESIS',
@@ -163,77 +174,4 @@ export const en: Dict = {
'lang.switch_to_en': 'Switch to English',
'lang.fr': 'FR',
'lang.en': 'EN',
// svg editor
'svg_editor.title': 'SVG Anatomy Editor',
'svg_editor.subtitle': 'Points, zones & clickable categories',
'svg_editor.file': 'File',
'svg_editor.choose_file': 'Choose an SVG file',
'svg_editor.change_file': 'Change SVG file',
'svg_editor.export': 'Export SVG',
'svg_editor.mode': 'Mode',
'svg_editor.mode_select': 'Select / move',
'svg_editor.mode_point': 'Add point',
'svg_editor.mode_polygon': 'Add polygon',
'svg_editor.validate_polygon': 'Validate polygon (Enter)',
'svg_editor.cancel_polygon': 'Cancel (Esc)',
'svg_editor.category_for_new': 'Category for new elements',
'svg_editor.categories': 'Categories',
'svg_editor.shared_color': '(shared color)',
'svg_editor.category_placeholder': 'Category name',
'svg_editor.selected_element': 'Selected element',
'svg_editor.opens_detail': 'This zone opens a detail view',
'svg_editor.detail_id_label': 'Detail view ID (e.g. head, front-leg)',
'svg_editor.detail_id_placeholder': 'head',
'svg_editor.name_fr': 'French name',
'svg_editor.name_fr_placeholder': 'e.g. Hanche',
'svg_editor.name_en': 'English name',
'svg_editor.name_en_placeholder': 'e.g. Hip joint',
'svg_editor.category': 'Category',
'svg_editor.radius': 'Radius (circle)',
'svg_editor.fill_opacity': 'Fill opacity',
'svg_editor.polygon_editing': 'Polygon editing:',
'svg_editor.polygon_drag': 'Drag a yellow handle to move it',
'svg_editor.polygon_insert': 'Click a white mid-handle to insert a vertex',
'svg_editor.polygon_delete': 'Alt+click or right-click a yellow handle to delete it',
'svg_editor.redraw_polygon': 'Redraw this polygon',
'svg_editor.delete': 'Delete',
'svg_editor.elements': 'Elements',
'svg_editor.filter_placeholder': 'Filter...',
'svg_editor.welcome_title': 'SVG Anatomy Editor',
'svg_editor.welcome_text': 'Upload an SVG file to begin. If your file already has points/zones with ',
'svg_editor.welcome_text_suffix': ', they will be detected and configured automatically.',
'svg_editor.welcome_drag_hint': 'or drag & drop an SVG file anywhere',
'svg_editor.no_categories': 'No categories yet. Use the form below to add one.',
'svg_editor.new_point_fr': 'Nouveau point',
'svg_editor.new_point_en': 'New point',
'svg_editor.new_zone_fr': 'Nouvelle zone',
'svg_editor.new_zone_en': 'New zone',
'svg_editor.alert_drop_svg': 'Drop an SVG file.',
'svg_editor.alert_invalid_svg': 'Invalid file: no SVG element found.',
'svg_editor.alert_min_3': 'Need at least 3 points.',
'svg_editor.alert_min_3_vertices': 'A polygon must have at least 3 vertices.',
'svg_editor.alert_upload_first': 'Upload an SVG first.',
'svg_editor.alert_no_svg_loaded': 'No SVG loaded. Upload a file first.',
'svg_editor.alert_cat_name_required': 'Give the category a name.',
'svg_editor.alert_cat_invalid_name': 'Invalid name.',
'svg_editor.alert_cat_exists': 'This category already exists.',
'svg_editor.confirm_delete_element': 'Delete this element?',
'svg_editor.confirm_delete_cat': 'Delete category "{name}"?',
'svg_editor.confirm_delete_cat_count': '\n\nIt contains {count} element(s) that will also be deleted.',
'svg_editor.confirm_redraw': 'Erase this polygon and redraw it?',
'svg_editor.handle_drag': 'Drag to move | Alt+click or right-click to delete',
'svg_editor.handle_insert': 'Click to insert a vertex here',
'svg_editor.polygon_vertices': 'polygon ({count} vertices)',
'svg_editor.drop_svg_here': 'Drop SVG here',
'svg_editor.lateral': 'Laterality',
'svg_editor.lateral_unpaired': 'Unilateral (no side)',
'svg_editor.lateral_bilateral': 'Bilateral (left / right)',
'svg_editor.source_project': 'Project SVGs',
'svg_editor.source_upload': 'Upload a file',
'svg_editor.species': 'Species',
'svg_editor.view': 'View',
'svg_editor.view_main': 'Full body',
'svg_editor.view_detail': 'Detail: {name}',
'svg_editor.load': 'Load',
}
+41 -103
View File
@@ -18,37 +18,31 @@ export const fr: Dict = {
// home
'home.new_report.title': 'Nouveau bilan',
'home.new_report.description': "Démarrer un nouveau bilan d'ostéopathie sur un animal.",
'home.new_report.description':
"Démarrer un nouveau bilan d'ostéopathie sur un animal.",
'home.new_report.cta': 'Commencer',
'home.import.title': 'Importer un PDF',
'home.import.description':
"Reprendre un bilan précédent généré par cette application pour effectuer un suivi.",
'Reprendre un bilan précédent généré par cette application pour effectuer un suivi.',
'home.import.cta': 'Choisir un PDF',
'home.import.loading': 'Lecture…',
'home.import.error_generic': 'Erreur de lecture du PDF.',
'home.import.error_invalid_pdf':
"Ce fichier n'est pas un PDF lisible.",
'home.import.error_invalid_pdf': "Ce fichier n'est pas un PDF lisible.",
'home.import.error_no_attachment':
"Ce PDF n'a pas été généré par Faunosteo (pas de données détectées).",
'home.import.error_incompatible_version':
"Ce PDF est au format v{version}, incompatible avec la version actuelle (v2). Réexportez le bilan depuis une version récente de l'application.",
"Ce PDF est au format v{version}, que cette version de l'application ne sait pas lire (formats acceptés : v2 et v3).",
'home.import.migrated':
'Bilan importé depuis un ancien format. Constats non retrouvés dans la fiche actuelle : {count} (conservés avec leurs libellés).',
'home.no_sheet.title': 'Aucune fiche anatomique',
'home.no_sheet.description':
"Cette version de l'application n'embarque aucune fiche anatomique : aucun bilan ne peut être créé ni importé.",
// footer
'footer.all_rights_reserved': 'Tous droits réservés.',
'footer.powered_by': 'Propulsé par',
'footer.editors': 'Éditeurs',
'footer.in_partnership': 'En partenariat avec',
// editors page
'editors.svg.title': 'Éditeur SVG',
'editors.svg.description':
'Annoter un fichier SVG anatomique : ajouter des zones cliquables, catégories et labels FR/EN.',
'editors.svg.cta': 'Ouvrir',
'editors.pathology.title': 'Éditeur de pathologies',
'editors.pathology.description':
'Créer et modifier le référentiel de pathologies (arbre JSON) pour une espèce.',
'editors.pathology.cta': 'Ouvrir',
// not found
'not_found.title': 'Page introuvable',
'not_found.description': "Le chemin demandé n'existe pas.",
@@ -61,14 +55,15 @@ export const fr: Dict = {
// editor
'editor.export': 'Exporter en PDF',
'editor.exporting': 'Génération…',
'editor.export_failed': 'Échec de la génération du PDF. Réessayez ou contactez le support.',
'editor.export_failed':
'Échec de la génération du PDF. Réessayez ou contactez le support.',
'editor.edit_infos': 'Modifier les infos',
'editor.edit_dialog_title': 'Modifier les informations',
'editor.disclaimer_title': "Périmètre légal de l'ostéopathie animale",
'editor.detail_title_prefix': 'Détail — ',
// detail modal
'detail.click_to_add': "Cliquez sur les zones pour les ajouter à l'observation en cours.",
'detail.click_to_add':
"Cliquez sur les zones pour les ajouter à l'observation en cours.",
// observation list / card
'observation.section_title': 'Observations',
@@ -81,9 +76,11 @@ export const fr: Dict = {
'observation.finding_label_singular': 'constat',
'observation.finding_label_plural': 'constats',
'observation.zones_label': 'Zones sélectionnées',
'observation.zones_empty': 'Cliquez sur les zones du schéma pour les ajouter à cette observation.',
'observation.zones_empty':
'Cliquez sur les zones du schéma pour les ajouter à cette observation.',
'observation.findings_catalog_label': 'Constats (référentiel)',
'observation.findings_pick_zone_first': 'Sélectionnez une zone pour accéder au référentiel.',
'observation.findings_pick_zone_first':
'Sélectionnez une zone pour accéder au référentiel.',
'observation.findings_no_catalog':
'Aucun référentiel disponible pour ces zones. Utilisez le texte libre ci-dessous.',
'observation.findings_free_label': 'Constats (texte libre)',
@@ -93,7 +90,8 @@ export const fr: Dict = {
'observation.comment_label': 'Commentaire',
'observation.comment_placeholder': 'Notes cliniques détaillées…',
'observation.vertebrae_button': 'Vertèbres…',
'observation.vertebrae_button_title': 'Préciser les vertèbres pour cette zone',
'observation.vertebrae_button_title':
'Préciser les vertèbres pour cette zone',
'observation.remove_zone': 'Retirer',
'observation.expand_aria': "Développer l'observation",
'observation.collapse_aria': "Réduire l'observation",
@@ -132,13 +130,26 @@ export const fr: Dict = {
// vertebra picker
'vertebra.title_prefix': 'Préciser les vertèbres — ',
'vertebra.region.C': 'Cervicales',
'vertebra.region.T': 'Thoraciques',
'vertebra.region.L': 'Lombaires',
'vertebra.region.S': 'Sacrales',
'vertebra.region.Cd': 'Caudales',
'vertebra.check_all': 'Tout cocher',
'vertebra.uncheck_all': 'Tout décocher',
'vertebra.extend_to': "Afficher jusqu'à {max}",
'vertebra.range_note':
'Nombre usuel : {usual} ; variation documentée : {min} à {max}.',
// sheet
'sheet.status.draft':
'Fiche anatomique : brouillon de référence, non validé médicalement',
'sheet.status.published': 'Fiche anatomique officielle',
'sheet.loading': 'Chargement de la fiche anatomique…',
// unresolved (migrated) data
'observation.unresolved_short': 'hérité',
'observation.zone_unresolved':
"Zone héritée d'un ancien bilan, absente de la fiche actuelle",
'observation.findings_unresolved_label':
'Constats hérités (hors référentiel actuel)',
'observation.findings_unresolved_help':
"Constats importés d'un ancien bilan dont le chemin n'existe plus dans la fiche : conservés avec leurs libellés d'origine.",
// laterality
'lateral.which_side': 'Quel côté ?',
@@ -150,9 +161,9 @@ export const fr: Dict = {
// severity
'severity.aria': 'Sévérité',
'severity.légère': 'légère',
'severity.modérée': 'modérée',
'severity.sévère': 'sévère',
'severity.mild': 'légère',
'severity.moderate': 'modérée',
'severity.severe': 'sévère',
// pdf
'pdf.eyebrow.observation': 'OBSERVATION',
@@ -180,77 +191,4 @@ export const fr: Dict = {
'lang.switch_to_en': 'Switch to English',
'lang.fr': 'FR',
'lang.en': 'EN',
// svg editor
'svg_editor.title': 'Editeur SVG anatomique',
'svg_editor.subtitle': 'Points, zones & catégories cliquables',
'svg_editor.file': 'Fichier',
'svg_editor.choose_file': 'Choisir un fichier SVG',
'svg_editor.change_file': 'Changer de fichier SVG',
'svg_editor.export': 'Exporter le SVG',
'svg_editor.mode': 'Mode',
'svg_editor.mode_select': 'Sélectionner / déplacer',
'svg_editor.mode_point': 'Ajouter un point',
'svg_editor.mode_polygon': 'Ajouter un polygone',
'svg_editor.validate_polygon': 'Valider le polygone (Entrée)',
'svg_editor.cancel_polygon': 'Annuler (Echap)',
'svg_editor.category_for_new': 'Catégorie des nouveaux éléments',
'svg_editor.categories': 'Catégories',
'svg_editor.shared_color': '(couleur partagée)',
'svg_editor.category_placeholder': 'Nom de catégorie',
'svg_editor.selected_element': 'Elément sélectionné',
'svg_editor.opens_detail': 'Cette zone ouvre une vue détaillée',
'svg_editor.detail_id_label': 'ID vue détaillée (ex. head, front-leg)',
'svg_editor.detail_id_placeholder': 'head',
'svg_editor.name_fr': 'Nom français',
'svg_editor.name_fr_placeholder': 'ex: Hanche',
'svg_editor.name_en': 'Nom anglais',
'svg_editor.name_en_placeholder': 'ex: Hip joint',
'svg_editor.category': 'Catégorie',
'svg_editor.radius': 'Rayon (cercle)',
'svg_editor.fill_opacity': 'Opacité du remplissage',
'svg_editor.polygon_editing': 'Edition du polygone :',
'svg_editor.polygon_drag': 'Glissez une poignée jaune pour la déplacer',
'svg_editor.polygon_insert': 'Cliquez une poignée blanche pour insérer un sommet',
'svg_editor.polygon_delete': 'Alt+clic ou clic droit sur une poignée jaune pour la supprimer',
'svg_editor.redraw_polygon': 'Redessiner ce polygone',
'svg_editor.delete': 'Supprimer',
'svg_editor.elements': 'Eléments',
'svg_editor.filter_placeholder': 'Filtrer...',
'svg_editor.welcome_title': 'Editeur SVG anatomique',
'svg_editor.welcome_text': 'Importez un fichier SVG pour commencer. Si votre fichier contient déjà des points/zones avec ',
'svg_editor.welcome_text_suffix': ', ils seront détectés et configurés automatiquement.',
'svg_editor.welcome_drag_hint': 'ou glissez-déposez un fichier SVG n\'importe où',
'svg_editor.no_categories': 'Aucune catégorie. Utilisez le formulaire ci-dessous pour en ajouter une.',
'svg_editor.new_point_fr': 'Nouveau point',
'svg_editor.new_point_en': 'New point',
'svg_editor.new_zone_fr': 'Nouvelle zone',
'svg_editor.new_zone_en': 'New zone',
'svg_editor.alert_drop_svg': 'Déposez un fichier SVG.',
'svg_editor.alert_invalid_svg': 'Fichier invalide : aucun élément SVG trouvé.',
'svg_editor.alert_min_3': 'Il faut au moins 3 points.',
'svg_editor.alert_min_3_vertices': 'Un polygone doit avoir au moins 3 sommets.',
'svg_editor.alert_upload_first': 'Importez d\'abord un SVG.',
'svg_editor.alert_no_svg_loaded': 'Aucun SVG chargé. Importez d\'abord un fichier.',
'svg_editor.alert_cat_name_required': 'Donnez un nom à la catégorie.',
'svg_editor.alert_cat_invalid_name': 'Nom invalide.',
'svg_editor.alert_cat_exists': 'Cette catégorie existe déjà.',
'svg_editor.confirm_delete_element': 'Supprimer cet élément ?',
'svg_editor.confirm_delete_cat': 'Supprimer la catégorie "{name}" ?',
'svg_editor.confirm_delete_cat_count': '\n\nElle contient {count} élément(s) qui seront aussi supprimés.',
'svg_editor.confirm_redraw': 'Effacer ce polygone et le redessiner ?',
'svg_editor.handle_drag': 'Glisser pour déplacer | Alt+clic ou clic droit pour supprimer',
'svg_editor.handle_insert': 'Cliquez pour insérer un sommet ici',
'svg_editor.polygon_vertices': 'polygone ({count} sommets)',
'svg_editor.drop_svg_here': 'Déposez le SVG ici',
'svg_editor.lateral': 'Latéralité',
'svg_editor.lateral_unpaired': 'Unilatéral (pas de côté)',
'svg_editor.lateral_bilateral': 'Bilatéral (gauche / droite)',
'svg_editor.source_project': 'SVG du projet',
'svg_editor.source_upload': 'Importer un fichier',
'svg_editor.species': 'Espèce',
'svg_editor.view': 'Vue',
'svg_editor.view_main': 'Corps entier',
'svg_editor.view_detail': 'Détail : {name}',
'svg_editor.load': 'Charger',
}
+2 -1
View File
@@ -18,7 +18,8 @@ export function formatDate(isoDate: string, locale: Locale): string {
if (!match) throw new Error(`Invalid ISO date: ${isoDate}`)
const [, y, mo, d] = match
const date = new Date(Date.UTC(Number(y), Number(mo) - 1, Number(d)))
if (Number.isNaN(date.getTime())) throw new Error(`Invalid ISO date: ${isoDate}`)
if (Number.isNaN(date.getTime()))
throw new Error(`Invalid ISO date: ${isoDate}`)
return new Intl.DateTimeFormat(LOCALE_TAG[locale], {
day: 'numeric',
month: 'long',
-131
View File
@@ -1,131 +0,0 @@
import type {
ObservationZone,
Vertebra,
VertebralRegion,
} from '@/domain/schema/observation'
import type { Bone } from '@/anatomy/types'
/**
* Infers the matching vertebral region from a free-form anatomical label
* (zone name in FR or EN). Matches on substring roots, case-insensitive,
* accent-insensitive. Returns undefined when no root matches.
*/
export function regionFromLabel(label: string): VertebralRegion | undefined {
const norm = label
.normalize('NFD')
.replace(/\p{Diacritic}/gu, '')
.toLowerCase()
if (norm.includes('cervic')) return 'C'
if (norm.includes('thorac') || norm.includes('dors')) return 'T'
if (norm.includes('lombair') || norm.includes('lumbar')) return 'L'
if (norm.includes('sacral') || norm.includes('sacre')) return 'S'
if (norm.includes('caudal') || norm.includes('coccyg')) return 'Cd'
return undefined
}
/**
* Finds the spine-zone boneId whose label maps to the given vertebral region.
* Spine zones are the SVG elements flagged data-anno-special="vertebral-precision".
* Returns undefined when the SVG exposes no zone for that region.
*/
export function findSpineZoneId(
region: VertebralRegion,
bones: Map<string, Bone>,
): string | undefined {
for (const [id, bone] of bones) {
if (bone.special !== 'vertebral-precision') continue
const r = regionFromLabel(bone.fr) ?? regionFromLabel(bone.en)
if (r === region) return id
}
return undefined
}
const key = (v: Vertebra) => `${v.region}${v.index}`
const isSpineZone = (z: ObservationZone, bones: Map<string, Bone>) =>
!z.detailSourceId && bones.get(z.boneId)?.special === 'vertebral-precision'
/**
* Gathers the union of vertebrae across every spine zone of an observation so
* the picker can show selections from all regions at once. `priorityBoneId`'s
* vertebrae are listed first so the picker opens on the clicked zone's tab
* (the picker keys its default tab off the first vertebra's region).
*
* Deduplicated by region+index; order otherwise follows zone order.
*/
export function collectSpineVertebrae(
zones: ObservationZone[],
bones: Map<string, Bone>,
priorityBoneId?: string,
): Vertebra[] {
const spine = zones.filter((z) => isSpineZone(z, bones))
const ordered = priorityBoneId
? [
...spine.filter((z) => z.boneId === priorityBoneId),
...spine.filter((z) => z.boneId !== priorityBoneId),
]
: spine
const out: Vertebra[] = []
const seen = new Set<string>()
for (const z of ordered) {
for (const v of z.vertebrae ?? []) {
if (seen.has(key(v))) continue
seen.add(key(v))
out.push(v)
}
}
return out
}
/**
* Reconciles the observation's spine zones with the full set of vertebrae the
* picker confirmed (the picker shows and edits every region at once).
*
* Authoritative per region: each region's zone gets exactly the vertebrae
* picked for it (replace, so unchecking sticks); a region with no vertebrae
* left has its spine zone pruned; a region picked for the first time spawns its
* zone so the SVG highlights it and its findings picker appears. Non-spine
* zones (and their order) are preserved untouched.
*
* Returns a new zones array; the original is not mutated.
*/
export function syncSpineZones(
zones: ObservationZone[],
vertebrae: Vertebra[],
bones: Map<string, Bone>,
): ObservationZone[] {
const byRegion = new Map<VertebralRegion, Vertebra[]>()
for (const v of vertebrae) {
byRegion.set(v.region, [...(byRegion.get(v.region) ?? []), v])
}
const result: ObservationZone[] = []
const handled = new Set<VertebralRegion>()
for (const z of zones) {
const bone = bones.get(z.boneId)
const region =
!z.detailSourceId && bone?.special === 'vertebral-precision'
? (regionFromLabel(bone.fr) ?? regionFromLabel(bone.en))
: undefined
// Non-spine, detail-sourced, or unrecognized-label zones pass through.
if (!region) {
result.push(z)
continue
}
const verts = byRegion.get(region)
if (!verts) continue // region deselected to zero → prune the zone
result.push({ ...z, vertebrae: verts })
handled.add(region)
}
// Regions picked that had no existing zone yet → spawn one.
for (const [region, verts] of byRegion) {
if (handled.has(region)) continue
const zoneId = findSpineZoneId(region, bones)
if (zoneId) result.push({ boneId: zoneId, vertebrae: verts })
}
return result
}
-130
View File
@@ -1,130 +0,0 @@
import type { ZoneFindings } from '@/domain/schema/findings'
/**
* Bridges SVG anatomy labels to the JSON findings catalog when the two
* carry slightly different strings (casse, accents, abbreviations like
* "(ATM)" vs "Articulation Temporo-Mandibulaire (ATM)", or genuine typos).
*
* Strategy: normalize aggressively (lowercase + NFD-strip accents + drop
* non-alphanumerics), then score each (boneLabel, zoneLabel) pair:
*
* 0 exact normalized match
* 1 one normalized string is contained in the other (substring)
* 2+d Levenshtein distance d, within a length-relative threshold
* ∞ beyond tolerance — discarded
*
* Language strategy: English first (no accents → fewer normalization
* edge cases), French as fallback, fuzzy matching across both languages
* as last resort. Falls through silently when nothing matches.
*/
export function normalizeLabel(s: string | undefined | null): string {
if (!s) return ''
return s
.toLowerCase()
.normalize('NFD')
.replace(/[\u0300-\u036f]/g, '')
.replace(/[^a-z0-9]+/g, '')
}
export function levenshtein(a: string, b: string): number {
if (a === b) return 0
const al = a.length
const bl = b.length
if (al === 0) return bl
if (bl === 0) return al
let prev: number[] = new Array(bl + 1)
let curr: number[] = new Array(bl + 1)
for (let j = 0; j <= bl; j += 1) prev[j] = j
for (let i = 1; i <= al; i += 1) {
curr[0] = i
for (let j = 1; j <= bl; j += 1) {
const cost = a.charCodeAt(i - 1) === b.charCodeAt(j - 1) ? 0 : 1
curr[j] = Math.min(prev[j] + 1, curr[j - 1] + 1, prev[j - 1] + cost)
}
const tmp = prev
prev = curr
curr = tmp
}
return prev[bl]
}
const SCORE_EXACT = 0
const SCORE_SUBSTRING = 1
const SCORE_FUZZY_BASE = 2
const SCORE_NO_MATCH = Number.POSITIVE_INFINITY
/**
* Compares two raw labels after normalization. Lower scores beat higher
* ones; SCORE_NO_MATCH means the inputs are too dissimilar to be linked
* confidently.
*/
export function scorePair(boneLabel: string, zoneLabel: string): number {
const a = normalizeLabel(boneLabel)
const b = normalizeLabel(zoneLabel)
if (!a || !b) return SCORE_NO_MATCH
if (a === b) return SCORE_EXACT
if (a.includes(b) || b.includes(a)) return SCORE_SUBSTRING
const distance = levenshtein(a, b)
const longest = Math.max(a.length, b.length)
// 25% character tolerance, with a minimum of 2 edits so short labels
// (e.g. "Hip") still admit one typo without exploding into the matcher.
const threshold = Math.max(2, Math.floor(longest * 0.25))
if (distance > threshold) return SCORE_NO_MATCH
return SCORE_FUZZY_BASE + distance
}
export interface BoneLabels {
fr: string
en: string
}
interface ScoredZone {
zone: ZoneFindings
score: number
}
function bestOnLanguage(
boneLabel: string,
zones: ZoneFindings[],
pickZoneLabel: (zone: ZoneFindings) => string,
): ScoredZone | undefined {
let best: ScoredZone | undefined
for (const zone of zones) {
const score = scorePair(boneLabel, pickZoneLabel(zone))
if (score === SCORE_NO_MATCH) continue
if (!best || score < best.score) best = { zone, score }
}
return best
}
/**
* Pick the findings tree most likely to describe a clicked SVG zone.
*
* 1. If the English bone label exactly matches (or is contained in) an
* English zone label, return that zone — cheapest, most reliable.
* 2. Otherwise try the same on the French side.
* 3. As a last resort, take the lowest fuzzy score across all four
* (bone-lang, zone-lang) pairings.
*/
export function matchZoneFindings(
bone: BoneLabels,
zones: ZoneFindings[],
): ZoneFindings | undefined {
if (zones.length === 0) return undefined
const enOnEn = bestOnLanguage(bone.en, zones, (z) => z.name_en)
if (enOnEn && enOnEn.score <= SCORE_SUBSTRING) return enOnEn.zone
const frOnFr = bestOnLanguage(bone.fr, zones, (z) => z.name_fr)
if (frOnFr && frOnFr.score <= SCORE_SUBSTRING) return frOnFr.zone
const enOnFr = bestOnLanguage(bone.en, zones, (z) => z.name_fr)
const frOnEn = bestOnLanguage(bone.fr, zones, (z) => z.name_en)
const candidates = [enOnEn, frOnFr, enOnFr, frOnEn].filter(
(x): x is ScoredZone => x !== undefined,
)
if (candidates.length === 0) return undefined
candidates.sort((a, b) => a.score - b.score)
return candidates[0].zone
}
+81 -33
View File
@@ -1,59 +1,92 @@
import { AFRelationship, type PDFDocument } from 'pdf-lib'
import { ReportSchema, type Report } from '@/domain/schema/report'
import {
readReportDocument,
REPORT_VERSION,
UnsupportedReportVersionError,
type MigrationOutcome,
type Report,
type ReportMigrationMap,
} from '@faunosteo/domain'
/**
* The report document travels inside the PDF as a native attachment.
* Written as v3; read back as v3, or as v2 migrated through the sheet's
* migration map (the practitioner's archive). Any other version is refused
* with the found version.
*/
const FILENAME = 'osteo-report.json'
/**
* Internal sentinel raised when the attached JSON's `version` field is
* present but not 2. The UI-facing message is composed by the importer
* caller against the active i18n dict — this error only carries the
* discriminating data.
*/
export class IncompatibleReportVersionError extends Error {
constructor(public readonly foundVersion: number) {
super(`incompatible_version:${foundVersion}`)
constructor(public readonly foundVersion: number | null) {
super(`incompatible_version:${foundVersion ?? 'unknown'}`)
this.name = 'IncompatibleReportVersionError'
}
}
export async function attachReportJson(pdfDoc: PDFDocument, report: Report): Promise<void> {
export async function attachReportJson(
pdfDoc: PDFDocument,
report: Report,
): Promise<void> {
const bytes = new TextEncoder().encode(JSON.stringify(report, null, 2))
await pdfDoc.attach(bytes, FILENAME, {
mimeType: 'application/json',
description: 'Faunosteo state v2',
description: `Faunosteo state v${REPORT_VERSION}`,
creationDate: new Date(),
modificationDate: new Date(),
afRelationship: AFRelationship.Data,
})
}
export async function extractReportJson(pdfDoc: PDFDocument): Promise<Report> {
const maybeApi = pdfDoc as unknown as { getAttachments?: () => Array<{ name: string; data: Uint8Array }> }
export interface ExtractedReport extends MigrationOutcome {
/** True when the attachment was an older version lifted to v3. */
migrated: boolean
}
export async function extractReportJson(
pdfDoc: PDFDocument,
map: ReportMigrationMap,
): Promise<ExtractedReport> {
const maybeApi = pdfDoc as unknown as {
getAttachments?: () => Array<{ name: string; data: Uint8Array }>
}
if (typeof maybeApi.getAttachments === 'function') {
const list = maybeApi.getAttachments()
if (list && list.length) {
const hit = list.find((a) => a.name.startsWith('osteo-report') && a.name.endsWith('.json')) ?? list[0]
return parseAttachment(hit.data)
const hit =
list.find(
(a) => a.name.startsWith('osteo-report') && a.name.endsWith('.json'),
) ?? list[0]
return parseAttachment(hit.data, map)
}
}
const fallback = await traverseForJsonAttachment(pdfDoc)
if (!fallback) throw new Error('No osteo-report attachment found')
return parseAttachment(fallback)
return parseAttachment(fallback, map)
}
function parseAttachment(bytes: Uint8Array): Report {
const text = new TextDecoder().decode(bytes)
const data: unknown = JSON.parse(text)
if (
function parseAttachment(
bytes: Uint8Array,
map: ReportMigrationMap,
): ExtractedReport {
const data: unknown = JSON.parse(new TextDecoder().decode(bytes))
const version =
data !== null &&
typeof data === 'object' &&
'version' in data &&
typeof (data as { version: unknown }).version === 'number' &&
(data as { version: number }).version !== 2
) {
throw new IncompatibleReportVersionError((data as { version: number }).version)
typeof (data as { version?: unknown }).version === 'number'
? (data as { version: number }).version
: null
try {
return {
...readReportDocument(data, map),
migrated: version !== REPORT_VERSION,
}
} catch (err) {
if (err instanceof UnsupportedReportVersionError) {
throw new IncompatibleReportVersionError(err.foundVersion)
}
throw err
}
return ReportSchema.parse(data)
}
interface RawObj {
@@ -68,10 +101,14 @@ interface RawObj {
const MAX_INFLATED_BYTES = 16 * 1024 * 1024
/** Exported for tests. Returns null on failure or when the cap is exceeded. */
export async function inflateFlate(bytes: Uint8Array): Promise<Uint8Array | null> {
export async function inflateFlate(
bytes: Uint8Array,
): Promise<Uint8Array | null> {
if (typeof DecompressionStream === 'undefined') return null
try {
const stream = new Blob([bytes as BlobPart]).stream().pipeThrough(new DecompressionStream('deflate'))
const stream = new Blob([bytes as BlobPart])
.stream()
.pipeThrough(new DecompressionStream('deflate'))
const reader = stream.getReader()
const chunks: Uint8Array[] = []
let total = 0
@@ -99,13 +136,20 @@ export async function inflateFlate(bytes: Uint8Array): Promise<Uint8Array | null
function dictHasFlateFilter(entries: Array<[unknown, unknown]>): boolean {
for (const [k, v] of entries) {
if (String(k).includes('Filter') && String(v).includes('FlateDecode')) return true
if (String(k).includes('Filter') && String(v).includes('FlateDecode'))
return true
}
return false
}
async function traverseForJsonAttachment(pdfDoc: PDFDocument): Promise<Uint8Array | null> {
const ctx = (pdfDoc as unknown as { context: { enumerateIndirectObjects(): Array<[unknown, RawObj]> } }).context
async function traverseForJsonAttachment(
pdfDoc: PDFDocument,
): Promise<Uint8Array | null> {
const ctx = (
pdfDoc as unknown as {
context: { enumerateIndirectObjects(): Array<[unknown, RawObj]> }
}
).context
for (const [, obj] of ctx.enumerateIndirectObjects()) {
if (!obj || typeof obj !== 'object') continue
if (!(obj.contents instanceof Uint8Array)) continue
@@ -115,9 +159,13 @@ async function traverseForJsonAttachment(pdfDoc: PDFDocument): Promise<Uint8Arra
for (const [k, v] of entries) {
const ks = String(k)
const vs = String(v)
if (ks.includes('Type') && vs.includes('EmbeddedFile')) isEmbeddedFile = true
if (ks.includes('Type') && vs.includes('EmbeddedFile'))
isEmbeddedFile = true
// PDF name syntax escapes '/' as '#2F': /application#2Fjson
if (ks.includes('Subtype') && (vs.includes('application/json') || vs.includes('application#2Fjson'))) {
if (
ks.includes('Subtype') &&
(vs.includes('application/json') || vs.includes('application#2Fjson'))
) {
isJsonSubtype = true
}
}
+18 -90
View File
@@ -1,94 +1,32 @@
import { PDFDocument } from 'pdf-lib'
import type { Report } from '@/domain/schema/report'
import type { SpeciesFindings } from '@/domain/schema/findings'
import type { Report } from '@faunosteo/domain'
import type { Locale } from '@/i18n/types'
import { getDict } from '@/i18n'
import type { SheetIndex } from '@/services/sheetIndex'
import { embedFonts } from './fonts'
import { addObservationPage } from './render/observationPage'
import { addConclusionPage } from './render/conclusionPage'
import { attachReportJson } from './attachment'
import { drawFooter } from './render/footer'
import { loadFaunosteoLogo, loadFaunosteoComLogo, loadZenqualityLogo } from './render/logo'
import {
loadFaunosteoLogo,
loadFaunosteoComLogo,
loadZenqualityLogo,
} from './render/logo'
import { rasterizeSvg } from './render/svgToPng'
import { loadSvg } from '@/anatomy/svgLoader'
import { parseSvgBones } from '@/anatomy/svgConvention'
import { getSpecies } from '@/domain/species/registry'
export interface PdfExportOptions {
locale: Locale
}
/** Bilingual label pair surfaced to the PDF render layer. */
export interface ZoneLabelPair {
fr: string
en: string
}
/**
* Builds a `data-anno-id → { fr, en }` map by parsing every SVG the
* species manifest knows about. Each SVG is loaded independently so a
* failure on the detail asset never prevents the main labels (or vice
* versa) from making it into the returned map. The PDF render layer
* picks the locale-appropriate label at draw time (falls back to the
* opposite language when one side is missing).
*
* Exported for unit testing — the editor calls it indirectly via
* `exportReportToPdf`.
* Exports a report to PDF from the in-memory document and the loaded sheet:
* labels and drawings come from the sheet, nothing is fetched except the
* partner logos. The v3 document is attached for re-import.
*/
export async function buildZoneLabels(
report: Report,
): Promise<Map<string, ZoneLabelPair>> {
const labels = new Map<string, ZoneLabelPair>()
const species = getSpecies(report.animal.speciesId)
if (!species) return labels
const sources: string[] = [
species.mainSvg,
...Object.values(species.details),
]
await Promise.all(
sources.map(async (src) => {
try {
const root = await loadSvg(src)
parseSvgBones(root).forEach((b, id) => {
const existing = labels.get(id)
if (existing) {
if (!existing.fr && b.fr) existing.fr = b.fr
if (!existing.en && b.en) existing.en = b.en
} else if (b.fr || b.en) {
labels.set(id, { fr: b.fr, en: b.en })
}
})
} catch (err) {
console.warn(`buildZoneLabels: skipped ${src}`, err)
}
}),
)
return labels
}
/**
* Loads the parsed findings catalog for a species so the PDF renderer
* can resolve a Finding's `zoneId` (JSON catalog key) back to its
* human-readable zone name.
*/
async function loadSpeciesFindings(
speciesId: string,
): Promise<SpeciesFindings | null> {
const species = getSpecies(speciesId)
if (!species) return null
try {
const m = await species.findings()
return m.default
} catch (err) {
console.warn(`loadSpeciesFindings: failed for ${speciesId}`, err)
return null
}
}
export async function exportReportToPdf(
report: Report,
sheet: SheetIndex,
opts: PdfExportOptions,
): Promise<Uint8Array> {
const { locale } = opts
@@ -101,53 +39,43 @@ export async function exportReportToPdf(
pdfDoc.setModificationDate(new Date())
const fonts = await embedFonts(pdfDoc)
const zoneLabels = await buildZoneLabels(report)
const findingsTree = await loadSpeciesFindings(report.animal.speciesId)
let headerLogoPdf = null
let footerLogoPdf = null
let zqLogoPdfImage = null
let pawsLogoPdf = null
try {
const bytes = await loadFaunosteoLogo()
headerLogoPdf = await pdfDoc.embedPng(bytes)
headerLogoPdf = await pdfDoc.embedPng(await loadFaunosteoLogo())
} catch (err) {
console.warn('Faunosteo logo embed failed:', err)
}
try {
const bytes = await loadFaunosteoComLogo()
footerLogoPdf = await pdfDoc.embedPng(bytes)
footerLogoPdf = await pdfDoc.embedPng(await loadFaunosteoComLogo())
} catch (err) {
console.warn('Faunosteo -com logo embed failed:', err)
}
try {
const zqPngBytes = await loadZenqualityLogo()
zqLogoPdfImage = await pdfDoc.embedPng(zqPngBytes)
zqLogoPdfImage = await pdfDoc.embedPng(await loadZenqualityLogo())
} catch (err) {
console.warn('ZenQuality logo embed failed:', err)
}
try {
const resp = await fetch('/Paws_in_harmony.svg')
if (!resp.ok) throw new Error(`Paws logo fetch failed: HTTP ${resp.status}`)
const svgText = await resp.text()
const pawsPngBytes = await rasterizeSvg(svgText)
pawsLogoPdf = await pdfDoc.embedPng(pawsPngBytes)
pawsLogoPdf = await pdfDoc.embedPng(await rasterizeSvg(await resp.text()))
} catch (err) {
console.warn('Paws in Harmony logo embed failed:', err)
}
const headerAssets = { logoPng: headerLogoPdf }
const totalObs = report.observations.length
for (let i = 0; i < totalObs; i += 1) {
for (let i = 0; i < report.observations.length; i += 1) {
await addObservationPage({
pdfDoc,
report,
observation: report.observations[i],
observation: report.observations[i]!,
obsIndex: i,
fonts,
zoneLabels,
findingsTree,
sheet,
locale,
headerAssets,
})
+17 -5
View File
@@ -1,6 +1,10 @@
import { PDFDocument } from 'pdf-lib'
import { extractReportJson, IncompatibleReportVersionError } from './attachment'
import type { Report } from '@/domain/schema/report'
import type { ReportMigrationMap } from '@faunosteo/domain'
import {
extractReportJson,
IncompatibleReportVersionError,
type ExtractedReport,
} from './attachment'
export type ImportErrorKind =
| 'invalid_pdf'
@@ -15,14 +19,22 @@ export type ImportErrorKind =
export class ImportError extends Error {
constructor(
public readonly kind: ImportErrorKind,
public readonly foundVersion?: number,
public readonly foundVersion?: number | null,
) {
super(kind)
this.name = 'ImportError'
}
}
export async function importReportFromPdf(pdfBytes: Uint8Array): Promise<Report> {
/**
* Reads a Faunosteo PDF back into a report document (v3, or v2 migrated
* through the reference sheet's map). The outcome says whether a migration
* happened and how many zones or findings it could not place.
*/
export async function importReportFromPdf(
pdfBytes: Uint8Array,
map: ReportMigrationMap,
): Promise<ExtractedReport> {
let pdfDoc: PDFDocument
try {
pdfDoc = await PDFDocument.load(pdfBytes, { ignoreEncryption: true })
@@ -30,7 +42,7 @@ export async function importReportFromPdf(pdfBytes: Uint8Array): Promise<Report>
throw new ImportError('invalid_pdf')
}
try {
return await extractReportJson(pdfDoc)
return await extractReportJson(pdfDoc, map)
} catch (err) {
if (err instanceof IncompatibleReportVersionError) {
throw new ImportError('incompatible_version', err.foundVersion)
+14 -4
View File
@@ -1,6 +1,6 @@
import { PageSizes, type PDFDocument } from 'pdf-lib'
import type { EmbeddedFonts } from '@/pdf/fonts'
import type { Report } from '@/domain/schema/report'
import type { Report } from '@faunosteo/domain'
import type { Locale } from '@/i18n/types'
import { getDict } from '@/i18n'
import { drawHeader, type HeaderAssets } from './header'
@@ -61,9 +61,19 @@ export async function addConclusionPage(
let cursorY = titleY - SECTION_TOP_GAP
const sections: Array<{ label: string; body: string; color?: typeof COLOR_INK }> = [
{ label: dict['pdf.section.conclusion'], body: report.conclusion || dict['pdf.empty'] },
{ label: dict['pdf.section.recommendations'], body: report.recommendations || dict['pdf.empty'] },
const sections: Array<{
label: string
body: string
color?: typeof COLOR_INK
}> = [
{
label: dict['pdf.section.conclusion'],
body: report.conclusion || dict['pdf.empty'],
},
{
label: dict['pdf.section.recommendations'],
body: report.recommendations || dict['pdf.empty'],
},
]
if (report.nextAppointment) {
const txt =
+10 -3
View File
@@ -55,7 +55,10 @@ export function drawFooter(
}
const poweredLabel = `${dict['footer.powered_by']} `
const poweredLabelW = fonts.bodyRegular.widthOfTextAtSize(poweredLabel, FONT_SIZE)
const poweredLabelW = fonts.bodyRegular.widthOfTextAtSize(
poweredLabel,
FONT_SIZE,
)
const zqLogoW = 70
const zqLogoH = 16
const zqFallback = 'zenquality.fr'
@@ -106,12 +109,16 @@ export function drawFooter(
}
const partnerLabel = `${dict['footer.in_partnership']} `
const partnerLabelW = fonts.bodyRegular.widthOfTextAtSize(partnerLabel, FONT_SIZE)
const partnerLabelW = fonts.bodyRegular.widthOfTextAtSize(
partnerLabel,
FONT_SIZE,
)
const partnerUrl = 'https://www.instagram.com/paws.iin.harmony'
if (assets.pawsLogoPng) {
const pawsLogoH = 16
const pawsLogoW = pawsLogoH * (assets.pawsLogoPng.width / assets.pawsLogoPng.height)
const pawsLogoW =
pawsLogoH * (assets.pawsLogoPng.width / assets.pawsLogoPng.height)
const partnerX = width - MARGIN_X - partnerLabelW - pawsLogoW
page.drawText(partnerLabel, {
x: partnerX,
+1 -1
View File
@@ -1,6 +1,6 @@
import type { PDFPage, PDFImage } from 'pdf-lib'
import type { EmbeddedFonts } from '@/pdf/fonts'
import type { Report } from '@/domain/schema/report'
import type { Report } from '@faunosteo/domain'
import type { Locale } from '@/i18n/types'
import { getDict } from '@/i18n'
import { formatDate } from '@/lib/dates'
+174 -198
View File
@@ -1,19 +1,25 @@
import { rgb, PageSizes, type PDFDocument, type PDFPage, type PDFImage } from 'pdf-lib'
import {
rgb,
PageSizes,
type PDFDocument,
type PDFPage,
type PDFImage,
} from 'pdf-lib'
import type {
Finding,
Observation,
Report,
ReportZone,
Severity,
} from '@faunosteo/domain'
import type { EmbeddedFonts } from '@/pdf/fonts'
import type { Report } from '@/domain/schema/report'
import type { Finding, Observation } from '@/domain/schema/observation'
import type { SpeciesFindings } from '@/domain/schema/findings'
import type { SpeciesManifest } from '@/domain/species/types'
import type { Locale, Dict } from '@/i18n/types'
import { getDict } from '@/i18n'
import { pickLocaleLabel } from '@/i18n/pickLocaleLabel'
import type { ZoneLabelPair } from '@/pdf/export'
import { pickLabel, type SheetIndex } from '@/services/sheetIndex'
import { buildViewSvg } from '@/anatomy/drawing'
import { drawHeader, type HeaderAssets } from './header'
import { rasterizeSvg } from './svgToPng'
import { wrapLines } from './text'
import { loadSvg } from '@/anatomy/svgLoader'
import { parseSvgBones } from '@/anatomy/svgConvention'
import { getSpecies } from '@/domain/species/registry'
import {
MARGIN_X,
EYEBROW_Y_OFFSET,
@@ -39,10 +45,10 @@ const SECTION_BLOCK_GAP = 10
const COLOR_WHITE = rgb(1, 1, 1)
const SEVERITY_BG: Record<string, ReturnType<typeof rgb>> = {
'légère': rgb(0.55, 0.65, 0.45),
'modérée': rgb(0.85, 0.55, 0.18),
'sévère': rgb(0.78, 0.20, 0.20),
const SEVERITY_BG: Record<Severity, ReturnType<typeof rgb>> = {
mild: rgb(0.55, 0.65, 0.45),
moderate: rgb(0.85, 0.55, 0.18),
severe: rgb(0.78, 0.2, 0.2),
}
const SECTION_TEXT_SIZE = 10
@@ -70,7 +76,7 @@ function countSegmentedLines(
let x = 0
for (let i = 0; i < items.length; i += 1) {
const itemW = fonts.bodyRegular.widthOfTextAtSize(
items[i],
items[i]!,
SECTION_TEXT_SIZE,
)
if (x + itemW > maxWidth && x > 0) {
@@ -92,8 +98,7 @@ function countSegmentedLines(
/**
* Renders a list of items separated by a visibly larger accent-coloured
* bullet. Returns the cursor y *below* the last line drawn so the
* caller can keep advancing the page cursor like a plain wrapLines run.
* bullet. Returns the cursor y *below* the last line drawn.
*/
function drawSegmentedText(
page: PDFPage,
@@ -105,15 +110,11 @@ function drawSegmentedText(
): number {
if (items.length === 0) return startY - TEXT_LINE_HEIGHT
const sepW = separatorWidth(fonts)
// The bullet's larger size pushes its baseline above the surrounding
// text. Shift it down a touch so it visually centers on the x-height
// of the items it separates.
const sepBaselineOffset = (SEPARATOR_SIZE - SECTION_TEXT_SIZE) * 0.3
let x = startX
let y = startY
for (let i = 0; i < items.length; i += 1) {
const item = items[i]
const item = items[i]!
const itemW = fonts.bodyRegular.widthOfTextAtSize(item, SECTION_TEXT_SIZE)
if (x + itemW > startX + maxWidth && x > startX) {
x = startX
@@ -150,22 +151,17 @@ const SVG_NS = 'http://www.w3.org/2000/svg'
const HALO_FILTER_ID = 'osteo-halo'
/**
* Adds a Gaussian-blur "halo" filter to the SVG defs the first time it
* is called on a root. The filter widens the visible footprint of the
* highlighted zones on the whole-animal view, where individual point
* markers are otherwise tiny relative to the full body silhouette.
* Adds a Gaussian-blur "halo" filter so the highlighted markers stay
* visible on the whole-animal view once rasterised at print scale.
*/
function ensureHaloFilter(root: SVGSVGElement): void {
const doc = root.ownerDocument
if (!doc) return
if (doc.getElementById(HALO_FILTER_ID)) return
if (root.querySelector(`#${HALO_FILTER_ID}`)) return
let defs = root.querySelector('defs')
if (!defs) {
defs = doc.createElementNS(SVG_NS, 'defs')
root.insertBefore(defs, root.firstChild)
}
const filter = doc.createElementNS(SVG_NS, 'filter')
filter.setAttribute('id', HALO_FILTER_ID)
filter.setAttribute('x', '-100%')
@@ -173,84 +169,63 @@ function ensureHaloFilter(root: SVGSVGElement): void {
filter.setAttribute('width', '300%')
filter.setAttribute('height', '300%')
filter.setAttribute('filterUnits', 'userSpaceOnUse')
// Two-stage blur: a wide outer halo for "spotted from across the
// room" visibility, plus a tighter inner halo that keeps the
// selection anchored to the original point so it doesn't dissolve.
const wide = doc.createElementNS(SVG_NS, 'feGaussianBlur')
wide.setAttribute('in', 'SourceGraphic')
wide.setAttribute('stdDeviation', '18')
wide.setAttribute('result', 'haloWide')
filter.appendChild(wide)
const tight = doc.createElementNS(SVG_NS, 'feGaussianBlur')
tight.setAttribute('in', 'SourceGraphic')
tight.setAttribute('stdDeviation', '8')
tight.setAttribute('result', 'haloTight')
filter.appendChild(tight)
const merge = doc.createElementNS(SVG_NS, 'feMerge')
// Stack the wide halo three times so its contribution survives the
// SVG → PNG → pdf-lib pipeline (each pass attenuates alpha) and
// still reads as a strong glow at print scale.
for (let i = 0; i < 3; i += 1) {
for (const input of [
'haloWide',
'haloWide',
'haloWide',
'haloTight',
'haloTight',
'SourceGraphic',
]) {
const n = doc.createElementNS(SVG_NS, 'feMergeNode')
n.setAttribute('in', 'haloWide')
n.setAttribute('in', input)
merge.appendChild(n)
}
for (let i = 0; i < 2; i += 1) {
const n = doc.createElementNS(SVG_NS, 'feMergeNode')
n.setAttribute('in', 'haloTight')
merge.appendChild(n)
}
const source = doc.createElementNS(SVG_NS, 'feMergeNode')
source.setAttribute('in', 'SourceGraphic')
merge.appendChild(source)
filter.appendChild(merge)
defs.appendChild(filter)
}
async function colorizedSvgString(
speciesSvgPath: string,
/**
* The view rendered from the sheet with the observation's zones of that
* view highlighted (legacy picture: accent fill, halo on the main view,
* other markers hidden, no data attributes left).
*/
export function highlightedViewSvg(
sheet: SheetIndex,
viewId: string,
observation: Observation,
sourceDetailId: string | undefined,
): Promise<string> {
const root = await loadSvg(speciesSvgPath)
const bones = parseSvgBones(root)
const selectedIds = new Set(
): string {
const selected = new Set(
observation.zones
.filter((z) => z.detailSourceId === sourceDetailId)
.map((z) => z.boneId),
.filter((z) => z.viewId === viewId)
.map((z) => z.annotationId),
)
// Whole-animal view: zone hitboxes are tiny markers on a big
// silhouette, so we apply a blurred halo to make selections pop.
// Detail views are already zoomed in and don't need it.
const applyHalo = sourceDetailId === undefined
const root = buildViewSvg(sheet, viewId, new Map())
const applyHalo = sheet.view(viewId)?.kind === 'main'
if (applyHalo) ensureHaloFilter(root)
bones.forEach((bone, id) => {
const selected = selectedIds.has(id)
bone.els.forEach((el) => {
if (selected) {
el.setAttribute('fill', '#b85a3f')
el.setAttribute('fill-opacity', '0.85')
if (applyHalo) {
el.setAttribute('filter', `url(#${HALO_FILTER_ID})`)
}
} else {
el.setAttribute('display', 'none')
}
})
})
root.querySelectorAll('[data-anno-id]').forEach((el) => {
root.querySelectorAll<Element>('[data-anno-id]').forEach((el) => {
if (selected.has(el.getAttribute('data-anno-id') ?? '')) {
el.setAttribute('fill', '#b85a3f')
el.setAttribute('fill-opacity', '0.85')
if (applyHalo) el.setAttribute('filter', `url(#${HALO_FILTER_ID})`)
} else {
el.setAttribute('display', 'none')
}
Array.from(el.attributes)
.filter((a) => a.name.startsWith('data-anno-'))
.filter((a) => a.name.startsWith('data-'))
.forEach((a) => el.removeAttribute(a.name))
})
return new XMLSerializer().serializeToString(root)
}
@@ -261,49 +236,40 @@ export interface ObservationPageContext {
observation: Observation
obsIndex: number
fonts: EmbeddedFonts
zoneLabels: Map<string, ZoneLabelPair>
findingsTree: SpeciesFindings | null
sheet: SheetIndex
locale: Locale
headerAssets: HeaderAssets
}
/** Shared draw handles threaded through the observation-page sub-renderers. */
interface PageDrawContext {
page: PDFPage
fonts: EmbeddedFonts
width: number
}
/** One rasterized anatomy view (main body or a detail popup) ready to embed. */
interface RenderedImage {
label: string
img: PDFImage
aspect: number
}
/** One label/value block drawn under the images (zones, findings, comment...). */
interface ObservationSection {
label: string
value: string
}
/**
* Draws the eyebrow, index/severity title, and accent rule for an
* observation page. Returns titleY so callers can lay out the content
* below it.
*/
function drawObservationTitleBlock(
ctx: PageDrawContext,
dict: Dict,
obsIndex: number,
severity: Observation['severity'],
severity: Severity | undefined,
): number {
const { page, fonts } = ctx
const { height } = page.getSize()
const eyebrowY = height - EYEBROW_Y_OFFSET
const titleY = height - TITLE_Y_OFFSET
const obsLabel = String(obsIndex + 1).padStart(2, '0')
page.drawText(dict['pdf.eyebrow.observation'], {
page.drawText(dict['pdf.eyebrow.observation']!, {
x: MARGIN_X,
y: eyebrowY,
size: 9,
@@ -319,14 +285,11 @@ function drawObservationTitleBlock(
})
if (severity) {
const numW = fonts.headingRegular.widthOfTextAtSize(obsLabel, 22)
const sev = severity
const sevLabel = dict[`severity.${sev}`] ?? sev
const sevText = sevLabel.toUpperCase()
const sevText = (dict[`severity.${severity}`] ?? severity).toUpperCase()
const sevSize = 9
const sevTextW = fonts.bodyBold.widthOfTextAtSize(sevText, sevSize)
const padX = 8
const padY = 4
const pillW = sevTextW + padX * 2
const pillW = fonts.bodyBold.widthOfTextAtSize(sevText, sevSize) + padX * 2
const pillH = sevSize + padY * 2
const pillX = MARGIN_X + numW + 14
const pillY = titleY + 4
@@ -335,7 +298,7 @@ function drawObservationTitleBlock(
y: pillY,
width: pillW,
height: pillH,
color: SEVERITY_BG[sev] ?? COLOR_MUTED,
color: SEVERITY_BG[severity] ?? COLOR_MUTED,
})
page.drawText(sevText, {
x: pillX + padX,
@@ -354,100 +317,97 @@ function drawObservationTitleBlock(
return titleY
}
/**
* Resolves the main-body view plus every detail-popup view referenced by
* the observation, rasterizing each to a PNG ready for pdf-lib.
*/
/** Every view the observation touches, main first, each rasterised with its highlights. */
async function buildObservationImages(
pdfDoc: PDFDocument,
species: SpeciesManifest,
sheet: SheetIndex,
observation: Observation,
locale: Locale,
dict: Dict,
): Promise<RenderedImage[]> {
const hasMainZones = observation.zones.some((z) => !z.detailSourceId)
const detailIds = Array.from(
new Set(observation.zones.map((z) => z.detailSourceId).filter(Boolean) as string[]),
)
const items: Array<{ label: string; src: string; sourceId: string | undefined }> = []
if (hasMainZones) {
items.push({ label: dict['pdf.view.general'], src: species.mainSvg, sourceId: undefined })
}
for (const detailId of detailIds) {
const detailPath = species.details[detailId]
if (!detailPath) continue
items.push({
label: `${dict['pdf.view.detail_prefix']}${detailId.toUpperCase()}`,
src: detailPath,
sourceId: detailId,
})
}
const viewIds = [...new Set(observation.zones.map((z) => z.viewId))]
.filter((id) => sheet.view(id))
.sort(
(a, b) =>
Number(b === sheet.mainView.id) - Number(a === sheet.mainView.id),
)
return Promise.all(
items.map(async (it) => {
const svgStr = await colorizedSvgString(it.src, observation, it.sourceId)
const png = await rasterizeSvg(svgStr)
viewIds.map(async (viewId) => {
const view = sheet.view(viewId)!
const label =
view.kind === 'main'
? dict['pdf.view.general']!
: `${dict['pdf.view.detail_prefix']}${pickLabel(view.name, locale).toUpperCase()}`
const png = await rasterizeSvg(
highlightedViewSvg(sheet, viewId, observation),
)
const img = await pdfDoc.embedPng(png)
const aspect = img.width > 0 ? img.height / img.width : 0.6
return { label: it.label, img, aspect }
return {
label,
img,
aspect: img.width > 0 ? img.height / img.width : 0.6,
}
}),
)
}
/** Renders the "Zones" section value: bilingual labels + vertebra/side suffixes. */
function zoneText(z: ReportZone, sheet: SheetIndex, locale: Locale): string {
const annotation = sheet.annotation(z.annotationId)
if (annotation) return pickLabel(sheet.name(annotation), locale)
const snapshot =
locale === 'en'
? z.labelEnSnapshot || z.labelFrSnapshot
: z.labelFrSnapshot || z.labelEnSnapshot
return snapshot || z.annotationId
}
function describeObservationZones(
zones: Observation['zones'],
zoneLabels: Map<string, ZoneLabelPair>,
zones: ReportZone[],
sheet: SheetIndex,
locale: Locale,
dict: Dict,
): string {
return zones
.map((z) => {
const pair = zoneLabels.get(z.boneId)
const label = pickLocaleLabel(pair?.fr, pair?.en, locale, z.boneId)
const v = z.vertebrae?.length
? ` (${z.vertebrae.map((x) => `${x.region}${x.index}`).join(', ')})`
: ''
const side = z.side
? ` (${dict[z.side === 'left' ? 'lateral.left' : 'lateral.right']})`
: ''
return `${label}${v}${side}`
return `${zoneText(z, sheet, locale)}${v}${side}`
})
.join(' · ')
}
/** Groups findings by zone+side, one label/value section entry per group. */
function findingZoneName(
zoneId: string,
sheet: SheetIndex,
locale: Locale,
): string {
const zone = sheet.findingZone(zoneId)
return zone ? pickLabel(zone.name, locale) : zoneId
}
/** Groups findings by zone+side, one section per group; snapshots give the text. */
function buildFindingsSections(
findings: Finding[],
findingsTree: SpeciesFindings | null,
sheet: SheetIndex,
locale: Locale,
dict: Dict,
): ObservationSection[] {
const byZoneSide = new Map<string, Finding[]>()
for (const f of findings) {
const key = f.side ? `${f.zoneId}:${f.side}` : f.zoneId
const list = byZoneSide.get(key)
if (list) {
list.push(f)
} else {
byZoneSide.set(key, [f])
}
const key = f.side ? `${f.findingZoneId}:${f.side}` : f.findingZoneId
byZoneSide.set(key, [...(byZoneSide.get(key) ?? []), f])
}
const sections: ObservationSection[] = []
for (const [key, group] of byZoneSide) {
const zoneId = key.split(':')[0]
const zoneId = key.split(':')[0]!
const side = group[0]?.side
const zoneTree = findingsTree?.zones[zoneId]
let zoneName = zoneTree
? locale === 'en'
? zoneTree.name_en
: zoneTree.name_fr
: zoneId
if (side) {
const sideLabel = dict[side === 'left' ? 'lateral.left' : 'lateral.right']
zoneName = `${zoneName} (${sideLabel})`
}
let zoneName = findingZoneName(zoneId, sheet, locale)
if (side)
zoneName = `${zoneName} (${dict[side === 'left' ? 'lateral.left' : 'lateral.right']})`
const value = group
.map((f) => {
const lbl = locale === 'en' ? f.labelEnSnapshot : f.labelFrSnapshot
@@ -462,37 +422,46 @@ function buildFindingsSections(
return sections
}
/** Assembles the ordered label/value sections drawn below the images. */
function buildObservationSections(
observation: Observation,
zoneLabels: Map<string, ZoneLabelPair>,
findingsTree: SpeciesFindings | null,
sheet: SheetIndex,
locale: Locale,
dict: Dict,
): ObservationSection[] {
const zonesText = describeObservationZones(observation.zones, zoneLabels, locale, dict)
const zonesText = describeObservationZones(
observation.zones,
sheet,
locale,
dict,
)
const sections: ObservationSection[] = [
{ label: dict['pdf.section.zones'], value: zonesText || dict['pdf.empty'] },
{
label: dict['pdf.section.zones']!,
value: zonesText || dict['pdf.empty']!,
},
...buildFindingsSections(observation.findings, sheet, locale, dict),
]
sections.push(...buildFindingsSections(observation.findings, findingsTree, locale, dict))
if (observation.freeTextFindings.length) {
sections.push({
label: dict['pdf.section.free_findings'],
label: dict['pdf.section.free_findings']!,
value: observation.freeTextFindings.join(' · '),
})
}
if (observation.severity) {
const sevLabel = dict[`severity.${observation.severity}`] ?? observation.severity
sections.push({ label: dict['pdf.section.severity'], value: sevLabel })
sections.push({
label: dict['pdf.section.severity']!,
value: dict[`severity.${observation.severity}`] ?? observation.severity,
})
}
if (observation.comment.trim()) {
sections.push({ label: dict['pdf.section.comment'], value: observation.comment.trim() })
sections.push({
label: dict['pdf.section.comment']!,
value: observation.comment.trim(),
})
}
return sections
}
/** Estimates the vertical space the given sections will occupy once drawn. */
function estimateSectionsHeight(
sections: ObservationSection[],
fonts: EmbeddedFonts,
@@ -503,16 +472,13 @@ function estimateSectionsHeight(
const lineCount = value.includes(' · ')
? countSegmentedLines(value.split(' · '), fonts, maxTextW)
: wrapLines(value, fonts.bodyRegular, SECTION_TEXT_SIZE, maxTextW).length
h += SECTION_LABEL_GAP + 9 + lineCount * TEXT_LINE_HEIGHT + SECTION_BLOCK_GAP
h +=
SECTION_LABEL_GAP + 9 + lineCount * TEXT_LINE_HEIGHT + SECTION_BLOCK_GAP
}
return h
}
/**
* Lays out and draws the (up to 2-column) image grid for an observation
* page. Returns the cursor y directly below the images — unchanged from
* startY when there is nothing to draw.
*/
/** Lays out the (up to 2-column) image grid; returns the cursor y below it. */
function drawObservationImageGrid(
ctx: PageDrawContext,
rendered: RenderedImage[],
@@ -522,14 +488,10 @@ function drawObservationImageGrid(
const { page, fonts, width } = ctx
let cursorY = startY
if (rendered.length === 0) return cursorY
const isSingle = rendered.length === 1
const cols = isSingle ? 1 : 2
const rows = Math.ceil(rendered.length / cols)
const fullCellW = (width - MARGIN_X * 2 - IMAGE_COL_GAP * (cols - 1)) / cols
// Single-image observations get rendered at half the available width
// and centered, so they don't dominate the page when the surrounding
// text is short.
const cellW = isSingle ? fullCellW / 2 : fullCellW
const singleOffsetX = isSingle ? (fullCellW - cellW) / 2 : 0
const availH = Math.max(IMAGE_MIN_CELL_H, cursorY - reservedBottom)
@@ -537,7 +499,6 @@ function drawObservationImageGrid(
IMAGE_MIN_CELL_H,
(availH - rows * IMAGE_LABEL_GAP - (rows - 1) * IMAGE_ROW_GAP) / rows,
)
for (let r = 0; r < rows; r += 1) {
const rowItems = rendered.slice(r * cols, r * cols + cols)
const cellHs = rowItems.map((it) => Math.min(cellW * it.aspect, rowBudget))
@@ -557,9 +518,9 @@ function drawObservationImageGrid(
const x = MARGIN_X + singleOffsetX + c * (cellW + IMAGE_COL_GAP)
page.drawImage(it.img, {
x,
y: cursorY - cellHs[c],
y: cursorY - cellHs[c]!,
width: cellW,
height: cellHs[c],
height: cellHs[c]!,
})
})
cursorY -= rowH
@@ -569,7 +530,6 @@ function drawObservationImageGrid(
return cursorY
}
/** Draws each label/value section, returns the cursor y below the last one. */
function drawObservationSections(
ctx: PageDrawContext,
sections: ObservationSection[],
@@ -597,8 +557,12 @@ function drawObservationSections(
fonts,
)
} else {
const lines = wrapLines(value, fonts.bodyRegular, SECTION_TEXT_SIZE, maxTextW)
for (const line of lines) {
for (const line of wrapLines(
value,
fonts.bodyRegular,
SECTION_TEXT_SIZE,
maxTextW,
)) {
page.drawText(line, {
x: MARGIN_X,
y: cursorY,
@@ -623,8 +587,7 @@ export async function addObservationPage(
observation,
obsIndex,
fonts,
zoneLabels,
findingsTree,
sheet,
locale,
headerAssets,
} = ctx
@@ -634,18 +597,31 @@ export async function addObservationPage(
drawHeader(page, report, fonts, locale, headerAssets)
const drawCtx: PageDrawContext = { page, fonts, width }
const titleY = drawObservationTitleBlock(drawCtx, dict, obsIndex, observation.severity)
const species = getSpecies(report.animal.speciesId)
if (!species) return
const rendered = await buildObservationImages(pdfDoc, species, observation, dict)
const titleY = drawObservationTitleBlock(
drawCtx,
dict,
obsIndex,
observation.severity,
)
const rendered = await buildObservationImages(
pdfDoc,
sheet,
observation,
locale,
dict,
)
const maxTextW = width - MARGIN_X * 2
const sections = buildObservationSections(observation, zoneLabels, findingsTree, locale, dict)
const reservedBottom = MARGIN_BOTTOM + estimateSectionsHeight(sections, fonts, maxTextW) + IMAGE_BOTTOM_GAP
let cursorY = drawObservationImageGrid(drawCtx, rendered, titleY - IMAGE_TOP_GAP, reservedBottom)
const sections = buildObservationSections(observation, sheet, locale, dict)
const reservedBottom =
MARGIN_BOTTOM +
estimateSectionsHeight(sections, fonts, maxTextW) +
IMAGE_BOTTOM_GAP
let cursorY = drawObservationImageGrid(
drawCtx,
rendered,
titleY - IMAGE_TOP_GAP,
reservedBottom,
)
cursorY -= TEXT_TOP_GAP
drawObservationSections(drawCtx, sections, cursorY, maxTextW)
}
+5 -2
View File
@@ -22,7 +22,8 @@ function ensureSvgAttributes(
root.setAttribute('xmlns', 'http://www.w3.org/2000/svg')
}
if (!root.getAttribute('width')) root.setAttribute('width', String(widthPx))
if (!root.getAttribute('height')) root.setAttribute('height', String(heightPx))
if (!root.getAttribute('height'))
root.setAttribute('height', String(heightPx))
return new XMLSerializer().serializeToString(root)
}
@@ -77,7 +78,9 @@ async function rasterizeWithImageElement(
return canvas
}
async function canvasToPngBytes(canvas: HTMLCanvasElement): Promise<Uint8Array> {
async function canvasToPngBytes(
canvas: HTMLCanvasElement,
): Promise<Uint8Array> {
const blob = await new Promise<Blob | null>((resolve) => {
canvas.toBlob((b) => resolve(b), 'image/png')
})
+113
View File
@@ -0,0 +1,113 @@
import type {
Annotation,
FindingCategory,
FindingNode,
FindingZone,
LocalizedText,
SheetView,
VertebralRegion,
} from '@faunosteo/domain'
import type { Locale } from '@/i18n/types'
import type { LoadedSheet } from '@/sheets/provider'
/**
* Read-only lookups over a loaded sheet. Everything the editor used to derive
* from SVG attributes, label matching or the species manifest comes from the
* document here, by stable id: no label drives logic.
*/
export type ObservableAnnotation = Extract<
Annotation,
{ kind: 'point' | 'zone' }
>
export interface SheetIndex {
sheet: LoadedSheet
mainView: SheetView
view(id: string): SheetView | undefined
annotation(id: string): Annotation | undefined
annotationsOfView(viewId: string): Annotation[]
findingZone(id: string): FindingZone | undefined
/** The category or node at a path, undefined when absent from the sheet. */
nodeAt(
zoneId: string,
path: readonly string[],
): FindingCategory | FindingNode | undefined
regions(): VertebralRegion[]
region(code: string): VertebralRegion | undefined
/** The annotation that opens the vertebra picker for a region on a view. */
spineAnnotation(
regionCode: string,
viewId: string,
): ObservableAnnotation | undefined
/** Whether an annotation opens the vertebra picker. */
isSpine(annotationId: string): boolean
name(annotation: Annotation): LocalizedText
}
export function pickLabel(
text: LocalizedText | null | undefined,
locale: Locale,
): string {
if (!text) return ''
return locale === 'en' ? text.en || text.fr : text.fr || text.en
}
export function isObservable(
a: Annotation | undefined,
): a is ObservableAnnotation {
return a !== undefined && a.kind !== 'detail_trigger'
}
export function buildSheetIndex(sheet: LoadedSheet): SheetIndex {
const { document } = sheet
const views = new Map(document.views.map((v) => [v.id, v]))
const annotations = new Map(document.annotations.map((a) => [a.id, a]))
const zones = new Map(document.finding_zones.map((z) => [z.id, z]))
const regions = new Map(
document.vertebral_config.regions.map((r) => [r.code, r]),
)
const mainView = document.views.find((v) => v.kind === 'main')
if (!mainView) throw new Error('sheet has no main view')
const nodeAt: SheetIndex['nodeAt'] = (zoneId, path) => {
const zone = zones.get(zoneId)
if (!zone || path.length === 0) return undefined
let node: FindingCategory | FindingNode | undefined = zone.categories.find(
(c) => c.id === path[0],
)
for (const segment of path.slice(1)) {
if (!node) return undefined
node = node.children.find((n) => n.id === segment)
}
return node
}
return {
sheet,
mainView,
view: (id) => views.get(id),
annotation: (id) => annotations.get(id),
annotationsOfView: (viewId) =>
document.annotations.filter((a) => a.view_id === viewId),
findingZone: (id) => zones.get(id),
nodeAt,
regions: () => document.vertebral_config.regions,
region: (code) => regions.get(code),
spineAnnotation: (code, viewId) =>
document.annotations.find(
(a): a is ObservableAnnotation =>
isObservable(a) &&
a.view_id === viewId &&
a.vertebral_region_code === code,
),
isSpine: (id) => {
const a = annotations.get(id)
return isObservable(a) && a.vertebral_region_code !== null
},
name: (a) =>
a.kind === 'detail_trigger'
? (a.name ?? views.get(a.opens_view_id)?.name ?? { fr: '', en: '' })
: a.name,
}
}
+213
View File
@@ -0,0 +1,213 @@
import type {
Annotation,
LateralSide,
Observation,
ReportZone,
Vertebra,
} from '@faunosteo/domain'
import { isObservable, type SheetIndex } from './sheetIndex'
/**
* Zone interaction rules of the report editor, pure: what a click on an
* annotation means for the active observation, and the observation
* reducers the route applies. The rules are the legacy ones (click chain
* of EditorRoute, BDR-019 vertebra sync), keyed by annotation ids.
*/
export interface ZoneRef {
annotationId: string
viewId: string
}
export type ZoneClickDecision =
| { kind: 'ignore' }
| { kind: 'open_view'; viewId: string }
| { kind: 'activate_fallback' }
| { kind: 'open_vertebra_picker' }
| { kind: 'open_laterality_picker' }
| { kind: 'remove_both_sides' }
| { kind: 'toggle' }
export function sameZone(zone: ReportZone, ref: ZoneRef): boolean {
return zone.annotationId === ref.annotationId && zone.viewId === ref.viewId
}
export function refOf(annotation: Annotation): ZoneRef {
return { annotationId: annotation.id, viewId: annotation.view_id }
}
export function sidesPresent(obs: Observation, ref: ZoneRef): LateralSide[] {
return obs.zones
.filter((z) => sameZone(z, ref) && z.side)
.map((z) => z.side as LateralSide)
}
/**
* Legacy click chain: detail trigger opens its view and is never added; no
* active observation → the click only activates one; spine zones always open
* the picker; bilateral zones go through the side picker, or clear both sides
* when both are set; anything else toggles.
*/
export function decideZoneClick(
annotation: Annotation | undefined,
active: Observation | undefined,
): ZoneClickDecision {
if (!annotation) return { kind: 'ignore' }
if (annotation.kind === 'detail_trigger') {
return { kind: 'open_view', viewId: annotation.opens_view_id }
}
if (!active) return { kind: 'activate_fallback' }
if (annotation.vertebral_region_code !== null) {
return { kind: 'open_vertebra_picker' }
}
if (annotation.laterality === 'bilateral') {
const sides = sidesPresent(active, refOf(annotation))
return sides.includes('left') && sides.includes('right')
? { kind: 'remove_both_sides' }
: { kind: 'open_laterality_picker' }
}
return { kind: 'toggle' }
}
function newZone(annotation: Annotation, side?: LateralSide): ReportZone {
const zone: ReportZone = refOf(annotation)
if (isObservable(annotation)) {
zone.labelFrSnapshot = annotation.name.fr
zone.labelEnSnapshot = annotation.name.en
}
if (side) zone.side = side
return zone
}
function withZones(obs: Observation, zones: ReportZone[]): Observation {
return { ...obs, zones }
}
/** Plain zone: added when absent, removed when present (no side). */
export function toggleZone(
obs: Observation,
annotation: Annotation,
): Observation {
const index = obs.zones.findIndex((z) => sameZone(z, refOf(annotation)))
if (index >= 0)
return withZones(
obs,
obs.zones.filter((_, i) => i !== index),
)
return withZones(obs, [...obs.zones, newZone(annotation)])
}
/** The zone exists after the call; returns its index. */
export function ensureZone(
obs: Observation,
annotation: Annotation,
): { observation: Observation; index: number } {
const index = obs.zones.findIndex((z) => sameZone(z, refOf(annotation)))
if (index >= 0) return { observation: obs, index }
const zones = [...obs.zones, newZone(annotation)]
return { observation: withZones(obs, zones), index: zones.length - 1 }
}
/** Appends the sides not present yet; never removes one (legacy semantics). */
export function addSides(
obs: Observation,
annotation: Annotation,
sides: readonly LateralSide[],
): Observation {
const present = sidesPresent(obs, refOf(annotation))
const added = sides
.filter((side) => !present.includes(side))
.map((side) => newZone(annotation, side))
return added.length === 0 ? obs : withZones(obs, [...obs.zones, ...added])
}
export function removeAllSides(obs: Observation, ref: ZoneRef): Observation {
return withZones(
obs,
obs.zones.filter((z) => !sameZone(z, ref)),
)
}
export function removeZoneAt(obs: Observation, index: number): Observation {
return withZones(
obs,
obs.zones.filter((_, i) => i !== index),
)
}
function isSpineZone(zone: ReportZone, index: SheetIndex): boolean {
return index.isSpine(zone.annotationId)
}
/**
* Vertebrae of every spine zone of the observation, the zone at `priority`
* first (the one the picker was opened from), without duplicates.
*/
export function collectVertebrae(
obs: Observation,
index: SheetIndex,
priority: number,
): Vertebra[] {
const ordered = [
...obs.zones.filter((_, i) => i === priority),
...obs.zones.filter((_, i) => i !== priority),
]
const seen = new Set<string>()
const out: Vertebra[] = []
for (const zone of ordered) {
if (!isSpineZone(zone, index)) continue
for (const v of zone.vertebrae ?? []) {
const key = `${v.region}${v.index}`
if (seen.has(key)) continue
seen.add(key)
out.push({ ...v })
}
}
return out
}
function regionOf(zone: ReportZone, index: SheetIndex): string | null {
const a = index.annotation(zone.annotationId)
return isObservable(a) ? a.vertebral_region_code : null
}
/**
* BDR-019: the picker edits every region at once. Per region the selection
* REPLACES the zone's vertebrae; a spine zone left without vertebrae is
* pruned; a region picked without a zone gets one on the view the picker
* was opened from (or the main view).
*/
export function syncVertebrae(
obs: Observation,
selection: readonly Vertebra[],
index: SheetIndex,
viewId: string,
): Observation {
const byRegion = new Map<string, Vertebra[]>()
for (const v of selection) {
const list = byRegion.get(v.region) ?? []
list.push({ ...v })
byRegion.set(v.region, list)
}
const kept: ReportZone[] = []
for (const zone of obs.zones) {
const region = isSpineZone(zone, index) ? regionOf(zone, index) : null
if (region === null) {
kept.push(zone)
continue
}
const picked = byRegion.get(region)
byRegion.delete(region)
if (!picked || picked.length === 0) continue
kept.push({ ...zone, vertebrae: picked })
}
for (const [region, picked] of byRegion) {
if (picked.length === 0) continue
const annotation =
index.spineAnnotation(region, viewId) ??
index.spineAnnotation(region, index.mainView.id)
if (!annotation) continue
kept.push({ ...newZone(annotation), vertebrae: picked })
}
return withZones(obs, kept)
}
+83
View File
@@ -0,0 +1,83 @@
import {
AnatomicalSheetDocumentSchema,
ReportMigrationMapSchema,
type AnatomicalSheetDocument,
type ReportMigrationMap,
type SheetRef,
} from '@faunosteo/domain'
/**
* Where the application gets the anatomical sheet it works on. Step 5 ships
* one implementation, the sheet bundled at build time (virtual module, see
* vite/sheet-bundle.ts); the Supabase implementation of Step 13 sits behind
* the same interface. A loaded sheet is immutable for the session.
*/
export type SheetStatus = 'draft' | 'published'
/** Raw payload of the virtual module, validated here before use. */
export interface BundledSheetData {
status: SheetStatus
ref: {
sheet_id: string
version_id: string | null
document_sha256: string
schema_version: number
species_id: string
}
document: unknown
migrationMap: unknown
assets: Record<string, string>
}
export interface LoadedSheet {
status: SheetStatus
ref: SheetRef
speciesId: string
document: AnatomicalSheetDocument
/** SVG text by `svg_asset_id`. */
assets: Readonly<Record<string, string>>
migrationMap: ReportMigrationMap
}
export interface SheetProvider {
/** The reference sheet of a species, or null when none is available. */
getReferenceSheet(speciesId: string): Promise<LoadedSheet | null>
}
export function parseBundledSheet(data: BundledSheetData): LoadedSheet {
const document = AnatomicalSheetDocumentSchema.parse(data.document)
const migrationMap = ReportMigrationMapSchema.parse(data.migrationMap)
return {
status: data.status,
ref: {
sheetId: data.ref.sheet_id,
versionId: data.ref.version_id,
documentSha256: data.ref.document_sha256,
},
speciesId: data.ref.species_id,
document,
assets: data.assets,
migrationMap,
}
}
let cached: Promise<LoadedSheet | null> | null = null
async function loadBundled(): Promise<LoadedSheet | null> {
const mod = await import('virtual:faunosteo-sheet')
return mod.bundledSheet ? parseBundledSheet(mod.bundledSheet) : null
}
export const bundledSheetProvider: SheetProvider = {
async getReferenceSheet(speciesId) {
cached ??= loadBundled()
const sheet = await cached
return sheet && sheet.speciesId === speciesId ? sheet : null
},
}
/** Test seam: forget the memoised bundle. */
export function resetBundledSheetCache(): void {
cached = null
}
+54
View File
@@ -0,0 +1,54 @@
import { useEffect, useState } from 'react'
import { buildSheetIndex, type SheetIndex } from '@/services/sheetIndex'
import { bundledSheetProvider, type SheetProvider } from './provider'
/**
* The reference sheet of a species for the current session, loaded once
* through the provider and indexed. `none` means the build carries no sheet
* (production bundle without SHEET_BUNDLE=draft) or no sheet for the species.
*/
export type SheetState =
| { status: 'loading' }
| { status: 'none' }
| { status: 'ready'; index: SheetIndex }
let provider: SheetProvider = bundledSheetProvider
const cache = new Map<string, Promise<SheetIndex | null>>()
/** Test seam: swap the provider and forget loaded sheets. */
export function setSheetProvider(next: SheetProvider): void {
provider = next
cache.clear()
}
export function loadSheetIndex(speciesId: string): Promise<SheetIndex | null> {
let pending = cache.get(speciesId)
if (!pending) {
pending = provider
.getReferenceSheet(speciesId)
.then((sheet) => (sheet ? buildSheetIndex(sheet) : null))
cache.set(speciesId, pending)
}
return pending
}
export function useSheet(speciesId: string | undefined): SheetState {
const [state, setState] = useState<SheetState>({ status: 'loading' })
useEffect(() => {
let cancelled = false
if (!speciesId) {
setState({ status: 'none' })
return
}
setState({ status: 'loading' })
loadSheetIndex(speciesId).then((index) => {
if (cancelled) return
setState(index ? { status: 'ready', index } : { status: 'none' })
})
return () => {
cancelled = true
}
}, [speciesId])
return state
}
+3
View File
@@ -0,0 +1,3 @@
declare module 'virtual:faunosteo-sheet' {
export const bundledSheet: import('./provider').BundledSheetData | null
}
+41
View File
@@ -0,0 +1,41 @@
import {
readReportDocument,
type Report,
type ReportMigrationMap,
} from '@faunosteo/domain'
/**
* Where the report document lives between renders. One implementation today
* (the per-tab sessionStorage draft, migrated from v2 on read); the Supabase
* and outbox adapters of later steps implement the same interface.
*/
export interface ReportPersistence {
load(map: ReportMigrationMap): Report | null
save(report: Report | null): void
}
export const DRAFT_KEY = 'osteo:draft'
function storage(): Storage | null {
return typeof sessionStorage === 'undefined' ? null : sessionStorage
}
export const sessionStoragePersistence: ReportPersistence = {
load(map) {
const raw = storage()?.getItem(DRAFT_KEY)
if (!raw) return null
try {
return readReportDocument(JSON.parse(raw), map).report
} catch (err) {
if (import.meta.env.DEV) console.warn('osteo:draft ignored', err)
return null
}
},
save(report) {
const store = storage()
if (!store) return
if (report) store.setItem(DRAFT_KEY, JSON.stringify(report))
else store.removeItem(DRAFT_KEY)
},
}
+1 -4
View File
@@ -1,7 +1,4 @@
import {
PractitionerSchema,
type Practitioner,
} from '@/domain/schema/practitioner'
import { PractitionerSchema, type Practitioner } from '@faunosteo/domain'
const STORAGE_KEY = 'osteo:lastPractitioner'
+141 -121
View File
@@ -1,16 +1,42 @@
import { create } from 'zustand'
import { ReportSchema, type Report } from '@/domain/schema/report'
import type { Observation } from '@/domain/schema/observation'
import type { Practitioner } from '@/domain/schema/practitioner'
import type { Animal, Owner } from '@/domain/schema/animal'
import {
REPORT_VERSION,
type Animal,
type NextAppointment,
type Observation,
type Owner,
type Practitioner,
type Report,
type ReportMigrationMap,
type SheetRef,
} from '@faunosteo/domain'
import { generateId } from '@/lib/id'
import { nowIso } from '@/lib/dates'
import {
sessionStoragePersistence,
type ReportPersistence,
} from './persistence'
/**
* In-memory report document (v3) and its editing actions. Observation-level
* zone rules live in services/zoneInteraction; the store only replaces
* documents. The per-tab draft is mirrored through the persistence adapter
* and restored once the sheet (and its migration map) is known.
*/
/** What a new report needs before the store stamps version, id and dates. */
export type NewReportDraft = Omit<
Report,
'version' | 'id' | 'createdAt' | 'sheet' | 'localAnnotations'
>
export interface ReportStore {
report: Report | null
activeObservationIndex: number
initReport: (draft: Omit<Report, 'id' | 'createdAt' | 'version'>) => void
initReport: (draft: NewReportDraft, sheet: SheetRef) => void
hydrateReport: (report: Report) => void
/** Restores the per-tab draft; a no-op when a report is already open. */
restoreDraft: (map: ReportMigrationMap) => void
addObservation: () => void
removeObservation: (index: number) => void
moveObservationUp: (index: number) => void
@@ -22,11 +48,11 @@ export interface ReportStore {
setOwner: (next: Owner) => void
setConclusion: (text: string) => void
setRecommendations: (text: string) => void
setNextAppointment: (next: Report['nextAppointment']) => void
setNextAppointment: (next: NextAppointment | undefined) => void
reset: () => void
}
function emptyObservation(): Observation {
export function emptyObservation(): Observation {
return {
id: generateId(),
zones: [],
@@ -36,131 +62,125 @@ function emptyObservation(): Observation {
}
}
const DRAFT_KEY = 'osteo:draft'
/** Reads the auto-saved draft back from sessionStorage (null if absent/invalid). */
export function readPersistedDraft(): Report | null {
if (typeof sessionStorage === 'undefined') return null
const raw = sessionStorage.getItem(DRAFT_KEY)
if (!raw) return null
try {
const parsed = ReportSchema.safeParse(JSON.parse(raw))
return parsed.success ? parsed.data : null
} catch {
return null
}
function swapped(list: Observation[], i: number, j: number): Observation[] {
const next = [...list]
;[next[i], next[j]] = [next[j]!, next[i]!]
return next
}
export const useReportStore = create<ReportStore>((set) => ({
// Restore the per-tab draft so a page refresh never loses the session.
report: readPersistedDraft(),
activeObservationIndex: 0,
type Patch = Partial<Pick<ReportStore, 'report' | 'activeObservationIndex'>>
type Setter = (fn: (s: ReportStore) => Patch | ReportStore) => void
initReport: (draft) =>
set({
report: {
...draft,
version: 2,
id: generateId(),
createdAt: nowIso(),
observations:
draft.observations.length === 0
? [emptyObservation()]
: draft.observations,
},
activeObservationIndex: 0,
}),
function onReport(set: Setter, update: (r: Report, s: ReportStore) => Patch) {
set((s) => (s.report ? update(s.report, s) : s))
}
hydrateReport: (report) => set({ report, activeObservationIndex: 0 }),
export function createReportStore(persistence: ReportPersistence) {
const store = create<ReportStore>((set) => ({
report: null,
activeObservationIndex: 0,
addObservation: () =>
set((s) => {
if (!s.report) return s
const obs = emptyObservation()
const observations = [...s.report.observations, obs]
return {
report: { ...s.report, observations },
activeObservationIndex: observations.length - 1,
}
}),
initReport: (draft, sheet) =>
set({
report: {
...draft,
version: REPORT_VERSION,
id: generateId(),
createdAt: nowIso(),
sheet,
observations:
draft.observations.length === 0
? [emptyObservation()]
: draft.observations,
localAnnotations: [],
},
activeObservationIndex: 0,
}),
removeObservation: (index) =>
set((s) => {
if (!s.report) return s
const observations = s.report.observations.filter((_, i) => i !== index)
const active = Math.min(
s.activeObservationIndex,
Math.max(0, observations.length - 1),
)
return {
report: { ...s.report, observations },
activeObservationIndex: active,
}
}),
hydrateReport: (report) => set({ report, activeObservationIndex: 0 }),
moveObservationUp: (index) =>
set((s) => {
if (!s.report || index <= 0) return s
const observations = [...s.report.observations]
;[observations[index - 1], observations[index]] = [
observations[index],
observations[index - 1],
]
return { report: { ...s.report, observations } }
}),
restoreDraft: (map) =>
set((s) => {
if (s.report) return s
const report = persistence.load(map)
return report ? { report, activeObservationIndex: 0 } : s
}),
moveObservationDown: (index) =>
set((s) => {
if (!s.report || index >= s.report.observations.length - 1) return s
const observations = [...s.report.observations]
;[observations[index], observations[index + 1]] = [
observations[index + 1],
observations[index],
]
return { report: { ...s.report, observations } }
}),
addObservation: () =>
onReport(set, (r) => {
const observations = [...r.observations, emptyObservation()]
return {
report: { ...r, observations },
activeObservationIndex: observations.length - 1,
}
}),
updateObservation: (index, obs) =>
set((s) => {
if (!s.report) return s
const observations = s.report.observations.map((o, i) =>
i === index ? obs : o,
)
return { report: { ...s.report, observations } }
}),
removeObservation: (index) =>
onReport(set, (r, s) => {
const observations = r.observations.filter((_, i) => i !== index)
const active = Math.min(
s.activeObservationIndex,
Math.max(0, observations.length - 1),
)
return {
report: { ...r, observations },
activeObservationIndex: active,
}
}),
setActiveObservation: (index) => set({ activeObservationIndex: index }),
moveObservationUp: (index) =>
onReport(set, (r) =>
index <= 0
? {}
: {
report: {
...r,
observations: swapped(r.observations, index - 1, index),
},
},
),
setPractitioner: (next) =>
set((s) => (s.report ? { report: { ...s.report, practitioner: next } } : s)),
moveObservationDown: (index) =>
onReport(set, (r) =>
index >= r.observations.length - 1
? {}
: {
report: {
...r,
observations: swapped(r.observations, index, index + 1),
},
},
),
setAnimal: (next) =>
set((s) => (s.report ? { report: { ...s.report, animal: next } } : s)),
updateObservation: (index, obs) =>
onReport(set, (r) => ({
report: {
...r,
observations: r.observations.map((o, i) => (i === index ? obs : o)),
},
})),
setOwner: (next) =>
set((s) => (s.report ? { report: { ...s.report, owner: next } } : s)),
setActiveObservation: (index) => set({ activeObservationIndex: index }),
setPractitioner: (next) =>
onReport(set, (r) => ({ report: { ...r, practitioner: next } })),
setAnimal: (next) =>
onReport(set, (r) => ({ report: { ...r, animal: next } })),
setOwner: (next) =>
onReport(set, (r) => ({ report: { ...r, owner: next } })),
setConclusion: (text) =>
onReport(set, (r) => ({ report: { ...r, conclusion: text } })),
setRecommendations: (text) =>
onReport(set, (r) => ({ report: { ...r, recommendations: text } })),
setNextAppointment: (next) =>
onReport(set, (r) => {
const rest = { ...r }
delete rest.nextAppointment
return { report: next ? { ...rest, nextAppointment: next } : rest }
}),
reset: () => set({ report: null, activeObservationIndex: 0 }),
}))
store.subscribe((state) => persistence.save(state.report))
return store
}
setConclusion: (text) =>
set((s) => (s.report ? { report: { ...s.report, conclusion: text } } : s)),
setRecommendations: (text) =>
set((s) =>
s.report ? { report: { ...s.report, recommendations: text } } : s,
),
setNextAppointment: (next) =>
set((s) =>
s.report ? { report: { ...s.report, nextAppointment: next } } : s,
),
reset: () => set({ report: null, activeObservationIndex: 0 }),
}))
useReportStore.subscribe((state) => {
if (typeof sessionStorage === 'undefined') return
if (state.report) {
sessionStorage.setItem(DRAFT_KEY, JSON.stringify(state.report))
} else {
sessionStorage.removeItem(DRAFT_KEY)
}
})
export const useReportStore = createReportStore(sessionStoragePersistence)
-528
View File
@@ -1,528 +0,0 @@
.svg-editor-root {
display: flex;
flex-direction: column;
flex: 1;
min-height: 0;
overflow: hidden;
font-family: var(--font-sans);
color: var(--color-ink);
background: var(--color-bg);
}
@media (min-width: 768px) {
.svg-editor-root {
flex-direction: row;
}
}
.svg-editor-root * { box-sizing: border-box; margin: 0; padding: 0; }
.svg-editor-canvas {
flex: 1;
position: relative;
background: var(--color-surface);
overflow: hidden;
padding: 10px;
min-height: 40vh;
}
@media (min-width: 768px) {
.svg-editor-canvas {
min-height: 0;
}
}
.svg-editor-canvas-inner {
width: 100%;
height: 100%;
overflow: auto;
position: relative;
}
.svg-editor-canvas-inner svg {
display: block;
max-width: 100%;
max-height: 100%;
width: auto;
height: auto;
}
.svg-editor-canvas.mode-point svg,
.svg-editor-canvas.mode-polygon svg { cursor: crosshair; }
.svg-editor-canvas.mode-select svg { cursor: default; }
.svg-editor-root [data-anno-id] { transition: filter 0.1s; }
.svg-editor-root [data-anno-id]:hover {
filter: brightness(1.3) drop-shadow(0 0 4px rgba(184, 90, 63, 0.7));
}
.svg-editor-root [data-anno-id].selected {
filter: drop-shadow(0 0 12px var(--color-accent)) drop-shadow(0 0 6px var(--color-accent)) brightness(1.15);
stroke: var(--color-accent) !important;
stroke-width: 4 !important;
stroke-opacity: 1 !important;
}
.svg-editor-root .polygon-handle {
cursor: move;
fill: #ffd54f;
stroke: var(--color-accent);
stroke-width: 2;
transition: r 0.1s;
}
.svg-editor-root .polygon-handle:hover {
fill: #ffe082;
stroke-width: 3;
}
.svg-editor-root .polygon-midhandle {
cursor: copy;
fill: var(--color-surface);
stroke: var(--color-accent);
stroke-width: 1.5;
fill-opacity: 0.7;
}
.svg-editor-root .polygon-midhandle:hover {
fill: #ffd54f;
fill-opacity: 1;
}
@keyframes svg-editor-flash-pulse {
0%, 100% {
stroke-width: 4;
stroke: var(--color-accent);
filter: drop-shadow(0 0 12px var(--color-accent)) brightness(1.15);
}
50% {
stroke-width: 10;
stroke: #ffd54f;
filter: drop-shadow(0 0 24px #ffd54f) drop-shadow(0 0 12px var(--color-accent)) brightness(1.4);
}
}
.svg-editor-root [data-anno-id].flashing {
animation: svg-editor-flash-pulse 0.6s ease-in-out 2;
}
.svg-editor-root .polygon-preview {
fill: rgba(184, 90, 63, 0.2);
stroke: var(--color-accent);
stroke-width: 2;
stroke-dasharray: 5,3;
}
.svg-editor-root .polygon-preview-pt { fill: var(--color-accent); }
.svg-editor-sidebar {
width: 100%;
background: var(--color-surface);
border-top: 1px solid var(--color-border);
display: flex;
flex-direction: column;
overflow: hidden;
max-height: 50vh;
}
@media (min-width: 768px) {
.svg-editor-sidebar {
width: 380px;
max-height: none;
border-top: none;
border-left: 1px solid var(--color-border);
}
}
.svg-editor-sidebar header {
padding: 14px 16px;
background: var(--color-accent);
color: white;
}
.svg-editor-sidebar header h1 { font-size: 16px; font-weight: 600; }
.svg-editor-sidebar header .sub { font-size: 11px; opacity: 0.8; margin-top: 4px; }
.svg-editor-sidebar-content {
flex: 1;
overflow-y: auto;
padding: 14px 16px;
}
.svg-editor-root .section { margin-bottom: 20px; }
.svg-editor-root .section h3 {
font-size: 11px;
text-transform: uppercase;
color: var(--color-ink-muted);
margin-bottom: 8px;
letter-spacing: 0.5px;
}
.svg-editor-root button,
.svg-editor-root .btn {
display: block;
width: 100%;
padding: 9px 12px;
margin-bottom: 6px;
background: var(--color-surface-strong);
border: 1px solid var(--color-border);
border-radius: 6px;
cursor: pointer;
font-size: 13px;
text-align: left;
transition: all 0.1s;
font-family: inherit;
color: var(--color-ink);
}
.svg-editor-root button:hover { background: var(--color-border); }
.svg-editor-root button.active {
background: var(--color-accent);
color: white;
border-color: var(--color-accent);
}
.svg-editor-root button.danger {
background: #fef2f2;
border-color: #fecaca;
color: var(--color-danger);
}
.svg-editor-root button.danger:hover { background: #fee2e2; }
.svg-editor-root button.primary {
background: var(--color-accent);
color: white;
border-color: var(--color-accent);
}
.svg-editor-root button.primary:hover { background: var(--color-accent-strong); }
.svg-editor-root input,
.svg-editor-root select {
display: block;
width: 100%;
padding: 8px 10px;
margin-bottom: 6px;
border: 1px solid var(--color-border);
border-radius: 6px;
font-size: 13px;
background: var(--color-surface);
font-family: inherit;
color: var(--color-ink);
}
.svg-editor-root input[type="color"] { padding: 2px; height: 32px; cursor: pointer; }
.svg-editor-root input[type="file"] { background: var(--color-surface-strong); cursor: pointer; }
.svg-editor-root label {
font-size: 11px;
color: var(--color-ink-muted);
margin-bottom: 2px;
display: block;
margin-top: 8px;
}
.svg-editor-root .element-list {
max-height: 280px;
overflow-y: auto;
border: 1px solid var(--color-border);
border-radius: 6px;
background: var(--color-bg);
}
.svg-editor-root .element-item {
padding: 6px 10px;
border-bottom: 1px solid var(--color-border);
cursor: pointer;
font-size: 12px;
display: flex;
align-items: center;
gap: 8px;
}
.svg-editor-root .element-item:last-child { border-bottom: none; }
.svg-editor-root .element-item:hover { background: var(--color-surface-strong); }
.svg-editor-root .element-item.selected {
background: color-mix(in srgb, var(--color-accent) 12%, transparent);
color: var(--color-accent-strong);
font-weight: 600;
}
.svg-editor-root .element-item .swatch {
width: 12px;
height: 12px;
border-radius: 3px;
border: 1px solid rgba(0,0,0,0.15);
flex-shrink: 0;
}
.svg-editor-root .element-item .name {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.svg-editor-root .element-item .cat {
font-size: 10px;
color: var(--color-ink-muted);
margin-left: auto;
padding: 1px 6px;
background: var(--color-surface-strong);
border-radius: 8px;
flex-shrink: 0;
}
.svg-editor-root .coords {
font-family: monospace;
font-size: 11px;
color: var(--color-ink-muted);
padding: 4px 8px;
background: var(--color-bg);
border-radius: 4px;
margin-bottom: 8px;
}
.svg-editor-zoom-controls {
position: absolute;
bottom: 20px;
left: 20px;
background: var(--color-surface);
border: 1px solid var(--color-border);
border-radius: 6px;
padding: 4px;
display: flex;
gap: 4px;
box-shadow: 0 2px 8px rgba(0,0,0,0.08);
}
.svg-editor-zoom-controls button {
width: 40px;
height: 40px;
padding: 0;
margin: 0;
font-size: 18px;
display: flex;
align-items: center;
justify-content: center;
}
@media (min-width: 768px) {
.svg-editor-zoom-controls button {
width: 32px;
height: 32px;
font-size: 16px;
}
}
.svg-editor-root input[type="checkbox"] { width: auto; display: inline; margin: 0 6px 0 0; }
.svg-editor-root .cat-row {
display: flex;
align-items: center;
gap: 6px;
padding: 6px 4px;
background: var(--color-bg);
border-radius: 6px;
margin-bottom: 4px;
border: 1px solid var(--color-border);
}
.svg-editor-root .cat-row input[type="color"] { width: 32px; height: 28px; padding: 0; margin: 0; flex-shrink: 0; }
.svg-editor-root .cat-row input[type="checkbox"] { margin: 0 4px 0 4px; flex-shrink: 0; }
.svg-editor-root .cat-row .name {
flex: 1;
font-size: 13px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.svg-editor-root .cat-row .count {
font-size: 10px;
color: var(--color-ink-muted);
padding: 1px 5px;
background: var(--color-surface-strong);
border-radius: 8px;
}
.svg-editor-root .cat-row .delete {
width: 28px;
height: 28px;
padding: 0;
margin: 0;
font-size: 13px;
display: flex;
align-items: center;
justify-content: center;
background: transparent;
border: none;
cursor: pointer;
}
.svg-editor-root .cat-row .delete:hover { background: #fef2f2; color: var(--color-danger); }
.svg-editor-root .cat-row .special-btn {
width: 28px;
height: 28px;
padding: 0;
margin: 0;
font-size: 13px;
display: flex;
align-items: center;
justify-content: center;
background: transparent;
border: none;
cursor: pointer;
color: var(--color-ink-muted);
}
.svg-editor-root .cat-row .special-btn:hover { background: #fff8e1; color: #d97706; }
.svg-editor-root .cat-row .special-btn.has-value { color: #d97706; }
.svg-editor-root .cat-row .special-badge {
font-size: 10px;
padding: 1px 6px;
background: #fff8e1;
color: #92400e;
border: 1px solid #ffd54f;
border-radius: 8px;
flex-shrink: 0;
}
.svg-editor-root .add-cat { display: flex; gap: 6px; margin-top: 8px; }
.svg-editor-root .add-cat input { margin: 0; }
.svg-editor-root .add-cat input[type="color"] { width: 36px; flex-shrink: 0; }
.svg-editor-root .add-cat input[type="text"] { flex: 1; }
.svg-editor-root .add-cat button { width: auto; padding: 6px 12px; margin: 0; flex-shrink: 0; }
.svg-editor-root .slider-row {
display: flex;
gap: 8px;
align-items: center;
margin-bottom: 6px;
}
.svg-editor-root .slider-row input[type="range"] {
flex: 1;
margin: 0;
padding: 0;
height: 28px;
cursor: pointer;
accent-color: var(--color-accent);
}
.svg-editor-root .slider-row input[type="number"] {
width: 60px;
margin: 0;
padding: 6px 4px;
text-align: center;
font-variant-numeric: tabular-nums;
}
.svg-editor-root .detail-toggle {
margin-top: 4px;
padding: 8px 10px;
background: #fff8e1;
border: 1px solid #ffd54f;
border-radius: 6px;
font-size: 13px;
}
.svg-editor-root .detail-toggle label { margin: 0; color: #92400e; font-size: 13px; }
.svg-editor-root .detail-toggle input[type="text"] { margin-top: 4px; margin-bottom: 0; }
.svg-editor-root .element-item .detail-badge {
background: #ffd54f;
color: #6b4500;
font-size: 10px;
padding: 1px 6px;
border-radius: 8px;
font-weight: 600;
margin-left: 4px;
flex-shrink: 0;
}
.svg-editor-root [data-anno-opens-detail] { stroke-dasharray: 8,4; }
.svg-editor-root .detail-zone { cursor: pointer; }
.svg-editor-root .welcome {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
min-height: 100%;
text-align: center;
color: var(--color-ink-muted);
padding: 60px 20px;
}
.svg-editor-root .welcome-icon { font-size: 80px; margin-bottom: 20px; opacity: 0.7; }
.svg-editor-root .welcome h2 {
color: var(--color-accent);
margin-bottom: 16px;
font-size: 24px;
font-family: var(--font-serif);
}
.svg-editor-root .welcome p {
max-width: 480px;
margin-bottom: 30px;
line-height: 1.5;
font-size: 14px;
}
.svg-editor-root .welcome p code {
background: var(--color-surface-strong);
padding: 2px 6px;
border-radius: 3px;
font-size: 90%;
font-family: monospace;
}
.svg-editor-root .welcome-btn {
width: auto !important;
padding: 14px 28px !important;
font-size: 15px !important;
margin: 0 !important;
}
.svg-editor-root .welcome-hint {
margin-top: 16px;
color: var(--color-ink-muted);
font-size: 13px;
}
.svg-editor-root .welcome-tabs {
display: flex;
gap: 0;
margin-bottom: 20px;
border-radius: 6px;
overflow: hidden;
border: 1px solid var(--color-border);
}
.svg-editor-root .welcome-tab {
padding: 8px 20px;
font-size: 13px;
background: var(--color-surface);
color: var(--color-ink-muted);
border: none;
cursor: pointer;
transition: background 0.15s, color 0.15s;
}
.svg-editor-root .welcome-tab:not(:last-child) {
border-right: 1px solid var(--color-border);
}
.svg-editor-root .welcome-tab.active {
background: var(--color-accent);
color: #fff;
}
.svg-editor-root .welcome-tab-content {
display: flex;
flex-direction: column;
align-items: center;
gap: 10px;
min-width: 260px;
}
.svg-editor-root .welcome-tab-content label {
font-size: 12px;
color: var(--color-ink-muted);
align-self: flex-start;
}
.svg-editor-root .welcome-tab-content select {
width: 100%;
padding: 8px 10px;
border-radius: 5px;
border: 1px solid var(--color-border);
background: var(--color-surface);
color: var(--color-ink);
font-size: 13px;
}
.svg-editor-canvas.dragging-over { background: color-mix(in srgb, var(--color-accent) 8%, var(--color-surface)); }
.svg-editor-canvas.dragging-over .welcome { color: var(--color-accent); }
.svg-editor-canvas.dragging-over::after {
content: attr(data-drop-label);
position: absolute;
inset: 10px;
display: flex;
align-items: center;
justify-content: center;
font-size: 32px;
color: var(--color-accent);
background: color-mix(in srgb, var(--color-accent) 8%, transparent 15%);
border: 4px dashed var(--color-accent);
border-radius: 8px;
pointer-events: none;
z-index: 10;
}
.svg-editor-root .hide-articulation [data-anno-category="articulation"],
.svg-editor-root .hide-charniere [data-anno-category="charniere"],
.svg-editor-root .hide-cadran-crane [data-anno-category="cadran-crane"],
.svg-editor-root .hide-os-overlay [data-anno-category="os-overlay"],
.svg-editor-root .hide-spine-zone [data-anno-category="spine-zone"],
.svg-editor-root .hide-custom [data-anno-category="custom"] { display: none; }